From ad1629e4f90490758dbd91c4d8a9bed4a8693dfc Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 11 二月 2026 15:59:14 +0800
Subject: [PATCH] 合并

---
 mini-program/utils/http.interceptor.js |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/mini-program/utils/http.interceptor.js b/mini-program/utils/http.interceptor.js
index cc8a506..5937e68 100644
--- a/mini-program/utils/http.interceptor.js
+++ b/mini-program/utils/http.interceptor.js
@@ -42,19 +42,10 @@
 							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