Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-sagacare-weChat

src/packagesEnv/pages/home/index.wpy

@@ -462,6 +462,8 @@ wepy.page({
     console.log("home----onLoad");
     checkLoginNew()
       .then(() => {
+        console.log("触发了")
+        // checkHasUserInfo();
         //获取项目list
         getCompanyDataByPhone()
           .then((res) => {
@@ -501,7 +503,7 @@ wepy.page({
   },
   onShow() {
     console.log("home----onShow");
-    checkHasUserInfo();
+    // checkHasUserInfo();
   },
 });
 </script>

src/pages/auth/index.wpy

@@ -89,7 +89,7 @@ import wepy from '@wepy/core';
 import { mapState } from '@wepy/x';
 import store from '@/store';
 import config from '@/config';
-import { setAvatar, checkLoginNew } from '@/service/user';
+import { setAvatar } from '@/service/user';
 import { getHttpPhoneNumber } from '@/api/user';
 let defaultAvatarUrl =
   config.h5StaticPath + '/page-bind-tenant/default_avatar.svg';

src/pages/index.wpy

@@ -57,7 +57,7 @@ import wepy from '@wepy/core';
 import { mapState } from '@wepy/x';
 import store from '@/store';
 import config from '@/config';
-import { wxLogin, checkLoginNew } from '@/service/user';
+import { wxLogin } from '@/service/user';
 wepy.page({
   store,
   data: {
@@ -65,14 +65,17 @@ wepy.page({
     isActivated: 0
   },
   computed: {
-    ...mapState({ token: state => state.user.token }),
-    ...mapState({ isActivated: state => state.user.isActivated })
+    ...mapState({
+      token: state => state.user.token,
+      isActivated: state => state.user.isActivated
+    })
   },
   onLoad() {},
   onShow() {
     if (this.isActivated && this.isActivated == 1) {
       this.goHome();
     } else {
+      console.log('this.isActivated===45', this.isActivated);
       this.checkTenantRegist();
     }
   },
@@ -108,12 +111,10 @@ wepy.page({
         .catch(error => {});
     },
     goHome() {
+      // console.log("gohome");
       wx.navigateTo({
         url: '/packagesEnv/pages/home/index'
       });
-      // wx.navigateTo({
-      //   url: '/pages/auth/index'
-      // });
     },
     goAuth() {
       console.log('被点击了');

src/service/user.js

@@ -3,20 +3,31 @@ import store from '@/store';
 import config from '@/config';
 import { login, getCompanyByPhone, refreshToken, getUserControlSpace } from '@/api/user.js';
 import utils from '@/common/utils.js';
-//  定时检查用户信息并且续约
+//  定时检查用户信息并且续约-进入页面默认传0
 function checkHasUserInfo() {
   let timer = setTimeout(() => {
+    let token = store.state.user.token
     let tokenInfo = store.state.user.tokenInfo;
     let expireTime = tokenInfo.expireTime;
     let refreshTokenExpireTime = tokenInfo.refreshTokenExpireTime;
     let nowtime = utils.getTimeStamp();
-    if (expireTime && refreshTokenExpireTime >= nowtime && expireTime - nowtime <= 1800000) {  // 过期可续约
-      refreshTokenPage()
+    let refreshTokenValue = tokenInfo && tokenInfo.refreshToken ? tokenInfo.refreshToken : '';
+    if (token && refreshTokenValue && expireTime && refreshTokenExpireTime >= nowtime) {  // 过期可续约
+      let minute = (parseInt(expireTime - nowtime) / 1000 / 60);
+      console.log(minute);
+      if (minute < 20) {
+        refreshTokenPage().then(() => {
+          clearTimeout(timer);
+          checkHasUserInfo(1000);
+        });
+        console.log("minute==", minute)
+      }
+      // console.log("minute==", minute)
+    } else {
+      clearTimeout(timer);
+      checkHasUserInfo(600000);
     }
-    clearTimeout(timer);
-    checkHasUserInfo();
   }, 600000)
-
 }
 
 
@@ -136,15 +147,15 @@ function refreshTokenPage() {
           refreshHome()
           resolve(data)
         }
-      } else { 
+      } else {
         store.commit('clearToken', '');
         refreshHome();
-        reject("续约失败")
+        reject("续约失败!")
       }
     }).catch(() => {
       store.commit('clearToken', '');
       refreshHome();
-      reject("续约失败")
+      reject("续约失败!")
     })
   })
 }
@@ -198,7 +209,7 @@ function checkUserControl() {
 }
 
 // 登录续约逻辑-待处理
-function checkLoginNew(type) {
+function checkLoginNew() {
   return new Promise((resolve, reject) => {
     let token = store.state.user.token;
     let storeTokenInfo = store.state.user.tokenInfo
@@ -218,7 +229,7 @@ function checkLoginNew(type) {
           resolve(res)
         }).catch((error) => {
           reject("续约失败!");
-        });;
+        });
       } else if (flag == 2) { // 重新登录
         wxLogin().then((res) => {
           resolve(res)
@@ -244,7 +255,12 @@ function checkTokenIsValid() {
   if (expireTime && expireTime <= nowtime && refreshTokenExpireTime >= nowtime) {  // 过期可续约
     flag = 1
   } else if (expireTime && expireTime >= nowtime) { //未过期
-    flag = 3
+    let minute = (parseInt(expireTime - nowtime) / 1000 / 60)
+    if (minute <= 20) {
+      flag = 1
+    } else {
+      flag = 3
+    }
   }
   else { // 需要重新登录
     flag = 2