Merge remote-tracking branch 'origin/master' into akun

@@ -235,7 +235,7 @@ class BTemplateLogic extends BaseLogic
         $bTemplateMainModel = new BTemplateMain();
         $bTemplateMainModel = new BTemplateMain();
         $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$type]);
         $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$type]);
         if($mainInfo === false){
         if($mainInfo === false){
-            $data['main_html'] = $this->getModule($type,$is_custom);
+            $data['main_html'] = $this->getModule($type);
             $data['main_css'] = "<style id='globalsojs-styles'></style>";
             $data['main_css'] = "<style id='globalsojs-styles'></style>";
         }else{
         }else{
             $data['main_html'] = $mainInfo['main_html'];
             $data['main_html'] = $mainInfo['main_html'];
@@ -621,10 +621,7 @@ class BTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/7/27 15:08
      * @time   :2023/7/27 15:08
      */
      */
-    public function getModule($type,$is_custom){
-        if($is_custom == BTemplate::SOURCE_CUSTOM){
-            $type == BTemplate::TYPE_CUSTOM_DETAIL;
-        }
+    public function getModule($type){
         $mainModel = new TemplateTypeMain();
         $mainModel = new TemplateTypeMain();
         $info = $mainModel->read(['type'=>$type]);
         $info = $mainModel->read(['type'=>$type]);
         return $info['main_html'];
         return $info['main_html'];
@@ -667,14 +664,6 @@ class BTemplateLogic extends BaseLogic
         return $this->success($list);
         return $this->success($list);
     }
     }
 
 
-
-    /**
-     * @remark :获取类型
-     * @name   :getModuleType
-     * @author :lyh
-     * @method :any
-     * @time   :2023/7/17 16:03
-     */
     /**
     /**
      * @remark :获取类型
      * @remark :获取类型
      * @name   :getModuleType
      * @name   :getModuleType
@@ -701,6 +690,13 @@ class BTemplateLogic extends BaseLogic
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 
+    /**
+     * @remark :获取类型
+     * @name   :getModuleTypes
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/26 14:18
+     */
     public function getModuleTypes(){
     public function getModuleTypes(){
         $data['module'] = ['默认','产品','新闻','博客','产品分类'];
         $data['module'] = ['默认','产品','新闻','博客','产品分类'];
         $data = [
         $data = [
@@ -847,7 +843,10 @@ class BTemplateLogic extends BaseLogic
         $bTemplateMainModel = new BTemplateMain();
         $bTemplateMainModel = new BTemplateMain();
         $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$this->param['type'],'is_custom'=>$is_custom]);
         $mainInfo = $bTemplateMainModel->read(['project_id'=>$this->user['project_id'],'type'=>$this->param['type'],'is_custom'=>$is_custom]);
         if($mainInfo === false){
         if($mainInfo === false){
-            $main_html = $this->getModule($this->param['type'],$is_custom);
+            if($is_custom == BTemplate::SOURCE_CUSTOM) {
+                $this->param['type'] = BTemplate::TYPE_CUSTOM_DETAIL;
+            }
+            $main_html = $this->getModule($this->param['type']);
             $main_style = "<style id='globalsojs-styles'></style>";
             $main_style = "<style id='globalsojs-styles'></style>";
         }else{
         }else{
             $main_html = $mainInfo['main_html'];
             $main_html = $mainInfo['main_html'];

@@ -24,7 +24,7 @@ class BlogRequest extends FormRequest
     public function rules()
     public function rules()
     {
     {
         return [
         return [
-            'name'=>'required|max:100',
+            'name'=>'required|max:200',
 //            'remark'=>'max:500',
 //            'remark'=>'max:500',
             'url'=>'required',
             'url'=>'required',
         ];
         ];
@@ -34,7 +34,7 @@ class BlogRequest extends FormRequest
     {
     {
         return [
         return [
             'name.required'=>'请填写名称',
             'name.required'=>'请填写名称',
-            'name.max'=>'名称超过最长长度100',
+            'name.max'=>'名称超过最长长度200',
             'url.required'=>'链接不能为空',
             'url.required'=>'链接不能为空',
 //            'remark.max'=>'描述超过最长长度500'
 //            'remark.max'=>'描述超过最长长度500'
         ];
         ];

@@ -24,7 +24,7 @@ class NewsRequest extends FormRequest
     public function rules()
     public function rules()
     {
     {
         return [
         return [
-            'name'=>'required|max:100',
+            'name'=>'required|max:200',
 //            'remark'=>'max:500',
 //            'remark'=>'max:500',
             'url'=>'required',
             'url'=>'required',
         ];
         ];
@@ -34,7 +34,7 @@ class NewsRequest extends FormRequest
     {
     {
         return [
         return [
             'name.required'=>'请填写名称',
             'name.required'=>'请填写名称',
-            'name.max'=>'名称超过最长长度100',
+            'name.max'=>'名称超过最长长度200',
             'url.required'=>'链接不能为空',
             'url.required'=>'链接不能为空',
 //            'remark.max'=>'描述超过最长长度500'
 //            'remark.max'=>'描述超过最长长度500'
         ];
         ];