From 92a4759e242421f578d463e457fcea33893c6c2a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 14 九月 2024 18:33:12 +0800
Subject: [PATCH] 完成合并并解决冲突
---
plugins/http.js | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/plugins/http.js b/plugins/http.js
index 083f90c..1f2b554 100644
--- a/plugins/http.js
+++ b/plugins/http.js
@@ -109,8 +109,10 @@
res.data.code.startsWith('401')) {
console.log('resp', res)
// storage.removeItem('token')
- await store.dispatch('logout')
- message.showToast('登录信息失效')
+ // await store.dispatch('logout')
+ store.commit('updateLogin', false)
+
+ await message.showToast('登录信息失效')
// #ifdef PUB_CUSTOMER
uni.reLaunch({
@@ -151,9 +153,10 @@
// commit('updat')
// store.commit('updateLogin', false)
console.log('401', res)
- storage.removeItem('token')
- await store.dispatch('logout')
- message.showToast('登录信息失效')
+ // storage.removeItem('token')
+ // await store.dispatch('logout')
+ store.commit('updateLogin', false)
+ await message.showToast('登录信息失效')
// #ifdef PUB_CUSTOMER
--
Gitblit v1.9.3