From ac14b5116c10cdc2007f6e6604d7eb21122cc1fd Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Thu, 14 Nov 2019 18:25:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20H5=E7=AB=AF=E8=B0=83=E7=94=A8uni.getSyst?=
 =?UTF-8?q?emInfoSync=E5=9C=A8=E5=88=9D=E5=A7=8B=E5=8C=96=E5=89=8D?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/service/plugins/app/create-app.js             | 8 +++++---
 src/platforms/h5/service/api/device/get-system-info.js | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/core/service/plugins/app/create-app.js b/src/core/service/plugins/app/create-app.js
index bab7aa48b..4b71821ba 100644
--- a/src/core/service/plugins/app/create-app.js
+++ b/src/core/service/plugins/app/create-app.js
@@ -6,11 +6,13 @@ export function getApp () {
   return appVm
 }
 
-export function getCurrentPages (isAll = false) {
+export function getCurrentPages (isAll = false, ignoreError = false) {
   const pages = []
   const app = getApp()
   if (!app) {
-    console.error('app is not ready')
+    if (ignoreError) {
+      console.error('app is not ready')
+    }
     return []
   }
   const childrenVm = app.$children[0]
@@ -62,4 +64,4 @@ export default function createApp (vm, routes) {
 
   // initEvents(appVm)
   initRouterGuard(appVm, routes)
-}
+}
diff --git a/src/platforms/h5/service/api/device/get-system-info.js b/src/platforms/h5/service/api/device/get-system-info.js
index 0bb3f96a5..5988c9fe0 100644
--- a/src/platforms/h5/service/api/device/get-system-info.js
+++ b/src/platforms/h5/service/api/device/get-system-info.js
@@ -84,7 +84,7 @@ export function getSystemInfoSync () {
   const {
     top: windowTop,
     bottom: windowBottom
-  } = getWindowOffset()
+  } = getWindowOffset(false, true)
 
   windowHeight -= windowTop
   windowHeight -= windowBottom
-- 
GitLab