File tree Expand file tree Collapse file tree 5 files changed +290
-325
lines changed Expand file tree Collapse file tree 5 files changed +290
-325
lines changed Original file line number Diff line number Diff line change 20
20
"dependencies" : {
21
21
"axios" : " ^0.19.0" ,
22
22
"core-js" : " ^2.6.5" ,
23
- "element-ui" : " ^2.4.5 " ,
23
+ "element-ui" : " ^2.12.0 " ,
24
24
"normalize.css" : " ^8.0.1" ,
25
25
"vue" : " ^2.6.10" ,
26
26
"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"
29
29
},
30
30
"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 " ,
34
34
"stylus-loader" : " ^3.0.2" ,
35
35
"vue-template-compiler" : " ^2.6.10" ,
36
36
"webpack-alioss-plugin" : " ^2.2.4"
Original file line number Diff line number Diff line change @@ -48,7 +48,6 @@ request.interceptors.response.use(
48
48
type : 'warning'
49
49
} ) . then ( ( ) => {
50
50
clearLogin ( )
51
- location . href = '/login'
52
51
} )
53
52
return Promise . reject ( `${ ret . code } :${ ret . msg } ` )
54
53
default :
Original file line number Diff line number Diff line change 1
- import { resetRouter } from '@/router'
1
+ import { resetRouter } from '@/router'
2
+ import router from '@/router'
3
+ import store from '@/store'
2
4
3
5
const TOKEN_KEY = 'token'
4
6
@@ -27,6 +29,7 @@ export const setToken = (token, remember) => {
27
29
}
28
30
29
31
export const removeToken = ( ) => {
32
+ token = null
30
33
sessionStorage . removeItem ( TOKEN_KEY )
31
34
localStorage . removeItem ( TOKEN_KEY )
32
35
}
@@ -37,6 +40,8 @@ export const removeToken = () => {
37
40
export const clearLogin = ( ) => {
38
41
removeToken ( )
39
42
resetRouter ( )
43
+ store . commit ( 'user/setAllRoutes' , null )
44
+ router . replace ( '/login' )
40
45
}
41
46
42
47
/**
Original file line number Diff line number Diff line change @@ -27,7 +27,6 @@ export default {
27
27
handleCommand (command ) {
28
28
if (command === ' exit' ) {
29
29
clearLogin ()
30
- location .href = ' /login'
31
30
}
32
31
}
33
32
}
You can’t perform that action at this time.
0 commit comments