gx

@@ -12,6 +12,7 @@ namespace App\Http\Logic\Bside\BTemplate;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Template\BTemplate;
+use App\Models\Template\BTemplateCommon;
 use App\Models\Template\BTemplateLog;
 
 class BTemplateLogLogic extends BaseLogic
@@ -41,12 +42,17 @@ class BTemplateLogLogic extends BaseLogic
         if(($this->user['project_id'] == 1) && (!in_array($this->user['mobile'],$bTemplateModel->mobile)) && ($info['source'] == 1)){
             $this->fail('演示项目仅支持演示功能,无法更改首页');
         }
-        $data = $this->setParam($info);
-        $BTemplateModel = new BTemplate();
-        $rs = $BTemplateModel->edit($data,['template_id'=>$info['template_id'],'source'=>$info['source'],'source_id'=>$info['source_id']]);
-        if($rs === false){
-            $this->fail('error');
+        try {
+            $data = $this->setParam($info);
+            $BTemplateModel = new BTemplate();
+            $BTemplateModel->edit($data,['template_id'=>$info['template_id'],'source'=>$info['source'],'source_id'=>$info['source_id']]);
+            $commonData = $this->setCommonParam($info);
+            $commonTemplateModel = new BTemplateCommon();
+            $commonTemplateModel->edit($commonData,['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]);
+        }catch (\Exception $e){
+            $this->fail('系统错误，请联系管理员');
         }
+        //同步更新公共头和底
         return $this->success();
     }
 
@@ -71,6 +77,23 @@ class BTemplateLogLogic extends BaseLogic
     }
 
     /**
+     * @remark :设置回滚公共参数参数
+     * @name   :setParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/23 14:18
+     */
+    public function setCommonParam($info){
+        $data = [
+            'head_html'=>$info['head_html'],
+            'head_css'=>$info['head_css'],
+            'footer_html'=>$info['footer_html'],
+            'footer_css'=>$info['footer_css'],
+        ];
+        return  $this->success($data);
+    }
+
+    /**
      * @remark :获取数据详情
      * @name   :templateLogInfo
      * @author :lyh

@@ -212,6 +212,7 @@ class BTemplateLogic extends BaseLogic
             }else{
                 $this->model->edit($this->param,['id'=>$info['id']]);
             }
+            //写入操作模版记录
             $this->setTemplateLog($this->param);
             DB::commit();
         }catch (\Exception $e){

@@ -6,6 +6,7 @@ use App\Http\Logic\Bside\BaseLogic;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Template\BCustomTemplate;
+use App\Models\Template\BTemplateCommon;
 use App\Models\Template\Setting;
 use App\Models\Template\BTemplate;
 
@@ -169,27 +170,17 @@ class CustomTemplateLogic extends BaseLogic
      * @method :post
      * @time   :2023/7/21 18:08
      */
-    public function getBodyHeaderFooter($preg_html,$html_style){
+    public function getBodyHeaderFooter($preg_html = "<main></main>",$html_style = "<style id='globalsojs-styles'></style>"){
         //获取设置的默认模版
         $bSettingModel = new Setting();
         $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
-        //获取模板详情
-        $bTemplateModel = new BTemplate();
-        $TemplateInfo = $bTemplateModel->read([
-            'template_id'=>$info['template_id'],
-            'project_id'=>$this->user['project_id'],
-            'source'=>1//首页
-        ]);
+        //兼容老数据
+        $commonTemplateModel = new BTemplateCommon();
+        $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]);
         $html = '';
-        if($TemplateInfo !== false){
-            if(empty($preg_html)){
-                $preg_html  = "<main></main>";
-                $html = preg_replace('/<style id="globalsojs-styles">(.*?)<\/style>/s', "<style id='globalsojs-styles'></style>", $TemplateInfo['html']);
-            }else{
-                $html = preg_replace('/<style id="globalsojs-styles">(.*?)<\/style>/s',$html_style , $TemplateInfo['html']);
-            }
-            //内容
-            $html = preg_replace('/<main\b[^>]*>(.*?)<\/main>/s', $preg_html, $html);
+        if($commonInfo !== false){
+            $html = $commonInfo['head_css'].$html_style.$commonInfo['footer_css'].$commonInfo['other'].
+                $commonInfo['head_html'].$preg_html.$commonInfo['footer_html'];
         }
         return $html;
     }