From fa7478b01b19f3e4ef0153d7e2398a27b7c9e032 Mon Sep 17 00:00:00 2001
From: chenghx <chenghx@nfex.com>
Date: Thu, 9 Aug 2018 14:06:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AGlobalHeader=20not=20show;=20Global?=
 =?UTF-8?q?Layout#content=20minHeight=20not=20correct?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/GlobalLayout.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/layout/GlobalLayout.vue b/src/components/layout/GlobalLayout.vue
index 1651c32..8767c2f 100644
--- a/src/components/layout/GlobalLayout.vue
+++ b/src/components/layout/GlobalLayout.vue
@@ -10,12 +10,12 @@
       <i-menu :collapsed="collapsed" :menuData="menuData" />
     </a-layout-sider>
     <a-layout>
-      <gloabl-header :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
+      <global-header :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
       <a-layout-content :style="{minHeight: minHeight, margin: '24px 24px 0'}">
         <slot></slot>
       </a-layout-content>
       <a-layout-footer style="padding: 0px">
-        <gloabl-footer />
+        <global-footer />
       </a-layout-footer>
     </a-layout>
   </a-layout>
@@ -32,7 +32,7 @@ const ALayoutSider = ALayout.Sider
 const ALayoutHeader = ALayout.Header
 const ALayoutContent = ALayout.Content
 const ALayoutFooter = ALayout.Footer
-const minHeight = window.innerHeight - 64 - 48
+const minHeight = window.innerHeight - 64 - 24 - 122
 
 let menuData = []