From adf10a882ee565d6a5c37ba07a9e8ec2289ccf34 Mon Sep 17 00:00:00 2001
From: jazz <49930677+jxmanxk@users.noreply.github.com>
Date: 星期四, 03 三月 2022 17:55:17 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenshaoxiong/sms_center_backstage
---
src/utils/http.js | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/utils/http.js b/src/utils/http.js
index 0ee0f9d..b820a65 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -151,7 +151,11 @@
// o.baseUrl 鍩烘湰璺緞
// udData Object锛氬嵆userDefined Data 鐢ㄦ埛鑷畾涔夋暟鎹紝杩欐槸涓�涓墿灞曞瓧娈�
// fullData 杩欎釜瀛楁涓虹湡鐨勮瘽锛屽皢杩斿洖 鏈嶅姟绔繑鍥炵殑鎵�鏈夋暟鎹紝榛樿杩斿洖data
- requestArr.push(request_o) // 灏嗚姹傚姞鍏ユ暟缁�
+ // 20210303 long 浼樺寲璇锋眰缁撴潫loading 灏唍oLoading涓嶈绠楀璇锋眰鏁扮粍
+ if (request_o && (!request_o.udData || !request_o.udData.noLoading)) {
+ requestArr.push(request_o) // 灏嗚姹傚姞鍏ユ暟缁�
+ }
+ // requestArr.push(request_o) // 灏嗚姹傚姞鍏ユ暟缁�
if (http_o.startRequest) {
http_o.startRequest(http_o, request_o) // 浜嬩欢濮旀墭,璇锋眰涔嬪墠
}
@@ -177,7 +181,10 @@
// ...urlEncodes,
}
// // 灏嗚姹傚弬鏁版斁鍒伴摼鎺ュ悗闈�
- var paramsUrl = urlEncode(urlEncodes).replace('&', '?')
+ var paramsUrl = urlEncode(urlEncodes)
+ if (!/\?/.test(ajaxUrl)) {
+ paramsUrl = paramsUrl.replace('&', '?')
+ }
ajaxUrl = ajaxUrl + paramsUrl
// console.log(ajaxUrl)
--
Gitblit v1.8.0