Merge branch '20250522_diywebfr'

app/JsonRpc/PublicRpcService.php

@@ -1242,9 +1242,17 @@ class PublicRpcService implements PublicRpcServiceInterface
         if(empty($footer_category->toArray())){
             return Result::error('暂无底部导航数据！');
         }
+        $page_type = WebsiteTemplateInfo::where('website_id', $data['website_id'])->value('page_type');
+        // $page_type = json_decode($page_type,true);
+        if(isset($page_type) && $page_type == '[1,2,3,4,5,6,7]'){
+            $page_type = 1;
+        }else{
+            $page_type = 0;
+        }
         $result = [
             'friend_link' => $friend_link,
             'footer_category' => $footer_category,
+            'page_type' => $page_type,
         ];
         return Result::success($result);
     }
@@ -1340,6 +1348,12 @@ class PublicRpcService implements PublicRpcServiceInterface
             $result['template'] = Template::orderBy('updated_at','desc')
                 ->paginate($data['page_size'], ['*'], 'page', $data['page']);
         }
+        $template = WebsiteTemplateInfo::where('website_id', $data['website_id'])->value('template_id');
+        if($template){
+            $result['template_id'] = $template;
+        }else{
+            $result['template_id'] = 0;
+        }
         return Result::success($result);
     }
     /**