戴艳蓉 3 years ago
parent
commit
3e2159a9ef

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.9397f897.css


BIN
dist/static/css/app.1983dc71.css.gz → dist/static/css/app.9397f897.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-6c350abb.9df72291.css


BIN
dist/static/css/chunk-6c350abb.9df72291.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-91c9c9d0.dc50f156.css


BIN
dist/static/css/chunk-91c9c9d0.dc50f156.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.39968fee.js


BIN
dist/static/js/app.2edc855b.js.gz → dist/static/js/app.39968fee.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-6c350abb.1bba9592.js


BIN
dist/static/js/chunk-6c350abb.1bba9592.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-91c9c9d0.f4595fd5.js


BIN
dist/static/js/chunk-91c9c9d0.f4595fd5.js.gz


+ 4 - 2
src/assets/css/common.scss

@@ -75,10 +75,12 @@ body {
   height: 100%;
   width: 100%;
   background-color: #fff;
-  position: fixed;
+  // position: relative;
+  // z-index:1;
+  // position: fixed;
   padding:0;
   margin: 0;
-  overflow: hidden;
+  // overflow: hidden;
 }
 
 .fillcontain {

+ 1 - 1
src/assets/css/index.scss

@@ -8,7 +8,7 @@
   height: 100%;
   width: 100%;
   background-color: #fff;
-  position: fixed;
+  position: relative;
   width: 100%;
   height: 100%;
   overflow: hidden;

+ 5 - 19
src/layout/components/AppMain.vue

@@ -1,5 +1,5 @@
 <template>
-  <div   class="app-main">
+  <div class="app-main">
     <transition name="fade-transform" mode="out-in">
       <keep-alive :include="cachedViews">
         <router-view :key="key" />
@@ -32,48 +32,34 @@ export default {
 @import "~@/styles/sidebar.scss";
 @import "~@/styles/btn.scss";
 .app-main {
-  // min-height: calc(100vh - 50px);
   min-height: 100%;
-  //calc(100vh - 50px);
   width: 100%;
   height: 100%;
-  position: fixed;
-  // overflow: scroll;
+  position: relative;
   padding: 50px 0 0 0;
+  overflow-y: scroll;
+  min-width: 1200px;
+  @include scrollBar();
   box-sizing: border-box;
-  // @include scrollBar();
 }
 
 .fixed-header + .app-main {
-  // min-height: calc(100vh - 50px);
   min-height: 100%;
-  //calc(100vh - 50px);
   width: 100%;
   height: 100%;
-  position: fixed;
-  // overflow: scroll;
   padding: 50px 0 0 0;
   box-sizing: border-box;
-  // @include scrollBar();
 }
 
 .hasTagsView {
   .app-main {
     // min-height: calc(100vh - 50px);
     min-height: 100%;
-    //calc(100vh - 50px);
     width: 100%;
     height: 100%;
-    position: fixed;
-    // overflow: scroll;
     padding: 50px 0 0 0;
     box-sizing: border-box;
-    // @include scrollBar();
   }
-
-  // .fixed-header+.app-main {
-  //   padding-top: 84px;
-  // }
 }
 </style>
 

+ 3 - 3
src/layout/index.vue

@@ -69,11 +69,11 @@ export default {
   @include clearfix;
   height: 100%;
   width: 100%;
-  position: fixed;
-  overflow: hidden;
+  min-width: 1200px;
+  position: relative;
 
   &.mobile.openSidebar {
-    position: fixed;
+    // position: fixed;
     top: 0;
   }
 }

+ 2 - 1
src/styles/sidebar.scss

@@ -4,7 +4,8 @@
     height: 100%;
     transition: margin-left 0.28s;
     margin-left: $sideBarWidth;
-    position: fixed;
+    position: relative;
+    // width: 100%;;
     min-height: 100%;;
     min-width: calc( 1200px - 200px);
   }

Some files were not shown because too many files changed in this diff