From 0a0a83b2240c18421ecdc3f0630f0fc4d44c1b51 Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Sun, 24 Sep 2023 14:22:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/variables.scss              |  6 ++--
 src/layout/components/Sidebar/SidebarItem.vue | 20 +++++++------
 src/layout/components/Sidebar/index.vue       | 30 ++++++-------------
 vue.config.js                                 |  6 ++--
 4 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 79b34db..5081d4a 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -9,12 +9,12 @@ $yellow: #fec171;
 $panGreen: #30b08f;
 
 // 默认菜单主题风格
-$base-menu-color: #806e6e;
+$base-menu-color: #4C4949;
 $base-menu-color-active: #f4f4f5;
-$base-menu-background: #304156;
+$base-menu-background: #fff;
 $base-logo-title-color: #ffffff;
 
-$base-menu-light-color: rgba(0, 0, 0, 0.7);
+$base-menu-light-color: rgba(51, 30, 30, 0.7);
 $base-menu-light-background: #ffffff;
 $base-logo-light-title-color: #001529;
 
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 79b451b..12c6148 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -11,15 +11,17 @@
         v-if="onlyOneChild.meta"
         :to="resolvePath(onlyOneChild.path, onlyOneChild.query)"
       >
-        <el-menu-item
-          :index="resolvePath(onlyOneChild.path)"
-          :class="{ 'submenu-title-noDropdown': !isNest }"
-        >
-          <item
-            :icon="onlyOneChild.meta.icon || (item.meta && item.meta.icon)"
-            :title="onlyOneChild.meta.title"
-          />
-        </el-menu-item>
+        <div>
+          <el-menu-item
+            :index="resolvePath(onlyOneChild.path)"
+            class="submenu-title-noDropdown"
+          >
+            <item
+              :icon="onlyOneChild.meta.icon || (item.meta && item.meta.icon)"
+              :title="onlyOneChild.meta.title"
+            />
+          </el-menu-item>
+        </div>
       </app-link>
     </template>
 
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 6855f37..ec5093d 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,30 +1,14 @@
 <template>
-  <div
-    :class="{ 'has-logo': showLogo }"
-    :style="{
-      backgroundColor:
-        settings.sideTheme === 'theme-dark'
-          ? 'transparent'
-          : variables.menuLightBackground,
-    }"
-  >
-    <logo v-if="showLogo" :collapse="isCollapse" />
+  <div :class="{ 'has-logo': showLogo }">
+    <!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
     <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
       <!-- :collapse="isCollapse" -->
       <el-menu
         :default-active="activeMenu"
-        :background-color="
-          settings.sideTheme === 'theme-dark'
-            ? 'transparent'
-            : variables.menuLightBackground
-        "
-        :text-color="
-          settings.sideTheme === 'theme-dark'
-            ? variables.menuColor
-            : variables.menuLightColor
-        "
+        :background-color="variables.menuLightBackground"
+        :text-color="variables.menuColor"
         :unique-opened="true"
-        :active-text-color="'#F23F4A'"
+        active-text-color="#F23F4A"
         :collapse-transition="false"
         mode="vertical"
       >
@@ -52,6 +36,7 @@ export default {
     ...mapGetters(["sidebarRouters", "sidebar"]),
     activeMenu() {
       const route = this.$route;
+      console.log(route);
       const { meta, path } = route;
       // if set path, the sidebar will highlight the path you set
       if (meta.activeMenu) {
@@ -71,3 +56,6 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/vue.config.js b/vue.config.js
index b369899..7db7928 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -57,9 +57,9 @@ module.exports = {
         sassOptions: { outputStyle: "expanded" },
       },
       // px to rem
-      postcss: {
-        plugins: [postcss],
-      },
+      // postcss: {
+      //   plugins: [postcss],
+      // },
     },
   },
   configureWebpack: {