Commit 97209ebb authored by yanzhongrong's avatar yanzhongrong

logout

parent 26f0a3bf
......@@ -26,6 +26,8 @@ import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
import Sidebar from './Sidebar/index.vue'
import { logout } from '@/api/user'
export default {
data() {
let timer
......@@ -51,9 +53,11 @@ export default {
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
async logout() {
await this.$store.dispatch('user/logout')
this.$router.push(`/login?redirect=${this.$route.fullPath}`)
logout() {
logout().then(() => {
this.$store.dispatch('user/logout')
this.$router.push(`/login`)
})
},
// 获取当前时间函数
timeFormate (timeStamp) {
......
......@@ -81,8 +81,6 @@ export default {
return {};
},
mounted() {
console.log(this.$refs['subMenu']);
console.log(document.getElementById('subid'));
},
methods: {
hasOneShowingChild(children = [], parent) {
......
import { login, logout, getInfo } from '@/api/user'
import { login, getInfo } from '@/api/user'
import { getToken, setToken, removeToken } from '@/utils/auth'
import { resetRouter } from '@/router'
......@@ -67,14 +67,11 @@ const actions = {
// user logout
logout({ commit, state }) {
return new Promise((resolve, reject) => {
logout(state.token).then(() => {
removeToken() // must remove token first
resetRouter()
commit("SET_TOKEN", "")
commit('RESET_STATE')
resolve()
}).catch(error => {
reject(error)
})
})
},
......
......@@ -71,10 +71,10 @@ service.interceptors.response.use(
store.dispatch('user/resetToken')
return
}
if (code) {
!config.silence && Message.error(message)
return Promise.reject(new Error(message))
}
// if (code) {
// !config.silence && Message.error(message)
// return Promise.reject(new Error(message))
// }
}
// if (res.code !== 20000) {
// Message({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment