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

pages/album/albumIndex.vue

@@ -248,12 +248,12 @@ export default {
       })
     },
     async handleWhetherToVotePage() { //---判断是否跳转投票页面
+      try{
         // 1.获取调查列表id
         const surveyQueryData = {
           pageCode: 'albumIndex', //默认前端写死
           channelId: this.options.channelId //游客扫码携带的channelId
         }
-
         const surveyList = await this.judgeWhether('scenic/market/findPageMarket', surveyQueryData)
 				
         // 2.判断商店是否在做投票活动，获取模板
@@ -267,7 +267,6 @@ export default {
           })
         }else {// 调查模板为空则直接展示首页
           this.show = true
-				this.getCoupon()
           this.couponIsUse()
           return
         }
@@ -283,7 +282,6 @@ export default {
           voteObj = await this.judgeWhether('wechatUser/pdAlbum/checkVisitorSurvey', votedQueryData)
         }else {
           this.show = true
-				this.getCoupon()
           this.couponIsUse()
           return
         }
@@ -295,9 +293,14 @@ export default {
           })
         } else if (voteObj.alreadySurvey === 1) { // 已投票
           this.show = true
-				this.getCoupon()
           this.couponIsUse()
         }
+			
+      }catch(e){
+        this.show = true
+        this.couponIsUse()
+        console.log(e)
+      }
     },
     getCoupon() { //---获取优惠券
       var data = {

pages/album/chooseFavorite.vue

@@ -14,7 +14,7 @@
 				</view>
 				<view class="img-box">
 					<view class="item" v-for="(item, index) in imgArr" :key="item.templateId" @click="imageChange(item)">
-						<image class="img" :src="item.templateUrl" mode="aspectFill"></image>
+						<image class="img" :src="item.templateUrl" mode="widthFix"></image>
 						<checkbox class="checkbox blue round" :checked="item.value" :value="item.templateId" shape="circle"></checkbox>
 					</view>
 				</view>
@@ -173,6 +173,7 @@ export default {
 				.img {
 					width: 100%;
 					heigit: 100%;
+					border-radius: 16rpx;
 				}
 				.checkbox {
 					position: absolute;