|
@@ -2675,7 +2675,7 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
});
|
|
});
|
|
|
})
|
|
})
|
|
|
->select('sector.sector_name', 'sector_component.sector_id', 'component.*', 'component_img.img_url'
|
|
->select('sector.sector_name', 'sector_component.sector_id', 'component.*', 'component_img.img_url'
|
|
|
- ,'sector.pic_height')
|
|
|
|
|
|
|
+ ,'sector.pic_height','sector.sector_img')
|
|
|
->orderBy('component.sort_id')
|
|
->orderBy('component.sort_id')
|
|
|
->orderBy('sector_component.sector_id')
|
|
->orderBy('sector_component.sector_id')
|
|
|
->get()->all();
|
|
->get()->all();
|
|
@@ -2705,11 +2705,10 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
// var_dump(in_array($sector_id,$sectors_key));
|
|
// var_dump(in_array($sector_id,$sectors_key));
|
|
|
$comlist_key[$array_key][$sector_id]['sectorName'] = $value['sector_name'];
|
|
$comlist_key[$array_key][$sector_id]['sectorName'] = $value['sector_name'];
|
|
|
$comlist_key[$array_key][$sector_id]['sectorHeight'] = $value['pic_height'];
|
|
$comlist_key[$array_key][$sector_id]['sectorHeight'] = $value['pic_height'];
|
|
|
|
|
+ $comlist_key[$array_key][$sector_id]['sectorImg'] = $value['sector_img'];
|
|
|
$componentList['component_style'] = 1;
|
|
$componentList['component_style'] = 1;
|
|
|
$componentList['sort'] = $value['sort_id'];
|
|
$componentList['sort'] = $value['sort_id'];
|
|
|
// 1:资讯;2:广告;3:静态;
|
|
// 1:资讯;2:广告;3:静态;
|
|
|
- // $component_code = json_decode($value['component_code']) ?? [];
|
|
|
|
|
- // $component[$key] = $value['component_data'];
|
|
|
|
|
$component_data = empty($value['component_data']) ? null : (json_decode($value['component_data']) ?? []);
|
|
$component_data = empty($value['component_data']) ? null : (json_decode($value['component_data']) ?? []);
|
|
|
// 检查 $value['component_column'] 是否为非空字符串,避免传递 null 给 json_decode
|
|
// 检查 $value['component_column'] 是否为非空字符串,避免传递 null 给 json_decode
|
|
|
$listType = empty($value['component_column']) ? null : (json_decode($value['component_column']) ?? []);;
|
|
$listType = empty($value['component_column']) ? null : (json_decode($value['component_column']) ?? []);;
|
|
@@ -2779,8 +2778,6 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
$comlist_key[$array_key][$sector_id]['componentList'] = $componentList;
|
|
$comlist_key[$array_key][$sector_id]['componentList'] = $componentList;
|
|
|
}
|
|
}
|
|
|
$keys[$key] = $key;
|
|
$keys[$key] = $key;
|
|
|
-
|
|
|
|
|
- // $array_key++;
|
|
|
|
|
}
|
|
}
|
|
|
// return Result::success($sector_arr_key);
|
|
// return Result::success($sector_arr_key);
|
|
|
// $page[$keys] = array_column($page,$sectors_key[0]);
|
|
// $page[$keys] = array_column($page,$sectors_key[0]);
|