From edeeafd87e7573b8722f72983a412eba17fa6687 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 11 二月 2026 09:11:48 +0800
Subject: [PATCH] 合并
---
mini-program/utils/http.interceptor.js | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/mini-program/utils/http.interceptor.js b/mini-program/utils/http.interceptor.js
index 986c445..cc8a506 100644
--- a/mini-program/utils/http.interceptor.js
+++ b/mini-program/utils/http.interceptor.js
@@ -6,11 +6,15 @@
// 璇锋眰鎷︽埅鍣�
uni.$u.http.interceptors.request.use((config) => {
- console.log("config==========",config)
if(config.data && config.data.tokenType===1){
const HeadShoptoken = vm.$store.state.shopToken
if (HeadShoptoken) {
- config.header['stoken'] = 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
@@ -38,12 +42,19 @@
method: "GET",
data: { code },
success: (res) => {
+<<<<<<< HEAD
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.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)
+>>>>>>> b9b64778f693ebe82fcbc97837b6012dadb3b084
// 宸茬粡鍒锋柊浜唗oken锛屽皢鎵�鏈夐槦鍒椾腑鐨勮姹傝繘琛岄噸璇�
requests.forEach(item => item(res.data.data))
requests = []
--
Gitblit v1.9.3