yuwenjun hace 3 años
padre
commit
c46618c345
Se han modificado 2 ficheros con 7 adiciones y 6 borrados
  1. 7 5
      src/utils/request.js
  2. 0 1
      src/views/login/index.vue

+ 7 - 5
src/utils/request.js

@@ -21,8 +21,9 @@ service.interceptors.request.use(
     NProgress.start()
     config.headers['Content-Type'] = 'application/json'
     config.data = JSON.stringify(config.data)
-    if (store.getters.token) {
-      config.headers['X-Token'] = getToken()
+    const token = getToken()
+    if (token) {
+      config.headers['X-Token'] = token
     }
     return config
   },
@@ -48,9 +49,10 @@ service.interceptors.response.use(
     const res = response.data
     // token失效时
     if (res.code === -99) {
-      Message({ message: '登录失效,请重新登录!', duration: 1000 })
-      store.dispatch('user/logout')
+      Message({ message: '登录失效,请重新登录!', duration: 1500 })
       setTimeout(() => {
+        store.dispatch('user/logout')
+        store.dispatch('resetState')
         router.replace('/login')
       }, 500)
       NProgress.done()
@@ -60,7 +62,7 @@ service.interceptors.response.use(
       Message({
         message: res.msg || '操作失败了,请重试!',
         type: 'error',
-        duration: 500
+        duration: 1500
       })
       NProgress.done()
       return

+ 0 - 1
src/views/login/index.vue

@@ -130,7 +130,6 @@ export default {
               isAdmin ? this.$router.replace('/supplier/list') : this.$router.replace('/auth/list')
               this.loading = false
               this.$message.success('登录成功')
-              this.$store.commit('app/SET_IS_REFRESH', false)
             })
             .catch(() => {
               this.loading = false