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

pages/my/order/afterSale/applyAfterSale/applyAfterSale.vue

 <template>
 	<view class="apply-box">
 		<!--提示-->
-		<view class="apply-tips">
+		<view class="apply-tips" v-if="merchantId=='z0015605022691a5945bbe463141668c'">
 			同一身份证退票当日仅再购1次，同一身份证一个月累计可购3次
 		</view>
-		<view class="apply-ticket general-Box">
+		<view class="apply-ticket general-Box" :class="merchantId!='z0015605022691a5945bbe463141668c'?'apply-ticketAct':''">
 			<view class="ticket-title">
 				<view class="title-name">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</view>
 				<view class="title-num">x{{orderInfo.orderNum}}</view>
 			</view>
-			<view class="ticket-timer">游玩当日{{orderInfo.orderRefundRuleList[0].refundTime}}之前未使用可退</view>
+			<view class="ticket-timer">游玩当日{{orderRefundRuleTimer}}之前未使用可退</view>
 		</view>
 		<!-- <view class="apply-user general-Box">
 			<view class="user-title">
@@ -53,7 +53,13 @@
 			退款提交
 		</view>
 		<view class="apply-toButton" v-else>
-			退款时间为08:00:00-{{orderInfo.orderRefundRuleList[0].refundTime}}
+			退款时间为08:00:00-{{orderRefundRuleTimer}}
+		</view>
+		<view class="apply-mask" v-if="orderRefundRuleTimerType==true">
+			<view class="mask-box">
+				<view class="box-text">请在{{orderRefundRuleTimer}}前退票</view>
+				<view class="box-btn" @click="orderRefundRuleTimerBack()">返回</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -62,6 +68,7 @@
 export default {
   data() {
     return {
+      merchantId:'',//景区ID
       applyClickAll:false,//是否全选
       applyUserList:[
         {
@@ -102,15 +109,23 @@ export default {
       openId:'',//用户ID
       orderInfo:{},//订单信息
       isRefund:false,//是否可以退单
+      orderRefundRuleTimer:'',//退款时间
+      orderRefundRuleTimerType:false,
     }
   },
   onLoad(option) {
     this.id = option.orderId||''
     this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
-    //this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'
+    //this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//oh2UV1lyYABHMZ1rMlgjhVHyyYDQ  oroHZ5FaUQ_SOOC_uQQP92fJpBRE
     this.getDetail()
   },
   methods: {
+    orderRefundRuleTimerBack(){//返回前一个页面
+      console.log('123')
+      uni.navigateBack({
+        delta: 1
+      })
+    },
     confirm(){//提交退订申请
       if(this.causeNum==5&&this.causeInput==''){
         uni.showToast({
@@ -173,10 +188,20 @@ export default {
       this.$request('order/userOrder/findOrderDetail',data).then((res)=>{
 			  if(res.code == '00'){
 			    this.orderInfo = res.data
-          if(this.getNowTime()>'08:00:00'&&this.getNowTime()<this.orderInfo.orderRefundRuleList[0].refundTime){
+          var refundTimer= '23:59:59'
+          if(this.orderInfo.orderRefundRuleList!=undefined&&this.orderInfo.orderRefundRuleList.length>0){
+            refundTimer = this.orderInfo.orderRefundRuleList[0].refundTime
+          }
+					
+          if(this.getNowTime()>'08:00:00'&&this.getNowTime()<refundTimer){
             this.isRefund = true
           }else{
             this.isRefund = false
+          }
+          this.merchantId = res.data.merchantId
+          this.orderRefundRuleTimer = refundTimer
+          if(this.getNowTime()>this.orderRefundRuleTimer){
+            this.orderRefundRuleTimerType = true
           }
 			  }else{
 			    uni.showToast({
@@ -296,6 +321,9 @@ export default {
 		line-height: 40rpx;
 	}
 }
+.apply-ticketAct{
+	margin-top: 20rpx;
+}
 .apply-user{
 	padding: 24rpx 24rpx 30rpx 24rpx;
 	.user-title{
@@ -397,4 +425,46 @@ export default {
 	bottom: 0;
 	left: 0;
 }
+.apply-mask{
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 998;
+	background-color: rgba(0,0,0,.3);
+	.mask-box{
+		width: 500rpx;
+		height: 200rpx;
+		padding: 24rpx;
+		background-color: #fff;
+		border-radius: 10px;
+		margin: auto;
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 998;
+		.box-text{
+			font-size: 28rpx;
+			text-align: center;
+			line-height: 42rpx;
+			margin-top: 10rpx;
+			margin-bottom: 35rpx;
+		}
+		.box-btn{
+			width: 300rpx;
+			height: 60rpx;
+			border-radius: 10rpx;
+			background-color: #3688FF;
+			font-size: 28rpx;
+			text-align: center;
+			line-height: 60rpx;
+			margin: 0 auto 0 auto;
+			color: #fff;
+			font-weight: bold;
+		}
+	}
+}
 </style>

pages/my/order/electronicTicket/electronicTicket.vue

@@ -635,7 +635,7 @@ export default {
     this.ifyukuaiCode = option.ifyukuaiCode||''
     //this.id = "z00167956572219584dc15634b62cf75"
     this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
-    //this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'
+    //this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'  oroHZ5FaUQ_SOOC_uQQP92fJpBRE
     this.getDetail()
   },
   onUnload() {
@@ -1135,7 +1135,7 @@ export default {
       },1000)
     },
     refundJump(id){//-------------------景区跳转
-      uni.reLaunch({
+      uni.navigateTo({
         url: '/pages/my/order/afterSale/applyAfterSale/applyAfterSale?orderId='+id+'&ifyukuaiCode='+this.ifyukuaiCode
       })
     },

pages/my/order/orderList/orderList.vue

@@ -440,7 +440,7 @@ export default {
   },
   onLoad(option) {
     this.openId = uni.getStorageSync('openid')
-    //this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'
+    //this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//oh2UV1lyYABHMZ1rMlgjhVHyyYDQ  oroHZ5FaUQ_SOOC_uQQP92fJpBRE
     this.orderStatus = option.orderStatus||''
     this.ifyukuaiCode = option.ifyukuaiCode||''
     this.getData(1)
@@ -698,7 +698,7 @@ export default {
       
     },
     refundJump(id){//-------------------退款
-      uni.reLaunch({
+      uni.navigateTo({
         url: '/pages/my/order/afterSale/applyAfterSale/applyAfterSale?orderId='+id+'&ifyukuaiCode='+this.ifyukuaiCode
       })
     },