|
@@ -2110,36 +2110,11 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
if(empty($component_type)){
|
|
|
return Result::error('组件类型不存在!');
|
|
|
}
|
|
|
- $article = Article::first()->toArray();
|
|
|
- $category = WebsiteCategory::first()->toArray();
|
|
|
- $footer_category = FooterCategory::first()->toArray();
|
|
|
- $ad = AdPlace::leftJoin('ad_size','ad_place.ad_size_id','=','ad_size.id')
|
|
|
- ->select('ad_place.*','ad_size.width','ad_size.height')
|
|
|
- ->first()->toArray();
|
|
|
- $type_arr = [1,2,3,4,5,6,7,8,9,14];
|
|
|
- // 组件分类:1:资讯-头条组件;2:资讯-轮播组件;3:资讯-推荐图类组件;4:资讯-最新类组件;5:资讯-推荐类;6:资讯-热点类组件;
|
|
|
- // 7:资讯-栏目类组件;8:列表类组件;9:详情类组件;10:二级导航栏类组件;11:广告类;12:静态资源类;13:底部导航类;
|
|
|
$default_code = json_decode($component_type['com_code'] ?? '',true);
|
|
|
- $article_code = array_keys($article);
|
|
|
- if(in_array($component_type['id'], $type_arr) && !empty($default_code)){
|
|
|
- $merged['info'] = array_values(array_unique(array_merge($default_code['listType'], $article_code)));
|
|
|
- $merged['count'] = count($merged['info']);
|
|
|
- // 遍历 $default_code 和 $article 合并键值
|
|
|
- foreach ($merged['info'] as $key => $value) {
|
|
|
- $key = $value;
|
|
|
- if (in_array($value,$article_code)) {
|
|
|
- $merged['info'][$key] = true;
|
|
|
- } else {
|
|
|
- $merged['info'][$key] = false;
|
|
|
- }
|
|
|
- }
|
|
|
- // $component_type['merged_info'] = $merged;
|
|
|
- }
|
|
|
- $merged['count'] = count($merged['info']);
|
|
|
- if(empty($category)){
|
|
|
+ if(empty($default_code)){
|
|
|
return Result::error('组件类型不存在!');
|
|
|
}
|
|
|
- return Result::success($merged);
|
|
|
+ return Result::success($default_code['listType']);
|
|
|
}
|
|
|
/**
|
|
|
* 组件管理-获取所有组件
|