|
|
@@ -218,11 +218,13 @@ class User extends BaseController
|
|
|
{
|
|
|
[$page, $limit] = $this->getPage();
|
|
|
[$start,$stop]= $this->request->params(['start','stop'],true);
|
|
|
+ $pm = $this->request->param('pm', 0);
|
|
|
return app('json')->success($billRepository->userList([
|
|
|
// 'award_range' => $this->request->param('type', 0),
|
|
|
'date'=> $start&&$stop ? date('Y/m/d',$start).'-'.date('Y/m/d',$stop) : '',
|
|
|
'status' => 1,
|
|
|
'category' => 'award_range',
|
|
|
+ 'pm'=> $pm
|
|
|
], $this->request->uid(), $page, $limit));
|
|
|
}
|
|
|
/**
|
|
|
@@ -236,11 +238,13 @@ class User extends BaseController
|
|
|
{
|
|
|
[$page, $limit] = $this->getPage();
|
|
|
[$start,$stop]= $this->request->params(['start','stop'],true);
|
|
|
+ $pm = $this->request->param('pm', 0);
|
|
|
return app('json')->success($billRepository->userList([
|
|
|
// 'award_integral' => $this->request->param('type', 0),
|
|
|
'date'=> $start&&$stop ? date('Y/m/d',$start).'-'.date('Y/m/d',$stop) : '',
|
|
|
'status' => 1,
|
|
|
- 'category' => 'award_integral'
|
|
|
+ 'category' => 'award_integral',
|
|
|
+ 'pm'=> $pm
|
|
|
], $this->request->uid(), $page, $limit));
|
|
|
}
|
|
|
/**
|