From af8160738cdc88c4488e01319b80f7ff194abb7d Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Mon, 4 Mar 2019 18:17:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E9=80=8F=E6=98=8E=E6=B8=90=E5=8F=98=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/h5/components/page/pageBody.vue | 4 ++--
 src/platforms/h5/components/page/pageHead.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/platforms/h5/components/page/pageBody.vue b/src/platforms/h5/components/page/pageBody.vue
index 329f392e2..ecb0ec9cf 100644
--- a/src/platforms/h5/components/page/pageBody.vue
+++ b/src/platforms/h5/components/page/pageBody.vue
@@ -12,7 +12,7 @@ uni-page-wrapper {
   position: relative;
 }
 
-uni-page-head ~ uni-page-wrapper {
+uni-page-head[uni-page-head-type="default"] ~ uni-page-wrapper {
   height: calc(100% - 44px);
 }
 
@@ -28,7 +28,7 @@ uni-page-head ~ uni-page-wrapper {
   height: 50px;
 }
 
-.uni-app--showtabbar uni-page-head ~ uni-page-wrapper {
+.uni-app--showtabbar uni-page-head[uni-page-head-type="default"] ~ uni-page-wrapper {
   height: calc(100% - 44px - 50px);
 }
 
diff --git a/src/platforms/h5/components/page/pageHead.vue b/src/platforms/h5/components/page/pageHead.vue
index 0d675d8a3..a95bf6a40 100644
--- a/src/platforms/h5/components/page/pageHead.vue
+++ b/src/platforms/h5/components/page/pageHead.vue
@@ -1,5 +1,5 @@
 <template>
-  <uni-page-head>
+  <uni-page-head :uni-page-head-type="type">
     <div
       :style="{transitionDuration:duration,transitionTimingFunction:timingFunc,backgroundColor:bgColor,color:textColor}"
       :class="{'uni-page-head-transparent':type==='transparent'}"
-- 
GitLab