|
|
@@ -4302,17 +4302,32 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
$component_data = json_decode($value['sector_components'][$i]['component']['component_data'] ?? '[]', true) ?? [];
|
|
|
$list_type = json_decode($value['sector_components'][$i]['component']['component_column'] ?? '[]', true) ?? [];
|
|
|
if (!empty($component_data) && !empty($list_type)) {
|
|
|
- $componentData = $component_data['componentData'];
|
|
|
+ if (in_array($component_type, [23, 24])) {
|
|
|
+ $componentData[0] = $component_data['componentData'];
|
|
|
+ $componentData[1] = $component_data['componentData'];
|
|
|
+ }else{
|
|
|
+ $componentData = $component_data['componentData'];
|
|
|
+ }
|
|
|
if ($component_type != 10) {
|
|
|
- $componentData['listType'] = $list_type['listType'];
|
|
|
+ if (in_array($component_type, [23, 24])) {
|
|
|
+ $componentData[0]['listType'] = $list_type['listType'];
|
|
|
+ $componentData[1]['listType'] = $list_type['listType'];
|
|
|
+ }else{
|
|
|
+ $componentData['listType'] = $list_type['listType'];
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (in_array($component_type, [7, 14, 15, 23, 24]) && ($page == 1 || $page == 2)) {
|
|
|
if ($page == 1) {
|
|
|
if(!empty($all_cate[$cat_key]['real_category_arr_id'])){
|
|
|
- $cat_arr[$cat_key] = $all_cate[$cat_key]['real_category_arr_id'];
|
|
|
+ $cat_arr[$cat_key] = json_decode($all_cate[$cat_key]['real_category_arr_id'],true);
|
|
|
+ }else{
|
|
|
+ $cat_arr[$cat_key] = json_decode($all_cate[$cat_key]['category_arr_id'],true);
|
|
|
+ }
|
|
|
+ if(!empty($all_cate[$cat_key+1]['real_category_arr_id'])){
|
|
|
+ $cat_arr[$cat_key+1] = json_decode($all_cate[$cat_key+1]['real_category_arr_id'],true);
|
|
|
}else{
|
|
|
- $cat_arr[$cat_key] = $all_cate[$cat_key]['category_arr_id'];
|
|
|
+ $cat_arr[$cat_key+1] = json_decode($all_cate[$cat_key+1]['category_arr_id'],true);
|
|
|
}
|
|
|
if (in_array($component_type, [23, 24])) {
|
|
|
$componentData[0]['name'] = $all_cate[$cat_key]['alias'];
|