Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/router/index.js

@@ -322,12 +322,7 @@ export function changeSystemType (type) {
       this.$router.push('/')
       resolve(true)
     } catch (e) {
-      this.$api.base.logout().then(({ data }) => { }).catch(() => { })
-      removeToken()
-      window.sessionStorage.clear();
-      this.$store.commit('app/clearStore')
-      this.$router.push(`/login`)
-      reject(false)
+      store.dispatch('user/logout')
     }
   })
 }

src/store/modules/app.js

@@ -17,6 +17,11 @@ const mutations = {
     },
     setTabsArray: (state, payload) => {
         state.tabsArray = payload
+        if (!!state.tabsArray && state.tabsArray.length > 0) {
+            if (state.tabsArray[0].key != '0') {
+                state.tabsArray.unshift({ title: '首页', key: '0', code: 'home', keepAlive: 1, router: '/home', closable: false })
+            }
+        }
     },
     setSystemType: (state, payload) => {
         state.systemType = payload

src/store/modules/user.js

 // @ts-nocheck
 import router from '@/router'
 import api from '@/api'
-import { getType } from '@/views/utils/auth'
+import { getToken, removeToken, getType, setType } from '@/views/utils/auth'
 
 const state = {
 
@@ -50,6 +50,17 @@ const actions = {
             })
         })
     },
+    logout ({ dispatch }) {
+        _this = this
+        return new Promise(async (resolve, reject) => {
+            _this.$message.error('登录信息失效，请重新登录！')
+            _this.$api.base.logout().then(({ data }) => { }).catch(() => { })
+            removeToken()
+            window.sessionStorage.clear()
+            _this.$store.commit('app/clearStore')
+            _this.$router.push(`/login`)
+        })
+    },
 }