diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js index d97d71426..2f830689b 100755 --- a/resources/assets/js/functions/common.js +++ b/resources/assets/js/functions/common.js @@ -466,6 +466,15 @@ const timezone = require("dayjs/plugin/timezone"); return ua && /iphone|ipad|ipod|ios/.test(ua); }, + /** + * 是否iPad + * @returns {boolean|string} + */ + isIpad() { + let ua = typeof window !== 'undefined' && window.navigator.userAgent.toLowerCase(); + return ua && /ipad/.test(ua); + }, + /** * 是否安卓 * @returns {boolean|string} diff --git a/resources/assets/js/functions/eeui.js b/resources/assets/js/functions/eeui.js index 512ddd9f9..b1f100261 100755 --- a/resources/assets/js/functions/eeui.js +++ b/resources/assets/js/functions/eeui.js @@ -362,6 +362,18 @@ import {languageName} from "../language"; reject(e); } }) + }, + + // 判断是否窗口化 + eeuiAppIsWindowed() { + return new Promise(async resolve => { + try { + const eeui = await $A.eeuiModulePromise(); + resolve(eeui.isFullscreen() === false || eeui.isFullscreen() === 0); + } catch (e) { + resolve(false); + } + }) } }); diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 6f58737db..ffc16d335 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -177,7 +177,7 @@ export default { if (!state.isFirstPage) { return resolve(null) } - $A.eeuiAppGetSafeAreaInsets().then(data => { + $A.eeuiAppGetSafeAreaInsets().then(async data => { data.top = data.top || state.safeAreaSize?.data?.top || 0 data.bottom = data.bottom || state.safeAreaSize?.data?.bottom || 0 const proportion = data.height / window.outerHeight diff --git a/resources/mobile b/resources/mobile index 65fddcf2c..430291453 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit 65fddcf2cdfa4c5dbc9bef60a5c8b66575f2f30f +Subproject commit 4302914539ca3aae58e3724250abafa1a2124233