|
|
@@ -13,6 +13,7 @@ const state = {
|
|
|
const mutations = {
|
|
|
SET_TOKEN: (state, token) => {
|
|
|
state.token = token
|
|
|
+ setToken(token)
|
|
|
},
|
|
|
SET_INTRODUCTION: (state, introduction) => {
|
|
|
state.introduction = introduction
|
|
|
@@ -35,7 +36,6 @@ const actions = {
|
|
|
api.sysUser.login({ domain, username, password }).then(response => {
|
|
|
const { data: { access_token }} = response
|
|
|
commit('SET_TOKEN', access_token)
|
|
|
- setToken(access_token)
|
|
|
resolve()
|
|
|
}).catch(error => {
|
|
|
reject(error)
|
|
|
@@ -72,19 +72,15 @@ const actions = {
|
|
|
|
|
|
// user logout
|
|
|
logout({ commit, state, dispatch }) {
|
|
|
- return new Promise((resolve, reject) => {
|
|
|
- api.sysUser.logout(state.token).then(() => {
|
|
|
- commit('SET_TOKEN', '')
|
|
|
- commit('SET_ROLES', [])
|
|
|
- removeToken()
|
|
|
- resetRouter()
|
|
|
- // reset visited views and cached views
|
|
|
- // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
|
|
|
- dispatch('tagsView/delAllViews', null, { root: true })
|
|
|
- resolve()
|
|
|
- }).catch(error => {
|
|
|
- reject(error)
|
|
|
- })
|
|
|
+ return new Promise(resolve => {
|
|
|
+ commit('SET_TOKEN', '')
|
|
|
+ commit('SET_ROLES', [])
|
|
|
+ removeToken()
|
|
|
+ resetRouter()
|
|
|
+ // reset visited views and cached views
|
|
|
+ // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
|
|
|
+ dispatch('tagsView/delAllViews', null, { root: true })
|
|
|
+ resolve()
|
|
|
})
|
|
|
},
|
|
|
|
|
|
@@ -104,8 +100,6 @@ const actions = {
|
|
|
const token = role + '-token'
|
|
|
|
|
|
commit('SET_TOKEN', token)
|
|
|
- setToken(token)
|
|
|
-
|
|
|
const { roles } = await dispatch('getInfo')
|
|
|
|
|
|
resetRouter()
|