|
|
@@ -4309,19 +4309,23 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
}
|
|
|
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'];
|
|
|
+ }else{
|
|
|
+ $cat_arr[$cat_key] = $all_cate[$cat_key]['category_arr_id'];
|
|
|
+ }
|
|
|
if (in_array($component_type, [23, 24])) {
|
|
|
$componentData[0]['name'] = $all_cate[$cat_key]['alias'];
|
|
|
- $componentData[0]['category_arr'] = $all_cate[$cat_key]['category_arr_id'];
|
|
|
+ $componentData[0]['category_id'] = $all_cate[$cat_key]['category_id'];
|
|
|
+ $componentData[0]['category_arr'] = $cat_arr[$cat_key];
|
|
|
$componentData[1]['name'] = $all_cate[$cat_key + 1]['alias'];
|
|
|
- $componentData[1]['category_arr'] = $all_cate[$cat_key + 1]['category_arr_id'];
|
|
|
+ $componentData[1]['category_id'] = $all_cate[$cat_key + 1]['category_id'];
|
|
|
+ $componentData[1]['category_arr'] = $cat_arr[$cat_key + 1];
|
|
|
$cat_key += 2;
|
|
|
} else {
|
|
|
$componentData['name'] = $all_cate[$cat_key]['alias'];
|
|
|
- if(!empty($all_cate[$cat_key]['category_arr_id'])){
|
|
|
- $componentData['category_arr'] = $all_cate[$cat_key]['real_category_arr_id'];
|
|
|
- }else{
|
|
|
- $componentData['category_arr'] = $all_cate[$cat_key]['category_arr_id'];
|
|
|
- }
|
|
|
+ $componentData['category_arr'] = $cat_arr[$cat_key];
|
|
|
+ $componentData['category_id'] = $all_cate[$cat_key]['category_id'];
|
|
|
$cat_key++;
|
|
|
}
|
|
|
}
|