diff --git a/src/core/service/plugins/app/create-app.js b/src/core/service/plugins/app/create-app.js index bab7aa48b66dc1c651c6ed934235550a92beaf25..4b71821ba2d47ff7e8edac5cca27a2c331f4f37b 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 0bb3f96a558db473ad08bc217def20769b6fdf50..5988c9fe002409c599378da71f2ca6f36089b6a6 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