联票样式处理

pages/my/order/jointElectronicTicket/jointElectronicTicket.vue

@@ -2,8 +2,8 @@
 	<view class="wrap">
 		<!-- 联票电子门票 -->
 		<view class="top">
-			<text class="one-txt-cut">
-				{{orderInfo.productName}}
+			<text>
+				{{orderInfo.productName}}X{{orderInfo.orderNum}}份
 			</text>
 			<text>
 				¥{{orderInfo.totalMoney}}
@@ -14,7 +14,7 @@
 			<view class="productInfo" v-for="(item,index) in orderInfo.childs" :key="index">
 				<view class="product-top">
 					<view class="product-name">
-						<text class="one-txt-cut">{{item.productName}}</text>
+						<text>{{item.productName}}</text>
 						<text>{{item.orderStatus|orderStatus}}</text>
 					</view>
 					<view class="product-datetime">
@@ -49,7 +49,7 @@
 					<!-- 等于1为需要排号的景区 -->
 					<view class="product-number" v-if="item.showSortInfo==true" v-for="(item2,a) in item.sorts" :key='a'>
 						<!-- 1可进入等候区 -->
-						<view v-if="item2.sortFair==1" style="background: #31AA6B;color: #ffffff;">
+						<view v-if="item2.sortFair==1" style="background: #31AA6B;color: #ffffff;border: none;">
 							<view class="my-number" >
 								<view>
 									<view>我的排队号</view>
@@ -63,7 +63,7 @@
 							<view class="current-number">
 								当前排队区间<text>{{item2.showStart}}-{{item2.showEnd}}</text>号
 							</view>
-							<view class="number-notice" style="color: #ffffff;">
+							<view class="number-notice" style="color: #9ed9ba;">
 								<view>
 									温馨提示：{{item2.config.paRowNumHint}}
 								</view>
@@ -175,14 +175,14 @@
 					<!-- 后端返回了二维码才显示下面内容 -->
 					<view class="product-code" v-if="item.orderTicketDetailList.length>0&&item.orderTicketDetailList[0].verifyCode">
 						<view class="code-title">
-							凭「身份证」或「入园码」直接入园
+							凭「入园码」直接入园
 						</view>
 						<view class="code-image">
 							<image :src="item.codeImage"></image>
 						</view>
 						<view class="code-number">
 							<text>
-								数字码:{{item.orderTicketDetailList[0].verifyCode}}
+								{{item.orderTicketDetailList[0].verifyCode}}
 							</text>
 							<text @click="copyText(item.orderTicketDetailList[0].verifyCode)">
 								复制
@@ -209,7 +209,7 @@
 			
 			<view class="rufundRule">
 				<!-- 等于3退票规则以子订单为准 -->
-				<template v-if="orderInfo.isRefund==3">
+				<view style="padding: 32rpx;" v-if="orderInfo.isRefund==3">
 					<view v-for="(item,index) in orderInfo.childs" :key="index" >
 						<view class="rule-title">
 							{{item.productName}}退改规则
@@ -250,9 +250,9 @@
 							</view>
 						</view>
 					</view>
-				</template>
+				</view>
 				<!-- 不等于3退票规则以主订单为准 -->
-				<template v-else>
+				<view style="padding: 32rpx;" v-else>
 					<view class="rule-title">
 						退改规则
 					</view>
@@ -291,10 +291,10 @@
 							
 						</view>
 					</view>
-				</template>
+				</view>
 				<view class="rule-service" @click="makePhone('4000720368')">
 					<u-icon name='kefu-ermai'></u-icon>
-					联系客服
+					<text style="margin-left: 12rpx;">联系客服</text>
 				</view>
 			</view>
 			<view class="orderInfo">
@@ -305,7 +305,9 @@
 					<view>
 						<text style="flex-shrink: 0;">订单编号</text>
 						<view class="order-id">
-							<text class="one-txt-cut" style="flex: 1;">{{orderInfo.id?orderInfo.id.substr(0,8)+"****"+orderInfo.id.substr(orderInfo.id.length-8,8):''}}</text>
+							<text class="one-txt-cut" style="flex: 1;text-align: right;">
+								{{orderInfo.id?orderInfo.id.substr(0,8)+"****"+orderInfo.id.substr(orderInfo.id.length-8,8):''}}
+							</text>
 							<text class="order-btn">复制</text>
 						</view>
 					</view>
@@ -613,8 +615,7 @@ export default {
                           refundTime = orderInfo.playDate+' '+item2.refundTime
                         }
                         let refundTimeNumber=new Date(refundTime.replace(/-/g, '/')).getTime()
-                        //refundDateType退款时间0之前1之后2至（用于区间）
-												
+                        // refundDateType退款时间0之前,1至(用于区间),2之后
                         if(item2.refundDateType==0){
                           if(nowTimeNumber<refundTimeNumber){
                             this.subRefundBtn=true
@@ -625,23 +626,23 @@ export default {
                           }
                         }
                         if(item2.refundDateType==1){
-                          if(nowTimeNumber>refundTimeNumber){
-                            this.subRefundBtn=true
-                            //增加字段用于弹窗展示该产品是否可退
-                            item.ifRefund=true
-                          }else{
-                            this.subRefundBtn=false
-                          }
+												  let refundEndTime=''
+												  if(item2.refundDay){
+												    let playDate = this.getNewDate(orderInfo.playDate,-item2.refundDay)
+												    refundEndTime = playDate+' '+item2.refundEndTime
+												  }else{
+												    refundEndTime = orderInfo.playDate+' '+item2.refundEndTime
+												  }
+												  if(refundTime<nowTime<refundEndTime){
+												    this.subRefundBtn=true
+												    //增加字段用于弹窗展示该产品是否可退
+												    item.ifRefund=true
+												  }else{
+												    this.subRefundBtn=false
+												  }
                         }
                         if(item2.refundDateType==2){
-                          let refundEndTime=''
-                          if(item2.refundDay){
-                            let playDate = this.getNewDate(orderInfo.playDate,-item2.refundDay)
-                            refundEndTime = playDate+' '+item2.refundEndTime
-                          }else{
-                            refundEndTime = orderInfo.playDate+' '+item2.refundEndTime
-                          }
-                          if(refundTime<nowTime<refundEndTime){
+                          if(nowTimeNumber>refundTimeNumber){
                             this.subRefundBtn=true
                             //增加字段用于弹窗展示该产品是否可退
                             item.ifRefund=true
@@ -654,7 +655,6 @@ export default {
                   }
                 }
               })
-              console.log(this.orderInfo.childs)
             }else{
 					  // 退票规则以主订单为准
               if(orderInfo.orderStatus==2||orderInfo.orderStatus==7){
@@ -696,26 +696,27 @@ export default {
                         }
                       }
                       if(item.refundDateType==1){
-                        if(nowTimeNumber>refundTimeNumber){
-                          this.mainRefundBtn=true
-                        }else{
-                          this.mainRefundBtn=false
-                        }
+											  let refundEndTime=''
+											  if(item.refundDay){
+											    let playDate = this.getNewDate(orderInfo.playDate,-item.refundDay)
+											    refundEndTime = playDate+' '+item.refundEndTime
+											  }else{
+											    refundEndTime = orderInfo.playDate+' '+item.refundEndTime
+											  }
+											  if(refundTime<nowTime<refundEndTime){
+											    this.mainRefundBtn=true
+											  }else{
+											    this.mainRefundBtn=false
+											  }
                       }
                       if(item.refundDateType==2){
-                        let refundEndTime=''
-                        if(item.refundDay){
-                          let playDate = this.getNewDate(orderInfo.playDate,-item.refundDay)
-                          refundEndTime = playDate+' '+item.refundEndTime
-                        }else{
-                          refundEndTime = orderInfo.playDate+' '+item.refundEndTime
-                        }
-                        if(refundTime<nowTime<refundEndTime){
+                        if(nowTimeNumber>refundTimeNumber){
                           this.mainRefundBtn=true
                         }else{
                           this.mainRefundBtn=false
                         }
                       }
+                      
                     }
                   })
                 }
@@ -1020,17 +1021,20 @@ export default {
 	margin-top: 20rpx;
 	background: #ffffff;
 	border-radius: 16rpx;
-	padding: 40rpx 32rpx 32rpx 32rpx;
+	padding: 40rpx 0 32rpx 0;
 }
 .product-refund-detail{
 	display: flex;
 	justify-content: space-between;
-	padding: 20rpx 0;
+	padding: 20rpx 32rpx;
 	border-bottom: 1px solid #EDEDED;
 }
 .product-refund-list view{
 	margin-top: 10rpx;
 }
+.product-top{
+	padding: 0 32rpx;
+}
 .product-name{
 	display: flex;
 	justify-content: space-between;
@@ -1055,13 +1059,14 @@ export default {
 	}
 }
 .product-number{
+	padding: 0 32rpx;
 	border-radius: 16rpx;
 	background: #FFFFFF;
-	border: 1px solid #dcdcdc;
 	margin-top: 20rpx;
 	>view{
 		padding: 32rpx;
 		border-radius: 16rpx;
+		border: 1px solid #dcdcdc;
 	}
 }
 .my-number{
@@ -1122,7 +1127,7 @@ export default {
 }
 .code-title{
 	margin-top: 40rpx;
-	font-size: 32rpx;
+	font-size: 36rpx;
 	font-weight: 600;
 }
 .code-number{
@@ -1162,7 +1167,6 @@ export default {
 // 退票规则
 .rufundRule{
 	background: #ffffff;
-	padding: 32rpx;
 	border-radius: 16rpx;
 	margin-top: 20rpx;
 }
@@ -1181,12 +1185,12 @@ export default {
 	}
 }
 .rule-list{
-	margin: 30rpx 0;
+	margin-top:30rpx;
 }
 .rule-service{
 	display: flex;
 	align-items: center;
-	padding-top: 36rpx;
+	padding: 36rpx 0;
 	justify-content: center;
 	border-top: 1px solid #EBEEF5;
 }
@@ -1226,6 +1230,7 @@ export default {
 	border-radius: 20rpx;
 	font-size: 24rpx;
 	margin-left: 20rpx;
+	color: #333333;
 }
 .bottom{
 	position: fixed;
@@ -1238,7 +1243,7 @@ export default {
 	display: flex;
 	align-items: center;
 	padding: 0 40rpx;
-	justify-content: space-around;
+	justify-content:flex-end;
 	text{
 		display: inline-block;
 		width: 170rpx;
@@ -1248,6 +1253,7 @@ export default {
 		text-align: center;
 		line-height: 60rpx;
 		color: #666666;
+		margin-left: 20rpx;
 	}
 }
 .subtitle{