From 5b18ce3c34189c00565ccaed442de07e01ad06e3 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 7 Jan 2020 14:47:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96H5=E7=AB=AF=20css=20?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/h5/components/app/index.vue       | 6 ++++--
 src/platforms/h5/view/bridge/subscribe/index.js | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/platforms/h5/components/app/index.vue b/src/platforms/h5/components/app/index.vue
index 3dc0fca7..d7166c53 100644
--- a/src/platforms/h5/components/app/index.vue
+++ b/src/platforms/h5/components/app/index.vue
@@ -73,7 +73,9 @@ export default {
     hideTabBar (newVal, oldVal) {
       // TODO 不支持 css 变量时
       if (uni.canIUse('css.var')) {
-        const windowBottom = !newVal ? (TABBAR_HEIGHT + 'px') : '0px'
+        const windowBottomValue = !newVal ? (TABBAR_HEIGHT) : 0
+        const envMethod = uni.canIUse('css.env') ? 'env' : (uni.canIUse('css.constant') ? 'constant' : '')
+        const windowBottom = windowBottomValue && envMethod ? `calc(${windowBottomValue}px + ${envMethod}(safe-area-inset-bottom))` : `${windowBottomValue}px`
         document.documentElement.style.setProperty('--window-bottom', windowBottom)
         console.debug(`uni.${windowBottom ? 'showTabBar' : 'hideTabBar'}：--window-bottom=${windowBottom}`)
       }
@@ -103,7 +105,7 @@ export default {
 }
 </script>
 
-<style>
+<style>
   @import "~uni-core/view/index.css";
 	uni-app {
 		display: block;
diff --git a/src/platforms/h5/view/bridge/subscribe/index.js b/src/platforms/h5/view/bridge/subscribe/index.js
index 4aa2157b..8f8f7ed0 100644
--- a/src/platforms/h5/view/bridge/subscribe/index.js
+++ b/src/platforms/h5/view/bridge/subscribe/index.js
@@ -28,8 +28,8 @@ function updateCssVar (vm) {
     const windowTopValue = navigationBarType === 'default' || navigationBarType === 'float' ? NAVBAR_HEIGHT : 0
     const windowBottomValue = getApp().$children[0].showTabBar ? TABBAR_HEIGHT : 0
     const envMethod = uni.canIUse('css.env') ? 'env' : (uni.canIUse('css.constant') ? 'constant' : '')
-    const windowTop = windowTopValue && envMethod ? `calc(${windowTopValue}px + ${envMethod}(safe-area-inset-top))` : '0px'
-    const windowBottom = windowBottomValue && envMethod ? `calc(${windowBottomValue}px + ${envMethod}(safe-area-inset-bottom))` : '0px'
+    const windowTop = windowTopValue && envMethod ? `calc(${windowTopValue}px + ${envMethod}(safe-area-inset-top))` : `${windowTopValue}0px`
+    const windowBottom = windowBottomValue && envMethod ? `calc(${windowBottomValue}px + ${envMethod}(safe-area-inset-bottom))` : `${windowBottomValue}px`
     const style = document.documentElement.style
     style.setProperty('--window-top', windowTop)
     style.setProperty('--window-bottom', windowBottom)
-- 
GitLab