Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages/album/albumOrderdetail/albumOrderdetail.vue

@@ -9,7 +9,7 @@
 				<text class="grey">
 					订单编号
 				</text>
-				<text style="flex: 1;">
+				<text style="flex: 1;width: 0;overflow-wrap: break-word;">
 					{{orderInfo.id}}
 				</text>
 				<image @click="copyText(orderInfo.id)" src="@/static/img/my/icon01.png" class="copy-image">
@@ -66,7 +66,7 @@
 				<text>不可退</text>
 			</view>
 			<view class="bottom-btn">
-				<text class="button-empty">我的影集</text>
+				<text class="button-empty" @click="goMyPhoto()">我的影集</text>
 				<text class="button" @click="download()">下载</text>
 				<text class="button" @click="showPop=true">打印</text>
 			</view>
@@ -75,7 +75,7 @@
 		<!-- 打印弹窗 -->
 		<u-popup  v-model="showPop" mode="bottom" border-radius="14" closeable height="70%">
 			<view class="pop-head">
-				<text style="font-size: 32rpx;font-weight: bold;">
+				<text style="font-size: 36rpx;font-weight: bold;">
 					打印
 				</text>
 				<text>
@@ -88,7 +88,7 @@
 					<text class="middle-tip">
 						取片电话：
 					</text>
-					<input />
+					<input type="number" placeholder="请输入取片人手机号码" />
 				</view>
 				
 				<view>
@@ -197,6 +197,12 @@ export default {
         }, 2000)
       })
     },
+    //---跳转我的影集
+    goMyPhoto(){
+      uni.navigateTo({
+        url:'/pages/album/purchasedPhotoAlbum/purchasedPhotoAlbum'
+      })
+    },
     //---点击下载
     download(){
       this.downImgNumber=0
@@ -343,13 +349,19 @@ export default {
 // 打印弹窗
 .pop-head{
 	text-align: center;
-	margin-top: 20rpx;
+	margin-top: 40rpx;
 }
 .pop-middle{
-	padding:0 48rpx 32rpx 48rpx;
+	padding:20rpx 48rpx 32rpx 48rpx;
+	font-size: 32rpx;
 	view{
 		display: flex;
-		margin-top: 32rpx;
+		margin-top: 40rpx;
+		input{
+			flex: 1;
+			border-bottom: 1px solid #ececec;
+			padding-bottom: 10rpx;
+		}
 	}
 }
 .middle-tip{