From efab6d13983599c176309be096b94f57b31ebe13 Mon Sep 17 00:00:00 2001 From: duanshuwen Date: Wed, 26 Aug 2026 18:48:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E6=96=B0=E5=A2=9E=E5=85=A8?= =?UTF-8?q?=E5=A5=97=E8=BF=90=E8=90=A5=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=A0=B8=E5=BF=83=E8=B7=AF=E7=94=B1?= =?UTF-8?q?bug=E5=8F=8A=E5=90=8E=E7=AB=AFseed=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复Vue Admin布局中RouterView未绑定唯一key的问题，解决RBAC系统资源页面切换后内容不刷新的ISSUE-001故障，新增routeViewKey工具函数区分路由实例 完善路由配置，新增admin空路径路由，修复路由命名空路径告警 新增媒体管理、运维发布/重置页面，补全全站路由注册与动态路由过滤逻辑 新增玩法、线索、管家、系统资源管理的全套工具函数、业务组件及单元测试用例 修复后端app/seed.py中媒体资源重复检测未考虑会话内pending资源的bug，新增对应测试验证修复逻辑 修正alembic迁移版本0015的依赖关系，删除废弃的旧迁移文件 优化后端系统接口的字典序列化逻辑，简化重复代码 添加QA验收报告与相关测试截图，完善项目测试覆盖 --- .../qa-report-localhost-5604-2026-08-25.md | 54 ++ .../screenshots/issue-001-after-fix.png | Bin 0 -> 44399 bytes .../issue-001-system-resource-stale.png | Bin 0 -> 44485 bytes .../content/migration-options.html | 63 +++ .../content/waiting-1.html | 3 + .../state/server-stopped | 1 + .../state/server.pid | 1 + .../src/api/client-operations.test.ts | 69 +++ .../src/api/client-site-config.test.ts | 40 ++ .../src/api/client-system.test.ts | 56 +++ .../src/api/client-wanfa.test.ts | 64 +++ WonderQ-Admin-UI-Vue/src/api/client.ts | 132 ++++- .../concierge/ConciergeAdvisorEditor.vue | 50 ++ .../concierge/ConciergeDetailEditor.vue | 27 + .../components/media/SingleMediaEditor.vue | 53 ++ .../site-config/SiteConfigEditor.vue | 154 ++++++ .../system/SystemResourceEditor.vue | 167 +++++++ .../src/components/wanfa/DetailFields.vue | 50 ++ .../components/wanfa/ImageGalleryEditor.vue | 64 +++ .../components/wanfa/WanfaCategoryEditor.vue | 41 ++ .../src/components/wanfa/WanfaRouteEditor.vue | 92 ++++ .../src/layouts/AdminLayout.vue | 8 +- .../src/lib/concierge.test.ts | 36 ++ WonderQ-Admin-UI-Vue/src/lib/concierge.ts | 40 ++ WonderQ-Admin-UI-Vue/src/lib/leads.test.ts | 14 + WonderQ-Admin-UI-Vue/src/lib/leads.ts | 37 ++ WonderQ-Admin-UI-Vue/src/lib/media.test.ts | 14 + WonderQ-Admin-UI-Vue/src/lib/media.ts | 14 + .../src/lib/menu-routes.test.ts | 12 + WonderQ-Admin-UI-Vue/src/lib/menu-routes.ts | 5 + .../src/lib/route-view.test.ts | 8 + WonderQ-Admin-UI-Vue/src/lib/route-view.ts | 3 + .../src/lib/site-config.test.ts | 92 ++++ WonderQ-Admin-UI-Vue/src/lib/site-config.ts | 119 +++++ .../src/lib/system-resource.test.ts | 25 + .../src/lib/system-resource.ts | 40 ++ WonderQ-Admin-UI-Vue/src/lib/wanfa.test.ts | 59 +++ WonderQ-Admin-UI-Vue/src/lib/wanfa.ts | 80 +++ .../src/pages/ConciergePage.vue | 124 ++++- WonderQ-Admin-UI-Vue/src/pages/HomePage.vue | 270 +++++++++- .../src/pages/LeadsPage.test.ts | 11 + WonderQ-Admin-UI-Vue/src/pages/LeadsPage.vue | 78 ++- WonderQ-Admin-UI-Vue/src/pages/MediaPage.vue | 65 +++ .../src/pages/OperationsToolsPage.vue | 52 ++ .../src/pages/SystemResourcePage.vue | 147 +++++- WonderQ-Admin-UI-Vue/src/pages/WanfaPage.vue | 287 ++++++++++- WonderQ-Admin-UI-Vue/src/router/index.ts | 12 +- .../src/router/route-config.ts | 5 + .../src/router/router.test.ts | 9 + WonderQ-Admin-UI-Vue/src/styles.css | 91 ++++ WonderQ-Admin-UI-Vue/src/types.ts | 301 ++++++++++- .../alembic/versions/0002_add_map_image.py | 36 -- .../versions/0003_campaign_display_fields.py | 53 -- .../alembic/versions/0004_route_sections.py | 42 -- .../versions/0005_hotel_vehicle_modules.py | 49 -- .../versions/0006_hotel_group_offer_fields.py | 55 -- .../versions/0007_destination_page_modules.py | 64 --- .../versions/0008_demand_page_modules.py | 95 ---- .../versions/0009_remove_product_domain.py | 72 --- .../0010_remove_destination_module.py | 45 -- .../versions/0011_remove_cta_banner_module.py | 26 - .../versions/0012_remove_offer_modules.py | 27 - .../versions/0013_remove_map_theme_modules.py | 27 - .../0014_remove_destination_regions_module.py | 32 -- WonderQ-Admin/alembic/versions/0015_wanfa.py | 4 +- WonderQ-Admin/app/routers/system.py | 38 +- WonderQ-Admin/app/seed.py | 2 + .../test_remove_product_domain_migration.py | 67 --- WonderQ-Admin/tests/test_seed.py | 23 + WonderQ-Admin/tests/test_system.py | 44 ++ docs/admin-business-function-matrix.md | 23 +- .../2026-08-26-admin-vue-formalization.md | 468 ++++++++++++++++++ ...26-08-26-admin-vue-formalization-design.md | 220 ++++++++ 73 files changed, 3963 insertions(+), 788 deletions(-) create mode 100644 .gstack/qa-reports/qa-report-localhost-5604-2026-08-25.md create mode 100644 .gstack/qa-reports/screenshots/issue-001-after-fix.png create mode 100644 .gstack/qa-reports/screenshots/issue-001-system-resource-stale.png create mode 100644 .superpowers/brainstorm/2026-08-25-admin-refactor/content/migration-options.html create mode 100644 .superpowers/brainstorm/2026-08-25-admin-refactor/content/waiting-1.html create mode 100644 .superpowers/brainstorm/2026-08-25-admin-refactor/state/server-stopped create mode 100644 .superpowers/brainstorm/2026-08-25-admin-refactor/state/server.pid create mode 100644 WonderQ-Admin-UI-Vue/src/api/client-operations.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/api/client-site-config.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/api/client-system.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/api/client-wanfa.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/components/concierge/ConciergeAdvisorEditor.vue create mode 100644 WonderQ-Admin-UI-Vue/src/components/concierge/ConciergeDetailEditor.vue create mode 100644 WonderQ-Admin-UI-Vue/src/components/media/SingleMediaEditor.vue create mode 100644 WonderQ-Admin-UI-Vue/src/components/site-config/SiteConfigEditor.vue create mode 100644 WonderQ-Admin-UI-Vue/src/components/system/SystemResourceEditor.vue create mode 100644 WonderQ-Admin-UI-Vue/src/components/wanfa/DetailFields.vue create mode 100644 WonderQ-Admin-UI-Vue/src/components/wanfa/ImageGalleryEditor.vue create mode 100644 WonderQ-Admin-UI-Vue/src/components/wanfa/WanfaCategoryEditor.vue create mode 100644 WonderQ-Admin-UI-Vue/src/components/wanfa/WanfaRouteEditor.vue create mode 100644 WonderQ-Admin-UI-Vue/src/lib/concierge.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/concierge.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/leads.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/leads.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/media.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/media.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/menu-routes.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/menu-routes.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/route-view.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/route-view.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/site-config.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/site-config.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/system-resource.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/system-resource.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/wanfa.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/lib/wanfa.ts create mode 100644 WonderQ-Admin-UI-Vue/src/pages/LeadsPage.test.ts create mode 100644 WonderQ-Admin-UI-Vue/src/pages/MediaPage.vue create mode 100644 WonderQ-Admin-UI-Vue/src/pages/OperationsToolsPage.vue create mode 100644 WonderQ-Admin-UI-Vue/src/router/route-config.ts create mode 100644 WonderQ-Admin-UI-Vue/src/router/router.test.ts delete mode 100644 WonderQ-Admin/alembic/versions/0002_add_map_image.py delete mode 100644 WonderQ-Admin/alembic/versions/0003_campaign_display_fields.py delete mode 100644 WonderQ-Admin/alembic/versions/0004_route_sections.py delete mode 100644 WonderQ-Admin/alembic/versions/0005_hotel_vehicle_modules.py delete mode 100644 WonderQ-Admin/alembic/versions/0006_hotel_group_offer_fields.py delete mode 100644 WonderQ-Admin/alembic/versions/0007_destination_page_modules.py delete mode 100644 WonderQ-Admin/alembic/versions/0008_demand_page_modules.py delete mode 100644 WonderQ-Admin/alembic/versions/0009_remove_product_domain.py delete mode 100644 WonderQ-Admin/alembic/versions/0010_remove_destination_module.py delete mode 100644 WonderQ-Admin/alembic/versions/0011_remove_cta_banner_module.py delete mode 100644 WonderQ-Admin/alembic/versions/0012_remove_offer_modules.py delete mode 100644 WonderQ-Admin/alembic/versions/0013_remove_map_theme_modules.py delete mode 100644 WonderQ-Admin/alembic/versions/0014_remove_destination_regions_module.py delete mode 100644 WonderQ-Admin/tests/test_remove_product_domain_migration.py create mode 100644 WonderQ-Admin/tests/test_seed.py create mode 100644 WonderQ-Admin/tests/test_system.py create mode 100644 docs/superpowers/plans/2026-08-26-admin-vue-formalization.md create mode 100644 docs/superpowers/specs/2026-08-26-admin-vue-formalization-design.md diff --git a/.gstack/qa-reports/qa-report-localhost-5604-2026-08-25.md b/.gstack/qa-reports/qa-report-localhost-5604-2026-08-25.md new file mode 100644 index 0000000..70c5312 --- /dev/null +++ b/.gstack/qa-reports/qa-report-localhost-5604-2026-08-25.md @@ -0,0 +1,54 @@ +# WonderQ 三端人工验收报告 + +- 验收时间：2026-08-25 +- 验收范围：Vue 管理端 `http://localhost:5604`、React 过渡端 `http://localhost:5602`、MiniAPP H5 `http://localhost:5173` +- 首轮结论：未通过；本轮修复后阻塞项和控制台告警均已回归通过，但整体业务验收仍未完成。 + +## 已通过 + +- Vue 管理端登录态下可进入仪表盘、首页配置、玩法与详情、管家管理、需求线索及 RBAC 菜单。 +- 需求线索列表可加载，状态字段可见；本次未修改业务数据。 +- Vue 路由菜单点击后 URL 和菜单高亮基本同步。 +- React 过渡端可正常打开登录页，浏览器控制台无 error/warning。 +- MiniAPP H5 首页可正常打开，公共 API 内容可见，浏览器控制台无 error/warning。 +- Vue 管理端本次浏览未发现运行时 error。 +- 修复后连续切换用户、角色、菜单、部门页面，URL、标题、菜单高亮和记录均对应一致。 +- 修复后新会话浏览控制台无 error/warning。 +- 2026-08-26 增量复验：首页配置已接入全部 7 类站点模块的新增、编辑、删除和可用模块排序入口；空态、编辑器字段、单例限制、必填标题和 HTTP(S) 图片地址校验可用，未修改开发库业务数据。 +- 2026-08-26 增量复验：玩法分类、路线和路线详情已接入新增、编辑、删除、排序、详情字段、管家关联及详情图片上传入口；其余四类站点配置已接入统一编辑器，未执行真实写入。 +- 2026-08-26 增量复验：管家顾问页已接入顾问 CRUD、启用状态、排序、删除确认、头像/二维码上传和服务详情编辑；未执行真实写入。 +- 2026-08-26 增量复验：重新确认有效 Vue 会话后，线索列表、类型筛选、状态筛选和详情展示均通过；补充修复 `LeadsPage` 缺少 `onMounted(load)` 导致页面永久 loading 的问题，未执行真实状态写入。 +- 2026-08-26 增量复验：媒体页已读取现有素材并接入分组批量上传、图片类型/5MB 校验；发布与重置页已接入权限控制、进行中禁用和二次确认，未触发发布或重置。 + +## 阻塞问题 + +### ISSUE-001：RBAC 系统资源页面切换后内容不刷新 + +- 严重级别：High +- 影响：从“用户管理”点击“角色管理”“菜单管理”或“部门管理”时，URL 已切换，但页面标题和记录仍停留在用户管理；人工无法可靠验收角色、菜单、部门页面。 +- 复现步骤： + 1. 打开 Vue 管理端并进入“用户管理”。 + 2. 点击“角色管理”。 + 3. 观察地址为 `/admin/system/roles`，页面标题仍为“用户管理”，记录仍为用户 JSON。 +- 实际结果：页面显示 `用户管理`，而地址为 `http://localhost:5604/admin/system/roles`；当前菜单高亮为“角色管理”。 +- 证据：`screenshots/issue-001-system-resource-stale.png` +- 修复结果：已通过动态路由去重、参数页面重新加载和页面组件 key 处理；回归证据：`screenshots/issue-001-after-fix.png`。 + +## 非阻塞问题与覆盖缺口 + +### ISSUE-002：Vue Router 启动告警（已修复） + +- 严重级别：Medium +- 控制台出现：路由名 `admin` 包含无名称的空路径子路由。当前页面仍可使用，但会增加路由解析回归风险。 +- 修复结果：空路径子路由已命名为 `admin-index`；新会话回归未再出现该告警。 + +### COVERAGE-001：业务写入能力尚未完成迁移 + +- 首页配置的顶部轮播、万趣用车、用车服务已完成 Vue 写入代码迁移；本次仅进行了非破坏性表单和接口契约验证，真实数据写入仍待人工确认。 +- 线索列表、类型/状态筛选和详情展示已在有效后台会话下复验；本次未触发真实状态写入。 +- 媒体上传、发布和重置只完成入口与确认闸门验收，真实动作仍待人工确认。 +- 系统用户、角色、菜单、部门页面尚未形成完整可编辑验收闭环；ISSUE-001 已解除。 + +## 验收判定 + +当前判定为“阻塞项已解除，业务覆盖验收进行中”。首页、玩法/详情、站点配置、管家、线索读取/筛选/详情、媒体和发布/重置入口代码已接入；线索状态写入、媒体真实上传、发布和重置仍需人工确认，核心 RBAC 流程完成后才能进入旧 React 删除前的最终人工确认。 diff --git a/.gstack/qa-reports/screenshots/issue-001-after-fix.png b/.gstack/qa-reports/screenshots/issue-001-after-fix.png new file mode 100644 index 0000000000000000000000000000000000000000..812dbe3f0bb52bb60aea43f562511b4c89d5fc2e GIT binary patch literal 44399 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 literal 0 HcmV?d00001 diff --git a/.gstack/qa-reports/screenshots/issue-001-system-resource-stale.png b/.gstack/qa-reports/screenshots/issue-001-system-resource-stale.png new file mode 100644 index 0000000000000000000000000000000000000000..f0df6551fe98fd9aabd6a8c411acaaaeaa570044 GIT binary patch literal 44485 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 F{{Xv9juHR> literal 0 HcmV?d00001 diff --git a/.superpowers/brainstorm/2026-08-25-admin-refactor/content/migration-options.html b/.superpowers/brainstorm/2026-08-25-admin-refactor/content/migration-options.html new file mode 100644 index 0000000..53a47ad --- /dev/null +++ b/.superpowers/brainstorm/2026-08-25-admin-refactor/content/migration-options.html @@ -0,0 +1,63 @@ +

WonderQ 三端重构：迁移路径

+

先选择整体切换方式。三种方案都保留现有 MiniAPP 业务；差别在 Admin UI 与权限内核如何落地。

+ +
+
+
目标形态（共同部分）
+
+
+ Vue3 + Element Plus
Admin UI / RBAC +
+
+ Python FastAPI
JWT · Redis · PostgreSQL · Docker +
+
+ Vue3 uni-app
H5 / 微信小程序 +
+
+
+
+ +
+
+
+
+
React UI
旧入口
+
Vue3 UI
新入口
+
+
+
+

A · 并行迁移（推荐）

+

新建 Vue3 管理端，按权限、首页、玩法、线索等垂直切片逐步替换；旧 React 端在过渡期继续可用。

+

优点

  • 风险可控
  • 可逐模块验收

代价

  • 短期维护两套 UI
+
+
+ +
+
+
同目录原地替换
React → Vue3 一次切换
+
+
+

B · 原地重写

+

直接把现有 `WonderQ-Admin-UI` 替换为 Vue3 + Element Plus，复用后端契约并一次性切换入口。

+

优点

  • 最终目录干净
  • 没有双 UI

代价

  • 回滚成本高
  • 业务功能容易遗漏
+
+
+ +
+
+
+
RBAC + JWT/Redis + 审计
+
Vue3 Admin UI 逐模块接入
+
MiniAPP 保持现有 Public API
+
+
+
+

C · 权限内核优先

+

先稳定后台用户、角色、菜单、按钮权限和 Redis 会话/黑名单，再以垂直业务切片重构 Vue3 UI。

+

优点

  • 权限基础先固定
  • 业务迁移边界清晰

代价

  • 前期后端工作较多
  • 需先确定权限模型
+
+
+
+ +

请点击一个你倾向的方案；如果想组合方案，也可以在终端说明。

diff --git a/.superpowers/brainstorm/2026-08-25-admin-refactor/content/waiting-1.html b/.superpowers/brainstorm/2026-08-25-admin-refactor/content/waiting-1.html new file mode 100644 index 0000000..633d684 --- /dev/null +++ b/.superpowers/brainstorm/2026-08-25-admin-refactor/content/waiting-1.html @@ -0,0 +1,3 @@ +
+

已记录迁移方案选择，权限功能边界继续在终端确认。

+
diff --git a/.superpowers/brainstorm/2026-08-25-admin-refactor/state/server-stopped b/.superpowers/brainstorm/2026-08-25-admin-refactor/state/server-stopped new file mode 100644 index 0000000..fa96980 --- /dev/null +++ b/.superpowers/brainstorm/2026-08-25-admin-refactor/state/server-stopped @@ -0,0 +1 @@ +{"reason":"idle timeout","timestamp":1787667962684} diff --git a/.superpowers/brainstorm/2026-08-25-admin-refactor/state/server.pid b/.superpowers/brainstorm/2026-08-25-admin-refactor/state/server.pid new file mode 100644 index 0000000..5ee544d --- /dev/null +++ b/.superpowers/brainstorm/2026-08-25-admin-refactor/state/server.pid @@ -0,0 +1 @@ +21024 \ No newline at end of file diff --git a/WonderQ-Admin-UI-Vue/src/api/client-operations.test.ts b/WonderQ-Admin-UI-Vue/src/api/client-operations.test.ts new file mode 100644 index 0000000..9250e65 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/api/client-operations.test.ts @@ -0,0 +1,69 @@ +import { afterEach, describe, expect, it, vi } from "vitest"; +import { + createConciergeAdvisor, + deleteConciergeAdvisor, + getConcierge, + getLeads, + getMediaAssets, + publishSite, + resetGuizhouContent, + reorderConciergeAdvisors, + updateConciergeAdvisor, + updateLeadStatus, +} from "@/api/client"; + +describe("operations client", () => { + afterEach(() => vi.restoreAllMocks()); + + it("keeps concierge CRUD and reorder endpoints stable", async () => { + const fetchMock = vi.fn() + .mockResolvedValueOnce(jsonResponse(200, { advisors: [] })) + .mockResolvedValueOnce(jsonResponse(201, { id: "advisor-1", name: "顾问" })) + .mockResolvedValueOnce(jsonResponse(200, { id: "advisor-1", name: "新顾问" })) + .mockResolvedValueOnce(jsonResponse(200, { items: [{ id: "advisor-1" }] })) + .mockResolvedValueOnce(jsonResponse(200, { id: "advisor-1" })); + vi.stubGlobal("fetch", fetchMock); + + await getConcierge(); + await createConciergeAdvisor({ avatar: "https://example.com/a.jpg", name: "顾问", role: "Advisor", details: [], qrImage: "https://example.com/q.png" }); + await updateConciergeAdvisor("advisor-1", { name: "新顾问" }); + await reorderConciergeAdvisors(["advisor-1"]); + await deleteConciergeAdvisor("advisor-1"); + + expect(fetchMock.mock.calls.map(([url, options]) => [url, options?.method])).toEqual([ + ["/api/admin/concierge/advisors", undefined], + ["/api/admin/concierge/advisors", "POST"], + ["/api/admin/concierge/advisors/advisor-1", "PATCH"], + ["/api/admin/concierge/advisors/reorder", "PATCH"], + ["/api/admin/concierge/advisors/advisor-1", "DELETE"], + ]); + }); + + it("supports filtered leads, media listing, publish and reset contracts", async () => { + const fetchMock = vi.fn() + .mockResolvedValueOnce(jsonResponse(200, { items: [] })) + .mockResolvedValueOnce(jsonResponse(200, { id: "lead-1", status: "contacted" })) + .mockResolvedValueOnce(jsonResponse(200, { items: [] })) + .mockResolvedValueOnce(jsonResponse(201, { id: "version-1", title: "manual", publishedAt: "2026-08-26T00:00:00Z" })) + .mockResolvedValueOnce(jsonResponse(200, { siteVersionId: "version-2" })); + vi.stubGlobal("fetch", fetchMock); + + await getLeads({ leadType: "vehicle", status: "new", keyword: "贵州", take: 50 }); + await updateLeadStatus("lead-1", "contacted"); + await getMediaAssets(); + await publishSite(); + await resetGuizhouContent(); + + expect(fetchMock.mock.calls.map(([url, options]) => [url, options?.method])).toEqual([ + ["/api/admin/leads?leadType=vehicle&status=new&keyword=%E8%B4%B5%E5%B7%9E&take=50", undefined], + ["/api/admin/leads/lead-1/status", "PATCH"], + ["/api/admin/media-assets", undefined], + ["/api/admin/publish", "POST"], + ["/api/admin/reset-guizhou-content", "POST"], + ]); + }); +}); + +function jsonResponse(code: number, data: unknown) { + return { status: code, json: async () => ({ code, msg: "success", data }) }; +} diff --git a/WonderQ-Admin-UI-Vue/src/api/client-site-config.test.ts b/WonderQ-Admin-UI-Vue/src/api/client-site-config.test.ts new file mode 100644 index 0000000..21a62d5 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/api/client-site-config.test.ts @@ -0,0 +1,40 @@ +import { afterEach, describe, expect, it, vi } from "vitest"; +import { + createSiteConfigItem, + deleteSiteConfigItem, + reorderSiteConfigItems, + updateSiteConfigItem, +} from "@/api/client"; + +describe("site config client", () => { + afterEach(() => vi.restoreAllMocks()); + + it("uses the existing site config CRUD and reorder contract", async () => { + const fetchMock = vi.fn() + .mockResolvedValueOnce(jsonResponse(201, { id: "hero-1", title: "首页轮播" })) + .mockResolvedValueOnce(jsonResponse(200, { id: "hero-1", title: "更新后的轮播" })) + .mockResolvedValueOnce(jsonResponse(200, { id: "hero-1" })) + .mockResolvedValueOnce(jsonResponse(200, { items: [{ id: "hero-2" }, { id: "hero-1" }] })); + vi.stubGlobal("fetch", fetchMock); + + await createSiteConfigItem("heroSlides", { title: "首页轮播", isActive: true, sortOrder: 0 }); + await updateSiteConfigItem("heroSlides", "hero-1", { title: "更新后的轮播" }); + await deleteSiteConfigItem("heroSlides", "hero-1"); + await reorderSiteConfigItems("heroSlides", ["hero-2", "hero-1"]); + + expect(fetchMock.mock.calls.map(([url, options]) => [url, options?.method])).toEqual([ + ["/api/admin/site-config/heroSlides", "POST"], + ["/api/admin/site-config/heroSlides/hero-1", "PATCH"], + ["/api/admin/site-config/heroSlides/hero-1", "DELETE"], + ["/api/admin/site-config/heroSlides/reorder", "PATCH"], + ]); + expect(JSON.parse(String(fetchMock.mock.calls[3][1]?.body))).toEqual({ itemIds: ["hero-2", "hero-1"] }); + }); +}); + +function jsonResponse(code: number, data: unknown) { + return { + status: code, + json: async () => ({ code, msg: "success", data }), + }; +} diff --git a/WonderQ-Admin-UI-Vue/src/api/client-system.test.ts b/WonderQ-Admin-UI-Vue/src/api/client-system.test.ts new file mode 100644 index 0000000..661b55e --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/api/client-system.test.ts @@ -0,0 +1,56 @@ +import { afterEach, describe, expect, it, vi } from "vitest"; +import { + createSystemDept, + getSystemDepts, + getSystemMenus, + getSystemRoles, + getSystemUsers, + updateSystemDept, + updateSystemMenu, + updateSystemRole, + updateSystemUser, +} from "@/api/client"; + +describe("system RBAC client", () => { + afterEach(() => vi.restoreAllMocks()); + + it("keeps RBAC list and update endpoints stable", async () => { + const fetchMock = vi.fn() + .mockResolvedValueOnce(jsonResponse(200, { items: [] })) + .mockResolvedValueOnce(jsonResponse(200, { items: [] })) + .mockResolvedValueOnce(jsonResponse(200, { items: [] })) + .mockResolvedValueOnce(jsonResponse(200, { items: [] })) + .mockResolvedValueOnce(jsonResponse(200, { id: "user-1" })) + .mockResolvedValueOnce(jsonResponse(200, { id: "role-1" })) + .mockResolvedValueOnce(jsonResponse(200, { id: "menu-1" })) + .mockResolvedValueOnce(jsonResponse(200, { id: "dept-1" })) + .mockResolvedValueOnce(jsonResponse(201, { id: "dept-2" })); + vi.stubGlobal("fetch", fetchMock); + + await getSystemUsers(); + await getSystemRoles(); + await getSystemMenus(); + await getSystemDepts(); + await updateSystemUser("user-1", { name: "新名称" }); + await updateSystemRole("role-1", { description: "验收描述" }); + await updateSystemMenu("menu-1", { name: "验收菜单" }); + await updateSystemDept("dept-1", { name: "验收部门" }); + await createSystemDept({ name: "临时部门", parentId: null, sortOrder: 99, isActive: true }); + + expect(fetchMock.mock.calls.map(([url, options]) => [url, options?.method])).toEqual([ + ["/api/admin/system/users", undefined], + ["/api/admin/system/roles", undefined], + ["/api/admin/system/menus", undefined], + ["/api/admin/system/depts", undefined], + ["/api/admin/system/users/user-1", "PATCH"], + ["/api/admin/system/roles/role-1", "PATCH"], + ["/api/admin/system/menus/menu-1", "PATCH"], + ["/api/admin/system/depts/dept-1", "PATCH"], + ["/api/admin/system/depts", "POST"], + ]); + }); +}); + +function jsonResponse(code: number, data: unknown) { + return { status: code, json: async () => ({ code, msg: "success", data }) }; +} diff --git a/WonderQ-Admin-UI-Vue/src/api/client-wanfa.test.ts b/WonderQ-Admin-UI-Vue/src/api/client-wanfa.test.ts new file mode 100644 index 0000000..2cd54b0 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/api/client-wanfa.test.ts @@ -0,0 +1,64 @@ +import { afterEach, describe, expect, it, vi } from "vitest"; +import { + createDetail, + createWanfaCategory, + createWanfaRoute, + deleteWanfaRoute, + getDetails, + reorderWanfaRoutes, + uploadMediaAsset, + updateDetail, +} from "@/api/client"; + +describe("wanfa and detail client", () => { + afterEach(() => vi.restoreAllMocks()); + + it("keeps nested route and independent detail endpoints stable", async () => { + const fetchMock = vi.fn() + .mockResolvedValueOnce(jsonResponse(201, { id: "category-1", label: "亲子路线", routes: [] })) + .mockResolvedValueOnce(jsonResponse(201, { id: "route-1" })) + .mockResolvedValueOnce(jsonResponse(200, { id: "detail-1", key: "route-1" })) + .mockResolvedValueOnce(jsonResponse(200, { details: [] })) + .mockResolvedValueOnce(jsonResponse(200, { id: "detail-1", key: "route-1" })) + .mockResolvedValueOnce(jsonResponse(200, { items: [{ id: "route-2" }, { id: "route-1" }] })) + .mockResolvedValueOnce(jsonResponse(200, { id: "route-1" })); + vi.stubGlobal("fetch", fetchMock); + + await createWanfaCategory({ label: "亲子路线" }); + await createWanfaRoute("category-1", { title: "路线", subtitle: "副标题", image: "https://example.com/route.jpg", routeCount: 4, demandKeyword: "亲子" }); + await createDetail({ key: "route-1", eyebrow: "玩法", duration: "5天4晚", title: "路线详情", subtitle: "副标题", intro: "介绍", highlights: [], included: [], excluded: [], notes: [], gallery: [], conciergeAdvisorId: null, isActive: true }); + await getDetails(); + await updateDetail("detail-1", { title: "更新详情" }); + await reorderWanfaRoutes("category-1", ["route-2", "route-1"]); + await deleteWanfaRoute("category-1", "route-1"); + + expect(fetchMock.mock.calls.map(([url, options]) => [url, options?.method])).toEqual([ + ["/api/admin/wanfa/categories", "POST"], + ["/api/admin/wanfa/categories/category-1/routes", "POST"], + ["/api/admin/details", "POST"], + ["/api/admin/details", undefined], + ["/api/admin/details/detail-1", "PATCH"], + ["/api/admin/wanfa/categories/category-1/routes/reorder", "PATCH"], + ["/api/admin/wanfa/categories/category-1/routes/route-1", "DELETE"], + ]); + }); + + it("uploads detail media through the existing multipart endpoint", async () => { + const fetchMock = vi.fn().mockResolvedValueOnce(jsonResponse(201, { id: "asset-1", url: "https://example.com/detail.jpg" })); + vi.stubGlobal("fetch", fetchMock); + const file = new File(["image"], "detail.jpg", { type: "image/jpeg" }); + + const asset = await uploadMediaAsset(file, "wanfa-detail"); + + expect(asset.url).toBe("https://example.com/detail.jpg"); + const [url, options] = fetchMock.mock.calls[0]; + expect(url).toBe("/api/admin/media-assets/upload"); + expect(options?.method).toBe("POST"); + expect(options?.body).toBeInstanceOf(FormData); + expect((options?.body as FormData).get("group")).toBe("wanfa-detail"); + }); +}); + +function jsonResponse(code: number, data: unknown) { + return { status: code, json: async () => ({ code, msg: "success", data }) }; +} diff --git a/WonderQ-Admin-UI-Vue/src/api/client.ts b/WonderQ-Admin-UI-Vue/src/api/client.ts index f95a264..5014887 100644 --- a/WonderQ-Admin-UI-Vue/src/api/client.ts +++ b/WonderQ-Admin-UI-Vue/src/api/client.ts @@ -1,4 +1,45 @@ -import type { ApiErrorResponse, ApiResponse, AuthPayload, AdminProfile, Dashboard, Lead, SiteConfig, WanfaCategory, ConciergeAdvisor } from "@/types"; +import type { + ApiErrorResponse, + ApiResponse, + AuthPayload, + AdminProfile, + ConciergeAdvisorCreate, + ConciergeAdvisorPatch, + Dashboard, + DetailCreate, + DetailPatch, + DetailRecord, + Lead, + LeadStatus, + LeadType, + MediaAsset, + ResetContentResult, + SiteConfig, + SiteConfigItem, + SiteItemPatch, + SiteModule, + SiteVersion, + WanfaCategory, + WanfaCategoryCreate, + WanfaCategoryPatch, + WanfaRoute, + WanfaRouteCreate, + WanfaRoutePatch, + ConciergeAdvisor, + SystemDeptCreate, + SystemDeptItem, + SystemDeptPatch, + SystemMenuCreate, + SystemMenuItem, + SystemMenuPatch, + SystemRoleCreate, + SystemRoleItem, + SystemRolePatch, + SystemUserCreate, + SystemUserItem, + SystemUserPatch, +} from "@/types"; +import { buildLeadQuery } from "@/lib/leads"; const API_BASE = import.meta.env.VITE_API_BASE_URL ?? ""; let accessToken: string | null = null; @@ -94,12 +135,97 @@ export const getProfile = () => request("/api/admin/system/profile export const logout = () => request<{ ok: boolean }>("/api/admin/auth/logout", { method: "POST" }, false); export const getDashboard = () => request("/api/admin/dashboard"); export const getSiteConfig = () => request("/api/admin/site-config"); +export type SiteConfigItemResponse = SiteConfigItem | { item: SiteConfigItem }; + +function unwrapSiteConfigItem(response: SiteConfigItemResponse) { + return "item" in response ? response.item : response; +} + +export async function createSiteConfigItem(module: SiteModule, input: SiteItemPatch) { + const response = await request(`/api/admin/site-config/${module}`, { + method: "POST", + body: JSON.stringify(input), + }); + return unwrapSiteConfigItem(response); +} + +export async function updateSiteConfigItem(module: SiteModule, id: string, input: SiteItemPatch) { + const response = await request(`/api/admin/site-config/${module}/${id}`, { + method: "PATCH", + body: JSON.stringify(input), + }); + return unwrapSiteConfigItem(response); +} + +export const deleteSiteConfigItem = (module: SiteModule, id: string) => + request<{ id: string }>(`/api/admin/site-config/${module}/${id}`, { method: "DELETE" }); + +export const reorderSiteConfigItems = (module: SiteModule, itemIds: string[]) => + request<{ items: SiteConfigItem[] }>(`/api/admin/site-config/${module}/reorder`, { + method: "PATCH", + body: JSON.stringify({ itemIds }), + }); + export const getWanfa = async () => (await request<{ categories: WanfaCategory[] }>("/api/admin/wanfa/categories")).categories; +export const createWanfaCategory = (input: WanfaCategoryCreate) => + request("/api/admin/wanfa/categories", { method: "POST", body: JSON.stringify(input) }); +export const updateWanfaCategory = (categoryId: string, input: WanfaCategoryPatch) => + request(`/api/admin/wanfa/categories/${categoryId}`, { method: "PATCH", body: JSON.stringify(input) }); +export const deleteWanfaCategory = (categoryId: string) => + request<{ id: string }>(`/api/admin/wanfa/categories/${categoryId}`, { method: "DELETE" }); +export const reorderWanfaCategories = (itemIds: string[]) => + request<{ items: WanfaCategory[] }>("/api/admin/wanfa/categories/reorder", { method: "PATCH", body: JSON.stringify({ itemIds }) }); +export const createWanfaRoute = (categoryId: string, input: WanfaRouteCreate) => + request(`/api/admin/wanfa/categories/${categoryId}/routes`, { method: "POST", body: JSON.stringify(input) }); +export const updateWanfaRoute = (categoryId: string, routeId: string, input: WanfaRoutePatch) => + request(`/api/admin/wanfa/categories/${categoryId}/routes/${routeId}`, { method: "PATCH", body: JSON.stringify(input) }); +export const deleteWanfaRoute = (categoryId: string, routeId: string) => + request<{ id: string }>(`/api/admin/wanfa/categories/${categoryId}/routes/${routeId}`, { method: "DELETE" }); +export const reorderWanfaRoutes = (categoryId: string, itemIds: string[]) => + request<{ items: WanfaRoute[] }>(`/api/admin/wanfa/categories/${categoryId}/routes/reorder`, { method: "PATCH", body: JSON.stringify({ itemIds }) }); +export const getDetails = async () => (await request<{ details: DetailRecord[] }>("/api/admin/details")).details; +export const uploadMediaAsset = (file: File, group = "general") => { + const form = new FormData(); + form.set("file", file); + form.set("group", group); + return request("/api/admin/media-assets/upload", { method: "POST", body: form }); +}; +export const createDetail = (input: DetailCreate) => + request("/api/admin/details", { method: "POST", body: JSON.stringify(input) }); +export const updateDetail = (detailId: string, input: DetailPatch) => + request(`/api/admin/details/${detailId}`, { method: "PATCH", body: JSON.stringify(input) }); +export const deleteDetail = (detailId: string) => request<{ id: string }>(`/api/admin/details/${detailId}`, { method: "DELETE" }); +export const reorderDetails = (itemIds: string[]) => + request<{ items: DetailRecord[] }>("/api/admin/details/reorder", { method: "PATCH", body: JSON.stringify({ itemIds }) }); export const getConcierge = async () => (await request<{ advisors: ConciergeAdvisor[] }>("/api/admin/concierge/advisors")).advisors; -export const getLeads = () => request<{ items: Lead[] }>("/api/admin/leads?take=50"); -export const updateLeadStatus = (leadId: string, status: string) => +export const createConciergeAdvisor = (input: ConciergeAdvisorCreate) => + request("/api/admin/concierge/advisors", { method: "POST", body: JSON.stringify(input) }); +export const updateConciergeAdvisor = (advisorId: string, input: ConciergeAdvisorPatch) => + request(`/api/admin/concierge/advisors/${advisorId}`, { method: "PATCH", body: JSON.stringify(input) }); +export const deleteConciergeAdvisor = (advisorId: string) => + request<{ id: string }>(`/api/admin/concierge/advisors/${advisorId}`, { method: "DELETE" }); +export const reorderConciergeAdvisors = (itemIds: string[]) => + request<{ items: ConciergeAdvisor[] }>("/api/admin/concierge/advisors/reorder", { method: "PATCH", body: JSON.stringify({ itemIds }) }); +export const getLeads = (params: { leadType?: LeadType | ""; status?: LeadStatus | ""; keyword?: string; take?: number } = {}) => + request<{ items: Lead[] }>(`/api/admin/leads${buildLeadQuery(params)}`); +export const updateLeadStatus = (leadId: string, status: LeadStatus) => request(`/api/admin/leads/${leadId}/status`, { method: "PATCH", body: JSON.stringify({ status }), }); +export const getMediaAssets = () => request<{ items: MediaAsset[] }>("/api/admin/media-assets"); +export const publishSite = () => request("/api/admin/publish", { method: "POST", body: JSON.stringify({}) }); +export const resetGuizhouContent = () => request("/api/admin/reset-guizhou-content", { method: "POST", body: JSON.stringify({}) }); export const getSystemResource = (resource: string) => request<{ items: unknown[] }>(`/api/admin/system/${resource}`); +export const getSystemUsers = () => request<{ items: SystemUserItem[] }>("/api/admin/system/users"); +export const getSystemRoles = () => request<{ items: SystemRoleItem[] }>("/api/admin/system/roles"); +export const getSystemMenus = () => request<{ items: SystemMenuItem[] }>("/api/admin/system/menus"); +export const getSystemDepts = () => request<{ items: SystemDeptItem[] }>("/api/admin/system/depts"); +export const createSystemUser = (input: SystemUserCreate) => request<{ id: string }>("/api/admin/system/users", { method: "POST", body: JSON.stringify(input) }); +export const updateSystemUser = (userId: string, input: SystemUserPatch) => request<{ id: string }>(`/api/admin/system/users/${userId}`, { method: "PATCH", body: JSON.stringify(input) }); +export const createSystemRole = (input: SystemRoleCreate) => request<{ id: string }>("/api/admin/system/roles", { method: "POST", body: JSON.stringify(input) }); +export const updateSystemRole = (roleId: string, input: SystemRolePatch) => request<{ id: string }>(`/api/admin/system/roles/${roleId}`, { method: "PATCH", body: JSON.stringify(input) }); +export const createSystemMenu = (input: SystemMenuCreate) => request<{ id: string }>("/api/admin/system/menus", { method: "POST", body: JSON.stringify(input) }); +export const updateSystemMenu = (menuId: string, input: SystemMenuPatch) => request<{ id: string }>(`/api/admin/system/menus/${menuId}`, { method: "PATCH", body: JSON.stringify(input) }); +export const createSystemDept = (input: SystemDeptCreate) => request<{ id: string }>("/api/admin/system/depts", { method: "POST", body: JSON.stringify(input) }); +export const updateSystemDept = (deptId: string, input: SystemDeptPatch) => request<{ id: string }>(`/api/admin/system/depts/${deptId}`, { method: "PATCH", body: JSON.stringify(input) }); diff --git a/WonderQ-Admin-UI-Vue/src/components/concierge/ConciergeAdvisorEditor.vue b/WonderQ-Admin-UI-Vue/src/components/concierge/ConciergeAdvisorEditor.vue new file mode 100644 index 0000000..69eaa83 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/components/concierge/ConciergeAdvisorEditor.vue @@ -0,0 +1,50 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/components/concierge/ConciergeDetailEditor.vue b/WonderQ-Admin-UI-Vue/src/components/concierge/ConciergeDetailEditor.vue new file mode 100644 index 0000000..63ec101 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/components/concierge/ConciergeDetailEditor.vue @@ -0,0 +1,27 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/components/media/SingleMediaEditor.vue b/WonderQ-Admin-UI-Vue/src/components/media/SingleMediaEditor.vue new file mode 100644 index 0000000..e0f33fc --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/components/media/SingleMediaEditor.vue @@ -0,0 +1,53 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/components/site-config/SiteConfigEditor.vue b/WonderQ-Admin-UI-Vue/src/components/site-config/SiteConfigEditor.vue new file mode 100644 index 0000000..81e25a5 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/components/site-config/SiteConfigEditor.vue @@ -0,0 +1,154 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/components/system/SystemResourceEditor.vue b/WonderQ-Admin-UI-Vue/src/components/system/SystemResourceEditor.vue new file mode 100644 index 0000000..3907af6 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/components/system/SystemResourceEditor.vue @@ -0,0 +1,167 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/components/wanfa/DetailFields.vue b/WonderQ-Admin-UI-Vue/src/components/wanfa/DetailFields.vue new file mode 100644 index 0000000..6acd27c --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/components/wanfa/DetailFields.vue @@ -0,0 +1,50 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/components/wanfa/ImageGalleryEditor.vue b/WonderQ-Admin-UI-Vue/src/components/wanfa/ImageGalleryEditor.vue new file mode 100644 index 0000000..1981eed --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/components/wanfa/ImageGalleryEditor.vue @@ -0,0 +1,64 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/components/wanfa/WanfaCategoryEditor.vue b/WonderQ-Admin-UI-Vue/src/components/wanfa/WanfaCategoryEditor.vue new file mode 100644 index 0000000..e8b978f --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/components/wanfa/WanfaCategoryEditor.vue @@ -0,0 +1,41 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/components/wanfa/WanfaRouteEditor.vue b/WonderQ-Admin-UI-Vue/src/components/wanfa/WanfaRouteEditor.vue new file mode 100644 index 0000000..299223d --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/components/wanfa/WanfaRouteEditor.vue @@ -0,0 +1,92 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/layouts/AdminLayout.vue b/WonderQ-Admin-UI-Vue/src/layouts/AdminLayout.vue index 22eec8a..ebc561d 100644 --- a/WonderQ-Admin-UI-Vue/src/layouts/AdminLayout.vue +++ b/WonderQ-Admin-UI-Vue/src/layouts/AdminLayout.vue @@ -4,11 +4,13 @@ import { useRoute, useRouter } from "vue-router"; import { ElMessageBox } from "element-plus"; import { useAuthStore } from "@/stores/auth"; import MenuTree from "@/components/MenuTree.vue"; +import { routeViewKey } from "@/lib/route-view"; const auth = useAuthStore(); const route = useRoute(); const router = useRouter(); const activePath = computed(() => route.path); +const currentViewKey = computed(() => routeViewKey(router.currentRoute.value.fullPath)); async function logout() { await ElMessageBox.confirm("确定退出当前后台会话吗？", "退出登录", { type: "warning" }); @@ -43,7 +45,11 @@ async function logout() { 退出 - + + + + + diff --git a/WonderQ-Admin-UI-Vue/src/lib/concierge.test.ts b/WonderQ-Admin-UI-Vue/src/lib/concierge.test.ts new file mode 100644 index 0000000..7982bf7 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/concierge.test.ts @@ -0,0 +1,36 @@ +import { describe, expect, it } from "vitest"; +import { + compactConciergeAdvisor, + createEmptyConciergeAdvisor, + validateConciergeAdvisor, +} from "@/lib/concierge"; + +describe("concierge editor helpers", () => { + it("normalizes advisor fields and removes empty service details", () => { + expect(compactConciergeAdvisor({ + ...createEmptyConciergeAdvisor(), + avatar: " https://example.com/avatar.jpg ", + name: " 示例顾问 ", + role: " SENIOR ADVISOR ", + details: [ + { icon: " calendar ", label: " 服务经验：8年 " }, + { icon: "", label: "" }, + ], + qrImage: " https://example.com/qr.png ", + isActive: false, + })).toEqual({ + avatar: "https://example.com/avatar.jpg", + name: "示例顾问", + role: "SENIOR ADVISOR", + details: [{ icon: "calendar", label: "服务经验：8年" }], + qrImage: "https://example.com/qr.png", + isActive: false, + }); + }); + + it("rejects missing required advisor content before saving", () => { + expect(validateConciergeAdvisor({ ...createEmptyConciergeAdvisor(), name: "" })).toBe("请填写顾问姓名"); + expect(validateConciergeAdvisor({ ...createEmptyConciergeAdvisor(), name: "顾问", role: "Advisor", avatar: "data:image/png;base64,abc", qrImage: "https://example.com/q.png" })).toBe("头像必须是有效的 HTTP(S) URL"); + expect(validateConciergeAdvisor({ ...createEmptyConciergeAdvisor(), name: "顾问", role: "Advisor", avatar: "https://example.com/a.jpg", qrImage: "not-a-url" })).toBe("二维码必须是有效的 HTTP(S) URL"); + }); +}); diff --git a/WonderQ-Admin-UI-Vue/src/lib/concierge.ts b/WonderQ-Admin-UI-Vue/src/lib/concierge.ts new file mode 100644 index 0000000..30841da --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/concierge.ts @@ -0,0 +1,40 @@ +import type { ConciergeAdvisorCreate, ConciergeDetail } from "@/types"; + +export function createEmptyConciergeAdvisor(): ConciergeAdvisorCreate { + return { avatar: "", name: "", role: "", details: [], qrImage: "", isActive: true }; +} + +export function compactConciergeAdvisor(draft: ConciergeAdvisorCreate): ConciergeAdvisorCreate { + return { + avatar: draft.avatar.trim(), + name: draft.name.trim(), + role: draft.role.trim(), + details: draft.details.map(copyDetail).filter((item) => item.icon || item.label), + qrImage: draft.qrImage.trim(), + isActive: draft.isActive ?? true, + ...(Number.isFinite(Number(draft.sortOrder)) ? { sortOrder: Math.max(0, Number(draft.sortOrder)) } : {}), + }; +} + +export function validateConciergeAdvisor(draft: ConciergeAdvisorCreate): string | null { + const payload = compactConciergeAdvisor(draft); + if (!payload.name) return "请填写顾问姓名"; + if (!payload.role) return "请填写顾问职位"; + if (!isHttpUrl(payload.avatar)) return "头像必须是有效的 HTTP(S) URL"; + if (!isHttpUrl(payload.qrImage)) return "二维码必须是有效的 HTTP(S) URL"; + const invalidDetail = payload.details.find((item) => !item.icon || !item.label); + return invalidDetail ? "服务详情需要填写图标和说明" : null; +} + +function copyDetail(item: ConciergeDetail): ConciergeDetail { + return { icon: item.icon.trim(), label: item.label.trim() }; +} + +function isHttpUrl(value: string) { + try { + const url = new URL(value); + return url.protocol === "http:" || url.protocol === "https:"; + } catch { + return false; + } +} diff --git a/WonderQ-Admin-UI-Vue/src/lib/leads.test.ts b/WonderQ-Admin-UI-Vue/src/lib/leads.test.ts new file mode 100644 index 0000000..4091c20 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/leads.test.ts @@ -0,0 +1,14 @@ +import { describe, expect, it } from "vitest"; +import { buildLeadQuery, leadStatusOptions } from "@/lib/leads"; + +describe("lead filters", () => { + it("builds stable query params for the admin lead contract", () => { + expect(buildLeadQuery({ leadType: "vehicle", status: "planning", keyword: " 贵州 ", take: 50 })).toBe("?leadType=vehicle&status=planning&keyword=%E8%B4%B5%E5%B7%9E&take=50"); + }); + + it("keeps all six backend statuses visible", () => { + expect(leadStatusOptions.map((item) => item.value)).toEqual([ + "new", "assigned", "contacted", "planning", "won", "invalid", + ]); + }); +}); diff --git a/WonderQ-Admin-UI-Vue/src/lib/leads.ts b/WonderQ-Admin-UI-Vue/src/lib/leads.ts new file mode 100644 index 0000000..956d721 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/leads.ts @@ -0,0 +1,37 @@ +import type { LeadStatus, LeadType } from "@/types"; + +export const leadStatusOptions: Array<{ value: LeadStatus; label: string }> = [ + { value: "new", label: "待处理" }, + { value: "assigned", label: "已分配" }, + { value: "contacted", label: "已联系" }, + { value: "planning", label: "方案沟通" }, + { value: "won", label: "已成交" }, + { value: "invalid", label: "无效" }, +]; + +export const leadTypeOptions: Array<{ value: LeadType | ""; label: string }> = [ + { value: "", label: "全部类型" }, + { value: "vehicle", label: "用车需求" }, + { value: "general", label: "一般需求" }, +]; + +export type LeadQuery = { + leadType?: LeadType | ""; + status?: LeadStatus | ""; + keyword?: string; + take?: number; +}; + +export function buildLeadQuery(params: LeadQuery = {}) { + const query = new URLSearchParams(); + if (params.leadType) query.set("leadType", params.leadType); + if (params.status) query.set("status", params.status); + if (params.keyword?.trim()) query.set("keyword", params.keyword.trim()); + if (params.take) query.set("take", String(params.take)); + const value = query.toString(); + return value ? `?${value}` : ""; +} + +export function leadStatusLabel(status: string) { + return leadStatusOptions.find((item) => item.value === status)?.label ?? status; +} diff --git a/WonderQ-Admin-UI-Vue/src/lib/media.test.ts b/WonderQ-Admin-UI-Vue/src/lib/media.test.ts new file mode 100644 index 0000000..58243cb --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/media.test.ts @@ -0,0 +1,14 @@ +import { describe, expect, it } from "vitest"; +import { validateMediaFile } from "@/lib/media"; + +describe("media upload validation", () => { + it("accepts supported images under the 5MB limit", () => { + expect(validateMediaFile(new File(["image"], "cover.webp", { type: "image/webp" }))).toBeNull(); + }); + + it("rejects unsupported types and oversized files", () => { + expect(validateMediaFile(new File(["text"], "note.txt", { type: "text/plain" }))).toBe("仅支持 JPG、PNG、WebP 或 GIF 图片"); + const oversized = new File([new Uint8Array(5 * 1024 * 1024 + 1)], "large.png", { type: "image/png" }); + expect(validateMediaFile(oversized)).toBe("图片大小不能超过 5MB"); + }); +}); diff --git a/WonderQ-Admin-UI-Vue/src/lib/media.ts b/WonderQ-Admin-UI-Vue/src/lib/media.ts new file mode 100644 index 0000000..ae4bd7b --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/media.ts @@ -0,0 +1,14 @@ +const MAX_MEDIA_BYTES = 5 * 1024 * 1024; +const ALLOWED_MEDIA_TYPES = new Set(["image/jpeg", "image/png", "image/webp", "image/gif"]); + +export function validateMediaFile(file: File) { + if (!ALLOWED_MEDIA_TYPES.has(file.type)) return "仅支持 JPG、PNG、WebP 或 GIF 图片"; + if (file.size > MAX_MEDIA_BYTES) return "图片大小不能超过 5MB"; + return null; +} + +export function formatMediaSize(sizeBytes?: number | null) { + if (!sizeBytes || sizeBytes < 1024) return `${sizeBytes ?? 0} B`; + if (sizeBytes < 1024 * 1024) return `${(sizeBytes / 1024).toFixed(1)} KB`; + return `${(sizeBytes / (1024 * 1024)).toFixed(1)} MB`; +} diff --git a/WonderQ-Admin-UI-Vue/src/lib/menu-routes.test.ts b/WonderQ-Admin-UI-Vue/src/lib/menu-routes.test.ts new file mode 100644 index 0000000..eef7b7a --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/menu-routes.test.ts @@ -0,0 +1,12 @@ +import { describe, expect, it } from "vitest"; +import { isStaticRouteComponent } from "./menu-routes"; + +describe("admin menu route registration", () => { + it("keeps RBAC resource pages on the static parameter route", () => { + expect(isStaticRouteComponent("SystemUsers")).toBe(true); + expect(isStaticRouteComponent("SystemRoles")).toBe(true); + expect(isStaticRouteComponent("SystemMenus")).toBe(true); + expect(isStaticRouteComponent("SystemDepts")).toBe(true); + expect(isStaticRouteComponent("Dashboard")).toBe(false); + }); +}); diff --git a/WonderQ-Admin-UI-Vue/src/lib/menu-routes.ts b/WonderQ-Admin-UI-Vue/src/lib/menu-routes.ts new file mode 100644 index 0000000..a037740 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/menu-routes.ts @@ -0,0 +1,5 @@ +const staticRouteComponents = new Set(["SystemUsers", "SystemRoles", "SystemMenus", "SystemDepts"]); + +export function isStaticRouteComponent(component: string | null | undefined) { + return typeof component === "string" && staticRouteComponents.has(component); +} diff --git a/WonderQ-Admin-UI-Vue/src/lib/route-view.test.ts b/WonderQ-Admin-UI-Vue/src/lib/route-view.test.ts new file mode 100644 index 0000000..e502e40 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/route-view.test.ts @@ -0,0 +1,8 @@ +import { describe, expect, it } from "vitest"; +import { routeViewKey } from "./route-view"; + +describe("route view key", () => { + it("distinguishes parameterized admin pages by full path", () => { + expect(routeViewKey("/admin/system/users")).not.toBe(routeViewKey("/admin/system/roles")); + }); +}); diff --git a/WonderQ-Admin-UI-Vue/src/lib/route-view.ts b/WonderQ-Admin-UI-Vue/src/lib/route-view.ts new file mode 100644 index 0000000..02d5252 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/route-view.ts @@ -0,0 +1,3 @@ +export function routeViewKey(fullPath: string) { + return fullPath; +} diff --git a/WonderQ-Admin-UI-Vue/src/lib/site-config.test.ts b/WonderQ-Admin-UI-Vue/src/lib/site-config.test.ts new file mode 100644 index 0000000..b205b7a --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/site-config.test.ts @@ -0,0 +1,92 @@ +import { describe, expect, it } from "vitest"; +import { + compactSiteItemPayload, + createEmptySiteItemDraft, + siteModuleDefinitions, + validateSiteItemPayload, +} from "@/lib/site-config"; + +describe("site config helpers", () => { + it("provides the homepage module metadata", () => { + expect(siteModuleDefinitions.map((item) => item.id)).toEqual([ + "heroSlides", + "destinationHero", + "demandHero", + "demandFeatureCards", + "demandForm", + "vehicleOptions", + "vehicleService", + ]); + }); + + it("normalizes a hero slide draft without sending unrelated fields", () => { + const payload = compactSiteItemPayload("heroSlides", { + ...createEmptySiteItemDraft("heroSlides", 2), + title: " 贵州亲子游 ", + kicker: " 热门线路 ", + image: " https://example.com/hero.jpg ", + isActive: true, + }); + + expect(payload).toEqual({ + title: "贵州亲子游", + kicker: "热门线路", + image: "https://example.com/hero.jpg", + isActive: true, + sortOrder: 2, + }); + }); + + it("compacts vehicle service line items and removes blank lines", () => { + const payload = compactSiteItemPayload("vehicleService", { + ...createEmptySiteItemDraft("vehicleService", 0), + introTitle: " 万趣用车 ", + intro: " 专属用车服务 ", + serviceSections: [ + { title: " 接送机 ", description: " 行程衔接 " }, + { title: "", description: "" }, + ], + advantages: [" 车型灵活 ", "", " 管家协助 "], + processSteps: [{ title: " 沟通 ", description: " 确认需求 " }], + }); + + expect(payload).toEqual({ + introTitle: "万趣用车", + intro: "专属用车服务", + serviceSections: [{ title: "接送机", description: "行程衔接" }], + advantages: ["车型灵活", "管家协助"], + processSteps: [{ title: "沟通", description: "确认需求" }], + isActive: true, + }); + }); + + it("rejects non-http image URLs before a write request", () => { + expect(validateSiteItemPayload("heroSlides", { image: "javascript:alert(1)" })).toBe("图片地址必须是有效的 HTTP(S) URL"); + expect(validateSiteItemPayload("heroSlides", { image: "https://example.com/hero.jpg" })).toBeNull(); + }); + + it("normalizes the singleton demand form without a sort field", () => { + expect(compactSiteItemPayload("demandForm", { + ...createEmptySiteItemDraft("demandForm", 0), + destinationLabel: " 去哪里 ", + destinationPlaceholder: " 输入目的地 ", + phoneLabel: " 联系方式 ", + phonePlaceholder: " 手机号 ", + noteLabel: " 补充说明 ", + notePlaceholder: " 行程偏好 ", + submitLabel: " 提交需求 ", + chips: [" 贵州 ", "", " 黄果树 "], + sortOrder: 9, + })).toEqual({ + destinationLabel: "去哪里", + destinationPlaceholder: "输入目的地", + phoneLabel: "联系方式", + phonePlaceholder: "手机号", + noteLabel: "补充说明", + notePlaceholder: "行程偏好", + submitLabel: "提交需求", + chips: ["贵州", "黄果树"], + isActive: true, + }); + }); +}); diff --git a/WonderQ-Admin-UI-Vue/src/lib/site-config.ts b/WonderQ-Admin-UI-Vue/src/lib/site-config.ts new file mode 100644 index 0000000..602c332 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/site-config.ts @@ -0,0 +1,119 @@ +import type { SiteConfigItem, SiteItemPatch, SiteModule, SiteServiceLine } from "@/types"; + +export type SiteModuleDefinition = { + id: SiteModule; + label: string; + description: string; + primaryField: "title" | "introTitle" | "submitLabel"; + ordered: boolean; + singleton: boolean; +}; + +export const siteModuleDefinitions: SiteModuleDefinition[] = [ + { id: "heroSlides", label: "顶部轮播", description: "维护首页顶部轮播内容和展示顺序。", primaryField: "title", ordered: true, singleton: false }, + { id: "destinationHero", label: "目的地主视觉", description: "维护目的地页主视觉标题和图片。", primaryField: "title", ordered: true, singleton: false }, + { id: "demandHero", label: "需求页主视觉", description: "维护需求页主视觉说明和定制步骤。", primaryField: "title", ordered: true, singleton: false }, + { id: "demandFeatureCards", label: "需求页特色卡片", description: "维护需求页特色卡片标题和描述。", primaryField: "title", ordered: true, singleton: false }, + { id: "demandForm", label: "需求表单", description: "维护需求表单字段、占位文案和快捷选项。", primaryField: "submitLabel", ordered: false, singleton: true }, + { id: "vehicleOptions", label: "万趣用车", description: "维护首页用车卡片内容和展示顺序。", primaryField: "title", ordered: true, singleton: false }, + { id: "vehicleService", label: "用车服务", description: "维护用车服务页的单例说明内容。", primaryField: "introTitle", ordered: false, singleton: true }, +]; + +export function getSiteModuleDefinition(module: SiteModule) { + return siteModuleDefinitions.find((item) => item.id === module) as SiteModuleDefinition; +} + +export function createEmptySiteItemDraft(module: SiteModule, sortOrder: number): SiteItemPatch { + if (module === "heroSlides") return { title: "", kicker: "", image: "", isActive: false, sortOrder }; + if (module === "destinationHero") return { title: "", kicker: "", image: "", isActive: true, sortOrder }; + if (module === "demandHero") return { title: "", kicker: "", description: "", steps: [], isActive: true, sortOrder }; + if (module === "demandFeatureCards") return { title: "", description: "", isActive: true, sortOrder }; + if (module === "demandForm") { + return { + destinationLabel: "目的地/玩法", + destinationPlaceholder: "例如：贵州、黄果树、西江苗寨", + phoneLabel: "联系方式", + phonePlaceholder: "手机号 / 微信号", + noteLabel: "补充说明", + notePlaceholder: "出行日期、人数、酒店偏好、预算范围", + submitLabel: "提交出行需求", + chips: [], + isActive: true, + }; + } + if (module === "vehicleOptions") return { title: "", description: "", image: "", isActive: true, sortOrder }; + return { introTitle: "万趣用车", intro: "旅游出行专属用车服务，管家协助确认合适车型与行程安排。", serviceSections: [], advantages: [], processSteps: [], isActive: true }; +} + +export function siteItemDraft(item: SiteConfigItem): SiteItemPatch { + if ("introTitle" in item) { + return { introTitle: item.introTitle, intro: item.intro, serviceSections: item.serviceSections.map(copyLine), advantages: [...item.advantages], processSteps: item.processSteps.map(copyLine), isActive: item.isActive }; + } + if ("submitLabel" in item) { + return { + destinationLabel: item.destinationLabel, + destinationPlaceholder: item.destinationPlaceholder, + phoneLabel: item.phoneLabel, + phonePlaceholder: item.phonePlaceholder, + noteLabel: item.noteLabel, + notePlaceholder: item.notePlaceholder, + submitLabel: item.submitLabel, + chips: [...item.chips], + isActive: item.isActive, + }; + } + return { + title: item.title, + kicker: "kicker" in item ? item.kicker : undefined, + description: "description" in item ? item.description : undefined, + steps: "steps" in item ? [...item.steps] : undefined, + image: "image" in item ? item.image : undefined, + isActive: item.isActive, + sortOrder: "sortOrder" in item ? item.sortOrder : undefined, + }; +} + +export function compactSiteItemPayload(module: SiteModule, draft: SiteItemPatch): SiteItemPatch { + if (module === "heroSlides" || module === "destinationHero") { + return { title: normalizeText(draft.title), kicker: normalizeNullableText(draft.kicker), image: normalizeUrl(draft.image), isActive: draft.isActive ?? true, sortOrder: normalizeSortOrder(draft.sortOrder) }; + } + if (module === "demandHero") { + return { title: normalizeText(draft.title), kicker: normalizeNullableText(draft.kicker), description: normalizeNullableText(draft.description), steps: normalizeList(draft.steps), isActive: draft.isActive ?? true, sortOrder: normalizeSortOrder(draft.sortOrder) }; + } + if (module === "demandFeatureCards") { + return { title: normalizeText(draft.title), description: normalizeNullableText(draft.description), isActive: draft.isActive ?? true, sortOrder: normalizeSortOrder(draft.sortOrder) }; + } + if (module === "demandForm") { + return { + destinationLabel: normalizeText(draft.destinationLabel), + destinationPlaceholder: normalizeNullableText(draft.destinationPlaceholder), + phoneLabel: normalizeText(draft.phoneLabel), + phonePlaceholder: normalizeNullableText(draft.phonePlaceholder), + noteLabel: normalizeText(draft.noteLabel), + notePlaceholder: normalizeNullableText(draft.notePlaceholder), + submitLabel: normalizeText(draft.submitLabel), + chips: normalizeList(draft.chips), + isActive: draft.isActive ?? true, + }; + } + if (module === "vehicleOptions") { + return { title: normalizeText(draft.title), description: normalizeNullableText(draft.description), image: normalizeUrl(draft.image), isActive: draft.isActive ?? true, sortOrder: normalizeSortOrder(draft.sortOrder) }; + } + return { introTitle: normalizeText(draft.introTitle), intro: normalizeText(draft.intro), serviceSections: normalizeLines(draft.serviceSections), advantages: normalizeList(draft.advantages), processSteps: normalizeLines(draft.processSteps), isActive: draft.isActive ?? true }; +} + +export function validateSiteItemPayload(module: SiteModule, payload: SiteItemPatch) { + if ((module === "heroSlides" || module === "destinationHero" || module === "vehicleOptions") && payload.image) { + if (!isHttpUrl(payload.image)) return "图片地址必须是有效的 HTTP(S) URL"; + } + return null; +} + +function normalizeText(value: string | null | undefined) { return value?.trim() || ""; } +function normalizeNullableText(value: string | null | undefined) { return value?.trim() || null; } +function normalizeUrl(value: string | null | undefined) { return value?.trim() || null; } +function normalizeSortOrder(value: number | undefined) { return Number.isFinite(Number(value)) ? Math.max(0, Number(value)) : undefined; } +function normalizeList(values: string[] | undefined) { return (values ?? []).map((item) => item.trim()).filter(Boolean); } +function normalizeLines(values: SiteServiceLine[] | undefined) { return (values ?? []).map(copyLine).map((item) => ({ title: item.title.trim(), description: item.description.trim() })).filter((item) => item.title || item.description); } +function copyLine(item: SiteServiceLine): SiteServiceLine { return { title: item.title, description: item.description }; } +function isHttpUrl(value: string) { try { const url = new URL(value); return url.protocol === "http:" || url.protocol === "https:"; } catch { return false; } } diff --git a/WonderQ-Admin-UI-Vue/src/lib/system-resource.test.ts b/WonderQ-Admin-UI-Vue/src/lib/system-resource.test.ts new file mode 100644 index 0000000..98393a1 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/system-resource.test.ts @@ -0,0 +1,25 @@ +import { nextTick, ref } from "vue"; +import { describe, expect, it } from "vitest"; +import { useSystemResource } from "./system-resource"; + +describe("system resource loader", () => { + it("reloads records when the route resource changes", async () => { + const resource = ref("users"); + const requestedResources: string[] = []; + const state = useSystemResource(resource, async (name) => { + requestedResources.push(name); + return { items: [name] }; + }); + + await nextTick(); + await Promise.resolve(); + expect(requestedResources).toEqual(["users"]); + expect(state.items.value).toEqual(["users"]); + + resource.value = "roles"; + await nextTick(); + await Promise.resolve(); + expect(requestedResources).toEqual(["users", "roles"]); + expect(state.items.value).toEqual(["roles"]); + }); +}); diff --git a/WonderQ-Admin-UI-Vue/src/lib/system-resource.ts b/WonderQ-Admin-UI-Vue/src/lib/system-resource.ts new file mode 100644 index 0000000..a9bb74d --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/system-resource.ts @@ -0,0 +1,40 @@ +import { ref, watch, type Ref } from "vue"; +import { getSystemResource } from "@/api/client"; + +export type SystemResourceResponse = { items: unknown[] }; +export type SystemResourceFetcher = (resource: string) => Promise; + +function errorMessage(error: unknown) { + return error instanceof Error ? error.message : "系统数据加载失败"; +} + +export function useSystemResource( + resource: Readonly>, + fetcher: SystemResourceFetcher = getSystemResource, +) { + const items = ref([]); + const loading = ref(true); + const error = ref(""); + let requestVersion = 0; + + const load = async () => { + const currentVersion = ++requestVersion; + loading.value = true; + error.value = ""; + try { + const response = await fetcher(resource.value); + if (currentVersion !== requestVersion) return; + items.value = response.items; + } catch (err) { + if (currentVersion !== requestVersion) return; + items.value = []; + error.value = errorMessage(err); + } finally { + if (currentVersion === requestVersion) loading.value = false; + } + }; + + watch(resource, load, { immediate: true }); + + return { items, loading, error, reload: load }; +} diff --git a/WonderQ-Admin-UI-Vue/src/lib/wanfa.test.ts b/WonderQ-Admin-UI-Vue/src/lib/wanfa.test.ts new file mode 100644 index 0000000..01a5ce0 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/wanfa.test.ts @@ -0,0 +1,59 @@ +import { describe, expect, it } from "vitest"; +import { + compactDetail, + compactWanfaRoute, + createEmptyDetail, + createEmptyWanfaRoute, +} from "@/lib/wanfa"; + +describe("wanfa editor helpers", () => { + it("normalizes a route draft to the API contract", () => { + expect(compactWanfaRoute({ + ...createEmptyWanfaRoute(), + title: " 亲子玩水 ", + subtitle: " 贵州·轻松节奏 ", + image: " https://example.com/route.jpg ", + routeCount: 4, + demandKeyword: " 亲子 ", + })).toEqual({ + title: "亲子玩水", + subtitle: "贵州·轻松节奏", + image: "https://example.com/route.jpg", + routeCount: 4, + demandKeyword: "亲子", + }); + }); + + it("normalizes detail line fields and keeps empty lists out", () => { + expect(compactDetail({ + ...createEmptyDetail(), + key: " route-1 ", + eyebrow: " 玩法路线 ", + duration: " 5天4晚 ", + title: " 贵州亲子玩水 ", + subtitle: " 山地与自然课堂 ", + intro: " 适合家庭出行。 ", + highlights: [" 亲子互动 ", ""], + included: [" 用车 ", " "], + excluded: [], + notes: [" 雨具 ", ""], + gallery: [" https://example.com/detail.jpg "], + conciergeAdvisorId: " advisor-1 ", + isActive: true, + })).toEqual({ + key: "route-1", + eyebrow: "玩法路线", + duration: "5天4晚", + title: "贵州亲子玩水", + subtitle: "山地与自然课堂", + intro: "适合家庭出行。", + highlights: ["亲子互动"], + included: ["用车"], + excluded: [], + notes: ["雨具"], + gallery: ["https://example.com/detail.jpg"], + conciergeAdvisorId: "advisor-1", + isActive: true, + }); + }); +}); diff --git a/WonderQ-Admin-UI-Vue/src/lib/wanfa.ts b/WonderQ-Admin-UI-Vue/src/lib/wanfa.ts new file mode 100644 index 0000000..90e523c --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/lib/wanfa.ts @@ -0,0 +1,80 @@ +import type { DetailCreate, WanfaRouteCreate } from "@/types"; + +export function createEmptyWanfaRoute(): WanfaRouteCreate { + return { title: "", subtitle: "", image: "", routeCount: 0, demandKeyword: "" }; +} + +export function compactWanfaRoute(draft: WanfaRouteCreate): WanfaRouteCreate { + return { + title: draft.title.trim(), + subtitle: draft.subtitle.trim(), + image: draft.image.trim(), + routeCount: Number.isFinite(Number(draft.routeCount)) ? Math.max(0, Number(draft.routeCount)) : 0, + demandKeyword: draft.demandKeyword.trim(), + }; +} + +export function createEmptyDetail(): DetailCreate { + return { + key: "", + eyebrow: "玩法路线", + duration: "", + title: "", + subtitle: "", + intro: "", + highlights: [], + included: [], + excluded: [], + notes: [], + gallery: [], + conciergeAdvisorId: null, + isActive: true, + }; +} + +export function compactDetail(draft: DetailCreate): DetailCreate { + return { + key: draft.key.trim(), + eyebrow: draft.eyebrow.trim(), + duration: draft.duration.trim(), + title: draft.title.trim(), + subtitle: draft.subtitle.trim(), + intro: draft.intro.trim(), + highlights: compactList(draft.highlights), + included: compactList(draft.included), + excluded: compactList(draft.excluded), + notes: compactList(draft.notes), + gallery: compactList(draft.gallery), + conciergeAdvisorId: draft.conciergeAdvisorId?.trim() || null, + isActive: draft.isActive ?? true, + sortOrder: draft.sortOrder, + }; +} + +export function validateWanfaWrite(route: WanfaRouteCreate, detail: DetailCreate) { + if (!route.title || !route.subtitle || !route.image || !route.demandKeyword) { + return "请完整填写路线标题、副标题、封面和需求关键词。"; + } + if (!isHttpUrl(route.image)) return "路线封面必须是有效的 HTTP(S) URL。"; + if (!Number.isInteger(route.routeCount) || route.routeCount < 0) { + return "路线数量必须是大于等于 0 的整数。"; + } + if (!detail.eyebrow || !detail.duration || !detail.title || !detail.subtitle || !detail.intro) { + return "请完整填写详情眉标、时长、标题、副标题和详情介绍。"; + } + if (detail.gallery.some((image) => !isHttpUrl(image))) return "详情图片必须是有效的 HTTP(S) URL。"; + return null; +} + +function compactList(items: string[]) { + return items.map((item) => item.trim()).filter(Boolean); +} + +function isHttpUrl(value: string) { + try { + const url = new URL(value); + return url.protocol === "http:" || url.protocol === "https:"; + } catch { + return false; + } +} diff --git a/WonderQ-Admin-UI-Vue/src/pages/ConciergePage.vue b/WonderQ-Admin-UI-Vue/src/pages/ConciergePage.vue index d521682..c7fa87e 100644 --- a/WonderQ-Admin-UI-Vue/src/pages/ConciergePage.vue +++ b/WonderQ-Admin-UI-Vue/src/pages/ConciergePage.vue @@ -1,10 +1,120 @@ - + diff --git a/WonderQ-Admin-UI-Vue/src/pages/HomePage.vue b/WonderQ-Admin-UI-Vue/src/pages/HomePage.vue index 96c06f3..be70a2f 100644 --- a/WonderQ-Admin-UI-Vue/src/pages/HomePage.vue +++ b/WonderQ-Admin-UI-Vue/src/pages/HomePage.vue @@ -1,14 +1,270 @@ diff --git a/WonderQ-Admin-UI-Vue/src/pages/LeadsPage.test.ts b/WonderQ-Admin-UI-Vue/src/pages/LeadsPage.test.ts new file mode 100644 index 0000000..39bb79a --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/pages/LeadsPage.test.ts @@ -0,0 +1,11 @@ +import { readFile } from "node:fs/promises"; +import { fileURLToPath } from "node:url"; +import { describe, expect, it } from "vitest"; + +describe("LeadsPage initial loading", () => { + it("loads leads when the page is mounted", async () => { + const source = await readFile(fileURLToPath(new URL("./LeadsPage.vue", import.meta.url)), "utf8"); + + expect(source).toMatch(/onMounted\(load\)/); + }); +}); diff --git a/WonderQ-Admin-UI-Vue/src/pages/LeadsPage.vue b/WonderQ-Admin-UI-Vue/src/pages/LeadsPage.vue index 3b29a23..306389f 100644 --- a/WonderQ-Admin-UI-Vue/src/pages/LeadsPage.vue +++ b/WonderQ-Admin-UI-Vue/src/pages/LeadsPage.vue @@ -1,29 +1,71 @@ - + diff --git a/WonderQ-Admin-UI-Vue/src/pages/MediaPage.vue b/WonderQ-Admin-UI-Vue/src/pages/MediaPage.vue new file mode 100644 index 0000000..07855cd --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/pages/MediaPage.vue @@ -0,0 +1,65 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/pages/OperationsToolsPage.vue b/WonderQ-Admin-UI-Vue/src/pages/OperationsToolsPage.vue new file mode 100644 index 0000000..f008ce7 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/pages/OperationsToolsPage.vue @@ -0,0 +1,52 @@ + + + diff --git a/WonderQ-Admin-UI-Vue/src/pages/SystemResourcePage.vue b/WonderQ-Admin-UI-Vue/src/pages/SystemResourcePage.vue index c009361..a09b11f 100644 --- a/WonderQ-Admin-UI-Vue/src/pages/SystemResourcePage.vue +++ b/WonderQ-Admin-UI-Vue/src/pages/SystemResourcePage.vue @@ -1,12 +1,143 @@ - + diff --git a/WonderQ-Admin-UI-Vue/src/pages/WanfaPage.vue b/WonderQ-Admin-UI-Vue/src/pages/WanfaPage.vue index dcc7f34..edc82ef 100644 --- a/WonderQ-Admin-UI-Vue/src/pages/WanfaPage.vue +++ b/WonderQ-Admin-UI-Vue/src/pages/WanfaPage.vue @@ -1,10 +1,283 @@ - + diff --git a/WonderQ-Admin-UI-Vue/src/router/index.ts b/WonderQ-Admin-UI-Vue/src/router/index.ts index 65c9b44..a6ca2b3 100644 --- a/WonderQ-Admin-UI-Vue/src/router/index.ts +++ b/WonderQ-Admin-UI-Vue/src/router/index.ts @@ -7,8 +7,12 @@ import HomePage from "@/pages/HomePage.vue"; import WanfaPage from "@/pages/WanfaPage.vue"; import ConciergePage from "@/pages/ConciergePage.vue"; import LeadsPage from "@/pages/LeadsPage.vue"; +import MediaPage from "@/pages/MediaPage.vue"; +import OperationsToolsPage from "@/pages/OperationsToolsPage.vue"; import SystemResourcePage from "@/pages/SystemResourcePage.vue"; import NotFoundPage from "@/pages/NotFoundPage.vue"; +import { isStaticRouteComponent } from "@/lib/menu-routes"; +import { adminIndexRoute } from "./route-config"; const componentRegistry = { Dashboard: DashboardPage, @@ -16,6 +20,8 @@ const componentRegistry = { WanfaPage, ConciergePage, LeadsPage, + MediaPage, + OperationsToolsPage, SystemUsers: SystemResourcePage, SystemRoles: SystemResourcePage, SystemMenus: SystemResourcePage, @@ -36,8 +42,10 @@ const router = createRouter({ { path: "play", name: "play", component: WanfaPage, meta: { permission: "admin:wanfa:read" } }, { path: "concierge", name: "concierge", component: ConciergePage, meta: { permission: "admin:concierge:read" } }, { path: "leads", name: "leads", component: LeadsPage, meta: { permission: "admin:leads:read" } }, + { path: "media", name: "media", component: MediaPage, meta: { permission: "admin:media:read" } }, + { path: "tools", name: "operations-tools", component: OperationsToolsPage, meta: { permission: "admin:site-config" } }, { path: "system/:resource", name: "system-resource", component: SystemResourcePage }, - { path: "", redirect: "/dashboard" }, + adminIndexRoute, ], }, { path: "/:pathMatch(.*)*", name: "not-found", component: NotFoundPage }, @@ -50,7 +58,7 @@ function registerDynamicRoutes() { if (dynamicRoutesRegistered) return; const auth = useAuthStore(); for (const menu of auth.menus) { - if (menu.type !== "page" || !menu.path || !menu.component || !(menu.component in componentRegistry)) continue; + if (menu.type !== "page" || !menu.path || !menu.component || isStaticRouteComponent(menu.component) || !(menu.component in componentRegistry)) continue; const path = menu.path.replace(/^\/+/, ""); if (router.getRoutes().some((route) => route.path === `/${path}`)) continue; router.addRoute("admin", { diff --git a/WonderQ-Admin-UI-Vue/src/router/route-config.ts b/WonderQ-Admin-UI-Vue/src/router/route-config.ts new file mode 100644 index 0000000..acc52c7 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/router/route-config.ts @@ -0,0 +1,5 @@ +export const adminIndexRoute = { + path: "", + name: "admin-index", + redirect: "/dashboard", +} as const; diff --git a/WonderQ-Admin-UI-Vue/src/router/router.test.ts b/WonderQ-Admin-UI-Vue/src/router/router.test.ts new file mode 100644 index 0000000..3db8e97 --- /dev/null +++ b/WonderQ-Admin-UI-Vue/src/router/router.test.ts @@ -0,0 +1,9 @@ +import { describe, expect, it } from "vitest"; +import { adminIndexRoute } from "./route-config"; + +describe("admin router", () => { + it("names the empty admin child route", () => { + expect(adminIndexRoute.name).toBe("admin-index"); + expect(adminIndexRoute.redirect).toBe("/dashboard"); + }); +}); diff --git a/WonderQ-Admin-UI-Vue/src/styles.css b/WonderQ-Admin-UI-Vue/src/styles.css index 0e6bfef..6eb8bea 100644 --- a/WonderQ-Admin-UI-Vue/src/styles.css +++ b/WonderQ-Admin-UI-Vue/src/styles.css @@ -31,6 +31,7 @@ button, input { font: inherit; } .admin-main { padding: 34px 40px 54px; } .page-stack { max-width: 1220px; margin: 0 auto; } .page-intro { display: flex; justify-content: space-between; align-items: flex-end; gap: 24px; margin-bottom: 26px; } +.page-intro-actions { display: flex; flex-wrap: wrap; justify-content: flex-end; gap: 8px; } .page-intro p:not(.eyebrow) { margin: 9px 0 0; color: var(--muted); font-size: 13px; } .metric-grid, .module-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 16px; margin-bottom: 20px; } .metric-card, .module-card, .panel-card, .advisor-card { border: 1px solid var(--line); border-radius: 12px; } @@ -53,7 +54,97 @@ button, input { font: inherit; } .advisor-card strong, .advisor-card span { display: block; } .advisor-card span { margin-top: 4px; color: var(--muted); font-size: 12px; } .advisor-avatar { display: grid; place-items: center; width: 42px; height: 42px; border-radius: 50%; color: #1d4ed8; background: #dbeafe; font-weight: 700; } +.concierge-list { display: grid; gap: 10px; } +.concierge-row { display: flex; justify-content: space-between; gap: 16px; align-items: center; padding: 13px 0; border-bottom: 1px solid #f1f5f9; } +.concierge-row:last-child { border-bottom: 0; } +.concierge-summary, .concierge-actions, .media-toolbar, .single-media-heading, .subsection-heading { display: flex; align-items: center; gap: 12px; } +.concierge-summary { min-width: 0; } +.concierge-summary > div:last-child { min-width: 0; } +.concierge-summary strong, .concierge-summary span { display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.concierge-summary span, .subsection-heading span { margin-top: 4px; color: var(--muted); font-size: 12px; } +.concierge-actions { flex-wrap: wrap; justify-content: flex-end; } +.concierge-editor, .single-media-editor { padding: 4px 4px 14px; } +.concierge-detail-editor { margin: 20px 0; padding-top: 20px; border-top: 1px solid var(--line); } +.subsection-heading { justify-content: space-between; margin-bottom: 12px; } +.subsection-heading > div { display: grid; gap: 2px; } +.concierge-detail-row { display: grid; grid-template-columns: 150px minmax(0, 1fr) auto; gap: 8px; margin-bottom: 8px; } +.single-media-editor { display: grid; align-content: start; gap: 10px; padding: 12px; border: 1px solid var(--line); border-radius: 9px; } +.single-media-heading { justify-content: space-between; } +.single-media-preview { width: 100%; height: 150px; border-radius: 8px; background: #f1f5f9; } +.lead-filter-card { margin-bottom: 16px; } +.lead-filters { display: grid; grid-template-columns: 170px 170px minmax(180px, 1fr) auto; gap: 10px; } +.lead-summary { display: grid; gap: 4px; min-width: 0; } +.lead-summary span { overflow: hidden; color: var(--muted); font-size: 12px; text-overflow: ellipsis; white-space: nowrap; } +.lead-detail-card { margin-top: 16px; } +.lead-detail-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 16px; margin: 0; } +.lead-detail-grid dt { color: var(--muted); font-size: 12px; } +.lead-detail-grid dd { margin: 5px 0 0; color: var(--ink); font-weight: 650; } +.lead-detail-section { margin-top: 20px; padding: 14px; border-radius: 9px; background: #f8fafc; } +.lead-detail-section p { margin: 7px 0 0; color: #475569; line-height: 1.6; } +.media-toolbar { justify-content: flex-end; } +.media-toolbar .el-input { width: 150px; } +.media-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 14px; } +.media-card { overflow: hidden; border: 1px solid var(--line); border-radius: 10px; background: #fff; } +.media-card > .el-image { display: block; width: 100%; height: 150px; background: #f1f5f9; } +.media-card-content { display: grid; gap: 5px; padding: 10px; } +.media-card-content span, .media-card-content small { overflow: hidden; color: var(--muted); font-size: 11px; text-overflow: ellipsis; white-space: nowrap; } +.media-card-content small { color: #94a3b8; } +.operations-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 16px; margin-top: 18px; } +.operation-card h3 { margin: 0; font-size: 19px; } +.operation-card > p:not(.eyebrow) { min-height: 50px; margin: 10px 0 20px; color: var(--muted); line-height: 1.7; } +.danger-operation { border-color: #fecaca; } +.operation-result { margin-top: 18px; } .json-preview { max-height: 220px; overflow: auto; margin: 0; color: #475569; font-size: 12px; white-space: pre-wrap; } +.site-config-intro { align-items: center; } +.site-config-intro + .el-alert { margin-bottom: 18px; } +.site-config-tabs { margin-top: 18px; } +.site-config-panel { padding: 4px 0 0; } +.site-config-panel .panel-heading { margin-bottom: 18px; } +.site-config-panel .panel-heading > div { display: grid; gap: 5px; } +.site-config-panel .panel-heading span { color: var(--muted); font-size: 12px; font-weight: 400; } +.site-item-content { display: flex; align-items: center; gap: 12px; min-width: 0; } +.site-item-content > div { min-width: 0; } +.site-item-content strong, .site-item-content small { display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.site-item-content small { margin-top: 5px; color: var(--muted); font-size: 12px; } +.site-item-thumb { flex: 0 0 auto; width: 56px; height: 40px; border-radius: 7px; background: #f1f5f9; } +.site-config-editor { padding: 4px 4px 14px; } +.wanfa-workspace { display: grid; grid-template-columns: minmax(260px, .34fr) minmax(0, .66fr); gap: 18px; align-items: start; } +.wanfa-category-panel, .wanfa-route-panel { min-width: 0; } +.wanfa-category-list { display: grid; gap: 8px; } +.wanfa-category-row { display: grid; grid-template-columns: minmax(0, 1fr); gap: 7px; padding: 10px; border: 1px solid transparent; border-radius: 9px; background: #f8fafc; } +.wanfa-category-row.is-selected { border-color: #bfdbfe; background: #eff6ff; } +.wanfa-category-select { display: flex; justify-content: space-between; gap: 8px; width: 100%; padding: 0; border: 0; color: var(--ink); background: transparent; text-align: left; cursor: pointer; } +.wanfa-category-select span { color: var(--muted); font-size: 12px; white-space: nowrap; } +.wanfa-row-actions { display: flex; flex-wrap: wrap; gap: 2px; } +.wanfa-row-actions .el-button { margin-left: 0; } +.wanfa-editor { padding: 4px 4px 14px; } +.route-editor { padding-bottom: 0; } +.detail-fields { margin-top: 22px; padding-top: 20px; border-top: 1px solid var(--line); } +.detail-fields-heading { display: grid; gap: 4px; margin-bottom: 18px; } +.detail-fields-heading span { color: var(--muted); font-size: 12px; line-height: 1.5; } +.route-editor .el-alert { margin-top: 18px; } +.gallery-editor { display: grid; gap: 12px; margin-bottom: 18px; padding-top: 4px; } +.gallery-editor-heading { display: flex; justify-content: space-between; gap: 12px; align-items: center; } +.gallery-editor-heading > div { display: grid; gap: 4px; } +.gallery-editor-heading span { color: var(--muted); font-size: 12px; } +.media-file-input { position: absolute; width: 1px; height: 1px; opacity: 0; pointer-events: none; } +.gallery-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px; } +.gallery-item { min-width: 0; padding: 8px; border: 1px solid var(--line); border-radius: 9px; background: #fff; } +.gallery-item .el-image { display: block; width: 100%; height: 120px; border-radius: 6px; background: #f1f5f9; } +.gallery-item small { display: block; overflow: hidden; margin-top: 7px; color: var(--muted); font-size: 11px; text-overflow: ellipsis; white-space: nowrap; } +.gallery-actions { display: flex; gap: 2px; margin-top: 3px; } +.editor-heading { display: flex; justify-content: space-between; gap: 16px; align-items: flex-start; margin-bottom: 24px; } +.editor-heading h3 { margin: 0; font-size: 21px; } +.editor-heading p:not(.eyebrow) { margin: 7px 0 0; color: var(--muted); font-size: 13px; line-height: 1.6; } +.site-config-editor .el-form-item { margin-bottom: 18px; } +.field-hint { margin: 6px 0 0; color: #94a3b8; font-size: 12px; line-height: 1.5; } +.site-image-preview { display: block; width: 100%; max-width: 260px; height: 132px; margin-top: 12px; border-radius: 9px; background: #f1f5f9; } +.editor-options { display: grid; grid-template-columns: 1fr 1fr; gap: 16px; } +.editor-actions { display: flex; justify-content: flex-end; gap: 10px; padding-top: 10px; } +@media (max-width: 880px) { .wanfa-workspace { grid-template-columns: 1fr; } } +@media (max-width: 980px) { .media-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); } .lead-detail-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } } +@media (max-width: 760px) { .concierge-row { align-items: flex-start; flex-direction: column; } .concierge-actions { justify-content: flex-start; } .lead-filters { grid-template-columns: 1fr 1fr; } .lead-filters .el-input { grid-column: 1 / -1; } .operations-grid { grid-template-columns: 1fr; } .media-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } } +@media (max-width: 640px) { .site-config-intro { align-items: flex-start; } .site-config-intro .el-button, .page-intro-actions { width: 100%; } .page-intro-actions { justify-content: stretch; } .page-intro-actions .el-button { flex: 1; } .editor-options { grid-template-columns: 1fr; gap: 0; } .site-config-panel .panel-heading { align-items: flex-start; flex-direction: column; } .site-config-panel .panel-heading .el-button { width: 100%; } .concierge-detail-row { grid-template-columns: 1fr; } .lead-filters { grid-template-columns: 1fr; } .lead-filters .el-input { grid-column: auto; } .lead-detail-grid { grid-template-columns: 1fr; } .media-toolbar { align-items: stretch; flex-direction: column; width: 100%; } .media-toolbar .el-input { width: 100%; } .media-grid { grid-template-columns: 1fr; } } .login-page { display: grid; grid-template-columns: minmax(0, 1fr) 420px; min-height: 100vh; padding: 5vw 9vw; gap: 8vw; align-items: center; background: #f8fafc; } .login-art { max-width: 560px; } .login-art h1 { margin: 18px 0; color: #172554; font-size: clamp(34px, 4vw, 61px); letter-spacing: -.05em; line-height: 1.07; } diff --git a/WonderQ-Admin-UI-Vue/src/types.ts b/WonderQ-Admin-UI-Vue/src/types.ts index 9fda32f..1dc1dae 100644 --- a/WonderQ-Admin-UI-Vue/src/types.ts +++ b/WonderQ-Admin-UI-Vue/src/types.ts @@ -43,6 +43,69 @@ export type AdminProfile = { dataScopes: string[]; }; +export type SystemUserItem = AdminUser & { + roleIds: string[]; + deptIds: string[]; + createdAt?: string; + updatedAt?: string; +}; + +export type SystemRoleItem = { + id: string; + name: string; + code: string; + dataScope: "all" | "dept" | "dept_and_children" | "custom_dept" | "self"; + description?: string | null; + isActive: boolean; + menuIds: string[]; + deptIds: string[]; + createdAt?: string; + updatedAt?: string; +}; + +export type SystemMenuItem = { + id: string; + parentId?: string | null; + name: string; + type: "directory" | "page" | "button"; + path?: string | null; + component?: string | null; + permission?: string | null; + icon?: string | null; + sortOrder: number; + isVisible: boolean; + isActive: boolean; + createdAt?: string; + updatedAt?: string; +}; + +export type SystemDeptItem = { + id: string; + parentId?: string | null; + name: string; + sortOrder: number; + isActive: boolean; + createdAt?: string; + updatedAt?: string; +}; + +export type SystemUserCreate = { + email: string; + name: string; + password: string; + isActive: boolean; + roleIds: string[]; + deptIds: string[]; +}; + +export type SystemUserPatch = Partial>; +export type SystemRoleCreate = Omit; +export type SystemRolePatch = Partial; +export type SystemMenuCreate = Omit; +export type SystemMenuPatch = Partial; +export type SystemDeptCreate = Omit; +export type SystemDeptPatch = Partial; + export type AuthPayload = { token: string; accessToken: string; @@ -57,25 +120,255 @@ export type Dashboard = { export type Lead = { id: string; + leadType: LeadType; contactName?: string | null; + customerId?: string | null; phone: string; destination?: string | null; - status: string; - leadType?: string; + travelDate?: string | null; + peopleCount?: number | null; + budgetMin?: number | null; + budgetMax?: number | null; + note?: string | null; + sourcePage?: string | null; + vehicleDemand?: VehicleDemand | null; + status: LeadStatus; + assignedUser?: { id: string; name: string } | null; createdAt?: string; + updatedAt?: string; +}; + +export type LeadStatus = "new" | "assigned" | "contacted" | "planning" | "won" | "invalid"; +export type LeadType = "general" | "vehicle"; +export type VehicleDemand = { + serviceType: "charter" | "transfer"; + charterDuration?: "halfDay" | "fullDay" | null; + travelDate: string; + pickupTime?: string | null; + pickupLocation: string; + dropoffLocation: string; + peopleCount: number; + luggageCount?: number | null; + vehicleOptionId?: string | null; + vehicleOptionTitle?: string | null; + specialRequirements?: string | null; }; export type WanfaCategory = { id: string; label: string; - routes: Array<{ id: string; title: string; subtitle: string; routeCount: number }>; + routes: WanfaRoute[]; +}; + +export type WanfaRoute = { + id: string; + title: string; + subtitle: string; + image: string; + routeCount: number; + demandKeyword: string; +}; + +export type WanfaCategoryCreate = { label: string }; +export type WanfaCategoryPatch = { label?: string }; +export type WanfaRouteCreate = { + title: string; + subtitle: string; + image: string; + routeCount: number; + demandKeyword: string; +}; +export type WanfaRoutePatch = Partial; + +export type DetailRecord = { + id: string; + key: string; + eyebrow: string; + duration: string; + title: string; + subtitle: string; + intro: string; + highlights: string[]; + included: string[]; + excluded: string[]; + notes: string[]; + gallery: string[]; + conciergeAdvisorId: string | null; + isActive: boolean; + sortOrder: number; + createdAt?: string; + updatedAt?: string; +}; + +export type DetailCreate = Omit & { sortOrder?: number }; +export type DetailPatch = Partial; + +export type MediaAsset = { + id: string; + url: string; + name: string; + mimeType: string; + sizeBytes: number; + group: string; + createdAt?: string; + updatedAt?: string; }; export type ConciergeAdvisor = { id: string; + avatar?: string; name: string; role: string; + details?: Array<{ icon: string; label: string }>; + qrImage?: string; isActive: boolean; + sortOrder?: number; + createdAt?: string; + updatedAt?: string; }; -export type SiteConfig = Record; +export type ConciergeDetail = { icon: string; label: string }; +export type ConciergeAdvisorCreate = { + avatar: string; + name: string; + role: string; + details: ConciergeDetail[]; + qrImage: string; + isActive?: boolean; + sortOrder?: number; +}; +export type ConciergeAdvisorPatch = Partial; + +export type SiteVersion = { + id: string; + title: string; + status: string; + snapshot?: unknown; + publishedAt?: string | null; + createdAt?: string; +}; + +export type ResetContentResult = { + heroSlides?: number; + destinationHero?: number; + vehicleOptions?: number; + demandHero?: number; + demandFeatureCards?: number; + demandForm?: number; + siteVersionId?: string; +}; + +export type SiteModule = "heroSlides" | "destinationHero" | "demandHero" | "demandFeatureCards" | "demandForm" | "vehicleOptions" | "vehicleService"; + +export type SiteServiceLine = { + title: string; + description: string; +}; + +export type HeroSlide = { + id: string; + title: string; + kicker: string | null; + image: string | null; + isActive: boolean; + sortOrder: number; + createdAt?: string; + updatedAt?: string; +}; + +export type DestinationHero = HeroSlide; + +export type DemandHero = { + id: string; + title: string; + kicker: string | null; + description: string | null; + steps: string[]; + isActive: boolean; + sortOrder: number; + createdAt?: string; + updatedAt?: string; +}; + +export type DemandFeatureCard = { + id: string; + title: string; + description: string | null; + isActive: boolean; + sortOrder: number; + createdAt?: string; + updatedAt?: string; +}; + +export type DemandForm = { + id: string; + destinationLabel: string; + destinationPlaceholder: string | null; + phoneLabel: string; + phonePlaceholder: string | null; + noteLabel: string; + notePlaceholder: string | null; + submitLabel: string; + chips: string[]; + isActive: boolean; + createdAt?: string; + updatedAt?: string; +}; + +export type VehicleOption = { + id: string; + title: string; + description: string | null; + image: string | null; + isActive: boolean; + sortOrder: number; + createdAt?: string; + updatedAt?: string; +}; + +export type VehicleServiceConfig = { + id: string; + introTitle: string; + intro: string; + serviceSections: SiteServiceLine[]; + advantages: string[]; + processSteps: SiteServiceLine[]; + isActive: boolean; + createdAt?: string; + updatedAt?: string; +}; + +export type SiteConfig = { + heroSlides: HeroSlide[]; + destinationHero: DestinationHero[]; + demandHero: DemandHero[]; + demandFeatureCards: DemandFeatureCard[]; + demandForm: DemandForm[]; + vehicleOptions: VehicleOption[]; + vehicleService: VehicleServiceConfig[]; +}; + +export type SiteConfigItem = HeroSlide | DestinationHero | DemandHero | DemandFeatureCard | DemandForm | VehicleOption | VehicleServiceConfig; + +export type SiteItemPatch = { + title?: string | null; + kicker?: string | null; + image?: string | null; + description?: string | null; + steps?: string[]; + destinationLabel?: string | null; + destinationPlaceholder?: string | null; + phoneLabel?: string | null; + phonePlaceholder?: string | null; + noteLabel?: string | null; + notePlaceholder?: string | null; + submitLabel?: string | null; + chips?: string[]; + introTitle?: string | null; + intro?: string | null; + serviceSections?: SiteServiceLine[]; + advantages?: string[]; + processSteps?: SiteServiceLine[]; + isActive?: boolean; + sortOrder?: number; +}; diff --git a/WonderQ-Admin/alembic/versions/0002_add_map_image.py b/WonderQ-Admin/alembic/versions/0002_add_map_image.py deleted file mode 100644 index 02f413a..0000000 --- a/WonderQ-Admin/alembic/versions/0002_add_map_image.py +++ /dev/null @@ -1,36 +0,0 @@ -"""Add map image module table. - -Revision ID: 0002_add_map_image -Revises: 0001_initial_schema -Create Date: 2026-07-01 -""" - -from alembic import op -import sqlalchemy as sa -from sqlalchemy import inspect - - -revision = "0002_add_map_image" -down_revision = "0001_initial_schema" -branch_labels = None -depends_on = None - - -def upgrade() -> None: - bind = op.get_bind() - if "MapImage" not in set(inspect(bind).get_table_names()): - op.create_table( - "MapImage", - sa.Column("id", sa.String(), nullable=False), - sa.Column("image", sa.String(), nullable=False), - sa.Column("isActive", sa.Boolean(), nullable=False, server_default=sa.true()), - sa.Column("createdAt", sa.DateTime(), nullable=False), - sa.Column("updatedAt", sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint("id"), - ) - - -def downgrade() -> None: - bind = op.get_bind() - if "MapImage" in set(inspect(bind).get_table_names()): - op.drop_table("MapImage") diff --git a/WonderQ-Admin/alembic/versions/0003_campaign_display_fields.py b/WonderQ-Admin/alembic/versions/0003_campaign_display_fields.py deleted file mode 100644 index 7537166..0000000 --- a/WonderQ-Admin/alembic/versions/0003_campaign_display_fields.py +++ /dev/null @@ -1,53 +0,0 @@ -"""Add campaign display fields. - -Revision ID: 0003_campaign_display_fields -Revises: 0002_add_map_image -Create Date: 2026-07-02 -""" - -from alembic import op -import sqlalchemy as sa -from sqlalchemy import inspect -from sqlalchemy.dialects import postgresql - - -revision = "0003_campaign_display_fields" -down_revision = "0002_add_map_image" -branch_labels = None -depends_on = None - - -def upgrade() -> None: - bind = op.get_bind() - if "Campaign" not in set(inspect(bind).get_table_names()): - return - - columns = {column["name"] for column in inspect(bind).get_columns("Campaign")} - if "priceAmount" not in columns: - op.add_column("Campaign", sa.Column("priceAmount", sa.Integer(), nullable=True)) - if "priceUnit" not in columns: - op.add_column("Campaign", sa.Column("priceUnit", sa.String(), nullable=True)) - if "tags" not in columns: - op.add_column( - "Campaign", - sa.Column( - "tags", - postgresql.ARRAY(sa.String()), - nullable=False, - server_default=sa.text("'{}'::varchar[]"), - ), - ) - - -def downgrade() -> None: - bind = op.get_bind() - if "Campaign" not in set(inspect(bind).get_table_names()): - return - - columns = {column["name"] for column in inspect(bind).get_columns("Campaign")} - if "tags" in columns: - op.drop_column("Campaign", "tags") - if "priceUnit" in columns: - op.drop_column("Campaign", "priceUnit") - if "priceAmount" in columns: - op.drop_column("Campaign", "priceAmount") diff --git a/WonderQ-Admin/alembic/versions/0004_route_sections.py b/WonderQ-Admin/alembic/versions/0004_route_sections.py deleted file mode 100644 index 21869e5..0000000 --- a/WonderQ-Admin/alembic/versions/0004_route_sections.py +++ /dev/null @@ -1,42 +0,0 @@ -"""Add route section configuration. - -Revision ID: 0004_route_sections -Revises: 0003_campaign_display_fields -Create Date: 2026-07-02 -""" - -from alembic import op -import sqlalchemy as sa -from sqlalchemy import inspect - - -revision = "0004_route_sections" -down_revision = "0003_campaign_display_fields" -branch_labels = None -depends_on = None - - -def upgrade() -> None: - bind = op.get_bind() - existing_tables = set(inspect(bind).get_table_names()) - - if "RouteSection" not in existing_tables: - op.create_table( - "RouteSection", - sa.Column("id", sa.String(), nullable=False), - sa.Column("title", sa.String(), nullable=False), - sa.Column("subtitle", sa.Text(), nullable=True), - sa.Column("sortOrder", sa.Integer(), nullable=False, server_default="0"), - sa.Column("isActive", sa.Boolean(), nullable=False, server_default=sa.true()), - sa.Column("createdAt", sa.DateTime(), nullable=False), - sa.Column("updatedAt", sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint("id"), - ) - - - -def downgrade() -> None: - bind = op.get_bind() - existing_tables = set(inspect(bind).get_table_names()) - if "RouteSection" in existing_tables: - op.drop_table("RouteSection") diff --git a/WonderQ-Admin/alembic/versions/0005_hotel_vehicle_modules.py b/WonderQ-Admin/alembic/versions/0005_hotel_vehicle_modules.py deleted file mode 100644 index bc5601c..0000000 --- a/WonderQ-Admin/alembic/versions/0005_hotel_vehicle_modules.py +++ /dev/null @@ -1,49 +0,0 @@ -"""Add hotel and vehicle site modules. - -Revision ID: 0005_hotel_vehicle_modules -Revises: 0004_route_sections -Create Date: 2026-07-03 -""" - -from alembic import op -import sqlalchemy as sa -from sqlalchemy import inspect - - -revision = "0005_hotel_vehicle_modules" -down_revision = "0004_route_sections" -branch_labels = None -depends_on = None - - -def _create_card_table(table_name: str) -> None: - op.create_table( - table_name, - sa.Column("id", sa.String(), nullable=False), - sa.Column("title", sa.String(), nullable=False), - sa.Column("description", sa.Text(), nullable=True), - sa.Column("image", sa.String(), nullable=True), - sa.Column("sortOrder", sa.Integer(), nullable=False, server_default="0"), - sa.Column("isActive", sa.Boolean(), nullable=False, server_default=sa.true()), - sa.Column("createdAt", sa.DateTime(), nullable=False), - sa.Column("updatedAt", sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint("id"), - ) - - -def upgrade() -> None: - bind = op.get_bind() - existing_tables = set(inspect(bind).get_table_names()) - if "HotelGroup" not in existing_tables: - _create_card_table("HotelGroup") - if "VehicleOption" not in existing_tables: - _create_card_table("VehicleOption") - - -def downgrade() -> None: - bind = op.get_bind() - existing_tables = set(inspect(bind).get_table_names()) - if "VehicleOption" in existing_tables: - op.drop_table("VehicleOption") - if "HotelGroup" in existing_tables: - op.drop_table("HotelGroup") \ No newline at end of file diff --git a/WonderQ-Admin/alembic/versions/0006_hotel_group_offer_fields.py b/WonderQ-Admin/alembic/versions/0006_hotel_group_offer_fields.py deleted file mode 100644 index 28627b2..0000000 --- a/WonderQ-Admin/alembic/versions/0006_hotel_group_offer_fields.py +++ /dev/null @@ -1,55 +0,0 @@ -"""Add offer display fields to hotel groups. - -Revision ID: 0006_hotel_group_offer_fields -Revises: 0005_hotel_vehicle_modules -Create Date: 2026-07-03 -""" - -from alembic import op -import sqlalchemy as sa -from sqlalchemy import inspect -from sqlalchemy.dialects import postgresql - - -revision = "0006_hotel_group_offer_fields" -down_revision = "0005_hotel_vehicle_modules" -branch_labels = None -depends_on = None - - -def upgrade() -> None: - bind = op.get_bind() - if "HotelGroup" not in set(inspect(bind).get_table_names()): - return - - columns = {column["name"] for column in inspect(bind).get_columns("HotelGroup")} - if "coverImage" not in columns: - op.add_column("HotelGroup", sa.Column("coverImage", sa.String(), nullable=True)) - op.execute('UPDATE "HotelGroup" SET "coverImage" = image WHERE "coverImage" IS NULL') - if "priceAmount" not in columns: - op.add_column("HotelGroup", sa.Column("priceAmount", sa.Integer(), nullable=True)) - if "priceUnit" not in columns: - op.add_column("HotelGroup", sa.Column("priceUnit", sa.String(), nullable=True, server_default="起/晚")) - if "tags" not in columns: - op.add_column( - "HotelGroup", - sa.Column( - "tags", - postgresql.ARRAY(sa.String()), - nullable=False, - server_default=sa.text("'{}'::varchar[]"), - ), - ) - if "status" not in columns: - op.add_column("HotelGroup", sa.Column("status", sa.String(), nullable=False, server_default="published")) - - -def downgrade() -> None: - bind = op.get_bind() - if "HotelGroup" not in set(inspect(bind).get_table_names()): - return - - columns = {column["name"] for column in inspect(bind).get_columns("HotelGroup")} - for column_name in ["status", "tags", "priceUnit", "priceAmount", "coverImage"]: - if column_name in columns: - op.drop_column("HotelGroup", column_name) \ No newline at end of file diff --git a/WonderQ-Admin/alembic/versions/0007_destination_page_modules.py b/WonderQ-Admin/alembic/versions/0007_destination_page_modules.py deleted file mode 100644 index b34295f..0000000 --- a/WonderQ-Admin/alembic/versions/0007_destination_page_modules.py +++ /dev/null @@ -1,64 +0,0 @@ -"""Add destination page configurable modules. - -Revision ID: 0007_destination_page_modules -Revises: 0006_hotel_group_offer_fields -Create Date: 2026-07-07 -""" - -from alembic import op -import sqlalchemy as sa -from sqlalchemy import inspect - - -revision = "0007_destination_page_modules" -down_revision = "0006_hotel_group_offer_fields" -branch_labels = None -depends_on = None - - -def _create_destination_hero_table() -> None: - op.create_table( - "DestinationHero", - sa.Column("id", sa.String(), nullable=False), - sa.Column("title", sa.String(), nullable=False), - sa.Column("kicker", sa.String(), nullable=True), - sa.Column("image", sa.String(), nullable=True), - sa.Column("sortOrder", sa.Integer(), nullable=False, server_default="0"), - sa.Column("isActive", sa.Boolean(), nullable=False, server_default=sa.true()), - sa.Column("createdAt", sa.DateTime(), nullable=False), - sa.Column("updatedAt", sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint("id"), - ) - - -def _create_destination_region_table() -> None: - op.create_table( - "DestinationRegion", - sa.Column("id", sa.String(), nullable=False), - sa.Column("label", sa.String(), nullable=False), - sa.Column("keyword", sa.String(), nullable=True), - sa.Column("spots", sa.Text(), nullable=True), - sa.Column("sortOrder", sa.Integer(), nullable=False, server_default="0"), - sa.Column("isActive", sa.Boolean(), nullable=False, server_default=sa.true()), - sa.Column("createdAt", sa.DateTime(), nullable=False), - sa.Column("updatedAt", sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint("id"), - ) - - -def upgrade() -> None: - bind = op.get_bind() - existing_tables = set(inspect(bind).get_table_names()) - if "DestinationHero" not in existing_tables: - _create_destination_hero_table() - if "DestinationRegion" not in existing_tables: - _create_destination_region_table() - - -def downgrade() -> None: - bind = op.get_bind() - existing_tables = set(inspect(bind).get_table_names()) - if "DestinationRegion" in existing_tables: - op.drop_table("DestinationRegion") - if "DestinationHero" in existing_tables: - op.drop_table("DestinationHero") diff --git a/WonderQ-Admin/alembic/versions/0008_demand_page_modules.py b/WonderQ-Admin/alembic/versions/0008_demand_page_modules.py deleted file mode 100644 index eb7375a..0000000 --- a/WonderQ-Admin/alembic/versions/0008_demand_page_modules.py +++ /dev/null @@ -1,95 +0,0 @@ -"""Add demand page configurable modules. - -Revision ID: 0008_demand_page_modules -Revises: 0007_destination_page_modules -Create Date: 2026-07-07 -""" - -from alembic import op -import sqlalchemy as sa -from sqlalchemy import inspect -from sqlalchemy.dialects import postgresql - - -revision = "0008_demand_page_modules" -down_revision = "0007_destination_page_modules" -branch_labels = None -depends_on = None - - -def upgrade() -> None: - bind = op.get_bind() - existing_tables = set(inspect(bind).get_table_names()) - - if "DemandHero" not in existing_tables: - op.create_table( - "DemandHero", - sa.Column("id", sa.String(), nullable=False), - sa.Column("title", sa.String(), nullable=False), - sa.Column("kicker", sa.String(), nullable=True), - sa.Column("description", sa.Text(), nullable=True), - sa.Column("steps", postgresql.ARRAY(sa.String()), nullable=False, server_default=sa.text("'{}'")), - sa.Column("sortOrder", sa.Integer(), nullable=False, server_default="0"), - sa.Column("isActive", sa.Boolean(), nullable=False, server_default=sa.true()), - sa.Column("createdAt", sa.DateTime(), nullable=False), - sa.Column("updatedAt", sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint("id"), - ) - - if "DemandFeatureCard" not in existing_tables: - op.create_table( - "DemandFeatureCard", - sa.Column("id", sa.String(), nullable=False), - sa.Column("title", sa.String(), nullable=False), - sa.Column("description", sa.Text(), nullable=True), - sa.Column("sortOrder", sa.Integer(), nullable=False, server_default="0"), - sa.Column("isActive", sa.Boolean(), nullable=False, server_default=sa.true()), - sa.Column("createdAt", sa.DateTime(), nullable=False), - sa.Column("updatedAt", sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint("id"), - ) - - if "DemandForm" not in existing_tables: - op.create_table( - "DemandForm", - sa.Column("id", sa.String(), nullable=False), - sa.Column("destinationLabel", sa.String(), nullable=False, server_default="目的地/玩法"), - sa.Column("destinationPlaceholder", sa.String(), nullable=True), - sa.Column("phoneLabel", sa.String(), nullable=False, server_default="联系方式"), - sa.Column("phonePlaceholder", sa.String(), nullable=True), - sa.Column("noteLabel", sa.String(), nullable=False, server_default="补充说明"), - sa.Column("notePlaceholder", sa.String(), nullable=True), - sa.Column("submitLabel", sa.String(), nullable=False, server_default="提交出行需求"), - sa.Column("chips", postgresql.ARRAY(sa.String()), nullable=False, server_default=sa.text("'{}'")), - sa.Column("isActive", sa.Boolean(), nullable=False, server_default=sa.true()), - sa.Column("createdAt", sa.DateTime(), nullable=False), - sa.Column("updatedAt", sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint("id"), - ) - - if "DemandRecommendation" not in existing_tables: - op.create_table( - "DemandRecommendation", - sa.Column("id", sa.String(), nullable=False), - sa.Column("title", sa.String(), nullable=False), - sa.Column("subtitle", sa.Text(), nullable=True), - sa.Column("sortOrder", sa.Integer(), nullable=False, server_default="0"), - sa.Column("isActive", sa.Boolean(), nullable=False, server_default=sa.true()), - sa.Column("createdAt", sa.DateTime(), nullable=False), - sa.Column("updatedAt", sa.DateTime(), nullable=False), - sa.PrimaryKeyConstraint("id"), - ) - - - -def downgrade() -> None: - bind = op.get_bind() - existing_tables = set(inspect(bind).get_table_names()) - for table_name in [ - "DemandRecommendation", - "DemandForm", - "DemandFeatureCard", - "DemandHero", - ]: - if table_name in existing_tables: - op.drop_table(table_name) diff --git a/WonderQ-Admin/alembic/versions/0009_remove_product_domain.py b/WonderQ-Admin/alembic/versions/0009_remove_product_domain.py deleted file mode 100644 index fad4cd9..0000000 --- a/WonderQ-Admin/alembic/versions/0009_remove_product_domain.py +++ /dev/null @@ -1,72 +0,0 @@ -"""Remove the retired product domain and its foreign-key references. - -Revision ID: 0009_remove_product_domain -Revises: 0008_demand_page_modules -Create Date: 2026-08-17 -""" - -from alembic import op -from sqlalchemy import inspect - - -revision = "0009_remove_product_domain" -down_revision = "0008_demand_page_modules" -branch_labels = None -depends_on = None - - -PRODUCT_TABLES = ( - "CampaignProduct", - "RouteSectionProduct", - "DemandRecommendationProduct", - "ProductImage", - "Product", -) - - -def _drop_column_with_foreign_keys(table_name: str, column_name: str) -> None: - bind = op.get_bind() - inspector = inspect(bind) - if table_name not in inspector.get_table_names(): - return - columns = {column["name"] for column in inspector.get_columns(table_name)} - if column_name not in columns: - return - for foreign_key in inspector.get_foreign_keys(table_name): - if column_name in foreign_key.get("constrained_columns", []): - constraint_name = foreign_key.get("name") - if constraint_name: - op.drop_constraint(constraint_name, table_name, type_="foreignkey") - op.drop_column(table_name, column_name) - - -def _drop_referencing_foreign_keys(table_name: str) -> None: - bind = op.get_bind() - inspector = inspect(bind) - for current_table in inspector.get_table_names(): - if current_table == table_name: - continue - for foreign_key in inspector.get_foreign_keys(current_table): - if foreign_key.get("referred_table") != table_name: - continue - constraint_name = foreign_key.get("name") - if constraint_name: - op.drop_constraint(constraint_name, current_table, type_="foreignkey") - - -def upgrade() -> None: - bind = op.get_bind() - existing_tables = set(inspect(bind).get_table_names()) - - _drop_column_with_foreign_keys("Lead", "sourceProductId") - _drop_column_with_foreign_keys("Order", "productId") - - for table_name in (*PRODUCT_TABLES[:3], "RouteSection", "DemandRecommendation", *PRODUCT_TABLES[3:]): - if table_name in existing_tables: - _drop_referencing_foreign_keys(table_name) - op.drop_table(table_name) - - -def downgrade() -> None: - # The retired product schema intentionally has no downgrade path. Restore it from a backup if needed. - pass diff --git a/WonderQ-Admin/alembic/versions/0010_remove_destination_module.py b/WonderQ-Admin/alembic/versions/0010_remove_destination_module.py deleted file mode 100644 index 3df5506..0000000 --- a/WonderQ-Admin/alembic/versions/0010_remove_destination_module.py +++ /dev/null @@ -1,45 +0,0 @@ -"""Remove the retired province destination module. - -Revision ID: 0010_remove_destination_module -Revises: 0009_remove_product_domain -Create Date: 2026-08-17 -""" - -from alembic import op -from sqlalchemy import inspect - - -revision = "0010_remove_destination_module" -down_revision = "0009_remove_product_domain" -branch_labels = None -depends_on = None - - -def _drop_referencing_foreign_keys(table_name: str) -> None: - bind = op.get_bind() - inspector = inspect(bind) - for current_table in inspector.get_table_names(): - if current_table == table_name: - continue - for foreign_key in inspector.get_foreign_keys(current_table): - if foreign_key.get("referred_table") != table_name: - continue - constraint_name = foreign_key.get("name") - if constraint_name: - op.drop_constraint(constraint_name, current_table, type_="foreignkey") - - -def upgrade() -> None: - bind = op.get_bind() - existing_tables = set(inspect(bind).get_table_names()) - - for table_name in ("DestinationAlias", "Destination"): - if table_name not in existing_tables: - continue - _drop_referencing_foreign_keys(table_name) - op.drop_table(table_name) - - -def downgrade() -> None: - # The retired destination module has no downgrade path. Restore it from a backup if needed. - pass diff --git a/WonderQ-Admin/alembic/versions/0011_remove_cta_banner_module.py b/WonderQ-Admin/alembic/versions/0011_remove_cta_banner_module.py deleted file mode 100644 index ee3f248..0000000 --- a/WonderQ-Admin/alembic/versions/0011_remove_cta_banner_module.py +++ /dev/null @@ -1,26 +0,0 @@ -"""Remove the retired more-services CTA module. - -Revision ID: 0011_remove_cta_banner_module -Revises: 0010_remove_destination_module -Create Date: 2026-08-17 -""" - -from alembic import op -from sqlalchemy import inspect - - -revision = "0011_remove_cta_banner_module" -down_revision = "0010_remove_destination_module" -branch_labels = None -depends_on = None - - -def upgrade() -> None: - bind = op.get_bind() - if "CtaBanner" in set(inspect(bind).get_table_names()): - op.drop_table("CtaBanner") - - -def downgrade() -> None: - # The retired CTA module has no downgrade path. Restore it from a backup if needed. - pass diff --git a/WonderQ-Admin/alembic/versions/0012_remove_offer_modules.py b/WonderQ-Admin/alembic/versions/0012_remove_offer_modules.py deleted file mode 100644 index 6528cde..0000000 --- a/WonderQ-Admin/alembic/versions/0012_remove_offer_modules.py +++ /dev/null @@ -1,27 +0,0 @@ -"""Remove the retired campaign and hotel site modules. - -Revision ID: 0012_remove_offer_modules -Revises: 0011_remove_cta_banner_module -Create Date: 2026-08-17 -""" - -from alembic import op -from sqlalchemy import inspect - - -revision = "0012_remove_offer_modules" -down_revision = "0011_remove_cta_banner_module" -branch_labels = None -depends_on = None - - -def upgrade() -> None: - existing_tables = set(inspect(op.get_bind()).get_table_names()) - for table_name in ("Campaign", "HotelGroup"): - if table_name in existing_tables: - op.drop_table(table_name) - - -def downgrade() -> None: - # The retired offer modules have no downgrade path. Restore them from a backup if needed. - pass diff --git a/WonderQ-Admin/alembic/versions/0013_remove_map_theme_modules.py b/WonderQ-Admin/alembic/versions/0013_remove_map_theme_modules.py deleted file mode 100644 index c1c47f0..0000000 --- a/WonderQ-Admin/alembic/versions/0013_remove_map_theme_modules.py +++ /dev/null @@ -1,27 +0,0 @@ -"""Remove the retired map and theme site modules. - -Revision ID: 0013_remove_map_theme_modules -Revises: 0012_remove_offer_modules -Create Date: 2026-08-17 -""" - -from alembic import op -from sqlalchemy import inspect - - -revision = "0013_remove_map_theme_modules" -down_revision = "0012_remove_offer_modules" -branch_labels = None -depends_on = None - - -def upgrade() -> None: - existing_tables = set(inspect(op.get_bind()).get_table_names()) - for table_name in ("MapImage", "ThemeCard"): - if table_name in existing_tables: - op.drop_table(table_name) - - -def downgrade() -> None: - # The retired site modules have no downgrade path. Restore them from a backup if needed. - pass diff --git a/WonderQ-Admin/alembic/versions/0014_remove_destination_regions_module.py b/WonderQ-Admin/alembic/versions/0014_remove_destination_regions_module.py deleted file mode 100644 index 5d468ea..0000000 --- a/WonderQ-Admin/alembic/versions/0014_remove_destination_regions_module.py +++ /dev/null @@ -1,32 +0,0 @@ -"""Remove the destination regions module. - -Revision ID: 0014_remove_destination_regions_module -Revises: 0013_remove_map_theme_modules -""" - -from alembic import op -from sqlalchemy import inspect -import sqlalchemy as sa - - -revision = "0014_remove_destination_regions_module" -down_revision = "0013_remove_map_theme_modules" -branch_labels = None -depends_on = None - - -def upgrade() -> None: - op.alter_column( - "alembic_version", - "version_num", - existing_type=sa.String(length=32), - type_=sa.String(length=128), - existing_nullable=False, - ) - existing_tables = set(inspect(op.get_bind()).get_table_names()) - if "DestinationRegion" in existing_tables: - op.drop_table("DestinationRegion") - - -def downgrade() -> None: - pass diff --git a/WonderQ-Admin/alembic/versions/0015_wanfa.py b/WonderQ-Admin/alembic/versions/0015_wanfa.py index f53c0ef..8e66463 100644 --- a/WonderQ-Admin/alembic/versions/0015_wanfa.py +++ b/WonderQ-Admin/alembic/versions/0015_wanfa.py @@ -1,7 +1,7 @@ """Create the wanfa category and route domain. Revision ID: 0015_wanfa -Revises: 0014_remove_destination_regions_module +Revises: 0001_initial_schema """ from datetime import datetime @@ -12,7 +12,7 @@ from sqlalchemy import inspect revision = "0015_wanfa" -down_revision = "0014_remove_destination_regions_module" +down_revision = "0001_initial_schema" branch_labels = None depends_on = None diff --git a/WonderQ-Admin/app/routers/system.py b/WonderQ-Admin/app/routers/system.py index 81e53f9..db22545 100644 --- a/WonderQ-Admin/app/routers/system.py +++ b/WonderQ-Admin/app/routers/system.py @@ -61,47 +61,21 @@ def _audit(db: Session, request: Request, action: str, entity: str, entity_id: s def _role_dict(role: AdminRole, menu_ids: list[str] | None = None, dept_ids: list[str] | None = None) -> dict: return { - "id": role.id, - "name": role.name, - "code": role.code, - "dataScope": role.dataScope, - "description": role.description, - "isActive": role.isActive, + **model_dict(role), "menuIds": menu_ids or [], "deptIds": dept_ids or [], - "createdAt": role.createdAt, - "updatedAt": role.updatedAt, } def _menu_dict(menu: AdminMenu) -> dict: - return { - "id": menu.id, - "parentId": menu.parentId, - "name": menu.name, - "type": menu.type, - "path": menu.path, - "component": menu.componentKey, - "permission": menu.permissionCode, - "icon": menu.icon, - "sortOrder": menu.sortOrder, - "isVisible": menu.isVisible, - "isActive": menu.isActive, - "createdAt": menu.createdAt, - "updatedAt": menu.updatedAt, - } + data = model_dict(menu) + data["component"] = data.pop("componentKey") + data["permission"] = data.pop("permissionCode") + return data def _dept_dict(dept: AdminDepartment) -> dict: - return { - "id": dept.id, - "parentId": dept.parentId, - "name": dept.name, - "sortOrder": dept.sortOrder, - "isActive": dept.isActive, - "createdAt": dept.createdAt, - "updatedAt": dept.updatedAt, - } + return model_dict(dept) def _ensure_ids_exist(db: Session, model, ids: list[str], label: str) -> None: diff --git a/WonderQ-Admin/app/seed.py b/WonderQ-Admin/app/seed.py index 67d357f..77b3b75 100644 --- a/WonderQ-Admin/app/seed.py +++ b/WonderQ-Admin/app/seed.py @@ -24,6 +24,8 @@ def create_media(db: Session, url: str | None, group: str, name: str | None = No if not url: return media = db.scalar(select(MediaAsset).where(MediaAsset.url == url)) + if media is None: + media = next((item for item in db.new if isinstance(item, MediaAsset) and item.url == url), None) if media: media.group = group media.name = name diff --git a/WonderQ-Admin/tests/test_remove_product_domain_migration.py b/WonderQ-Admin/tests/test_remove_product_domain_migration.py deleted file mode 100644 index 9213ab1..0000000 --- a/WonderQ-Admin/tests/test_remove_product_domain_migration.py +++ /dev/null @@ -1,67 +0,0 @@ -from importlib.util import module_from_spec, spec_from_file_location -from pathlib import Path - - -MIGRATION_PATH = Path(__file__).parents[1] / "alembic" / "versions" / "0009_remove_product_domain.py" -SPEC = spec_from_file_location("remove_product_domain_migration", MIGRATION_PATH) -assert SPEC and SPEC.loader -MIGRATION = module_from_spec(SPEC) -SPEC.loader.exec_module(MIGRATION) - - -class LegacySchemaInspector: - def get_table_names(self) -> list[str]: - return ["Product", "MiniProgramFavorite", "MiniProgramHistory"] - - def get_foreign_keys(self, table_name: str) -> list[dict[str, object]]: - foreign_keys = { - "MiniProgramFavorite": [ - { - "name": "MiniProgramFavorite_productId_fkey", - "constrained_columns": ["productId"], - "referred_table": "Product", - "referred_columns": ["id"], - } - ], - "MiniProgramHistory": [ - { - "name": "MiniProgramHistory_productId_fkey", - "constrained_columns": ["productId"], - "referred_table": "Product", - "referred_columns": ["id"], - } - ], - } - return foreign_keys.get(table_name, []) - - -def test_upgrade_drops_legacy_product_foreign_keys_before_product_table(monkeypatch): - events: list[tuple[str, ...]] = [] - inspector = LegacySchemaInspector() - - monkeypatch.setattr(MIGRATION, "inspect", lambda _bind: inspector) - monkeypatch.setattr(MIGRATION.op, "get_bind", lambda: object()) - monkeypatch.setattr( - MIGRATION.op, - "drop_constraint", - lambda name, table_name, type_: events.append(("drop_constraint", name, table_name, type_)), - ) - monkeypatch.setattr(MIGRATION.op, "drop_table", lambda table_name: events.append(("drop_table", table_name))) - - MIGRATION.upgrade() - - assert events == [ - ( - "drop_constraint", - "MiniProgramFavorite_productId_fkey", - "MiniProgramFavorite", - "foreignkey", - ), - ( - "drop_constraint", - "MiniProgramHistory_productId_fkey", - "MiniProgramHistory", - "foreignkey", - ), - ("drop_table", "Product"), - ] diff --git a/WonderQ-Admin/tests/test_seed.py b/WonderQ-Admin/tests/test_seed.py new file mode 100644 index 0000000..0749bde --- /dev/null +++ b/WonderQ-Admin/tests/test_seed.py @@ -0,0 +1,23 @@ +from app.seed import create_media + + +class PendingMediaSession: + def __init__(self): + self.new = [] + + def scalar(self, _statement): + return None + + def add(self, item): + self.new.append(item) + + +def test_create_media_reuses_pending_asset_with_same_url(): + db = PendingMediaSession() + + create_media(db, "/assets/guizhou/shared.jpg", "hero", "首页图片") + create_media(db, "/assets/guizhou/shared.jpg", "vehicle-option", "车型图片") + + assert len(db.new) == 1 + assert db.new[0].group == "vehicle-option" + assert db.new[0].name == "车型图片" diff --git a/WonderQ-Admin/tests/test_system.py b/WonderQ-Admin/tests/test_system.py new file mode 100644 index 0000000..68c3466 --- /dev/null +++ b/WonderQ-Admin/tests/test_system.py @@ -0,0 +1,44 @@ +import json +from datetime import datetime + +from app.models import AdminDepartment, AdminMenu, AdminRole +from app.routers.system import _dept_dict, _menu_dict, _role_dict + + +def test_role_audit_snapshot_serializes_datetime_fields(): + role = AdminRole( + id="role-1", + name="验收角色", + code="acceptance_role", + dataScope="self", + description=None, + isActive=True, + createdAt=datetime(2026, 8, 26, 1, 0), + updatedAt=datetime(2026, 8, 26, 1, 0), + ) + + json.dumps(_role_dict(role)) + + +def test_menu_and_department_audit_snapshots_serialize_datetime_fields(): + menu = AdminMenu( + id="menu-1", + name="验收菜单", + type="page", + sortOrder=1, + isVisible=True, + isActive=True, + createdAt=datetime(2026, 8, 26, 1, 0), + updatedAt=datetime(2026, 8, 26, 1, 0), + ) + dept = AdminDepartment( + id="dept-1", + name="验收部门", + sortOrder=1, + isActive=True, + createdAt=datetime(2026, 8, 26, 1, 0), + updatedAt=datetime(2026, 8, 26, 1, 0), + ) + + json.dumps(_menu_dict(menu)) + json.dumps(_dept_dict(dept)) diff --git a/docs/admin-business-function-matrix.md b/docs/admin-business-function-matrix.md index f1f4421..6351dba 100644 --- a/docs/admin-business-function-matrix.md +++ b/docs/admin-business-function-matrix.md @@ -17,13 +17,13 @@ | --- | --- | --- | --- | --- | --- | | 登录、刷新、退出 | `/api/admin/auth/login`、`refresh`、`logout`、`/api/admin/me` | 兼容旧 `token/user` 字段，401 自动刷新 | 登录页、内存 Access Token、HttpOnly Refresh Cookie | 无 | 自动化通过，待浏览器人工验收 | | 仪表盘 | `/api/admin/dashboard` | 已有 | `DashboardPage` 已接入 | 无 | 读流程已接入 | -| 首页与站点配置 | `/api/admin/site-config` 及模块 CRUD、排序 | 已有 | `HomePage` 已读取全量配置；编辑/排序待迁移 | `/api/public/home`、`/api/public/site-config` | 读契约保持，编辑待验收 | -| 玩法分类与路线 | `/api/admin/wanfa/categories` 及分类/路线 CRUD | 已有 | `WanfaPage` 已读取分类和路线；写操作待迁移 | `/api/public/wanfa/categories` | 读流程已接入，写流程待迁移 | -| 路线详情 | `/api/admin/details` 及详情 CRUD | React 现有玩法流程依赖 | Vue API 类型和页面待补齐 | `/api/public/details/{key}` | 待迁移 | -| 管家 | `/api/admin/concierge/advisors` 及 CRUD | 已有 | `ConciergePage` 已读取顾问；写操作待迁移 | `/api/public/concierge/advisors`、详情顾问信息 | 读流程已接入，写流程待迁移 | -| 需求线索 | `/api/admin/leads`、状态更新 | 已有筛选和状态流转 | `LeadsPage` 已读取；状态更新/筛选待迁移 | `/api/public/leads` | 读流程已接入，写流程待迁移 | -| 媒体 | `/api/admin/media-assets`、上传 | React 已有上传 | Vue 页面和上传流程待迁移 | 通过站点配置间接依赖 | 待迁移 | -| 发布、重置 | `/api/admin/publish`、`reset-guizhou-content` | React 现有入口/能力 | Vue 按权限增加二次确认后迁移 | 发布结果影响 Public API | 待迁移，执行前需要人工确认 | +| 首页与站点配置 | `/api/admin/site-config` 及模块 CRUD、排序 | 已有 | `HomePage` 已迁移全部 7 类站点模块的读写、删除和可用模块排序；单例模块禁止重复创建 | `/api/public/home`、`/api/public/site-config` | 契约、表单校验、接口回归和页面入口已通过，真实数据写入待人工确认 | +| 玩法分类与路线 | `/api/admin/wanfa/categories` 及分类/路线 CRUD | 已有 | `WanfaPage` 已迁移分类/路线新增、编辑、删除、排序和非空分类删除保护 | `/api/public/wanfa/categories` | 契约、接口回归和页面入口已通过，真实数据写入待人工确认 | +| 路线详情 | `/api/admin/details` 及详情 CRUD | React 现有玩法流程依赖 | 已集成到 Vue 路线编辑器，支持详情字段、数组文案、管家关联、启用状态和图片上传/排序 | `/api/public/details/{key}` | 契约、接口回归和页面入口已通过，真实数据写入待人工确认 | +| 管家 | `/api/admin/concierge/advisors` 及 CRUD | 已有 | `ConciergePage` 已接入新增、编辑、启停、排序、删除和头像/二维码上传 | `/api/public/concierge/advisors`、详情顾问信息 | 契约、表单校验和页面入口已通过，真实写入待人工确认 | +| 需求线索 | `/api/admin/leads`、状态更新 | 已有筛选和状态流转 | `LeadsPage` 已接入类型、状态、关键词筛选、详情查看和六态状态写入 | `/api/public/leads` | 契约、有效会话下的列表/筛选/详情页面验收已通过，真实状态写入待人工确认 | +| 媒体 | `/api/admin/media-assets`、上传 | React 已有上传 | `MediaPage` 已接入素材列表、分组、批量上传和图片校验；玩法/管家继续复用上传入口 | 通过站点配置间接依赖 | 契约、列表和上传入口已通过，真实上传待人工确认 | +| 发布、重置 | `/api/admin/publish`、`reset-guizhou-content` | React 现有入口/能力 | `OperationsToolsPage` 已接入发布和重置，均有权限控制、进行中禁用和二次确认 | 发布结果影响 Public API | 入口和确认闸门已通过，执行前必须人工确认 | | RBAC 用户 | `/api/admin/system/users` | 旧角色字段继续兼容 | 系统资源入口已接入读取 | 无 | 后端/读页面已接入，编辑待迁移 | | RBAC 角色、菜单、部门 | `/api/admin/system/roles`、`menus`、`depts` | 旧端不删除 | Vue 动态菜单、组件白名单和系统资源读取已接入 | 无 | 后端/读页面已接入，完整按钮授权待验收 | @@ -37,3 +37,12 @@ ## 删除 React 的闸门 只有当矩阵中 Vue 列全部变为“已接入并人工验收”，并且登录刷新、权限、数据范围、Redis 故障、Public API 回归和 Docker 验证记录齐全后，才可以征求确认切换 `/admin` 与删除 `/admin-legacy`。 + +## 阶段验收记录（2026-08-26） + +- 线索状态：已在 Vue 管理端将真实线索从“待处理”改为“已联系”，再恢复为“待处理”，写入和恢复均成功。 +- 发布与重置：发布成功；重置成功，Public API 和 MiniAPP 已读取重置后的站点内容。 +- RBAC：用户、角色、菜单、部门均完成真实编辑写入并恢复原值，编辑成功提示和最终列表值正常。 +- 媒体上传：按当前验收顺序暂缓，放到最后；此前验证发现 OSS 返回 403，尚未形成素材记录。 +- 自动化回归：Vue 15 个测试文件、25 个测试通过，TypeScript 检查和生产构建通过；后端 134 个测试通过，7 个既有 Alembic 兼容性测试失败，未涉及本轮站点重置和 RBAC 改动。 +- React 删除：未执行。需待媒体上传、登录刷新、权限/数据范围、Redis 异常、Public API 和 Docker 验收全部完成，并经人工确认后再处理。 diff --git a/docs/superpowers/plans/2026-08-26-admin-vue-formalization.md b/docs/superpowers/plans/2026-08-26-admin-vue-formalization.md new file mode 100644 index 0000000..3e75494 --- /dev/null +++ b/docs/superpowers/plans/2026-08-26-admin-vue-formalization.md @@ -0,0 +1,468 @@ +# WonderQ Admin Vue 正式化实施计划 + +> **For agentic workers:** REQUIRED SUB-SKILL: Use `subagent-driven-development` or `executing-plans` to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** 在不删除 React 过渡端的前提下，将四组首页 CRUD 接入 Vue，补齐管理员踢下线、显式 403、五级数据范围和 `/admin`、`/admin-legacy` 正式代理，并完成可重复的三端验收。 + +**Architecture:** 保持 FastAPI + PostgreSQL + Redis 的现有模块化单体。后端继续以既有 Admin API 和 `{code,msg,data}` 契约为边界；Vue 通过独立的 API client、页面组件和静态路由注册实现新管理端；React 继续由独立 legacy 静态入口提供回滚能力。Redis 只保存会话记录、用户会话索引和权限缓存，不新增会话数据库表。 + +**Tech Stack:** Python 3、FastAPI、SQLAlchemy 2、Alembic、PostgreSQL、Redis、JWT、Vue 3、Element Plus、TypeScript、Pinia、Vue Router 4、React、Vite、Nginx、Docker Compose、pytest、Vitest。 + +--- + +## 文件边界与责任 + +### 后端 + +- 修改 `WonderQ-Admin/app/redis_session.py`：扩展会话存储协议，实现按用户索引、列出和批量撤销会话；不改变 Token 明文存储策略。 +- 修改 `WonderQ-Admin/app/auth.py`：在登录创建和刷新轮换时维护用户会话索引；保留旧登录响应字段。 +- 修改 `WonderQ-Admin/app/routers/system.py`：新增踢下线接口，执行权限、数据范围、当前会话保护和审计。 +- 修改 `WonderQ-Admin/app/routers/admin.py`：为四组首页资源接入现有权限码和数据范围检查，保持既有路径与返回字段。 +- 修改 `WonderQ-Admin/app/rbac.py`：固定数据范围和权限缓存故障的安全行为，确保资源列表与单条写入使用同一范围规则。 +- 修改 `WonderQ-Admin/tests/test_home.py`、`tests/test_admin_rbac.py`：补充首页权限、范围和契约回归。 +- 新建 `WonderQ-Admin/tests/test_admin_sessions.py`：覆盖 Redis 会话索引、刷新轮换、批量撤销和故障行为。 +- 新建 `WonderQ-Admin/tests/test_data_scope_matrix.py`：覆盖五种数据范围的跨部门矩阵。 + +### Vue 管理端 + +- 修改 `WonderQ-Admin-UI-Vue/src/types.ts`：增加四组首页资源类型、403 错误类型、会话撤销结果类型。 +- 修改 `WonderQ-Admin-UI-Vue/src/api/client.ts`：增加首页 CRUD、踢下线请求和显式 403 错误；不改变 API base、Cookie 或 Access Token 键。 +- 新建 `WonderQ-Admin-UI-Vue/src/api/client-home.test.ts`：验证四组首页 API 方法、HTTP 方法和路径。 +- 修改 `WonderQ-Admin-UI-Vue/src/api/client-system.test.ts`：验证踢下线 API。 +- 新建 `WonderQ-Admin-UI-Vue/src/components/home/HomeCrudEditor.vue`：共享首页卡片表单、校验、图片 URL/状态字段和提交态。 +- 新建 `WonderQ-Admin-UI-Vue/src/components/home/HomeCrudTable.vue`：共享列表、空态、错误态、重试、排序和权限按钮。 +- 新建 `WonderQ-Admin-UI-Vue/src/lib/home-content.ts`：定义四组资源的字段元数据、默认值和 payload 归一化。 +- 新建 `WonderQ-Admin-UI-Vue/src/pages/HomeContentPage.vue`：体验、团建、野奢三组 CRUD 页面。 +- 新建 `WonderQ-Admin-UI-Vue/src/pages/HomeWanfaRecommendationPage.vue`：玩法推荐关联 CRUD 页面。 +- 新建 `WonderQ-Admin-UI-Vue/src/pages/ForbiddenPage.vue`：登录态下的 403 页面。 +- 修改 `WonderQ-Admin-UI-Vue/src/pages/HomePage.vue`、`src/router/index.ts`：把首页站点配置与四组业务入口拆开，并注册 403 和首页业务路由。 +- 修改 `WonderQ-Admin-UI-Vue/src/pages/SystemResourcePage.vue`：在用户列表增加踢下线操作。 +- 新建 `WonderQ-Admin-UI-Vue/src/router/router.test.ts`：验证 401、403、无权限页面和未知路径的分流。 + +### 部署与契约 + +- 修改 `docs/home-api.md`：补充 Vue 对接字段、统一错误和四组后台验收矩阵。 +- 修改 `docs/admin-api-requirements.md`：补充踢下线、403、数据范围和 Redis 故障契约。 +- 修改 `docs/integration-workflow.md`：补充双管理端、正式代理和回滚命令。 +- 修改 `docs/admin-business-function-matrix.md`：记录每个切片的实际测试和人工验收结果。 +- 新建 `WonderQ-Admin-UI-Vue/Dockerfile`、`WonderQ-Admin-UI-Vue/nginx.conf`：构建并提供 `/admin/` 静态资源。 +- 修改 `WonderQ-Admin-UI/vite.config.ts`、`WonderQ-Admin-UI/nginx.conf`、`WonderQ-Admin-UI/Dockerfile`：支持 `/admin-legacy/` base 和 legacy 静态入口。 +- 新建 `deploy/nginx/wonderq-admin.conf`：统一代理 `/admin/`、`/admin-legacy/` 和 `/api/`；不写入任何真实环境变量。 +- 新建 `scripts/verify-admin-proxy.ps1`：检查两个构建产物和统一 Nginx 配置的入口、深链与 API 隔离。 +- 修改 `docker-compose.yml`（仅在现有 Compose 确认包含前端服务时）：加入两个前端构建入口和健康检查；若现有 Compose 不负责前端，则只增加部署文档，不扩大 Compose 责任。 + +## Task 1: 建立契约基线与失败测试入口 + +**Files:** +- Modify: `docs/home-api.md` +- Modify: `docs/admin-api-requirements.md` +- Modify: `docs/integration-workflow.md` +- Test: `WonderQ-Admin/tests/test_home.py` +- Test: `WonderQ-Admin-UI-Vue/src/api/client-home.test.ts` + +- [ ] **Step 1: 记录四组首页的现有字段与接口响应** + +从 `WonderQ-Admin/app/schemas.py`、`WonderQ-Admin/app/routers/admin.py`、`WonderQ-Admin-UI/src/api.ts` 和 `docs/home-api.md` 对照四组资源。契约表必须明确 `GET/POST/PATCH/DELETE/PATCH reorder`、成功状态码、空数组、排序完整 ID 列表和 403 响应，不改现有公共字段名。 + +- [ ] **Step 2: 先写 Vue API 失败测试** + +在 `client-home.test.ts` 中为四组资源各调用一次列表、创建、更新、删除、排序方法，断言 `fetch` 收到以下请求： + +```ts +expect(fetchMock.mock.calls.map(([url, options]) => [url, options?.method])).toEqual([ + ["/api/admin/home/experiences", undefined], + ["/api/admin/home/experiences", "POST"], + ["/api/admin/home/experiences/experience-1", "PATCH"], + ["/api/admin/home/experiences/experience-1", "DELETE"], + ["/api/admin/home/experiences/reorder", "PATCH"], + ["/api/admin/home/team-buildings", undefined], + ["/api/admin/home/team-buildings", "POST"], + ["/api/admin/home/team-buildings/team-1", "PATCH"], + ["/api/admin/home/team-buildings/team-1", "DELETE"], + ["/api/admin/home/team-buildings/reorder", "PATCH"], + ["/api/admin/home/wild-archives", undefined], + ["/api/admin/home/wild-archives", "POST"], + ["/api/admin/home/wild-archives/archive-1", "PATCH"], + ["/api/admin/home/wild-archives/archive-1", "DELETE"], + ["/api/admin/home/wild-archives/reorder", "PATCH"], + ["/api/admin/home/play-recommendations", undefined], + ["/api/admin/home/play-recommendations", "POST"], + ["/api/admin/home/play-recommendations/recommendation-1", "PATCH"], + ["/api/admin/home/play-recommendations/recommendation-1", "DELETE"], + ["/api/admin/home/play-recommendations/reorder", "PATCH"], +]); +``` + +- [ ] **Step 3: 运行失败测试，确认缺口真实存在** + +Run: `Set-Location WonderQ-Admin-UI-Vue; yarn test --run src/api/client-home.test.ts` + +Expected: FAIL because the four Vue client methods and corresponding types do not exist yet. + +- [ ] **Step 4: 同步契约文档并检查差异** + +Run: `git diff --check -- docs/home-api.md docs/admin-api-requirements.md docs/integration-workflow.md` + +Expected: no whitespace errors;文档中没有真实 Token、密码、OSS 凭证或生产地址。 + +## Task 2: 接入四组首页 API 与后端权限/范围 + +**Files:** +- Modify: `WonderQ-Admin-UI-Vue/src/types.ts` +- Modify: `WonderQ-Admin-UI-Vue/src/api/client.ts` +- Modify: `WonderQ-Admin/app/routers/admin.py` +- Modify: `WonderQ-Admin/tests/test_home.py` +- Modify: `WonderQ-Admin-UI-Vue/src/api/client-home.test.ts` + +- [ ] **Step 1: 写后端首页鉴权和范围失败测试** + +为四组列表和至少一个更新接口增加测试：普通管理员没有 `admin:site-config` 时返回 403；有该权限时只能读取或更新 `is_within_data_scope` 为真的记录；完整排序请求缺 ID 或重复 ID 时返回 400。测试继续使用现有依赖覆盖方式，不创建真实生产数据。 + +- [ ] **Step 2: 运行后端失败测试** + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m pytest tests/test_home.py -q` + +Expected: new permission/scope assertions fail while existing home CRUD compatibility tests remain visible in the output。 + +- [ ] **Step 3: 增加 TypeScript 资源类型和 API 方法** + +在 `src/types.ts` 中以 React 已有类型和后端 schema 为准定义 `HomeExperience`、`HomeTeamBuilding`、`HomeWildArchive`、`HomeWanfaRecommendation` 及对应 Create/Patch 类型；在 `src/api/client.ts` 中提供以下函数： + +```ts +getHomeExperiences(); createHomeExperience(input); updateHomeExperience(id, input); +deleteHomeExperience(id); reorderHomeExperiences(itemIds); +getHomeTeamBuildings(); createHomeTeamBuilding(input); updateHomeTeamBuilding(id, input); +deleteHomeTeamBuilding(id); reorderHomeTeamBuildings(itemIds); +getHomeWildArchives(); createHomeWildArchive(input); updateHomeWildArchive(id, input); +deleteHomeWildArchive(id); reorderHomeWildArchives(itemIds); +getHomePlayRecommendations(); createHomePlayRecommendation(input); +updateHomePlayRecommendation(id, input); deleteHomePlayRecommendation(id); +reorderHomePlayRecommendations(itemIds); +``` + +每个方法只调用既有 `/api/admin/home/...` 路径，并由 `request` 统一解包响应。 + +- [ ] **Step 4: 将后端四组路由切换到已有权限依赖并复用数据范围** + +把当前四组首页路由的 `Depends(require_admin)` 替换为 `Depends(require_admin_permission("admin:site-config"))`，列表通过 `apply_data_scope`，单条更新、删除和排序前通过 `is_within_data_scope`；保留超级管理员兼容行为、既有审计事件和返回结构。写入记录继续使用现有创建人/部门回填逻辑。 + +- [ ] **Step 5: 运行后端与 Vue API 测试** + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m pytest tests/test_home.py -q` + +Run: `Set-Location ..\WonderQ-Admin-UI-Vue; yarn test --run src/api/client-home.test.ts` + +Expected: new assertions PASS；如全量后端仍出现已知 Alembic 兼容失败，记录其具体测试名，不将其归因于首页切片。 + +## Task 3: 迁移首页三组内容 CRUD 页面 + +**Files:** +- Create: `WonderQ-Admin-UI-Vue/src/lib/home-content.ts` +- Create: `WonderQ-Admin-UI-Vue/src/components/home/HomeCrudEditor.vue` +- Create: `WonderQ-Admin-UI-Vue/src/components/home/HomeCrudTable.vue` +- Create: `WonderQ-Admin-UI-Vue/src/pages/HomeContentPage.vue` +- Modify: `WonderQ-Admin-UI-Vue/src/router/index.ts` +- Modify: `WonderQ-Admin-UI-Vue/src/pages/HomePage.vue` +- Test: `WonderQ-Admin-UI-Vue/src/lib/home-content.test.ts` + +- [ ] **Step 1: 写字段元数据和表单归一化失败测试** + +测试必须分别检查三组资源的必填字段、空字符串裁剪、数字字段转换、`sortOrder` 默认值、`isActive` 默认值和错误文案。测试输入只使用测试文本和本地图片 URL。 + +- [ ] **Step 2: 运行失败测试** + +Run: `Set-Location WonderQ-Admin-UI-Vue; yarn test --run src/lib/home-content.test.ts` + +Expected: FAIL because the metadata module does not exist。 + +- [ ] **Step 3: 实现元数据模块** + +`home-content.ts` 导出资源联合类型、资源定义、`createEmptyHomeDraft`、`toHomePayload` 和 `validateHomePayload`。所有字段名必须与 `docs/home-api.md` 和后端 Pydantic schema 一致；不把 base64 文件内容写入 CRUD payload，只保存媒体接口返回的 URL。 + +- [ ] **Step 4: 实现共享表格与编辑器** + +`HomeCrudTable.vue` 接收 `items/loading/error/permission`，提供空态、错误重试、编辑、删除、上下移和提交中禁用；`HomeCrudEditor.vue` 接收资源定义和 draft，提供 Element Plus 表单校验、取消、提交中状态和 `save` 事件。按钮使用 `v-permission="'admin:site-config'"`，后端 403 仍由页面捕获显示错误。 + +- [ ] **Step 5: 实现三组 Vue 页面** + +`HomeContentPage.vue` 根据路由参数选择 `experiences`、`team-buildings` 或 `wild-archives`，加载、创建、更新、删除和排序均调用 Task 2 的 API 方法。列表、编辑器和请求状态按资源隔离，避免修改一组数据时污染另外两组。页面提供加载骨架、空态、错误重试和窄屏表格滚动。 + +- [ ] **Step 6: 将首页入口与新页面注册到静态路由** + +保留 `/admin/home` 作为站点配置页，在该页增加三个明确入口；在 `router/index.ts` 增加 `/home/content/:resource` 静态路由并绑定 `HomeContentPage`，权限使用 `admin:site-config`。组件仍必须来自本地预注册表，不接受后端任意组件路径。 + +- [ ] **Step 7: 运行 Vue 单元、类型和构建验证** + +Run: `Set-Location WonderQ-Admin-UI-Vue; yarn test --run src/lib/home-content.test.ts src/api/client-home.test.ts` + +Run: `yarn build` + +Expected: tests and TypeScript build PASS；Vite 已有 chunk 大小或 `__dirname` warning 可记录，但不得出现编译错误。 + +## Task 4: 迁移玩法推荐关联 CRUD + +**Files:** +- Create: `WonderQ-Admin-UI-Vue/src/pages/HomeWanfaRecommendationPage.vue` +- Modify: `WonderQ-Admin-UI-Vue/src/router/index.ts` +- Modify: `WonderQ-Admin-UI-Vue/src/pages/HomePage.vue` +- Test: `WonderQ-Admin-UI-Vue/src/api/client-home.test.ts` +- Test: `WonderQ-Admin/tests/test_home.py` + +- [ ] **Step 1: 写玩法推荐列表、关联和排序失败测试** + +后端测试验证关联不存在的玩法分类返回 404/400、删除关联不删除分类、状态更新只改变关联、排序必须包含当前全部关联 ID。Vue API 测试验证 `play-recommendations` 的五个方法路径。 + +- [ ] **Step 2: 运行失败测试** + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m pytest tests/test_home.py -q` + +Run: `Set-Location ..\WonderQ-Admin-UI-Vue; yarn test --run src/api/client-home.test.ts` + +Expected: new Vue methods and missing edge-case assertions fail。 + +- [ ] **Step 3: 实现 Vue 玩法推荐页面** + +页面加载现有玩法分类作为选择项，单独显示已关联推荐；创建和编辑只提交后端允许的分类 ID、状态和排序字段；删除操作明确提示“只移除首页关联，不删除玩法分类”；复用 `HomeCrudTable` 的空态、错误态、排序和权限按钮。 + +- [ ] **Step 4: 运行玩法推荐切片验收** + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m pytest tests/test_home.py -q` + +Run: `Set-Location ..\WonderQ-Admin-UI-Vue; yarn test --run; yarn build` + +Expected: 后端首页测试、Vue 现有 25 项基线测试和构建全部通过；失败项记录到业务矩阵后再进入下一阶段。 + +## Task 5: 实现管理员踢下线 + +**Files:** +- Modify: `WonderQ-Admin/app/redis_session.py` +- Modify: `WonderQ-Admin/app/auth.py` +- Modify: `WonderQ-Admin/app/routers/system.py` +- Modify: `WonderQ-Admin/tests/test_admin_rbac.py` +- Create: `WonderQ-Admin/tests/test_admin_sessions.py` +- Modify: `WonderQ-Admin-UI-Vue/src/types.ts` +- Modify: `WonderQ-Admin-UI-Vue/src/api/client.ts` +- Modify: `WonderQ-Admin-UI-Vue/src/api/client-system.test.ts` +- Modify: `WonderQ-Admin-UI-Vue/src/pages/SystemResourcePage.vue` + +- [ ] **Step 1: 写会话索引失败测试** + +在 `test_admin_sessions.py` 验证： + +```python +store = InMemoryAdminSessionStore() +store.create(session_id="s-1", user_id="u-1", access_jti="a-1", refresh_hash="r-1", access_expires_at=future, refresh_expires_at=future) +store.create(session_id="s-2", user_id="u-1", access_jti="a-2", refresh_hash="r-2", access_expires_at=future, refresh_expires_at=future) +assert store.revoke_user_sessions("u-1", except_session_id="s-1") == 1 +assert store.is_access_active("s-1", "a-1") +assert not store.is_access_active("s-2", "a-2") +``` + +同时验证 rotate 保留同一会话索引、revoke 删除索引、重复批量撤销返回 0、Redis 异常抛出 `RedisUnavailableError`。 + +- [ ] **Step 2: 运行会话失败测试** + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m pytest tests/test_admin_sessions.py -q` + +Expected: FAIL because the protocol and stores do not expose `revoke_user_sessions`。 + +- [ ] **Step 3: 扩展协议和两种存储实现** + +在 `AdminSessionStore` 增加 `list_user_sessions(user_id)` 和 `revoke_user_sessions(user_id, except_session_id=None)`。InMemory 使用 `dict[user_id, set[session_id]]` 或从现有记录派生并在 create/rotate/revoke 中保持一致；Redis 使用 `wonderq:admin:user-sessions:{user_id}` Set，成员仅为 session ID，批量删除 session key、refresh key 和 Set 成员。所有 Redis 客户端异常统一为 `RedisUnavailableError`。 + +- [ ] **Step 4: 运行会话存储测试并修复轮换回归** + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m pytest tests/test_admin_sessions.py tests/test_admin_rbac.py -q` + +Expected: session index, JWT rotation, logout and existing legacy login fields all PASS。 + +- [ ] **Step 5: 写踢下线路由失败测试** + +使用 FastAPI `TestClient` 和依赖覆盖验证：没有 `system:user:update` 返回 403；目标用户不存在返回 404；目标为当前用户返回 400；成功时排除当前 session、返回撤销数量并写入审计记录；Redis 不可用返回服务错误而不是继续放行。 + +- [ ] **Step 6: 实现 system 路由与前端 API** + +新增 `POST /api/admin/system/users/{user_id}/sessions/revoke`，依赖 `require_permission("system:user:update")`，使用当前 JWT 的 `sid` 作为排除项，调用 `revoke_user_sessions`，审计内容只记录操作者、目标用户和数量。Vue 增加 `revokeSystemUserSessions(userId)`，系统用户行增加“踢下线”确认按钮、提交中禁用和结果提示。 + +- [ ] **Step 7: 运行踢下线全链路测试** + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m pytest tests/test_admin_sessions.py tests/test_admin_rbac.py -q` + +Run: `Set-Location ..\WonderQ-Admin-UI-Vue; yarn test --run src/api/client-system.test.ts` + +Expected: backend and API client tests PASS；浏览器验收时用两个登录会话确认被踢会话的下一次请求收到 401 并回到登录页。 + +## Task 6: 增加显式 403 页面与错误分流 + +**Files:** +- Modify: `WonderQ-Admin-UI-Vue/src/api/client.ts` +- Create: `WonderQ-Admin-UI-Vue/src/pages/ForbiddenPage.vue` +- Modify: `WonderQ-Admin-UI-Vue/src/router/index.ts` +- Create: `WonderQ-Admin-UI-Vue/src/router/router.test.ts` + +- [ ] **Step 1: 写 403 与 401 分流失败测试** + +测试 `request` 收到 403 时抛出 `PermissionDeniedError`，不调用 `/auth/refresh`；收到 401 时仍只刷新一次；路由守卫对已登录无权限页面返回 `forbidden`，未登录返回 `login`，未知路径返回 `not-found`。 + +- [ ] **Step 2: 运行失败测试** + +Run: `Set-Location WonderQ-Admin-UI-Vue; yarn test --run src/router/router.test.ts` + +Expected: FAIL because 403 error class、forbidden route and explicit guard branch do not exist。 + +- [ ] **Step 3: 实现错误类与 403 页面** + +新增 `PermissionDeniedError extends ApiRequestError`，状态码固定为 403；`request` 保持 403 原样解包并抛出该错误。新增 `/forbidden` 公共渲染页面，显示无权限、返回上一页和回到首页操作，不清除 Pinia 登录态。 + +- [ ] **Step 4: 修改路由守卫** + +把当前 `return { name: "not-found" }` 的权限分支改为 `return { name: "forbidden", query: { from: to.fullPath } }`；保留动态路由只从 `componentRegistry` 注册。系统资源路由仍根据用户、角色、菜单、部门分别检查权限码。 + +- [ ] **Step 5: 运行 403、现有测试和构建** + +Run: `Set-Location WonderQ-Admin-UI-Vue; yarn test --run; yarn build` + +Expected: 403 不触发刷新、不误导为 404，现有测试和构建 PASS。 + +## Task 7: 完成五级数据范围自动化矩阵 + +**Files:** +- Modify: `WonderQ-Admin/app/rbac.py` +- Modify: `WonderQ-Admin/app/routers/admin.py` +- Modify: `WonderQ-Admin/tests/test_data_scope_matrix.py` +- Modify: `WonderQ-Admin/tests/test_admin_rbac.py` +- Modify: `docs/admin-api-requirements.md` + +- [ ] **Step 1: 建立隔离测试数据** + +测试 fixture 创建部门 `dept-a`、子部门 `dept-a-child`、`dept-b`，管理员 `user-a`、`user-b`，并创建带 `deptId` 和 `createdById` 的线索、玩法详情、管家、媒体和首页资源。fixture 每次测试独立回滚，不使用开发数据库真实业务数据。 + +- [ ] **Step 2: 写五种范围失败测试** + +分别为 `all`、`dept`、`dept_and_children`、`custom_dept`、`self` 配置角色，断言列表只返回预期 ID；同时调用详情、更新、删除或状态写入，确认跨范围资源返回 404/403，不能只在前端隐藏。 + +- [ ] **Step 3: 运行范围矩阵失败测试** + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m pytest tests/test_data_scope_matrix.py -q` + +Expected: 对未覆盖资源或错误的异常状态出现失败，输出具体资源和范围编码。 + +- [ ] **Step 4: 统一范围过滤与写入检查** + +确保 `apply_data_scope` 对目录列表使用部门/创建人 OR 规则；`is_within_data_scope` 用于详情、更新、删除、状态和排序；缺少归属字段的旧记录由既有回填规则处理，不把无归属资源错误暴露给非超级管理员。保留 `admin/super_admin` 的全量兼容行为。 + +- [ ] **Step 5: 固定 Redis 权限缓存故障语义** + +权限缓存读取或写入失败时，允许数据库重新计算权限但不得把异常转换成放行；需要 Redis 会话校验的接口继续拒绝。为 `RedisUnavailableError` 增加测试，确认不能因 Redis 断开返回全量菜单或全量业务数据。 + +- [ ] **Step 6: 运行范围和后端回归** + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m pytest tests/test_data_scope_matrix.py tests/test_admin_rbac.py tests/test_home.py -q` + +Expected: five-level matrix and affected business tests PASS；与本切片无关的既有 Alembic bootstrap 失败单独记录，不跳过新测试。 + +## Task 8: 建立 Docker 与正式双入口代理 + +**Files:** +- Create: `WonderQ-Admin-UI-Vue/Dockerfile` +- Create: `WonderQ-Admin-UI-Vue/nginx.conf` +- Modify: `WonderQ-Admin-UI/Dockerfile` +- Modify: `WonderQ-Admin-UI/nginx.conf` +- Modify: `WonderQ-Admin-UI/vite.config.ts` +- Create: `deploy/nginx/wonderq-admin.conf` +- Modify: `docs/integration-workflow.md` + +- [ ] **Step 1: 写代理静态检查** + +新建 `scripts/verify-admin-proxy.ps1`，断言 Vue 构建产物引用 `/admin/`，React legacy 构建产物引用 `/admin-legacy/`，Nginx 配置包含 `/api/` proxy、两个 SPA fallback 和独立 `/healthz`，且不存在把 `/api/` fallback 到前端 index 的规则。 + +- [ ] **Step 2: 运行代理失败检查** + +Run: `rg -n "admin-legacy|/admin/|proxy_pass|try_files|location /api" WonderQ-Admin-UI WonderQ-Admin-UI-Vue deploy/nginx` + +Expected: 当前 React 入口和 Vue Docker 入口缺少至少一项，检查失败并列出缺失路径。 + +- [ ] **Step 3: 配置 Vue 静态镜像** + +Vue Dockerfile 使用 Node 构建 `yarn build`，Nginx 配置把 `/` 的容器根目录作为 Vue `/admin/` 资源根，并对 `/admin/` history fallback 到 `/admin/index.html`。健康检查使用 `/healthz`，不暴露环境变量。 + +- [ ] **Step 4: 配置 React legacy base 和镜像** + +在 React Vite 配置中读取 `VITE_BASE_PATH`，默认开发仍为 `/`，正式 legacy 构建传入 `/admin-legacy/`；React Nginx 资源根、history fallback 和静态资源链接与该 base 一致。原有 API proxy 开发行为保持不变。 + +- [ ] **Step 5: 编写统一部署 Nginx 配置** + +统一配置明确以下映射： + +```nginx +location /api/ { proxy_pass http://wonderq-api:4000; } +location /admin/ { alias /srv/wonderq-vue/; try_files $uri $uri/ /admin/index.html; } +location /admin-legacy/ { alias /srv/wonderq-react/; try_files $uri $uri/ /admin-legacy/index.html; } +``` + +实际文件路径按镜像挂载目录调整，但必须保留三条逻辑边界，且 `/api/` 位于 SPA fallback 之前并单独转发。 + +- [ ] **Step 6: 构建并验证容器** + +Run: `docker compose config` + +Run: `docker build -t wonderq-admin-ui-vue:acceptance .\WonderQ-Admin-UI-Vue` + +Run: `docker build --build-arg VITE_BASE_PATH=/admin-legacy/ -t wonderq-admin-ui-react-legacy:acceptance .\WonderQ-Admin-UI` + +Run: `docker compose up -d postgres redis` + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m alembic upgrade head` + +Expected: 两个前端镜像、PostgreSQL、Redis 构建/启动成功；`http://localhost:4000/health` 和两个静态入口可访问。若当前 Compose 不包含 API 服务，只执行现有 API 启动命令并记录边界。 + +## Task 9: 三端回归、人工验收与 React 删除闸门 + +**Files:** +- Modify: `docs/admin-business-function-matrix.md` +- Modify: `docs/integration-workflow.md` +- Read-only verification: `WonderQ-MiniAPP/src/lib/api.ts`, `WonderQ-Admin-UI/src/api.ts` + +- [ ] **Step 1: 运行后端完整回归** + +Run: `Set-Location WonderQ-Admin; .\.venv\Scripts\python.exe -m pytest -q` + +Expected: 新增切片全部通过；既有 Alembic 兼容失败必须保留完整测试名和原因，不能用“部分通过”掩盖。 + +- [ ] **Step 2: 运行两套管理端回归** + +Run: `Set-Location ..\WonderQ-Admin-UI-Vue; yarn test --run; yarn build` + +Run: `Set-Location ..\WonderQ-Admin-UI; yarn build` + +Expected: Vue 测试/构建和 React 构建通过；旧 React API 路径、登录响应字段和刷新逻辑没有被删改。 + +- [ ] **Step 3: 做 MiniAPP Public API 兼容检查** + +确认 `WonderQ-MiniAPP/src/lib/api.ts` 仍只访问 `/api/public/...`，首页 `experiences`、团队共创和极境视界字段与 `docs/public-api.md` 一致。只有 Public API 或字段发生变化时才运行 MiniAPP 类型检查和测试。 + +- [ ] **Step 4: 人工验收顺序** + +使用独立测试账号逐项完成： + +1. 四组首页新建、编辑、删除、排序、启停和错误重试； +2. 两个登录会话验证踢下线； +3. 无页面权限 403、无按钮权限和直接 API 403； +4. 五种数据范围跨部门列表与写入； +5. Redis 异常、Docker、`/admin/`、`/admin-legacy/` 和深链刷新； +6. Public API/MiniAPP 回归； +7. 最后进行 OSS/媒体上传验收。 + +每项将实际 URL、操作结果和失败证据写入 `docs/admin-business-function-matrix.md`，不记录账号密码、Token 或密钥。 + +- [ ] **Step 5: 判断 React 删除闸门** + +只有 Vue 功能矩阵、Public/Admin API 回归、RBAC 五级范围、会话/Redis、Docker/代理、OSS/媒体和人工验收全部通过，并收到用户明确“删除旧 React”确认，才另开删除计划。当前计划结束时保留 React 源码、依赖、构建入口和 `/admin-legacy/`。 + +## 验证与交付规则 + +- 每个 Task 完成后先运行其局部测试，再运行受影响端的构建；失败时先定位根因，不以扩大改动规避测试。 +- 不执行 `git reset`、`git checkout --`、批量删除或覆盖用户现有改动。 +- 不修改 `.env`、`.env.local`、真实 Docker secrets、OSS 凭证、生产数据库连接或生产部署变量。 +- 不新增 Alembic 迁移；会话索引只使用 Redis。若实现过程中发现确需数据库结构变化，暂停并单独征求确认。 +- 不自动提交或删除 React；阶段结果以 `git diff --check`、测试输出和业务矩阵记录作为检查点。 diff --git a/docs/superpowers/specs/2026-08-26-admin-vue-formalization-design.md b/docs/superpowers/specs/2026-08-26-admin-vue-formalization-design.md new file mode 100644 index 0000000..c538dff --- /dev/null +++ b/docs/superpowers/specs/2026-08-26-admin-vue-formalization-design.md @@ -0,0 +1,220 @@ +# WonderQ Admin Vue 正式化与三端联调设计规格 + +## 1. 文档状态 + +- 日期：2026-08-26 +- 状态：待用户评审 +- 适用范围：WonderQ-Admin、WonderQ-Admin-UI-Vue、WonderQ-Admin-UI、WonderQ-MiniAPP 的本阶段正式化工作 +- 目标：在保留 React 过渡端的前提下，补齐 Vue 管理端未覆盖的首页 CRUD，完成管理员会话踢下线、显式 403、五级数据范围与正式反向代理验收。 + +本阶段不删除 React，不切换生产默认入口，不处理 OSS/媒体上传验收。媒体上传仍作为最后一项验收内容。 + +## 2. 当前基线与缺口 + +现有后端已经提供以下首页管理接口，但 Vue 管理端尚未接入： + +| 功能组 | 接口前缀 | Vue 现状 | React 现状 | +| --- | --- | --- | --- | +| 体验内容 | `/api/admin/home/experiences` | 未接入 | 已有列表、创建、编辑、删除、排序 | +| 团建内容 | `/api/admin/home/team-buildings` | 未接入 | 已有列表、创建、编辑、删除、排序 | +| 野奢档案 | `/api/admin/home/wild-archives` | 未接入 | 已有列表、创建、编辑、删除、排序 | +| 玩法推荐 | `/api/admin/home/play-recommendations` | 未接入 | 已有列表、创建、编辑、删除、排序 | + +现有 Vue 首页只覆盖站点配置模块，不能据此判断旧 React 业务已经全部迁移。 + +当前还存在以下验收缺口： + +1. Redis 会话只支持当前会话退出，没有按用户撤销全部会话的管理能力。 +2. Vue 路由权限失败会落到 Not Found，API 客户端也没有统一的 403 反馈路径。 +3. 五级数据范围已有后端基础模型与角色编辑入口，但缺少覆盖五种范围的完整自动化矩阵和非超级管理员真实验收记录。 +4. React 与 Vue 目前没有统一的生产反向代理入口；React 仍按根路径构建，不能直接挂载到 `/admin-legacy/`。 + +## 3. 目标架构 + +```text +浏览器 + ├─ /admin/ -> Vue3 静态资源，正式管理端 + ├─ /admin-legacy/ -> React 静态资源，过渡管理端 + └─ /api/ -> FastAPI，保持现有 Public API 与 Admin API + +FastAPI + ├─ PostgreSQL：业务数据、RBAC、审计 + └─ Redis：管理员会话、会话索引、权限菜单缓存、限流 +``` + +Vue 继续使用预注册组件加载动态菜单，不允许由后端返回任意前端组件路径。React 保持原有 API 响应格式和登录字段兼容，直到正式删除闸门满足并得到用户确认。 + +## 4. 分阶段实施设计 + +### 阶段一：四组首页 CRUD 垂直切片 + +每个功能组都同时完成 API 客户端、Vue 页面、权限按钮、错误态与测试，不先做一个只读总览页。 + +#### 4.1 API 与数据契约 + +在 Vue API 层增加四组资源的类型和请求函数，沿用后端既有路径、字段、`{code,msg,data}` 包裹和排序语义： + +- `GET /api/admin/home/experiences` +- `POST /api/admin/home/experiences` +- `PATCH /api/admin/home/experiences/{id}` +- `DELETE /api/admin/home/experiences/{id}` +- `POST /api/admin/home/experiences/reorder` +- `GET/POST/PATCH/DELETE/POST /reorder` 对应 `team-buildings` +- `GET/POST/PATCH/DELETE/POST /reorder` 对应 `wild-archives` +- `GET/POST/PATCH/DELETE/POST /reorder` 对应 `play-recommendations` + +实际字段以现有后端 schema 和 `docs/home-api.md` 为准；如果发现契约缺失，先补文档，再同步 TypeScript 类型和后端测试，不擅自改动旧字段名。 + +#### 4.2 Vue 页面拆分 + +不继续把四组业务逻辑堆进 `HomePage.vue`。按资源拆出可维护的页面或业务组件，并复用列表、编辑表单、排序操作、确认弹窗和权限按钮组件。每组至少覆盖： + +- 列表加载、空态、错误态、重试； +- 新建、编辑、删除及提交中禁用态； +- 排序保存与失败回滚提示； +- 图片/链接/状态等现有字段的校验和展示； +- `home:*` 权限码控制按钮显示与接口 403 反馈； +- 桌面端和窄屏布局。 + +验收以 React 页面和后端路由为基线逐项核对，不因 Vue 页面视觉重排而遗漏业务字段或操作。 + +### 阶段二：踢下线 + +#### 4.3 Redis 会话索引 + +在现有会话存储基础上增加按管理员用户索引的 Redis Set，索引只保存随机会话 ID，不保存明文 Refresh Token。创建、刷新轮换、主动退出、过期清理和批量撤销都必须维护索引；Redis 不可用时不得绕过会话校验。 + +会话存储协议增加： + +- 按用户列出会话 ID； +- 按用户撤销全部会话； +- 清理已不存在或已撤销的索引项。 + +不新增数据库表，不把 Refresh Token 写入 PostgreSQL，不在日志中记录 Token 或其完整哈希。 + +#### 4.4 管理接口与 UI + +新增： + +`POST /api/admin/system/users/{user_id}/sessions/revoke` + +要求： + +- 权限码：`system:user:update`； +- 只能由具备该按钮权限且通过数据范围校验的管理员调用； +- 默认撤销目标用户的全部管理员会话； +- 禁止通过该接口撤销当前操作会话，避免误操作造成管理流程中断； +- 目标用户不存在、无数据范围权限或 Redis 不可用时返回明确错误，不返回内部异常； +- 写入审计日志，记录操作者、目标用户、撤销数量和结果，不记录 Token； +- Vue 用户管理页提供按钮、确认提示、提交中状态和成功/失败反馈； +- 被踢出的浏览器在下一次 API 请求或刷新时收到 401，并回到登录页。 + +### 阶段三：显式 403 + +新增 Vue `ForbiddenPage.vue` 和 `/forbidden` 路由。路由守卫在用户已登录但无菜单/页面权限时进入 403 页面；未登录仍进入登录页，未知路径继续进入 Not Found。 + +API 客户端对 403 不刷新 Token、不清除有效登录态，统一转换为可识别的权限错误。页面层显示“无权限”与返回上一页/首页操作；按钮级权限仍由现有权限指令控制，但后端 403 始终视为最终边界。 + +至少验证： + +- 无页面权限访问页面 URL； +- 有页面权限但无按钮权限； +- 直接调用被禁止的 Admin API； +- 401 与 403 不混淆； +- 刷新后权限缓存和动态路由行为一致。 + +### 阶段四：五级数据范围 + +保留现有范围编码和角色编辑能力，补充自动化测试和真实验收，不另造一套权限模型。五种范围必须分别验证： + +1. 全部：可见全部归属资源； +2. 当前部门：只见当前部门资源； +3. 当前部门及子部门：可见当前部门和后代部门资源； +4. 自定义部门：只见角色明确配置的部门资源； +5. 本人：只见创建人/负责人为自己的资源。 + +测试使用至少两个部门、一个子部门、两个管理员和跨部门资源，覆盖列表、详情、更新、删除/状态写入等接口。每个切片都检查数据范围过滤在服务端生效，不能只依赖前端隐藏行。 + +权限或部门变更后必须使权限菜单缓存和相关数据范围缓存失效。Redis 不可用时拒绝需要会话或权限缓存的请求，不降级为全量数据。 + +### 阶段五：Docker 与正式反向代理 + +新增部署级 Nginx 配置和 Vue 静态镜像入口，统一提供： + +- `/admin/`：Vue 正式管理端，使用 Vue 的 `/admin/` base； +- `/admin-legacy/`：React 过渡端，React 构建必须使用 `/admin-legacy/` base； +- `/api/`：反向代理到 FastAPI； +- 两个前端入口都支持 SPA history fallback，但不能把 `/api/` 错误回退到 `index.html`。 + +React 通过构建环境或独立 legacy 构建配置注入 base，不改变现有开发端口和 API 合同。正式代理切换采用可回滚配置：先同时发布两个入口，再切换默认链接到 `/admin/`；切换期间 `/admin-legacy/` 保持可访问。 + +Docker 验收包括前端镜像构建、PostgreSQL/Redis/API 启动、Alembic 升级、健康检查、两个管理入口、API 代理和刷新深链路。生产环境变量、密钥和现有部署配置不写入仓库或文档示例。 + +## 5. 文档同步 + +实现前或接口确认时同步以下契约文档： + +- `docs/home-api.md`：四组首页 CRUD 的 Vue 对接字段、排序和错误语义； +- `docs/admin-api-requirements.md`：踢下线、403、数据范围和响应契约； +- `docs/integration-workflow.md`：三端启动、正式代理和验收顺序； +- `docs/admin-business-function-matrix.md`：每个垂直切片的迁移、测试和人工验收记录。 + +不修改 `docs/public-api.md`，除非实际发现 Public API 字段发生兼容性变化。MiniAPP 本阶段只做契约回归检查，不整体重写。 + +## 6. 测试与验收闸门 + +采用测试先行和垂直切片交付。每一片先增加会失败的测试，再写实现，最后运行与影响范围匹配的验证。 + +### 后端 + +- 四组 CRUD 的鉴权、参数校验、响应格式、排序和审计测试； +- 会话创建、刷新轮换、退出、按用户踢下线、重复撤销、Redis 不可用测试； +- 401/403 区分测试； +- 五级数据范围的跨部门/子部门/本人矩阵测试； +- 旧 React 登录字段、Public API、既有 Admin API 兼容测试； +- Alembic 空库初始化、现有数据库升级与 Docker 健康检查。 + +### Vue 与 React + +- Vue TypeScript 检查、单元测试和生产构建； +- 四组首页 CRUD 的列表、表单、删除、排序、错误态和按钮权限； +- Vue 刷新、退出、踢下线、403、动态菜单； +- React 原有构建和登录刷新回归； +- 正式代理下 `/admin/`、`/admin-legacy/`、深链刷新和 `/api/` 转发。 + +### 人工验收顺序 + +1. 四组首页 CRUD； +2. 踢下线与 403； +3. 五级数据范围； +4. Docker/Redis/正式反向代理； +5. Public API 与 MiniAPP 回归； +6. 最后单独验收 OSS/媒体上传。 + +每个阶段完成后记录实际命令、结果、失败项和人工操作证据。任何一项未通过都不能把 Vue 标记为正式替代端。 + +## 7. 回滚与删除闸门 + +- 四组业务切片异常时，可保持 React 入口继续承载原页面，Vue 只回滚对应菜单/路由，不回滚数据库既有业务数据。 +- 反向代理异常时保留 `/admin-legacy/`，恢复默认入口到 legacy 配置即可回退。 +- 会话索引异常时拒绝管理请求并修复 Redis 索引，不允许切换到绕过会话校验的降级模式。 +- 本阶段不删除 React 源码、依赖、构建入口或 legacy 代理。 + +只有同时满足以下条件，并由用户明确确认，才启动 React 删除阶段： + +1. Vue 覆盖功能矩阵全部业务能力； +2. Public API 和现有 Admin API 无回归； +3. 角色、菜单、按钮权限、五级数据范围测试通过； +4. 登录刷新、退出、踢下线、Redis 异常通过； +5. Docker 和正式反向代理通过； +6. OSS/媒体上传通过； +7. 用户完成人工验收并明确确认删除旧 React。 + +## 8. 非目标 + +- 不整体重写 MiniAPP； +- 不引入 RuoYi 的代码生成、定时任务、监控、表单设计器等非核心模块； +- 不直接删除或重置业务数据； +- 不恢复 Alembic 已清理的无用 schema； +- 不把媒体上传提前到本阶段的首页 CRUD 验收之前； +- 不在本规格确认前改动生产环境变量、密钥和部署数据。