gx

lyh
app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
--- a/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @02ce917
+++ b/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @02ce917
@@ -105,7 +105,7 @@ class BTemplateLogic extends BaseLogic
             $TemplateInfo = $ATemplateModel->read(['id'=>$info['template_id']]);
         }else{
             $commonTemplateModel = new BTemplateCommon();
-            $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]);
+            $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id'],'type'=>$source]);
             if($commonInfo !== false){
                 $TemplateInfo['html'] = $commonInfo['head_css'].$TemplateInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other'].
                     $commonInfo['head_html'].$TemplateInfo['main_html'].$commonInfo['footer_html'];
@@ -142,7 +142,7 @@ class BTemplateLogic extends BaseLogic
         }
         //兼容老数据
         $commonTemplateModel = new BTemplateCommon();
-        $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]);
+        $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id'],'type'=>1]);
         if($commonInfo !== false){
             $html = $commonInfo['head_css'].$main_style.$commonInfo['footer_css'].$commonInfo['other'].
                 $commonInfo['head_html'].$main_html.$commonInfo['footer_html'];