From b902b40fda2f1dccca0825277d07908119deecfd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 09:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/utils/http.interceptor.js | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/mini-program/utils/http.interceptor.js b/mini-program/utils/http.interceptor.js
index 54cbc02..53cdfa4 100644
--- a/mini-program/utils/http.interceptor.js
+++ b/mini-program/utils/http.interceptor.js
@@ -6,7 +6,7 @@
// 璇锋眰鎷︽埅鍣�
uni.$u.http.interceptors.request.use((config) => {
- console.log(config)
+ // console.log(config)
if(config.data && config.data.tokenType===1){
config.header['tokenType'] = config.data.tokenType;
const HeadShoptoken = vm.$store.state.shopToken
@@ -73,13 +73,26 @@
}
});
}
- return new Promise((resolve) => {
- // 灏唕esolve鏀捐繘闃熷垪锛岀敤涓�涓嚱鏁板舰寮忔潵淇濆瓨锛岀瓑token鍒锋柊鍚庣洿鎺ユ墽琛�
- requests.push(token => {
- response.config.header['token'] = token
- resolve(uni.$u.http.request(response.config));
+
+ if ( response.config.header.tokenType != 1) {
+ return new Promise((resolve) => {
+ // 灏唕esolve鏀捐繘闃熷垪锛岀敤涓�涓嚱鏁板舰寮忔潵淇濆瓨锛岀瓑token鍒锋柊鍚庣洿鎺ユ墽琛�
+ requests.push(token => {
+ response.config.header['token'] = token
+ resolve(uni.$u.http.request(response.config));
+ })
})
- })
+ }else{
+ var pages = getCurrentPages();
+ console.log(pages[0].route)
+ console.log(pages[pages.length-1].route)
+ console.log(pages.length && pages[pages.length-1].route != 'pages/login/login')
+ if(pages.length && pages[pages.length-1].route != 'pages/login/login'){
+ uni.redirectTo({
+ url: '/pages/login/login'
+ })
+ }
+ }
}
// 鎺ュ彛涓氬姟鎶ラ敊
if (response.data.code !== 200) {
--
Gitblit v1.9.3