diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php index 6832a97..c10ccd7 100644 --- a/app/Admin/Controllers/v3/GoodsController.php +++ b/app/Admin/Controllers/v3/GoodsController.php @@ -111,7 +111,9 @@ class GoodsController extends AdminController $text = ''; if($value){ foreach ($value as $v){ - $text .= '【'.$v['spec_key'] .':'.$v['spec_value'].'】 '; + $specKey = isset($v['spec_key'])?$v['spec_key']:''; + $specValue = isset($v['spec_value'])?$v['spec_value']:''; + $text .= '【'.$specKey .':'.$specValue.'】 '; } } return $text; @@ -198,8 +200,8 @@ class GoodsController extends AdminController $form->tags('tags','标签')->options(['新品','热销','新鲜']); $form->table('spec', function (NestedForm $table) { - $table->text('spec_key')->help('如:净含量:500克,保质期:120天,包装:12个/盒等'); - $table->text('spec_value'); + $table->text('spec_key')->required()->help('如:净含量:500克,保质期:120天,包装:12个/盒等'); + $table->text('spec_value')->required(); }); $form->switch('on_sale') ->customFormat(function ($v) { diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index e143e88..8eb48c1 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -45,7 +45,9 @@ class GoodsNewController extends AdminController $item = ''; if(!empty($spec)){ foreach($spec as $key => $value){ - $item .= $value['spec_key'].':'.$value['spec_value'].'
'; + $specKey = isset($value['spec_key'])?$value['spec_key']:''; + $specValue = isset($value['spec_value'])?$value['spec_value']:''; + $item .= $specKey.':'.$specValue.'
'; } } @@ -84,6 +86,7 @@ class GoodsNewController extends AdminController $filter->equal('market_id')->select($marketList); $filter->equal('on_sale')->select(GoodsModel::$_ONSALE); $filter->equal('price'); + $filter->equal('goods_unit'); }); $grid->model()->orderBy('category_id', 'asc'); @@ -142,7 +145,9 @@ class GoodsNewController extends AdminController $text = ''; if($value){ foreach ($value as $v){ - $text .= '【'.$v['spec_key'] .':'.$v['spec_value'].'】 '; + $specKey = isset($v['spec_key'])?$v['spec_key']:''; + $specValue = isset($v['spec_value'])?$v['spec_value']:''; + $text .= '【'.$specKey .':'.$specValue.'】 '; } } return $text; @@ -229,8 +234,8 @@ class GoodsNewController extends AdminController $form->tags('tags','标签')->options(['新品','热销','新鲜']); $form->table('spec', function (NestedForm $table) { - $table->text('spec_key')->help('如:净含量:500克,保质期:120天,包装:12个/盒等'); - $table->text('spec_value'); + $table->text('spec_key')->required()->help('如:净含量:500克,保质期:120天,包装:12个/盒等'); + $table->text('spec_value')->required(); }); $form->switch('on_sale') ->customFormat(function ($v) {