Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -32,7 +32,6 @@ class ReplaceHtmlController extends BaseController
             'is_list'=>'required',
             'is_list'=>'required',
             'is_custom'=>'required',
             'is_custom'=>'required',
             'project_id'=>'required',
             'project_id'=>'required',
-            'template_id'=>'required',
         ],[
         ],[
             'old_html.required' => '需替换的html不能为空',
             'old_html.required' => '需替换的html不能为空',
             'html.required' => 'html不能为空',
             'html.required' => 'html不能为空',
@@ -40,7 +39,6 @@ class ReplaceHtmlController extends BaseController
             'is_custom.required' => '类型is_custom不能为空',
             'is_custom.required' => '类型is_custom不能为空',
             'is_list.required' => '类型is_list不能为空',
             'is_list.required' => '类型is_list不能为空',
             'project_id.required' => 'project_id不能为空',
             'project_id.required' => 'project_id不能为空',
-            'template_id.required' => '模版id不能为空',
         ]);
         ]);
         $logic->replaceHtml();
         $logic->replaceHtml();
         $this->response('success');
         $this->response('success');

@@ -26,39 +26,6 @@ class ReplaceHtmlLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @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;
-    }
-
-    /**
      * @remark :替换可视化的html代码（按类型）
      * @remark :替换可视化的html代码（按类型）
      * @name   :replaceHtml
      * @name   :replaceHtml
      * @author :lyh
      * @author :lyh