Merge remote-tracking branch 'origin/develop' into develop

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

app/Admin/Lazys/AlipayLazys.php

@@ -0,0 +1,30 @@
+<?php
+
+
+namespace App\Admin\Lazys;
+
+use App\Admin\Repositories\Withdrawal;
+use App\Admin\Repositories\WithdrawalAlipay;
+use App\Models\Demand;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Grid\LazyRenderable;
+use Dcat\Admin\Repositories\EloquentRepository;
+use Dcat\Admin\Show;
+
+
+class AlipayLazys extends LazyRenderable
+{
+	public function grid(): Grid
+	{
+		return Grid::make(new WithdrawalAlipay(), function (Grid $grid) {
+			$grid->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();
+		});
+	}
+}

app/Admin/Lazys/BankLazys.php

@@ -0,0 +1,32 @@
+<?php
+
+
+namespace App\Admin\Lazys;
+
+use App\Admin\Repositories\Withdrawal;
+use App\Admin\Repositories\WithdrawalAlipay;
+use App\Admin\Repositories\WithdrawalBank;
+use App\Models\Demand;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Grid\LazyRenderable;
+use Dcat\Admin\Repositories\EloquentRepository;
+use Dcat\Admin\Show;
+
+
+class BankLazys extends LazyRenderable
+{
+	public function grid(): Grid
+	{
+		return Grid::make(new WithdrawalBank(), function (Grid $grid) {
+			$grid->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();
+		});
+	}
+}

app/Admin/Repositories/WithdrawalAlipay.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\WithdrawalAlipay as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class WithdrawalAlipay extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/Admin/Repositories/WithdrawalBank.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\WithdrawalBank as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class WithdrawalBank extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/AdminAgent/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();

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) {

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

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

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

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