|
@@ -97,16 +97,17 @@ class Message extends Api
|
|
public function getMessage(){
|
|
public function getMessage(){
|
|
$post=$this->request->post();
|
|
$post=$this->request->post();
|
|
$user = User::getByUserId($post['user_id']);
|
|
$user = User::getByUserId($post['user_id']);
|
|
|
|
+ $config['page']=$post['page'];
|
|
$data=array();
|
|
$data=array();
|
|
if($user){
|
|
if($user){
|
|
$wheres['group_id']=$user->group_id;
|
|
$wheres['group_id']=$user->group_id;
|
|
$wheres['status']=2;
|
|
$wheres['status']=2;
|
|
- $list = Db::name('message')->where($wheres)->order('id')->select();
|
|
|
|
|
|
+ $list = Db::name('message')->where($wheres)->order('id')->paginate(1,'',$config);
|
|
if($list){
|
|
if($list){
|
|
foreach ($list as $k=>$v){
|
|
foreach ($list as $k=>$v){
|
|
$data[$k]['message_id']=$v['id'];
|
|
$data[$k]['message_id']=$v['id'];
|
|
$data[$k]['imgUrl']='';
|
|
$data[$k]['imgUrl']='';
|
|
- $data[$k]['time']=$v['sendtime'];
|
|
|
|
|
|
+ $data[$k]['time']=date('Y-m-d H:i A');
|
|
$data[$k]['title']=$v['template_name'];
|
|
$data[$k]['title']=$v['template_name'];
|
|
$data[$k]['des']=$v['template_dsc'];
|
|
$data[$k]['des']=$v['template_dsc'];
|
|
$data[$k]['push_type']=$v['type'];
|
|
$data[$k]['push_type']=$v['type'];
|