|
@@ -223,7 +223,6 @@ class User extends BaseController
|
|
|
'date'=> $start&&$stop ? date('Y/m/d',$start).'-'.date('Y/m/d',$stop) : '',
|
|
'date'=> $start&&$stop ? date('Y/m/d',$start).'-'.date('Y/m/d',$stop) : '',
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
'category' => 'award_range',
|
|
'category' => 'award_range',
|
|
|
- 'pm'=>$this->request->params('pm',true)
|
|
|
|
|
], $this->request->uid(), $page, $limit));
|
|
], $this->request->uid(), $page, $limit));
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|
|
@@ -241,8 +240,7 @@ class User extends BaseController
|
|
|
// 'award_integral' => $this->request->param('type', 0),
|
|
// 'award_integral' => $this->request->param('type', 0),
|
|
|
'date'=> $start&&$stop ? date('Y/m/d',$start).'-'.date('Y/m/d',$stop) : '',
|
|
'date'=> $start&&$stop ? date('Y/m/d',$start).'-'.date('Y/m/d',$stop) : '',
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
- 'category' => 'award_integral',
|
|
|
|
|
- 'pm'=>$this->request->params('pm',true)
|
|
|
|
|
|
|
+ 'category' => 'award_integral'
|
|
|
], $this->request->uid(), $page, $limit));
|
|
], $this->request->uid(), $page, $limit));
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|
