Browse Source

修复页脚显示问题

Pchen0 3 weeks ago
parent
commit
53b95e78eb
3 changed files with 6 additions and 12 deletions
  1. 2 1
      src/components/Footer/index.vue
  2. 0 4
      src/layout/default-layout.vue
  3. 4 7
      src/layout/html-view.vue

+ 2 - 1
src/components/Footer/index.vue

@@ -6,8 +6,9 @@
 
 
 <style scoped>
 <style scoped>
 .footer {
 .footer {
+    flex-shrink: 0;
     width: 100%;
     width: 100%;
-    padding: 18px 16px;
+    padding: 20px 16px;
     box-sizing: border-box;
     box-sizing: border-box;
     text-align: center;
     text-align: center;
     color: rgba(27, 48, 34, 0.62);
     color: rgba(27, 48, 34, 0.62);

+ 0 - 4
src/layout/default-layout.vue

@@ -183,10 +183,6 @@ const toggleSider = () => {
 
 
 @nav-size-height: 60px;
 @nav-size-height: 60px;
 
 
-.page-layout-main {
-  margin-bottom: 24px;
-  min-height: calc(100vh - @nav-size-height - 80px);
-}
 
 
 .layout {
 .layout {
   min-width: 0;
   min-width: 0;

+ 4 - 7
src/layout/html-view.vue

@@ -39,18 +39,15 @@ import Footer from '@/components/Footer/index.vue'
   bottom: 0;
   bottom: 0;
   width: 100%;
   width: 100%;
   height: calc(100% - @nav-size-height);
   height: calc(100% - @nav-size-height);
+  display: flex;
+  flex-direction: column;
+  overflow-x: hidden;
   overflow-y: auto;
   overflow-y: auto;
   background-color: var(--color-fill-2);
   background-color: var(--color-fill-2);
 }
 }
 
 
 .page {
 .page {
-  height: 100%;
-  margin-bottom: 30px;
-}
-
-router-view {
-  display: block;
-  height: 100%;
+  padding-bottom: 8px;
 }
 }
 
 
 </style>
 </style>