From f479c38f486ce27a1081244592bdf130e4fda3ec Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Wed, 11 Mar 2020 16:12:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DApp=E9=9D=9EtabBar?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BD=BF=E7=94=A8=E5=8E=9F=E7=94=9F=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E5=8C=BA=E5=8D=A0=E4=BD=8D=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E8=8E=B7=E5=8F=96=E7=9A=84=E7=AA=97=E5=8F=A3=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E9=94=99=E8=AF=AF=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/app-plus/service/api/device/system.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/platforms/app-plus/service/api/device/system.js b/src/platforms/app-plus/service/api/device/system.js
index e41dcf0723..12b2bc12ab 100644
--- a/src/platforms/app-plus/service/api/device/system.js
+++ b/src/platforms/app-plus/service/api/device/system.js
@@ -52,9 +52,13 @@ export function getSystemInfo () {
   }
   const windowTop = titleNView.cover ? titleNView.height : 0
   const windowBottom = tabBarView.cover ? tabBarView.height : 0
-  const windowHeight = screenHeight - titleNView.height - tabBarView.height
-  const windowHeightReal = screenHeight - (titleNView.cover ? 0 : titleNView.height) - (tabBarView.cover ? 0 : tabBarView.height)
+  let windowHeight = screenHeight - titleNView.height - tabBarView.height
+  let windowHeightReal = screenHeight - (titleNView.cover ? 0 : titleNView.height) - (tabBarView.cover ? 0 : tabBarView.height)
   const windowWidth = screenWidth
+  if ((!tabBarView.height || tabBarView.cover) && !safeAreaInsets.bottom && safeAreaInsets.deviceBottom) {
+    windowHeight -= safeAreaInsets.deviceBottom
+    windowHeightReal -= safeAreaInsets.deviceBottom
+  }
   safeAreaInsets = ios ? safeAreaInsets : {
     left: 0,
     right: 0,
-- 
GitLab