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

@@ -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'];