登陆

src/component/authorization-modal/authorization-modal.js

@@ -56,6 +56,7 @@ Component({
       const userInfo = res.detail || {}
       if (res.detail.userInfo) {
         utils.getUserInfoByBtn(userInfo).then( (data = {} ) => {
+          console.log('----',data)
           const {token} = data
           wx.setStorageSync('_accreditUserInfo', userInfo)
           wx.hideNavigationBarLoading()

src/component/picNav/picNav.js

@@ -37,13 +37,18 @@ Component({
 		},
 		preview(e) {
 			const {appid, path} = e.currentTarget.dataset
+      const {memberActivateStatus} = wx.getStorageSync('_baseUserInfo')
 			// 获取当前帐号信息
 			const accountInfo = utils.getAccountInfo()
       const userInfo = wx.getStorageSync('_baseUserInfo')
       if (userInfo){
-        // 是当前小程序 直接跳转
+       
           if(accountInfo.miniProgram.appId == appid){
+            if (!memberActivateStatus){
+              wxService.openCard()
+            }else{
               wxService.router(`${path}`)
+            }
           } else {
             // 	跳转其他小程序
             wx.navigateToMiniProgram({
@@ -59,9 +64,10 @@ Component({
                 console.log(e)
               },
             })
+          
         }
+        // 是当前小程序 直接跳转
       }else{
-        console.log('222')
         this.setData({
           isAuthorization: true
         })

src/utils/Http.js

@@ -148,7 +148,7 @@ class Http {
         content: '请求数据超时'
       })
     }
-    if(error.msg){
+    if (error.msg && error.msg !='用户未登录'){
       wx.showToast({
         title: `${error.msg}`,
         icon: 'none'

src/utils/wxService.js

@@ -47,15 +47,9 @@ class WXService extends Http {
       this.setPageLoadStatus()
       wx.hideLoading()
     }).catch(res => {
-      console.log('res', res)
-      if (res.state === 401) {
-        // this.openCard()
+      console.log(res)
+      if (res.msg === '用户未登录') {
         var _this = this
-        wx.showModal({
-          title: '温馨提示',
-          content: '登录已过期，请重新登录',
-          success(res) {
-            if (res.confirm) {
         let userInfo = wx.getStorageSync('_baseUserInfo')
         _this.login().then(result=>{
           if(result.code){
@@ -63,22 +57,14 @@ class WXService extends Http {
               code: result.code,
               wechatInfo: userInfo,
               brandId: 2005,
-                 }).then(data=>{
-                     const { token } = data
-                     if (token) {
-                       wx.setStorageSync('token', token)
-                     } else {
-                       wx.setStorageSync('token', '')
-                     }
-                     wx.setStorageSync('_baseUserInfo', data)
+            }).then(response=>{
+              let dataResp = response.data.data
+              wx.setStorageSync('token', dataResp.token)
+              wx.setStorageSync('_baseUserInfo', dataResp)
             })
           }
         })
-            } else if (res.cancel) {
             
-            }
-          }
-        })
       } else if (res.state === 402) {
         return this.getUserInfo().then(() => {
           if (!this.getUserInfoLimitCount) {
@@ -508,6 +494,7 @@ class WXService extends Http {
       if(memberActivateStatus) {
         resolve(baseUserInfo)
       } else {
+        console.log('开卡', baseUserInfo)
         return this.navigateToMiniProgram({
           biz: baseUserInfo.biz,
           encrypt_card_id: baseUserInfo.encryptCardId,