周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 b039b1c780928631786ebc980e3e99959496951d 1 个父辈 8b095562

gx

内嵌 并排对比
正在显示 1 个修改的文件 包含 1 行增加 和 1 行删除
@@ -85,7 +85,7 @@ class BTemplateLogic extends BaseLogic @@ -85,7 +85,7 @@ class BTemplateLogic extends BaseLogic
85 $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_style'=>$templateInfo['main_css']]; 85 $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_style'=>$templateInfo['main_css']];
86 } 86 }
87 $commonInfo = $this->getTemplateComHtml($this->param['source'],$is_list,$is_custom,$template_id);//获取非定制头部 87 $commonInfo = $this->getTemplateComHtml($this->param['source'],$is_list,$is_custom,$template_id);//获取非定制头部
88 - $html = $commonInfo['head_style'].$mainInfo['main_style'].$commonInfo['footer_style'].$commonInfo['other']. $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html']; 88 + $html = $commonInfo['head_style'].$mainInfo['main_css'].$commonInfo['footer_style'].$commonInfo['other']. $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html'];
89 $html = $this->getHeadFooter($html); 89 $html = $this->getHeadFooter($html);
90 $result = ['html'=>$html,'template_id'=>$template_id]; 90 $result = ['html'=>$html,'template_id'=>$template_id];
91 if($templateInfo !== false) { 91 if($templateInfo !== false) {