diff --git a/store/modules/user.js b/store/modules/user.js index 0e8a1c0..5e76c1e 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -72,14 +72,18 @@ const user = { setIsLogin(true); uni.hideLoading(); success(res) - if (!res.data.userInfo.userName || !res.data.userInfo.userImage || ! - res.data.userInfo.userTelephone) { - uni.navigateTo({ - url: "/pages/login/wxUserInfo" - }) - } else { - uni.navigateBack(-1) + + if(loading){ + if (!res.data.userInfo.userName || !res.data.userInfo.userImage || ! + res.data.userInfo.userTelephone) { + uni.navigateTo({ + url: "/pages/login/wxUserInfo" + }) + } else { + uni.navigateBack(-1) + } } + } }) } diff --git a/utils/request.js b/utils/request.js index 57e4e1e..1a0aec5 100644 --- a/utils/request.js +++ b/utils/request.js @@ -21,7 +21,7 @@ const request = config => { // 是否需要设置 token const isToken = (config.headers || {}).isToken || false config.header = config.header || {} - if (getToken() && isToken) { + if (getToken()) { config.header['Authorization'] = 'Bearer ' + getToken() } // get请求映射params参数