|
|
@@ -68,7 +68,7 @@ class ProductController extends BaseController
|
|
|
|
|
|
//dd($itemInfoData);
|
|
|
//组装数据: [{classId:'','className:'',child:[{itemInfoData}]}]
|
|
|
- $data = ProductService::assembleData($classIds, $itemIdsInfo, $itemInfoData, $oftenItemIds, $type);
|
|
|
+ $data = ProductService::assembleData($classIds, $itemIdsInfo, $itemInfoData, $oftenItemIds, $type, true);
|
|
|
|
|
|
util::success($data);
|
|
|
}
|
|
|
@@ -356,10 +356,10 @@ class ProductController extends BaseController
|
|
|
if (empty($product)) {
|
|
|
continue;
|
|
|
}
|
|
|
- if($product->shopId != $this->shopId){
|
|
|
+ if ($product->shopId != $this->shopId) {
|
|
|
util::fail("不是您的产品");
|
|
|
}
|
|
|
- if(empty($val) || is_numeric($val) == false){
|
|
|
+ if (empty($val) || is_numeric($val) == false) {
|
|
|
util::fail("请填写价格");
|
|
|
}
|
|
|
$currentItemId = $product->itemId ?? 0;
|