From 7237957574b2cbbc0090697e9dd0741d3d2e1ee3 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Tue, 23 Jul 2019 16:32:11 +0800
Subject: [PATCH] fix showLoading returnValue

---
 src/platforms/app-plus/service/api/ui/popup.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/platforms/app-plus/service/api/ui/popup.js b/src/platforms/app-plus/service/api/ui/popup.js
index f339ab6ae..b0cc7d41d 100644
--- a/src/platforms/app-plus/service/api/ui/popup.js
+++ b/src/platforms/app-plus/service/api/ui/popup.js
@@ -8,11 +8,19 @@ let toast = false
 let toastTimeout
 
 export function showLoading (args) {
-  return showToast(args).replace('showToast', 'showLoading')
+  const ret = showToast(args)
+  if (ret && ret.errMsg) {
+    ret.errMsg = ret.errMsg.replace('showToast', 'showLoading')
+  }
+  return ret
 }
 
 export function hideLoading () {
-  return hideToast().replace('hideToast', 'hideLoading')
+  const ret = hideToast()
+  if (ret && ret.errMsg) {
+    ret.errMsg = ret.errMsg.replace('hideToast', 'hideLoading')
+  }
+  return ret
 }
 
 export function showToast ({
-- 
GitLab