|
@@ -2674,7 +2674,8 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
->where('component.type_id', 11);
|
|
->where('component.type_id', 11);
|
|
|
});
|
|
});
|
|
|
})
|
|
})
|
|
|
- ->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')
|
|
|
->orderBy('component.sort_id')
|
|
->orderBy('component.sort_id')
|
|
|
->orderBy('sector_component.sector_id')
|
|
->orderBy('sector_component.sector_id')
|
|
|
->get()->all();
|
|
->get()->all();
|
|
@@ -2703,9 +2704,9 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
// var_dump($array_key);
|
|
// var_dump($array_key);
|
|
|
// 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'];
|
|
|
$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_code = json_decode($value['component_code']) ?? [];
|
|
|
// $component[$key] = $value['component_data'];
|
|
// $component[$key] = $value['component_data'];
|