From 9c1e627b7d29af3061293bef0b62c01a8a2ec58a Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Thu, 19 Oct 2023 23:11:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E6=94=B6=E7=BC=A9=E6=89=A9=E5=B1=95=E6=8C=89=E9=92=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=A0=B7=E5=BC=8F=E5=92=8C=E8=8F=9C=E5=8D=95=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E8=BE=B9=E8=B7=9D=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: ef6db0ae507a3848a45a0e6c48bf08766d5339dd
---
 src/assets/icons/shrink.svg                   |  2 +-
 src/components/Hamburger/index.vue            | 32 ++++++-------------
 src/layout/components/NavBar/NavRight.vue     |  2 +-
 src/layout/components/Sidebar/SidebarItem.vue |  1 +
 src/layout/index.vue                          |  3 ++
 5 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/assets/icons/shrink.svg b/src/assets/icons/shrink.svg
index 69a0f3a6..075a559d 100644
--- a/src/assets/icons/shrink.svg
+++ b/src/assets/icons/shrink.svg
@@ -1 +1 @@
-<svg t="1697690769344" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7573" width="200" height="200"><path d="M128 192l0-64L896 128l0 64-768 0z m192 447.808l-192-128 192-128 0 256zM384 544l0-64L896 480l0 64-512 0zM128 896l0-64L896 832V896l-768 0z" fill="#464955" p-id="7574"></path></svg>
+<svg t="1697727436066" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8081" width="200" height="200"><path d="M892.5 160h-760a4 4 0 0 0-4 4v64a4 4 0 0 0 4 4h760a4 4 0 0 0 4-4v-64a4 4 0 0 0-4-4z m0 210.7h-440a4 4 0 0 0-4 4v64a4 4 0 0 0 4 4h440a4 4 0 0 0 4-4v-64a4 4 0 0 0-4-4z m0 210.6h-440a4 4 0 0 0-4 4v64a4 4 0 0 0 4 4h440a4 4 0 0 0 4-4v-64a4 4 0 0 0-4-4z m0 210.7h-760a4 4 0 0 0-4 4v64a4 4 0 0 0 4 4h760a4 4 0 0 0 4-4v-64a4 4 0 0 0-4-4z m-527-140.8a4 4 0 0 0 6-3.5V376.3a4 4 0 0 0-6-3.5l-235 135.7a4 4 0 0 0 0 7z" p-id="8082"></path></svg>
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index de82363b..a092d4f7 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -1,13 +1,15 @@
 <template>
-  <div class="menu-toggle-button" @click="toggleClick">
+  <div
+    class="px-[15px] flex items-center justify-center color-[var(--el-text-color-regular)]"
+    @click="toggleClick"
+  >
     <svg-icon
-      class="menu-toggle-button__icon"
+      class="hamburger"
       :class="{ 'is-active': isActive }"
       icon-class="shrink"
     />
   </div>
 </template>
-
 <script setup lang="ts">
 defineProps({
   isActive: {
@@ -25,26 +27,12 @@ function toggleClick() {
 </script>
 
 <style scoped lang="scss">
-.menu-toggle-button {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 15px;
+.hamburger {
+  vertical-align: middle;
   cursor: pointer;
-  transition: background-color 0.3s;
+}
 
-  :hover {
-    background-color: var(--el-fill-color);
-  }
-
-  &--active {
-    background-color: var(--el-fill-color-light);
-  }
-
-  &__icon {
-    &.is-active {
-      transform: rotate(180deg);
-    }
-  }
+.hamburger.is-active {
+  transform: rotate(180deg);
 }
 </style>
diff --git a/src/layout/components/NavBar/NavRight.vue b/src/layout/components/NavBar/NavRight.vue
index 63cb1aa8..ee03561d 100644
--- a/src/layout/components/NavBar/NavRight.vue
+++ b/src/layout/components/NavBar/NavRight.vue
@@ -99,7 +99,7 @@ function logout() {
     cursor: pointer;
 
     &:hover {
-      background: var(--el-color-info-light-3);
+      background: var(--el-disabled-bg-color);
     }
   }
 }
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 84ead3fb..32a853f1 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -90,6 +90,7 @@ function resolvePath(routePath: string) {
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)">
           <svg-icon
+            class="mr-1"
             :icon-class="
               onlyOneChild.meta && onlyOneChild.meta.icon
                 ? onlyOneChild.meta.icon
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 63417ecd..dccd012e 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -190,6 +190,9 @@ function toggleSideBar() {
       .menu-action {
         position: absolute;
         bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
         width: 100%;
         height: 50px;
         line-height: 50px;