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

@@ -85,7 +85,7 @@ class BTemplateLogic extends BaseLogic
         }else{
             if($templateInfo['type'] == BTemplate::ALL_HTML){//返回整个html代码
                 $type = $this->getCustomizedType($source, $source_id);//定制获取头部底部类型
-                $commonInfo = $this->getCommonPage(0,$this->user['project_id'],$type);//获取定制头部
+                $commonInfo = $this->getCommonPage($type,$this->user['project_id'],0);//获取定制头部
                 $html = $this->handleAllHtml($commonInfo,$templateInfo['html']);
                 return $this->success(['html'=>$html,'template_id'=>$template_id,'id'=>$templateInfo['id']]);
             }
@@ -136,6 +136,10 @@ class BTemplateLogic extends BaseLogic
             if($customHtmlInfo === false){
                 $this->fail('定制页面，请先上传代码块');
             }
+            $commonInfo = $this->getCommonPage($type,$this->user['project_id'],0);//获取定制头部
+            if($commonInfo !== false){
+                $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
+            }
             return $customHtmlInfo['main_html'];
         }
         return [];

@@ -58,7 +58,7 @@ class KeywordLogic extends  BaseLogic
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 //TODO::不能修改路由
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
-                $route = $this->param['route'];
+                $route = RouteMap::getRoute(RouteMap::SOURCE_PRODUCT_KEYWORD,$this->param['id'], $this->user['project_id']);
             }else{
                 $this->param = $this->addHandleParam($this->param);
                 $id = $this->model->insertGetId($this->param);