From 5dc241435066651ff95ca75f637e7c5425930269 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Fri, 31 Dec 2021 21:43:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=82=E6=AD=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/DistributionPreIncomeController.php   | 4 ++--
 .../DistributionPreIncomeLogTable.php}                      | 6 +++---
 app/Admin/Renderable/DistributionPreIncomeSimpleTable.php   | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename app/Admin/{Actions/Grid/DistributionPreIncomeLog.php => Renderable/DistributionPreIncomeLogTable.php} (87%)

diff --git a/app/Admin/Controllers/DistributionPreIncomeController.php b/app/Admin/Controllers/DistributionPreIncomeController.php
index ab692b36..856d772d 100644
--- a/app/Admin/Controllers/DistributionPreIncomeController.php
+++ b/app/Admin/Controllers/DistributionPreIncomeController.php
@@ -2,7 +2,7 @@
 
 namespace App\Admin\Controllers;
 
-use App\Admin\Actions\Grid\DistributionPreIncomeLog;
+use App\Admin\Renderable\DistributionPreIncomeLogTable;
 use App\Admin\Repositories\DistributionPreIncome;
 use App\Models\DistributionPreIncome as DistributionPreIncomeModel;
 use App\Models\UserInfo;
@@ -39,7 +39,7 @@ class DistributionPreIncomeController extends AdminController
             $grid->column('total_revenue');
             $grid->column('logs', '收益详情')->display('详情')->modal(function ($modal) {
                 $modal->title('收益详情');
-                return DistributionPreIncomeLog::make();
+                return DistributionPreIncomeLogTable::make(['id'=>$this->id]);
             });
             $grid->column('status')->using(DistributionPreIncomeModel::$statusTexts)->dot([
                 0=>'danger',
diff --git a/app/Admin/Actions/Grid/DistributionPreIncomeLog.php b/app/Admin/Renderable/DistributionPreIncomeLogTable.php
similarity index 87%
rename from app/Admin/Actions/Grid/DistributionPreIncomeLog.php
rename to app/Admin/Renderable/DistributionPreIncomeLogTable.php
index ddc48397..1bd3944a 100644
--- a/app/Admin/Actions/Grid/DistributionPreIncomeLog.php
+++ b/app/Admin/Renderable/DistributionPreIncomeLogTable.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Admin\Actions\Grid;
+namespace App\Admin\Renderable;
 
 use App\Models\DistributionPreIncomeLog as DistributionPreIncomeLogModel;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Support\LazyRenderable;
 
-class DistributionPreIncomeLog extends LazyRenderable
+class DistributionPreIncomeLogTable extends LazyRenderable
 {
     public function render()
     {
@@ -22,7 +22,7 @@ class DistributionPreIncomeLog extends LazyRenderable
             $grid->disableActions();
             $grid->disableCreateButton();
             $grid->disablePagination();
-            $grid->async();
+            // $grid->async();
         });
 
         return $grid;
diff --git a/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php b/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php
index 655a5367..7fcb4bb7 100644
--- a/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php
+++ b/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php
@@ -2,7 +2,6 @@
 
 namespace App\Admin\Renderable;
 
-use App\Admin\Actions\Grid\DistributionPreIncomeLog;
 use App\Models\DistributionPreIncome;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid\LazyRenderable;
@@ -26,7 +25,7 @@ class DistributionPreIncomeSimpleTable extends LazyRenderable
             $grid->column('total_revenue', '收益');
             $grid->column('logs', '收益详情')->display('详情')->modal(function ($modal) {
                 $modal->title('收益详情');
-                return DistributionPreIncomeLog::make();
+                return DistributionPreIncomeLogTable::make(['id'=>$this->id]);
             });
             $grid->column('created_at', '创建时间');
             // $grid->withBorder();