Merge branch 'GeekQiaQia:main' into wc-main

WeCuit · Oct 13, 2021 · cc1be1c · cc1be1c
2 parents 1612906 + 552cf72
commit cc1be1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
@@ -2,7 +2,14 @@
   <div :class="{ 'has-logo': showLogo }">
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-menu :router="true" :unique-opened="false" :default-active="activeMenu" class="el-menu-vertical" :collapse="isCollapse" background-color="#545c64" text-color="#fff">
+      <el-menu
+        :router="true"
+        :unique-opened="false"
+        :default-active="activeMenu"
+        class="el-menu-vertical"
+        :collapse="isCollapse"
+        background-color="#545c64"
+        text-color="#fff">
         <!--递归路由对象-->
         <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" />
       </el-menu>

diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
@@ -111,8 +111,6 @@
       overflow: hidden;
 
       & > .el-sub-menu__title {
-        padding: 0 !important;
-
         .svg-icon {
           margin-left: 20px;
         }