From 122759a525c3472eb15a658e4fc54ab688ff416f Mon Sep 17 00:00:00 2001
From: wang_fan_w <2547096351@qq.com>
Date: Tue, 14 May 2024 00:00:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=B7=E5=90=88=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Logo/index.vue |  4 ++--
 src/layout/layout-mixing/index.vue   | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Logo/index.vue b/src/layout/components/Logo/index.vue
index a7ad423..713a8b9 100644
--- a/src/layout/components/Logo/index.vue
+++ b/src/layout/components/Logo/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="layoutType == 'layoutDefaults' ? 'logo_head' : 'logo_head no-border'">
+  <div :class="layoutType == 'layoutHead' ? 'logo_head no-border' : 'logo_head'">
     <img :src="Logo" class="logo" />
     <span :class="isDark ? 'logo_title dark' : 'logo_title'" v-if="!collapsed">dc admin</span>
   </div>
@@ -13,7 +13,7 @@ const themeStore = useThemeConfig();
 const { collapsed, asideDark, layoutType } = storeToRefs(themeStore);
 
 const isDark = computed(() => {
-  if (asideDark.value && layoutType.value === "layoutDefaults") {
+  if (asideDark.value && layoutType.value != "layoutHead") {
     return true;
   } else {
     return false;
diff --git a/src/layout/layout-mixing/index.vue b/src/layout/layout-mixing/index.vue
index 16719c9..597c462 100644
--- a/src/layout/layout-mixing/index.vue
+++ b/src/layout/layout-mixing/index.vue
@@ -142,7 +142,6 @@ const onMenuItem = (key: string) => {
   display: flex;
   align-items: stretch; // 如果（多个）元素的组合大小小于容器的大小，其中自动调整大小的元素将等量增大，以填满容器，同时这些元素仍然保持其宽高比例的约束。
   overflow: hidden;
-  border: 1px solid red;
   .header-logo {
     width: 150px;
   }
@@ -163,6 +162,17 @@ const onMenuItem = (key: string) => {
   justify-content: space-between;
   align-items: center;
   overflow: hidden;
+  .menu_fold {
+    width: 32px;
+    height: 32px;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    .menu_fold_icon {
+      color: $color-text-1;
+      border-radius: $radius-box;
+    }
+  }
 }
 
 :deep(.arco-menu-pop) {