Merge branch '20250522_diywebfr'

app/JsonRpc/PublicRpcService.php

@@ -1255,6 +1255,7 @@ class PublicRpcService implements PublicRpcServiceInterface
      */
     public function addWebPageType(array $data): array
     {
+        // return Result::success($data);
         // 1:首页 2：频道页 3：列表页 4：详情页 5：搜索页 6：特殊列表 7：特殊详情页'
         if($data['is_search'] == 1){
             $page_type = json_encode([1,2,3,4,5,6,7]);
@@ -1263,18 +1264,16 @@ class PublicRpcService implements PublicRpcServiceInterface
         }
         // 0：未构建；1：已填写基础信息；2：已选择模板；    action_id
         $website_template_info = WebsiteTemplateInfo::where('website_id', $data['website_id'])->first();
-        if($website_template_info['action_id'] == 2){
-            return Result::error('网站已应用，不可再次修改！');
-        }
+        // return Result::success($website_template_info);
+        
+        // return Result::success(empty($website_template_info));
         if(empty($website_template_info)){
-            $result = WebsiteTemplateInfo::insertGetId([
-                'website_id' => $data['website_id'],
-                'page_type' => $page_type,
-                'action_id' => 1,
-                'status' => 0,
-                'user_id' => $data['user_id'],
-            ]);
+            $result = WebsiteTemplateInfo::insertGetId(['website_id' => $data['website_id'], 'page_type' => $page_type, 'user_id' => $data['user_id']]);
+                
         }else{
+            if($website_template_info['action_id'] == 2){
+                return Result::error('网站已应用，不可再次修改！');
+            }
             $result = WebsiteTemplateInfo::where('website_id', $data['website_id'])->update(['page_type' => $page_type],['action_id' => 1,'user_id' => $data['user_id']]);
         }
         if ($result) {