diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index 2b940cd..6bc7d36 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -136,7 +136,6 @@ class ProductController extends AdminController */ protected function form() { - Admin::user()->publish_type = json_decode(Admin::user()->publish_type, true); return Form::make(new Product(['spec']), function (Form $form) { //不允许编辑非自己数据 @@ -225,7 +224,7 @@ class ProductController extends AdminController ]; $form->table('extends.field_1_tags', '酒店设施', function (NestedForm $table) { $table->text('tag', '包含项目')->placeholder('如:24小时热水、干洗服务等'); - })->value($default)->help('首次创建时,系统会默认填充基本服务,请根据本酒店情况进行删减或新增'); + })->default($default)->help('首次创建时,系统会默认填充基本服务,请根据本酒店情况进行删减或新增'); $form->text('extends.field_1_name', '酒店名'); $form->text('extends.field_1_address', '地址'); @@ -269,9 +268,15 @@ class ProductController extends AdminController $form->text('extends.field_3_address', '地址'); $form->map('extends.field_3_latitude', 'extends.field_3_longitude', '位置'); })->when(4, function (Form $form) { //车队 + if ($form->isEditing() && $form->model()->type != 4) { + return; + } $form->text('extends.field_4_address', '地址'); $form->map('extends.field_4_latitude', 'extends.field_4_longitude', '位置'); })->when(5, function (Form $form) { //单项 + if ($form->isEditing() && $form->model()->type != 5) { + return; + } $form->text('extends.field_5_address', '地址'); $form->map('extends.field_5_latitude', 'extends.field_5_longitude', '位置'); });