diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php index 0b3ced7..20510aa 100644 --- a/app/Admin/Controllers/ImsCjdcMarketController.php +++ b/app/Admin/Controllers/ImsCjdcMarketController.php @@ -25,6 +25,9 @@ class ImsCjdcMarketController extends AdminController $grid->column('mp_id','服务商')->display(function ($mid){ if($mid == 0) return '懒族自营'; $mp = LanzuMpInfo::find($mid); + if (!$mp){ + return '数据错误'; + } return $mp->name; }); $grid->column('status','状态')->display(function ($status){ @@ -88,7 +91,7 @@ class ImsCjdcMarketController extends AdminController return Form::make(new ImsCjdcMarket(), function (Form $form) { $form->display('id'); $form->text('name'); - $form->select('mq_id','服务商')->options('/api/getMpInfo'); + $form->select('mp_id','服务商')->options('/api/getMpInfo'); $form->text('address'); $form->text('coordinates'); $form->text('poundage'); @@ -97,7 +100,7 @@ class ImsCjdcMarketController extends AdminController $form->text('yd_poundage'); $form->text('loudspeaker_imei')->value(0); $form->number('sort','排序'); - $form->number('status','状态'); + $form->switch('status','状态'); $form->image('logo'); $form->multipleImage('imgs','市场图片'); $form->textarea('introduce'); diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index 05427be..8811438 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/app/Admin/Controllers/LanzuMmInfoController.php @@ -83,14 +83,14 @@ class LanzuMmInfoController extends AdminController { return Form::make(new LanzuMmInfo(), function (Form $form) { $form->display('id'); - $form->text('name'); - $form->text('phone'); - $form->select('market_id','所属市场')->options('/api/getMarket'); - $form->text('user_id','小程序用户ID'); + $form->text('name')->required(); + $form->text('phone')->required(); + $form->select('market_id','所属市场')->options('/api/getMarket')->required(); + $form->text('user_id','小程序用户ID')->required(); $form->image('id_frond')->uniqueName(); $form->image('id_back')->uniqueName(); $form->text('id_number'); - $form->text('status','状态'); + $form->radio('status','状态')->options(['禁用','启用']); $form->saved(function (Form $form,$result){ $adu = new AdminUsers(); if ($form->isCreating()){ diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index cfd8587..36173aa 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/app/Admin/Controllers/LanzuMpInfoController.php @@ -39,11 +39,11 @@ class LanzuMpInfoController extends AdminController if ($status==1){ return '正常'; }elseif($status==0){ - return '待审核'; + return '禁用'; } }); $grid->created_at->display(function ($time) { - return date("Y-m-d H:i:s",$time); + return date("Y-m-d H:i",$time); }); $grid->filter(function (Grid\Filter $filter) { @@ -109,7 +109,7 @@ class LanzuMpInfoController extends AdminController $form->image('id_frond')->uniqueName(); $form->image('id_back')->uniqueName(); $form->text('id_number'); - $form->number('status','状态'); + $form->radio('status','状态')->options(['禁用','启用']); $form->saved(function (Form $form,$result){ $adu = new AdminUsers(); if ($form->isCreating()){