gx

@@ -51,7 +51,7 @@ class BTemplateController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :获取当前已选择的模板
+     * @remark :获取可视化数据
      * @name   :getModuleTemplate
      * @name   :getModuleTemplate
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post

@@ -15,6 +15,7 @@ use App\Models\Project\PageSetting;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Service\Service as ServiceSettingModel;
+use App\Models\Template\BTemplateCom;
 use App\Models\Template\BTemplateCommon;
 use App\Models\Template\BTemplateCommon;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
@@ -68,11 +69,11 @@ class BTemplateLogic extends BaseLogic
         $is_list = $this->param['is_list'] ?? 0;//是否为列表页
         $is_list = $this->param['is_list'] ?? 0;//是否为列表页
         $template_id = $this->getSettingTemplate($this->param['source'],$is_list,$is_custom);//设置的模版id
         $template_id = $this->getSettingTemplate($this->param['source'],$is_list,$is_custom);//设置的模版id
         $templateInfo = $this->webTemplateInfo($this->param['source'],$this->param['source_id'],$template_id,$is_custom,$is_list);
         $templateInfo = $this->webTemplateInfo($this->param['source'],$this->param['source_id'],$template_id,$is_custom,$is_list);
-        if($templateInfo === false){
+        if($templateInfo === false){//todo::无装修数据处理
             if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION){//处理定制页面初始数据
             if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION){//处理定制页面初始数据
-                $html = $this->customizedReturnHtml($this->param['source'],$template_id,$is_custom,$is_list);
-                if($html !== false){
-                    return $this->success($html);
+                $data = $this->customizedReturnHtml($this->param['source'],$template_id,$is_custom,$is_list);
+                if($data !== false){
+                    return $this->success($data);
                 }
                 }
             }
             }
             //非定制初始中间部分
             //非定制初始中间部分
@@ -83,11 +84,14 @@ class BTemplateLogic extends BaseLogic
             }
             }
             $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_css'=>$templateInfo['main_css']];
             $mainInfo = ['main_html'=>$templateInfo['main_html'], 'main_css'=>$templateInfo['main_css']];
         }
         }
-        $commonInfo = $this->getCommonHtml($this->param['source'],$is_list,$template_id,$is_custom);//获取非定制头部
+        $commonInfo = $this->getTemplateComHtml($this->param['source'],$is_list,$is_custom,$template_id);//获取非定制头部
         $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other']. $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html'];
         $html = $commonInfo['head_css'].$mainInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other']. $commonInfo['head_html'].$mainInfo['main_html'].$commonInfo['footer_html'];
         $html = $this->getHeadFooter($html);
         $html = $this->getHeadFooter($html);
         $result = ['html'=>$html,'template_id'=>$template_id];
         $result = ['html'=>$html,'template_id'=>$template_id];
-        if($templateInfo !== false) {$result['id'] = $templateInfo['id'];$result['updated_at'] = $templateInfo['updated_at'];}
+        if($templateInfo !== false) {
+            $result['id'] = $templateInfo['id'];
+            $result['updated_at'] = $templateInfo['updated_at'];
+        }
         return $this->success($result);
         return $this->success($result);
     }
     }
 
 
@@ -100,11 +104,11 @@ class BTemplateLogic extends BaseLogic
      */
      */
     public function getCustomizeAllHtml($templateInfo,$template_id,$is_custom,$is_list){
     public function getCustomizeAllHtml($templateInfo,$template_id,$is_custom,$is_list){
         if($is_custom == BTemplate::IS_CUSTOM){
         if($is_custom == BTemplate::IS_CUSTOM){
-            $commonInfo = $this->getCustomizedCommonHtml($this->param['source'],$is_custom,$is_list);//获取定制头部
+            $commonInfo = $this->getTemplateComHtml($templateInfo['source'],$is_custom,$is_list);//获取定制头部
             $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
             $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
         }else{
         }else{
-            $type = $this->getCustomizedType($this->param['source'],$is_list);
-            $commonInfo = $this->getCustomizedCommonHtml($type,$is_custom,$is_list);//获取定制头部
+            $type = $this->getCustomizedType($templateInfo['source'],$is_list);
+            $commonInfo = $this->getTemplateComHtml($type,$is_custom,$is_list);//获取定制头部
             $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
             $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
         }
         }
         return $this->success(['html'=>$html,'template_id'=>$template_id,'id'=>$templateInfo['id'],'updated_at'=>$templateInfo['updated_at']]);
         return $this->success(['html'=>$html,'template_id'=>$template_id,'id'=>$templateInfo['id'],'updated_at'=>$templateInfo['updated_at']]);
@@ -174,7 +178,7 @@ class BTemplateLogic extends BaseLogic
         if($customHtmlInfo === false){
         if($customHtmlInfo === false){
             $this->fail('定制页面，请先上传代码块');
             $this->fail('定制页面，请先上传代码块');
         }
         }
-        $commonInfo = $this->getCustomizedCommonHtml($source,$is_custom,$is_list);//获取定制头部
+        $commonInfo = $this->getTemplateComHtml($source,$is_custom,$is_list);//获取定制头部
         if($commonInfo !== false){
         if($commonInfo !== false){
             $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
             $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
         }
         }
@@ -254,7 +258,7 @@ class BTemplateLogic extends BaseLogic
             if($customHtmlInfo === false){
             if($customHtmlInfo === false){
                 $this->fail('定制页面，请先上传代码块');
                 $this->fail('定制页面，请先上传代码块');
             }
             }
-            $commonInfo = $this->getCustomizedCommonHtml($type,$is_custom,$is_list);//获取定制头部
+            $commonInfo = $this->getTemplateComHtml($type,$is_custom,$is_list);//获取定制头部
             if($commonInfo !== false){
             if($commonInfo !== false){
                 $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
                 $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
             }
             }
@@ -263,6 +267,7 @@ class BTemplateLogic extends BaseLogic
         return false;
         return false;
     }
     }
 
 
+
     /**
     /**
      * @remark :定制项目获取头部底部
      * @remark :定制项目获取头部底部
      * @name   :getCustomizedCommonHtml
      * @name   :getCustomizedCommonHtml
@@ -270,49 +275,25 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/12/29 13:13
      * @time   :2023/12/29 13:13
      */
      */
-    public function getCustomizedCommonHtml($type,$is_custom = 0,$is_list = 0){
-        $data = [
-            'template_id' => 0,
-            'project_id' => $this->user['project_id'],
-            'type'=>$type,
-            'is_custom'=>$is_custom,
-            'is_list'=>$is_list
-        ];
-        $commonTemplateModel = new BTemplateCommon();
-        return $commonTemplateModel->read($data);
-    }
-
-    /**
-     * @remark :定制页面头部类型---根据source获取type类型
-     * @name   :getType
-     * @author :lyh
-     * @method :post
-     * @time   :2023/11/16 11:20
-     */
-    public function getCustomizedType($source,$is_list){
-        $type = BTemplate::TYPE_HOME;
-        if($source == BTemplate::SOURCE_PRODUCT){
-            if($is_list == BTemplate::IS_LIST){
-                $type = BTemplate::TYPE_PRODUCT_LIST;
-            }else{
-                $type = BTemplate::TYPE_PRODUCT_DETAIL;
-            }
-        }
-        if($source == BTemplate::SOURCE_BLOG){
-            if($is_list == BTemplate::IS_LIST){
-                $type = BTemplate::TYPE_BLOG_LIST;
-            }else{
-                $type = BTemplate::TYPE_BLOG_DETAIL;
-            }
-        }
-        if($source == BTemplate::SOURCE_NEWS){
-            if($is_list == BTemplate::IS_LIST){
-                $type = BTemplate::TYPE_NEWS_LIST;
-            }else{
-                $type = BTemplate::TYPE_NEWS_DETAIL;
+    public function getTemplateComHtml($type,$is_custom,$is_list,$template_id = 0){
+        $data = ['head_html'=>'','head_style'=>'','footer_html'=>'','footer_style'=>'','other'=>''];
+        $param = ['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$type,'is_custom'=>$is_custom,'is_list'=>$is_list];
+        $commonTemplateModel = new BTemplateCom();
+        $commonList = $commonTemplateModel->list($param);
+        if(!empty($commonList)){
+            foreach ($commonList as $v){
+                if($v['common_type'] == BTemplate::COMMON_HEAD){
+                    $data['head_html'] = $v['html'];
+                    $data['head_style'] = $v['html_style'];
+                }elseif ($v['common_type'] == BTemplate::COMMON_FOOTER){
+                    $data['footer_html'] = $v['html'];
+                    $data['footer_style'] = $v['html_style'];
+                }else{
+                    $data['other'] = $v['html'];
+                }
             }
             }
         }
         }
-        return $type;
+        return $this->success($data);
     }
     }
 
 
     /**
     /**
@@ -351,37 +332,9 @@ class BTemplateLogic extends BaseLogic
         if($info === false){
         if($info === false){
             $this->fail('请先选择模版');
             $this->fail('请先选择模版');
         }
         }
-        $template_id = $info['template_id'];
-        return $this->success($template_id);
-    }
-
-    /**
-     * @remark :根据类型获取公共头和底
-     * @name   :getCommonPage
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/21 16:55
-     */
-    public function getCommonHtml($source,$is_list,$template_id,$is_custom = 0){
-        $type = $this->getType($source,$is_list,$is_custom);
-        $data = [
-            'template_id' => $template_id,
-            'project_id' => $this->user['project_id'],
-            'type'=>$type,
-            'is_custom'=>0,
-        ];
-        $commonTemplateModel = new BTemplateCommon();
-        $commonInfo = $commonTemplateModel->read($data);
-        if($commonInfo === false){
-            $data['type'] = BTemplate::SOURCE_HOME;
-            $commonInfo = $commonTemplateModel->read($data);
-        }
-        return $this->success($commonInfo);
+        return $this->success($info['template_id']);
     }
     }
 
 
-
-
-
     /**
     /**
      * @remark :保存修改后的模版
      * @remark :保存修改后的模版
      * @name   :templateSave
      * @name   :templateSave
@@ -409,14 +362,12 @@ class BTemplateLogic extends BaseLogic
                 'is_custom'=>$this->param['is_custom'], 'template_id'=>$this->param['template_id'],
                 'is_custom'=>$this->param['is_custom'], 'template_id'=>$this->param['template_id'],
                 'is_list'=>$this->param['is_list']
                 'is_list'=>$this->param['is_list']
             ];
             ];
-            $data = [
-                'section_list_id'=>$this->param['section_list_id']
-            ];
+            $data = ['section_list_id'=>$this->param['section_list_id']];
             $data = $this->handleVisualizationParam($this->param['html'],$this->param['source'],$this->param['is_list'],$this->param['is_custom'],$data);
             $data = $this->handleVisualizationParam($this->param['html'],$this->param['source'],$this->param['is_list'],$this->param['is_custom'],$data);
             $this->model->edit($data,$condition);
             $this->model->edit($data,$condition);
         }
         }
         //更新头部信息
         //更新头部信息
-        $this->saveCommonHtml($this->param['html'],$this->param['source'],$this->param['is_list'],$this->param['template_id'],$this->param['is_custom']);
+        $this->saveTemplateCom($this->param['html'],$this->param['template_id'],$this->param['source'],$this->param['is_list'],$this->param['is_custom']);
         $this->setOperationRecords($this->param['html'],$this->param['source'],$this->param['source_id'],$this->param['template_id'],$this->param['is_custom'],$this->param['is_list']);
         $this->setOperationRecords($this->param['html'],$this->param['source'],$this->param['source_id'],$this->param['template_id'],$this->param['is_custom'],$this->param['is_list']);
         //通知更新
         //通知更新
         $this->homeOrProduct($this->param['source'],$this->param['source_id'],$this->param['is_custom'],$this->param['is_list']);
         $this->homeOrProduct($this->param['source'],$this->param['source_id'],$this->param['is_custom'],$this->param['is_list']);
@@ -446,119 +397,69 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/12/15 10:59
      * @time   :2023/12/15 10:59
      */
      */
     public function handleVisualizationParam($html,$source, $is_list,$is_custom,$data){
     public function handleVisualizationParam($html,$source, $is_list,$is_custom,$data){
-        if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION){//定制项目
+        //TODO::扩展模块定制单独处理
+        if($is_custom == BTemplate::IS_CUSTOM){
+            $customModuleModel = new CustomModule();
+            $info = $customModuleModel->read(['id'=>$source]);
+            if($info === false){
+                $this->fail('当前扩展模块不存在或已被删除');
+            }
+            //todo::扩展模块（列表页/详情页）定制
+            if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION) {
+                $data['html'] = $html;
+                $data['type'] = BTemplate::ALL_HTML;
+                return $this->success($data);
+            }
+        }
+        if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION){
             $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
             $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型
-            //查看当前页面是否定制，是否开启可视化
             $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
             $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
-            if (in_array($type, $page_array)) {//当前页面是定制界面
+            if(in_array($type, $page_array)){
                 $data['html'] = $html;
                 $data['html'] = $html;
                 $data['type'] = BTemplate::ALL_HTML;
                 $data['type'] = BTemplate::ALL_HTML;
-            }else{
-                //TODO::扩展模块定制单独处理
-                if($is_custom == BTemplate::IS_CUSTOM){
-                    $customModuleModel = new CustomModule();
-                    $info = $customModuleModel->read(['id'=>$source]);
-                    if($info === false){
-                        $this->fail('当前扩展模块不存在或已被删除');
-                    }
-                    //todo::扩展模块（列表页/详情页）定制
-                    if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION) {
-                        $data['html'] = $html;
-                        $data['type'] = BTemplate::ALL_HTML;
-                    }
-                }
-                $mainInfo = $this->handleTemplateHtml($html);
-                $data['main_html'] = $mainInfo['main_html'];
-                $data['main_css'] = $mainInfo['main_css'];
+                return $this->success($data);
             }
             }
-        }else{
-            $mainInfo = $this->handleTemplateHtml($html);
-            $data['main_html'] = $mainInfo['main_html'];
-            $data['main_css'] = $mainInfo['main_css'];
         }
         }
-        return $data;
+        $data['main_html'] = characterTruncation($html,'/<main\b[^>]*>(.*?)<\/main>/s');
+        $data['main_css'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
+        return $this->success($data);
     }
     }
 
 
     /**
     /**
-     * @remark :保存公共头部底部
-     * @name   :saveCommonHtml
+     * @remark :保存公共部分（头部。底部。连接部分）
+     * @name   :saveTemplateCom
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/12/13 17:05
+     * @time   :2024/4/29 10:32
      */
      */
-    public function saveCommonHtml($html,$source,$is_list,$template_id,$is_custom){
-        //TODO::定制扩展模块单独处理
-        if($is_custom == BTemplate::IS_CUSTOM){
-            $code = $this->saveCustomModuleCommonHtml($html,$source,$is_custom,$is_list,$template_id);
-            if($code === false){
-                return $this->success();
-            }
-        }
-        //其他情况
-        $type = $this->getType($source,$is_list,$is_custom);//获取头部类型1-9（首页到自定义页面）
-        if($template_id == 0){//定制页面默认为独立头部
-            $type = $this->getCustomizedType($source,$is_list);//定制默认独立头部
-        }
-        $templateCommonModel = new BTemplateCommon();
-        $commonInfo = $templateCommonModel->read(['template_id'=>$template_id,'project_id'=>$this->user['project_id'],'type'=>$type,'is_custom'=>0]);//查看当前头部是否存在
+    public function saveTemplateCom($html,$template_id,$source,$is_list,$is_custom){
+        $typeArr = [BTemplate::COMMON_HEAD, BTemplate::COMMON_FOOTER, BTemplate::COMMON_OTHER];
         $handleInfo = $this->handleCommonParam($html);
         $handleInfo = $this->handleCommonParam($html);
-        if($commonInfo === false){
-            $data = [
-                'head_html'=>$handleInfo['head_html'], 'head_css'=>$handleInfo['head_css'],'other'=>$handleInfo['other'],
-                'footer_html'=>$handleInfo['footer_html'], 'footer_css'=>$handleInfo['footer_css'],
-                'type'=>$type,'template_id'=>$template_id, 'project_id'=>$this->user['project_id'],
-            ];
-            $templateCommonModel->add($data);
-        }else{
-            $data = [
-                'head_html'=>$handleInfo['head_html'], 'head_css'=>$handleInfo['head_css'],'other'=>$handleInfo['other'],
-                'footer_html'=>$handleInfo['footer_html'], 'footer_css'=>$handleInfo['footer_css'],
-            ];
-            $templateCommonModel->edit($data,['id'=>$commonInfo['id']]);
-        }
-        //更新所有界面的other
-        if($template_id != 0){
-            return $templateCommonModel->edit(['other'=>$handleInfo['other']],['project_id'=>$this->user['project_id'],'template_id'=>$template_id]);
-        }
-    }
-
-    /**
-     * @remark :扩展模块定制保存头部处理
-     * @name   :saveCustomModuleCommonHtml
-     * @author :lyh
-     * @method :post
-     * @time   :2024/1/10 11:33
-     */
-    public function saveCustomModuleCommonHtml($html,$source,$is_custom,$is_list,$template_id){
-        $customModuleModel = new CustomModule();
-        $info = $customModuleModel->read(['id'=>$source]);
-        if($info === false){
-            $this->fail('当前扩展模块不存在或已被删除');
-        }
-        //todo::扩展模块（列表页/详情页）定制
-        if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION) {
-            $data = ['type'=>$source,'is_custom'=>$is_custom,'is_list'=>$is_list,'template_id'=>$template_id];
-            $templateCommonModel = new BTemplateCommon();
-            $commonInfo = $templateCommonModel->read($data);//查看当前头部是否存在
-            $handleInfo = $this->handleCommonParam($html);
-            if($commonInfo === false){
-                $data = [
-                    'head_html'=>$handleInfo['head_html'], 'head_css'=>$handleInfo['head_css'],'other'=>$handleInfo['other'],
-                    'footer_html'=>$handleInfo['footer_html'], 'footer_css'=>$handleInfo['footer_css'],
-                    'type'=>$source,'template_id'=>$template_id, 'project_id'=>$this->user['project_id'],
-                    'is_custom'=>$is_custom,'is_list'=>$is_list,
-                ];
-                $templateCommonModel->add($data);
+        $templateComModel = new BTemplateCom();
+        foreach ($typeArr as $type){
+            if($type == BTemplate::COMMON_HEAD){
+                $param['html'] = $handleInfo['head_html'];
+                $param['html_style'] = $handleInfo['head_style'];
+                $typeSource = $this->getType($source,$is_list,$is_custom,$type);//头部是否为独立头部
+            }elseif ($type == BTemplate::COMMON_FOOTER){
+                $param['html'] = $handleInfo['footer_html'];
+                $param['html_style'] = $handleInfo['footer_style'];
+                $typeSource = $this->getType($source,$is_list,$is_custom,$type);
             }else{
             }else{
-                $data = [
-                    'head_html'=>$handleInfo['head_html'], 'head_css'=>$handleInfo['head_css'],'other'=>$handleInfo['other'],
-                    'footer_html'=>$handleInfo['footer_html'], 'footer_css'=>$handleInfo['footer_css'],
-                ];
-                $templateCommonModel->edit($data,['id'=>$commonInfo['id']]);
+                $param['html'] = $handleInfo['other'];
+                $typeSource = $this->getType($source,$is_list,$is_custom);
+            }
+            //查看当前数据是否还存在
+            $condition = ['project_id'=>$this->user['project_id'],'template_id'=>$template_id,'is_list'=>$is_list,'is_custom'=>$is_custom,'source'=>$typeSource,'common_type'=>$type];
+            $info = $templateComModel->read($condition);
+            if($info === false){
+                $param = array_merge($param,$condition);
+                $this->model->add($param);
+            }else{
+                $this->model->edit($param,$condition);
             }
             }
-            return false;
         }
         }
-        return true;
+        return $this->success();
     }
     }
 
 
     /**
     /**
@@ -595,47 +496,31 @@ class BTemplateLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :保存时字符串处理
-     * @name   :handleSaveParam
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/29 15:35
-     */
-    public function handleTemplateHtml($html){
-        //字符串截取
-        $param['main_html'] = characterTruncation($html,'/<main\b[^>]*>(.*?)<\/main>/s');
-        $param['main_css'] = characterTruncation($html,'/<style id="globalsojs-styles">(.*?)<\/style>/s');
-        return $this->success($param);
-    }
-
-    /**
      * @remark :（非定制）保存时获取获取设置的类型
      * @remark :（非定制）保存时获取获取设置的类型
      * @name   :getType
      * @name   :getType
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/10/21 17:29
      * @time   :2023/10/21 17:29
      */
      */
-    public function getType($source,$is_list,$is_custom = 0){
+    public function getType($source,$is_list,$is_custom = BTemplate::IS_NO_CUSTOM,$CommonType = BTemplate::COMMON_HEAD){
         $type = BTemplate::SOURCE_HOME;//首页公共头部底部
         $type = BTemplate::SOURCE_HOME;//首页公共头部底部
         $is_head = $this->user['configuration']['is_head'] ?? BTemplate::IS_NO_HEADER;
         $is_head = $this->user['configuration']['is_head'] ?? BTemplate::IS_NO_HEADER;
-        if($is_custom == BTemplate::IS_CUSTOM){//拓展模块为首页头部
+        if($is_custom == BTemplate::IS_CUSTOM || $is_head == BTemplate::IS_NO_HEADER){//拓展模块为首页头部
             return $this->success($type);
             return $this->success($type);
         }
         }
         //查看页面是否设置自定义头部底部
         //查看页面是否设置自定义头部底部
-        if($is_head != BTemplate::IS_NO_HEADER) {
-            $pageSettingModel = new PageSetting();
-            $pageInfo = $pageSettingModel->read(['project_id' => $this->user['project_id']]);
-            if ($pageInfo === false) {
-                return $this->success($type);
-            }
-            if ($source == BTemplate::SOURCE_PRODUCT) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['product_details'] != 0) {$type = BTemplate::TYPE_PRODUCT_DETAIL;}}
-            else {if ($pageInfo['product_list'] != 0) {$type = BTemplate::TYPE_PRODUCT_LIST;}}}
-            if ($source == BTemplate::SOURCE_BLOG) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['blog_details'] != 0) {$type = BTemplate::TYPE_BLOG_DETAIL;}}
-            else {if ($pageInfo['blog_list'] != 0) {$type = BTemplate::TYPE_BLOG_LIST;}}}
-            if ($source == BTemplate::SOURCE_NEWS) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['news_details'] != 0) {$type = BTemplate::TYPE_NEWS_DETAIL;}}
-            else {if ($pageInfo['news_list'] != 0) {$type = BTemplate::TYPE_NEWS_LIST;}}}
-            if ($source == BTemplate::SOURCE_KEYWORD) {if ($pageInfo['polymerization'] != 0) {$type = BTemplate::TYPE_CUSTOM_PAGE;}}
+        $pageSettingModel = new PageSetting();
+        $pageInfo = $pageSettingModel->read(['project_id' => $this->user['project_id'],'type'=>$CommonType]);
+        if ($pageInfo === false) {
+            return $this->success($type);
         }
         }
+        if ($source == BTemplate::SOURCE_PRODUCT) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['product_details'] != 0) {$type = BTemplate::SOURCE_PRODUCT;}}
+        else {if ($pageInfo['product_list'] != 0) {$type = BTemplate::SOURCE_PRODUCT;}}}
+        if ($source == BTemplate::SOURCE_BLOG) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['blog_details'] != 0) {$type = BTemplate::SOURCE_BLOG;}}
+        else {if ($pageInfo['blog_list'] != 0) {$type = BTemplate::SOURCE_BLOG;}}}
+        if ($source == BTemplate::SOURCE_NEWS) {if ($is_list != BTemplate::IS_LIST) {if ($pageInfo['news_details'] != 0) {$type = BTemplate::SOURCE_NEWS;}}
+        else {if ($pageInfo['news_list'] != 0) {$type = BTemplate::SOURCE_NEWS;}}}
+        if ($source == BTemplate::SOURCE_KEYWORD) {if ($pageInfo['polymerization'] != 0) {$type = BTemplate::TYPE_CUSTOM_PAGE;}}
         return $this->success($type);
         return $this->success($type);
     }
     }
 
 
@@ -956,4 +841,37 @@ class BTemplateLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :定制页面头部类型---根据source获取type类型
+     * @name   :getType
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/16 11:20
+     */
+    public function getCustomizedType($source,$is_list){
+        $type = BTemplate::TYPE_HOME;
+        if($source == BTemplate::SOURCE_PRODUCT){
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_PRODUCT_LIST;
+            }else{
+                $type = BTemplate::TYPE_PRODUCT_DETAIL;
+            }
+        }
+        if($source == BTemplate::SOURCE_BLOG){
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_BLOG_LIST;
+            }else{
+                $type = BTemplate::TYPE_BLOG_DETAIL;
+            }
+        }
+        if($source == BTemplate::SOURCE_NEWS){
+            if($is_list == BTemplate::IS_LIST){
+                $type = BTemplate::TYPE_NEWS_LIST;
+            }else{
+                $type = BTemplate::TYPE_NEWS_DETAIL;
+            }
+        }
+        return $type;
+    }
 }
 }

@@ -29,7 +29,12 @@ class BTemplate extends Base
      */
      */
     const ALL_HTML = 1;//无需拼接数据，获取整个html
     const ALL_HTML = 1;//无需拼接数据，获取整个html
     const PAGE_HTML = 0;//默认保存方式为0，
     const PAGE_HTML = 0;//默认保存方式为0，
-
+    /**
+     * 公共头部底部连接部分
+     */
+    const COMMON_HEAD = 1;//公共头部
+    const COMMON_FOOTER = 2;//公共头部
+    const COMMON_OTHER = 3;//公共头部
     /**
     /**
      * 独立头部类型
      * 独立头部类型
      */
      */
@@ -52,7 +57,7 @@ class BTemplate extends Base
     const IS_NO_CUSTOM = 0;//为默认模块
     const IS_NO_CUSTOM = 0;//为默认模块
     const IS_VISUALIZATION = 1;//定制项目
     const IS_VISUALIZATION = 1;//定制项目
 
 
-    const IS_NO_VISUALIZATION = 1;//定制项目
+    const IS_NO_VISUALIZATION = 0;//非定制项目
     const STATUS = 0;
     const STATUS = 0;
 
 
     /**
     /**

+<?php
+/**
+ * @remark :
+ * @name   :BTemplateCom.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/4/29 10:29
+ */
+
+namespace App\Models\Template;
+
+use App\Models\Base;
+
+/**
+ * @remark :可视化公共部分
+ * @name   :BTemplateCom
+ * @author :lyh
+ * @method :post
+ * @time   :2024/4/29 10:29
+ */
+class BTemplateCom extends Base
+{
+    protected $table = 'gl_web_template_com';
+    //连接数据库
+    protected $connection = 'custom_mysql';
+}