From d0da0ce546110de49cca9e0358029a51c53188d6 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 24 二月 2026 09:57:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/utils/http.interceptor.js | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/mini-program/utils/http.interceptor.js b/mini-program/utils/http.interceptor.js
index 08fb1ea..54cbc02 100644
--- a/mini-program/utils/http.interceptor.js
+++ b/mini-program/utils/http.interceptor.js
@@ -6,6 +6,7 @@
// 璇锋眰鎷︽埅鍣�
uni.$u.http.interceptors.request.use((config) => {
+ console.log(config)
if(config.data && config.data.tokenType===1){
config.header['tokenType'] = config.data.tokenType;
const HeadShoptoken = vm.$store.state.shopToken
@@ -13,7 +14,7 @@
config.header['token'] = HeadShoptoken;
}
}else if(config.params && config.params.tokenType===1){
- config.header['tokenType'] = config.data.tokenType;
+ config.header['tokenType'] = config.params.tokenType;
const HeadShoptoken = vm.$store.state.shopToken
if (HeadShoptoken) {
config.header['token'] = HeadShoptoken;
@@ -50,21 +51,24 @@
if (res.data.data.token) {
isLogin = true
vm.$store.commit('setToken', res.data.data.token)
- vm.$store.commit('setUserInfo', res.data.data.member)
+ vm.$store.commit('setUserInfo', res.data.data.member)
}
vm.$store.commit('setOpenId', res.data.data.openid)
}
if (!isLogin) {
- if (response.config.header && response.config.header.tokenType != 1) {
+ if (!response.config.header || response.config.header.tokenType != 1) {
uni.switchTab({
url: '/pages/index/index'
})
}
+ }else{
+ if (!response.config.header || response.config.header.tokenType != 1) {
+ // 宸茬粡鍒锋柊浜唗oken锛屽皢鎵�鏈夐槦鍒椾腑鐨勮姹傝繘琛岄噸璇�
+ requests.forEach(item => item(res.data.data))
+ requests = []
+ }
}
- // 宸茬粡鍒锋柊浜唗oken锛屽皢鎵�鏈夐槦鍒椾腑鐨勮姹傝繘琛岄噸璇�
- requests.forEach(item => item(res.data.data))
- requests = []
- }
+ },
});
}
});
@@ -72,7 +76,7 @@
return new Promise((resolve) => {
// 灏唕esolve鏀捐繘闃熷垪锛岀敤涓�涓嚱鏁板舰寮忔潵淇濆瓨锛岀瓑token鍒锋柊鍚庣洿鎺ユ墽琛�
requests.push(token => {
- response.config.header['eva-auth-token'] = token
+ response.config.header['token'] = token
resolve(uni.$u.http.request(response.config));
})
})
--
Gitblit v1.9.3