diff --git a/app/controller/AdminTeam.php b/app/controller/AdminTeam.php index 5bfb277..460e75f 100644 --- a/app/controller/AdminTeam.php +++ b/app/controller/AdminTeam.php @@ -66,17 +66,18 @@ class AdminTeam extends BaseController */ public function editUser() { - $param = Request::param(); try { validate(UserValidate::class)->scene('editUser')->check($param); + $UserModel = new UserModel(); + $result = $UserModel->retrieve($param); + if (!$result['status']) throw new ValidateException($result['msg']); - - + return $this->renderSuccess($result['msg']); } catch (ValidateException $validateException) { return $this->renderError($validateException->getMessage()); } diff --git a/app/model/User.php b/app/model/User.php index 4d737c3..5360f0f 100644 --- a/app/model/User.php +++ b/app/model/User.php @@ -84,7 +84,15 @@ class User extends Model public function retrieve($data) { // 根据用户名查询用户信息 - $user = $this->where('phone', $data['phone'])->find(); + $user = []; + $errorMsg = ''; + if (isset($data['phone'])) { + $errorMsg = '手机号'; + $user = $this->where('phone', $data['phone'])->find(); + } elseif ($data['user_id']) { + $errorMsg = '用户'; + $user = $this->find($data['user_id']); + } if ($user) { @@ -100,7 +108,7 @@ class User extends Model return ['status' => true, 'msg' => '密码重制成功']; } - return ['status' => false, 'msg' => '手机号未注册']; + return ['status' => false, 'msg' => $errorMsg.'未注册']; } /** diff --git a/route/app.php b/route/app.php index 831b144..7dc70ca 100644 --- a/route/app.php +++ b/route/app.php @@ -57,6 +57,7 @@ Route::group('agentTeam',function(){ # 总后台 Route::group('adminTeam',function() { Route::post('userList','adminTeam/userList')->middleware(CheckAdmin::class)->allowCrossDomain(); + Route::post('editUser','adminTeam/editUser')->middleware(CheckAdmin::class)->allowCrossDomain(); }); # 支付(待开发)