diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php index 0ef2068f..6ed4d2ed 100644 --- a/app/Admin/Controllers/UserController.php +++ b/app/Admin/Controllers/UserController.php @@ -214,7 +214,7 @@ class UserController extends AdminController // 下级列表 $tab->add('下级列表', UserFansSimpleTable::make(['id'=>$id])); // 上级列表 - // $tab->add('上级列表', UserInviterSimpleTable::make(['id'=>$id])); + $tab->add('上级列表', UserInviterSimpleTable::make(['id'=>$id])); $column->row(Box::make('用户记录', $tab)); }); }; diff --git a/app/Admin/Renderable/UserFansSimpleTable.php b/app/Admin/Renderable/UserFansSimpleTable.php index dc1b5bad..275fd81e 100644 --- a/app/Admin/Renderable/UserFansSimpleTable.php +++ b/app/Admin/Renderable/UserFansSimpleTable.php @@ -12,15 +12,15 @@ class UserFansSimpleTable extends LazyRenderable { $userId = $this->payload['id'] ?? 0; $builder = UserInfo::query(); - $builder->with(['user', 'user.userVip.vip'])->where('inviter_id', $userId); + $builder->with(['user.userVip.vip'])->where('inviter_id', $userId); return Grid::make($builder, function (Grid $grid) { + $grid->column('user_id', 'ID'); $grid->column('user.phone', '手机号')->link(function ($value) { return admin_url('users/'.$this->user_id); }); $grid->column('user.userVip.vip.name', '代理'); $grid->column('growth_value', '成长值'); $grid->column('created_at', '注册时间'); - // $grid->withBorder(); $grid->model()->orderBy('created_at', 'desc'); $grid->disableRefreshButton(); $grid->disableActions(); diff --git a/app/Admin/Renderable/UserInviterSimpleTable.php b/app/Admin/Renderable/UserInviterSimpleTable.php index ad33a4ac..3667426b 100644 --- a/app/Admin/Renderable/UserInviterSimpleTable.php +++ b/app/Admin/Renderable/UserInviterSimpleTable.php @@ -11,20 +11,18 @@ class UserInviterSimpleTable extends LazyRenderable public function grid(): Grid { $userId = $this->payload['id'] ?? 0; - $userInfo = UserInfo::with('user')->where('user_id', $userId)->first(); + $userInfo = UserInfo::where('user_id', $userId)->first(); $builder = UserInfo::query(); - $builder->with(['user'])->whereIn('user_id', $userInfo->parent_ids)->latest('depth'); + $builder->with(['user.userVip.vip'])->whereIn('user_id', $userInfo->parent_ids)->latest('depth'); return Grid::make($builder, function (Grid $grid) { + $grid->column('user_id', 'ID'); $grid->column('user.phone', '手机号')->link(function ($value) { return admin_url('users/'.$this->user_id); }); - $grid->column('depth', '层级'); - - $grid->column('growth_value', '消费值'); - + $grid->column('user.userVip.vip.name', '代理'); + $grid->column('growth_value', '成长值'); $grid->column('created_at', '注册时间'); - // $grid->withBorder(); $grid->model()->orderBy('created_at', 'desc'); $grid->disableRefreshButton(); $grid->disableActions();