From b9f0be8a0944349267062f1f7d4eca5ce97550d3 Mon Sep 17 00:00:00 2001 From: DCloud_LXH <283700113@qq.com> Date: Mon, 19 Apr 2021 11:09:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(H5):=20=E8=AE=BE=E7=BD=AEtabbar=E9=AB=98?= =?UTF-8?q?=E5=BA=A6=E5=90=8E=EF=BC=8CgetSystemInfoSync()=E8=8E=B7?= =?UTF-8?q?=E5=8F=96windowBottom=E7=9A=84=E9=AB=98=E5=BA=A6=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20=20question/121154?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/platforms/h5/view/bridge/subscribe/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/platforms/h5/view/bridge/subscribe/index.js b/src/platforms/h5/view/bridge/subscribe/index.js index 900d2f2c5..7c51cc5ec 100644 --- a/src/platforms/h5/view/bridge/subscribe/index.js +++ b/src/platforms/h5/view/bridge/subscribe/index.js @@ -23,10 +23,11 @@ const passiveOptions = supportsPassive ? { function updateCssVar (vm) { if (uni.canIUse('css.var')) { + const uniConfigTabbarHeight = parseFloat(__uniConfig.tabBar.height) const pageVm = vm.$parent.$parent const navigationBarType = pageVm.navigationBar.type const windowTopValue = navigationBarType === 'default' || navigationBarType === 'float' ? NAVBAR_HEIGHT : 0 - const windowBottomValue = getApp().$children[0].showTabBar ? TABBAR_HEIGHT : 0 + const windowBottomValue = getApp().$children[0].showTabBar ? isNaN(uniConfigTabbarHeight) ? TABBAR_HEIGHT : uniConfigTabbarHeight : 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))` : `${windowTopValue}px` @@ -87,4 +88,4 @@ export default function initSubscribe (subscribe) { }) } }) -} +} -- GitLab