gx

@@ -207,26 +207,26 @@ class ATemplateLogic extends BaseLogic
         $info = $bTemplateModel->read(['source'=>1,'template_id'=>$template_id]);
         if($info === false){
             $data = [
-                'source'=>1, 'source_id'=>0, 'template_id'=>$template_id, 'main_html'=>$templateInfo['main_html'],
+                'source'=>BTemplate::SOURCE_COM, 'source_id'=>0, 'template_id'=>$template_id, 'main_html'=>$templateInfo['main_html'],
                 'main_css'=>$templateInfo['main_css'], 'project_id'=>$project_id,
             ];
             $bTemplateModel->add($data);
         }
         //保存一次公共头部+底部+other信息
         $bComTemplateModel = new BTemplateCom();
-        $condition = ['template_id'=>$template_id,'common_type'=>BTemplate::COMMON_HEAD,'source'=>BTemplate::SOURCE_HOME];
+        $condition = ['template_id'=>$template_id,'common_type'=>BTemplate::COMMON_HEAD,'source'=>BTemplate::SOURCE_COM];
         $headInfo = $bComTemplateModel->read($condition);
         if($headInfo === false){
             $headData = ['html'=>$templateInfo['head_html'], 'html_style'=>$templateInfo['head_css'], 'project_id'=>$project_id];
             $bComTemplateModel->add(array_merge($condition,$headData));
         }
-        $condition = ['template_id'=>$template_id,'common_type'=>BTemplate::COMMON_FOOTER,'source'=>BTemplate::SOURCE_HOME];
+        $condition = ['template_id'=>$template_id,'common_type'=>BTemplate::COMMON_FOOTER,'source'=>BTemplate::SOURCE_COM];
         $footerInfo = $bComTemplateModel->read($condition);
         if($footerInfo === false){
             $footerData = ['html'=>$templateInfo['head_html'], 'html_style'=>$templateInfo['head_css'], 'project_id'=>$project_id];
             $bComTemplateModel->add(array_merge($condition,$footerData));
         }
-        $condition = ['template_id'=>$template_id,'common_type'=>BTemplate::COMMON_OTHER,'source'=>BTemplate::SOURCE_HOME];
+        $condition = ['template_id'=>$template_id,'common_type'=>BTemplate::COMMON_OTHER,'source'=>BTemplate::SOURCE_COM];
         $footerInfo = $bComTemplateModel->read($condition);
         if($footerInfo === false){
             $other = str_replace('<header','',characterTruncation($templateInfo['html'],"/<link id=\"google-fonts-link\"(.*?)<header/s"));

@@ -427,8 +427,8 @@ class BlogLogic extends BaseLogic
             'updated_at'=>date('Y-m-d H:i:s'),
         ];
         $save_id = $this->model->insertGetId($param);
-        $route = RouteMap::setRoute($param['route'], RouteMap::SOURCE_BLOG, $save_id, $this->user['project_id']);
-        $this->model->edit(['route'=>$route],['id'=>$save_id]);
+        $route = RouteMap::setRoute($param['url'], RouteMap::SOURCE_BLOG, $save_id, $this->user['project_id']);
+        $this->model->edit(['url'=>$route],['id'=>$save_id]);
         //同步可视化装修数据
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id);
         return $this->success(['id'=>$save_id]);

@@ -471,8 +471,8 @@ class NewsLogic extends BaseLogic
             'updated_at'=>date('Y-m-d H:i:s'),
         ];
         $save_id = $this->model->insertGetId($param);
-        $route = RouteMap::setRoute($param['route'], RouteMap::SOURCE_NEWS, $save_id, $this->user['project_id']);
-        $this->model->edit(['route'=>$route],['id'=>$save_id]);
+        $route = RouteMap::setRoute($param['url'], RouteMap::SOURCE_NEWS, $save_id, $this->user['project_id']);
+        $this->model->edit(['url'=>$route],['id'=>$save_id]);
         //同步可视化装修数据
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id);
         return $this->success(['id'=>$save_id]);

@@ -15,6 +15,7 @@ class BTemplate extends Base
     /**
      * 模块类型
     */
+    const SOURCE_COM = 99;//公共页面
     const SOURCE_HOME = 1;//首页
     const SOURCE_PRODUCT = 2;//产品