|
@@ -68,7 +68,7 @@ class Award extends BaseController
|
|
|
$where = $this->request->params(['type']);
|
|
$where = $this->request->params(['type']);
|
|
|
$list=$this->repository->getLakeList($where, $page, $limit);
|
|
$list=$this->repository->getLakeList($where, $page, $limit);
|
|
|
foreach ($list['list'] as $k=>&$v){
|
|
foreach ($list['list'] as $k=>&$v){
|
|
|
- $list['list'][$k]['send_time'] = date('Y-m-d H:i:s',$list['list'][$k]['add_time']);
|
|
|
|
|
|
|
+ $list['list'][$k]['send_time'] = date('Y-m-d H:i:s',$list['list'][$k]['send_time']);
|
|
|
}
|
|
}
|
|
|
return app('json')->success($list);
|
|
return app('json')->success($list);
|
|
|
}
|
|
}
|
|
@@ -82,7 +82,7 @@ class Award extends BaseController
|
|
|
{
|
|
{
|
|
|
[$page, $limit] = $this->getPage();
|
|
[$page, $limit] = $this->getPage();
|
|
|
$where = $this->request->params(['type','pm']);
|
|
$where = $this->request->params(['type','pm']);
|
|
|
- return app('json')->success($this->repository->getLakeList($where, $page, $limit));
|
|
|
|
|
|
|
+ return app('json')->success($this->repository->getLakeLogList($where, $page, $limit));
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|
|
|
* 列表
|
|
* 列表
|
