22

src/components/page/GlobalHeader.vue

@@ -25,7 +25,8 @@
       </span>
 
       <user-menu :theme="theme" :showSwitch='showSwitch'/>
-      <a href="http://www.myfitt.cn:18002"  target="_top" style="color:white;float: right;" v-if="showSwitch =='森语'">切换单证系统</a>
+      <!-- <a href="http://www.myfitt.cn:18002"  target="_top" style="color:white;float: right;" v-if="showSwitch =='森语'">切换单证系统</a> -->
+      <a @click="handleLogout1" target="_top" style="color:white;float: right;" v-if="showSwitch =='森语'">切换单证系统</a>
 
     </div>
     <!-- 顶部导航栏模式 -->
@@ -51,7 +52,8 @@ import SMenu from '../menu/'
 import Logo from '../tools/Logo'
 import {getProjctName}from '../../../url.config'
 import { mixin } from '@/utils/mixin.js'
-
+import { logout } from "@/api/login"
+import { mapActions, mapGetters,mapState } from 'vuex'
 export default {
     name: 'GlobalHeader',
     components: {
@@ -126,6 +128,21 @@ export default {
     // update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
     },
     methods: {
+        ...mapActions(["Logout2"]),
+        handleLogout1() {
+          
+          const that = this
+          return that.Logout2({}).then(() => {
+            window.location.href="/";
+            //window.location.reload()
+            
+          }).catch(err => {
+            that.$message.error({
+              title: '错误',
+              description: err.message
+            })
+          })
+        },
         handleScroll () {
             if (this.autoHideHeader) {
                 let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop

src/store/modules/user.js

@@ -195,38 +195,52 @@ const user = {
     // 登出
     Logout({ commit, state }) {
       return new Promise((resolve) => {
-        
+        debugger
         let logoutToken = state.token;
         commit('SET_TOKEN', '')
         commit('SET_PERMISSIONLIST', [])
         
-        // commit('SET_INFO', '')
-        // commit('SET_NAME', {})
-        // commit('SET_AVATAR', '')
+        commit('SET_INFO', '')
+        commit('SET_NAME', {})
+        commit('SET_AVATAR', '')
         
         Vue.ls.remove(ACCESS_TOKEN)
         Vue.ls.remove(USER_INFO)
         Vue.ls.remove(USER_NAME)
        
-        //console.log('logoutToken: '+ logoutToken)
         logout(logoutToken).then(() => {
-            // console.log(process.env.VITE_GLOB_APP_OPEN_SSO)
             let sevice = 'http://' + window.location.host + '/'
             let serviceUrl = encodeURIComponent(sevice)
-            // window.location.href = process.env.VUE_APP_CAS_BASE_URL + '/logout?service=' + serviceUrl
             window.location.href = window._CONFIG['casPrefixUrl']+"/logout?service="+serviceUrl;
             // resolve()
-            // setTimeout(function(){
-            //   window.location.href = 'http://www.myfitt.cn:18086/';
-            //   // resolve()
-            // },110)
         }).catch(() => {
-          console.log("1111111111111111111111111111111111111111111111111111")
+          console.log("111111111111111")
+          resolve()
+        })
+      })
+    },
+    // 登出（该方法非退出登录，请勿修改变动）
+    Logout2({ commit, state }) {
+      return new Promise((resolve) => {
+        let logoutToken = state.token;
+        commit('SET_TOKEN', '')
+        commit('SET_PERMISSIONLIST', [])
+        commit('SET_INFO', '')
+        commit('SET_NAME', {})
+        commit('SET_AVATAR', '')
+        Vue.ls.remove(ACCESS_TOKEN)
+        Vue.ls.remove(USER_INFO)
+        Vue.ls.remove(USER_NAME)
+       
+        logout(logoutToken).then(() => {
+            window.location.href='http://www.myfitt.cn:18002'
+            // window.location.href='www.baidu.com'
+        }).catch(() => {
+          console.log("111111111111111")
           resolve()
         })
       })
     },
-
   }
 }