Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/public_producer

app/JsonRpc/PublicRpcService.php

@@ -1399,7 +1399,7 @@ class PublicRpcService implements PublicRpcServiceInterface
         if($website_template_info['status'] == 2){
             return Result::error('网站已应用，不可再次修改！');
         }
-        $template = Template::where('id', $data['template_id'])->first();
+        $template = Template::where('template_id', $data['template_id'])->first();
         if(empty($template)){
             return Result::error('未查询到皮肤！');
         }
@@ -1420,7 +1420,7 @@ class PublicRpcService implements PublicRpcServiceInterface
     {
         // return Result::success($data);
         $website_template_info = WebsiteTemplateInfo::where('website_id', $data['website_id'])->first();
-        if(empty($website_template_info)){
+        if(empty($website_template_info) || empty($website_template_info->template_id) || empty($website_template_info->page_type)){
             return Result::error('请先填写网站基础信息！');
         }
         // 0:未构建 1:未应用 2：已应用   status
@@ -1440,9 +1440,15 @@ class PublicRpcService implements PublicRpcServiceInterface
                     'template_data' => $data['template_data'],
                     'user_id' => $data['user_id'],
                     'canvas_data' => $data['canvas_data'],
+                    'page_type' => $website_template_info['page_type'],
+                    'template_id' => $website_template_info['template_id'],
                 ]);
             }else{
-                $template = WebsiteTemplate::where('website_id', $data['website_id'])->update(['template_data' => $data['template_data'],'user_id' => $data['user_id'],'canvas_data' => $data['canvas_data']]);
+                $template = WebsiteTemplate::where('website_id', $data['website_id'])->update(
+                    ['template_data' => $data['template_data'],'user_id' => $data['user_id'],'canvas_data' => $data['canvas_data'],
+                    'page_type' => $website_template_info['page_type'],
+                    'template_id' => $website_template_info['template_id'],
+                    ]);
             }
             if(empty($template)){
                 Db::rollback();
@@ -1471,7 +1477,8 @@ class PublicRpcService implements PublicRpcServiceInterface
         if(empty($web)){
             return Result::error('未查询到网站信息！');
         }
-        $template = WebsiteTemplate::where('website_id', $data['website_id'])->first();
+        $template = WebsiteTemplate::where('website_id', $data['website_id'])
+        ->first(['website_id','template_id','page_type','template_data','canvas_data']);
         if(empty($template)){
             return Result::error('未查询到模版！');
         }