diff --git a/src/layouts/UserLayout.vue b/src/layouts/UserLayout.vue index fc04200..ff7548a 100644 --- a/src/layouts/UserLayout.vue +++ b/src/layouts/UserLayout.vue @@ -3,7 +3,7 @@
- + 安全培训平台 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 5578f77..f127cb1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -39,7 +39,7 @@ const user = { actions: { // 登录 - Login({ commit }, userInfo) { + Login ({ commit }, userInfo) { return new Promise((resolve, reject) => { login(userInfo).then(response => { storage.set(ACCESS_TOKEN, response.token, 24 * 60 * 60 * 1000) @@ -52,7 +52,7 @@ const user = { }, // 获取用户信息 - GetInfo({ commit, state }) { + GetInfo ({ commit, state }) { return new Promise((resolve, reject) => { getLoginUser().then(response => { if (response.code === 200) { @@ -76,18 +76,25 @@ const user = { }, // 登出 - Logout({ commit, state }) { + Logout ({ commit, state }) { return new Promise((resolve) => { - logout().then(() => { - resolve() - }).catch(() => { - resolve() - }).finally(() => { + const clear = function () { commit('SET_TOKEN', '') commit('SET_ROLES', []) commit('SET_BUTTONS', []) commit('SET_ROUTERS', []) storage.remove(ACCESS_TOKEN) + } + logout().then(() => { + clear() + setTimeout(() => { + resolve() + }, 300) + resolve() + }).catch(() => { + resolve() + }).finally(() => { + clear() }) }) }