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);
+            $data['main_html'] = $this->getModule($type,$is_custom);
             $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'];
@@ -622,9 +622,9 @@ class BTemplateLogic extends BaseLogic
      * @time   :2023/7/27 15:08
      * @time   :2023/7/27 15:08
      */
      */
     public function getModule($type,$is_custom){
     public function getModule($type,$is_custom){
-//        if($is_custom == BTemplate::SOURCE_CUSTOM){
-//            $type == BTemplate::TYPE_CUSTOM_DETAIL;
-//        }
+        if($is_custom == BTemplate::SOURCE_CUSTOM){
+            $type == BTemplate::TYPE_CUSTOM_DETAIL;
+        }
         $mainModel = new TemplateTypeMain();
         $mainModel = new TemplateTypeMain();
         $info = $mainModel->read(['type'=>$type]);
         $info = $mainModel->read(['type'=>$type]);
         return $info['main_html'];
         return $info['main_html'];