From 240971a1724059e47de19719e0183719d2a7c62e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 08 十二月 2022 16:44:04 +0800
Subject: [PATCH] 1.修改刷新退出bug
---
src/utils/request.js | 1 -
src/permission.js | 3 +--
src/store/modules/user.js | 10 +++-------
src/store/modules/app.js | 4 +---
4 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 6567fd4..19d6870 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -19,8 +19,7 @@
// determine whether the user has logged in
// const hasToken = getToken()
- // const hasToken = getCookie('admin')
- const hasToken = store.state.app.isGoToIndex
+ const hasToken = getCookie('admin')
if (hasToken) {
if (to.path === '/login') {
// if is logged in, redirect to the home page
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 19b8157..a868bf9 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -6,8 +6,7 @@
withoutAnimation: false
},
device: 'desktop',
- buttonIsDisabled: false, // 鑷畾涔夊叏灞�鍙橀噺鍙傛暟 鎺у埗鎸夐挳鎻愪氦鏃禿isabled
- isGoToIndex: false // 鑷畾涔夊叏灞�鍙橀噺鍙傛暟 鏄惁杩涘叆鍒扮郴缁熼椤�
+ buttonIsDisabled: false // 鑷畾涔夊叏灞�鍙橀噺鍙傛暟 鎺у埗鎸夐挳鎻愪氦鏃禿isabled
}
const mutations = {
@@ -45,7 +44,6 @@
export default {
namespaced: true,
buttonIsDisabled: false,
- isGoToIndex: false,
state,
mutations,
actions
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 669fb6b..12780f9 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,6 @@
import { login, logout, getInfo, LoginMenu } from '@/api/user'
import { getToken, setToken, removeToken, setCookie, removeCookie, getCookie } from '@/utils/auth'
import { resetRouter } from '@/router'
-import store from '@/store'
const getDefaultState = () => {
return {
@@ -37,9 +36,9 @@
const { username, password } = userInfo
return new Promise((resolve, reject) => {
login({ username: username.trim(), password: password, usertype: 'PC' }).then(res => {
- // login({ UserName: '001', PassWord: 123, HOrgName: 1 }).then(response => {
- // const { data: res } = response
- // if (res.code === '200') {
+ // login({ UserName: '001', PassWord: 123, HOrgName: 1 }).then(response => {
+ // const { data: res } = response
+ // if (res.code === '200') {
setCookie('username', res.data.username)
setCookie('admin', res.data.usercode)
setCookie('navTabId', res.data.usercode)
@@ -54,8 +53,6 @@
// if (res.code === '302') {
setCookie('code', res.code)
// }
-
- store.state.app.isGoToIndex = true
// commit('SET_TOKEN', data.token)
// setToken(res)
@@ -119,7 +116,6 @@
logout(data).then(res => {
if (res.code === '200') {
- store.state.app.isGoToIndex = false
removeToken() // must remove token first
resetRouter()
diff --git a/src/utils/request.js b/src/utils/request.js
index 5f7ded7..e95e5b7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -68,7 +68,6 @@
removeCookie('rediskey')
removeCookie('guid')
removeCookie('code')
- store.state.app.isGoToIndex = false
setTimeout(() => {
sessionStorage.removeItem('tabViews')
window.location.reload()
--
Gitblit v1.9.3