diff --git a/packages/uni-app-plus-nvue/dist/uni.js b/packages/uni-app-plus-nvue/dist/uni.js index 369a8a058ea7a434cbb14fd2480723bbe19c1c26..b5ce218e0e7d2d505f4d24873b6573406ca27934 100644 --- a/packages/uni-app-plus-nvue/dist/uni.js +++ b/packages/uni-app-plus-nvue/dist/uni.js @@ -6143,11 +6143,19 @@ let toast = false; let toastTimeout; function showLoading$1 (args) { - return showToast$1(args).replace('showToast', 'showLoading') + const ret = showToast$1(args); + if (ret && ret.errMsg) { + ret.errMsg = ret.errMsg.replace('showToast', 'showLoading'); + } + return ret } function hideLoading () { - return hideToast().replace('hideToast', 'hideLoading') + const ret = hideToast(); + if (ret && ret.errMsg) { + ret.errMsg = ret.errMsg.replace('hideToast', 'hideLoading'); + } + return ret } function showToast$1 ({ diff --git a/src/platforms/app-plus/service/api/device/system.js b/src/platforms/app-plus/service/api/device/system.js index 91920a7424a18c868006accdb0e5c0c6a7a75e18..fe06103b31fa0ab2d392f80939c81a9eaf4a062e 100644 --- a/src/platforms/app-plus/service/api/device/system.js +++ b/src/platforms/app-plus/service/api/device/system.js @@ -10,7 +10,11 @@ import { import tabbar from '../../framework/tabbar' -export function getSystemInfo (args) { +export function getSystemInfoSync () { + return getSystemInfo() +} + +export function getSystemInfo () { const platform = plus.os.name.toLowerCase() const ios = platform === 'ios' // 安卓 plus 接口获取的屏幕大小值不为整数,iOS js 获取的屏幕大小横屏时颠倒