From d893745407982cdb1c5ef96ef26882ad981ca1a6 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Fri, 13 May 2022 13:21:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=94=A8=E6=88=B7=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/UserController.php        |  2 +-
 app/Admin/Renderable/UserFansSimpleTable.php    |  4 ++--
 app/Admin/Renderable/UserInviterSimpleTable.php | 12 +++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

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();