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

页面跳转的error和success模板分开 \think\controller类添加result方法 用于单独返回不同格式的api数据

Browse Source
This commit is contained in:
thinkphp
2016-02-14 22:48:14 +08:00
parent f637f06e0d
commit 00f226a6f9
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
convention.php
View File

@@ -91,7 +91,8 @@ return [
// +----------------------------------------------------------------------
// 默认跳转页面对应的模板文件
'dispatch_jump_tmpl' => THINK_PATH . 'tpl' . DS . 'dispatch_jump.tpl',
'dispatch_success_tmpl' => THINK_PATH . 'tpl' . DS . 'dispatch_jump.tpl',
'dispatch_error_tmpl' => THINK_PATH . 'tpl' . DS . 'dispatch_jump.tpl',
// 默认的模板引擎
'template_engine' => 'Think',

4
library/think/Response.php
View File

@@ -181,7 +181,7 @@ class Response
$type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type');
if ('html' == $type) {
$result = \think\View::instance()->fetch(Config::get('dispatch_jump_tmpl'), $result);
$result = \think\View::instance()->fetch(Config::get('dispatch_success_tmpl'), $result);
}
self::type($type);
return $result;
@@ -214,7 +214,7 @@ class Response
$type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type');
if ('html' == $type) {
$result = \think\View::instance()->fetch(Config::get('dispatch_jump_tmpl'), $result);
$result = \think\View::instance()->fetch(Config::get('dispatch_error_tmpl'), $result);
}
self::type($type);
return $result;

14
library/traits/controller/Jump.php
View File

@@ -46,6 +46,20 @@ trait Jump
return Response::success($msg, $data, $url, $wait);
}
/**
* 返回封装后的API数据到客户端
* @access public
* @param mixed $data 要返回的数据
* @param integer $code 返回的code
* @param mixed $msg 提示信息
* @param string $type 返回数据格式
* @return mixed
*/
public function result($data, $code = 0, $msg = '', $type = '')
{
return Response::result($data, $code, $msg, $type);
}
/**
* URL重定向
* @access protected