From 4c1dadd8ba3f7fab528edea9a9e7b74d05799276 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 5 Aug 2025 09:04:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(logout):=20=E7=99=BB=E5=87=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 89 +++++++++++++++++++-------------
 src/views/login/index.vue        |  2 +-
 2 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c7bfad8..07bda88 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -5,37 +5,54 @@
     <breadcrumb class="breadcrumb-container" />
 
     <div class="right-menu">
-      <div class="check" v-if="user.userType!=9">
-        <el-select v-model="languageItem"
-                   @change="setLanguage"
-                   popper-class="selectCls"
-                   size="mini">
-          <el-option v-for="item in languageList"
-                     :key="item.value"
-                     :label="item.label"
-                     :value="item.value">
-          </el-option>
+      <div v-if="user.userType!=9" class="check">
+        <el-select
+          v-model="languageItem"
+          popper-class="selectCls"
+          size="mini"
+          @change="setLanguage"
+        >
+          <el-option
+            v-for="item in languageList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
 
-        <el-dropdown trigger="click"
-                     placement="bottom-start">
+        <el-dropdown
+          trigger="click"
+          placement="bottom-start"
+        >
           <div class="kuang">
             <div class="dropdown_i">
-              <img :src="ruleForm.nationalFlag2"
-                   alt="">
+              <img
+                :src="ruleForm.nationalFlag2"
+                alt=""
+              >
               <div>{{ ruleForm.name }}</div>
             </div>
-            <i slot="suffix"
-               class="el-icon-arrow-down"></i>
+            <i
+              slot="suffix"
+              class="el-icon-arrow-down"
+            />
           </div>
-          <el-dropdown-menu slot="dropdown"
-                            class="dropdown-container">
-            <el-dropdown-item v-for="(item, i) in countryList"
-                              :key="i">
-              <div class="dropdown_i"
-                   @click="handleClick(item)">
-                <img :src="item.nationalFlag2"
-                     alt="">
+          <el-dropdown-menu
+            slot="dropdown"
+            class="dropdown-container"
+          >
+            <el-dropdown-item
+              v-for="(item, i) in countryList"
+              :key="i"
+            >
+              <div
+                class="dropdown_i"
+                @click="handleClick(item)"
+              >
+                <img
+                  :src="item.nationalFlag2"
+                  alt=""
+                >
                 <div>{{ item.name }}</div>
               </div>
 
@@ -43,8 +60,10 @@
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-      <div class="login"
-           @click="logout">退出登录</div>
+      <div
+        class="login"
+        @click="logout"
+      >退出登录</div>
       <!-- <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
@@ -74,10 +93,10 @@ import { userCountryList, changeList, languages } from '@/api/user'
 export default {
   components: {
     Breadcrumb,
-    Hamburger,
+    Hamburger
   },
   computed: {
-    ...mapGetters(['sidebar', 'avatar', 'user']),
+    ...mapGetters(['sidebar', 'avatar', 'user'])
   },
   data() {
     return {
@@ -85,14 +104,14 @@ export default {
       ruleForm: {
         pkCountry: '',
         nationalFlag2: '',
-        name: '',
+        name: ''
       },
       languageList: [],
-      languageItem: 0,
+      languageItem: 0
     }
   },
   mounted() {
-    let that = this
+    const that = this
     setTimeout(() => {
       // 获取结算国列表
       that.getJScountry()
@@ -160,16 +179,16 @@ export default {
       this.$confirm('确定注销并退出系统吗？', this.$t('w_0034'), {
         confirmButtonText: this.$t('w_0035'),
         cancelButtonText: this.$t('ENU_P_TYPE0'),
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           this.$store.dispatch('user/LogOut').then(() => {
-            this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+            this.$router.push(`/login?redirect=${encodeURIComponent(this.$route.fullPath)}`)
           })
         })
         .catch(() => {})
-    },
-  },
+    }
+  }
 }
 </script>
 
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index cabccae..c1b9d6a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -249,7 +249,7 @@ export default {
           this.$store
             .dispatch('user/login', this.loginForm)
             .then(() => {
-              this.$router.push({ path: this.redirect || '/' })
+              this.$router.push({ path: decodeURIComponent(this.redirect) || '/' })
               this.loading = false
             })
             .catch(() => {