From 7defa06bae84d584524f42c5c6fd7dc1fbc17cab Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 16 Feb 2022 11:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=B9=E9=9B=B6=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E6=8F=90=E7=8E=B0=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DealerWalletToBankLogController.php       | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/Admin/Controllers/DealerWalletToBankLogController.php b/app/Admin/Controllers/DealerWalletToBankLogController.php
index 3910c2ea..60072123 100644
--- a/app/Admin/Controllers/DealerWalletToBankLogController.php
+++ b/app/Admin/Controllers/DealerWalletToBankLogController.php
@@ -43,7 +43,11 @@ class DealerWalletToBankLogController extends AdminController
                 0=>'primary',
                 1=>'success',
                 2=>'danger',
-            ]);
+            ])->filter(Grid\Column\Filter\In::make([
+                DealerWalletToBankLogModel::STATUS_PENDING=>'待处理',
+                DealerWalletToBankLogModel::STATUS_AGREE=>'同意',
+                DealerWalletToBankLogModel::STATUS_REFUSE=>'拒绝',
+            ]));
             $grid->column('remarks');
             $grid->column('created_at')->sortable();
             // $grid->column('updated_at')
@@ -58,11 +62,11 @@ class DealerWalletToBankLogController extends AdminController
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();
-                $filter->equal('status')->select([
-                    DealerWalletToBankLogModel::STATUS_PENDING=>'待处理',
-                    DealerWalletToBankLogModel::STATUS_AGREE=>'已同意',
-                    DealerWalletToBankLogModel::STATUS_REFUSE=>'已拒绝',
-                ])->width(3);
+                // $filter->equal('status')->select([
+                //     DealerWalletToBankLogModel::STATUS_PENDING=>'待处理',
+                //     DealerWalletToBankLogModel::STATUS_AGREE=>'已同意',
+                //     DealerWalletToBankLogModel::STATUS_REFUSE=>'已拒绝',
+                // ])->width(3);
                 $filter->equal('user.phone')->width(3);
                 $filter->between('created_at')->dateTime()->width(7);
             });
@@ -100,45 +104,45 @@ class DealerWalletToBankLogController extends AdminController
             $show->divider('收款信息-银行');
             $show->field('bank_user_name', '银行-收款人')->as(function () {
                 $payInfo = $this->getPayInfo();
-                return $payInfo['bank']['user_name']??'';
+                return $payInfo['bank']['user_name'] ?? '';
             });
             $show->field('bank_bank_name', '银行-名称')->as(function () {
                 $payInfo = $this->getPayInfo();
-                return $payInfo['bank']['bank_name']??'';
+                return $payInfo['bank']['bank_name'] ?? '';
             });
             $show->field('bank_bank_number', '银行-卡号')->as(function () {
                 $payInfo = $this->getPayInfo();
-                return $payInfo['bank']['bank_number']??'';
+                return $payInfo['bank']['bank_number'] ?? '';
             });
             $show->field('bank_bank_description', '银行-开户行')->as(function () {
                 $payInfo = $this->getPayInfo();
-                return $payInfo['bank']['bank_description']??'';
+                return $payInfo['bank']['bank_description'] ?? '';
             });
             $show->divider('收款信息-支付宝');
             $show->field('alipay_user_name', '支付宝-真实名称')->as(function () {
                 $payInfo = $this->getPayInfo();
-                return $payInfo['alipay']['user_name']??'';
+                return $payInfo['alipay']['user_name'] ?? '';
             });
             $show->field('alipay_ali_name', '支付宝-账户')->as(function () {
                 $payInfo = $this->getPayInfo();
-                return $payInfo['alipay']['ali_name']??'';
+                return $payInfo['alipay']['ali_name'] ?? '';
             });
             $show->field('alipay_image', '支付宝-收款码')->as(function () {
                 $payInfo = $this->getPayInfo();
-                return $payInfo['alipay']['image']??'';
+                return $payInfo['alipay']['image'] ?? '';
             })->image();
             $show->divider('收款信息-微信');
             $show->field('wechat_user_name', '微信-真实名称')->as(function () {
                 $payInfo = $this->getPayInfo();
-                return $payInfo['wechat']['user_name']??'';
+                return $payInfo['wechat']['user_name'] ?? '';
             });
             $show->field('wechat_wechat_name', '微信-ID')->as(function () {
                 $payInfo = $this->getPayInfo();
-                return $payInfo['wechat']['wechat_name']??'';
+                return $payInfo['wechat']['wechat_name'] ?? '';
             });
             $show->field('wechat_image', '微信-收款码')->as(function () {
                 $payInfo = $this->getPayInfo();
-                return $payInfo['wechat']['image']??'';
+                return $payInfo['wechat']['image'] ?? '';
             })->image();
             $show->field('created_at');