From a1e663eeb588f419b1622ca07b23fb9d44292ee9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/layouts/AppLayout.vue |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index 0072133..837c9bb 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/admin/src/layouts/AppLayout.vue
@@ -10,7 +10,6 @@
         <header>
           <AppHeader/>
         </header>
-        <div style="height:10px;"></div>
         <main ref="containerS">
           <transition name="fade">
 <!--            <keep-alive>-->
@@ -69,8 +68,8 @@
     height: calc(100vh - 80px);
     overflow-y: scroll;
     overflow-x: hidden;
-    background: $primary-color;
-    color: #fff;
+    background: #fff;
+    color: #333333;
     transition: width ease .3s;
     scrollbar-width: none; /* firefox */
     -ms-overflow-style: none; /* IE 10+ */

--
Gitblit v1.9.3