作者 李宇航

合并分支 'lyh-server' 到 'master'

列表页聚合页模式



查看合并请求 !2466
... ... @@ -116,7 +116,7 @@ class BTemplateLogic extends BaseLogic
$bTemplateComModel = new BTemplateCom();
$otherInfo = $bTemplateComModel->read(['source'=>$headComInfo['source'],'common_type'=>BTemplate::COMMON_OTHER,'is_list'=>$headComInfo['is_list'],'is_custom'=>$headComInfo['is_custom'],'template_id'=>$template_id]);
if($otherInfo === false){
$this->fail('获取失败,请联系管理员222');
$otherInfo = $bTemplateComModel->read(['source'=>99,'common_type'=>BTemplate::COMMON_OTHER,'is_list'=>$headComInfo['is_list'],'is_custom'=>$headComInfo['is_custom'],'template_id'=>$template_id]);
}
$footerComInfo = $this->getFooterComHtml($condition,$source,$is_list,$is_custom,$template_id);
$data = ['head_html'=>$headComInfo['html'] ?? '', 'head_style'=>$headComInfo['html_style'] ?? '', 'other'=>$otherInfo['html'] ?? '',
... ...