|
|
@@ -76,6 +76,8 @@ class Product extends Controller
|
|
|
$product_specs = isset($value['product_specs']) ? explode(',', $value['product_specs']) : '';
|
|
|
//移除空数组
|
|
|
$result['data'][$key]['product_specs'] = $product_specs ? array_filter($product_specs) : '';
|
|
|
+ $sampling_cycle = isset($value['sampling_cycle']) ? explode(',', $value['sampling_cycle']) : '';
|
|
|
+ $result['data'][$key]['sampling_cycle'] = $sampling_cycle ? array_filter($sampling_cycle) : '';
|
|
|
}
|
|
|
}
|
|
|
// 加载模板
|
|
|
@@ -212,6 +214,8 @@ class Product extends Controller
|
|
|
$product_specs = isset($data->product_specs) ? explode(',', $data->product_specs) : '';
|
|
|
//移除空数组
|
|
|
$data->product_specs = $product_specs ? array_filter($product_specs) : '';
|
|
|
+ $sampling_cycle = isset($data->sampling_cycle) ? explode(',', $data->sampling_cycle) : '';
|
|
|
+ $data->sampling_cycle = $sampling_cycle ? array_filter($sampling_cycle) : '';
|
|
|
// 加载模板
|
|
|
return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
|
|
|
}
|
|
|
@@ -245,7 +249,7 @@ class Product extends Controller
|
|
|
$all_data['product_brand'] = $product_brand;
|
|
|
$all_data['product_keyword'] = $product_keyword;
|
|
|
$minimum_order_quantity = request('minimum_order_quantity', 1);
|
|
|
- $sampling_cycle = request('sampling_cycle', '0');
|
|
|
+ $sampling_cycle = request('sampling_cycle', '');
|
|
|
$sampling_start_time = request('sampling_start_time', '');
|
|
|
$sampling_end_time = request('sampling_end_time', '');
|
|
|
$round_number = request('round_number', 1);
|
|
|
@@ -358,7 +362,7 @@ class Product extends Controller
|
|
|
$all_data['product_brand'] = $product_brand;
|
|
|
$all_data['product_keyword'] = $product_keyword;
|
|
|
$minimum_order_quantity = request('minimum_order_quantity', 1);
|
|
|
- $sampling_cycle = request('sampling_cycle', '0');
|
|
|
+ $sampling_cycle = request('sampling_cycle', '');
|
|
|
$sampling_start_time = request('sampling_start_time', '');
|
|
|
$sampling_end_time = request('sampling_end_time', '');
|
|
|
$round_number = request('round_number', 1);
|