From e928bdfea5ac0ed5a270cd7a8ebf8758f1e1b73a Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Sun, 7 Nov 2021 16:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E6=96=87?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/DepositController.php    | 11 ++++++++---
 app/Admin/Controllers/WithdrawalController.php |  8 ++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/Admin/Controllers/DepositController.php b/app/Admin/Controllers/DepositController.php
index 7937a1a..98c80ad 100644
--- a/app/Admin/Controllers/DepositController.php
+++ b/app/Admin/Controllers/DepositController.php
@@ -21,9 +21,12 @@ class DepositController extends AdminController
 			$grid->disableCreateButton();
 			$grid->disableRowSelector();
 			$grid->disableViewButton();
+
+			$grid->model()->where('id', '>', 1);
+
 			$grid->column('id')->sortable();
-			$grid->column('name');
-			$grid->column('trade_balance','正常');
+			$grid->column('company_name', '供应商');
+			$grid->column('trade_balance','交易金余额');
         });
     }
 
@@ -35,7 +38,7 @@ class DepositController extends AdminController
     protected function form()
     {
         return Form::make(new Supplier(), function (Form $form) {
-			$form->decimal('trade_balance','正常')->rules('required|numeric|min:0|not_in:0',[
+			$form->decimal('trade_balance','交易金余额')->rules('required|numeric|min:0|not_in:0',[
 				'*' => '金额为必填字段且必须大于0',
 			]);
 			$form->disableCreatingCheck();
@@ -45,6 +48,8 @@ class DepositController extends AdminController
 			$form->disableResetButton();
 			$form->disableViewCheck();
 			$form->disableEditingCheck();
+		})->deleting(function (Form $form) {
+			return $form->response()->error('操作禁止');
 		});
     }
 }
diff --git a/app/Admin/Controllers/WithdrawalController.php b/app/Admin/Controllers/WithdrawalController.php
index 32b8b36..5a987f3 100755
--- a/app/Admin/Controllers/WithdrawalController.php
+++ b/app/Admin/Controllers/WithdrawalController.php
@@ -5,11 +5,10 @@ namespace App\Admin\Controllers;
 use App\Admin\Lazys\AlipayLazys;
 use App\Admin\Lazys\BankLazys;
 use App\Admin\Repositories\Withdrawal;
+use App\Traits\DemandTraits;
 use App\Traits\WithdrawalTraits;
 use Dcat\Admin\Admin;
-use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
 
 class WithdrawalController extends AdminController
@@ -23,10 +22,11 @@ class WithdrawalController extends AdminController
     {
         return Grid::make(new Withdrawal(['user','pay']), function (Grid $grid) {
 			$grid->disableActions();
-			//$grid->disable();
+			$grid->model()->orderBy('id', 'desc');
 			$grid->column('id')->sortable();
+			$grid->column('user_type')->using(DemandTraits::$polymorphic);
+			$grid->column('user.company_name','商家名称');
 			$grid->column('price','提现金额');
-			$grid->column('user.name','用户名称');
 			$grid->column('pay_type','提现方式')->using(WithdrawalTraits::$userTypeText);
 			$grid->column('detail','提现信息')
 				->display('查看')