From 139f17407dc455638b3923937d54e78d605fb5ee Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 15 Dec 2021 15:15:26 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less          | 2 +-
 src/components/layouts/TabLayout.vue | 2 +-
 src/components/page/GlobalLayout.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index c9e6619..46372c9 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -105,7 +105,7 @@
 
 //页面边距
 .main-box {
-  margin: 12px 12px 0 12px;
+  //margin: 12px 12px 0 12px;
 }
 
 // 封装的列表组件中项目名称的样式
diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index 8be8805..1353c6f 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -18,7 +18,7 @@
         <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
       </a-tab-pane>
     </a-tabs>
-    <div style=" overflow: auto">
+    <div style=" overflow: auto; margin: 12px 12px 0 12px;">
       <!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 -->
       <div>
         <keep-alive v-if="multipage && $route.meta.keepAlive">
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 1adb73f..1452577 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -191,7 +191,7 @@ body {
 }
 
 .layout {
-  min-height: calc(100vh - 10px) !important;
+  min-height: 100vh !important;
   overflow-x: hidden;
 
   &.mobile {