Skip to content

Commit 47dc9e0

Browse files
committed
⚡ 升级依赖;修改退出登录为路由跳转
1 parent 1222703 commit 47dc9e0

File tree

5 files changed

+290
-325
lines changed

5 files changed

+290
-325
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
"dependencies": {
2121
"axios": "^0.19.0",
2222
"core-js": "^2.6.5",
23-
"element-ui": "^2.4.5",
23+
"element-ui": "^2.12.0",
2424
"normalize.css": "^8.0.1",
2525
"vue": "^2.6.10",
2626
"vue-awesome": "^3.5.4",
27-
"vue-router": "^3.0.3",
28-
"vuex": "^3.0.1"
27+
"vue-router": "^3.1.3",
28+
"vuex": "^3.1.1"
2929
},
3030
"devDependencies": {
31-
"@vue/cli-plugin-babel": "^3.10.0",
32-
"@vue/cli-service": "^3.10.0",
33-
"stylus": "^0.54.5",
31+
"@vue/cli-plugin-babel": "^3.11.0",
32+
"@vue/cli-service": "^3.11.0",
33+
"stylus": "^0.54.7",
3434
"stylus-loader": "^3.0.2",
3535
"vue-template-compiler": "^2.6.10",
3636
"webpack-alioss-plugin": "^2.2.4"

src/assets/js/request.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ request.interceptors.response.use(
4848
type: 'warning'
4949
}).then(() => {
5050
clearLogin()
51-
location.href = '/login'
5251
})
5352
return Promise.reject(`${ret.code}:${ret.msg}`)
5453
default:

src/assets/js/util.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import {resetRouter} from '@/router'
1+
import { resetRouter } from '@/router'
2+
import router from '@/router'
3+
import store from '@/store'
24

35
const TOKEN_KEY = 'token'
46

@@ -27,6 +29,7 @@ export const setToken = (token, remember) => {
2729
}
2830

2931
export const removeToken = () => {
32+
token = null
3033
sessionStorage.removeItem(TOKEN_KEY)
3134
localStorage.removeItem(TOKEN_KEY)
3235
}
@@ -37,6 +40,8 @@ export const removeToken = () => {
3740
export const clearLogin = () => {
3841
removeToken()
3942
resetRouter()
43+
store.commit('user/setAllRoutes', null)
44+
router.replace('/login')
4045
}
4146

4247
/**

src/components/Layout/LayoutHeaderUser.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export default {
2727
handleCommand(command) {
2828
if (command === 'exit') {
2929
clearLogin()
30-
location.href = '/login'
3130
}
3231
}
3332
}

0 commit comments

Comments
 (0)