|
|
|
@ -47,7 +47,7 @@ class GoodsActivityController extends AdminController |
|
|
|
$grid->column('name')->editable(); |
|
|
|
$grid->column('price')->editable(); |
|
|
|
$grid->column('type_text'); |
|
|
|
|
|
|
|
$grid->column('inventory')->editable(); |
|
|
|
$grid->column('market_id')->display(function($marketId){ |
|
|
|
$item = MarketModel::getMarketInfo($marketId,'name'); |
|
|
|
return empty($item) ? '' : $item->name; |
|
|
|
@ -60,10 +60,10 @@ class GoodsActivityController extends AdminController |
|
|
|
$item = CategoryModel::getInfo($categoryId,'title'); |
|
|
|
return empty($item) ? '' : $item->title; |
|
|
|
}); |
|
|
|
$grid->goods_category_id->display(function ($goodsCategoryId){ |
|
|
|
$item = GoodsCategoryModel::getInfo($goodsCategoryId,'title'); |
|
|
|
return empty($item) ? '' : $item->title; |
|
|
|
}); |
|
|
|
// $grid->goods_category_id->display(function ($goodsCategoryId){
|
|
|
|
// $item = GoodsCategoryModel::getInfo($goodsCategoryId,'title');
|
|
|
|
// return empty($item) ? '' : $item->title;
|
|
|
|
// });
|
|
|
|
$grid->column('expire_time_text'); |
|
|
|
$grid->column('sort'); |
|
|
|
$grid->column('on_sale')->switch(); |
|
|
|
@ -181,7 +181,7 @@ class GoodsActivityController extends AdminController |
|
|
|
$form->currency('vip_price')->required()->floatTwo()->symbol('¥'); |
|
|
|
$form->text('goods_unit')->help('如:斤,个,盒,500克,1000克,1500克等'); |
|
|
|
$form->radio('is_infinite')->options(['关闭','开启'])->default(1); |
|
|
|
$form->number('inventory')->required()->attribute('min', 1)->default(1); |
|
|
|
$form->number('inventory')->required()->attribute('min', 0)->default(1); |
|
|
|
$form->number('restrict_num')->attribute('min', 0)->default(1)->help('0表示不限购,单笔订单限购数量'); |
|
|
|
$form->number('start_num')->attribute('min', 1)->default(1); |
|
|
|
$form->number('time_limit_days')->help('A时间段内限购'); |
|
|
|
@ -225,6 +225,15 @@ class GoodsActivityController extends AdminController |
|
|
|
$spec = $form->input('spec'); |
|
|
|
$detailsImgs = $form->input('details_imgs'); |
|
|
|
$goodsCategoryId = $form->input('goods_category_id'); |
|
|
|
|
|
|
|
$inventory = $form->input('inventory'); |
|
|
|
// 规格
|
|
|
|
if(!empty($inventory)){ |
|
|
|
if(!is_numeric($inventory) || $inventory < 0){ |
|
|
|
return $form->error('库存必须为大于等于0的数字'); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if(!empty($storeId)){ |
|
|
|
// 商品所属市场,根据店铺查询市场
|
|
|
|
$info = StoreModel::getStoreInfo($storeId,'market_id'); |
|
|
|
|