Merge branch 'money_hand'

src/assets/styles/sidebar.scss

@@ -76,8 +76,16 @@
       white-space: nowrap !important;
     }
 
-    .el-menu-item .el-menu-tooltip__trigger {
-      display: inline-block !important;
+    .el-menu-item {
+      .el-menu-tooltip__trigger {
+        // display: inline-block !important;
+        display: flex;
+        padding: 0 !important;
+        justify-content: center;
+        .svg-icon{
+          margin-right: 0;
+        }
+      }
     }
 
     // menu hover
@@ -111,6 +119,7 @@
     }
   }
 
+  // 侧边栏导航隐藏时
   .hideSidebar {
     .sidebar-container {
       width: 54px !important;

src/layout/components/Sidebar/Logo.vue

@@ -61,13 +61,10 @@ const getLogoTextColor = computed(() => {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  // height: 50px;
-  // line-height: 50px;
-  height: 80px;
-  line-height: 80px;
   background: v-bind(getLogoBackground);
   text-align: center;
   overflow: hidden;
+  padding-top: 10px;
 
   & .sidebar-logo-link {
     // height: 100%;
@@ -76,8 +73,7 @@ const getLogoTextColor = computed(() => {
     & .sidebar-logo {
       // width: 32px;
       // height: 32px;
-      width: 120px;
-      height: 68px;
+      width: 160px;
       vertical-align: middle;
       // margin-right: 12px;
     }