1.相片选购页面增加判断 若未勾选相片点击下单时提示请勾选相片

2.订单详情 当为OTA进入时显示 OTA的名称

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -419,6 +419,13 @@ export default {
 			    orderProductListData.orderImgList.push(imgList)
 			  }
       })
+      if(orderProductListData.orderImgList.length==0){
+        uni.showToast({
+				  title: '请选择相片',
+				  icon: 'none'
+        })
+        return false
+      }
       var extendContentData={
         openid:this.openid,
         projectAddress:this.merchantMessage[0].projectAddress,

pages/my/applyUnsubscription/applyUnsubscription.vue

@@ -12,7 +12,18 @@
 			<view class="ticket-timer">游玩当日17:00之前未使用可退</view>
 		</view>
 		<view class="apply-user general-Box">
-			
+			<view class="user-title">
+				<view class="title-name">用户选择</view>
+				<u-checkbox	@change="checkedAll"	v-model="applyClickAll" >全选</u-checkbox>
+			</view>
+			<u-checkbox-group @change="checkboxGroupChange">
+				<u-checkbox 
+					@change="checkboxChange" 
+					v-model="item.checked" 
+					v-for="(item, index) in applyUserList" :key="index" 
+					:name="item.name"
+				>{{item.name}}</u-checkbox>
+			</u-checkbox-group>
 		</view>
 	</view>
 </template>
@@ -21,14 +32,52 @@
 export default {
   data() {
     return {
+      applyClickAll:false,//是否全选
+      applyUserList:[
+        {
+          name:'张三',
+          checked:false,
+        },
+        {
+          name:'李四',
+          checked:false,
+        },
 				
+      ],//用户信息
     }
   },
   onLoad(option) {
 		
   },
   methods: {
+    // 选中某个复选框时，由checkbox时触发  可以获取当前选择值的所有信息
+    checkboxChange(e) {
+      // console.log(e)
+      
+    },
+    // 选中任一checkbox时，由checkbox-group触发  已经选择了多少选项
+    checkboxGroupChange(e) {
+      // console.log(e)
+      if(this.applyUserList.length==e.length){
+        this.applyClickAll = true
+      }else{
+        this.applyClickAll =false
+      }
+    },
+    // 全选
+    checkedAll(e) {
+      console.log(e)
+      if(e.value==true){
+        this.applyUserList.map(val => {
+				  val.checked = true
+        })
+      }else{
+        this.applyUserList.map(val => {
+				  val.checked = false
+        })
+      }
       
+    },
   }
 }
 </script>
@@ -82,6 +131,17 @@ export default {
 	}
 }
 .apply-user{
-	
+	padding: 24rpx 24rpx 30rpx 24rpx;
+	.user-title{
+		display: flex;
+		margin-bottom: 30rpx;
+		.title-name{
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #333333;
+			line-height: 40rpx;
+			margin-right: 24rpx;
+		}
+	}
 }
 </style>

pages/my/order/electronicTicket/electronicTicket.vue

@@ -2,9 +2,9 @@
 	<view class="page-box">
 		<view class="order-status">
 		    <view class="status-box">
-						<template v-if="channelType==1">
+						<template v-if="orderInfo.channelType==8">
 							<view class="status-type">
-								携程<text style="font-size: 28rpx;margin-left: 10rpx;">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</text>
+								{{orderInfo.channelName}}<text style="font-size: 28rpx;margin-left: 10rpx;">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</text>
 							</view>
 							
 						</template>
@@ -48,6 +48,8 @@
 					<view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5">
 							<view class="box-verificationCode">验证码：{{ticketCode}}</view>
 							<uqrcode ref="uqrcode" canvas-id="qrcode" size="200" class="box-QRcode" :value="uqrcodeVal" :options="{ margin: 10 }" ></uqrcode>
+							<!--后端生成-->
+							<!-- <image :src="imgUrlList" style="width: 180px;height: 180px;margin: 0 auto;display: block;" v-if="imgUrlListType"></image> -->
 							<view class="progress-box" v-if="qrCodeType==true">
 									<progress :percent="percentage" activeColor="#3688FF" stroke-width="3" />
 							</view>
@@ -542,10 +544,11 @@ export default {
       btnRefundType:false,//是否可退款
       ifyukuaiCode:'',
       visitorIndex:'',//短信特殊字段
-      channelType:0,//渠道状态channelType==0 订单列表跳转   ==1 OTA取票跳转
       photoType:false,//是否显示优惠券
       claimStatus:1,//领取状态 0未领取 1已领取
       findCouponPhoto:{},//相册优惠券
+      imgUrlList:'',
+      imgUrlListType:false,
     }
   },
   onShow() {
@@ -582,7 +585,6 @@ export default {
     this.ifyukuaiCode = option.ifyukuaiCode||''
     //this.id = "z00167956572219584dc15634b62cf75"
     this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
-    this.channelType = option.channelType||0
     //this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'
     this.getDetail()
   },
@@ -857,6 +859,10 @@ export default {
         //   errorCorrectLevel: uQRCode.errorCorrectLevel.H
         // })
         this.uqrcodeVal=verifyCode
+        //后端生成
+        //var verifyCodeURL = verifyCode.encodeURI()
+        // this.imgUrlList = 'http://pay.tuyoyoo.com/distribution/c/'+verifyCodeURL+'?width=180&height=180&frontColor=0&backColor=16777215'
+        // this.imgUrlListType = true
       }
     },
     signOverFun(item){//过号遮罩显示
@@ -909,6 +915,11 @@ export default {
         //   errorCorrectLevel: uQRCode.errorCorrectLevel.H
         // })
         this.uqrcodeVal=this.codeNo
+        //后端生成
+        // this.imgUrlListType = false
+        //var verifyCodeURL = this.codeNo.encodeURI()
+        // this.imgUrlList = 'http://pay.tuyoyoo.com/distribution/c/'+verifyCodeURL+'?width=180&height=180&frontColor=0&backColor=16777215'
+        // this.imgUrlListType = true
       }
       this.percentage+=1
       if(this.percentage>=100){

pages/my/order/orderList/orderList.vue

@@ -672,7 +672,7 @@ export default {
         })
       }else{
         uni.navigateTo({
-				  url: '/pages/my/order/electronicTicket/electronicTicket?orderId='+orderId+'&channelType=0'
+				  url: '/pages/my/order/electronicTicket/electronicTicket?orderId='+orderId
         })
       }