From 264a2c1e93e9b9cd3c7e0568b656325b12b008ec Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期一, 25 八月 2025 15:59:03 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/xiehe_website
---
src/plugin/axios/index.ts | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/plugin/axios/index.ts b/src/plugin/axios/index.ts
index db4c3a9..4c20875 100644
--- a/src/plugin/axios/index.ts
+++ b/src/plugin/axios/index.ts
@@ -2,11 +2,13 @@
import myConfig from '@/assets/js/config.js'
import toolClass from '@/assets/js/toolClass.js'
import router from '@/router'
+import { inject } from 'vue'
// 鍒涘缓 axios 瀹炰緥
const service = axios.create({
baseURL: myConfig.requestCtx,
timeout: myConfig.requestTimeOut, // 璇锋眰瓒呮椂鏃堕棿
})
+const logIn = inject('logIn')
// 璇锋眰鎷︽埅鍣�
service.interceptors.request.use(
@@ -48,10 +50,9 @@
(error) => {
if ((error.response && error.response.status == 401) || error.code == 'ERR_NETWORK') {
console.log(router, 'router')
-
localStorage.removeItem(myConfig.tokenKey)
- localStorage.removeItem('jesk-userInfo')
- localStorage.removeItem('jsek-isUserInfo')
+ localStorage.removeItem('xiehe-userInfo')
+ localStorage.removeItem('xiehe-isUserInfo')
localStorage.removeItem('alreadyElectronicBook')
localStorage.removeItem('alreadyPaperBook')
localStorage.removeItem('electronicBookList')
@@ -59,17 +60,16 @@
sessionStorage.removeItem('cartNumber')
const url = window.location.hash.slice(1)
console.log(url, 'url')
- if (url.includes('showLogin=1')) {
- router.push(url)
- } else {
- // router.push(url)
- if (url.includes('?')) {
- console.log(url.includes('?'))
- router.push(url)
- } else {
- router.push(url + '?showLogin=1')
- }
- }
+ window.location.href = `${myConfig.requestCtx}/home/#/home?login=true&callBackUrl=${encodeURIComponent(window.location.href)}`
+ // window.location.href = `${'http://192.168.3.16:5173'}/#/home?login=true&callBackUrl=${encodeURIComponent(window.location.href)}`
+
+ router.push({
+ path: '/home',
+ query: {
+ login: 'true',
+ callBackUrl: encodeURIComponent(window.location.href),
+ },
+ })
} else {
if (error.response && error.response.data && error.response.data.error) {
console.error(error.response.data.error.msg)
--
Gitblit v1.9.1