diff --git a/utils/filters.js b/utils/filters.js index fec3435..32087e1 100644 --- a/utils/filters.js +++ b/utils/filters.js @@ -496,16 +496,16 @@ export function navigateToLogin (type = "navigateTo") { * 微信小程序跳转到微信小程序登录页面 * H5/App跳转到普通登录页面 */ + let url = "/pages/passport/login"; // #ifdef MP-WEIXIN - uni[type]({ - url: "/pages/passport/wechatMPLogin", - }); + url = "/pages/passport/wechatMPLogin"; // #endif - // #ifndef MP-WEIXIN - uni[type]({ - url: "/pages/passport/login", - }); - // #endif + + if (type === "redirectTo") { + uni.redirectTo({ url }); + } else { + uni.navigateTo({ url }); + } } /** diff --git a/utils/request.js b/utils/request.js index ca52def..3161875 100644 --- a/utils/request.js +++ b/utils/request.js @@ -24,7 +24,7 @@ function cleanStorage() { }); try { uni.hideLoading(); - } catch (e) {} + } catch (e) { } storage.setHasLogin(false); storage.setAccessToken(""); @@ -146,7 +146,7 @@ http.interceptors.response.use( // } try { uni.hideLoading(); - } catch (e) {} + } catch (e) { } let token = storage.getAccessToken(); if ( (token && response.statusCode === 403) ||