modify: 老会员弹框

src/component/picNav/picNav.js

@@ -64,16 +64,6 @@ Component({
         })
         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) {
         // 触发父组件更新页面
@@ -89,26 +79,26 @@ Component({
       } else if (link.type == 4) {
         wxService.router(`${currentClickType}`)
       } else if (link.type == 5) {
-        // if(userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
-        //   this.setData({
-        //     isAuthorizationActiveText:'新激活领卡',
-        //     isAuthorizationType: 3,
-        //     isAuthorization: true
-        //   })
-        // } else {
-        //   wxService.openCard()
-        // }
+        console.log('currentClickType', currentClickType)
 
         if (currentClickType == 1) {
-          // wxService.openCardList()
           wxService.openCard()
         } else if (currentClickType == 2) {
-          wxService.openCard()
+          if (userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
+            // 手机号存在 但未激活 跳转激活领卡页面 老用户
+            this.setData({
+              isAuthorizationActiveText: '新激活领卡',
+              isAuthorization: true,
+              isAuthorizationType: 3
+            }, () => {
+              return false
+            })
+          }
         }
       }
     },
-    activeTocard(e){
-      if(e.detail){
+    activeTocard(e) {
+      if (e.detail) {
         wxService.openCard()
       }
     }