add: 激活弹框条件判断

src/component/picNav/picNav.js

@@ -58,17 +58,17 @@ Component({
           isAuthorization: true
         })
         return false
-
-      } else if(userInfo && userInfo.member && !userInfo.member.mobile) {
-        // userInfo 存在  手机号不存在 跳转激活领卡页面
-        this.setData({
-          isAuthorizationActiveText:'新激活领卡',
-          isAuthorization: true
-        },()=> {
-          wxService.openCard()
-          return false
-        })
       } 
+      // else if(userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
+      //   // userInfo 存在  手机号存在 未激活 跳转激活领卡页面
+      //   this.setData({
+      //     isAuthorizationActiveText:'新激活领卡',
+      //     isAuthorization: true
+      //   },()=> {
+      //     wxService.openCard()
+      //     return false
+      //   })
+      // }
 
       if (link.type == 2) {
         // 触发父组件更新页面
@@ -78,28 +78,28 @@ Component({
       } else if (link.type == 3) {
         // 预览
         wx.previewImage({
-          current: `https://images.unsplash.com/${currentClickType.imageUrl}`, // 当前显示图片的http链接
+          current: `http://testimg3.bigaka.com/${currentClickType.imageUrl}`, // 当前显示图片的http链接
           urls: [`http://testimg3.bigaka.com/${currentClickType.link.url}`]  // 需要预览的图片http链接列表
         })
       } else if (link.type == 4) {
         wxService.router(`${currentClickType}`)
       } else if (link.type == 5) {
-        if(userInfo && userInfo.member && !userInfo.member.mobile) {
-          this.setData({
-            isAuthorizationActiveText:'新激活领卡',
-            isAuthorizationType: 3,
-            isAuthorization: true
-          })
-        } else {
-          wxService.openCard()
-        }
-       
-        // if (currentClickType == 1) {
-        //   // wxService.openCardList()
-        //   wxService.openCard()
-        // } else if (currentClickType == 2) {
+        // if(userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
+        //   this.setData({
+        //     isAuthorizationActiveText:'新激活领卡',
+        //     isAuthorizationType: 3,
+        //     isAuthorization: true
+        //   })
+        // } else {
         //   wxService.openCard()
         // }
+       
+        if (currentClickType == 1) {
+          // wxService.openCardList()
+          wxService.openCard()
+        } else if (currentClickType == 2) {
+          wxService.openCard()
+        }
       }
     },
     activeTocard(e){