diff --git a/.codex-tasks/tenant-architecture-epic/PROGRESS.md b/.codex-tasks/tenant-architecture-epic/PROGRESS.md
index f93dce4..a4248c5 100644
--- a/.codex-tasks/tenant-architecture-epic/PROGRESS.md
+++ b/.codex-tasks/tenant-architecture-epic/PROGRESS.md
@@ -3,7 +3,7 @@
- 任务:多品牌后台与 API 架构收口
- 形态:epic
- 进度:1/3
-- 当前:API Controller 拆分(已完成 session 模块第一批迁移,继续拆分中)
+- 当前:API Controller 拆分(已完成 session、customer booking、admin booking;继续拆分 public 和 admin config)
- 真相文件:`SUBTASKS.csv`
## 已完成
@@ -14,3 +14,4 @@
- `CustomerSessionController` 和 `AdminSessionController` 已迁移到 `modules/session/session.controller.ts`。
- `AdminBookingController` 已迁移到 `modules/admin/admin-booking.controller.ts`。
- `CustomerBookingController` 已迁移到 `modules/customer/customer-booking.controller.ts`。
+- 新增 `GET /admin/brands` 和 `POST /admin/brands/:brandId/switch`,切换由 membership 服务端校验。
diff --git a/.codex-tasks/tenant-architecture-epic/SUBTASKS.csv b/.codex-tasks/tenant-architecture-epic/SUBTASKS.csv
index 70a443d..62c18c6 100644
--- a/.codex-tasks/tenant-architecture-epic/SUBTASKS.csv
+++ b/.codex-tasks/tenant-architecture-epic/SUBTASKS.csv
@@ -1,4 +1,4 @@
id,title,task_type,depends_on,status,task_dir,acceptance_criteria,validation_command,notes
1,当前品牌工作区语义,single-full,,DONE,tasks/admin-context,后台明确当前品牌并保持 membership 隔离,pnpm --filter @personal-brand/admin build && pnpm --filter @personal-brand/api test:integration,已完成
-2,API Controller 拆分,single-full,1,TODO,tasks/api-split,main.ts 仅保留装配和跨模块基础代码,pnpm --filter @personal-brand/api typecheck && pnpm --filter @personal-brand/api test:integration,
+2,API Controller 拆分,single-full,1,IN_PROGRESS,tasks/api-split,main.ts 仅保留装配和跨模块基础代码,pnpm --filter @personal-brand/api typecheck && pnpm --filter @personal-brand/api test:integration,已拆分 session、customer booking、admin booking;public 和 admin config 仍待拆分
3,架构回归收口,single-full,2,TODO,tasks/regression,Admin 和 miniapp 回归全部通过,pnpm --filter @personal-brand/admin build && pnpm --filter @personal-brand/miniapp test:fixture,
diff --git a/apps/admin/src/main.tsx b/apps/admin/src/main.tsx
index cc05015..f082ba5 100644
--- a/apps/admin/src/main.tsx
+++ b/apps/admin/src/main.tsx
@@ -2,7 +2,19 @@ import React, { Suspense, useState } from "react";
import { createRoot } from "react-dom/client";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { useQuery } from "@tanstack/react-query";
-import { App, Button, Card, Form, Input, Layout, Menu, Space, Typography, message } from "antd";
+import {
+ App,
+ Button,
+ Card,
+ Form,
+ Input,
+ Layout,
+ Menu,
+ Select,
+ Space,
+ Typography,
+ message,
+} from "antd";
import { createApiClient } from "./lib/api.js";
const FeatureInquiriesPage = React.lazy(() =>
import("./features/inquiries/InquiriesPage.js").then((module) => ({
@@ -82,6 +94,19 @@ function Dashboard({ onLogout }: { onLogout: () => void }) {
queryKey: ["admin-shell-brand"],
queryFn: () => createApiClient().getAdminBrand(),
});
+ const memberships = useQuery({
+ queryKey: ["admin-brand-memberships"],
+ queryFn: () => createApiClient().listAdminBrands(),
+ });
+ const switchBrand = async (brandId: string) => {
+ try {
+ const result = await createApiClient().switchAdminBrand(brandId);
+ localStorage.setItem("adminToken", result.token);
+ window.location.reload();
+ } catch (error) {
+ message.error(error instanceof Error ? error.message : "品牌切换失败");
+ }
+ };
const page = location.pathname.split("/")[2] || "overview";
const items = [
{ key: "overview", label: "当前品牌概览" },
@@ -117,6 +142,16 @@ function Dashboard({ onLogout }: { onLogout: () => void }) {
{brand.data?.name || "当前品牌"}
品牌工作区
+