瀏覽代碼

Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

002390 1 年之前
父節點
當前提交
11bd307626
共有 3 個文件被更改,包括 8 次插入2 次删除
  1. 6 2
      src/assets/styles/sidebar.scss
  2. 1 0
      src/layout/components/Navbar.vue
  3. 1 0
      src/layout/components/TagsView/index.vue

+ 6 - 2
src/assets/styles/sidebar.scss

@@ -3,7 +3,8 @@
   .main-container {
     min-height: 100%;
     transition: margin-left .28s;
-    margin-left: $base-sidebar-width;
+    // margin-left: $base-sidebar-width;
+    margin-left: 0;
     position: relative;
   }
 
@@ -45,6 +46,7 @@
     }
 
     &.has-logo {
+      display: none;
       .el-scrollbar {
         height: calc(100% - 50px);
       }
@@ -109,11 +111,13 @@
 
   .hideSidebar {
     .sidebar-container {
+      display: none;
       width: 54px !important;
     }
 
     .main-container {
-      margin-left: 54px;
+      // margin-left: 54px;
+      margin-left: 0;
     }
 
     .submenu-title-noDropdown {

+ 1 - 0
src/layout/components/Navbar.vue

@@ -117,6 +117,7 @@
     position: relative;
     background: #fff;
     box-shadow: 0 1px 4px rgba(0,21,41,.08);
+    display: none;
 
     .hamburger-container {
       line-height: 46px;

+ 1 - 0
src/layout/components/TagsView/index.vue

@@ -244,6 +244,7 @@ export default {
   background: #fff;
   border-bottom: 1px solid #d8dce5;
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+  display: none;
   .tags-view-wrapper {
     .tags-view-item {
       display: inline-block;