增加愉快码：ifyukuaiCode 显示判定

pages/my/order/electronicTicket/electronicTicket.vue

@@ -27,7 +27,14 @@
 							</view>
 							<view class="title-label">入园凭证</view>
 					</view> -->
-					<view class="certificate-box" v-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5">
+					<view class="certificate-box" v-if="ifyukuaiCode!=''&&ifyukuaiCode!=undefined">
+						<view class="box-prompt2">温馨提示</view>
+						<!-- <view class="box-prompt2">验证码用于入园游玩时核验使用</view>
+						<view class="box-prompt2">注：验证码信息已自动同步至订单所有游玩人渝快码，游玩人直接使用本人渝快码即可入园核验</view> -->
+						<view class="box-prompt2">购票用户直接使用本人渝快码即可入园核验</view>
+						<view class="box-promptBtn" @click="returnMini()">我知道了</view>
+					</view>
+					<view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5">
 							<view class="box-verificationCode">验证码：{{ticketCode}}</view>
 							<canvas class="box-QRcode" canvas-id="qrcode"/>
 							<view class="progress-box" v-if="qrCodeType==true">
@@ -543,17 +550,19 @@
 							this.ticketCode = this.orderInfo.orderTicketDetailList[0].ticketCode
 						}
 						this.touristInfo = res.data.orderTouristList
-						if(this.orderInfo.orderType==1||this.orderInfo.orderType==3){
-							if(this.orderInfo.subOrderType!=4&&this.orderInfo.subOrderType!=5){
-								this.$nextTick(() => {
-									if(this.orderInfo.playDate.substr(0,10)==this.$commonjs.today()&&this.orderInfo.exchangeMode==4||this.orderInfo.playDate.substr(0,10)==this.$commonjs.today()&&this.orderInfo.exchangeMode==5){
-										this.dynamicCode()
-										this.qrCodeType=true
-									}else if(this.orderInfo.exchangeMode==1){
-										this.qecode()
-										this.qrCodeType=false
-									}
-								})
+						if(this.ifyukuaiCode==''||this.ifyukuaiCode==undefined){
+							if(this.orderInfo.orderType==1||this.orderInfo.orderType==3){
+								if(this.orderInfo.subOrderType!=4&&this.orderInfo.subOrderType!=5){
+									this.$nextTick(() => {
+										if(this.orderInfo.playDate.substr(0,10)==this.$commonjs.today()&&this.orderInfo.exchangeMode==4||this.orderInfo.playDate.substr(0,10)==this.$commonjs.today()&&this.orderInfo.exchangeMode==5){
+											this.dynamicCode()
+											this.qrCodeType=true
+										}else if(this.orderInfo.exchangeMode==1){
+											this.qecode()
+											this.qrCodeType=false
+										}
+									})
+								}
 							}
 						}
 						if(this.orderInfo.isFetch==1){//isFetch==1需要排队
@@ -855,6 +864,37 @@
 					url: '/pages/my/order/applyAfterSales/applyAfterSales?orderId='+id+'&ifyukuaiCode='+this.ifyukuaiCode
 				})
 			},
+			returnMini(){
+				//#ifdef MP-WEIXIN
+					wx.navigateBackMiniProgram({
+					  extraData: {
+						  cqQRCode:1
+					  },
+					  fail(res){
+						  uni.showToast({
+								title:"获取失败，请退出后重新进入渝快码小程序获取验证码",
+								icon:"none",
+								duration:3000
+						  })
+					  }
+					})
+				//#endif
+				
+				//#ifdef MP-ALIPAY
+					my.navigateBackMiniProgram({
+						extraData:{
+							cqQRCode:1
+						},
+					    fail: (res) => {
+					     uni.showToast({
+								title:"获取失败，请退出后重新进入渝快码小程序获取验证码",
+								icon:"none",
+								duration:3000
+					     })
+					    }
+					})
+				//#endif
+			},
 		}
 	}
 </script>
@@ -1151,6 +1191,18 @@
 		line-height: 40rpx;
 		text-align: center;
 		margin: 24rpx 0 0 0;
+		padding: 0 24rpx	
+	}
+	.order-certificate .certificate-box .box-promptBtn{
+		width: 152rpx;
+		height: 64rpx;
+		border: solid 1px #ccc;
+		border-radius: 8rpx;
+		line-height: 64rpx;
+		color: #333333;
+		text-align: center;
+		box-sizing: content-box;
+		margin: 24rpx auto 0 auto;
 	}
 
 	/*订单信息*/