我的相册 图片下载

pages/album/purchasedPhotoAlbum/purchasedPhotoAlbum.vue

@@ -24,8 +24,8 @@
 				<view>{{item.merchantName}}</view>
 			</view>
 			<view class="album-subject">
-				<view class="subject-List" v-for="(item2,index2) in item.list" :key="index2">
-					<image class="list-image" :src="item2.faceSourceUrl||item2.faceAiUrl"  @click="stopPhoto(index,index2)"></image>
+				<view class="subject-List" v-for="(item2,index2) in item.photoOrderImgResVoList" :key="index2">
+					<image class="list-image" :src="item2.imgUrl"  @click="stopPhoto(index,index2)"></image>
 					<u-checkbox v-model="item2.checkType" v-if="checkTypeFun==true" @click.stop.native="()=>{}" @change="stopPhoto(index,index2)" shape="circle" class="list-uCheck"></u-checkbox>
 				</view>
 			</view>
@@ -101,14 +101,15 @@ export default {
       sellingPrices:0,//售价
       favorablePrice:0,//优惠
       priceNum:0,//选购了多少照片
-      options:{},//参数
+      //options:{},//参数
       imgList:[],//下载图片列表
       downImgNumber:0,//下载图片的数量
     }
   },
   onLoad(option) {
-    this.openid = 'oroHZ5B455jLw_BqDmVpr7W13NLY' //获取openid uni.getStorageSync('openid') 
-    this.options = option
+    this.openid = uni.getStorageSync('openid') //获取openid
+    //this.openid = 'oh2UV1lFq2CjxbBw0y7DOohhBFBM' //获取openid uni.getStorageSync('openid') 
+    //this.options = option
     //this.merchantId = 'z0015605022691a5945bbe463141668c'//uni.getStorageSync('merchantId')
     this.obtainProvince()//获取省市区
     this.inquireMerchant()//查询所有商户
@@ -147,14 +148,14 @@ export default {
     },
     getPhotos(){//照片
 		  var data = {
-		    openid:this.openid,
-		    merchantId:this.merchantId,//商户ID
+		    userId:this.openid,
+		    orderType:11,//商户ID
 		  }
-		  this.$request('wechatUser/pdFace/getAlbumList',data).then((res)=>{
+		  this.$request('orderc/photo/queryPhotoOrderList',data).then((res)=>{
 		    if(res.code=='00'){
 		      this.previewData = res.data
           this.previewData.forEach((item,index)=>{
-            item.list.forEach((item2,index2)=>{
+            item.photoOrderImgResVoList.forEach((item2,index2)=>{
               item2['checkType'] = false
             })
           })
@@ -186,10 +187,10 @@ export default {
       if(this.checkProjectAll==true){
         this.checkProjectAll=false
       }
-      if(this.previewData[index].list[index2].checkType==false){
-        this.previewData[index].list[index2].checkType = true
+      if(this.previewData[index].photoOrderImgResVoList[index2].checkType==false){
+        this.previewData[index].photoOrderImgResVoList[index2].checkType = true
       }else{
-        this.previewData[index].list[index2].checkType = false
+        this.previewData[index].photoOrderImgResVoList[index2].checkType = false
       }
       this.checkTypeFun = false
       this.checkTypeFun = true
@@ -198,25 +199,25 @@ export default {
       if(this.checkProjectAll==true){
         this.checkProjectAll = false
         this.previewData.forEach((item,index)=>{
-          item.list.forEach((item2,index2)=>{
+          item.photoOrderImgResVoList.forEach((item2,index2)=>{
 					  item2.checkType = false
           })
         })
       }else{
         this.checkProjectAll = true
         this.previewData.forEach((item,index)=>{
-          item.list.forEach((item2,index2)=>{
+          item.photoOrderImgResVoList.forEach((item2,index2)=>{
 					  item2.checkType = true
           })
         })
       }
     },
-    upLoad(){//下单
+    upLoad(){//下载
       this.imgList = []
       this.previewData.forEach((item,index)=>{
-			  item.list.forEach((item2,index2)=>{
+			  item.photoOrderImgResVoList.forEach((item2,index2)=>{
           if(item2.checkType==true){
-            var imgUrl = item2.faceSourceUrl||item2.faceAiUrl
+            var imgUrl = item2.imgUrl
             this.imgList.push(imgUrl)
           }
 			  })

pages/my/order/electronicTicket/electronicTicket.vue

@@ -354,7 +354,7 @@
 					<image class="coupon-backgruondImg" src="../../../../static/img/my/backgroundIcon01.png" ></image>
 					<u-icon class="close" name="close-circle" @click="closeMask"></u-icon>
 				</view>
-				<u-button type="primary" shape="circle" @click="showtip = false" v-if="showtip">知道了</u-button>
+				<u-button type="primary" shape="circle" @click="showtipCloseFun()">知道了</u-button>
 			</view>
 		</u-mask>
 	</view>
@@ -624,6 +624,10 @@ export default {
       this.showtip= false//领取提示
       this.showUseRule=true//使用规则提示
     },
+    showtipCloseFun(){//点击使用规则
+		  this.showtip= false//领取提示
+		  this.showUseRule=false//使用规则提示
+    },
     closeMask(){//遮罩关闭
       this.showtip= false//领取提示
       this.showUseRule= false//使用规则提示
@@ -663,6 +667,7 @@ export default {
             if(item.useRange==11&&item.couponStatus==1){
               this.couponType=true
             }
+            
           })
 			  }else{
 			    uni.showToast({
@@ -1633,8 +1638,8 @@ export default {
 		position: fixed;
 		right: -30rpx;
 		bottom: 200rpx;
-		width: 120rpx;
-		height: 120rpx;
+		width: 140rpx;
+		height: 140rpx;
 		z-index: 20;
 	}
 </style>