mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

!23 活跃 

Merge pull request !23 from Chao Xing/xingchao
pull/58/head
Chao Xing 2018-05-06 11:01:09 +08:00
parent 58cbe6d19e 5ab960492c
commit f57eb0be7c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/api/controller/Live.php
View File

@ -35,8 +35,7 @@ class Live extends Api
// if ($this->request->isAjax()) // if ($this->request->isAjax())
// { // {
//如果发送的来源是Selectpage，则转发到Selectpage //如果发送的来源是Selectpage，则转发到Selectpage
if ($this->request->request('pkey_name')) if ($this->request->request('pkey_name')) {
{
return $this->selectpage(); return $this->selectpage();
} }
@ -45,11 +44,12 @@ class Live extends Api
if ($this->request->param("status")) { if ($this->request->param("status")) {
$where['status'] = $this->request->param("status"); $where = array(
'status' => $this->request->param("status"),
);
} }
$total = $this->model $total = $this->model
->where($where) ->where($where)
->order($sort, $order) ->order($sort, $order)
@ -73,7 +73,7 @@ class Live extends Api
/** /**
* 无需登录的接口 * 无需登录的接口
* *
*/ */
public function test1() public function test1()
{ {
@ -82,7 +82,7 @@ class Live extends Api
/** /**
* 需要登录的接口 * 需要登录的接口
* *
*/ */
public function test2() public function test2()
{ {
@ -92,7 +92,7 @@ class Live extends Api
/** /**
* 需要登录且需要验证有相应组的权限 * 需要登录且需要验证有相应组的权限
* *
*/ */
public function test3() public function test3()
{ {