diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index 08577ad..edc3558 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/app/Admin/Controllers/LanzuMmInfoController.php @@ -7,6 +7,7 @@ use App\Models\AdminUsers; use \App\Models\AdminRoles; use \App\Models\AdminRoleUsers; use App\Models\ImsCjdcMarket; +use App\Models\LanzuMpInfo; use App\Models\LanzuMpInfo as mpInfo; use Dcat\Admin\Form; use Dcat\Admin\Grid; @@ -27,7 +28,6 @@ class LanzuMmInfoController extends AdminController */ protected function grid() { - return Grid::make(new LanzuMmInfo(), function (Grid $grid) { $user = Admin::user(); @@ -163,7 +163,9 @@ class LanzuMmInfoController extends AdminController */ protected function getMarket() { - $markets = ImsCjdcMarket::all(); + $user = Admin::user(); + $mp = LanzuMpInfo::where('admin_user_id',$user->id)->first(); + $markets = ImsCjdcMarket::where('mp_id',$mp->id)->get(); $data = []; foreach ($markets as $market){ $item = []; diff --git a/app/Admin/Controllers/LanzuMmWithdrawController.php b/app/Admin/Controllers/LanzuMmWithdrawController.php index c226941..c839338 100644 --- a/app/Admin/Controllers/LanzuMmWithdrawController.php +++ b/app/Admin/Controllers/LanzuMmWithdrawController.php @@ -19,12 +19,10 @@ class LanzuMmWithdrawController extends AdminController { /** * Make a grid builder. - * * @return Grid */ protected function grid() { - $user = Admin::user(); $mp_info = mpInfo::where('admin_user_id',$user->id)->first(); $mk = ImsCjdcMarket::where('mp_id',$mp_info->id)->get()->pluck('id'); @@ -45,7 +43,9 @@ class LanzuMmWithdrawController extends AdminController $grid->money; $grid->status('提现状态')->using([-1=>'拒绝',0=>'审核中',1=>'通过']) ->label([-1=>'danger',0=>'default',1=>'success']); - $grid->created_at('提现时间'); + $grid->created_at('提现时间')->display(function ($time){ + return date('Y-m-d H:i',$time); + }); $grid->filter(function (Grid\Filter $filter) { $filter->equal('id');