diff --git a/src/api/user.js b/src/api/user.js index 0ccb3ec4..aa9354c5 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -7,7 +7,12 @@ export function login(data) { data }) } - +export function loginOut() { + return request({ + url: `/User/loginOut`, + method: 'get' + }) +} export function getAllDictionary() { return request({ url: '/dictionary/getAllDictionary', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index d7a66666..cb033368 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,5 +1,5 @@ import { getToken, setToken, removeToken, setName, removeName } from '@/utils/auth' -import { login, getUserMenuTree, getUserPermissions } from '@/api/user' +import { login,loginOut,getUserMenuTree, getUserPermissions } from '@/api/user' import { resetRouter } from '@/router' import md5 from 'js-md5' @@ -178,12 +178,17 @@ const actions = { commit('SET_NAME', zzSessionStorage.getItem('realName')) }, // user logout - logout({ commit, state }) { - removeToken() // must remove token first - resetRouter() - removeName() - zzSessionStorage.clear() - commit('RESET_STATE') + async logout({ commit, state }) { + try{ + await loginOut() + removeToken() // must remove token first + resetRouter() + removeName() + zzSessionStorage.clear() + commit('RESET_STATE') + }catch(e){ + console.log(e) + } }, setToken({ commit }, token) { commit('SET_TOKEN', token) diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue index f1b1b9a3..c91235da 100644 --- a/src/views/trials/trials-layout/components/trialsNavbar.vue +++ b/src/views/trials/trials-layout/components/trialsNavbar.vue @@ -129,7 +129,7 @@ export default { this.$store.dispatch('app/toggleSideBar') }, async logout() { - await this.$store.dispatch('user/logout') + await this.$store.dispatch('user/logout') this.$router.push(`/login`) this.$i18n.locale = 'zh' this.setLanguage('zh')