瀏覽代碼

Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

luojun 2 年之前
父節點
當前提交
fa3ffe9a4d
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      src/assets/styles/ruoyi.scss
  2. 3 3
      src/layout/components/Sidebar/index.vue

+ 1 - 1
src/assets/styles/ruoyi.scss

@@ -106,7 +106,7 @@
   display: flex;
   justify-content: flex-end;
   align-items: center;
-	height: 50px;
+	height: 54px;
 	padding: 10px;
   background-color: #fff;
   border:1px solid #f1f1f1;

+ 3 - 3
src/layout/components/Sidebar/index.vue

@@ -33,7 +33,7 @@
         </el-menu>
       </el-scrollbar>
       </div>
-      
+
       <div class="bottomBox">
         <hamburger
           id="hamburger-container"
@@ -89,7 +89,7 @@ export default {
   position: relative;
   height: 90vh;
   width: 100%;
-  overflow-y: scroll !important;
+  overflow-y: auto !important;
 }
 .bottomBox {
   //   position: absolute;
@@ -97,7 +97,7 @@ export default {
   width: 100%;
   margin-top: 10px;
   padding-left: 10px;
- 
+
   bottom: 2%;
   border-top: #ccc;
   .hamburger-container {