From 2c40a892f8de3bdf1b2ec9b76afd23a603c3bcb7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 07 二月 2021 09:18:17 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

---
 ruoyi-ui/src/layout/components/Navbar.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index d322da9..b11460a 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -7,7 +7,7 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
-
+        
         <el-tooltip content="婧愮爜鍦板潃" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
@@ -33,11 +33,11 @@
           <router-link to="/user/profile">
             <el-dropdown-item>涓汉涓績</el-dropdown-item>
           </router-link>
-          <el-dropdown-item>
-            <span @click="setting = true">甯冨眬璁剧疆</span>
+          <el-dropdown-item @click.native="setting = true">
+            <span>甯冨眬璁剧疆</span>
           </el-dropdown-item>
-          <el-dropdown-item divided>
-            <span @click="logout">閫�鍑虹櫥褰�</span>
+          <el-dropdown-item divided @click.native="logout">
+            <span>閫�鍑虹櫥褰�</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
@@ -94,7 +94,7 @@
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.reload()
+          location.href = '/index';
         })
       })
     }

--
Gitblit v1.9.3