From c75decade48ddba1151b075b3122b1e31e14198f Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Tue, 23 Jul 2019 16:36:08 +0800
Subject: [PATCH] add getSystemInfoSync

---
 packages/uni-app-plus-nvue/dist/uni.js              | 12 ++++++++++--
 src/platforms/app-plus/service/api/device/system.js |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/uni-app-plus-nvue/dist/uni.js b/packages/uni-app-plus-nvue/dist/uni.js
index 369a8a058..b5ce218e0 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 91920a742..fe06103b3 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 获取的屏幕大小横屏时颠倒
-- 
GitLab