logout

src/layout/components/Navbar.vue

@@ -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) {

src/layout/components/Sidebar/SidebarItem.vue

@@ -81,8 +81,6 @@ export default {
     return {};
   },
   mounted() {
-    console.log(this.$refs['subMenu']);
-    console.log(document.getElementById('subid'));
   },
   methods: {
     hasOneShowingChild(children = [], parent) {

src/store/modules/user.js

-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('RESET_STATE')
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
+      removeToken() // must remove  token  first
+      resetRouter()
+      commit("SET_TOKEN", "")
+      commit('RESET_STATE')
+      resolve()
     })
   },
 

src/utils/request.js

@@ -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({