周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 d13fd8f9ca0251b8312804388ff76ff0713135fb 1 个父辈 c1aec357

gx

内嵌 并排对比
正在显示 2 个修改的文件 包含 2 行增加 和 0 行删除
@@ -121,6 +121,7 @@ class BTemplateLogic extends BaseLogic @@ -121,6 +121,7 @@ class BTemplateLogic extends BaseLogic
121 if($otherInfo === false){ 121 if($otherInfo === false){
122 $this->fail('获取失败，请联系管理员222'); 122 $this->fail('获取失败，请联系管理员222');
123 } 123 }
  124 + $condition['is_list'] = $is_list;
124 $footerComInfo = $this->getFooterComHtml($condition,$source,$is_list,$is_custom,$template_id); 125 $footerComInfo = $this->getFooterComHtml($condition,$source,$is_list,$is_custom,$template_id);
125 $data = ['head_html'=>$headComInfo['html'] ?? '', 'head_style'=>$headComInfo['html_style'] ?? '', 'other'=>$otherInfo['html'] ?? '', 126 $data = ['head_html'=>$headComInfo['html'] ?? '', 'head_style'=>$headComInfo['html_style'] ?? '', 'other'=>$otherInfo['html'] ?? '',
126 'footer_html'=>$footerComInfo['html'] ?? '','footer_style'=>$footerComInfo['html_style'] ?? '']; 127 'footer_html'=>$footerComInfo['html'] ?? '','footer_style'=>$footerComInfo['html_style'] ?? ''];
@@ -77,6 +77,7 @@ class InitHtmlLogic extends BaseLogic @@ -77,6 +77,7 @@ class InitHtmlLogic extends BaseLogic
77 if($otherInfo === false){ 77 if($otherInfo === false){
78 $this->fail('获取失败，请联系管理员'); 78 $this->fail('获取失败，请联系管理员');
79 } 79 }
  80 + $condition['is_list'] = $is_list;
80 $footerComInfo = $this->getFooterComHtml($condition,$source,$is_list,$is_custom,$template_id); 81 $footerComInfo = $this->getFooterComHtml($condition,$source,$is_list,$is_custom,$template_id);
81 $data = ['head_html'=>$headComInfo['html'] ?? '', 'head_style'=>$headComInfo['html_style'] ?? '', 'other'=>$otherInfo['html'] ?? '', 82 $data = ['head_html'=>$headComInfo['html'] ?? '', 'head_style'=>$headComInfo['html_style'] ?? '', 'other'=>$otherInfo['html'] ?? '',
82 'footer_html'=>$footerComInfo['html'] ?? '','footer_style'=>$footerComInfo['html_style'] ?? '']; 83 'footer_html'=>$footerComInfo['html'] ?? '','footer_style'=>$footerComInfo['html_style'] ?? ''];