|
@@ -176,28 +176,38 @@ function getCompanyDataByPhone() {
|
|
|
|
|
|
// 登录续约
|
|
|
function refreshTokenPage() {
|
|
|
- refreshToken().then(res => {
|
|
|
- if (res.result == 'success') {
|
|
|
- let data = res.data || []
|
|
|
- let tokenInfo = {
|
|
|
- expireTime: data.expireTime,
|
|
|
- startTime: data.startTime,
|
|
|
- refreshTokenExpireTime: data.refreshTokenExpireTime,
|
|
|
- refreshToken: data.refreshToken
|
|
|
- };
|
|
|
- store.commit('setToken', data.token);
|
|
|
- store.commit('setActivated', data.isActivated);
|
|
|
- store.commit('setTokenInfo', tokenInfo);
|
|
|
- if (data.isActivated && data.isActivated == 1) {
|
|
|
- store.commit('setUserInfo', data.tokenUser);
|
|
|
- } else {
|
|
|
- wx.redirectTo({ url: '/pages/index' });
|
|
|
- store.commit('setUserInfo', {});
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
+ refreshToken().then(res => {
|
|
|
+ if (res.result == 'success') {
|
|
|
+ let data = res.data || []
|
|
|
+ let tokenInfo = {
|
|
|
+ expireTime: data.expireTime,
|
|
|
+ startTime: data.startTime,
|
|
|
+ refreshTokenExpireTime: data.refreshTokenExpireTime,
|
|
|
+ refreshToken: data.refreshToken
|
|
|
+ };
|
|
|
+ store.commit('setToken', data.token);
|
|
|
+ store.commit('setActivated', data.isActivated);
|
|
|
+ store.commit('setTokenInfo', tokenInfo);
|
|
|
+ if (data.isActivated && data.isActivated == 1) {
|
|
|
+ store.commit('setUserInfo', data.tokenUser);
|
|
|
+ resolve(data)
|
|
|
+ } else {
|
|
|
+ store.commit('setToken', '')
|
|
|
+ // store.commit('setUserInfo', {});
|
|
|
+ wx.redirectTo({ url: '/pages/index' });
|
|
|
+ resolve(data)
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- }).catch(() => {
|
|
|
- wxLogin()
|
|
|
+ }).catch(() => {
|
|
|
+ resolve("续约失败")
|
|
|
+ store.commit('setToken', '')
|
|
|
+ wx.redirectTo({ url: '/pages/index' });
|
|
|
+ // store.commit('setUserInfo', {});
|
|
|
+ // wxLogin()
|
|
|
+ })
|
|
|
})
|
|
|
+
|
|
|
}
|
|
|
// 检查是否登录过以及过期
|
|
|
function checkLoginNew() {
|
|
@@ -207,9 +217,9 @@ function checkLoginNew() {
|
|
|
} else {
|
|
|
let flag = checkTokenIsValid()
|
|
|
if (flag == 1) {
|
|
|
- refreshTokenPage(); // 续约
|
|
|
+ return refreshTokenPage(); // 续约
|
|
|
} else if (flag == 2) { // 重新登录
|
|
|
- wxLogin();
|
|
|
+ return wxLogin();
|
|
|
} else if (flag == 3) { // 后续补定时器定时续约逻辑
|
|
|
|
|
|
}
|