1. 影集选择修改

2.  详情增加券提示

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -118,6 +118,7 @@ export default {
   },
   data() {
     return {
+      companyId:'',//公司ID
       background: ['color1', 'color2', 'color3'],
       indicatorDots: false,
       autoplay: false,
@@ -164,9 +165,12 @@ export default {
       sellingPrices:0,//售价
       favorablePrice:0,//优惠
       priceNum:0,//选购了多少照片
+      merchantMessage:[],//景区基础参数
     }
   },
   onLoad(option) {
+    this.companyId = this.$commonjs.getCompanyId(option)
+    this.companyId = '6da527f930be4aa1904fe17fcb41874f'
     this.openid = uni.getStorageSync('openid') //获取openid
     this.faceIds = JSON.parse(option.faceIds)
     this.location = JSON.parse(uni.getStorageSync('location'))
@@ -184,7 +188,7 @@ export default {
         merchantIds:merchantIds
       }).then((res)=>{
         if(res.code=='00'){
-          this.option = res.data
+          this.merchantMessage = res.data
         }else{
           this.$refs.uToast.show({
             title: res.message,
@@ -322,27 +326,47 @@ export default {
     },
     upLoad(){//下单
       var data = {
+        companyId:this.companyId,//公司ID
 			  orderMoney:this.sellingPrices,//订单总价
         userId:this.openid,
         orderProductVo:{},//下单信息
+        orderType:11,//相册TYPE值
+        orderProductList:[],//景区下单信息
       }
-      var orderProductVo = {
+      // var orderProductVo = {
+      //   buyNum:this.priceNum,//购买数量
+      //   orderImgList:[],//订单图片
+      //   orderType:1,//订单类型(0其他，1景区，2酒店，3餐饮，4特产，5运营车，10组合订单)	
+      //   postage:0,//邮费
+      //   couponList:[],//产品券信息 游客使用券信息后传
+      //   unitPrice:this.sellingPrice,//产品单价
+      // }
+      var orderProductListData = {
         buyNum:this.priceNum,//购买数量
-        orderImgList:[],//订单图片
-        orderType:1,//订单类型(0其他，1景区，2酒店，3餐饮，4特产，5运营车，10组合订单)	
-        postage:0,//邮费
-        couponList:[],//产品券信息 游客使用券信息后传
+        merchantId:this.merchantMessage[0].merchantId,
+        orderType:11,//11相册
+        productId:this.merchantMessage[0].merchantExtendProjectId,
+        productName:this.merchantMessage[0].merchantExtendProjectName,
+        extendContent:'',
         unitPrice:this.sellingPrice,//产品单价
+        orderImgList:[],////订单图片
       }
       this.previewData.forEach((item,index)=>{
 			  if(item.checkType==true){
           var imgList = {
             imgUrl:item.faceSourceUrl||item.faceAiUrl
           }
-			    orderProductVo.orderImgList.push(imgList)
+			    orderProductListData.orderImgList.push(imgList)
 			  }
       })
-      data.orderProductVo = orderProductVo
+      var extendContentData={
+        openid:this.openid,
+        projectAddress:this.merchantMessage[0].projectAddress,
+        projectPhone:this.merchantMessage[0].projectAddress,
+      }
+      orderProductListData.extendContent = JSON.stringify(extendContentData)
+      data.orderProductList.push(orderProductListData)
+      //data.orderProductVo = orderProductVo
       this.$request('orderc/photo/photoCreateOrder',data).then((res)=>{
         if(res.code=='00'){
           uni.navigateTo({

pages/my/order/electronicTicket/electronicTicket.vue

@@ -314,12 +314,29 @@
 				</view>
 			</view>
 		</view>
+		<!--抵消券 对应的遮罩-->
+		<image class="coupon" src="../../../../static/img/my/coupon.png"  @click="showUseRule = true"></image>
+		<u-mask :show="showtip || showUseRule">
+			<view class="mask">
+				<view class="img-box">
+					<image src="../../../../static/img/my/postcardTip.png" v-if="showtip"></image>
+					<image src="../../../../static/img/my/useRule.png"  v-if="showUseRule"></image>
+					<u-icon class="close" name="close-circle" @click="closeMask"></u-icon>
+					<view class="use-rule" @click="useRuleClick" v-if="showtip"></view>
+				</view>
+				<u-button type="primary" shape="circle" @click="showtip = false" v-if="showtip">知道了</u-button>
+			</view>
+		</u-mask>
 	</view>
 </template>
 
 <script>
 import uQRCode from '@/common/js/uqrcode.js'
+import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
 export default {
+  components: {
+	  UMask
+  },
   filters:{
     orderStatus1(i){//景区订单状态
       switch(i){
@@ -512,6 +529,8 @@ export default {
       btnRefundType:false,//是否可退款
       ifyukuaiCode:'',
       visitorIndex:'',//短信特殊字段
+      showtip: false,//领取提示
+      showUseRule: false,//使用规则提示
     }
   },
   onShow() {
@@ -955,7 +974,7 @@ export default {
 }
 </script>
 
-<style scoped="scoped">
+<style scoped="scoped" lang="scss">
 	.page-box{
 		background-color: #ECF3FE;
 		min-height: 100vh;
@@ -1402,4 +1421,54 @@ export default {
 		color: #999999;
 		margin-right: 56rpx;
 	}
+	/deep/.u-mask {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.mask {
+		.img-box {
+			position: relative;
+			margin-bottom: 32rpx;
+			.close {
+				position: absolute;
+				top: -54rpx;
+				right: 24rpx;
+				color: #fff;
+				&::after {
+					position: absolute;
+					content: '';
+					top: 24rpx;
+					left: 50%;
+					transform: translateX(-50%);
+					width: 0;
+					height: 32rpx;
+					border-left: 1px dashed #fff;
+				}
+			}
+			.use-rule {
+				position: absolute;
+				left: 50%;
+				bottom: 40px;
+				transform: translateX(-50%);
+				width: 66px;
+				height: 16px;
+			}
+		}
+		image {
+			width: 504rpx;
+			height: 720rpx;
+		}
+		/deep/.u-btn {
+			width: 304rpx;
+		}
+	}
+	.coupon {
+		display: none;
+		position: fixed;
+		right: -30rpx;
+		bottom: 200rpx;
+		width: 120rpx;
+		height: 120rpx;
+	}
 </style>