mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 15:12:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化Response::success/error()，支持$msg传入数字作为code

Browse Source
This commit is contained in:
huangdijia
2015-12-24 12:30:00 +08:00
parent 1f593930af
commit 777b990fc9
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
library/think/response.php
View File

@@ -165,16 +165,21 @@ class Response
*/ */
public static function success($msg = '', $data = '', $url = '', $wait = 3) public static function success($msg = '', $data = '', $url = '', $wait = 3)
{ {
$result = [ $code = 1;
'code' => 1, if(is_numeric($msg)){
$code = $msg;
$msg = '';
}
$result = [
'code' => $code,
'msg' => $msg, 'msg' => $msg,
'data' => $data, 'data' => $data,
'url' => $url ?: $_SERVER["HTTP_REFERER"], 'url' => $url ?: $_SERVER["HTTP_REFERER"],
'wait' => $wait, 'wait' => $wait,
]; ];
$type = Config::get('default_return_type'); $type = Config::get('default_return_type');
if (IS_AJAX) { if (IS_AJAX) {
$type = Config::get('default_ajax_return'); $type = Config::get('default_ajax_return');
} }
if ('html' == $type) { if ('html' == $type) {
$result = \think\View::getInstance()->fetch(Config::get('dispatch_jump_tmpl'), $result); $result = \think\View::getInstance()->fetch(Config::get('dispatch_jump_tmpl'), $result);
@@ -194,16 +199,21 @@ class Response
*/ */
public static function error($msg = '', $data = '', $url = '', $wait = 3) public static function error($msg = '', $data = '', $url = '', $wait = 3)
{ {
$result = [ $code = 0;
'code' => 0, if(is_numeric($msg)){
$code = $msg;
$msg = '';
}
$result = [
'code' => $code,
'msg' => $msg, 'msg' => $msg,
'data' => $data, 'data' => $data,
'url' => $url ?: 'javascript:history.back(-1);', 'url' => $url ?: 'javascript:history.back(-1);',
'wait' => $wait, 'wait' => $wait,
]; ];
$type = Config::get('default_return_type'); $type = Config::get('default_return_type');
if (IS_AJAX) { if (IS_AJAX) {
$type = Config::get('default_ajax_return'); $type = Config::get('default_ajax_return');
} }
if ('html' == $type) { if ('html' == $type) {
$result = \think\View::getInstance()->fetch(Config::get('dispatch_jump_tmpl'), $result); $result = \think\View::getInstance()->fetch(Config::get('dispatch_jump_tmpl'), $result);