diff --git a/app/controller/AdminUser.php b/app/controller/AdminUser.php new file mode 100644 index 0000000..b15a37d --- /dev/null +++ b/app/controller/AdminUser.php @@ -0,0 +1,12 @@ + $agentData['id']]; + + $UserModel = new UserModel(); + + # 用户id / 手机号码查询 + if (isset($request['title']) && !empty($request['title'])) { + $queryUser = $UserModel + ->whereOr(['phone' => $request['title'], 'id' => $request['title']]) + ->field('id') + ->select() + ->toArray(); + if ($queryUser) { + foreach ($queryUser as $queryUserRow) { + $where['id'][] = $queryUserRow['id']; + } + } else { + $where['id'] = 0; + } + } + + # 查询用户列表 + $field = 'id,aid,phone,avatar,balance,withdrawal_balance'; + $userRes = $UserModel->field($field)->where($where)->order('id desc')->paginate($limit); + + $list = $userRes->items(); + $total = $userRes->total(); + + foreach ($list as &$item) { + + $item['phone'] = format_phone_number($item['phone']); + $item['avatar'] = get_image_url($item['avatar']); + } + + return $this->renderSuccess('数据返回成功',['list' => $list, 'total' => $total]); + } /** * 上分 diff --git a/app/controller/User.php b/app/controller/User.php index 94cb0a6..a75ba5a 100644 --- a/app/controller/User.php +++ b/app/controller/User.php @@ -12,58 +12,6 @@ use think\facade\Session; class User extends BaseController { - /** - * 获取用户列表 - * @param Request $request - * @return array - * @throws \think\db\exception\DbException - */ - public function userList() - { - $request = Request::param(); - - $limit = $request['limit'] ?? 10; - - $where = []; - - $UserModel = new UserModel(); - - # 用户id / 手机号码查询 - if (isset($request['title']) && !empty($request['title'])) { - $queryUser = $UserModel - ->whereOr(['phone' => $request['title'], 'id' => $request['title']]) - ->field('id') - ->select() - ->toArray(); - if ($queryUser) { - foreach ($queryUser as $queryUserRow) { - $where['id'][] = $queryUserRow['id']; - } - } else { - $where['id'] = 0; - } - } - # 代理id查询 - if ($agentData = Session::get('login_agent_user_data')) { - $where['aid'] = $agentData['id']; - } - - # 查询用户列表 - $field = 'id,aid,phone,avatar,balance,withdrawal_balance'; - $userRes = $UserModel->field($field)->where($where)->order('id desc')->paginate($limit); - - $list = $userRes->items(); - $total = $userRes->total(); - - foreach ($list as &$item) { - - $item['phone'] = format_phone_number($item['phone']); - $item['avatar'] = get_image_url($item['avatar']); - } - - return $this->renderSuccess('数据返回成功',['list' => $list, 'total' => $total]); - } - /** * 找回密码 * @return array diff --git a/route/app.php b/route/app.php index 17168ec..831b144 100644 --- a/route/app.php +++ b/route/app.php @@ -11,6 +11,7 @@ use think\facade\Route; use app\middleware\CheckUser; use app\middleware\CheckAgent; +use app\middleware\CheckAdmin; # 登陆注册 Route::group('passport',function (){ @@ -30,7 +31,6 @@ Route::group('index',function () { }); Route::group('user',function (){ - Route::post('userList','user/userList')->middleware(CheckUser::class)->allowCrossDomain(); Route::post('modifyPassword','user/modifyPassword')->middleware(CheckUser::class)->allowCrossDomain(); Route::post('withdrawalRecords','user/withdrawalRecords')->middleware(CheckUser::class)->allowCrossDomain(); Route::post('rechargeRecords','user/rechargeRecords')->middleware(CheckUser::class)->allowCrossDomain(); @@ -47,6 +47,7 @@ Route::group('zone',function(){ # 代理 Route::group('agentTeam',function(){ + Route::post('userList','agentTeam/userList')->middleware(CheckAgent::class)->allowCrossDomain(); Route::post('upScores','agentTeam/upScores')->middleware(CheckAgent::class)->allowCrossDomain(); Route::post('downScores','agentTeam/downScores')->middleware(CheckAgent::class)->allowCrossDomain(); }); @@ -54,6 +55,9 @@ Route::group('agentTeam',function(){ # 总后台 +Route::group('adminTeam',function() { + Route::post('userList','adminTeam/userList')->middleware(CheckAdmin::class)->allowCrossDomain(); +}); # 支付(待开发) //Route::group('pay',function (){