From 5f277fef6d2c6538e2158ed14bb14d5a60a43912 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 10 二月 2026 16:09:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/utils/http.interceptor.js | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/mini-program/utils/http.interceptor.js b/mini-program/utils/http.interceptor.js
index 5fdcdd2..5937e68 100644
--- a/mini-program/utils/http.interceptor.js
+++ b/mini-program/utils/http.interceptor.js
@@ -6,9 +6,21 @@
// 璇锋眰鎷︽埅鍣�
uni.$u.http.interceptors.request.use((config) => {
- const Headtoken = vm.$store.state.token
- if (Headtoken) {
- config.header['token'] = Headtoken;
+ if(config.data && config.data.tokenType===1){
+ const HeadShoptoken = vm.$store.state.shopToken
+ if (HeadShoptoken) {
+ config.header['token'] = HeadShoptoken;
+ }
+ }else if(config.params && config.params.tokenType===1){
+ const HeadShoptoken = vm.$store.state.shopToken
+ if (HeadShoptoken) {
+ config.header['token'] = HeadShoptoken;
+ }
+ }else{
+ const Headtoken = vm.$store.state.token
+ if (Headtoken) {
+ config.header['token'] = Headtoken;
+ }
}
return config
}, config => {
@@ -30,12 +42,10 @@
method: "GET",
data: { code },
success: (res) => {
- isRefreshing = false
-
- vm.$store.commit('setToken', res.data.token)
- vm.$store.commit('setUserInfo', res.data.member)
- vm.$store.commit('setOpenId', res.data.member.openId)
-
+ isRefreshing = false
+ vm.$store.commit('setToken', res.data.data.token)
+ vm.$store.commit('setUserInfo', res.data.data.member)
+ vm.$store.commit('setOpenId', res.data.data.openid)
// 宸茬粡鍒锋柊浜唗oken锛屽皢鎵�鏈夐槦鍒椾腑鐨勮姹傝繘琛岄噸璇�
requests.forEach(item => item(res.data.data))
requests = []
--
Gitblit v1.9.3