From 4c824e0543639a7fcdcfcb822780671dab1d9fc2 Mon Sep 17 00:00:00 2001 From: Devil Date: Fri, 6 Aug 2021 13:18:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=AE=89=E8=A3=85=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/admin/default/js/packageinstall.js | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/public/static/admin/default/js/packageinstall.js b/public/static/admin/default/js/packageinstall.js index 0d2843bb1..7e2b26b7a 100644 --- a/public/static/admin/default/js/packageinstall.js +++ b/public/static/admin/default/js/packageinstall.js @@ -84,7 +84,26 @@ function RequestHandle(key, opt, msg) { $progress.addClass('am-hide'); $error.removeClass('am-hide'); - $error.find('.msg-text').text(HtmlToString(xhr.responseText) || '异常错误'); + var data = null; + if((xhr.responseJSON || null) != null && (xhr.responseJSON.msg || null) != null) + { + data = xhr.responseJSON; + } else { + if(xhr.responseText.substr(0, 1) == '{') + { + var json = JSON.parse(xhr.responseText); + if((json.msg || null) != null) + { + data = json; + } else { + data = xhr.responseText; + } + } else { + data = xhr.responseText; + } + } + var msg = (typeof(data) == 'object') ? data.msg : data; + $error.find('.msg-text').text(msg || '异常错误'); } }); }