From a150ef64cff75e9e870580435a2387fcebbffa78 Mon Sep 17 00:00:00 2001
From: 188633308 <188633308@qq.com>
Date: Sun, 25 Apr 2021 20:57:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/common/login/index.js            | 3 ++-
 Web/src/views/main/_layout/sider/menu.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Web/src/common/login/index.js b/Web/src/common/login/index.js
index b5f5894..ca4f285 100644
--- a/Web/src/common/login/index.js
+++ b/Web/src/common/login/index.js
@@ -1,6 +1,6 @@
 import { api } from '@/common/api'
 import { token } from '@/common/token'
-import { GLOBAL_INFO_KEY } from '@/common/storage'
+import { GLOBAL_INFO_KEY, APP_MENU_KEY } from '@/common/storage'
 import { encryptByDES, decryptByDES } from '@/util/des'
 import app from '@/main'
 
@@ -50,6 +50,7 @@ const doLogout = () => {
             if (success) {
                 removeGlobal()
                 token.value = ''
+                window.localStorage.removeItem(APP_MENU_KEY)
                 if (app.$route.path === '/') {
                     app.$router.replace('/login')
                 } else {
diff --git a/Web/src/views/main/_layout/sider/menu.js b/Web/src/views/main/_layout/sider/menu.js
index f5bbbd8..573f23c 100644
--- a/Web/src/views/main/_layout/sider/menu.js
+++ b/Web/src/views/main/_layout/sider/menu.js
@@ -32,7 +32,7 @@ export default {
             return (
                 <a-sub-menu key={menu.id}>
                     <span slot="title">
-                        {menu.meta.icon ? <a-icon type={menu.meta.icon} /> : null}
+                        {menu.meta.icon && <a-icon type={menu.meta.icon} />}
                         <span>{menu.meta.title}</span>
                     </span>
                     {this.renderMenu(menu.children)}
@@ -43,7 +43,7 @@ export default {
         renderMenuItem(menu) {
             return (
                 <a-menu-item key={menu.id} onClick={() => this.onOpenContentWindow(menu)}>
-                    {menu.meta.icon ? <a-icon type={menu.meta.icon} /> : null}
+                    {menu.meta.icon && <a-icon type={menu.meta.icon} />}
                     <span>{menu.meta.title}</span>
                 </a-menu-item>
             )