diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php index b32f49a..ea5b418 100644 --- a/app/Admin/Controllers/ImsCjdcMarketController.php +++ b/app/Admin/Controllers/ImsCjdcMarketController.php @@ -48,7 +48,7 @@ class ImsCjdcMarketController extends AdminController $filter->equal('id'); }); $grid->disableFilterButton(); - $grid->quickSearch(['name'])->placeholder('名称'); + $grid->quickSearch(['name'])->placeholder('输入市场名称'); $grid->actions(function (Grid\Displayers\Actions $actions) { diff --git a/app/Admin/Controllers/ImsCjdcStoreController.php b/app/Admin/Controllers/ImsCjdcStoreController.php index 3aa048d..2bc861b 100644 --- a/app/Admin/Controllers/ImsCjdcStoreController.php +++ b/app/Admin/Controllers/ImsCjdcStoreController.php @@ -40,7 +40,9 @@ class ImsCjdcStoreController extends AdminController $grid->disableDeleteButton(); $grid->disableCreateButton(); $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); + $filter->like('name')->placeholder('输入店铺名称'); + $filter->equal('tel')->placeholder('输入电话'); + $filter->like('market.name','市场名称')->placeholder('输入市场名称'); }); }); diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index ef60602..e2f573f 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/app/Admin/Controllers/LanzuMmInfoController.php @@ -65,7 +65,8 @@ class LanzuMmInfoController extends AdminController return date('Y-m-d H:i:s', $time); }); $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); + $filter->like('name')->placeholder('输入经理名称'); + $filter->equal('phone')->placeholder('输入电话'); }); }); diff --git a/app/Admin/Controllers/LanzuMmWithdrawController.php b/app/Admin/Controllers/LanzuMmWithdrawController.php index b77dc5e..dd15970 100644 --- a/app/Admin/Controllers/LanzuMmWithdrawController.php +++ b/app/Admin/Controllers/LanzuMmWithdrawController.php @@ -72,7 +72,8 @@ class LanzuMmWithdrawController extends AdminController return date('Y-m-d H:i', $time); }); $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); + $filter->like('mmInfo.name','经理名')->placeholder('输入经理名称'); + $filter->between('money')->placeholder('输入提现范围值'); }); if ($mm_id) { diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index f46d5da..9b930c8 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/app/Admin/Controllers/LanzuMpInfoController.php @@ -55,11 +55,8 @@ class LanzuMpInfoController extends AdminController }); $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); - - }); - $grid->filter(function (Grid\Filter $filter) { - $filter->like('name'); + $filter->like('name')->placeholder('输入服务商名称'); + $filter->equal('phone')->placeholder('输入电话号码'); }); diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index 57427a3..2f5d46c 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/app/Admin/Controllers/LanzuMpWithdrawController.php @@ -35,9 +35,12 @@ class LanzuMpWithdrawController extends AdminController $grid->money; $grid->status('提现状态')->using([-1=>'拒绝',0=>'审核中',1=>'通过']) ->label([-1=>'danger',0=>'default',1=>'success']); - $grid->created_at; + $grid->column('created_at')->display(function ($time){ + return date('Y-m-d H:i',$time); + }); $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); + $filter->like('mpInfo.name','服务商')->placeholder('输入服务商名称'); + $filter->between('money'); }); $grid->actions(function (Grid\Displayers\Actions $actions) { diff --git a/app/Models/LanzuMpWithdraw.php b/app/Models/LanzuMpWithdraw.php index fa0cdb8..c15facf 100755 --- a/app/Models/LanzuMpWithdraw.php +++ b/app/Models/LanzuMpWithdraw.php @@ -2,6 +2,7 @@ namespace App\Models; +use Dcat\Admin\Traits\HasDateTimeFormatter; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\Model; @@ -9,9 +10,9 @@ class LanzuMpWithdraw extends Model { use SoftDeletes; - protected $dateFormat = 'U'; + use HasDateTimeFormatter; protected $table = 'lanzu_mp_withdraw'; - + protected $dateFormat = 'U'; public function mpInfo() { return $this->hasOne('\App\Models\LanzuMpInfo','id','mp_id');