From 010fd3f2404ddf10ce5da23ca3cb7f6b18914e5b Mon Sep 17 00:00:00 2001 From: augushong Date: Mon, 14 Apr 2025 19:46:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9cod?= =?UTF-8?q?e=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C0=E4=B8=BA=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=EF=BC=8C500=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E5=85=B6=E4=BB=96=E6=95=B0=E5=80=BC=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/base/common/tpl/dispatch_jump.tpl | 2 +- extend/base/common/traits/JumpTraitBase.php | 8 ++++---- extend/base/helper.php | 2 +- public/static/plugs/lay-module/layuimini/miniAdmin.js | 2 +- public/static/plugs/ulthon-admin/ulthon-admin.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extend/base/common/tpl/dispatch_jump.tpl b/extend/base/common/tpl/dispatch_jump.tpl index 1895f62..cb56b29 100644 --- a/extend/base/common/tpl/dispatch_jump.tpl +++ b/extend/base/common/tpl/dispatch_jump.tpl @@ -27,7 +27,7 @@
diff --git a/extend/base/common/traits/JumpTraitBase.php b/extend/base/common/traits/JumpTraitBase.php index 5928a6c..b8ec900 100644 --- a/extend/base/common/traits/JumpTraitBase.php +++ b/extend/base/common/traits/JumpTraitBase.php @@ -20,7 +20,7 @@ trait JumpTraitBase * @return void * @throws HttpResponseException */ - protected function success($msg = '', $data = '', $url = null, $wait = 3, array $header = []) + protected function success($msg = '', $data = '', $url = null, $code = 0, $wait = 3, array $header = []) { if (is_null($url) && isset($_SERVER['HTTP_REFERER'])) { $url = $_SERVER['HTTP_REFERER']; @@ -29,7 +29,7 @@ trait JumpTraitBase } $result = [ - 'code' => 1, + 'code' => $code, 'msg' => $msg, 'data' => $data, 'url' => $url, @@ -59,7 +59,7 @@ trait JumpTraitBase * @return void * @throws HttpResponseException */ - protected function error($msg = '', $data = '', $url = null, $wait = 3, array $header = []) + protected function error($msg = '', $data = '', $url = null, $code = 500, $wait = 3, array $header = []) { if (is_null($url)) { $url = request()->isAjax() ? '' : 'javascript:history.back(-1);'; @@ -69,7 +69,7 @@ trait JumpTraitBase $type = $this->getResponseType(); $result = [ - 'code' => 0, + 'code' => $code, 'msg' => $msg, 'data' => $data, 'url' => $url, diff --git a/extend/base/helper.php b/extend/base/helper.php index d43419e..fc5bbe5 100644 --- a/extend/base/helper.php +++ b/extend/base/helper.php @@ -190,7 +190,7 @@ function json_message($data = [], $code = 0, $msg = '') 'jump_to_url' => $data, ]; } else { - $code = $code === 0 ? 500 : $code; + $code = $code; $msg = $data; $data = []; } diff --git a/public/static/plugs/lay-module/layuimini/miniAdmin.js b/public/static/plugs/lay-module/layuimini/miniAdmin.js index 3d5b8e5..dcab13e 100644 --- a/public/static/plugs/lay-module/layuimini/miniAdmin.js +++ b/public/static/plugs/lay-module/layuimini/miniAdmin.js @@ -258,7 +258,7 @@ if (clearUrl != undefined && clearUrl != '' && clearUrl != null) { $.getJSON(clearUrl, function (data, status) { layer.close(loading); - if (data.code != 1) { + if (data.code != 0) { return miniAdmin.error(data.msg); } else { return miniAdmin.success(data.msg); diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js index ac56a3a..63b0d6a 100644 --- a/public/static/plugs/ulthon-admin/ulthon-admin.js +++ b/public/static/plugs/ulthon-admin/ulthon-admin.js @@ -2417,7 +2417,7 @@ multiple: uploadNumber !== 'one',//是否多文件上传 headers: admin.headers(), done: function (res) { - if (res.code === 1) { + if (res.code === 0) { var url = res.data.url; var filename = res.data.original_name; if (uploadNumber !== 'one') {