From 76a3c7e676d6cb05dce5348adae1f7d7e36fa290 Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Thu, 19 May 2022 10:53:48 +0800 Subject: [PATCH] admin/user show UserCompany --- app/Admin/Actions/Show/UserCompany.php | 20 +++++++++++ app/Admin/Controllers/UserController.php | 9 ++--- app/Admin/Forms/UserCompany.php | 44 ++++++++++++++++++++++++ resources/lang/zh_CN/user.php | 23 ++++--------- 4 files changed, 75 insertions(+), 21 deletions(-) create mode 100644 app/Admin/Actions/Show/UserCompany.php create mode 100644 app/Admin/Forms/UserCompany.php diff --git a/app/Admin/Actions/Show/UserCompany.php b/app/Admin/Actions/Show/UserCompany.php new file mode 100644 index 00000000..dde3715c --- /dev/null +++ b/app/Admin/Actions/Show/UserCompany.php @@ -0,0 +1,20 @@ +payload(['id'=>$this->getKey()]); + return Modal::make() + ->lg() + ->title('员工') + ->body($form) + ->button("设为员工  "); + } +} diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php index a22c9010..252962bf 100644 --- a/app/Admin/Controllers/UserController.php +++ b/app/Admin/Controllers/UserController.php @@ -7,7 +7,7 @@ use App\Admin\Actions\Grid\{EnableUser, UserCompany}; use App\Admin\Actions\Grid\Frozen; use App\Admin\Actions\Grid\UserResetAccountPassword; use App\Admin\Actions\Grid\UserResetPassword; -use App\Admin\Actions\Show\UserEditBank; +use App\Admin\Actions\Show\{UserEditBank, UserCompany as UserCompanyShow}; use App\Admin\Actions\Show\UserEditPhone; use App\Admin\Actions\Show\UserEditAgent; use App\Admin\Renderable\Grid\Filter\PriceBetween; @@ -165,7 +165,7 @@ class UserController extends AdminController $show->field('user_info.growth_value'); $show->field('profit'); - $show->field('userInfo.is_company')->as(function ($v) { + $show->field('user_info.is_company')->as(function ($v) { return $v ? '是' : '否'; }); @@ -180,9 +180,9 @@ class UserController extends AdminController // $show->field('user_info.points'); }); $show->row(function (Show\Row $show) { - // $show->width(6)->field('last_login_ip'); + $show->width(6)->field('last_login_ip'); $show->width(6)->field('last_login_at'); - // $show->field('register_ip'); + $show->field('register_ip'); $show->field('created_at'); }); @@ -202,6 +202,7 @@ class UserController extends AdminController if (Admin::user()->can('dcat.admin.users.agent')) { $tools->append(new UserEditAgent()); } + $tools->append(new UserCompanyShow()); }); })); }); diff --git a/app/Admin/Forms/UserCompany.php b/app/Admin/Forms/UserCompany.php new file mode 100644 index 00000000..cf874249 --- /dev/null +++ b/app/Admin/Forms/UserCompany.php @@ -0,0 +1,44 @@ +payload['id'] ?? 0; + $user = User::findOrFail($id); + try { + DB::beginTransaction(); + $user->userInfo->update([ + 'is_company' => $input['is_company'] + ]); + DB::commit(); + } catch (Throwable $th) { + DB::rollBack(); + report($th); + return $this->response()->error('操作失败:'.$th->getMessage()); + } + + return $this->response()->success(__('admin.update_succeeded'))->refresh(); + } + + /** + * Build a form here. + */ + public function form() + { + $id = $this->payload['id'] ?? 0; + $user = User::with(['userInfo'])->findOrFail($id); + + $this->radio('is_company', '员工')->value($user->userInfo->is_company)->options([1 => '是', 0 => '否']); + } +} diff --git a/resources/lang/zh_CN/user.php b/resources/lang/zh_CN/user.php index f1022a57..47acc1b6 100644 --- a/resources/lang/zh_CN/user.php +++ b/resources/lang/zh_CN/user.php @@ -2,8 +2,8 @@ return [ 'labels' => [ - 'User' => '会员管理', - 'users' => '会员管理', + 'User' => '用户管理', + 'users' => '用户管理', ], 'fields' => [ 'username' => '用户名', @@ -12,23 +12,11 @@ return [ 'phone' => '手机号', 'email' => '邮箱', 'status'=>'状态', - 'last_login_ip' => '最近登录IP', - 'last_login_at' => '最近登录时间', + 'last_login_ip' => '最近IP', + 'last_login_at' => '最近时间', 'register_ip' => '注册IP', 'created_at' => '注册时间', 'agent' => '代理', - 'userInfo'=>[ - 'avatar' => '头像', - 'nickname' => '昵称', - 'code' => '邀请码', - 'growth_value'=>'成长值', - 'inviterInfo'=>[ - 'user'=>[ - 'phone' =>'推荐人手机', - ], - ], - 'is_company' => '员工', - ], 'user_info'=>[ 'avatar' => '头像', 'nickname' => '昵称', @@ -38,9 +26,10 @@ return [ 'birthday'=>'生日', 'inviter_info'=>[ 'user'=>[ - 'phone' =>'推荐人手机', + 'phone' =>'推荐人', ], ], + 'is_company' => '员工', ], 'wallet'=>[ 'balance'=>'可提',