From 154aa7404fe340e8bd1b88eca499859708acb1dd Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Wed, 21 Feb 2024 23:22:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 45 +++++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 90d90e40..d9b89f67 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -3,7 +3,7 @@
     <!-- 遮罩层 -->
     <div
       v-if="classObj.mobile && classObj.openSidebar"
-      class="fixed z-999 bg-black bg-opacity-30 wh-full top-0"
+      class="fixed-tl z-999 bg-black bg-opacity-30 wh-full"
       @click="handleOutsideClick"
     ></div>
     <Sidebar class="sidebar-container" />
@@ -258,22 +258,45 @@ function toggleSidebar() {
     width: calc(100% - $sidebar-width-collapsed);
   }
 
-  .sidebar-container {
-    width: $sidebar-width-collapsed !important;
-  }
-
   .main-container {
     margin-left: $sidebar-width-collapsed;
   }
 
-  .sidebar-container__left {
-    width: $sidebar-width-collapsed;
+  &.layout-top {
+    .fixed-header {
+      left: 0;
+      width: 100%;
+    }
+
+    .main-container {
+      margin-left: 0;
+    }
   }
 
   &.layout-mix {
+    .fixed-header {
+      left: $sidebar-width-collapsed;
+      width: calc(100% - $sidebar-width-collapsed);
+    }
+
     .sidebar-container {
       width: 100% !important;
     }
+
+    .mix-container {
+      .sidebar-container__left {
+        width: $sidebar-width-collapsed;
+      }
+    }
+  }
+}
+
+.layout-left.hideSidebar {
+  .sidebar-container {
+    width: $sidebar-width-collapsed !important;
+    pointer-events: none;
+    transition-duration: 0.3s;
+    transform: translate3d(-210px, 0, 0);
   }
 }
 
@@ -287,14 +310,6 @@ function toggleSidebar() {
     margin-left: 0;
   }
 
-  &.hideSidebar {
-    .sidebar-container {
-      pointer-events: none;
-      transition-duration: 0.3s;
-      transform: translate3d(-210px, 0, 0);
-    }
-  }
-
   &.layout-top {
     .sidebar-container {
       z-index: 999;