diff --git a/app/Admin/Controllers/WithdrawalController.php b/app/Admin/Controllers/WithdrawalController.php index 2bf5810..32b8b36 100755 --- a/app/Admin/Controllers/WithdrawalController.php +++ b/app/Admin/Controllers/WithdrawalController.php @@ -2,6 +2,8 @@ namespace App\Admin\Controllers; +use App\Admin\Lazys\AlipayLazys; +use App\Admin\Lazys\BankLazys; use App\Admin\Repositories\Withdrawal; use App\Traits\WithdrawalTraits; use Dcat\Admin\Admin; @@ -26,6 +28,20 @@ class WithdrawalController extends AdminController $grid->column('price','提现金额'); $grid->column('user.name','用户名称'); $grid->column('pay_type','提现方式')->using(WithdrawalTraits::$userTypeText); + $grid->column('detail','提现信息') + ->display('查看') + ->if(fn() => $this->pay_type == WithdrawalTraits::$userType[0]) + ->then(function ($column) { + $column->modal('',function () { + return AlipayLazys::make(); + }); + }) + ->if(fn() => $this->pay_type == WithdrawalTraits::$userType[1]) + ->then(function ($column) { + $column->modal('',function () { + return BankLazys::make(); + }); + }); $grid->column('status','状态') ->if(fn() => $this->status == WithdrawalTraits::$state[0]) ->display('') diff --git a/app/Admin/Lazys/AlipayLazys.php b/app/Admin/Lazys/AlipayLazys.php new file mode 100644 index 0000000..fc65865 --- /dev/null +++ b/app/Admin/Lazys/AlipayLazys.php @@ -0,0 +1,30 @@ +model()->where('withdrawal_id',$this->key); + $grid->column('id'); + $grid->column('account','账户'); + $grid->column('name','账户名称'); + $grid->column('qrcode','收款码')->image(); + $grid->disableActions(); + $grid->disableRowSelector(); + $grid->disablePagination(); + }); + } +} diff --git a/app/Admin/Lazys/BankLazys.php b/app/Admin/Lazys/BankLazys.php new file mode 100644 index 0000000..1fa829c --- /dev/null +++ b/app/Admin/Lazys/BankLazys.php @@ -0,0 +1,32 @@ +model()->where('withdrawal_id',$this->key); + $grid->column('id'); + $grid->column('name','银行名称'); + $grid->column('branch','支行'); + $grid->column('card_number','卡号'); + $grid->column('account_name','开户人'); + $grid->disableActions(); + $grid->disableRowSelector(); + $grid->disablePagination(); + }); + } +} diff --git a/app/Admin/Repositories/WithdrawalAlipay.php b/app/Admin/Repositories/WithdrawalAlipay.php new file mode 100755 index 0000000..1bfa962 --- /dev/null +++ b/app/Admin/Repositories/WithdrawalAlipay.php @@ -0,0 +1,16 @@ +display('id'); + $form->display('id'); $form->decimal('price','提现金额')->required(); - $form->text('account')->required(); - $form->text('name')->required(); - $form->image('qrcode')->required(); - $form->hidden('withdrawal_id'); + $form->text('account')->required()->maxLength(50); + $form->text('name')->required()->maxLength(50); + $form->image('qrcode')->required(); + $form->hidden('withdrawal_id'); $form->saving(function (Form $form) { $user = Agent::query()->where('id', Admin::user()->id)->lockForUpdate()->first(); diff --git a/app/AdminAgent/Controllers/WithdrawalBankController.php b/app/AdminAgent/Controllers/WithdrawalBankController.php index 6b2bff1..4996f7c 100755 --- a/app/AdminAgent/Controllers/WithdrawalBankController.php +++ b/app/AdminAgent/Controllers/WithdrawalBankController.php @@ -26,11 +26,11 @@ class WithdrawalBankController extends AdminController { return Form::make(new WithdrawalBank(), function (Form $form) { $form->display('id'); - $form->decimal('price','提现金额')->required(); - $form->text('name')->required(); - $form->text('card_number')->required(); - $form->text('account_name')->required(); - $form->text('branch')->required(); + $form->decimal('price','提现金额')->required()->maxLength(50); + $form->text('name')->required()->maxLength(50); + $form->text('card_number')->required()->maxLength(50)->type('number'); + $form->text('account_name')->required()->maxLength(50); + $form->text('branch')->required()->maxLength(100); $form->hidden('withdrawal_id'); $form->saving(function (Form $form) { diff --git a/app/AdminGuide/Controllers/WithdrawalAlipayController.php b/app/AdminGuide/Controllers/WithdrawalAlipayController.php index da577eb..0f058ae 100755 --- a/app/AdminGuide/Controllers/WithdrawalAlipayController.php +++ b/app/AdminGuide/Controllers/WithdrawalAlipayController.php @@ -28,8 +28,8 @@ class WithdrawalAlipayController extends AdminController return Form::make(new WithdrawalAlipay(), function (Form $form) { $form->display('id'); $form->decimal('price','提现金额')->required(); - $form->text('account')->required(); - $form->text('name')->required(); + $form->text('account')->required()->maxLength(50); + $form->text('name')->required()->maxLength(50); $form->image('qrcode')->required(); $form->hidden('withdrawal_id'); diff --git a/app/AdminGuide/Controllers/WithdrawalBankController.php b/app/AdminGuide/Controllers/WithdrawalBankController.php index 08dada6..4ee1f5d 100755 --- a/app/AdminGuide/Controllers/WithdrawalBankController.php +++ b/app/AdminGuide/Controllers/WithdrawalBankController.php @@ -25,13 +25,13 @@ class WithdrawalBankController extends AdminController protected function form() { return Form::make(new WithdrawalBank(), function (Form $form) { - $form->display('id'); - $form->decimal('price','提现金额')->required(); - $form->text('name')->required(); - $form->text('card_number')->required(); - $form->text('account_name')->required(); - $form->text('branch')->required(); - $form->hidden('withdrawal_id'); + $form->display('id'); + $form->decimal('price','提现金额')->required()->maxLength(50); + $form->text('name')->required()->maxLength(50); + $form->text('card_number')->required()->maxLength(50)->type('number'); + $form->text('account_name')->required()->maxLength(50); + $form->text('branch')->required()->maxLength(100); + $form->hidden('withdrawal_id'); $form->saving(function (Form $form) { $user = Agent::query()->where('id', Admin::user()->id)->lockForUpdate()->first(); diff --git a/app/AdminSupplier/Controllers/WithdrawalAlipayController.php b/app/AdminSupplier/Controllers/WithdrawalAlipayController.php index 2bf7206..f45e814 100755 --- a/app/AdminSupplier/Controllers/WithdrawalAlipayController.php +++ b/app/AdminSupplier/Controllers/WithdrawalAlipayController.php @@ -26,12 +26,12 @@ class WithdrawalAlipayController extends AdminController protected function form() { return Form::make(new WithdrawalAlipay(), function (Form $form) { - $form->display('id'); + $form->display('id'); $form->decimal('price','提现金额')->required(); - $form->text('account')->required(); - $form->text('name')->required(); - $form->image('qrcode')->required(); - $form->hidden('withdrawal_id'); + $form->text('account')->required()->maxLength(50); + $form->text('name')->required()->maxLength(50); + $form->image('qrcode')->required(); + $form->hidden('withdrawal_id'); $form->saving(function (Form $form) { $user = Agent::query()->where('id', Admin::user()->id)->lockForUpdate()->first(); diff --git a/app/AdminSupplier/Controllers/WithdrawalBankController.php b/app/AdminSupplier/Controllers/WithdrawalBankController.php index 13fa16b..374ba82 100755 --- a/app/AdminSupplier/Controllers/WithdrawalBankController.php +++ b/app/AdminSupplier/Controllers/WithdrawalBankController.php @@ -25,13 +25,13 @@ class WithdrawalBankController extends AdminController protected function form() { return Form::make(new WithdrawalBank(), function (Form $form) { - $form->display('id'); - $form->decimal('price','提现金额')->required(); - $form->text('name')->required(); - $form->text('card_number')->required(); - $form->text('account_name')->required(); - $form->text('branch')->required(); - $form->hidden('withdrawal_id'); + $form->display('id'); + $form->decimal('price','提现金额')->required()->maxLength(50); + $form->text('name')->required()->maxLength(50); + $form->text('card_number')->required()->maxLength(50)->type('number'); + $form->text('account_name')->required()->maxLength(50); + $form->text('branch')->required()->maxLength(100); + $form->hidden('withdrawal_id'); $form->saving(function (Form $form) { $user = Agent::query()->where('id', Admin::user()->id)->lockForUpdate()->first();