Merge branch '20250522_diywebfr'

app/JsonRpc/PublicRpcService.php

@@ -2200,9 +2200,11 @@ class PublicRpcService implements PublicRpcServiceInterface
         }
         $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('未查询到模版！');
         }
+         $template['page_type'] = json_decode($template['page_type'],true);
         return Result::success($template);
     }