222

src/router/index.js

@@ -317,7 +317,7 @@ export function changeSystemType (type) {
     try {
       this.$store.commit('app/clearStore')
       setType(type + '')
-      await store.dispatch('user/logout')
+      await store.dispatch('user/getMenuList')
       this.$store.commit('app/setSystemType', type)
       this.$router.push('/')
       resolve(true)

src/store/modules/user.js

@@ -51,13 +51,14 @@ const actions = {
         })
     },
     logout ({ dispatch }) {
+        _this = this
         return new Promise(async (resolve, reject) => {
-            this.$message.error('登录信息失效，请重新登录！')
-            this.$api.base.logout().then(({ data }) => { }).catch(() => { })
+            _this.$message.error('登录信息失效，请重新登录！')
+            _this.$api.base.logout().then(({ data }) => { }).catch(() => { })
             removeToken()
             window.sessionStorage.clear()
-            this.$store.commit('app/clearStore')
-            this.$router.push(`/login`)
+            _this.$store.commit('app/clearStore')
+            _this.$router.push(`/login`)
         })
     },
 }