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

@@ -409,7 +409,7 @@ class SyncProject extends Command
         $param = [
         $param = [
             'company' => $data['company_name'],
             'company' => $data['company_name'],
             'phone' => $data['principal_mobile'],
             'phone' => $data['principal_mobile'],
-            'planday' => $data['exclusive_aicc_day'] ?: 1,
+            'planday' => $data['exclusive_hagro_day'] ?: 1,
             'from_order_id' => $data['from_order_id'],
             'from_order_id' => $data['from_order_id'],
             'agent_phone' => Channel::where('source_id', $data['company_id'])->value('contact_mobile') ?: '',
             'agent_phone' => Channel::where('source_id', $data['company_id'])->value('contact_mobile') ?: '',
         ];
         ];

@@ -26,7 +26,8 @@ class CustomTemplateLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/6/29 15:46
      * @time   :2023/6/29 15:46
      */
      */
-    public function customTemplateLists($map,$page,$row,$order = 'created_at',$filed = ['*']){
+    public function customTemplateLists($map,$page,$row,$order = 'created_at'){
+        $filed = ['id','name','status','url','title','keywords','description','project_id','created_at','updated_at'];
         $map['deleted_status'] = 0;
         $map['deleted_status'] = 0;
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
         $lists = $this->model->lists($map,$page,$row,$order,$filed);
         $lists = $this->model->lists($map,$page,$row,$order,$filed);
@@ -42,11 +43,11 @@ class CustomTemplateLogic extends BaseLogic
      */
      */
     public function customTemplateInfo(){
     public function customTemplateInfo(){
         $info = $this->model->read(['id'=>$this->param['id']]);
         $info = $this->model->read(['id'=>$this->param['id']]);
-        $html = $this->getBodyHeaderFooter($info['html'],$info['html_style']);
-        $info['html'] = $this->getHeadFooter($html);
         if($info === false){
         if($info === false){
-            $this->fail('error');
+            $this->fail('当前数据不存在');
         }
         }
+        $html = $this->getBodyHeaderFooter($info['html'],$info['html_style']);
+        $info['html'] = $this->getHeadFooter($html);
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
@@ -223,13 +224,21 @@ class CustomTemplateLogic extends BaseLogic
         if($info === false){
         if($info === false){
             $this->fail('请先设置模版');
             $this->fail('请先设置模版');
         }
         }
-        //兼容老数据
+
         $commonTemplateModel = new BTemplateCommon();
         $commonTemplateModel = new BTemplateCommon();
         $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]);
         $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]);
         $html = '';
         $html = '';
         if($commonInfo !== false){
         if($commonInfo !== false){
             $html = $commonInfo['head_css'].$html_style.$commonInfo['footer_css'].$commonInfo['other'].
             $html = $commonInfo['head_css'].$html_style.$commonInfo['footer_css'].$commonInfo['other'].
                 $commonInfo['head_html'].$preg_html.$commonInfo['footer_html'];
                 $commonInfo['head_html'].$preg_html.$commonInfo['footer_html'];
+        }else{
+            //兼容老数据，获取首页数据
+            $TemplateInfo = $this->webTemplateInfo($info['template_id'],1,0);
+            if($TemplateInfo !== false){
+                $html = preg_replace('/<style id="globalsojs-styles">(.*?)<\/style>/s',$html_style , $TemplateInfo['html']);
+                //内容
+                $html = preg_replace('/<main\b[^>]*>(.*?)<\/main>/s', $preg_html, $html);
+            }
         }
         }
         return $html;
         return $html;
     }
     }