diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index 1a0f91d..ee7ce21 100644 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -26,15 +26,19 @@ class User extends AdminController public function list() { if(Request::isAjax()){ - $user = Db::name('user')->where(['delete_time'=>0])->select(); + $data = Request::only(['id','name','email','sex']); + $map = array_filter($data); + $user = Db::name('user')->where(['delete_time'=>0])->where($map)->order('id desc')->select(); $count = $user->count(); $res = []; - if($user){ - $res = ['code'=>0,'msg'=>'','count'=>$count]; + if($count){ foreach($user as $k => $v){ $data = ['id'=>$v['id'],'username'=>$v['name'],'avatar'=>$v['user_img'],'phone'=>$v['phone'],'email'=>$v['email'],'sex'=>$v['sex'],'ip'=>$v['last_login_ip'],'jointime'=>date("Y-m-d",$v['create_time']),'check'=>$v['status'],'auth'=>$v['auth']]; - $res['data'][] = $data; + //$res['data'][] = $data; + $res = ['code'=>0,'msg'=>'','count'=>$count,'data'=>[$data]]; } + } else { + $res = ['code'=>-1,'msg'=>'没有查询结果!']; } return json($res); } diff --git a/view/admin/user/list.html b/view/admin/user/list.html index e8bc49d..bc1466a 100644 --- a/view/admin/user/list.html +++ b/view/admin/user/list.html @@ -15,7 +15,7 @@