From 44cbb39057b9240baccb12ff187d8c2d0ec5424a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 11 二月 2026 10:03:50 +0800
Subject: [PATCH] 经销商管理

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

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