默认merchantId

pages/album/albumIndex.vue

@@ -204,7 +204,7 @@ export default {
 			
       this.$request('wechatUser/pdFace/checkScanFace',{openid}).then(res => {
 			  if (res.code === '00') {
-          const merchantId = this.options.merchantId
+          const merchantId = this.options.merchantId || 'z0015605022691a5945bbe463141668c'// 默认长江索道
 			    if(res.data.isScanFace === 0) {//未扫脸
             uni.navigateTo({
               url: `./getPortrait?merchantId${merchantId}`
@@ -285,11 +285,11 @@ export default {
       }
 			
       // 4.判断是否跳转投票页面
-      if(voteObj.alreadySurvey === 1) {// 未投过票	
+      if(voteObj.alreadySurvey === 0) {// 未投过票	
         uni.navigateTo({
 				  url: `./chooseFavorite?surveyConfig=${JSON.stringify(surveyResult)}`
         })
-      }else if(voteObj.alreadySurvey === 0) {// 已投票
+      }else if(voteObj.alreadySurvey === 1) {// 已投票
         this.show = true
       }
     },
@@ -328,7 +328,6 @@ export default {
       this.showtip = true
     }else if(this.options.index == 1) {// 从vlog首页进入
       this.show = true
-      this.options.merchantId = 'z0015605022691a5945bbe463141668c'// 默认长江索道
     }else {// 扫码进入本页
       this.handleWhetherToVotePage()
     }