From 59bb834da847149704ded8e1a30a4db2ab86bbfa Mon Sep 17 00:00:00 2001
From: iczer <1126263215@qq.com>
Date: Sat, 17 Oct 2020 16:39:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20the=20problem=20of=20calculating=20minim?=
 =?UTF-8?q?um=20height=20of=20page;=20:bug:=20=E4=BF=AE=E5=A4=8D=EF=BC=9A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9=E6=9C=80=E5=B0=8F=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/AdminLayout.vue       | 14 +++++++-------
 src/layouts/footer/PageFooter.vue |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/layouts/AdminLayout.vue b/src/layouts/AdminLayout.vue
index 4c8640c..afea985 100644
--- a/src/layouts/AdminLayout.vue
+++ b/src/layouts/AdminLayout.vue
@@ -14,8 +14,8 @@
     <a-layout class="admin-layout-main beauty-scroll">
       <admin-header :class="[{'fixed-tabs': fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" :style="headerStyle" :menuData="headMenuData" :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
       <a-layout-header :class="['virtual-header', {'fixed-tabs' : fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" v-show="fixedHeader"></a-layout-header>
-      <a-layout-content class="admin-layout-content">
-        <div :style="`min-height: ${minHeight}px; position: relative`">
+      <a-layout-content class="admin-layout-content" :style="`min-height: ${minHeight}px;`">
+        <div style="position: relative">
           <slot></slot>
         </div>
       </a-layout-content>
@@ -34,14 +34,14 @@ import SideMenu from '../components/menu/SideMenu'
 import Setting from '../components/setting/Setting'
 import {mapState, mapMutations, mapGetters} from 'vuex'
 
-const minHeight = window.innerHeight - 64 - 24 - 122
+// const minHeight = window.innerHeight - 64 - 122
 
 export default {
   name: 'AdminLayout',
   components: {Setting, SideMenu, Drawer, PageFooter, AdminHeader},
   data () {
     return {
-      minHeight: minHeight,
+      minHeight: window.innerHeight - 64 - 122,
       collapsed: false,
       showSetting: false,
       drawerOpen: false
@@ -109,11 +109,11 @@ export default {
     }
   },
   created() {
-    this.correctPageMinHeight(minHeight - 1)
+    this.correctPageMinHeight(this.minHeight - 24)
     this.setActivated(this.$route)
   },
   beforeDestroy() {
-    this.correctPageMinHeight(-minHeight + 1)
+    this.correctPageMinHeight(-this.minHeight + 24)
   }
 }
 </script>
@@ -152,7 +152,7 @@ export default {
     .admin-layout-content{
       padding: 24px 24px 0;
       /*overflow-x: hidden;*/
-      min-height: calc(100vh - 64px - 122px);
+      /*min-height: calc(100vh - 64px - 122px);*/
     }
     .setting{
       background-color: @primary-color;
diff --git a/src/layouts/footer/PageFooter.vue b/src/layouts/footer/PageFooter.vue
index c6d6d5d..6689c1c 100644
--- a/src/layouts/footer/PageFooter.vue
+++ b/src/layouts/footer/PageFooter.vue
@@ -20,8 +20,8 @@ export default {
 
 <style lang="less" scoped>
   .footer{
-    padding: 0 16px;
-    margin: 48px 0 24px;
+    padding: 48px 16px 24px;
+    /*margin: 48px 0 24px;*/
     text-align: center;
     .copyright{
       color: @text-color-second;