diff --git a/app/apis/controller/VehicleNewController.php b/app/apis/controller/VehicleNewController.php index d0013ae..ebe8db1 100644 --- a/app/apis/controller/VehicleNewController.php +++ b/app/apis/controller/VehicleNewController.php @@ -112,12 +112,19 @@ class VehicleNewController extends BaseController return $result; } foreach ($item['sku'] as &$sku) { - foreach ($sku['skuAttributes'] as &$skuAttribute){ + $i=0; + $skuAttributes = $sku['skuAttributes']; + foreach ($skuAttributes as $key => &$skuAttribute){ $attribute = VehicleNewAttributesTranslationModel::where(['attributes_id' => $skuAttribute['attribute']['id'],'locale'=>locale()])->first(); $value = VehicleNewAttributeValuesTranslationModel::where(['values_id' => $skuAttribute['value']['id'],'locale'=>locale()])->first(); - $skuAttribute['attribute']['attribute_name'] = $attribute['attribute_name'] ; - $skuAttribute['value']['value_name'] = $value['value_name']; + //$skuAttribute['attribute']['attribute_name'] = $attribute['attribute_name'] ; + //$skuAttribute['value']['value_name'] = $value['value_name']; + $sku['skuAttributes'][$key]['attribute_name'] = $attribute['attribute_name']; + $sku['skuAttributes'][$key]['value_name'] = $value['value_name']; + $sku['skuAttributes'][$key]['color_code'] =$sku['skuAttributes'][$key]['value']['color_code']; + $sku['skuAttributes'][$key]['img_full'] = (!empty($skuAttribute['img']))?(new \app\mzl\modules\upload\service\OssService())->generatePrivateUrl($skuAttribute['img']):''; + } $result['sku'][] = $sku; } diff --git a/app/apis/service/VehicleNewService.php b/app/apis/service/VehicleNewService.php index 064c37b..b6439ad 100644 --- a/app/apis/service/VehicleNewService.php +++ b/app/apis/service/VehicleNewService.php @@ -79,7 +79,7 @@ class VehicleNewService extends BaseService 'energy.translation' => ['energy_id', 'name'], 'models.translation' => ['model_id', 'name'], 'sku' => [], - 'sku.skuAttributes' => [], + 'sku.skuAttributes' => ['id','sku_id','attribute_id','value_id','img',], 'sku.skuAttributes.attribute' => ['id', 'input_type', 'is_img', 'status'], 'sku.skuAttributes.value' => ['id','color_code'], ],