fix(ux): #1894 删除标题库入口 + 文案名称改标题 + AI改写UX + 清理旧定价硬编码 (#1965)

Co-authored-by: xiaoxia <dev@xiaoxiajianji.com>
Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>

.ci-trigger

@@ -1,2 +1,2 @@
 CI trigger file - safe to delete
-updated!
+retrigger at 2026-09-15 20:31:24 UTC

CHANGELOG.md

@@ -494,3 +494,5 @@
 - [Fixed] Bug 修复
 - [Security] 安全相关更新
 - [Performance] 性能优化
+---
+- 2026-09-16: fix extract-from-douyin 异常路径全部返回业务码（消除500） #1963

alembic/versions/077_merge_title_libs.py

@@ -0,0 +1,67 @@
+"""#1894: merge title_libraries into scripts — add title_text/title_category/title_config
+
+Revision ID: 077_merge_title_libs
+Revises: 076_membership_points
+Create Date: 2026-09-15
+"""
+
+import sqlalchemy as sa
+
+from alembic import context, op
+
+revision = "077_merge_title_libs"
+down_revision = "076_membership_points"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("scripts") as batch:
+        batch.add_column(
+            sa.Column("title_text", sa.String(500), nullable=False, server_default=""),
+        )
+        batch.add_column(
+            sa.Column("title_category", sa.String(50), nullable=False, server_default=""),
+        )
+        batch.add_column(
+            sa.Column("title_config", sa.JSON, nullable=False, server_default="{}"),
+        )
+
+    if context.get_context().dialect.name == "postgresql":
+        conn = op.get_bind()
+        result = conn.execute(sa.text("SELECT to_regclass('public.title_libraries')"))
+        if result.scalar() is not None:
+            conn.execute(sa.text("""
+                    INSERT INTO scripts
+                        (id, user_id, title, content, segments, tags,
+                         title_text, title_category, title_config,
+                         created_at, updated_at)
+                    SELECT
+                        gen_random_uuid()::TEXT,
+                        tl.user_id,
+                        COALESCE(tl.name, '迁移标题'),
+                        COALESCE(tl.text, ''),
+                        '[]'::JSONB,
+                        COALESCE(tl.tags, '[]'::JSONB),
+                        COALESCE(tl.text, ''),
+                        COALESCE(tl.category, ''),
+                        COALESCE(tl."metadata", '{}'::JSONB),
+                        tl.created_at,
+                        tl.updated_at
+                    FROM title_libraries tl
+                    WHERE tl.is_active = true
+                      AND NOT EXISTS (
+                        SELECT 1 FROM scripts s
+                        WHERE s.user_id = tl.user_id
+                          AND s.title_text = COALESCE(tl.text, '')
+                          AND s.title_category = COALESCE(tl.category, '')
+                          AND s.created_at = tl.created_at
+                      )
+                    """))
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("scripts") as batch:
+        batch.drop_column("title_config")
+        batch.drop_column("title_category")
+        batch.drop_column("title_text")

apps/api/app/api/routes/auth.py

@@ -13,7 +13,7 @@ from typing import Optional
 import jwt
 from app.auth import AuthenticatedUser, blacklist_token, get_current_user
 from app.config import settings
-from app.dependencies import get_auth_email_service, get_auth_session_store, get_user_repository
+from app.dependencies import get_auth_email_service, get_auth_session_store, get_db_session, get_user_repository
 from fastapi import APIRouter, Depends, Header, HTTPException, Request, status
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from pydantic import BaseModel, EmailStr, field_validator
@@ -126,6 +126,7 @@ async def register(
     request: RegisterRequest,
     user_repository: UserRepository = Depends(get_user_repository),
     email_service=Depends(get_auth_email_service),
+    db=Depends(get_db_session),
 ) -> RegisterResponse:
     use_case = RegisterUserUseCase(
         user_repository=user_repository,
@@ -143,6 +144,22 @@ async def register(
     if error or response is None:
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=_translate_auth_error(error))
 
+    # 新用户注册赠送 50 积分（失败不影响注册）
+    if settings.points_enabled:
+        try:
+            from packages.domain.points_service import PointsService
+            _svc = PointsService()
+            _svc.add_points(
+                user_id=response.user_id,
+                amount=50,
+                source="task_reward",
+                db=db,
+                description="新用户注册赠送",
+            )
+        except Exception as _bonus_err:
+            import logging
+            logging.getLogger(__name__).warning("注册送积分失败: user_id=%s err=%s", response.user_id, _bonus_err)
+
     return RegisterResponse(
         user_id=response.user_id,
         email=response.email,

apps/api/app/api/routes/points.py

@@ -8,7 +8,7 @@
 from __future__ import annotations
 
 import logging
-from datetime import datetime
+from datetime import datetime, timedelta, timezone
 from typing import Optional
 
 from app.auth import AuthenticatedUser, get_current_user
@@ -125,6 +125,7 @@ def get_rules(
                 base_points=scene_data["base_points"],
                 unit=scene_data["unit"],
                 extra_per_30s=scene_data.get("extra_per_30s"),
+                description=scene_data.get("description", ""),
             )
         )
     return PointsRulesResponse(
@@ -161,7 +162,16 @@ def check_points(
     current_user: AuthenticatedUser = Depends(get_current_user),
     db: Session = Depends(get_db_session),
 ):
-    """消费前检查余额是否足够。"""
+    """消费前检查余额是否足够。未知 scene_key 返回 400（而非 500）。"""
+    if body.scene_key not in POINTS_SCENES:
+        raise HTTPException(
+            status_code=400,
+            detail={
+                "code": "UNKNOWN_SCENE",
+                "message": f"未知场景: {body.scene_key}",
+                "valid_scenes": sorted(POINTS_SCENES.keys()),
+            },
+        )
     is_mem = _is_member(current_user)
     mt = _member_type(current_user)
 
@@ -267,7 +277,7 @@ def create_recharge_order(
     current_user: AuthenticatedUser = Depends(get_current_user),
     db: Session = Depends(get_db_session),
 ):
-    """创建积分充值订单。"""
+    """创建积分充值订单。pay_params 在支付通道接入后填入 prepay_id/payment_url；当前为空 dict。"""
     svc = _get_service()
     try:
         order = svc.create_order(
@@ -278,6 +288,14 @@ def create_recharge_order(
         )
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e)) from None
+
+    package = POINTS_PACKAGES.get(body.package_id, {})
+    now = datetime.now(timezone.utc)
+    expire_at = now + timedelta(hours=48)
+    # TODO: 接入微信/支付宝后填充真实 prepay_id / payment_url
+    order["points_amount"] = package.get("points", 0)
+    order["pay_params"] = {}
+    order["expire_at"] = expire_at.isoformat()
     return PointsOrderResponse(**order)
 
 

apps/api/app/api/routes/scripts.py

@@ -36,6 +36,9 @@ def _to_response(script) -> ScriptResponse:
             for s in segments
         ],
         tags=script.tags or [],
+        title_text=getattr(script, "title_text", "") or "",
+        title_category=getattr(script, "title_category", "") or "",
+        title_config=getattr(script, "title_config", None) or {},
         created_at=script.created_at,
         updated_at=script.updated_at,
     )
@@ -70,6 +73,9 @@ def create_script(
         content=request.content,
         segments=[s.model_dump() for s in request.segments],
         tags=request.tags,
+        title_text=request.title_text or "",
+        title_category=request.title_category or "",
+        title_config=request.title_config or {},
     )
     return _to_response(script)
 
@@ -104,6 +110,9 @@ def update_script(
             content=request.content,
             segments=[s.model_dump() for s in request.segments] if request.segments is not None else None,
             tags=request.tags,
+            title_text=request.title_text,
+            title_category=request.title_category,
+            title_config=request.title_config,
         )
     except ScriptNotFoundError as exc:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Script not found") from exc

apps/api/app/api/routes/scripts_ai.py

@@ -9,6 +9,7 @@
 from __future__ import annotations
 
 import logging
+import os
 import re
 import tempfile
 
@@ -80,10 +81,20 @@ def extract_from_douyin(
     if not re.match(r"^https?://", url_for_download, re.IGNORECASE):
         url_for_download = "https://" + url_for_download
 
-    # 使用临时目录下载视频，退出时自动清理
+    text: str = ""
+    duration: float = 0.0
+
     try:
         with tempfile.TemporaryDirectory(prefix="douyin_extract_") as temp_dir:
-            import yt_dlp
+            # 延迟导入 yt-dlp，避免模块缺失时影响其他路由启动
+            try:
+                import yt_dlp
+            except ImportError as exc:
+                logger.error("yt-dlp 未安装，抖音提取功能不可用: %s", exc)
+                raise HTTPException(
+                    status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
+                    detail="抖音提取功能暂不可用（缺少依赖 yt-dlp）",
+                ) from exc
 
             ydl_opts = {
                 "format": "best[ext=mp4]/best",
@@ -96,11 +107,23 @@ def extract_from_douyin(
             try:
                 ydl = yt_dlp.YoutubeDL(ydl_opts)
                 info = ydl.extract_info(url_for_download, download=True)
+            except yt_dlp.utils.DownloadError as exc:
+                # yt-dlp 官方异常类型：HTTP 错误、短链失效、视频下架等
+                msg = str(exc)
+                logger.warning("抖音下载失败: url=%s error=%s", source_url, msg)
+                # 404/视频不存在/不可下载 → 400；网络问题/上游异常 → 502
+                is_bad_url = any(
+                    kw in msg.lower() for kw in ("404", "not found", "unable to download webpage", "unsupported url", "no video formats")
+                )
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST if is_bad_url else status.HTTP_502_BAD_GATEWAY,
+                    detail=("无法解析该抖音链接，请确认链接有效且视频未被下架" if is_bad_url else f"视频下载失败: {msg[:200]}"),
+                ) from exc
             except Exception as exc:
-                logger.error("抖音视频下载失败: url=%s error=%s", source_url, exc)
+                logger.exception("抖音视频下载异常: url=%s", source_url)
                 raise HTTPException(
                     status_code=status.HTTP_502_BAD_GATEWAY,
-                    detail=f"视频下载失败: {exc}",
+                    detail=f"视频下载失败: {str(exc)[:200]}",
                 ) from exc
 
             if info is None:
@@ -110,9 +133,20 @@ def extract_from_douyin(
                 )
 
             video_path = ydl.prepare_filename(info)
-            duration = float(info.get("duration") or 0)
+            try:
+                duration = float(info.get("duration") or 0)
+            except (TypeError, ValueError):
+                duration = 0.0
 
-            # ASR 转写
+            # 校验下载的文件是否真的存在（某些 yt-dlp 版本可能 info 成功但未下载到文件）
+            if not os.path.isfile(video_path) or os.path.getsize(video_path) == 0:
+                logger.error("yt-dlp 未产生有效视频文件: path=%s", video_path)
+                raise HTTPException(
+                    status_code=status.HTTP_502_BAD_GATEWAY,
+                    detail="视频下载异常：未获取到有效文件",
+                )
+
+            # ASR 转写（兜底捕获所有异常，避免 500）
             try:
                 text = transcribe_to_text(video_path)
             except ASRNotConfiguredError as exc:
@@ -125,9 +159,22 @@ def extract_from_douyin(
                     status_code=status.HTTP_502_BAD_GATEWAY,
                     detail=str(exc),
                 ) from exc
+            except Exception as exc:
+                logger.exception("ASR 转写异常: path=%s", video_path)
+                raise HTTPException(
+                    status_code=status.HTTP_502_BAD_GATEWAY,
+                    detail=f"语音识别失败: {str(exc)[:200]}",
+                ) from exc
 
     except HTTPException:
         raise
+    except Exception as exc:
+        # 最后兜底：任何未捕获异常都转成 502/400，不允许冒泡成 500
+        logger.exception("抖音文案提取未预期异常: url=%s", source_url)
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"抖音文案提取失败: {str(exc)[:200]}",
+        ) from exc
 
     return ExtractFromDouyinResponse(
         text=text,

apps/api/app/api/routes/subscription.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import logging
 from dataclasses import replace
 from datetime import UTC, datetime
+from typing import Any
 
 from app.auth import AuthenticatedUser, get_current_user
 from app.dependencies import get_user_repository
@@ -99,6 +100,39 @@ async def get_current_subscription(
     return _build_subscription_info(current_user)
 
 
+@router.get("/plans")
+def list_membership_plans(
+    current_user: AuthenticatedUser = Depends(get_current_user),
+) -> dict[str, list[dict[str, Any]]]:
+    """查询所有会员档位（供前端会员购买页展示）。
+
+    返回 points 积分体系下的会员档位（月卡/季卡/年卡），含价格、时长、积分折扣等信息。
+    """
+    from packages.domain.points_rules import MEMBER_DISCOUNT, MEMBERSHIP_PRICES
+
+    plans: list[dict[str, Any]] = []
+    for plan_id, info in MEMBERSHIP_PRICES.items():
+        days = info["duration_days"]
+        monthly_cents = round(info["price_cents"] * 30 / days)
+        features: dict[str, Any] = {"max_resolution": "1080p"}
+        if plan_id == "monthly":
+            features.update({"free_clips_daily": 2})
+        elif plan_id == "quarterly":
+            features.update({"free_clips_daily": 5})
+        elif plan_id == "yearly":
+            features.update({"free_clips_daily": "unlimited"})
+        plans.append({
+            "plan_id": plan_id,
+            "name": info["name"],
+            "price_cents": info["price_cents"],
+            "monthly_price_cents": monthly_cents,
+            "duration_days": days,
+            "points_discount": MEMBER_DISCOUNT.get(plan_id, 1.0),
+            "features": features,
+        })
+    return {"plans": plans}
+
+
 @router.get("/billing-records", response_model=list[BillingRecord])
 async def get_billing_records(
     current_user: AuthenticatedUser = Depends(get_current_user),

apps/api/app/api/routes/titles.py

@@ -1,7 +1,13 @@
-"""Title library CRUD routes."""
+"""Title library CRUD routes.
+
+.. deprecated::
+    标题库 API 已废弃（#1894），标题配置已整合到 scripts 模型。
+    所有接口保留向后兼容，但返回 Warning header 并记录日志。
+"""
 
 from __future__ import annotations
 
+import logging
 from typing import Optional
 
 from app.api.routes._helpers import get_user_plan
@@ -35,6 +41,21 @@ from packages.application.title_library.use_cases import (
 from packages.ports.user_repository import UserRepository
 
 router = APIRouter()
+logger = logging.getLogger(__name__)
+
+_DEPRECATION_WARNING = (
+    '299 - "Title library API is deprecated; migrate to scripts.title_text/'
+    'title_category/title_config (issue #1894)"'
+)
+
+
+def _deprecation_headers() -> dict:
+    """返回 deprecation Warning header (ASCII-only, RFC 7234 §5.5)."""
+    return {"Warning": _DEPRECATION_WARNING, "Deprecation": "true"}
+
+
+def _log_deprecation(endpoint: str) -> None:
+    logger.warning("[Deprecated] title_library API 调用: %s — %s", endpoint, _DEPRECATION_WARNING)
 
 
 def _get_title_repository(session: Session = Depends(get_db_session)) -> SQLAlchemyTitleLibraryRepository:
@@ -59,12 +80,17 @@ def _to_response(item) -> TitleLibraryItemResponse:
 
 @router.get("", response_model=ListTitleLibraryResponse)
 def list_titles(
+    response: Response,
     category: Optional[str] = Query(None),
     skip: int = Query(0, ge=0),
     limit: int = Query(50, ge=1, le=200),
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
 ) -> ListTitleLibraryResponse:
+    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代."""
+    _log_deprecation("list_titles")
+    for k, v in _deprecation_headers().items():
+        response.headers[k] = v
     user_id = authenticated_user.user.id
     use_case = ListTitleLibraryUseCase(title_repository)
     items = use_case.execute(user_id, category=category, skip=skip, limit=limit)
@@ -77,6 +103,7 @@ def list_titles(
 
 @router.post("/pick", response_model=TitleLibraryItemResponse)
 def pick_title(
+    response: Response,
     category: Optional[str] = Query(None, description="按分类筛选，不填则从全部标题中选"),
     exclude_ids: Optional[str] = Query(
         None,
@@ -85,10 +112,15 @@ def pick_title(
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
 ) -> TitleLibraryItemResponse:
-    """智能选择一个标题。
+    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代.
+
+    智能选择一个标题。
 
     策略：优先使用次数少的，从最少的前5个中随机选一个，兼顾公平和多样性。
     """
+    _log_deprecation("pick_title")
+    for k, v in _deprecation_headers().items():
+        response.headers[k] = v
     user_id = authenticated_user.user.id
     exclude_list: list[str] = []
     if exclude_ids:
@@ -113,9 +145,14 @@ def pick_title(
 @router.get("/{title_id}", response_model=TitleLibraryItemResponse)
 def get_title(
     title_id: str,
+    response: Response,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
 ) -> TitleLibraryItemResponse:
+    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代."""
+    _log_deprecation("get_title")
+    for k, v in _deprecation_headers().items():
+        response.headers[k] = v
     user_id = authenticated_user.user.id
     use_case = GetTitleLibraryUseCase(title_repository)
     item = use_case.execute(title_id, user_id)
@@ -126,11 +163,16 @@ def get_title(
 
 @router.post("", response_model=TitleLibraryItemResponse, status_code=status.HTTP_201_CREATED)
 def create_title(
+    response: Response,
     request: CreateTitleLibraryRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
     user_repository: UserRepository = Depends(get_user_repository),
 ) -> TitleLibraryItemResponse:
+    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代."""
+    _log_deprecation("create_title")
+    for k, v in _deprecation_headers().items():
+        response.headers[k] = v
     user_id = authenticated_user.user.id
     plan_name = get_user_plan(user_id, user_repository)
     command = CreateTitleLibraryCommand(
@@ -155,10 +197,15 @@ def create_title(
 @router.put("/{title_id}", response_model=TitleLibraryItemResponse)
 def update_title(
     title_id: str,
+    response: Response,
     request: UpdateTitleLibraryRequest,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
 ) -> TitleLibraryItemResponse:
+    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代."""
+    _log_deprecation("update_title")
+    for k, v in _deprecation_headers().items():
+        response.headers[k] = v
     user_id = authenticated_user.user.id
     command = UpdateTitleLibraryCommand(
         title_id=title_id,
@@ -180,9 +227,14 @@ def update_title(
 @router.delete("/{title_id}", status_code=status.HTTP_204_NO_CONTENT, response_model=None, response_class=Response)
 def delete_title(
     title_id: str,
+    response: Response,
     authenticated_user: AuthenticatedUser = Depends(get_current_user),
     title_repository: SQLAlchemyTitleLibraryRepository = Depends(_get_title_repository),
 ) -> Response:
+    """[Deprecated] 请使用 scripts API 的 title_text/title_category 字段替代."""
+    _log_deprecation("delete_title")
+    for k, v in _deprecation_headers().items():
+        response.headers[k] = v
     user_id = authenticated_user.user.id
     use_case = DeleteTitleLibraryUseCase(title_repository)
     deleted = use_case.execute(title_id, user_id)

apps/api/app/schemas/points.py

@@ -57,6 +57,7 @@ class PointRuleItem(BaseModel):
     base_points: int
     unit: str
     extra_per_30s: Optional[int] = None
+    description: str = Field(default="", description="规则中文说明，例如 AI 配音每分钟消耗 X 积分")
 
 
 class PointsRulesResponse(BaseModel):
@@ -139,7 +140,12 @@ class PointsOrderResponse(BaseModel):
     order_type: str
     product_code: str
     amount_cents: int
+    points_amount: int = Field(0, description="本次充值/购买可获得的积分（仅 points 类型订单有意义）")
     status: str
+    pay_params: dict[str, Any] = Field(
+        default_factory=dict, description="拉起支付所需参数（payment_url/prepay_id 等），支付通道接入后填充"
+    )
+    expire_at: Optional[str] = Field(None, description="订单过期时间（ISO 8601），默认创建后 48 小时")
     created_at: Optional[str] = None
 
 
@@ -171,6 +177,27 @@ class MembershipStatusResponse(BaseModel):
     )
 
 
+# ============ 订阅档位 ============
+
+
+class MembershipPlanItem(BaseModel):
+    """单个会员档位"""
+
+    plan_id: str = Field(..., description="档位标识: monthly/quarterly/yearly")
+    name: str = Field(..., description="档位名称，例如 月卡")
+    monthly_price_cents: int = Field(..., description="折算月价（分）")
+    price_cents: int = Field(..., description="该档位总价（分）")
+    duration_days: int = Field(..., description="时长（天）")
+    points_discount: float = Field(..., description="该档位积分折扣，如 0.9 表示 9 折")
+    features: dict[str, Any] = Field(default_factory=dict, description="档位权益（max_resolution 等）")
+
+
+class MembershipPlansResponse(BaseModel):
+    """所有会员档位列表"""
+
+    plans: list[MembershipPlanItem]
+
+
 # ============ 通用响应 ============
 
 

apps/api/app/schemas/script.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Optional
+from typing import Any, Dict, Optional
 
 from pydantic import BaseModel, Field
 
@@ -22,6 +22,9 @@ class ScriptResponse(BaseModel):
     content: str
     segments: list[ScriptSegment] = Field(default_factory=list)
     tags: list[str] = Field(default_factory=list)
+    title_text: str = ""
+    title_category: str = ""
+    title_config: Dict[str, Any] = Field(default_factory=dict)
     created_at: datetime
     updated_at: datetime
 
@@ -36,6 +39,9 @@ class CreateScriptRequest(BaseModel):
     content: str = ""
     segments: list[ScriptSegment] = Field(default_factory=list)
     tags: list[str] = Field(default_factory=list)
+    title_text: str = ""
+    title_category: str = ""
+    title_config: Optional[Dict[str, Any]] = None
 
 
 class UpdateScriptRequest(BaseModel):
@@ -43,3 +49,6 @@ class UpdateScriptRequest(BaseModel):
     content: Optional[str] = None
     segments: Optional[list[ScriptSegment]] = None
     tags: Optional[list[str]] = None
+    title_text: Optional[str] = None
+    title_category: Optional[str] = None
+    title_config: Optional[Dict[str, Any]] = None

apps/api/app/services/script_service.py

@@ -51,6 +51,9 @@ class ScriptService:
         content: str = "",
         segments: list | None = None,
         tags: list | None = None,
+        title_text: str = "",
+        title_category: str = "",
+        title_config: dict | None = None,
     ) -> ScriptModel:
         script = ScriptModel(
             id=str(uuid.uuid4()),
@@ -59,6 +62,9 @@ class ScriptService:
             content=content,
             segments=segments if segments is not None else [],
             tags=tags if tags is not None else [],
+            title_text=title_text or "",
+            title_category=title_category or "",
+            title_config=title_config if title_config is not None else {},
         )
         self.db.add(script)
         self.db.commit()
@@ -83,6 +89,9 @@ class ScriptService:
         content: Optional[str] = None,
         segments: Optional[list] = None,
         tags: Optional[list] = None,
+        title_text: Optional[str] = None,
+        title_category: Optional[str] = None,
+        title_config: Optional[dict] = None,
     ) -> ScriptModel:
         script = self.get_script(script_id, user_id)
         if title is not None:
@@ -93,11 +102,27 @@ class ScriptService:
             script.segments = segments
         if tags is not None:
             script.tags = tags
+        if title_text is not None:
+            script.title_text = title_text
+        if title_category is not None:
+            script.title_category = title_category
+        if title_config is not None:
+            script.title_config = title_config
         script.updated_at = datetime.now(UTC)
         self.db.commit()
         self.db.refresh(script)
         return script
 
+    # ── title config ─────────────────────────────────────────────────────
+
+    def get_title_config_for_script(self, script_id: str, user_id: str) -> dict:
+        """从 script 读取标题配置，返回可直接用于渲染的 title_config dict."""
+        script = self.get_script(script_id, user_id)
+        config = dict(script.title_config or {})
+        if not config.get("text") and script.title_text:
+            config["text"] = script.title_text
+        return config
+
     # ── delete ────────────────────────────────────────────────────────────
 
     def delete_script(self, script_id: str, user_id: str) -> bool:

apps/web/e2e/core-generation.spec.ts

@@ -49,10 +49,10 @@ type AssetListResponse = {
 }
 
 test.describe("Core generation flow", () => {
-  test.describe.configure({ timeout: 360_000 })
+  test.describe.configure({ timeout: 600_000 })
 
-  test("walks through 6-step wizard and starts generation", async ({ page, request }) => {
-    test.setTimeout(360_000)
+  test("walks through wizard with count modal and starts generation", async ({ page, request }) => {
+    test.setTimeout(600_000)
 
     await routeBrowserApiToTestApi(page)
     const suffix = Date.now().toString(36)
@@ -169,18 +169,9 @@ test.describe("Core generation flow", () => {
       timeout: 20_000,
     })
 
-    // Step 1: template - default selected, click next
-    await expect(page.locator(".xx-choice-item.selected")).toBeVisible()
-    await page.getByRole("button", { name: "下一步" }).click()
-
-    // Step1 下一步弹出数量选择弹窗（Issue #1677 固定6步：模板→素材→配音→标题→确认生成→封面）
-    // 单视频流程：默认 1 个，点击「生成 1 个视频」进入步骤2
-    await expect(page.getByRole("heading", { name: "要生成几个视频？" })).toBeVisible({
-      timeout: 10_000,
-    })
-    await page.getByRole("button", { name: "生成 1 个视频" }).click()
-
-    // Step 2: select material (card grid UI)
+    // 5步向导：素材→数量弹窗→配音→标题→确认生成→封面（#1911 删除选模板步骤，后端自动使用默认模板；
+    // #1677 批量生成在选完素材后弹「要生成几个视频？」数量弹窗，默认1，回车确认）
+    // Step 1: select material (card grid UI)
     await expect(page.getByRole("heading", { name: /选择素材/ })).toBeVisible()
     const librarySelect = page.locator("select").first()
     await librarySelect.selectOption({ label: libraryName })
@@ -193,11 +184,17 @@ test.describe("Core generation flow", () => {
     await expect(materialCard.getByTestId("material-card-check")).toBeVisible({ timeout: 5_000 })
     await page.getByRole("button", { name: "下一步" }).click()
 
-    // Step 3: voice (可选步骤，新注册用户无配音素材，直接跳过)
+    // #1677 数量弹窗：默认值1，点击「生成 1 个视频」确认（新用户单视频冒烟路径）
+    await expect(page.getByRole("heading", { name: "要生成几个视频？" })).toBeVisible({
+      timeout: 5_000,
+    })
+    await page.getByRole("button", { name: "生成 1 个视频" }).click()
+
+    // Step 2: voice（新注册用户无配音素材时展示空状态 h3「🎙️ 选择配音」，仍可点「下一步」跳过）
     await expect(page.getByRole("heading", { name: /选择配音/ })).toBeVisible({ timeout: 15000 })
     await page.getByRole("button", { name: "下一步" }).click()
 
-    // Step 4: title（新顺序：标题在预览之前）
+    // Step 3: title（新顺序：标题在预览之前）
     await expect(page.getByRole("heading", { name: /选择标题/ })).toBeVisible({ timeout: 15000 })
     // 等待组件完全渲染
     await page.waitForTimeout(2000)
@@ -210,7 +207,14 @@ test.describe("Core generation flow", () => {
     const titleText = `E2E Test ${suffix}`
     await titleInput.fill(titleText)
 
-    // Step 4（标题+实时预览）：确认生成按钮已移到标题页，点击直接创建最终渲染任务
+    // 步骤3（标题页）底部操作栏按钮是「下一步 →」，点击后进入步骤4
+    // 步骤4底部才是「✨ 确认生成视频」按钮
+    const nextBtn = page.locator(".xx-step-actions .xx-btn-primary").filter({ hasText: "下一步" })
+    await expect(nextBtn).toBeVisible({ timeout: 15_000 })
+    await nextBtn.click()
+
+    // Step 4：「确认生成」页面——此处底部是「✨ 确认生成视频」按钮
+    // 注意：Step4 主内容区是实时预览画布，没有 h3 「🎬 确认生成」标题，标题由顶部步骤条展示
     // 等待前端实时预览就绪：未就绪时右侧 FrontendPreviewPlayer 显示「准备预览素材...」占位，
     // 就绪（previewReady：素材已解析 + 模板已选中）后占位消失；否则按钮会被校验拦截弹 warning
     await page
@@ -218,19 +222,25 @@ test.describe("Core generation flow", () => {
       .waitFor({ state: "detached", timeout: 30_000 })
       .catch(() => {})
 
-    // Wait for generation API to be called
-    // 前端直接创建生成任务：POST /generation/tasks
+    // 定位底部操作栏的「✨ 确认生成视频」按钮
+    // 使用底部操作栏 xx-step-actions 作用域，避免命中其他 primary 按钮
+    const confirmBtn = page
+      .locator(".xx-step-actions .xx-btn-primary")
+      .filter({ hasText: "确认生成" })
+    await expect(confirmBtn).toBeVisible({ timeout: 30_000 })
+    await expect(confirmBtn).toBeEnabled({ timeout: 30_000 })
+
+    // Wait for generation API to be called — 先挂监听再点击，避免竞态
     const generatePromise = page.waitForResponse(
       (response) => {
         const url = response.url()
         const path = new URL(url).pathname
         return response.request().method() === "POST" && path.endsWith("/generation/tasks")
       },
-      { timeout: 30_000 },
+      { timeout: 60_000 },
     )
 
-    // 点击「确认生成视频」
-    await page.locator(".xx-btn-primary").filter({ hasText: "确认生成视频" }).first().click()
+    await confirmBtn.click()
 
     // Verify generation was triggered
     const genResp = await generatePromise
@@ -250,19 +260,26 @@ test.describe("Core generation flow", () => {
       expect(genData.items.length).toBeGreaterThan(0)
       expect(genData.items[0].id).toBeTruthy()
 
-      // 单视频（N=1）：点击「确认生成视频」后跳 Step 5「确认生成」，展示实时渲染进度
-      await expect(page.getByRole("heading", { name: "🎬 确认生成" })).toBeVisible({
-        timeout: 30_000,
-      })
+      // 单视频（N=1）：点击「确认生成视频」后跳步骤 5「确认生成」进度页，展示进度卡
+      // 注意：进度页底部按钮变为 disabled 的「⏳ 视频渲染中…」
+      await expect(page.getByText("视频渲染中")).toBeVisible({ timeout: 30_000 })
 
-      // 等待渲染完成：进度卡变为「视频生成完成」（最长等待 3 分钟）
-      await expect(page.getByText("视频生成完成")).toBeVisible({ timeout: 180_000 })
+      // 等待渲染完成：单视频成片播放器渲染（带「⬇️ 下载」按钮），最长等待 3 分钟
+      // 注意：message.success「视频生成完成」toast 3秒后自动消失，不能作为稳定断言点
+      await expect(page.getByRole("button", { name: "⬇️ 下载" })).toBeVisible({ timeout: 420_000 })
 
-      // 全部完成后「下一步：选择封面」解锁，点击进入 Step 6
-      await page.getByRole("button", { name: /下一步：选择封面/ }).click()
-      await expect(page.getByRole("heading", { name: /选择封面/ })).toBeVisible({
-        timeout: 30_000,
-      })
+      // #1954 修复：生成完成后步骤4底部应显示「下一步：选择封面」按钮
+      // 等待底部主按钮从「⏳/确认生成」切换为「下一步：选择封面」
+      const nextCoverBtn = page
+        .locator(".xx-step-actions > .xx-btn-primary")
+        .filter({ hasText: "选择封面" })
+      await expect(nextCoverBtn).toBeVisible({ timeout: 15_000 })
+      await nextCoverBtn.click()
+
+      // 断言进入步骤5封面页：主内容出现「选择封面」标题
+      await expect(page.getByText("🖼️ 选择封面")).toBeVisible({ timeout: 10_000 })
+      // 底部操作栏主按钮应消失（封面是最后一步，只剩「← 上一步」）
+      await expect(page.locator(".xx-step-actions > .xx-btn-primary")).toHaveCount(0)
     } else {
       console.log(`[E2E] Generate API returned ${genResp.status()}, wizard flow test still passes`)
       // 创建失败时停留在标题页并展示错误提示

apps/web/src/api/points/index.ts

@@ -1,477 +1,345 @@
 /**
- * 积分 & 会员 API 封装（v2 两档会员制）
- * 后端接口未就绪阶段使用 mock 数据；接口就绪后把 MOCK 开关关掉即可。
+ * 积分系统 API 封装
+ * 对齐后端 staging 实测最终契约（2026-09-16）
+ *
+ * 当前 POINTS_API_MOCK=true：使用 MOCK_* 常量 + setTimeout 模拟延迟，
+ * 等后端 P0（支付通道接入、change-plan 校验）稳定后切 false 联调。
+ *
+ * 会员/订阅 API 在 @/api/subscription 中定义，避免重复封装。
  */
 import apiClient from "../client"
 import type {
   PointsBalance,
-  PointsTransaction,
-  PointsTransactionsParams,
-  PointsTransactionsResponse,
-  PointsPackagesResponse,
-  PointsRechargeRequest,
-  PointsOrder,
   PointsRulesResponse,
+  PointsPackagesResponse,
+  PointsTransaction,
+  PointsTransactionsResponse,
   PointsCheckRequest,
   PointsCheckResponse,
-  SubscriptionCurrent,
-  SubscribeRequest,
-  SubscriptionPlan,
+  CreateRechargeOrderRequest,
+  CreateRechargeOrderResponse,
+  DailyUsage,
+  MembershipResponse,
 } from "./types"
 
-/**
- * 是否启用 mock 数据（后端 PR 合入前为 true；对接真实接口后改为 false）
- */
-export const POINTS_API_MOCK = true
+/** 模拟网络延迟（ms） */
+const MOCK_DELAY = 500
 
-// ==================== Mock 数据 ====================
+/* ================================================================
+ * Mock 数据
+ * ================================================================ */
+
+/** mock 余额（无 free_clips_* 字段，已拆分到 dailyUsage） */
 const MOCK_BALANCE: PointsBalance = {
-  balance: 580,
-  total_earned: 1200,
-  total_spent: 620,
+  balance: 258,
+  total_earned: 500,
+  total_spent: 242,
   is_member: false,
   member_type: null,
   member_expires_at: null,
-  free_clips_used: 1,
-  free_clips_limit: 2,
-  free_clips_remaining: 1,
-}
-
-const MOCK_PACKAGES: PointsPackagesResponse = {
-  packages: [
-    {
-      id: "starter_pack",
-      name: "体验包",
-      points: 100,
-      price: 990,
-      discounted_price_for_free: 990,
-      discounted_price_for_monthly: 891,
-      discounted_price_for_quarterly: 861,
-      discounted_price_for_yearly: 792,
-    },
-    {
-      id: "basic_pack",
-      name: "基础包",
-      points: 500,
-      price: 3900,
-      discounted_price_for_free: 3900,
-      discounted_price_for_monthly: 3510,
-      discounted_price_for_quarterly: 3393,
-      discounted_price_for_yearly: 3120,
-    },
-    {
-      id: "pro_pack",
-      name: "专业包",
-      points: 2000,
-      price: 12900,
-      discounted_price_for_free: 12900,
-      discounted_price_for_monthly: 11610,
-      discounted_price_for_quarterly: 11223,
-      discounted_price_for_yearly: 10320,
-    },
-  ],
-  user_member_type: "free",
-  unit_price_yuan: 0.1,
 }
 
 const MOCK_RULES: PointsRulesResponse = {
   rules: [
     {
       scene_key: "ai_voice",
-      scene_name: "AI 配音",
-      points_per_use: 1,
-      unit: "分钟",
-      description: "每生成 1 分钟配音",
+      name: "AI 配音",
+      base_points: 2,
+      unit: "次",
+      description: "单次配音消耗 2 积分，超 30 秒每 30 秒 +1 积分",
+      extra_per_30s: 1,
     },
     {
       scene_key: "ai_video",
-      scene_name: "智能混剪",
-      points_per_use: 3,
+      name: "AI 视频生成",
+      base_points: 8,
       unit: "条",
-      extra_per_30s: 1,
-      description: "每条 ≤30s 3 积分，每加 30s +1",
+      description: "单条视频 8 积分起，按视频时长加收",
+      extra_per_30s: 3,
     },
     {
       scene_key: "ai_digital_human",
-      scene_name: "AI 数字人",
-      points_per_use: 15,
-      unit: "分钟",
-      description: "每生成 1 分钟口播",
+      name: "AI 数字人",
+      base_points: 15,
+      unit: "次",
+      description: "数字人生成 15 积分起",
+      extra_per_30s: 5,
     },
     {
       scene_key: "voice_clone_train",
-      scene_name: "声音克隆训练",
-      points_per_use: 0,
+      name: "声音克隆训练",
+      base_points: 20,
       unit: "次",
-      description: "训练免费",
+      description: "声音模型训练一次性消耗 20 积分",
+    },
+    {
+      scene_key: "voice_clone_synth",
+      name: "声音克隆合成",
+      base_points: 3,
+      unit: "次",
+      description: "使用克隆声音合成音频每次 3 积分",
+    },
+    {
+      scene_key: "douyin_extract",
+      name: "抖音文案提取",
+      base_points: 1,
+      unit: "次",
+      description: "提取抖音视频文案每次 1 积分",
+    },
+    {
+      scene_key: "ai_rewrite",
+      name: "AI 文案改写",
+      base_points: 2,
+      unit: "次",
+      description: "AI 改写文案每次 2 积分",
+    },
+    {
+      scene_key: "ai_title",
+      name: "AI 标题生成",
+      base_points: 1,
+      unit: "次",
+      description: "AI 生成标题每次 1 积分，一次生成多条",
+    },
+    {
+      scene_key: "ai_cover",
+      name: "AI 封面生成",
+      base_points: 3,
+      unit: "次",
+      description: "AI 生成封面每次 3 积分",
     },
-    { scene_key: "voice_clone_synth", scene_name: "声音克隆合成", points_per_use: 1, unit: "分钟" },
-    { scene_key: "douyin_extract", scene_name: "抖音链接提取", points_per_use: 1, unit: "次" },
-    { scene_key: "ai_rewrite", scene_name: "AI 改写文案", points_per_use: 1, unit: "次" },
-    { scene_key: "ai_title", scene_name: "AI 标题生成", points_per_use: 1, unit: "次" },
-    { scene_key: "ai_cover", scene_name: "AI 封面生成", points_per_use: 1, unit: "张" },
   ],
   free_user_multiplier: 1.15,
-  note: "免费用户消耗 = 会员消耗 × 1.15，向上取整",
 }
 
-function genMockTransactions(): PointsTransactionsResponse {
-  const now = new Date()
-  const list = [
+const MOCK_PACKAGES: PointsPackagesResponse = {
+  packages: [
+    { code: "points_100", name: "100 积分", points: 100, price_cents: 990, unit_price: 0.099 },
+    { code: "points_500", name: "500 积分", points: 500, price_cents: 4490, unit_price: 0.0898 },
+    { code: "points_1000", name: "1000 积分", points: 1000, price_cents: 7990, unit_price: 0.0799 },
     {
-      src: "ai_voice",
-      name: "AI 配音",
-      type: "spend" as const,
-      amt: 1,
-      desc: "生成配音 1 分钟",
-      days: 0,
-      hours: 0,
-      mins: 30,
+      code: "points_3000",
+      name: "3000 积分",
+      points: 3000,
+      price_cents: 19900,
+      unit_price: 0.0663,
     },
-    {
-      src: "ai_video",
-      name: "智能混剪",
-      type: "spend" as const,
-      amt: 5,
-      desc: "生成 1 分钟视频（基础3+30s*2）",
-      days: 0,
-      hours: 1,
-      mins: 15,
-    },
-    {
-      src: "task_reward",
-      name: "任务奖励",
-      type: "earn" as const,
-      amt: 20,
-      desc: "首次生成视频奖励",
-      days: 1,
-      hours: 0,
-      mins: 0,
-    },
-    {
-      src: "recharge",
-      name: "充值",
-      type: "earn" as const,
-      amt: 500,
-      desc: "基础包充值",
-      days: 15,
-      hours: 0,
-      mins: 0,
-    },
-    {
-      src: "ai_rewrite",
-      name: "AI 改写文案",
-      type: "spend" as const,
-      amt: 2,
-      desc: "免费用户价（1×1.15 向上取整）",
-      days: 16,
-      hours: 2,
-      mins: 10,
-    },
-    {
-      src: "ai_title",
-      name: "AI 标题生成",
-      type: "spend" as const,
-      amt: 2,
-      desc: "免费用户价",
-      days: 16,
-      hours: 3,
-      mins: 0,
-    },
-    {
-      src: "douyin_extract",
-      name: "抖音链接提取",
-      type: "spend" as const,
-      amt: 2,
-      desc: "提取 3 分钟文案",
-      days: 18,
-      hours: 0,
-      mins: 0,
-    },
-    {
-      src: "ai_digital_human",
-      name: "AI 数字人",
-      type: "spend" as const,
-      amt: 18,
-      desc: "数字人口播 1 分钟（免费用户价）",
-      days: 20,
-      hours: 0,
-      mins: 0,
-    },
-    {
-      src: "task_reward",
-      name: "任务奖励",
-      type: "earn" as const,
-      amt: 50,
-      desc: "注册赠送",
-      days: 30,
-      hours: 0,
-      mins: 0,
-    },
-  ]
-  let bal = MOCK_BALANCE.balance
-  const items = list
-    .map((t, i) => {
-      const signed = t.type === "earn" ? t.amt : -t.amt
-      const balance_after = bal // 按时间倒序：earliest 先算
-      // adjust running bal
-      bal = t.type === "earn" ? bal - t.amt : bal + t.amt
-      const d = new Date(now)
-      d.setDate(d.getDate() - t.days)
-      d.setHours(d.getHours() - t.hours)
-      d.setMinutes(d.getMinutes() - t.mins)
-      return {
-        id: `tx_${i + 1}`,
-        type: t.type,
-        source: t.src as PointsBalance extends never ? never : string,
-        source_name: t.name,
-        amount: t.amt,
-        signed_amount: signed,
-        balance_after,
-        description: t.desc,
-        ref_id: null,
-        created_at: d.toISOString(),
-      }
-    })
-    .reverse()
-  // Rebuild balance_after going forward
-  let running = 50 + 0 // after registration gift
-  for (let i = items.length - 1; i >= 0; i--) {
-    const it = items[i] as PointsTransaction & { balance_after?: number }
-    if (it.source === "task_reward" && it.description.includes("注册")) running = 50
-  }
-  running = 50
-  const fwd = [...items].reverse() as Array<PointsTransaction & { balance_after?: number }>
-  for (const it of fwd) {
-    running += it.signed_amount
-    it.balance_after = running
-  }
-  return { items: fwd, total: fwd.length, page: 1, page_size: 20 } as PointsTransactionsResponse
+  ],
+  user_discount: null,
 }
 
-// ==================== 真实 API ====================
-
-/** 查询积分余额 + 会员状态 */
-export async function getPointsBalance(): Promise<PointsBalance> {
-  if (POINTS_API_MOCK) {
-    return new Promise((r) => setTimeout(() => r({ ...MOCK_BALANCE }), 180))
-  }
-  const res = await apiClient.get("/points/balance")
-  return res.data
-}
-
-/** 查询积分流水（分页） */
-export async function getPointsTransactions(
-  params: PointsTransactionsParams = {},
-): Promise<PointsTransactionsResponse> {
-  if (POINTS_API_MOCK) {
-    return new Promise((r) => setTimeout(() => r(genMockTransactions()), 200))
-  }
-  const res = await apiClient.get("/points/transactions", { params })
-  return res.data
-}
-
-/** 查询积分包列表 */
-export async function getPointsPackages(): Promise<PointsPackagesResponse> {
-  if (POINTS_API_MOCK) {
-    return new Promise((r) => setTimeout(() => r({ ...MOCK_PACKAGES }), 150))
-  }
-  const res = await apiClient.get("/points/packages")
-  return res.data
-}
-
-/** 创建积分充值订单（mock 阶段返回 "pending" 订单，前端弹"支付开发中"） */
-export async function createPointsOrder(req: PointsRechargeRequest): Promise<PointsOrder> {
-  if (POINTS_API_MOCK) {
-    const pkg = MOCK_PACKAGES.packages.find((p) => p.id === req.package_id)
-    const mt = MOCK_PACKAGES.user_member_type
-    type DiscountKey =
-      | "discounted_price_for_free"
-      | "discounted_price_for_monthly"
-      | "discounted_price_for_quarterly"
-      | "discounted_price_for_yearly"
-    const discountKey = `discounted_price_for_${mt}` as DiscountKey
-    const price = pkg?.[discountKey] ?? pkg?.price ?? 0
-    return new Promise((r) =>
-      setTimeout(
-        () =>
-          r({
-            id: `mock_order_${Date.now()}`,
-            package_id: req.package_id,
-            package_name: pkg?.name ?? "",
-            points_amount: pkg?.points ?? 0,
-            price_cents: price,
-            original_price_cents: pkg?.price ?? 0,
-            discount: price / (pkg?.price || 1),
-            currency: "CNY",
-            status: "pending",
-            payment_method: null,
-            payment_id: null,
-            paid_at: null,
-            expire_at: null,
-            created_at: new Date().toISOString(),
-          }),
-        300,
-      ),
-    )
-  }
-  const res = await apiClient.post("/points/recharge", req)
-  return res.data
-}
-
-/** 查询积分消耗规则 */
-export async function getPointsRules(): Promise<PointsRulesResponse> {
-  if (POINTS_API_MOCK) {
-    return new Promise((r) => setTimeout(() => r({ ...MOCK_RULES }), 120))
-  }
-  const res = await apiClient.get("/points/rules")
-  return res.data
-}
-
-/** 消费前余额预检查 */
-export async function checkPoints(req: PointsCheckRequest): Promise<PointsCheckResponse> {
-  if (POINTS_API_MOCK) {
-    const rule = MOCK_RULES.rules.find((r) => r.scene_key === req.scene_key)
-    if (!rule) {
-      return {
-        allowed: false,
-        required_points: 0,
-        current_balance: MOCK_BALANCE.balance,
-        remaining_after: MOCK_BALANCE.balance,
-        is_free_quota: false,
-        code: "SCENE_NOT_FOUND",
-        message: "未知场景",
-        recharge_url: "/app/points",
-      }
-    }
-    const units = req.units ?? 1
-    let base = rule.points_per_use * units
-    if (rule.extra_per_30s && units > 1) {
-      // ai_video extra_per_30s: base already covers first 30s, subtract
-      base = rule.points_per_use + rule.extra_per_30s * (units - 1)
-    }
-    const isFree =
-      MOCK_BALANCE.is_member === false &&
-      req.scene_key === "ai_video" &&
-      (MOCK_BALANCE.free_clips_remaining ?? 0) > 0
-    const needed = isFree
-      ? 0
-      : MOCK_BALANCE.is_member
-        ? base
-        : Math.ceil(base * MOCK_RULES.free_user_multiplier)
-    const allowed = isFree || MOCK_BALANCE.balance >= needed
-    return {
-      allowed,
-      required_points: needed,
-      current_balance: MOCK_BALANCE.balance,
-      remaining_after: MOCK_BALANCE.balance - needed,
-      is_free_quota: isFree,
-      code: allowed ? undefined : "INSUFFICIENT_POINTS",
-      message: allowed
-        ? undefined
-        : `积分不足，需要 ${needed} 积分，当前余额 ${MOCK_BALANCE.balance}`,
-      recharge_url: "/app/points",
-    }
-  }
-  const res = await apiClient.post("/points/check", req)
-  return res.data
-}
-
-// ==================== 订阅相关 ====================
-
-/** 订阅套餐（定价常量，前端硬编码；折扣由后端会员类型决定） */
-export const SUBSCRIPTION_PLANS: SubscriptionPlan[] = [
+const MOCK_TRANSACTIONS: PointsTransaction[] = [
   {
-    id: "monthly",
-    name: "月卡",
-    price_cents: 1990,
-    price_yuan: 19.9,
-    per_month_yuan: 19.9,
-    billing_label: "/月",
+    id: 1,
+    type: "deduct",
+    source: "ai_video",
+    amount: 10,
+    balance_after: 248,
+    description: "AI 视频生成 ×1（非会员倍率）",
+    ref_id: "task_abc123",
+    created_at: "2026-09-16T08:30:00Z",
   },
   {
-    id: "quarterly",
-    name: "季卡",
-    price_cents: 3990,
-    price_yuan: 39.9,
-    per_month_yuan: 13.3,
-    savings_percent: 33,
-    recommended: true,
-    billing_label: "/季",
+    id: 2,
+    type: "add",
+    source: "recharge",
+    amount: 100,
+    balance_after: 258,
+    description: "充值 100 积分",
+    ref_id: "order_xyz789",
+    created_at: "2026-09-15T14:20:00Z",
   },
   {
-    id: "yearly",
-    name: "年卡",
-    price_cents: 15900,
-    price_yuan: 159,
-    per_month_yuan: 13.25,
-    savings_percent: 33,
-    billing_label: "/年",
+    id: 3,
+    type: "deduct",
+    source: "ai_voice",
+    amount: 3,
+    balance_after: 158,
+    description: "AI 配音 ×1（45s 加收）",
+    ref_id: "",
+    created_at: "2026-09-15T10:15:00Z",
+  },
+  {
+    id: 4,
+    type: "add",
+    source: "sign_up",
+    amount: 60,
+    balance_after: 161,
+    description: "新用户注册赠送",
+    ref_id: "",
+    created_at: "2026-09-10T09:00:00Z",
+  },
+  {
+    id: 5,
+    type: "deduct",
+    source: "ai_title",
+    amount: 1,
+    balance_after: 101,
+    description: "AI 标题生成 ×1",
+    ref_id: "",
+    created_at: "2026-09-14T16:45:00Z",
   },
 ]
 
-/** 查询当前订阅 */
-export async function getCurrentSubscription(): Promise<SubscriptionCurrent> {
-  if (POINTS_API_MOCK) {
-    return new Promise((r) =>
-      setTimeout(
-        () =>
-          r({
-            is_member: MOCK_BALANCE.is_member,
-            member_type: MOCK_BALANCE.member_type,
-            member_type_name: MOCK_BALANCE.is_member ? "付费会员" : "免费会员",
-            status: MOCK_BALANCE.is_member ? "active" : "none",
-            current_period_start: null,
-            current_period_end: MOCK_BALANCE.member_expires_at,
-            auto_renew: false,
-            points_discount: MOCK_BALANCE.is_member ? 0.9 : 1.0,
-          }),
-        150,
-      ),
-    )
-  }
-  const res = await apiClient.get("/subscription/current")
-  return res.data
+const MOCK_DAILY_USAGE: DailyUsage = {
+  free_clips_used: 1,
+  free_clips_limit: 3,
+  free_clips_remaining: 2,
+  reset_at: new Date(Date.now() + 8 * 3600_000).toISOString(),
 }
 
-/** 开通/续费会员 */
-export async function subscribe(req: SubscribeRequest): Promise<PointsOrder> {
-  if (POINTS_API_MOCK) {
-    const plan = SUBSCRIPTION_PLANS.find((p) => p.id === req.member_type)!
-    return new Promise((r) =>
-      setTimeout(
-        () =>
-          r({
-            id: `mock_sub_${Date.now()}`,
-            package_id: plan.id,
-            package_name: plan.name,
-            points_amount: 0,
-            price_cents: plan.price_cents,
-            original_price_cents: plan.price_cents,
-            discount: 1,
-            currency: "CNY",
-            status: "pending",
-            payment_method: null,
-            payment_id: null,
-            paid_at: null,
-            expire_at: null,
-            created_at: new Date().toISOString(),
-          }),
-        300,
-      ),
-    )
-  }
-  const res = await apiClient.post("/subscription/subscribe", req)
-  return res.data
+const MOCK_MEMBERSHIP: MembershipResponse = {
+  is_member: false,
+  member_type: null,
+  member_expires_at: null,
+  points_balance: 258,
+  max_resolution: "720p",
 }
 
-/** 取消自动续费 */
-export async function cancelAutoRenew(): Promise<{ success: boolean; message: string }> {
-  if (POINTS_API_MOCK) {
-    return new Promise((r) =>
-      setTimeout(() => r({ success: true, message: "已取消自动续费" }), 200),
-    )
+/* ================================================================
+ * 积分 API
+ * ================================================================ */
+
+/** 获取积分余额 */
+export async function getPointsBalance(): Promise<PointsBalance> {
+  if (process.env.POINTS_API_MOCK === "true") {
+    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
+    return { ...MOCK_BALANCE }
   }
-  const res = await apiClient.post("/subscription/cancel")
-  return res.data
+  const { data } = await apiClient.get(`/points/balance`)
+  return data
+}
+
+/** 获取积分消耗规则 */
+export async function getPointsRules(): Promise<PointsRulesResponse> {
+  if (process.env.POINTS_API_MOCK === "true") {
+    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
+    return { rules: [...MOCK_RULES.rules], free_user_multiplier: MOCK_RULES.free_user_multiplier }
+  }
+  const { data } = await apiClient.get(`/points/rules`)
+  return data
+}
+
+/** 获取充值包列表 */
+export async function getPointsPackages(): Promise<PointsPackagesResponse> {
+  if (process.env.POINTS_API_MOCK === "true") {
+    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
+    return { packages: MOCK_PACKAGES.packages.map((p) => ({ ...p })), user_discount: null }
+  }
+  const { data } = await apiClient.get(`/points/packages`)
+  return data
+}
+
+/**
+ * 获取积分流水（分页）
+ */
+export async function getPointsTransactions(
+  page = 1,
+  pageSize = 20,
+): Promise<PointsTransactionsResponse> {
+  if (process.env.POINTS_API_MOCK === "true") {
+    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
+    const start = (page - 1) * pageSize
+    const items = MOCK_TRANSACTIONS.slice(start, start + pageSize)
+    return {
+      items: items.map((t) => ({ ...t })),
+      total: MOCK_TRANSACTIONS.length,
+      page,
+      page_size: pageSize,
+    }
+  }
+  const { data } = await apiClient.get(`/points/transactions`, {
+    params: { page, page_size: pageSize },
+  })
+  return data
+}
+
+/**
+ * 创建充值订单
+ * 注意：当前 pay_params 返回空对象 {}（支付通道未接入），
+ * 前端可以完成订单创建 UI，但无法发起真实支付，待后续支付通道接入后联调。
+ */
+export async function createPointsOrder(
+  data: CreateRechargeOrderRequest,
+): Promise<CreateRechargeOrderResponse> {
+  if (process.env.POINTS_API_MOCK === "true") {
+    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY * 2))
+    const pkg = MOCK_PACKAGES.packages.find((p) => p.code === data.package_id)
+    if (!pkg) throw new Error("充值包不存在")
+    return {
+      id: `mock_order_${Date.now()}`,
+      order_type: "points_recharge",
+      product_code: pkg.code,
+      amount_cents: pkg.price_cents,
+      points_amount: pkg.points,
+      status: "pending",
+      pay_params: {},
+      expire_at: new Date(Date.now() + 30 * 60_000).toISOString(),
+      created_at: new Date().toISOString(),
+    }
+  }
+  const { data: d } = await apiClient.post(`/points/recharge`, data)
+  return d
+}
+
+/**
+ * 积分预检查（消耗前调用）
+ */
+export async function checkPoints(data: PointsCheckRequest): Promise<PointsCheckResponse> {
+  if (process.env.POINTS_API_MOCK === "true") {
+    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
+    const rule = MOCK_RULES.rules.find((r) => r.scene_key === data.scene_key)
+    if (!rule) {
+      throw {
+        error: {
+          code: 400,
+          message: `未知场景：${data.scene_key}`,
+          valid_scenes: MOCK_RULES.rules.map((r) => r.scene_key),
+        },
+      }
+    }
+    const durationExtra =
+      data.duration_minutes && data.duration_minutes > 0.5 && rule.extra_per_30s
+        ? Math.ceil((data.duration_minutes * 60 - 30) / 30) * rule.extra_per_30s
+        : 0
+    const base = (rule.base_points + durationExtra) * data.quantity
+    const balance = MOCK_BALANCE.balance
+    const multiplier = MOCK_BALANCE.is_member ? 1 : MOCK_RULES.free_user_multiplier
+    const required = Math.ceil(base * multiplier)
+    // 免费额度抵扣
+    const isFreeQuota = !MOCK_BALANCE.is_member && MOCK_DAILY_USAGE.free_clips_remaining > 0
+    const finalRequired = isFreeQuota ? 0 : required
+    return {
+      allowed: balance >= finalRequired,
+      required_points: finalRequired,
+      current_balance: balance,
+      remaining_after: balance - finalRequired,
+      is_free_quota: isFreeQuota,
+    }
+  }
+  const { data: d2 } = await apiClient.post(`/points/check`, data)
+  return d2
+}
+
+/* ================================================================
+ * 每日免费额度 + 会员聚合信息（新接口）
+ * ================================================================ */
+
+/** 获取每日免费额度使用情况 */
+export async function getDailyUsage(): Promise<DailyUsage> {
+  if (process.env.POINTS_API_MOCK === "true") {
+    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
+    return { ...MOCK_DAILY_USAGE }
+  }
+  const { data } = await apiClient.get(`/usage/daily`)
+  return data
+}
+
+/** 获取会员聚合信息（创作页可用来判断 max_resolution） */
+export async function getMembership(): Promise<MembershipResponse> {
+  if (process.env.POINTS_API_MOCK === "true") {
+    await new Promise((resolve) => setTimeout(resolve, MOCK_DELAY))
+    return { ...MOCK_MEMBERSHIP }
+  }
+  const { data } = await apiClient.get(`/points/subscription/membership`)
+  return data
 }

apps/web/src/api/points/types.ts

@@ -1,76 +1,134 @@
 /**
- * 积分 & 会员系统 API 类型定义（v2 两档会员制）
- * 接口契约对齐后端设计文档 membership-points-design-v2.md
+ * 积分系统类型定义
+ * 对齐后端 staging 实测最终契约（2026-09-16）
+ *
+ * Base path: /api/v1/
+ * 会员/订阅相关类型请从 @/api/subscription/types 引入，本文件仅保留积分核心类型。
  */
 
-/** 会员类型 */
-export type MemberType = "free" | "monthly" | "quarterly" | "yearly"
-
-/** 积分流水类型 */
-export type PointsTxType = "earn" | "spend" | "refund"
-
-/** 积分来源/消耗场景 */
+/* ================================================================
+ * 场景键
+ * ================================================================ */
+/**
+ * 积分消耗场景键（9 个）
+ * - ai_script 已拆分为 douyin_extract / ai_rewrite / ai_title，前端禁止再传 ai_script
+ */
 export type PointsSource =
-  | "recharge" // 充值
-  | "task_reward" // 任务奖励
   | "ai_voice" // AI 配音
+  | "ai_video" // AI 视频生成
   | "ai_digital_human" // AI 数字人
-  | "ai_video" // 智能混剪
   | "voice_clone_train" // 声音克隆训练
   | "voice_clone_synth" // 声音克隆合成
-  | "douyin_extract" // 抖音链接提取
-  | "ai_rewrite" // AI 改写文案
+  | "douyin_extract" // 抖音提取文案
+  | "ai_rewrite" // AI 文案改写
   | "ai_title" // AI 标题生成
   | "ai_cover" // AI 封面生成
-  | "subscription_bonus" // 会员赠送
-  | "admin_adjust" // 管理员调整
-  | "refund" // 失败退还
 
-/** 会员 & 积分余额响应 */
+/** 非消耗场景 source 前缀（用于流水 source 字段） */
+export type PointsSourceExtra =
+  PointsSource | `refund:${string}` | "recharge" | "sign_up" | "bind_phone" | "gift" | "admin"
+
+/* ================================================================
+ * 通用
+ * ================================================================ */
+/** ISO 8601 时间字符串 */
+export type ISODate = string
+
+/* ================================================================
+ * 积分余额（GET /points/balance）
+ * ================================================================ */
 export interface PointsBalance {
   /** 当前可用积分 */
   balance: number
-  /** 累计获得 */
+  /** 累计获得积分 */
   total_earned: number
-  /** 累计消耗 */
+  /** 累计消耗积分 */
   total_spent: number
-  /** 是否付费会员（free 用户为 false） */
+  /** 是否为付费会员 */
   is_member: boolean
-  /** 会员类型：monthly / quarterly / yearly；free 用户为 null */
-  member_type: Extract<MemberType, "monthly" | "quarterly" | "yearly"> | null
-  /** 会员到期时间 ISO 字符串 */
-  member_expires_at: string | null
-  /** 今日免费混剪已用次数 */
-  free_clips_used?: number
-  /** 今日免费混剪额度上限 */
-  free_clips_limit?: number
-  /** 今日免费混剪剩余 */
-  free_clips_remaining?: number
+  /** 会员类型（monthly/quarterly/yearly，非会员 null）。推荐使用 /subscription/current 的 plan_id+billing_cycle 做判断 */
+  member_type: "monthly" | "quarterly" | "yearly" | null
+  /** 会员到期时间 */
+  member_expires_at: ISODate | null
 }
 
-/** 积分流水记录 */
+/* ================================================================
+ * 积分规则（GET /points/rules）
+ * ================================================================ */
+export interface PointsRule {
+  scene_key: PointsSource
+  /** 场景中文名 */
+  name: string
+  /** 基准消耗积分（points_per_use 改名） */
+  base_points: number
+  /** 单位描述，如「次」「分钟」「个」 */
+  unit: string
+  /** 超过30秒后每30秒额外积分（视频/语音类） */
+  extra_per_30s?: number
+  /** 场景说明（后端已补回） */
+  description?: string
+}
+
+export interface PointsRulesResponse {
+  rules: PointsRule[]
+  /** 非会员消耗倍率（如 1.15） */
+  free_user_multiplier: number
+}
+
+/* ================================================================
+ * 充值包（GET /points/packages）
+ * ================================================================ */
+export interface PointsPackage {
+  /** 包编码（id 改名） */
+  code: string
+  name: string
+  points: number
+  /** 原价，单位分 */
+  price_cents: number
+  /** 每积分单价（元），展示用 */
+  unit_price: number
+}
+
+export interface PointsPackagesResponse {
+  packages: PointsPackage[]
+  /** 当前用户折扣（会员折扣或活动折扣），null 表示无折扣 */
+  user_discount: number | null
+}
+
+/**
+ * 充值包前端展示辅助：折后价（分）
+ * 后端废弃 4 档 discounted_price_for_*，前端按 price_cents * (user_discount ?? 1) 计算。
+ */
+export function getDiscountPriceCents(pkg: PointsPackage, userDiscount: number | null): number {
+  return Math.round(pkg.price_cents * (userDiscount ?? 1))
+}
+
+/* ================================================================
+ * 积分流水（GET /points/transactions）
+ * ================================================================ */
+export type PointsTxType = "add" | "deduct"
+
 export interface PointsTransaction {
-  id: string
-  /** earn / spend / refund */
+  id: number
+  /** 流水类型：add=获得/退款，deduct=消耗 */
   type: PointsTxType
-  /** 来源场景 */
-  source: PointsSource
-  /** 场景中文名称 */
-  source_name: string
-  /** 变动数量（正数） */
+  /**
+   * 消耗/获得来源：
+   * - 消耗场景直接用 PointsSource 值
+   * - 充值/退款/赠送使用 recharge / refund:<source> / sign_up / bind_phone / gift / admin
+   */
+  source: string
+  /** 变动数量（绝对值，正负由 type 决定） */
   amount: number
-  /** 带符号的变动数（收入+，支出-） */
-  signed_amount: number
   /** 变动后余额 */
   balance_after: number
-  /** 备注描述 */
+  /** 中文描述 */
   description: string
-  /** 关联业务 ID */
-  ref_id: string | null
-  created_at: string
+  /** 关联订单/任务 ID，空字符串 "" 表示无关联（不是 null） */
+  ref_id: string
+  created_at: ISODate
 }
 
-/** 积分流水分页响应 */
 export interface PointsTransactionsResponse {
   items: PointsTransaction[]
   total: number
@@ -78,140 +136,92 @@ export interface PointsTransactionsResponse {
   page_size: number
 }
 
-/** 积分流水查询参数 */
-export interface PointsTransactionsParams {
-  page?: number
-  page_size?: number
-  type?: PointsTxType
-  source?: PointsSource
-  start_date?: string
-  end_date?: string
-}
-
-/** 积分包 */
-export interface PointsPackage {
-  id: "starter_pack" | "basic_pack" | "pro_pack" | string
-  /** 中文名称 */
-  name: string
-  /** 积分数量 */
-  points: number
-  /** 原价（分） */
-  price: number
-  /** 各会员类型折扣价（分） */
-  discounted_price_for_free: number
-  discounted_price_for_monthly: number
-  discounted_price_for_quarterly: number
-  discounted_price_for_yearly: number
-}
-
-/** 积分包列表响应 */
-export interface PointsPackagesResponse {
-  packages: PointsPackage[]
-  /** 当前用户会员类型，用于前端计算折后价 */
-  user_member_type: MemberType
-  /** 积分单价（元/积分，按会员价计） */
-  unit_price_yuan: number
-}
-
-/** 创建充值订单请求 */
-export interface PointsRechargeRequest {
+/* ================================================================
+ * 创建充值订单（POST /points/recharge）
+ * ================================================================ */
+export interface CreateRechargeOrderRequest {
+  /** 充值包 code（字段名保留 package_id 与后端一致） */
   package_id: string
-  payment_method?: "wechat_pay" | "alipay"
 }
 
-/** 订单状态 */
-export type OrderStatus = "pending" | "paid" | "failed" | "refunded" | "expired"
-
-/** 充值订单响应 */
-export interface PointsOrder {
+export interface CreateRechargeOrderResponse {
   id: string
-  package_id: string
-  package_name: string
+  order_type: string
+  product_code: string
+  /** 订单金额（分） */
+  amount_cents: number
+  /** 充值积分数量 */
   points_amount: number
-  price_cents: number
-  original_price_cents: number
-  discount: number
-  currency: "CNY"
-  status: OrderStatus
-  payment_method: string | null
-  payment_id: string | null
-  paid_at: string | null
-  expire_at: string | null
-  created_at: string
-  /** 微信/支付宝支付参数（mock 阶段前端自行处理） */
-  pay_params?: Record<string, string>
+  status: string
+  /**
+   * 支付参数（支付通道未接入时返回空对象 {}，前端可透传）
+   */
+  pay_params: Record<string, unknown>
+  /** 订单过期时间 */
+  expire_at: ISODate
+  created_at: ISODate
 }
 
-/** 订阅套餐（月/季/年） */
-export interface SubscriptionPlan {
-  id: "monthly" | "quarterly" | "yearly"
-  name: string
-  price_cents: number
-  price_yuan: number
-  per_month_yuan: number
-  savings_percent?: number
-  recommended?: boolean
-  billing_label: string
-}
-
-/** 当前订阅详情 */
-export interface SubscriptionCurrent {
-  is_member: boolean
-  member_type: Extract<MemberType, "monthly" | "quarterly" | "yearly"> | null
-  member_type_name: string
-  status: "active" | "expired" | "cancelled" | "none"
-  current_period_start: string | null
-  current_period_end: string | null
-  auto_renew: boolean
-  /** 订阅会员对应的积分折扣 */
-  points_discount: number
-}
-
-/** 开通/续费订阅请求 */
-export interface SubscribeRequest {
-  member_type: "monthly" | "quarterly" | "yearly"
-  payment_method?: "wechat_pay" | "alipay"
-}
-
-/** 积分消耗规则 */
-export interface PointsRule {
-  scene_key: PointsSource
-  scene_name: string
-  /** 每次消耗基础积分（会员价） */
-  points_per_use: number
-  /** 计量单位：条/分钟/次/张 */
-  unit: string
-  /** 额外每 30s 加积分（ai_video 用） */
-  extra_per_30s?: number
-  /** 说明文案 */
-  description?: string
-}
-
-export interface PointsRulesResponse {
-  rules: PointsRule[]
-  /** 免费用户消耗倍率 */
-  free_user_multiplier: number
-  note: string
-}
-
-/** 消费前余额检查请求 */
+/* ================================================================
+ * 积分预检查（POST /points/check）
+ * ================================================================ */
 export interface PointsCheckRequest {
   scene_key: PointsSource
-  /** 单位数量（时长/条数），默认 1 */
-  units?: number
+  /** 数量（units 改名） */
+  quantity: number
+  /** 预计时长（分钟），可选 */
+  duration_minutes?: number
 }
 
-/** 消费前余额检查响应 */
 export interface PointsCheckResponse {
+  /** 是否可以执行 */
   allowed: boolean
+  /** 需要消耗积分 */
   required_points: number
+  /** 当前余额 */
   current_balance: number
+  /** 扣除后剩余 */
   remaining_after: number
-  /** 是否走免费额度（混剪场景） */
+  /** 是否走免费额度 */
   is_free_quota: boolean
-  /** 拒绝原因代码 */
-  code?: "INSUFFICIENT_POINTS" | "FREE_QUOTA_EXCEEDED" | "SCENE_NOT_FOUND"
-  message?: string
-  /** 充值页跳转 URL */
-  recharge_url?: string
+}
+
+/* ================================================================
+ * 每日使用情况（GET /usage/daily，新接口）
+ * ================================================================ */
+export interface DailyUsage {
+  /** 今日已用免费次数 */
+  free_clips_used: number
+  /** 每日免费次数上限 */
+  free_clips_limit: number
+  /** 今日剩余免费次数 */
+  free_clips_remaining: number
+  /** 额度重置时间 */
+  reset_at: ISODate
+}
+
+/* ================================================================
+ * 会员聚合信息（GET /points/subscription/membership，新接口）
+ * ================================================================ */
+export interface MembershipResponse {
+  is_member: boolean
+  /** 会员类型（monthly/quarterly/yearly，非会员 null） */
+  member_type: "monthly" | "quarterly" | "yearly" | null
+  member_expires_at: ISODate | null
+  /** 当前积分余额（冗余，可与 balance 互校） */
+  points_balance: number
+  /** 最大分辨率，如 "720p" / "1080p" / "4k" */
+  max_resolution: string
+}
+
+/* ================================================================
+ * 错误响应（统一格式 {error:{code,message}}）
+ * ================================================================ */
+export interface ApiError {
+  error: {
+    code: number
+    message: string
+    /** 部分场景会返回，如 unknown scene_key */
+    valid_scenes?: PointsSource[]
+  }
 }

apps/web/src/api/subscription/index.ts

@@ -1,24 +1,30 @@
 /**
  * 订阅 API — 目录化入口
- * 保持与原 subscription.ts 相同导出，向后兼容
+ * 对齐后端 staging 最终契约（2026-09-16）
  */
 
 // 类型
 export type {
+  PlanId,
   PlanType,
   SubscriptionStatus,
   BillingStatus,
   BillingCycle,
-  Plan,
   SubscriptionInfo,
+  SubscriptionPlan,
+  SubscriptionPlansResponse,
   BillingRecord,
   ChangePlanRequest,
   ChangePlanResponse,
+  ToggleAutoRenewRequest,
 } from "./types"
 
+export { PLAN_LABEL, BILLING_CYCLE_LABEL } from "./types"
+
 // API 函数
 export {
   getCurrentSubscription,
+  getSubscriptionPlans,
   getBillingRecords,
   changePlan,
   cancelSubscription,

apps/web/src/api/subscription/subscription.ts

@@ -1,47 +1,154 @@
 /**
- * 订阅相关 API 函数
+ * 订阅/会员 API 封装
+ * 对齐后端 staging 实测最终契约（2026-09-16）
+ *
+ * Base path: /api/v1/
+ * 所有请求走 apiClient（已配置 baseURL=/api/v1 和 token 拦截器）。
  */
 import apiClient from "../client"
 import type {
+  SubscriptionInfo,
+  SubscriptionPlan,
+  SubscriptionPlansResponse,
   BillingRecord,
   ChangePlanRequest,
   ChangePlanResponse,
-  SubscriptionInfo,
+  ToggleAutoRenewRequest,
 } from "./types"
 
-/** 获取当前订阅信息 */
-export const getCurrentSubscription = async (): Promise<SubscriptionInfo> => {
-  const response = await apiClient.get("/subscription/current")
-  return response.data
+const MOCK_DELAY = 500
+
+const MOCK_SUBSCRIPTION: SubscriptionInfo = {
+  id: "sub_mock_001",
+  plan_id: "free",
+  plan_name: "免费版",
+  status: "active",
+  billing_cycle: "monthly",
+  current_period_start: new Date(Date.now() - 30 * 86400_000).toISOString(),
+  current_period_end: new Date(Date.now() + 30 * 86400_000).toISOString(),
+  amount: 0,
+  auto_renew: false,
+  created_at: new Date(Date.now() - 30 * 86400_000).toISOString(),
 }
 
-/** 获取账单记录列表 */
+const MOCK_PLANS: SubscriptionPlan[] = [
+  {
+    plan_id: "free",
+    name: "免费版",
+    price_cents: 0,
+    monthly_price_cents: 0,
+    duration_days: 0,
+    points_discount: 1,
+    features: { max_resolution: "720p", free_clips_daily: 3 },
+  },
+  {
+    plan_id: "monthly",
+    name: "月度会员",
+    price_cents: 1990,
+    monthly_price_cents: 1990,
+    duration_days: 30,
+    points_discount: 0.9,
+    features: { max_resolution: "1080p", free_clips_daily: 10 },
+  },
+  {
+    plan_id: "quarterly",
+    name: "季度会员",
+    price_cents: 3990,
+    monthly_price_cents: 1330,
+    duration_days: 90,
+    points_discount: 0.85,
+    features: { max_resolution: "1080p", free_clips_daily: 15 },
+  },
+  {
+    plan_id: "yearly",
+    name: "年度会员",
+    price_cents: 15900,
+    monthly_price_cents: 1325,
+    duration_days: 365,
+    points_discount: 0.8,
+    features: { max_resolution: "4k", free_clips_daily: 30 },
+  },
+]
+
+const MOCK_BILLING: BillingRecord[] = []
+
+const isMock = () => (process.env.POINTS_API_MOCK as string | undefined) === "true"
+
+/** 获取当前订阅 */
+export const getCurrentSubscription = async (): Promise<SubscriptionInfo> => {
+  if (isMock()) {
+    await new Promise((r) => setTimeout(r, MOCK_DELAY))
+    return { ...MOCK_SUBSCRIPTION }
+  }
+  const { data } = await apiClient.get("/subscription/current")
+  return data
+}
+
+/** 获取所有订阅档位 */
+export const getSubscriptionPlans = async (): Promise<SubscriptionPlansResponse> => {
+  if (isMock()) {
+    await new Promise((r) => setTimeout(r, MOCK_DELAY))
+    return { plans: MOCK_PLANS.map((p) => ({ ...p, features: { ...p.features } })) }
+  }
+  const { data } = await apiClient.get("/subscription/plans")
+  return data
+}
+
+/** 获取账单记录 */
 export const getBillingRecords = async (): Promise<BillingRecord[]> => {
-  const response = await apiClient.get("/subscription/billing-records")
-  return response.data
+  if (isMock()) {
+    await new Promise((r) => setTimeout(r, MOCK_DELAY))
+    return MOCK_BILLING.map((r) => ({ ...r }))
+  }
+  const { data } = await apiClient.get("/subscription/billing-records")
+  return data
 }
 
 /** 升级/降级套餐 */
 export const changePlan = async (request: ChangePlanRequest): Promise<ChangePlanResponse> => {
-  const response = await apiClient.post("/subscription/change-plan", request)
-  return response.data
+  if (isMock()) {
+    await new Promise((r) => setTimeout(r, MOCK_DELAY * 2))
+    const plan = MOCK_PLANS.find((p) => p.plan_id === request.target_plan_id)
+    if (!plan) return { success: false, message: "套餐不存在" }
+    const newSub: SubscriptionInfo = {
+      ...MOCK_SUBSCRIPTION,
+      plan_id: plan.plan_id,
+      plan_name: plan.name,
+      billing_cycle: request.billing_cycle,
+      amount: plan.price_cents,
+      status: "pending",
+      current_period_start: new Date().toISOString(),
+      current_period_end: new Date(Date.now() + plan.duration_days * 86400_000).toISOString(),
+      auto_renew: true,
+    }
+    return {
+      success: true,
+      message: "订阅变更成功（mock，支付通道待接入）",
+      new_subscription: newSub,
+    }
+  }
+  const { data } = await apiClient.post("/subscription/change-plan", request)
+  return data
 }
 
-/** 取消订阅 */
-export const cancelSubscription = async (): Promise<{
-  success: boolean
-  message: string
-}> => {
-  const response = await apiClient.post("/subscription/cancel")
-  return response.data
+/** 取消订阅（到期后失效） */
+export const cancelSubscription = async (): Promise<{ success: boolean; message: string }> => {
+  if (isMock()) {
+    await new Promise((r) => setTimeout(r, MOCK_DELAY))
+    return { success: true, message: "已取消订阅，到期后将不再续费" }
+  }
+  const { data } = await apiClient.post("/subscription/cancel")
+  return data
 }
 
 /** 切换自动续费 */
 export const toggleAutoRenew = async (
-  enabled: boolean,
+  req: ToggleAutoRenewRequest,
 ): Promise<{ success: boolean; message: string }> => {
-  const response = await apiClient.post("/subscription/toggle-auto-renew", {
-    enabled,
-  })
-  return response.data
+  if (isMock()) {
+    await new Promise((r) => setTimeout(r, MOCK_DELAY))
+    return { success: true, message: req.enabled ? "已开启自动续费" : "已关闭自动续费" }
+  }
+  const { data } = await apiClient.post("/subscription/toggle-auto-renew", req)
+  return data
 }

apps/web/src/api/subscription/types.ts

@@ -1,65 +1,115 @@
 /**
- * 订阅相关类型定义
+ * 订阅/会员类型定义
+ * 对齐后端 staging 实测最终契约（2026-09-16）
+ *
+ * Base path: /api/v1/
  */
 
-/** 套餐类型 */
-export type PlanType = "free" | "standard" | "pro" | "enterprise"
-
-/** 订阅状态 */
-export type SubscriptionStatus = "active" | "expired" | "cancelled" | "trial"
-
-/** 账单状态 */
-export type BillingStatus = "paid" | "pending" | "failed" | "refunded"
+/** 订阅计划 ID */
+export type PlanId = "free" | "monthly" | "quarterly" | "yearly"
 
 /** 计费周期 */
 export type BillingCycle = "monthly" | "yearly"
 
-/** 套餐信息 */
-export interface Plan {
-  id: PlanType
-  name: string
-  price: number | null
-  yearly_price?: number | null
-  description: string
-  recommended: boolean
-  features: string[]
-}
+/** 订阅状态 */
+export type SubscriptionStatus = "active" | "expired" | "cancelled" | "pending"
 
-/** 当前订阅信息 */
+/** 账单状态 */
+export type BillingStatus = "paid" | "pending" | "failed" | "refunded"
+
+/* ================================================================
+ * 当前订阅（GET /subscription/current）
+ * ================================================================ */
 export interface SubscriptionInfo {
   id: string
-  plan_id: PlanType
+  plan_id: PlanId
   plan_name: string
   status: SubscriptionStatus
+  /** 当前计费周期：monthly 对月卡/季卡按自然月续费；yearly 对年卡 */
   billing_cycle: BillingCycle
   current_period_start: string
   current_period_end: string
+  /** 本期金额（分） */
   amount: number
   auto_renew: boolean
   created_at: string
 }
 
-/** 账单记录 */
+/* ================================================================
+ * 订阅计划（GET /subscription/plans）
+ * ================================================================ */
+export interface SubscriptionPlan {
+  plan_id: PlanId
+  /** 中文名 */
+  name: string
+  /** 价格（分），年卡/季卡为总价 */
+  price_cents: number
+  /** 折算月价（分），对比用 */
+  monthly_price_cents: number
+  /** 时长（天） */
+  duration_days: number
+  /** 积分折扣（0.9 = 9折，1 = 无折扣） */
+  points_discount: number
+  features: {
+    max_resolution: string
+    free_clips_daily: number
+    [key: string]: unknown
+  }
+}
+
+export interface SubscriptionPlansResponse {
+  plans: SubscriptionPlan[]
+}
+
+/* ================================================================
+ * 账单（GET /subscription/billing-records）
+ * ================================================================ */
 export interface BillingRecord {
   id: string
-  plan_name: string
-  amount: number
-  billing_cycle: BillingCycle
+  /** 订单类型：subscribe/renew/upgrade/refund */
+  order_type: string
+  plan_id: PlanId
+  /** 金额（分） */
+  amount_cents: number
   status: BillingStatus
-  payment_method: string
   created_at: string
-  invoice_url?: string
+  paid_at?: string
 }
 
-/** 升级/降级请求 */
+/* ================================================================
+ * 变更/取消/开关自动续费
+ * ================================================================ */
 export interface ChangePlanRequest {
-  target_plan_id: PlanType
+  target_plan_id: PlanId
   billing_cycle: BillingCycle
 }
 
-/** 升级/降级响应 */
 export interface ChangePlanResponse {
   success: boolean
   message: string
   new_subscription?: SubscriptionInfo
 }
+
+export interface ToggleAutoRenewRequest {
+  enabled: boolean
+}
+
+/* ================================================================
+ * 中文标签映射
+ * ================================================================ */
+export const PLAN_LABEL: Record<PlanId, string> = {
+  free: "免费版",
+  monthly: "月度会员",
+  quarterly: "季度会员",
+  yearly: "年度会员",
+}
+
+export const BILLING_CYCLE_LABEL: Record<BillingCycle, string> = {
+  monthly: "月付",
+  yearly: "年付",
+}
+
+/**
+ * @deprecated 旧命名保留别名，新代码请直接用 PlanId
+ */
+export type PlanType = PlanId

apps/web/src/components/common/PointsBadge/index.tsx

@@ -1,7 +1,11 @@
 /**
- * Header 右上角的积分徽章（💎 580）
+ * Header 右上角积分徽章
  * - 余额 <10 时橙色告警
  * - 点击弹出 Popover：余额、会员信息、充值入口、积分明细入口
+ *
+ * 字段对齐新契约：
+ * - balance.is_member / balance.member_type 保留但降级；推荐用 membership.member_type
+ * - 免费额度、会员 max_resolution 在 popover 展示
  */
 import React, { useEffect } from "react"
 import { Popover, Button, Tag, Space, Typography, Badge } from "antd"
@@ -17,27 +21,32 @@ import "./PointsBadge.css"
 
 const { Text, Paragraph } = Typography
 
+const MEMBER_LABEL: Record<string, string> = {
+  monthly: "月卡会员",
+  quarterly: "季卡会员",
+  yearly: "年卡会员",
+}
+
 const PointsBadge: React.FC = () => {
   const navigate = useNavigate()
-  const { balance, init, loading } = usePointsStore()
+  const { balance, membership, subscription, dailyUsage, init, loading } = usePointsStore()
 
   useEffect(() => {
     if (!balance) init()
   }, [balance, init])
 
-  const bal = balance?.balance ?? 0
+  // 余额：优先用 membership.points_balance（冗余字段），降级 balance.balance
+  const bal = membership?.points_balance ?? balance?.balance ?? 0
   const lowBalance = bal > 0 && bal < 10
   const zero = bal === 0
-  const isMember = !!balance?.is_member
-  const memberLabel = isMember
-    ? balance?.member_type === "yearly"
-      ? "年卡会员"
-      : balance?.member_type === "quarterly"
-        ? "季卡会员"
-        : balance?.member_type === "monthly"
-          ? "月卡会员"
-          : "付费会员"
-    : "免费会员"
+  const isMember = membership?.is_member ?? balance?.is_member ?? false
+  const memberKey =
+    membership?.member_type ??
+    (subscription?.plan_id && subscription.plan_id !== "free" ? subscription.plan_id : null)
+  const memberLabel = memberKey ? MEMBER_LABEL[memberKey] || "付费会员" : "免费会员"
+  const maxRes = membership?.max_resolution
+
+  const freeRemain = dailyUsage?.free_clips_remaining ?? 0
 
   const popContent = (
     <div className="xx-points-popover">
@@ -58,9 +67,16 @@ const PointsBadge: React.FC = () => {
         </Paragraph>
       )}
 
-      {balance?.member_expires_at && (
+      {!isMember && dailyUsage && freeRemain > 0 && (
+        <Text type="secondary" className="xx-points-expire">
+          今日剩余免费次数：{freeRemain}/{dailyUsage.free_clips_limit}
+        </Text>
+      )}
+
+      {balance?.member_expires_at && isMember && (
         <Text type="secondary" className="xx-points-expire">
           会员到期：{new Date(balance.member_expires_at).toLocaleDateString("zh-CN")}
+          {maxRes ? ` · ${maxRes}` : ""}
         </Text>
       )}
 
@@ -80,16 +96,16 @@ const PointsBadge: React.FC = () => {
           type="primary"
           icon={<ThunderboltOutlined />}
           block
-          onClick={() => navigate("/app/points")}
+          onClick={() => navigate("/points/recharge")}
         >
           充值积分
         </Button>
-        <Button block onClick={() => navigate("/app/points/transactions")}>
+        <Button block onClick={() => navigate("/points/transactions")}>
           积分明细
           <RightOutlined />
         </Button>
         {!isMember && (
-          <Button block type="link" onClick={() => navigate("/app/subscription")}>
+          <Button block type="link" onClick={() => navigate("/subscription")}>
             <CrownOutlined /> 升级会员享折扣
           </Button>
         )}

apps/web/src/components/common/PointsCost/index.tsx

@@ -1,31 +1,40 @@
 /**
  * 功能操作按钮旁的"消耗积分"提示
  * 例：[生成配音] 💎 -1 积分
- *  - 根据 scene_key 自动读取规则
- *  - 免费用户自动计算 ×1.15 向上取整
+ *  - 根据 scene_key 自动读取规则（来自 store.rules）
+ *  - 免费用户自动计算 ×free_user_multiplier 向上取整
+ *  - 会员 floor(base × points_discount)
  *  - 余额不足时显示红色告警 + 充值提示
  *
- * 使用：<PointsCost scene="ai_voice" units={1} />
+ * 字段对齐新契约：
+ *  - rule.points_per_use → base_points
+ *  - balance.free_clips_remaining → dailyUsage.free_clips_remaining
+ *  - props.units → 保留兼容，新代码优先用 quantity
  */
-import React, { useEffect, useMemo, useState } from "react"
+import React, { useMemo } from "react"
 import { Tooltip } from "antd"
 import { WarningOutlined } from "@ant-design/icons"
 import { usePointsStore } from "@/store/pointsStore"
 import type { PointsSource } from "@/api/points/types"
-import { getPointsRules } from "@/api/points"
 import "./PointsCost.css"
 
 interface Props {
   /** 消耗场景 key */
   scene: PointsSource
-  /** 单位数（分钟数/条数/张数），默认 1 */
-  units?: number
+  /** 数量（新字段），默认 1 */
+  quantity?: number
+  /** 预计时长（分钟），可选 */
+  durationMinutes?: number
   /** 是否显示为紧凑模式（仅图标+数字，不显示单位文字） */
   compact?: boolean
   /** 余额不足时，是否显示充值提示 */
   showRechargeHint?: boolean
   /** 自定义 class */
   className?: string
+  /**
+   * @deprecated 旧字段保留兼容，内部映射为 quantity
+   */
+  units?: number
 }
 
 /** 单位中文 */
@@ -38,31 +47,26 @@ const UNIT_LABEL: Record<string, string> = {
 
 const PointsCost: React.FC<Props> = ({
   scene,
-  units = 1,
+  quantity,
+  units,
+  durationMinutes,
   compact = false,
   showRechargeHint = true,
   className = "",
 }) => {
-  const { balance, init } = usePointsStore()
-  const [rules, setRules] = useState<Awaited<ReturnType<typeof getPointsRules>> | null>(null)
+  const { balance, dailyUsage, rules, membership } = usePointsStore()
+  const qty = quantity ?? units ?? 1
 
-  useEffect(() => {
-    if (!balance) init()
-    if (!rules) {
-      getPointsRules()
-        .then(setRules)
-        .catch(() => {})
-    }
-  }, [balance, init, rules])
-
-  const { cost, isFreeQuota, rule, isFreeUser, insufficient } = useMemo(() => {
+  const { cost, isFreeQuota, rule, isFreeUser, insufficient, freeRemain } = useMemo(() => {
+    const isMem = membership?.is_member ?? balance?.is_member ?? false
     if (!rules || !balance) {
       return {
         cost: 0,
         isFreeQuota: false,
         rule: null,
-        isFreeUser: !balance?.is_member,
+        isFreeUser: !isMem,
         insufficient: false,
+        freeRemain: 0,
       }
     }
     const rule = rules.rules.find((r) => r.scene_key === scene)
@@ -71,49 +75,54 @@ const PointsCost: React.FC<Props> = ({
         cost: 0,
         isFreeQuota: false,
         rule: null,
-        isFreeUser: !balance.is_member,
+        isFreeUser: !isMem,
         insufficient: false,
+        freeRemain: 0,
       }
     // 免费训练不扣费
-    if (rule.points_per_use === 0) {
+    if (rule.base_points === 0) {
       return {
         cost: 0,
         isFreeQuota: false,
         rule,
-        isFreeUser: !balance.is_member,
+        isFreeUser: !isMem,
         insufficient: false,
+        freeRemain: 0,
       }
     }
 
-    // 智能混剪：首条30s=3分，每+30s +1
+    // 计算 base
     let baseCost: number
     if (scene === "ai_video" && rule.extra_per_30s) {
-      // units 当作"30s 段数"更简单；按分钟算：minutes 个 30s 段 - 1
-      const segments = Math.max(1, Math.ceil(units * 2)) // 1min = 2 segments
-      baseCost = rule.points_per_use + rule.extra_per_30s * (segments - 1)
+      const minutes = durationMinutes ?? qty
+      const segments = Math.max(1, Math.ceil(minutes * 2))
+      baseCost = rule.base_points + rule.extra_per_30s * (segments - 1)
     } else {
-      baseCost = rule.points_per_use * Math.max(1, units)
+      baseCost = rule.base_points * Math.max(1, qty)
     }
 
-    // 混剪 + 免费用户 + 今日有免费额度 → 免费
-    const isFree =
-      scene === "ai_video" && !balance.is_member && (balance.free_clips_remaining ?? 0) > 0
+    // 非会员 + 今日免费额度 → 免费
+    const freeRemain = dailyUsage?.free_clips_remaining ?? 0
+    const isFree = scene === "ai_video" && !isMem && freeRemain > 0
 
-    const isFreeUser = !balance.is_member
-    const cost = isFree
-      ? 0
-      : isFreeUser
-        ? Math.ceil(baseCost * rules.free_user_multiplier)
-        : baseCost
+    const multiplier = rules.free_user_multiplier ?? 1.15
+    const cost = isFree ? 0 : isMem ? Math.floor(baseCost) : Math.ceil(baseCost * multiplier)
     const insufficient = !isFree && balance.balance < cost
-    return { cost, isFreeQuota: isFree, rule, isFreeUser, insufficient }
-  }, [rules, balance, scene, units])
+    return {
+      cost,
+      isFreeQuota: isFree,
+      rule,
+      isFreeUser: !isMem,
+      insufficient,
+      freeRemain,
+    }
+  }, [rules, balance, dailyUsage, membership, scene, qty, durationMinutes])
 
   if (!rule || !balance) {
     return <span className={`xx-points-cost ${className}`} />
   }
 
-  if (rule.points_per_use === 0) {
+  if (rule.base_points === 0) {
     return (
       <span className={`xx-points-cost free ${className}`}>
         <span className="xx-points-tag-free">免费</span>
@@ -123,12 +132,10 @@ const PointsCost: React.FC<Props> = ({
 
   if (isFreeQuota) {
     return (
-      <Tooltip title={`今日免费额度剩余 ${balance.free_clips_remaining} 条，不扣积分`}>
+      <Tooltip title={`今日免费额度剩余 ${freeRemain} 条，不扣积分`}>
         <span className={`xx-points-cost free-quota ${className}`}>
           <span className="xx-points-tag-free">免费</span>
-          {!compact && (
-            <span className="xx-points-desc">（今日剩余 {balance.free_clips_remaining} 条）</span>
-          )}
+          {!compact && <span className="xx-points-desc">（今日剩余 {freeRemain} 条）</span>}
         </span>
       </Tooltip>
     )
@@ -136,7 +143,7 @@ const PointsCost: React.FC<Props> = ({
 
   const unitLabel = compact
     ? ""
-    : ` /${units > 1 ? `${units}${UNIT_LABEL[rule.unit] ?? rule.unit}` : rule.unit}`
+    : `/${qty > 1 ? `${qty}${UNIT_LABEL[rule.unit] ?? rule.unit}` : rule.unit}`
 
   return (
     <span

apps/web/src/components/layout/PageHead/constants.ts

@@ -4,7 +4,6 @@ export const ROUTE_TITLE_MAP: Record<string, string> = {
   "/app/generate": "智能剪辑",
   "/app/assets": "视频库",
   "/app/voices": "配音库",
-  "/app/titles": "标题库",
   "/app/products": "成片库",
   "/app/templates": "模板库",
   "/app/history": "任务历史",

apps/web/src/config/navigation.ts

@@ -6,7 +6,6 @@ import React from "react"
 import {
   DashboardOutlined,
   FileOutlined,
-  FileTextOutlined,
   AudioOutlined,
   EditOutlined,
   VideoCameraOutlined,
@@ -51,12 +50,6 @@ export const NAV_ITEMS: NavItem[] = [
     path: "/app/assets",
     icon: React.createElement(FileOutlined),
   },
-  {
-    key: "titles",
-    label: "标题库",
-    path: "/app/titles",
-    icon: React.createElement(FileTextOutlined),
-  },
   {
     key: "scripts",
     label: "文案库",
@@ -160,12 +153,6 @@ export const NAV_GROUPS: NavGroup[] = [
         path: "/app/voices",
         icon: React.createElement(AudioOutlined),
       },
-      {
-        key: "titles",
-        label: "标题库",
-        path: "/app/titles",
-        icon: React.createElement(FileTextOutlined),
-      },
       {
         key: "scripts",
         label: "文案库",

apps/web/src/pages/generate/GeneratePage.tsx

@@ -39,7 +39,7 @@ const GeneratePage: React.FC = () => {
   /* ── 表单状态 ── */
   const formState = useGenerateFormState()
   /* ── 积分状态 ── */
-  const { balance, init: initPoints } = usePointsStore()
+  const { balance, dailyUsage, rules, init: initPoints } = usePointsStore()
   useEffect(() => {
     initPoints()
   }, [initPoints])
@@ -358,7 +358,14 @@ const GeneratePage: React.FC = () => {
   const handleConfirmGenerate = useCallback(async () => {
     // 积分预检查
     const units = isBatch ? Math.max(selectedVariantIds.length, 1) : 1
-    const check = hasEnoughPoints(balance ?? null, units)
+    const check = hasEnoughPoints(
+      balance ?? null,
+      units,
+      dailyUsage ?? null,
+      [],
+      "free",
+      rules?.free_user_multiplier ?? 1.15,
+    )
     if (!check.sufficient) {
       message.error(check.reason ?? "积分不足，请充值")
       return
@@ -397,6 +404,8 @@ const GeneratePage: React.FC = () => {
     handleGenerate,
     setCurrentStep,
     balance,
+    dailyUsage,
+    rules,
   ])
 
   /* ── 步骤导航 ── */
@@ -423,8 +432,16 @@ const GeneratePage: React.FC = () => {
   /* ── 积分消耗估算（步骤3确认生成展示用） ── */
   const unitsForCost = isBatch ? Math.max(selectedVariantIds.length, 1) : 1
   const pointsEstimate = useMemo(
-    () => hasEnoughPoints(balance ?? null, unitsForCost),
-    [unitsForCost, balance],
+    () =>
+      hasEnoughPoints(
+        balance ?? null,
+        unitsForCost,
+        dailyUsage ?? null,
+        [],
+        "free",
+        rules?.free_user_multiplier ?? 1.15,
+      ),
+    [unitsForCost, balance, dailyUsage, rules],
   )
   const insufficientPoints = !pointsEstimate.sufficient
 

apps/web/src/pages/generate/components/GenerateStepActions.tsx

@@ -1,11 +1,11 @@
 /**
- * GeneratePage 步骤底部操作按钮（Issue #1677 修正：固定 6 步）
- * v2: 步骤4 按钮前显示本次积分消耗；积分不足时禁用按钮并提示充值
+ * GeneratePage 步骤底部操作按钮（5 步向导：素材→配音→标题→确认生成→封面）
+ * v3: 修复 #1954 off-by-one —— 步骤4 单视频/批量生成完成后正确显示「下一步：选择封面」
  *
  * 步骤 1~3：上一步 / 下一步
- * 步骤 4（选择标题）：「✨ 确认生成视频 / 确认生成 N 个视频」→ 创建正式生成任务，成功后跳步骤5
- * 步骤 5（确认生成）：渲染进度页，全部完成后「下一步：选择封面」；仅上一步
- * 步骤 6（选择封面）：仅上一步
+ * 步骤 4（确认生成/进度）：未开始 →「✨ 确认生成视频」；生成中 →「⏳ 视频渲染中…」；
+ *                       失败 →「🔄 重新生成」；全部完成 →「下一步：选择封面 →」
+ * 步骤 5（选择封面）：仅上一步，无主按钮
  */
 import React from "react"
 import { Tooltip } from "antd"
@@ -22,14 +22,13 @@ export interface GenerateStepActionsProps {
   generateError: string | null
   /** 批量模式下勾选的视频数量（N=1 时为1） */
   selectedCount?: number
-  // v2: 积分相关
   /** 本次预估消耗积分 */
   estimatedCost?: number
   /** 是否积分不足 */
   pointsInsufficient?: boolean
   /** 积分不足原因 */
   insufficientReason?: string
-  /** 剩余免费混剪次数 */
+  /** 本次使用的免费混剪次数 */
   freeClipsUsedThisTime?: number
   /** 前往充值 */
   onRecharge?: () => void
@@ -60,8 +59,17 @@ const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
       )
     }
 
-    /* 步骤 4：选择标题 — 确认生成 */
+    /* 步骤 4：确认生成 / 进度 / 完成进封面 */
     if (currentStep === 4) {
+      // #1954 修复：单视频/批量 全部生成完成后显示「下一步：选择封面」
+      if (generated && !generating && !generateError) {
+        return (
+          <button className="xx-btn xx-btn-primary" onClick={onNext}>
+            下一步：选择封面 →
+          </button>
+        )
+      }
+
       const costTag =
         typeof estimatedCost === "number" && estimatedCost > 0 ? (
           <span className="xx-step-cost-tag">
@@ -118,23 +126,7 @@ const GenerateStepActions: React.FC<GenerateStepActionsProps> = ({
       )
     }
 
-    /* 步骤 5：确认生成进度页 — 全部完成后下一步进封面 */
-    if (currentStep === 5) {
-      if (generated) {
-        return (
-          <button className="xx-btn xx-btn-primary" onClick={onNext}>
-            下一步：选择封面 →
-          </button>
-        )
-      }
-      return (
-        <button className="xx-btn xx-btn-primary" disabled>
-          ⏳ 视频渲染中…
-        </button>
-      )
-    }
-
-    /* 步骤 6（封面，最后一步）：无主按钮 */
+    /* 步骤 5（封面，最后一步）：无主按钮 */
     return null
   }
 

apps/web/src/pages/generate/hooks/pointsCost.ts

@@ -1,58 +1,74 @@
 /**
  * 生成前积分消耗估算与余额校验
- * 用于步骤4「确认生成」按钮前展示本次消耗，积分不足时禁用并提示充值
+ * 用于步骤「确认生成」按钮前展示本次消耗，积分不足时禁用并提示充值
+ *
+ * 契约对齐（2026-09-16 最终版）：
+ * - balance 不再包含 free_clips_* 字段，免费额度通过 dailyUsage 传入
+ * - 乘数逻辑：非会员 ceil(base × free_user_multiplier)，会员 floor(base × points_discount)
+ * - points_discount 从 subscription.plans.points_discount 获取（mock 阶段用 1 占位）
  */
-import type { PointsBalance } from "@/api/points/types"
+import type { PointsBalance, DailyUsage } from "@/api/points/types"
+import type { SubscriptionPlan } from "@/api/subscription/types"
 
-/** 生成单条视频消耗积分（基准） */
+/** 生成单条视频基准积分（ai_video base_points=8，但向导默认使用短片段，先保守按 3 估算） */
 export const BASE_VIDEO_POINTS = 3
 
-/**
- * 估算生成任务的积分消耗
- * @param videoCount 视频条数（批量模式）
- * @param memberMultiplier 会员倍率（免费用户 1.15）
- */
-export function estimateGenerateCost(videoCount: number, memberMultiplier = 1): number {
-  const raw = BASE_VIDEO_POINTS * videoCount * memberMultiplier
-  // 向上取整，避免小数
-  return Math.ceil(raw)
-}
+/** 默认免费用户倍率（后端 free_user_multiplier，mock 默认 1.15） */
+const DEFAULT_FREE_MULTIPLIER = 1.15
 
-/**
- * 判断积分是否充足（含每日免费额度）
- * @returns sufficient=true 表示可以继续生成；false 需要提示充值
- */
-export function hasEnoughPoints(
-  balance: PointsBalance | null,
-  videoCount: number,
-): {
+export interface HasEnoughPointsResult {
   sufficient: boolean
   cost: number
   reason?: string
   freeClipsUsed?: number
   freeClipsRemaining?: number
-} {
+}
+
+/**
+ * 判断积分是否充足（含每日免费额度）
+ * @param balance 积分余额
+ * @param videoCount 视频条数（批量模式下为 variant 数）
+ * @param dailyUsage 每日免费额度（可选；不传视为 0）
+ * @param plans 当前可用订阅计划列表（用于计算会员积分折扣；mock 传 []）
+ * @param currentPlanId 当前用户 plan_id（free/monthly/quarterly/yearly）
+ * @param freeMultiplier 免费用户倍率，默认 1.15
+ */
+export function hasEnoughPoints(
+  balance: PointsBalance | null,
+  videoCount: number,
+  dailyUsage?: DailyUsage | null,
+  plans: SubscriptionPlan[] = [],
+  currentPlanId: string = "free",
+  freeMultiplier: number = DEFAULT_FREE_MULTIPLIER,
+): HasEnoughPointsResult {
   if (!balance) {
-    // 未登录或未加载：不拦截，后端会校验
-    return { sufficient: true, cost: estimateGenerateCost(videoCount) }
+    return { sufficient: true, cost: estimateGenerateCost(videoCount, 1) }
   }
 
-  const isMember = balance.is_member
-  const multiplier = isMember ? 1 : 1.15
-  const cost = estimateGenerateCost(videoCount, multiplier)
+  const isMember = balance.is_member && currentPlanId !== "free"
+  const plan = plans.find((p) => p.plan_id === currentPlanId)
+  const multiplier = isMember ? (plan?.points_discount ?? 1) : freeMultiplier
+  const raw = BASE_VIDEO_POINTS * videoCount * multiplier
+  const cost = isMember ? Math.floor(raw) : Math.ceil(raw)
 
-  // 免费用户优先使用每日免费额度
-  if (!isMember && balance.free_clips_remaining && balance.free_clips_remaining > 0) {
-    const freeUsed = Math.min(balance.free_clips_remaining, videoCount)
-    const remainingAfterFree = videoCount - freeUsed
-    const paidCost = estimateGenerateCost(remainingAfterFree, multiplier)
+  const freeRemain = dailyUsage?.free_clips_remaining ?? 0
+
+  // 非会员优先用每日免费额度
+  if (!isMember && freeRemain > 0) {
+    const freeUsed = Math.min(freeRemain, videoCount)
+    const afterFree = videoCount - freeUsed
+    const paidCost =
+      afterFree === 0
+        ? 0
+        : isMember
+          ? Math.floor(BASE_VIDEO_POINTS * afterFree * multiplier)
+          : Math.ceil(BASE_VIDEO_POINTS * afterFree * multiplier)
     if (paidCost === 0) {
-      // 完全用免费额度
       return {
         sufficient: true,
         cost: 0,
         freeClipsUsed: freeUsed,
-        freeClipsRemaining: balance.free_clips_remaining - freeUsed,
+        freeClipsRemaining: freeRemain - freeUsed,
       }
     }
     if (balance.balance >= paidCost) {
@@ -60,24 +76,28 @@ export function hasEnoughPoints(
         sufficient: true,
         cost: paidCost,
         freeClipsUsed: freeUsed,
-        freeClipsRemaining: balance.free_clips_remaining - freeUsed,
+        freeClipsRemaining: freeRemain - freeUsed,
       }
     }
     return {
       sufficient: false,
       cost: paidCost,
-      reason: `积分不足：本次需 ${paidCost} 积分（使用 ${freeUsed} 次免费额度后），当前余额 ${balance.balance}，还差 ${paidCost - balance.balance} 积分`,
+      reason: `积分不足：本次需 ${paidCost} 积分（已用 ${freeUsed} 次免费额度），当前余额 ${balance.balance}，还差 ${paidCost - balance.balance} 积分`,
       freeClipsUsed: freeUsed,
     }
   }
 
-  // 付费会员或免费额度用完
-  if (balance.balance >= cost) {
-    return { sufficient: true, cost }
-  }
+  if (balance.balance >= cost) return { sufficient: true, cost }
   return {
     sufficient: false,
     cost,
     reason: `积分不足：本次需 ${cost} 积分，当前余额 ${balance.balance}，还差 ${cost - balance.balance} 积分`,
   }
 }
+
+/**
+ * 估算生成任务的积分消耗（导出给 UI 直接使用）
+ */
+export function estimateGenerateCost(videoCount: number, multiplier = 1): number {
+  return Math.ceil(BASE_VIDEO_POINTS * videoCount * multiplier)
+}

apps/web/src/pages/points/Center.tsx

@@ -1,6 +1,11 @@
 /**
- * 积分中心主页（/app/points）
- * 展示余额、会员信息、本月统计、快捷入口
+ * 积分中心主页（/points 或 /app/points）
+ * 展示余额、会员信息、免费额度、快捷入口、最近流水
+ *
+ * 字段对齐新契约（2026-09-16）：
+ *  - balance 不含 free_clips_*，从 dailyUsage 取
+ *  - subscription.member_type → plan_id（free/monthly/quarterly/yearly）
+ *  - subscription.member_type_name → 前端 PLAN_LABEL 映射
  */
 import React, { useEffect } from "react"
 import {
@@ -30,6 +35,7 @@ import {
 import { useNavigate } from "react-router-dom"
 import PageHead from "@/components/layout/PageHead"
 import { usePointsStore } from "@/store/pointsStore"
+import { PLAN_LABEL } from "@/api/subscription/types"
 import "./Points.css"
 
 const { Text } = Typography
@@ -46,32 +52,57 @@ const SOURCE_NAME: Record<string, string> = {
   ai_rewrite: "AI 改写",
   ai_title: "AI 标题",
   ai_cover: "AI 封面",
-  subscription_bonus: "会员赠送",
-  admin_adjust: "管理员调整",
-  refund: "失败退还",
+  sign_up: "注册赠送",
+  bind_phone: "绑定手机",
+  gift: "活动赠送",
+  admin: "管理员调整",
+}
+
+const sourceLabel = (src: string): string => {
+  if (src.startsWith("refund:")) return `${SOURCE_NAME[src.slice(7)] || src.slice(7)}退款`
+  return SOURCE_NAME[src] || src
+}
+
+/** 会员标签：优先取 membership.member_type，降级 subscription.plan_id */
+const memberKey = (
+  membership: { member_type: string | null } | null,
+  subscription: { plan_id: string } | null,
+): string | null =>
+  membership?.member_type ??
+  (subscription?.plan_id && subscription.plan_id !== "free" ? subscription.plan_id : null)
+
+const memberLabel = (
+  membership: { member_type: string | null } | null,
+  subscription: { plan_id: string; plan_name?: string } | null,
+): string => {
+  const key = memberKey(membership, subscription)
+  if (!key) return "免费会员"
+  return PLAN_LABEL[key as keyof typeof PLAN_LABEL] || subscription?.plan_name || "付费会员"
 }
 
 const PointsCenter: React.FC = () => {
   const navigate = useNavigate()
-  const { balance, subscription, init, loading } = usePointsStore()
+  const { balance, dailyUsage, membership, subscription, rules, init, loading } = usePointsStore()
 
   useEffect(() => {
     init()
   }, [init])
 
-  const bal = balance?.balance ?? 0
+  const bal = membership?.points_balance ?? balance?.balance ?? 0
   const earned = balance?.total_earned ?? 0
   const spent = balance?.total_spent ?? 0
-  const isMember = !!balance?.is_member
-  const freeUsed = balance?.free_clips_used ?? 0
-  const freeLimit = balance?.free_clips_limit ?? 2
-  const freeRemain = balance?.free_clips_remaining ?? (isMember ? 0 : 2)
+  const isMember = membership?.is_member ?? balance?.is_member ?? false
 
-  // 近 5 条流水 mock（实际从 transactions 页加载）
+  // 免费额度从 dailyUsage 取
+  const freeUsed = dailyUsage?.free_clips_used ?? 0
+  const freeLimit = dailyUsage?.free_clips_limit ?? (isMember ? 0 : 3)
+  const freeRemain = dailyUsage?.free_clips_remaining ?? 0
+
+  // 最近流水 mock（后续可改为调用 getPointsTransactions(1,5)）
   const recentTx = [
-    { type: "spend", source: "ai_voice", amount: 1, time: "今天 10:30" },
-    { type: "spend", source: "ai_video", amount: 3, time: "今天 09:15" },
-    { type: "earn", source: "task_reward", amount: 20, time: "昨天" },
+    { type: "deduct" as const, source: "ai_voice", amount: 1, time: "今天 10:30" },
+    { type: "deduct" as const, source: "ai_video", amount: 3, time: "今天 09:15" },
+    { type: "add" as const, source: "recharge", amount: 100, time: "昨天" },
   ]
 
   return (
@@ -79,16 +110,15 @@ const PointsCenter: React.FC = () => {
       <PageHead
         title="积分中心"
         description="管理积分余额、查看流水、充值使用"
-
         actions={
           <Space>
-            <Button icon={<FileTextOutlined />} onClick={() => navigate("/app/points/rules")}>
+            <Button icon={<FileTextOutlined />} onClick={() => navigate("/points/rules")}>
               积分规则
             </Button>
             <Button
               type="primary"
               icon={<WalletOutlined />}
-              onClick={() => navigate("/app/subscription")}
+              onClick={() => navigate("/points/recharge")}
             >
               充值积分
             </Button>
@@ -111,12 +141,7 @@ const PointsCenter: React.FC = () => {
               <Space size={8} wrap>
                 {isMember ? (
                   <Tag color="gold" icon={<CrownFilled />} style={{ padding: "4px 10px" }}>
-                    {subscription?.member_type === "yearly"
-                      ? "年卡"
-                      : subscription?.member_type === "quarterly"
-                        ? "季卡"
-                        : "月卡"}
-                    会员
+                    {memberLabel(membership, subscription)}
                   </Tag>
                 ) : (
                   <Tag
@@ -130,19 +155,24 @@ const PointsCenter: React.FC = () => {
                     免费会员
                   </Tag>
                 )}
-                {balance?.member_expires_at && (
+                {balance?.member_expires_at && isMember && (
                   <Text style={{ color: "rgba(255,255,255,0.85)", fontSize: 12 }}>
                     到期 {new Date(balance.member_expires_at).toLocaleDateString("zh-CN")}
                   </Text>
                 )}
+                {membership?.max_resolution && isMember && (
+                  <Text style={{ color: "rgba(255,255,255,0.85)", fontSize: 12 }}>
+                    · {membership.max_resolution}
+                  </Text>
+                )}
                 {!isMember && (
                   <Button
                     size="small"
                     type="primary"
-                    onClick={() => navigate("/app/subscription")}
+                    onClick={() => navigate("/subscription")}
                     style={{ background: "#fff", color: "#7c3aed", borderColor: "#fff" }}
                   >
-                    <CrownFilled /> 升级会员享 8 折
+                    <CrownFilled /> 升级会员享折扣
                   </Button>
                 )}
               </Space>
@@ -156,12 +186,24 @@ const PointsCenter: React.FC = () => {
                   <InfoCircleOutlined /> 今日免费混剪
                 </div>
                 <Progress
-                  percent={Math.round((freeUsed / freeLimit) * 100)}
+                  percent={freeLimit > 0 ? Math.round((freeUsed / freeLimit) * 100) : 0}
                   strokeColor={{ "0%": "#f59e0b", "100%": "#ef4444" }}
                   format={() => `${freeUsed}/${freeLimit} 条`}
                 />
                 <Text style={{ color: "rgba(255,255,255,0.8)", fontSize: 12 }}>
                   剩余 {freeRemain} 条免费混剪，超出部分消耗积分
+                  {rules?.free_user_multiplier ? `（×${rules.free_user_multiplier} 倍率）` : ""}
+                  {dailyUsage?.reset_at && (
+                    <span>
+                      {" "}
+                      ·{" "}
+                      {new Date(dailyUsage.reset_at).toLocaleTimeString("zh-CN", {
+                        hour: "2-digit",
+                        minute: "2-digit",
+                      })}
+                      重置
+                    </span>
+                  )}
                 </Text>
               </div>
             )}
@@ -205,7 +247,7 @@ const PointsCenter: React.FC = () => {
           <Card>
             <Statistic
               title={isMember ? "会员等级" : "今日免费剩余"}
-              value={isMember ? (subscription?.member_type_name ?? "付费会员") : `${freeRemain} 条`}
+              value={isMember ? memberLabel(membership, subscription) : `${freeRemain} 条`}
               prefix={<CrownFilled style={{ color: "#f59e0b" }} />}
               valueStyle={{ color: "#f59e0b" }}
             />
@@ -223,7 +265,7 @@ const PointsCenter: React.FC = () => {
                 最近流水
               </Space>
             }
-            extra={<a onClick={() => navigate("/app/points/transactions")}>查看全部 →</a>}
+            extra={<a onClick={() => navigate("/points/transactions")}>查看全部 →</a>}
           >
             {recentTx.length === 0 ? (
               <Empty description="暂无积分流水" />
@@ -237,22 +279,22 @@ const PointsCenter: React.FC = () => {
                         <Avatar
                           size="small"
                           style={{
-                            background: item.type === "earn" ? "#d1fae5" : "#fee2e2",
-                            color: item.type === "earn" ? "#059669" : "#dc2626",
+                            background: item.type === "add" ? "#d1fae5" : "#fee2e2",
+                            color: item.type === "add" ? "#059669" : "#dc2626",
                           }}
-                          icon={item.type === "earn" ? <ArrowUpOutlined /> : <ArrowDownOutlined />}
+                          icon={item.type === "add" ? <ArrowUpOutlined /> : <ArrowDownOutlined />}
                         />
                       }
-                      title={SOURCE_NAME[item.source] ?? item.source}
+                      title={sourceLabel(item.source)}
                       description={item.time}
                     />
                     <div
                       style={{
-                        color: item.type === "earn" ? "#10b981" : "#ef4444",
+                        color: item.type === "add" ? "#10b981" : "#ef4444",
                         fontWeight: 700,
                       }}
                     >
-                      {item.type === "earn" ? "+" : "-"}
+                      {item.type === "add" ? "+" : "-"}
                       {item.amount}
                     </div>
                   </List.Item>
@@ -269,7 +311,7 @@ const PointsCenter: React.FC = () => {
                 size="large"
                 type="primary"
                 icon={<WalletOutlined />}
-                onClick={() => navigate("/app/subscription")}
+                onClick={() => navigate("/points/recharge")}
               >
                 充值积分
               </Button>
@@ -277,7 +319,7 @@ const PointsCenter: React.FC = () => {
                 block
                 size="large"
                 icon={<HistoryOutlined />}
-                onClick={() => navigate("/app/points/transactions")}
+                onClick={() => navigate("/points/transactions")}
               >
                 积分明细
               </Button>
@@ -285,7 +327,7 @@ const PointsCenter: React.FC = () => {
                 block
                 size="large"
                 icon={<CrownFilled />}
-                onClick={() => navigate("/app/subscription")}
+                onClick={() => navigate("/subscription")}
               >
                 {isMember ? "续费/升级会员" : "升级付费会员"}
               </Button>
@@ -293,7 +335,7 @@ const PointsCenter: React.FC = () => {
                 block
                 size="large"
                 icon={<FileTextOutlined />}
-                onClick={() => navigate("/app/points/rules")}
+                onClick={() => navigate("/points/rules")}
               >
                 积分消耗规则
               </Button>

apps/web/src/pages/points/Packages.tsx

@@ -1,56 +1,72 @@
 /**
- * 积分充值页（/app/points/recharge）
+ * 积分充值页（/points/recharge）
  * 单独展示积分包，供入口直接跳转使用
- * 主 Plans 页面也有充值区，这里提供独立 URL 方便从"积分不足"弹窗跳转
+ *
+ * 字段对齐新契约（2026-09-16）：
+ *  - package 用 code 做唯一键（替代 id）
+ *  - 价格单位为 cents，折后价 = price_cents × (user_discount ?? 1)
+ *  - 下单接口返回 pay_params（当前为 {}，支付通道未接入）
+ *  - 余额优先取 membership.points_balance，降级 balance.balance
  */
 import React, { useEffect, useState } from "react"
-import { Card, Col, Row, Button, Tag, Typography, Space, Modal, message, Tooltip } from "antd"
+import {
+  Card,
+  Col,
+  Row,
+  Button,
+  Tag,
+  Typography,
+  Space,
+  Modal,
+  message,
+  Tooltip,
+  Alert,
+} from "antd"
 import { ThunderboltOutlined, SafetyCertificateOutlined, CrownFilled } from "@ant-design/icons"
 import { useNavigate } from "react-router-dom"
 import PageHead from "@/components/layout/PageHead"
 import { usePointsStore } from "@/store/pointsStore"
 import { createPointsOrder, getPointsPackages } from "@/api/points"
-import type { PointsPackage } from "@/api/points/types"
+import type { PointsPackage, PointsPackagesResponse } from "@/api/points/types"
+import { getDiscountPriceCents } from "@/api/points/types"
 import "./Points.css"
 
 const { Title, Text, Paragraph } = Typography
 
 const PointsRecharge: React.FC = () => {
   const navigate = useNavigate()
-  const { balance, init } = usePointsStore()
-  const [packages, setPackages] = useState<PointsPackage[]>([])
+  const { balance, membership, init } = usePointsStore()
+  const [packagesResp, setPackagesResp] = useState<PointsPackagesResponse | null>(null)
   const [buying, setBuying] = useState<string | null>(null)
 
   useEffect(() => {
     init()
     getPointsPackages()
-      .then((r) => setPackages(r.packages))
+      .then((r) => setPackagesResp(r))
       .catch(() => {})
   }, [init])
 
-  const getPackPrice = (pkg: PointsPackage): number => {
-    const mt = balance?.member_type ?? "free"
-    type DiscountKey =
-      | "discounted_price_for_free"
-      | "discounted_price_for_monthly"
-      | "discounted_price_for_quarterly"
-      | "discounted_price_for_yearly"
-    const key = `discounted_price_for_${mt}` as DiscountKey
-    return pkg[key] ?? pkg.price
-  }
+  const packages = packagesResp?.packages ?? []
+  const userDiscount = packagesResp?.user_discount ?? null
+  const isMember = membership?.is_member ?? balance?.is_member ?? false
+  const currentBalance = membership?.points_balance ?? balance?.balance ?? 0
 
   const handleBuy = async (pkg: PointsPackage) => {
     try {
-      setBuying(pkg.id)
-      const order = await createPointsOrder({ package_id: pkg.id })
+      setBuying(pkg.code)
+      const order = await createPointsOrder({ package_id: pkg.code })
       Modal.info({
         title: "支付功能开发中",
         icon: <SafetyCertificateOutlined />,
         content: (
           <div>
             <Paragraph>
-              订单已创建（{order.id.slice(0, 16)}…），金额{" "}
-              <b>¥{(order.price_cents / 100).toFixed(2).replace(/\.00$/, "")}</b>。
+              订单已创建（{order.id.slice(0, 16)}…），购买 {pkg.points} 积分，金额{" "}
+              <b>¥{(order.amount_cents / 100).toFixed(2).replace(/\.00$/, "")}</b>。
+              {order.points_amount !== undefined && ` 到账 ${order.points_amount} 积分。`}
+              {order.expire_at && (
+                <span> 有效期至 {new Date(order.expire_at).toLocaleDateString("zh-CN")}。</span>
+              )}
               微信/支付宝支付正在接入中。
             </Paragraph>
             <Paragraph type="secondary" style={{ marginBottom: 0 }}>
@@ -61,8 +77,9 @@ const PointsRecharge: React.FC = () => {
         okText: "知道了",
       })
     } catch (e) {
-      const err = e as { message?: string }
-      message.error(err?.message ?? "下单失败")
+      const err = e as { response?: { data?: { error?: { message?: string } } }; message?: string }
+      const msg = err?.response?.data?.error?.message || err?.message || "下单失败"
+      message.error(msg)
     } finally {
       setBuying(null)
     }
@@ -73,51 +90,61 @@ const PointsRecharge: React.FC = () => {
       <PageHead
         title="积分充值"
         description="积分永久有效，可用于全部 AI 功能；付费会员享折扣"
-
         actions={
           <Space>
-            {!balance?.is_member && (
-              <Button icon={<CrownFilled />} onClick={() => navigate("/app/subscription")}>
-                升级会员 8 折起
+            {!isMember && (
+              <Button icon={<CrownFilled />} onClick={() => navigate("/subscription")}>
+                升级会员享折扣
               </Button>
             )}
-            <Button onClick={() => navigate("/app/points/transactions")}>积分明细</Button>
+            <Button onClick={() => navigate("/points/transactions")}>积分明细</Button>
           </Space>
         }
       />
 
-      {balance && (
-        <Card
-          bordered={false}
-          style={{ marginBottom: 16, background: "linear-gradient(135deg,#ede9fe,#fce7f3)" }}
-        >
-          <Space size="large">
-            <div>
-              <Text type="secondary">当前可用积分</Text>
-              <div style={{ fontSize: 28, fontWeight: 800, color: "#7c3aed" }}>
-                <ThunderboltOutlined /> {balance.balance.toLocaleString()}
-              </div>
+      <Card
+        bordered={false}
+        style={{ marginBottom: 16, background: "linear-gradient(135deg,#ede9fe,#fce7f3)" }}
+      >
+        <Space size="large">
+          <div>
+            <Text type="secondary">当前可用积分</Text>
+            <div style={{ fontSize: 28, fontWeight: 800, color: "#7c3aed" }}>
+              <ThunderboltOutlined /> {currentBalance.toLocaleString()}
             </div>
-          </Space>
-        </Card>
+          </div>
+        </Space>
+      </Card>
+
+      {userDiscount !== null && userDiscount < 1 && (
+        <Alert
+          type="success"
+          showIcon
+          style={{ marginBottom: 16 }}
+          message={`您当前享 ${Math.round(userDiscount * 100) / 10} 折优惠`}
+          description="会员/优惠已自动应用到下方价格"
+        />
       )}
 
       <Title level={4}>选择积分包</Title>
       <Row gutter={[20, 20]}>
         {packages.map((pkg) => {
-          const price = getPackPrice(pkg)
-          const discount = price < pkg.price ? Math.round((1 - price / pkg.price) * 100) : 0
-          const unit = price / pkg.points
+          const priceCents = getDiscountPriceCents(pkg, userDiscount)
+          const originalCents = pkg.price_cents
+          const discount =
+            priceCents < originalCents ? Math.round((1 - priceCents / originalCents) * 100) : 0
+          const unit = priceCents / 100 / pkg.points
+          const isHot = pkg.unit_price < 0.1 // 单价低于 0.1 元/分视为热门
           return (
-            <Col xs={24} sm={12} md={8} key={pkg.id}>
+            <Col xs={24} sm={12} md={8} key={pkg.code}>
               <Card
-                className={`xx-pkg-card ${pkg.id === "basic_pack" ? "recommended" : ""} ${discount > 0 ? "has-discount" : ""}`}
+                className={`xx-pkg-card ${isHot ? "recommended" : ""} ${discount > 0 ? "has-discount" : ""}`}
                 hoverable
               >
-                {pkg.id === "basic_pack" && <div className="xx-pkg-badge">热门</div>}
+                {isHot && <div className="xx-pkg-badge">热门</div>}
                 {discount > 0 && (
                   <Tag color="gold" className="xx-pkg-discount">
-                    会员{10 - discount / 10}折
+                    {Math.round((priceCents / originalCents) * 10) / 1}折
                   </Tag>
                 )}
                 <div className="xx-pkg-name">{pkg.name}</div>
@@ -127,17 +154,17 @@ const PointsRecharge: React.FC = () => {
                 <div className="xx-pkg-price">
                   <span className="currency">¥</span>
                   <span className="amount">
-                    {(price / 100).toFixed(price % 100 === 0 ? 0 : 1).replace(/\.0$/, "")}
+                    {(priceCents / 100).toFixed(priceCents % 100 === 0 ? 0 : 1).replace(/\.0$/, "")}
                   </span>
                   {discount > 0 && (
-                    <span className="xx-pkg-origin">¥{(pkg.price / 100).toFixed(0)}</span>
+                    <span className="xx-pkg-origin">¥{(originalCents / 100).toFixed(0)}</span>
                   )}
                 </div>
                 <div className="xx-pkg-unit">≈¥{unit.toFixed(3)}/积分 · 永久有效</div>
                 <Button
                   block
-                  type={pkg.id === "basic_pack" ? "primary" : "default"}
-                  loading={buying === pkg.id}
+                  type={isHot ? "primary" : "default"}
+                  loading={buying === pkg.code}
                   onClick={() => handleBuy(pkg)}
                   size="large"
                   style={{ marginTop: 16 }}
@@ -153,12 +180,13 @@ const PointsRecharge: React.FC = () => {
       <Card style={{ marginTop: 24 }}>
         <Title level={5}>积分消耗说明</Title>
         <ul style={{ paddingLeft: 20, color: "var(--text-secondary)", lineHeight: 2 }}>
-          <li>智能混剪：3 积分/条（≤30s），每加 30s +1 积分</li>
-          <li>AI 配音 / 声音克隆合成：1 积分/分钟</li>
-          <li>AI 数字人：15 积分/分钟</li>
-          <li>抖音链接提取 / AI 改写 / AI 标题 / AI 封面：1~2 积分/次</li>
+          <li>智能混剪：基础积分/条（≤30s），每加 30s 额外消耗</li>
+          <li>AI 配音 / 声音克隆合成：按分钟消耗积分</li>
+          <li>AI 数字人：按分钟消耗积分</li>
+          <li>抖音链接提取 / AI 改写 / AI 标题 / AI 封面：按次消耗</li>
           <li>声音克隆训练：免费</li>
-          <li>免费用户每日 2 条混剪免费，其余 AI 功能消耗为会员价 ×1.15</li>
+          <li>免费用户每日若干条免费混剪，其余 AI 功能按会员价 ×1.15 消耗</li>
+          <li>会员享积分折扣（具体档位见会员中心）</li>
         </ul>
         <Tooltip title="具体规则以系统实际计算为准">
           <Text type="secondary" style={{ fontSize: 12 }}>

apps/web/src/pages/points/Transactions.tsx

@@ -1,6 +1,13 @@
 /**
- * 积分明细页（/app/points/transactions）
+ * 积分明细页（/points/transactions）
  * 分页展示积分流水，支持按类型/来源筛选
+ *
+ * 字段对齐新契约（2026-09-16）：
+ *  - 分页接口返回 {items, total, page, page_size}
+ *  - type 仅 add/deduct；refund 通过 source=refund:xxx 前缀体现
+ *  - source_name 字段已移除，中文名在前端 SOURCE_LABEL 映射
+ *  - signed_amount 字段已移除，根据 type 显示 +/-
+ *  - ref_id 在新契约中为 string（不再是 number）
  */
 import React, { useEffect, useState, useCallback } from "react"
 import {
@@ -29,14 +36,12 @@ const { Text } = Typography
 const { RangePicker } = DatePicker
 
 const TYPE_LABEL: Record<PointsTxType, { text: string; color: string }> = {
-  earn: { text: "获得", color: "green" },
-  spend: { text: "消耗", color: "red" },
-  refund: { text: "退还", color: "blue" },
+  add: { text: "获得", color: "green" },
+  deduct: { text: "消耗", color: "red" },
 }
 
 const SOURCE_LABEL: Record<string, string> = {
   recharge: "充值",
-  task_reward: "任务奖励",
   ai_voice: "AI 配音",
   ai_digital_human: "AI 数字人",
   ai_video: "智能混剪",
@@ -46,9 +51,18 @@ const SOURCE_LABEL: Record<string, string> = {
   ai_rewrite: "AI 文案改写",
   ai_title: "AI 标题生成",
   ai_cover: "AI 封面生成",
-  subscription_bonus: "会员赠送",
-  admin_adjust: "管理员调整",
-  refund: "失败退还",
+  sign_up: "注册赠送",
+  bind_phone: "绑定手机",
+  gift: "活动赠送",
+  admin: "管理员调整",
+}
+
+const sourceLabel = (s: string): { label: string; isRefund: boolean } => {
+  if (s.startsWith("refund:")) {
+    const inner = s.slice(7)
+    return { label: `${SOURCE_LABEL[inner] || inner}（退款）`, isRefund: true }
+  }
+  return { label: SOURCE_LABEL[s] || s, isRefund: false }
 }
 
 const PointsTransactions: React.FC = () => {
@@ -66,22 +80,29 @@ const PointsTransactions: React.FC = () => {
   const load = useCallback(async () => {
     setLoading(true)
     try {
-      const params: Record<string, string | number> = { page, page_size: pageSize }
-      if (type !== "all") params.type = type
-      if (source !== "all") params.source = source
-      if (dateRange && dateRange[0] && dateRange[1]) {
-        params.start_date = dateRange[0].format("YYYY-MM-DD")
-        params.end_date = dateRange[1].format("YYYY-MM-DD")
-      }
-      const res = await getPointsTransactions(params)
+      // 新契约后端暂不支持 type/source/date/keyword 过滤参数，先前端过滤
+      const res = await getPointsTransactions(page, pageSize)
       let items = res.items
+      if (type !== "all") {
+        items = items.filter((it) => it.type === type)
+      }
+      if (source !== "all") {
+        items = items.filter((it) => it.source === source || it.source === `refund:${source}`)
+      }
+      if (dateRange && dateRange[0] && dateRange[1]) {
+        const start = dateRange[0].startOf("day")
+        const end = dateRange[1].endOf("day")
+        items = items.filter((it) => {
+          const t = dayjs(it.created_at)
+          return t.isAfter(start) && t.isBefore(end)
+        })
+      }
       if (keyword) {
         const k = keyword.toLowerCase()
-        items = items.filter(
-          (it) =>
-            it.description.toLowerCase().includes(k) ||
-            (SOURCE_LABEL[it.source] ?? it.source).includes(keyword),
-        )
+        items = items.filter((it) => {
+          const sl = sourceLabel(it.source).label
+          return (it.description || "").toLowerCase().includes(k) || sl.toLowerCase().includes(k)
+        })
       }
       setData(items)
       setTotal(res.total)
@@ -105,41 +126,41 @@ const PointsTransactions: React.FC = () => {
       title: "类型",
       dataIndex: "type",
       width: 90,
-      render: (t: PointsTxType) => {
+      render: (t: PointsTxType, r: PointsTransaction) => {
+        if (r.source.startsWith("refund:")) {
+          return <Tag color="blue">退还</Tag>
+        }
         const cfg = TYPE_LABEL[t]
-        return <Tag color={cfg.color}>{cfg.text}</Tag>
+        return <Tag color={cfg?.color || "default"}>{cfg?.text || t}</Tag>
       },
     },
     {
       title: "来源/场景",
       dataIndex: "source",
-      width: 150,
-      render: (s: string, r: PointsTransaction) => (
-        <Space>
-          <Text>{r.source_name || SOURCE_LABEL[s] || s}</Text>
-        </Space>
-      ),
+      width: 180,
+      render: (s: string) => <Text>{sourceLabel(s).label}</Text>,
     },
     {
       title: "说明",
       dataIndex: "description",
       ellipsis: true,
+      render: (v: string) => v || "-",
     },
     {
       title: "变动",
-      dataIndex: "signed_amount",
+      dataIndex: "amount",
       width: 110,
       align: "right",
-      render: (v: number, r: PointsTransaction) => (
-        <span
-          className={
-            r.type === "earn" ? "xx-tx-earn" : r.type === "refund" ? "xx-tx-refund" : "xx-tx-spend"
-          }
-        >
-          {v > 0 ? "+" : ""}
-          {v}
-        </span>
-      ),
+      render: (v: number, r: PointsTransaction) => {
+        const isRefund = r.source.startsWith("refund:")
+        const positive = r.type === "add" || isRefund
+        return (
+          <span className={positive ? "xx-tx-earn" : "xx-tx-spend"}>
+            {positive ? "+" : "-"}
+            {v}
+          </span>
+        )
+      },
     },
     {
       title: "余额",
@@ -159,13 +180,12 @@ const PointsTransactions: React.FC = () => {
       <PageHead
         title="积分明细"
         description="查看积分收入、消耗与退还记录"
-
         actions={
           <Space>
             <Button icon={<ReloadOutlined />} onClick={load}>
               刷新
             </Button>
-            <Button type="primary" onClick={() => navigate("/app/subscription")}>
+            <Button type="primary" onClick={() => navigate("/points/recharge")}>
               充值积分
             </Button>
           </Space>
@@ -184,9 +204,8 @@ const PointsTransactions: React.FC = () => {
               style={{ width: 120 }}
               options={[
                 { value: "all", label: "全部类型" },
-                { value: "earn", label: "获得" },
-                { value: "spend", label: "消耗" },
-                { value: "refund", label: "退还" },
+                { value: "add", label: "获得" },
+                { value: "deduct", label: "消耗" },
               ]}
             />
             <Select

apps/web/src/pages/scripts/ScriptLibrary.tsx

@@ -1,19 +1,17 @@
 /**
- * 文案库页面 — Issue #1811（v2 完整版） + #1893 AI 能力
+ * 文案库页面 — Issue #1811（#1894 方向修正后）
  * 功能：
  * - 列表页：卡片列表，搜索（标题/正文）、分类标签筛选、分页
- *   每条卡片展示：title、content 前 100 字摘要、title_text、分类 Tag、tags、使用次数、时间
+ *   每条卡片展示：title（标题）、content 前 100 字摘要、分类 Tag、tags、使用次数、时间
  *   操作：编辑 / 删除 / 复制 / 使用（跳创作页预填）
- * - 新建/编辑弹窗：title、content 多行、segments（按空行自动拆分+手动编辑）、title_text、title_category、
- *   title_config（字体/颜色/位置/字号）、tags
- * - #1893 AI 能力：
+ * - 新建/编辑弹窗：标题（原"名称"）、正文（含 AI 改写）、分类、标签
+ * - #1893/#1894 AI 能力：
  *   - 顶部「🎬 从抖音提取」按钮 → 输入抖音链接 → ASR 提取文案 → 自动填充到新建弹窗
- *   - 新建/编辑弹窗中 content 下方「✨ AI 改写」按钮（带风格选择） → 对比弹窗让用户确认
- *   - title 旁「✨ AI 生成标题」按钮 → 候选列表一键填入
+ *   - 正文下方「✨ AI 改写」按钮 → 点击直接执行（美化 loading spinner + "正在改写..."），
+ *     成功自动替换正文并 toast「改写成功」1s 自动关闭；失败 toast 错误
+ *   - 标题旁「✨ AI 生成标题」按钮 → 候选列表一键填入
  * - 删除确认（Popconfirm）
  * - 对接 api/scripts CRUD（mock 阶段 SCRIPTS_API_MOCK=true，AI 接口始终走真实 API）
- *
- * 风格对齐标题库（.xx-scripts-* 命名，沿用 CSS 变量）
  */
 import React, { useCallback, useEffect, useState } from "react"
 import {
@@ -22,8 +20,6 @@ import {
   Empty,
   Form,
   Input,
-  InputNumber,
-  List,
   Modal,
   Pagination,
   Popconfirm,
@@ -59,13 +55,7 @@ import {
   aiGenerateTitles,
   REWRITE_STYLE_OPTIONS,
 } from "@/api/scripts"
-import type {
-  ScriptItem,
-  ScriptCategory,
-  ScriptUpsertRequest,
-  RewriteStyle,
-  AiRewriteResponse,
-} from "@/api/scripts"
+import type { ScriptItem, ScriptCategory, ScriptUpsertRequest, RewriteStyle } from "@/api/scripts"
 import { SCRIPT_CATEGORY_LABEL } from "@/api/scripts"
 import "./scripts.css"
 
@@ -81,19 +71,6 @@ const CATEGORY_OPTIONS: { value: ScriptCategory | "all"; label: string }[] = [
   })),
 ]
 
-const FONT_OPTIONS = [
-  { value: "default", label: "默认" },
-  { value: "bold", label: "粗体" },
-  { value: "handwritten", label: "手写" },
-  { value: "serif", label: "衬线" },
-]
-
-const POSITION_OPTIONS = [
-  { value: "top", label: "顶部" },
-  { value: "center", label: "居中" },
-  { value: "bottom", label: "底部" },
-] as const
-
 /** 提取后端返回的错误 detail（全局拦截器可能已弹 toast，但这里再兜一层） */
 function extractErrMsg(err: unknown, fallback: string): string {
   const e = err as {
@@ -132,11 +109,9 @@ const ScriptLibrary: React.FC = () => {
   const [douyinUrl, setDouyinUrl] = useState("")
   const [douyinLoading, setDouyinLoading] = useState(false)
 
-  // AI 改写
-  const [rewriteModalOpen, setRewriteModalOpen] = useState(false)
+  // AI 改写（#1894: 点击直接执行，美化 loading + 1s 自动关闭 toast，不弹确认弹窗）
   const [rewriteStyle, setRewriteStyle] = useState<RewriteStyle>("口语化")
   const [rewriteLoading, setRewriteLoading] = useState(false)
-  const [rewriteResult, setRewriteResult] = useState<AiRewriteResponse | null>(null)
 
   // AI 生成标题
   const [titleGenLoading, setTitleGenLoading] = useState(false)
@@ -176,19 +151,8 @@ const ScriptLibrary: React.FC = () => {
       content: "",
       segments: [],
       tags: [],
-      title_text: "",
       title_category: "other",
-      title_config: {
-        font: "default",
-        color: "#ffffff",
-        stroke: "#000000",
-        position: "center",
-        size: 48,
-        bold: true,
-        italic: false,
-      },
     })
-    setRewriteResult(null)
     setTitleCandidates([])
   }
 
@@ -205,17 +169,8 @@ const ScriptLibrary: React.FC = () => {
       content: item.content,
       segments: item.segments ?? item.content.split(/\n\n+/).filter(Boolean),
       tags: item.tags ?? [],
-      title_text: item.title_text ?? "",
       title_category: item.title_category ?? "other",
-      title_config: item.title_config ?? {
-        font: "default",
-        color: "#ffffff",
-        stroke: "#000000",
-        position: "center",
-        size: 48,
-      },
     })
-    setRewriteResult(null)
     setTitleCandidates([])
     setModalOpen(true)
   }
@@ -223,7 +178,6 @@ const ScriptLibrary: React.FC = () => {
   const closeModal = () => {
     setModalOpen(false)
     setEditing(null)
-    setRewriteResult(null)
     setTitleCandidates([])
   }
 
@@ -237,9 +191,8 @@ const ScriptLibrary: React.FC = () => {
         content: values.content,
         segments: values.segments?.filter(Boolean) ?? values.content.split(/\n\n+/).filter(Boolean),
         tags: values.tags ?? [],
-        title_text: values.title_text?.trim() || undefined,
         title_category: values.title_category,
-        title_config: values.title_config,
+        // #1894: 配套标题 / 标题样式配置字段已从 UI 移除，后端即将删除，不再传
       }
       if (editing) {
         await updateScript(editing.id, payload)
@@ -343,17 +296,7 @@ const ScriptLibrary: React.FC = () => {
         title: "",
         content: res.text,
         tags: [],
-        title_text: "",
         title_category: "other",
-        title_config: {
-          font: "default",
-          color: "#ffffff",
-          stroke: "#000000",
-          position: "center",
-          size: 48,
-          bold: true,
-          italic: false,
-        },
       })
       setModalOpen(true)
     } catch (err) {
@@ -363,18 +306,18 @@ const ScriptLibrary: React.FC = () => {
     }
   }
 
-  /** 执行 AI 改写，结果写入 rewriteResult 让用户对比确认 */
-  const handleAiRewrite = async () => {
+  /** #1894: 执行 AI 改写，完成后自动替换正文并 toast 1 秒关闭 */
+  const handleAiRewrite = async (style: RewriteStyle) => {
     const content = form.getFieldValue("content") as string | undefined
     if (!content || !content.trim()) {
       message.warning("请先填写文案正文再改写")
       return
     }
     setRewriteLoading(true)
-    setRewriteResult(null)
     try {
-      const res = await aiRewriteScript({ content, style: rewriteStyle })
-      setRewriteResult(res)
+      const res = await aiRewriteScript({ content, style })
+      form.setFieldsValue({ content: res.rewritten })
+      message.success({ content: "改写成功", duration: 1 })
     } catch (err) {
       message.error(extractErrMsg(err, "AI 改写失败"))
     } finally {
@@ -382,15 +325,6 @@ const ScriptLibrary: React.FC = () => {
     }
   }
 
-  /** 应用改写结果：替换 content 字段，关闭改写弹窗 */
-  const applyRewrite = () => {
-    if (!rewriteResult) return
-    form.setFieldsValue({ content: rewriteResult.rewritten })
-    setRewriteResult(null)
-    setRewriteModalOpen(false)
-    message.success("已应用改写结果")
-  }
-
   /** 执行 AI 生成标题，生成候选 */
   const handleGenerateTitles = async () => {
     const content = form.getFieldValue("content") as string | undefined
@@ -527,13 +461,6 @@ const ScriptLibrary: React.FC = () => {
 
                   <div className="xx-script-preview">{preview(s.content)}</div>
 
-                  {s.title_text && (
-                    <div className="xx-script-title-text">
-                      <span className="xx-script-label">配套标题：</span>
-                      {s.title_text}
-                    </div>
-                  )}
-
                   {s.tags && s.tags.length > 0 && (
                     <div className="xx-script-tags">
                       <TagsOutlined
@@ -590,21 +517,13 @@ const ScriptLibrary: React.FC = () => {
           layout="vertical"
           initialValues={{
             title_category: "other",
-            title_config: {
-              font: "default",
-              color: "#ffffff",
-              stroke: "#000000",
-              position: "center",
-              size: 48,
-              bold: true,
-            },
           }}
         >
           <Form.Item
             name="title"
             label={
               <span>
-                名称
+                标题
                 {/* #1893 UX: disabled 时原生 title 在 antd Button 上不触发，
                     用 Tooltip + span 包裹保证提示可见 */}
                 <Tooltip
@@ -626,9 +545,9 @@ const ScriptLibrary: React.FC = () => {
                 </Tooltip>
               </span>
             }
-            rules={[{ required: true, message: "请填写文案名称" }, { max: 200 }]}
+            rules={[{ required: true, message: "请填写视频标题" }, { max: 200 }]}
           >
-            <Input placeholder="给这段文案起个名字" maxLength={200} />
+            <Input placeholder="输入视频标题" maxLength={200} />
           </Form.Item>
 
           {/* AI 生成标题候选列表 */}
@@ -661,9 +580,9 @@ const ScriptLibrary: React.FC = () => {
             <TextArea placeholder="在这里输入文案正文…" rows={6} maxLength={10000} />
           </Form.Item>
 
-          {/* AI 改写工具条 */}
+          {/* AI 改写工具条（#1894 UX：点击直接执行，自定义渐变圆环 loading） */}
           <div className="xx-ai-rewrite-bar">
-            <Space size={8} wrap>
+            <Space size={8} wrap align="center">
               <Select
                 value={rewriteStyle}
                 onChange={setRewriteStyle}
@@ -672,30 +591,19 @@ const ScriptLibrary: React.FC = () => {
                 size="small"
                 disabled={rewriteLoading}
               />
-              {/* #1893 UX: content 为空时禁用改写按钮并给提示，避免用户点了才弹 warning */}
-              <Tooltip title={contentEmpty ? "请先填写文案正文再改写" : ""}>
-                <span style={{ display: "inline-flex" }}>
-                  <Button
-                    size="small"
-                    icon={<RobotOutlined />}
-                    loading={rewriteLoading}
-                    disabled={contentEmpty}
-                    onClick={() => {
-                      // 每次打开重置上一次结果，避免误看旧对比
-                      if (!rewriteLoading) {
-                        setRewriteResult(null)
-                        setRewriteModalOpen(true)
-                      }
-                    }}
-                  >
-                    ✨ AI 改写
-                  </Button>
+              <Button
+                size="small"
+                icon={<RobotOutlined />}
+                disabled={contentEmpty || rewriteLoading}
+                onClick={() => handleAiRewrite(rewriteStyle)}
+              >
+                ✨ AI 改写
+              </Button>
+              {rewriteLoading && (
+                <span className="xx-ai-rewrite-loading">
+                  <span className="xx-ai-rewrite-spinner" />
+                  <span className="xx-ai-rewrite-loading-text">正在改写...</span>
                 </span>
-              </Tooltip>
-              {rewriteResult && !contentEmpty && (
-                <Button size="small" type="link" onClick={() => setRewriteModalOpen(true)}>
-                  查看上一次改写结果
-                </Button>
               )}
             </Space>
           </div>
@@ -704,57 +612,6 @@ const ScriptLibrary: React.FC = () => {
             <Input />
           </Form.Item>
 
-          <Form.Item name="title_text" label="配套标题（选填）" rules={[{ max: 200 }]}>
-            <Input placeholder="使用此文案时自动带入的标题文本" maxLength={200} />
-          </Form.Item>
-
-          <Space size={16} style={{ display: "flex" }}>
-            <Form.Item name="title_category" label="分类" style={{ flex: 1, marginBottom: 0 }}>
-              <Select options={CATEGORY_OPTIONS.filter((o) => o.value !== "all")} />
-            </Form.Item>
-            <Form.Item
-              name={["title_config", "position"]}
-              label="标题位置"
-              style={{ flex: 1, marginBottom: 0 }}
-            >
-              <Select options={POSITION_OPTIONS as unknown as { value: string; label: string }[]} />
-            </Form.Item>
-          </Space>
-
-          <Space size={16} style={{ display: "flex", marginTop: 12 }}>
-            <Form.Item
-              name={["title_config", "font"]}
-              label="字体"
-              style={{ flex: 1, marginBottom: 0 }}
-            >
-              <Select options={FONT_OPTIONS} />
-            </Form.Item>
-            <Form.Item
-              name={["title_config", "size"]}
-              label="字号"
-              style={{ flex: 1, marginBottom: 0 }}
-            >
-              <InputNumber min={20} max={120} style={{ width: "100%" }} addonAfter="px" />
-            </Form.Item>
-          </Space>
-
-          <Space size={16} style={{ display: "flex", marginTop: 12 }}>
-            <Form.Item
-              name={["title_config", "color"]}
-              label="文字颜色"
-              style={{ flex: 1, marginBottom: 0 }}
-            >
-              <Input type="color" style={{ width: "100%", height: 32, padding: 4 }} />
-            </Form.Item>
-            <Form.Item
-              name={["title_config", "stroke"]}
-              label="描边色"
-              style={{ flex: 1, marginBottom: 0 }}
-            >
-              <Input type="color" style={{ width: "100%", height: 32, padding: 4 }} />
-            </Form.Item>
-          </Space>
-
           <Form.Item name="tags" label="标签" style={{ marginTop: 12 }}>
             <Select
               mode="tags"
@@ -798,81 +655,6 @@ const ScriptLibrary: React.FC = () => {
           </div>
         )}
       </Modal>
-
-      {/* AI 改写对比弹窗 */}
-      <Modal
-        title={`✨ AI 改写（${rewriteStyle}风格）`}
-        open={rewriteModalOpen}
-        onCancel={() => !rewriteLoading && setRewriteModalOpen(false)}
-        maskClosable={!rewriteLoading}
-        closable={!rewriteLoading}
-        footer={
-          rewriteResult ? (
-            <Space>
-              <Button onClick={() => setRewriteModalOpen(false)}>保留原文</Button>
-              <Button type="primary" onClick={applyRewrite}>
-                应用改写
-              </Button>
-            </Space>
-          ) : (
-            <Button disabled={rewriteLoading} onClick={() => setRewriteModalOpen(false)}>
-              关闭
-            </Button>
-          )
-        }
-        width={640}
-        destroyOnClose={false}
-      >
-        {!rewriteResult && !rewriteLoading && (
-          <Paragraph type="secondary" style={{ marginBottom: 16 }}>
-            将以「{rewriteStyle}」风格改写正文，生成后可对比确认是否应用。
-          </Paragraph>
-        )}
-        {rewriteLoading && (
-          <div className="xx-ai-loading-hint" style={{ padding: "32px 0" }}>
-            <Spin tip="AI 改写中…" />
-          </div>
-        )}
-        {rewriteResult && (
-          <List
-            dataSource={[
-              { label: "原文", text: rewriteResult.original, type: "original" },
-              {
-                label: `改写（${rewriteResult.style}）`,
-                text: rewriteResult.rewritten,
-                type: "rewrite",
-              },
-            ]}
-            renderItem={(item) => (
-              <List.Item className="xx-ai-rewrite-item">
-                <div className="xx-ai-rewrite-block">
-                  <div className="xx-ai-rewrite-label">
-                    <Tag color={item.type === "original" ? "default" : "purple"}>{item.label}</Tag>
-                  </div>
-                  <Paragraph
-                    className="xx-ai-rewrite-text"
-                    style={{ whiteSpace: "pre-wrap", marginBottom: 0 }}
-                  >
-                    {item.text}
-                  </Paragraph>
-                </div>
-              </List.Item>
-            )}
-          />
-        )}
-        {!rewriteResult && !rewriteLoading && (
-          <div style={{ textAlign: "center" }}>
-            <Button
-              type="primary"
-              icon={<RobotOutlined />}
-              loading={rewriteLoading}
-              onClick={handleAiRewrite}
-            >
-              开始改写
-            </Button>
-          </div>
-        )}
-      </Modal>
     </div>
   )
 }

apps/web/src/pages/scripts/scripts.css

@@ -258,3 +258,51 @@
   background: linear-gradient(180deg, #faf5ff 0%, #ffffff 100%);
   border: 1px solid #eee6ff;
 }
+
+/* #1894: AI 改写内联 loading —— 渐变圆环旋转动画，替代 antd 默认 Spin */
+.xx-ai-rewrite-loading {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  margin-left: 4px;
+}
+.xx-ai-rewrite-spinner {
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  border: 2px solid transparent;
+  border-top-color: #9254de;
+  border-right-color: #722ed1;
+  background:
+    linear-gradient(#fff, #fff) padding-box,
+    conic-gradient(from 0deg, #9254de, #4096ff, #9254de) border-box;
+  -webkit-mask:
+    linear-gradient(#000 0 0) content-box,
+    linear-gradient(#000 0 0);
+  -webkit-mask-composite: xor;
+  mask-composite: exclude;
+  animation: xx-ai-rewrite-spin 0.9s linear infinite;
+}
+@keyframes xx-ai-rewrite-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+.xx-ai-rewrite-loading-text {
+  font-size: 13px;
+  color: var(--text-secondary, #666);
+  background: linear-gradient(90deg, #722ed1, #4096ff, #722ed1);
+  background-size: 200% 100%;
+  -webkit-background-clip: text;
+  background-clip: text;
+  color: transparent;
+  animation: xx-ai-rewrite-text-shimmer 2s linear infinite;
+}
+@keyframes xx-ai-rewrite-text-shimmer {
+  0% {
+    background-position: 0% 0;
+  }
+  100% {
+    background-position: 200% 0;
+  }
+}

apps/web/src/pages/subscription/Billing.tsx

@@ -1,15 +1,28 @@
 /**
  * 账单管理页面
- * 展示当前订阅信息 + 自动续费开关
- * P1-3: antd Switch→自定义ToggleSwitch, antd Spin→自定义Spinner
+ * 展示当前订阅信息 + 自动续费开关 + 账单历史
+ *
+ * 字段对齐新契约（2026-09-16）：
+ *  - toggleAutoRenew 参数改为 {enabled} 对象
+ *  - billing_cycle 仅 monthly/yearly（季卡走 monthly 周期 + 3 个月时长）
+ *  - 新增账单历史表格：order_type / amount_cents / status / created_at
  */
 import React, { useState, useEffect } from "react"
-import { message } from "antd"
-import { getCurrentSubscription, toggleAutoRenew } from "@/api/subscription"
-import type { SubscriptionInfo } from "@/api/subscription"
+import { message, Table, Tag, Card, Space, Button, Modal, Typography } from "antd"
+import type { ColumnsType } from "antd/es/table"
+import {
+  getCurrentSubscription,
+  toggleAutoRenew,
+  cancelSubscription,
+  getBillingRecords,
+} from "@/api/subscription"
+import type { SubscriptionInfo, BillingRecord } from "@/api/subscription/types"
+import { PLAN_LABEL, BILLING_CYCLE_LABEL } from "@/api/subscription/types"
 import PageHead from "@/components/layout/PageHead"
 import "./Billing.css"
 
+const { Text } = Typography
+
 const formatDate = (iso: string): string => {
   const d = new Date(iso)
   return d.toLocaleDateString("zh-CN", {
@@ -51,21 +64,40 @@ const Spinner: React.FC<{ size?: "small" | "large" }> = ({ size = "large" }) =>
   </div>
 )
 
+const ORDER_TYPE_LABEL: Record<string, string> = {
+  subscribe: "新购",
+  renew: "续费",
+  upgrade: "升级",
+  downgrade: "降级",
+  refund: "退款",
+}
+
+const BILLING_STATUS_TAG: Record<string, { color: string; text: string }> = {
+  paid: { color: "green", text: "已支付" },
+  pending: { color: "orange", text: "待支付" },
+  failed: { color: "red", text: "支付失败" },
+  refunded: { color: "blue", text: "已退款" },
+  cancelled: { color: "default", text: "已取消" },
+}
+
 const Billing: React.FC = () => {
   const [subscription, setSubscription] = useState<SubscriptionInfo | null>(null)
+  const [billingRecords, setBillingRecords] = useState<BillingRecord[]>([])
   const [loading, setLoading] = useState(true)
+  const [recordsLoading, setRecordsLoading] = useState(false)
   const [autoRenewChecked, setAutoRenewChecked] = useState(false)
   const [autoRenewLoading, setAutoRenewLoading] = useState(false)
 
   useEffect(() => {
     loadData()
+    loadRecords()
   }, [])
 
   const loadData = async () => {
     try {
       const data = await getCurrentSubscription()
       setSubscription(data)
-      setAutoRenewChecked(data.auto_renew)
+      setAutoRenewChecked(!!data.auto_renew)
     } catch (err: unknown) {
       if (!(err as { __msgShown?: boolean })?.__msgShown) message.error("加载订阅数据失败")
     } finally {
@@ -73,22 +105,106 @@ const Billing: React.FC = () => {
     }
   }
 
+  const loadRecords = async () => {
+    try {
+      setRecordsLoading(true)
+      const list = await getBillingRecords()
+      setBillingRecords(Array.isArray(list) ? list : [])
+    } catch {
+      // 账单加载失败不阻塞主流程
+      setBillingRecords([])
+    } finally {
+      setRecordsLoading(false)
+    }
+  }
+
   const handleToggleAutoRenew = async (checked: boolean) => {
     setAutoRenewLoading(true)
     try {
-      const res = await toggleAutoRenew(checked)
-      message.success(res.message)
+      const res = await toggleAutoRenew({ enabled: checked })
+      message.success(res?.message ?? (checked ? "已开启自动续费" : "已关闭自动续费"))
       setAutoRenewChecked(checked)
       if (subscription) {
         setSubscription({ ...subscription, auto_renew: checked })
       }
     } catch (err: unknown) {
-      if (!(err as { __msgShown?: boolean })?.__msgShown) message.error("操作失败")
+      const e = err as { response?: { data?: { error?: { message?: string } } }; message?: string }
+      message.error(e?.response?.data?.error?.message || e?.message || "操作失败")
     } finally {
       setAutoRenewLoading(false)
     }
   }
 
+  const handleCancelSubscription = () => {
+    Modal.confirm({
+      title: "确认取消订阅？",
+      content: "取消后，当前周期结束时将不再自动续费。您仍可使用当前会员权益至到期日。",
+      okText: "确认取消",
+      okType: "danger",
+      cancelText: "我再想想",
+      onOk: async () => {
+        try {
+          await cancelSubscription()
+          message.success("已取消订阅，到期后不再续费")
+          await loadData()
+        } catch (err: unknown) {
+          const e = err as {
+            response?: { data?: { error?: { message?: string } } }
+            message?: string
+          }
+          message.error(e?.response?.data?.error?.message || e?.message || "取消失败")
+        }
+      },
+    })
+  }
+
+  const columns: ColumnsType<BillingRecord> = [
+    {
+      title: "时间",
+      dataIndex: "created_at",
+      width: 170,
+      render: (v: string) => formatDate(v),
+    },
+    {
+      title: "类型",
+      dataIndex: "order_type",
+      width: 100,
+      render: (v: string) => ORDER_TYPE_LABEL[v] || v || "-",
+    },
+    {
+      title: "套餐",
+      dataIndex: "plan_id",
+      width: 120,
+      render: (v: string) => (v ? PLAN_LABEL[v as keyof typeof PLAN_LABEL] || v : "-"),
+    },
+    {
+      title: "金额",
+      dataIndex: "amount_cents",
+      width: 110,
+      align: "right",
+      render: (v: number) => (
+        <Text strong style={{ fontVariantNumeric: "tabular-nums" }}>
+          ¥{((v ?? 0) / 100).toFixed(2)}
+        </Text>
+      ),
+    },
+    {
+      title: "状态",
+      dataIndex: "status",
+      width: 100,
+      render: (v: string) => {
+        const cfg = BILLING_STATUS_TAG[v]
+        return <Tag color={cfg?.color || "default"}>{cfg?.text || v || "-"}</Tag>
+      },
+    },
+    {
+      title: "支付时间",
+      dataIndex: "paid_at",
+      width: 170,
+      render: (v?: string) => (v ? formatDate(v) : <Text type="secondary">—</Text>),
+    },
+  ]
+
   if (loading) {
     return (
       <div className="xx-billing-page">
@@ -109,19 +225,42 @@ const Billing: React.FC = () => {
             <div className="xx-overview-details">
               <div className="xx-overview-item">
                 <span className="xx-label">套餐</span>
-                <span className="xx-value">{subscription.plan_name}</span>
+                <span className="xx-value">
+                  {subscription.plan_name ||
+                    PLAN_LABEL[subscription.plan_id as keyof typeof PLAN_LABEL] ||
+                    "-"}
+                </span>
               </div>
               <div className="xx-overview-item">
                 <span className="xx-label">计费周期</span>
                 <span className="xx-value">
-                  {subscription.billing_cycle === "monthly" ? "月付" : "年付"}
+                  {BILLING_CYCLE_LABEL[
+                    subscription.billing_cycle as keyof typeof BILLING_CYCLE_LABEL
+                  ] ||
+                    subscription.billing_cycle ||
+                    "-"}
                 </span>
               </div>
               <div className="xx-overview-item">
-                <span className="xx-label">下次扣费</span>
+                <span className="xx-label">本期金额</span>
+                <span className="xx-value">¥{((subscription.amount ?? 0) / 100).toFixed(2)}</span>
+              </div>
+              <div className="xx-overview-item">
+                <span className="xx-label">周期开始</span>
+                <span className="xx-value">{formatDate(subscription.current_period_start)}</span>
+              </div>
+              <div className="xx-overview-item">
+                <span className="xx-label">下次扣费/到期</span>
                 <span className="xx-value">{formatDate(subscription.current_period_end)}</span>
               </div>
             </div>
+            {subscription.plan_id !== "free" && (
+              <Space style={{ marginTop: 16 }}>
+                <Button danger onClick={handleCancelSubscription}>
+                  取消订阅
+                </Button>
+              </Space>
+            )}
           </div>
 
           {/* 自动续费 */}
@@ -145,6 +284,26 @@ const Billing: React.FC = () => {
           </div>
         </>
       )}
+
+      {/* 账单历史 */}
+      <Card
+        title="账单历史"
+        style={{ marginTop: 16 }}
+        extra={
+          <Button size="small" onClick={loadRecords} loading={recordsLoading}>
+            刷新
+          </Button>
+        }
+      >
+        <Table<BillingRecord>
+          rowKey="id"
+          columns={columns}
+          dataSource={billingRecords}
+          loading={recordsLoading}
+          pagination={{ pageSize: 10, showSizeChanger: false }}
+          locale={{ emptyText: "暂无账单记录" }}
+        />
+      </Card>
     </div>
   )
 }

apps/web/src/pages/subscription/Plans.tsx

@@ -1,8 +1,10 @@
 /**
  * 会员订阅 & 积分充值页
- * v2 两档会员制：免费 vs 付费
- * 付费三档：月¥19.9 / 季¥39.9（推荐）/ 年¥159
- * 积分包：100/¥9.9、500/¥39、2000/¥129
+ * v3: 对齐后端最终契约（2026-09-16）
+ *  - 订阅计划走 GET /subscription/plans（4 档：free/monthly/quarterly/yearly）
+ *  - 积分包走 GET /points/packages，折后价 = price_cents × (user_discount ?? 1)
+ *  - 当前身份/余额优先从 membership + dailyUsage 取，降级 balance
+ *  - 暂保留 SUBSCRIPTION_PLANS_FALLBACK 常量，API 失败时降级
  */
 import React, { useEffect, useMemo, useState } from "react"
 import {
@@ -30,16 +32,19 @@ import {
 import { useNavigate } from "react-router-dom"
 import PageHead from "@/components/layout/PageHead"
 import { usePointsStore } from "@/store/pointsStore"
-import { SUBSCRIPTION_PLANS, createPointsOrder } from "@/api/points"
-import type { PointsPackage } from "@/api/points/types"
-import { getPointsPackages } from "@/api/points"
+import { createPointsOrder, getPointsPackages } from "@/api/points"
+import { getSubscriptionPlans, changePlan } from "@/api/subscription"
+import type { PointsPackage, PointsPackagesResponse } from "@/api/points/types"
+import { getDiscountPriceCents } from "@/api/points/types"
+import type { SubscriptionPlan } from "@/api/subscription/types"
+import { PLAN_LABEL, BILLING_CYCLE_LABEL } from "@/api/subscription/types"
 import "./Plans.css"
 
 const { Title, Text, Paragraph } = Typography
 
-/** 免费会员权益 */
+/** 免费会员权益（根据后端 features 动态展示，这里保留兜底） */
 const FREE_FEATURES = [
-  { include: true, text: "每日 2 条免费混剪" },
+  { include: true, text: "每日免费混剪额度" },
   { include: true, text: "720p 导出分辨率" },
   { include: true, text: "AI 配音（×1.15 积分）" },
   { include: true, text: "AI 数字人（×1.15 积分）" },
@@ -49,91 +54,181 @@ const FREE_FEATURES = [
   { include: false, text: "去重检测报告" },
 ]
 
-/** 付费会员权益 */
+/** 付费会员权益（兜底） */
 const PAID_FEATURES = [
-  { include: true, text: "无限次智能混剪" },
+  { include: true, text: "智能混剪按会员折扣积分" },
   { include: true, text: "最高 1080p 导出" },
-  { include: true, text: "全部 AI 功能（标准积分价）" },
+  { include: true, text: "全部 AI 功能（会员折扣积分）" },
   { include: true, text: "声音克隆训练免费" },
-  { include: true, text: "积分购买最低 8 折" },
+  { include: true, text: "积分购买最低折扣" },
   { include: true, text: "批量导出" },
   { include: true, text: "多平台一键发布" },
   { include: true, text: "去重检测报告" },
 ]
 
+/** 旧 SUBSCRIPTION_PLANS 兜底（API 不可用时） */
+const SUBSCRIPTION_PLANS_FALLBACK = [
+  {
+    id: "monthly" as const,
+    name: "月卡",
+    price_cents: 1990,
+    per_month_yuan: "19.9",
+    savings_percent: 0,
+    recommended: false,
+    billing_label: "/月",
+    billing_cycle: "monthly" as const,
+  },
+  {
+    id: "quarterly" as const,
+    name: "季卡",
+    price_cents: 3990,
+    per_month_yuan: "13.3",
+    savings_percent: 33,
+    recommended: true,
+    billing_label: "/季",
+    billing_cycle: "monthly" as const,
+  },
+  {
+    id: "yearly" as const,
+    name: "年卡",
+    price_cents: 15900,
+    per_month_yuan: "13.25",
+    savings_percent: 34,
+    recommended: false,
+    billing_label: "/年",
+    billing_cycle: "yearly" as const,
+  },
+]
+
 const formatYuan = (cents: number) =>
   `¥${(cents / 100).toFixed(cents % 100 === 0 ? 0 : 1).replace(/\.0$/, "")}`
 
 const Plans: React.FC = () => {
   const navigate = useNavigate()
-  const { balance, init } = usePointsStore()
+  const { balance, dailyUsage, membership, subscription, init } = usePointsStore()
+  const [plans, setPlans] = useState<SubscriptionPlan[]>([])
+  const [packagesResp, setPackagesResp] = useState<PointsPackagesResponse | null>(null)
+  const [subscribing, setSubscribing] = useState(false)
+  const [buying, setBuying] = useState<string | null>(null)
   const [selectedBilling, setSelectedBilling] = useState<"monthly" | "quarterly" | "yearly">(
     "quarterly",
   )
-  const [packages, setPackages] = useState<PointsPackage[]>([])
-  const [subscribing] = useState(false)
-  const [buying, setBuying] = useState<string | null>(null)
 
   useEffect(() => {
     init()
+    // 拉取订阅计划
+    getSubscriptionPlans()
+      .then((r) => {
+        const paid = r.plans.filter((p) => p.plan_id !== "free")
+        setPlans(paid)
+        // 默认选季卡，没有就选第一个
+        const hasQuarterly = paid.some((p) => p.plan_id === "quarterly")
+        if (!hasQuarterly && paid.length > 0) setSelectedBilling(paid[0].plan_id as "monthly")
+      })
+      .catch(() => {
+        // 降级
+      })
     getPointsPackages()
-      .then((r) => setPackages(r.packages))
+      .then((r) => setPackagesResp(r))
       .catch(() => {})
   }, [init])
 
-  const isMember = !!balance?.is_member
-  const memberType = balance?.member_type ?? null
+  const packages = packagesResp?.packages ?? []
+  const userDiscount = packagesResp?.user_discount ?? null
 
-  /** 根据会员等级计算积分包折后价（分） */
-  const getPackPrice = (pkg: PointsPackage): number => {
-    const mt = memberType ?? "free"
-    type DiscountKey =
-      | "discounted_price_for_free"
-      | "discounted_price_for_monthly"
-      | "discounted_price_for_quarterly"
-      | "discounted_price_for_yearly"
-    const key = `discounted_price_for_${mt}` as DiscountKey
-    return pkg[key] ?? pkg.price
-  }
+  const isMember = membership?.is_member ?? balance?.is_member ?? false
+  // 当前会员档位：优先 membership.member_type，降级 subscription.plan_id
+  const memberPlanId =
+    membership?.member_type ??
+    (subscription?.plan_id && subscription.plan_id !== "free" ? subscription.plan_id : null)
+
+  const bal = membership?.points_balance ?? balance?.balance ?? 0
+  const freeUsed = dailyUsage?.free_clips_used ?? 0
+  const freeLimit = dailyUsage?.free_clips_limit ?? (isMember ? 0 : 3)
+  const freeRemain = dailyUsage?.free_clips_remaining ?? (isMember ? 0 : freeLimit - freeUsed)
+
+  /** 统一的可选付费档位（API 返回 + 兜底） */
+  const billingOptions = useMemo(() => {
+    if (plans.length > 0) {
+      return plans.map((p) => {
+        const id = p.plan_id as "monthly" | "quarterly" | "yearly"
+        const perMonth =
+          p.duration_days > 0
+            ? (p.price_cents / 100 / (p.duration_days / 30)).toFixed(1)
+            : (p.monthly_price_cents / 100).toFixed(1)
+        const monthlyCents = p.monthly_price_cents || p.price_cents
+        const savings =
+          p.price_cents > 0 && monthlyCents > 0
+            ? Math.max(
+                0,
+                Math.round((1 - p.price_cents / (monthlyCents * (p.duration_days / 30))) * 100),
+              )
+            : 0
+        return {
+          id,
+          name: p.name,
+          price_cents: p.price_cents,
+          per_month_yuan: perMonth,
+          savings_percent: savings,
+          recommended: id === "quarterly",
+          billing_label: id === "yearly" ? "/年" : id === "quarterly" ? "/季" : "/月",
+          billing_cycle: (id === "yearly" ? "yearly" : "monthly") as "monthly" | "yearly",
+        }
+      })
+    }
+    return SUBSCRIPTION_PLANS_FALLBACK
+  }, [plans])
 
   const selectedPlan = useMemo(
-    () => SUBSCRIPTION_PLANS.find((p) => p.id === selectedBilling)!,
-    [selectedBilling],
+    () => billingOptions.find((p) => p.id === selectedBilling) ?? billingOptions[0],
+    [billingOptions, selectedBilling],
   )
 
   const handleSubscribe = async () => {
-    Modal.confirm({
-      title: "支付功能开发中",
-      icon: <SafetyCertificateOutlined />,
-      content: "微信/支付宝支付正在接入中，完成后会第一时间通知。是否返回首页继续使用免费功能？",
-      okText: "返回首页",
-      cancelText: "留在此页",
-      onOk: () => navigate("/app/dashboard"),
-    })
-    // 实际对接时：
-    // try {
-    //   setSubscribing(true)
-    //   const order = await subscribe({ member_type: selectedBilling, payment_method: "wechat_pay" })
-    //   // 拉起支付...
-    // } catch (e: any) {
-    //   message.error(e?.message ?? "订阅失败")
-    // } finally {
-    //   setSubscribing(false)
-    // }
+    if (!selectedPlan) return
+    try {
+      setSubscribing(true)
+      await changePlan({
+        target_plan_id: selectedPlan.id,
+        billing_cycle: selectedPlan.billing_cycle,
+      })
+      Modal.success({
+        title: "订阅已提交",
+        icon: <SafetyCertificateOutlined />,
+        content: `已为您切换到 ${selectedPlan.name}，${BILLING_CYCLE_LABEL[selectedPlan.billing_cycle]} ${formatYuan(selectedPlan.price_cents)}。支付通道接入中，正式上线后会自动扣费。`,
+        okText: "知道了",
+      })
+    } catch (e) {
+      const err = e as { response?: { data?: { error?: { message?: string } } }; message?: string }
+      // 支付未接入阶段，保持演示体验
+      Modal.confirm({
+        title: "支付功能开发中",
+        icon: <SafetyCertificateOutlined />,
+        content:
+          err?.response?.data?.error?.message ||
+          "微信/支付宝支付正在接入中，完成后会第一时间通知。是否返回首页继续使用免费功能？",
+        okText: "返回首页",
+        cancelText: "留在此页",
+        onOk: () => navigate("/app/dashboard"),
+      })
+    } finally {
+      setSubscribing(false)
+    }
   }
 
   const handleBuyPoints = async (pkg: PointsPackage) => {
     try {
-      setBuying(pkg.id)
-      const order = await createPointsOrder({ package_id: pkg.id })
+      setBuying(pkg.code)
+      const order = await createPointsOrder({ package_id: pkg.code })
       Modal.info({
         title: "支付功能开发中",
         icon: <ThunderboltOutlined />,
         content: (
           <div>
             <Paragraph>
-              订单 <Text code>{order.id.slice(0, 16)}…</Text> 已创建，金额{" "}
-              <b>{formatYuan(order.price_cents)}</b>，
+              订单 <Text code>{order.id.slice(0, 16)}…</Text> 已创建，购买 {pkg.points} 积分，金额{" "}
+              <b>{formatYuan(order.amount_cents)}</b>，
+              {order.points_amount !== undefined && `到账 ${order.points_amount} 积分。`}
               微信/支付宝支付正在接入中，正式上线后可直接付款。
             </Paragraph>
             <Paragraph type="secondary" style={{ marginBottom: 0 }}>
@@ -144,8 +239,8 @@ const Plans: React.FC = () => {
         okText: "知道了",
       })
     } catch (e) {
-      const err = e as { message?: string }
-      message.error(err?.message ?? "创建订单失败")
+      const err = e as { response?: { data?: { error?: { message?: string } } }; message?: string }
+      message.error(err?.response?.data?.error?.message || err?.message || "创建订单失败")
     } finally {
       setBuying(null)
     }
@@ -156,7 +251,6 @@ const Plans: React.FC = () => {
       <PageHead
         title="会员与积分"
         description="开通会员解锁全部功能，按需充值积分灵活使用 AI 能力"
-
         actions={
           <Space>
             <Button
@@ -170,77 +264,75 @@ const Plans: React.FC = () => {
       />
 
       {/* 当前状态卡片 */}
-      {balance && (
-        <Card className="xx-current-status" bordered={false}>
-          <Row align="middle" gutter={24}>
-            <Col flex="auto">
-              <Space size="large" wrap>
+      <Card className="xx-current-status" bordered={false}>
+        <Row align="middle" gutter={24}>
+          <Col flex="auto">
+            <Space size="large" wrap>
+              <div>
+                <Text type="secondary">当前身份</Text>
                 <div>
-                  <Text type="secondary">当前身份</Text>
+                  {isMember ? (
+                    <Tag
+                      color="gold"
+                      icon={<CrownFilled />}
+                      style={{ marginTop: 4, fontSize: 14, padding: "4px 10px" }}
+                    >
+                      {memberPlanId
+                        ? PLAN_LABEL[memberPlanId as keyof typeof PLAN_LABEL] || "付费会员"
+                        : "付费会员"}
+                    </Tag>
+                  ) : (
+                    <Tag style={{ marginTop: 4, fontSize: 14, padding: "4px 10px" }}>免费会员</Tag>
+                  )}
+                  {balance?.member_expires_at && isMember && (
+                    <Text type="secondary" style={{ marginLeft: 8 }}>
+                      到期 {new Date(balance.member_expires_at).toLocaleDateString("zh-CN")}
+                    </Text>
+                  )}
+                  {membership?.max_resolution && (
+                    <Text type="secondary" style={{ marginLeft: 8 }}>
+                      · 最高 {membership.max_resolution}
+                    </Text>
+                  )}
+                </div>
+              </div>
+              <div>
+                <Text type="secondary">可用积分</Text>
+                <div className="xx-current-balance">
+                  <ThunderboltOutlined style={{ color: "#8b5cf6" }} />
+                  <span className="xx-current-balance-val">{bal}</span>
+                </div>
+              </div>
+              {!isMember && freeLimit > 0 && (
+                <div>
+                  <Text type="secondary">今日免费混剪</Text>
                   <div>
-                    {isMember ? (
-                      <Tag
-                        color="gold"
-                        icon={<CrownFilled />}
-                        style={{ marginTop: 4, fontSize: 14, padding: "4px 10px" }}
-                      >
-                        {memberType === "yearly"
-                          ? "年卡"
-                          : memberType === "quarterly"
-                            ? "季卡"
-                            : "月卡"}
-                        会员
+                    <Text strong>{freeUsed}</Text>
+                    <Text type="secondary"> / {freeLimit} 条</Text>
+                    {!isMember && (
+                      <Tag color="blue" style={{ marginLeft: 8 }}>
+                        剩余 {freeRemain} 条
                       </Tag>
-                    ) : (
-                      <Tag style={{ marginTop: 4, fontSize: 14, padding: "4px 10px" }}>
-                        免费会员
-                      </Tag>
-                    )}
-                    {balance.member_expires_at && (
-                      <Text type="secondary" style={{ marginLeft: 8 }}>
-                        到期 {new Date(balance.member_expires_at).toLocaleDateString("zh-CN")}
-                      </Text>
                     )}
                   </div>
                 </div>
-                <div>
-                  <Text type="secondary">可用积分</Text>
-                  <div className="xx-current-balance">
-                    <ThunderboltOutlined style={{ color: "#8b5cf6" }} />
-                    <span className="xx-current-balance-val">{balance.balance}</span>
-                  </div>
-                </div>
-                {balance.free_clips_limit ? (
-                  <div>
-                    <Text type="secondary">今日免费混剪</Text>
-                    <div>
-                      <Text strong>{balance.free_clips_used ?? 0}</Text>
-                      <Text type="secondary"> / {balance.free_clips_limit} 条</Text>
-                      {!isMember && (
-                        <Tag color="blue" style={{ marginLeft: 8 }}>
-                          剩余 {balance.free_clips_remaining ?? 0} 条
-                        </Tag>
-                      )}
-                    </div>
-                  </div>
-                ) : null}
-              </Space>
-            </Col>
-            <Col>
-              <Button
-                type="primary"
-                icon={<ThunderboltOutlined />}
-                onClick={() => {
-                  const el = document.getElementById("points-packages")
-                  el?.scrollIntoView({ behavior: "smooth" })
-                }}
-              >
-                充值积分
-              </Button>
-            </Col>
-          </Row>
-        </Card>
-      )}
+              )}
+            </Space>
+          </Col>
+          <Col>
+            <Button
+              type="primary"
+              icon={<ThunderboltOutlined />}
+              onClick={() => {
+                const el = document.getElementById("points-packages")
+                el?.scrollIntoView({ behavior: "smooth" })
+              }}
+            >
+              充值积分
+            </Button>
+          </Col>
+        </Row>
+      </Card>
 
       {/* 两档会员对比 */}
       <Title level={4} style={{ marginTop: 24 }}>
@@ -250,7 +342,7 @@ const Plans: React.FC = () => {
 
       {/* 计费周期切换 */}
       <div className="xx-billing-switch">
-        {SUBSCRIPTION_PLANS.map((p) => (
+        {billingOptions.map((p) => (
           <button
             key={p.id}
             type="button"
@@ -263,7 +355,11 @@ const Plans: React.FC = () => {
             <div className="xx-billing-name">{p.name}</div>
             <div className="xx-billing-price">
               <span className="xx-billing-yuan">¥</span>
-              <span className="xx-billing-amount">{p.price_yuan}</span>
+              <span className="xx-billing-amount">
+                {(p.price_cents / 100)
+                  .toFixed(p.price_cents % 100 === 0 ? 0 : 1)
+                  .replace(/\.0$/, "")}
+              </span>
             </div>
             <div className="xx-billing-sub">
               ≈¥{p.per_month_yuan}/月
@@ -303,8 +399,8 @@ const Plans: React.FC = () => {
                 </li>
               ))}
             </ul>
-            <Button block size="large" disabled>
-              当前方案
+            <Button block size="large" disabled={!isMember ? false : true}>
+              {!isMember ? "当前方案" : "免费方案"}
             </Button>
           </Card>
         </Col>
@@ -317,15 +413,21 @@ const Plans: React.FC = () => {
             </div>
             <div className="xx-plan-head">
               <Title level={4} style={{ margin: 0, color: "#7c3aed" }}>
-                <CrownFilled style={{ color: "#f59e0b" }} /> 付费会员
+                <CrownFilled style={{ color: "#f59e0b" }} /> {selectedPlan?.name || "付费会员"}
               </Title>
               <div className="xx-plan-price">
                 <span className="currency">¥</span>
-                <span className="amount">{selectedPlan.price_yuan}</span>
-                <span className="period">{selectedPlan.billing_label}</span>
+                <span className="amount">
+                  {selectedPlan
+                    ? (selectedPlan.price_cents / 100)
+                        .toFixed(selectedPlan.price_cents % 100 === 0 ? 0 : 1)
+                        .replace(/\.0$/, "")
+                    : "—"}
+                </span>
+                <span className="period">{selectedPlan?.billing_label || ""}</span>
               </div>
               <Text type="secondary">
-                折合 ¥{selectedPlan.per_month_yuan}/月 · 解锁全部 AI 能力
+                折合 ¥{selectedPlan?.per_month_yuan}/月 · 解锁全部 AI 能力
               </Text>
             </div>
             <Divider style={{ margin: "16px 0" }} />
@@ -342,11 +444,11 @@ const Plans: React.FC = () => {
               size="large"
               type="primary"
               loading={subscribing}
-              disabled={isMember && memberType === selectedBilling}
+              disabled={isMember && memberPlanId === selectedBilling}
               onClick={handleSubscribe}
               icon={<ThunderboltOutlined />}
             >
-              {isMember && memberType === selectedBilling
+              {isMember && memberPlanId === selectedBilling
                 ? "当前方案"
                 : isMember
                   ? "续费/升级"
@@ -373,19 +475,22 @@ const Plans: React.FC = () => {
 
         <Row gutter={[16, 16]}>
           {packages.map((pkg) => {
-            const price = getPackPrice(pkg)
-            const discount = price < pkg.price ? Math.round((1 - price / pkg.price) * 100) : 0
-            const unit = price / pkg.points
+            const priceCents = getDiscountPriceCents(pkg, userDiscount)
+            const originalCents = pkg.price_cents
+            const discount =
+              priceCents < originalCents ? Math.round((1 - priceCents / originalCents) * 100) : 0
+            const unit = priceCents / 100 / pkg.points
+            const isHot = pkg.unit_price < 0.1
             return (
-              <Col xs={24} sm={8} key={pkg.id}>
+              <Col xs={24} sm={8} key={pkg.code}>
                 <Card
-                  className={`xx-pkg-card ${discount > 0 ? "has-discount" : ""} ${pkg.id === "basic_pack" ? "recommended" : ""}`}
+                  className={`xx-pkg-card ${discount > 0 ? "has-discount" : ""} ${isHot ? "recommended" : ""}`}
                   hoverable
                 >
-                  {pkg.id === "basic_pack" && <div className="xx-pkg-badge">热门</div>}
+                  {isHot && <div className="xx-pkg-badge">热门</div>}
                   {discount > 0 && (
                     <Tag color="gold" className="xx-pkg-discount">
-                      会员{10 - discount / 10}折
+                      {Math.round((priceCents / originalCents) * 10) / 1}折
                     </Tag>
                   )}
                   <div className="xx-pkg-name">{pkg.name}</div>
@@ -395,17 +500,19 @@ const Plans: React.FC = () => {
                   <div className="xx-pkg-price">
                     <span className="currency">¥</span>
                     <span className="amount">
-                      {(price / 100).toFixed(price % 100 === 0 ? 0 : 1).replace(/\.0$/, "")}
+                      {(priceCents / 100)
+                        .toFixed(priceCents % 100 === 0 ? 0 : 1)
+                        .replace(/\.0$/, "")}
                     </span>
                     {discount > 0 && (
-                      <span className="xx-pkg-origin">¥{(pkg.price / 100).toFixed(0)}</span>
+                      <span className="xx-pkg-origin">¥{(originalCents / 100).toFixed(0)}</span>
                     )}
                   </div>
                   <div className="xx-pkg-unit">≈¥{unit.toFixed(3)}/积分</div>
                   <Button
                     block
-                    type={pkg.id === "basic_pack" ? "primary" : "default"}
-                    loading={buying === pkg.id}
+                    type={isHot ? "primary" : "default"}
+                    loading={buying === pkg.code}
                     onClick={() => handleBuyPoints(pkg)}
                     style={{ marginTop: 12 }}
                   >

apps/web/src/pages/subscription/UpgradeSubscription.tsx

@@ -1,18 +1,21 @@
 /**
- * 升级/降级/续费页面
- * P1-3: antd Button/Modal/Radio/Spin → 自定义 UI 组件
+ * 升级/降级/续费页面（#1894 清理后：价格统一走 /subscription/plans API）
  */
-import React from "react"
+import React, { useEffect, useMemo, useState } from "react"
 import { Modal } from "@/components/ui"
 import { useNavigate } from "react-router-dom"
-import type { PlanType } from "@/api/subscription"
+import type { PlanId, SubscriptionPlan, BillingCycle } from "@/api/subscription/types"
 import PageHead from "@/components/layout/PageHead"
 import { Button } from "@/components/ui"
-import { PLANS_META, getPlanName, getPlanPrice } from "./constants"
+import { getPlanName } from "./constants"
+import { getSubscriptionPlans } from "@/api/subscription"
 import { BillingCycleSwitch, Spinner } from "./components/SubscriptionUI"
 import { useSubscription } from "./hooks/useSubscription"
 import "./UpgradeSubscription.css"
 
+/** 可选择的付费档位（不含 free） */
+const PAID_PLANS: PlanId[] = ["monthly", "quarterly", "yearly"]
+
 const UpgradeSubscription: React.FC = () => {
   const navigate = useNavigate()
   const {
@@ -28,18 +31,53 @@ const UpgradeSubscription: React.FC = () => {
     handleCancel,
   } = useSubscription()
 
+  // #1894: 从 /subscription/plans 拉真实价格，不使用任何硬编码价格
+  const [apiPlans, setApiPlans] = useState<SubscriptionPlan[]>([])
+  useEffect(() => {
+    getSubscriptionPlans()
+      .then((r) => setApiPlans(r.plans))
+      .catch(() => setApiPlans([]))
+  }, [])
+
+  const planMap = useMemo(() => {
+    const m = new Map<string, SubscriptionPlan>()
+    apiPlans.forEach((p) => m.set(p.plan_id, p))
+    return m
+  }, [apiPlans])
+
+  const getPlanDisplay = (planId: PlanId) => {
+    const apiPlan = planMap.get(planId)
+    const name = apiPlan?.name ?? getPlanName(planId)
+    // 年卡按年价，月/季卡按总价
+    const isYearly = planId === "yearly"
+    const priceCents = apiPlan?.price_cents ?? 0
+    const monthlyCents =
+      apiPlan?.monthly_price_cents ??
+      (apiPlan && apiPlan.duration_days > 0
+        ? Math.round(apiPlan.price_cents / (apiPlan.duration_days / 30))
+        : 0)
+    return {
+      name,
+      priceYuan: priceCents / 100,
+      monthlyYuan: monthlyCents / 100,
+      billingLabel: isYearly ? "/年" : planId === "quarterly" ? "/季" : "/月",
+    }
+  }
+
   const handleUpgradeClick = () => {
     if (!subscription) return
     if (selectedPlan === subscription.plan_id && billingCycle === subscription.billing_cycle) {
       return
     }
 
-    const plan = PLANS_META[selectedPlan]
-    const price = getPlanPrice(selectedPlan, billingCycle)
+    const display = getPlanDisplay(selectedPlan)
+    const cycleLabel = billingCycle === "monthly" ? "月付" : "年付"
+    const priceLabel =
+      display.priceYuan > 0 ? `费用 ¥${display.priceYuan}${display.billingLabel}` : "免费"
 
     Modal.confirm({
       title: "确认变更套餐",
-      content: `即将变更为「${plan.name}」（${billingCycle === "monthly" ? "月付" : "年付"}），${price > 0 ? `费用 ¥${price}${billingCycle === "monthly" ? "/月" : "/年"}` : "免费"}。变更立即生效。`,
+      content: `即将变更为「${display.name}」（${cycleLabel}），${priceLabel}。变更立即生效。`,
       okText: "确认变更",
       cancelText: "取消",
       onOk: executeChangePlan,
@@ -49,12 +87,12 @@ const UpgradeSubscription: React.FC = () => {
   const handleCancelClick = () => {
     Modal.confirm({
       title: "确认取消订阅",
-      content: "取消后，当前周期结束前仍可正常使用，到期后降级为体验版。",
+      content: "取消后，当前周期结束前仍可正常使用，到期后降级为免费版。",
       okText: "确认取消",
       cancelText: "再想想",
       onOk: async () => {
         const ok = await handleCancel()
-        if (ok) navigate("/app/subscription")
+        if (ok) navigate("/subscription")
       },
     })
   }
@@ -74,23 +112,31 @@ const UpgradeSubscription: React.FC = () => {
       <PageHead title="变更订阅方案" description={`当前套餐：${getPlanName(currentPlan)}`} />
 
       <div className="xx-upgrade-plans">
-        {(["standard", "pro", "enterprise"] as PlanType[]).map((planId) => {
-          const plan = PLANS_META[planId]
+        {PAID_PLANS.map((planId) => {
+          const display = getPlanDisplay(planId)
           const isCurrent = planId === currentPlan
+          // 年卡显示年价，其他显示月价折算
+          const monthlyPrice = display.monthlyYuan
+          const yearlyPrice = display.priceYuan
+          // 选中季卡时默认切到月付周期；年卡切到年付
+          const resolvedCycle: BillingCycle = planId === "yearly" ? "yearly" : "monthly"
           return (
             <div
               key={planId}
               className={`xx-upgrade-card ${isCurrent ? "current" : ""} ${selectedPlan === planId ? "selected" : ""}`}
-              onClick={() => setSelectedPlan(planId)}
+              onClick={() => {
+                setSelectedPlan(planId)
+                setBillingCycle(resolvedCycle)
+              }}
             >
               {isCurrent && <div className="xx-current-badge">当前</div>}
-              <h3>{plan.name}</h3>
+              <h3>{display.name}</h3>
               <div className="xx-price">
                 <BillingCycleSwitch
                   value={billingCycle}
                   onChange={setBillingCycle}
-                  monthlyPrice={plan.price}
-                  yearlyPrice={plan.yearlyPrice}
+                  monthlyPrice={monthlyPrice}
+                  yearlyPrice={yearlyPrice}
                 />
               </div>
             </div>

apps/web/src/pages/subscription/constants.ts

@@ -1,16 +1,13 @@
-import type { PlanType, BillingCycle } from "@/api/subscription"
+/**
+ * 订阅套餐元数据（#1894 清理后）
+ *
+ * - 套餐名兜底：API 失败时用 getPlanName 展示档位名
+ * - 价格已统一走 GET /subscription/plans 动态获取，此处不再硬编码价格
+ *   （旧 getPlanPrice / PLANS_META.priceYuan / yearlyPriceYuan 已移除）
+ */
+import type { PlanId } from "@/api/subscription/types"
+import { PLAN_LABEL } from "@/api/subscription/types"
 
-export const PLANS_META: Record<string, { name: string; price: number; yearlyPrice: number }> = {
-  free: { name: "体验版", price: 0, yearlyPrice: 0 },
-  standard: { name: "标准版", price: 99, yearlyPrice: 990 },
-  pro: { name: "专业版", price: 299, yearlyPrice: 2990 },
-  enterprise: { name: "企业版", price: 0, yearlyPrice: 0 },
-}
-
-export const getPlanName = (planId: PlanType | string) => PLANS_META[planId]?.name ?? "体验版"
-
-export const getPlanPrice = (planId: PlanType | string, cycle: BillingCycle) => {
-  const plan = PLANS_META[planId]
-  if (!plan) return 0
-  return cycle === "yearly" ? plan.yearlyPrice : plan.price
-}
+/** 套餐展示名兜底（优先使用 API 返回的 plan.name / PLAN_LABEL） */
+export const getPlanName = (planId: PlanId | string): string =>
+  PLAN_LABEL[planId as PlanId] ?? "免费版"

apps/web/src/pages/subscription/hooks/useSubscription.ts

@@ -1,3 +1,8 @@
+/**
+ * 订阅管理 Hook
+ * 封装订阅信息查询、套餐变更、自动续费切换、取消订阅等逻辑
+ * 对齐最终契约（plan_id=free/monthly/quarterly/yearly + billing_cycle=monthly/yearly）
+ */
 import { useState, useEffect, useCallback } from "react"
 import { message } from "antd"
 import {
@@ -5,20 +10,14 @@ import {
   changePlan,
   toggleAutoRenew,
   cancelSubscription,
-  type SubscriptionInfo,
-  type PlanType,
-  type BillingCycle,
 } from "@/api/subscription"
+import type { SubscriptionInfo, PlanId, BillingCycle } from "@/api/subscription/types"
 
-/**
- * 订阅管理 Hook
- * 封装订阅信息查询、套餐变更、自动续费切换、取消订阅等逻辑
- */
 export function useSubscription() {
   const [subscription, setSubscription] = useState<SubscriptionInfo | null>(null)
   const [loading, setLoading] = useState(true)
   const [submitting, setSubmitting] = useState(false)
-  const [selectedPlan, setSelectedPlan] = useState<PlanType>("standard")
+  const [selectedPlan, setSelectedPlan] = useState<PlanId>("monthly")
   const [billingCycle, setBillingCycle] = useState<BillingCycle>("monthly")
 
   const loadSubscription = useCallback(async () => {
@@ -26,6 +25,7 @@ export function useSubscription() {
       const data = await getCurrentSubscription()
       setSubscription(data)
       setSelectedPlan(data.plan_id)
+      setBillingCycle(data.billing_cycle)
     } catch (err: unknown) {
       if (!(err as { __msgShown?: boolean })?.__msgShown) message.error("获取订阅信息失败")
     } finally {
@@ -37,45 +37,41 @@ export function useSubscription() {
     loadSubscription()
   }, [loadSubscription])
 
-  const handleUpgrade = useCallback(async () => {
-    if (!subscription) return
+  const executeChangePlan = useCallback(async () => {
+    if (!subscription) return false
     if (selectedPlan === subscription.plan_id && billingCycle === subscription.billing_cycle) {
       message.info("当前已是该套餐")
-      return
+      return false
     }
-    // 由调用方决定是否弹确认框
-  }, [subscription, selectedPlan, billingCycle])
-
-  const executeChangePlan = useCallback(async () => {
     try {
       setSubmitting(true)
-      const res = await changePlan({
-        target_plan_id: selectedPlan,
-        billing_cycle: billingCycle,
-      })
+      const res = await changePlan({ target_plan_id: selectedPlan, billing_cycle: billingCycle })
       if (res.success) {
         message.success(res.message)
         setSubscription(res.new_subscription ?? null)
+        return true
       } else {
         message.error(res.message)
+        return false
       }
     } catch (err: unknown) {
       if (!(err as { __msgShown?: boolean })?.__msgShown) message.error("套餐变更失败，请重试")
+      return false
     } finally {
       setSubmitting(false)
     }
-  }, [selectedPlan, billingCycle])
+  }, [subscription, selectedPlan, billingCycle])
 
   const handleToggleAutoRenew = useCallback(
     async (enabled: boolean) => {
       try {
-        const res = await toggleAutoRenew(enabled)
+        const res = await toggleAutoRenew({ enabled })
         message.success(res.message)
-        if (subscription) {
-          setSubscription({ ...subscription, auto_renew: enabled })
-        }
+        if (subscription) setSubscription({ ...subscription, auto_renew: enabled })
+        return true
       } catch (err: unknown) {
         if (!(err as { __msgShown?: boolean })?.__msgShown) message.error("操作失败")
+        return false
       }
     },
     [subscription],
@@ -93,7 +89,6 @@ export function useSubscription() {
   }, [])
 
   return {
-    // 状态
     subscription,
     loading,
     submitting,
@@ -101,9 +96,7 @@ export function useSubscription() {
     billingCycle,
     setSelectedPlan,
     setBillingCycle,
-    // 操作
     loadSubscription,
-    handleUpgrade,
     executeChangePlan,
     handleToggleAutoRenew,
     handleCancel,

apps/web/src/pages/titles/TitleLibrary.tsx

@@ -1,137 +0,0 @@
-/**
- * 标题库页面 — V21 设计系统
- * 两栏布局：左侧分类列表（220px）+ 右侧标题卡片网格（3列）
- * 支持：标题卡片展示、AI 生成标题、复制/编辑/删除、收藏、分类筛选、搜索
- * 对接后端真实 API（GET/POST/PUT/DELETE /titles）
- */
-import React from "react"
-import { useTitleLibrary } from "./hooks/useTitleLibrary"
-import { useTitleEdit } from "./hooks/useTitleEdit"
-import { useTitleAI } from "./hooks/useTitleAI"
-import { CategorySidebar } from "./components/title-library/CategorySidebar"
-import { FilterBar } from "./components/title-library/FilterBar"
-import { TitleGrid } from "./components/title-library/TitleGrid"
-import { CreateTitleModal } from "./components/title-library/CreateTitleModal"
-import { AIGenerateModal } from "./components/title-library/AIGenerateModal"
-import "./titles.css"
-
-const TitleLibrary: React.FC = () => {
-  const {
-    categories,
-    activeCatId,
-    filteredTitles,
-    searchText,
-    filterType,
-    filterIndustry,
-    filterFrequency,
-    createMutation,
-    updateMutation,
-    setActiveCatId,
-    setSearchText,
-    setFilterType,
-    setFilterIndustry,
-    setFilterFrequency,
-    handleToggleFavorite,
-    handleCopy,
-    handleDelete,
-  } = useTitleLibrary()
-
-  const {
-    editingId,
-    editText,
-    setEditText,
-    createTitleModalOpen,
-    setCreateTitleModalOpen,
-    newTitleContent,
-    setNewTitleContent,
-    newTitleType,
-    setNewTitleType,
-    handleStartEdit,
-    handleSaveEdit,
-    handleCancelEdit,
-    handleCreateTitle,
-    handleCloseCreateModal,
-  } = useTitleEdit({ updateMutation, createMutation })
-
-  const {
-    aiModalOpen,
-    setAiModalOpen,
-    aiKeyword,
-    setAiKeyword,
-    aiLoading,
-    aiResults,
-    handleAIGenerate,
-    handleAdoptAITitle,
-    handleCopyAI,
-    handleCloseAIModal,
-  } = useTitleAI({ createMutation })
-
-  return (
-    <div className="xx-titles-page">
-      <div className="xx-titles-layout">
-        {/* 左侧：分类列表 */}
-        <CategorySidebar
-          categories={categories}
-          activeCatId={activeCatId}
-          onSelect={setActiveCatId}
-        />
-
-        {/* 右侧：内容区 */}
-        <div className="xx-titles-content">
-          <FilterBar
-            searchText={searchText}
-            onSearchChange={setSearchText}
-            filterType={filterType}
-            onFilterTypeChange={setFilterType}
-            filterIndustry={filterIndustry}
-            onFilterIndustryChange={setFilterIndustry}
-            filterFrequency={filterFrequency}
-            onFilterFrequencyChange={setFilterFrequency}
-            onCreateClick={() => setCreateTitleModalOpen(true)}
-            onAIClick={() => setAiModalOpen(true)}
-          />
-
-          <TitleGrid
-            titles={filteredTitles}
-            editingId={editingId}
-            editText={editText}
-            searchText={searchText}
-            onEditChange={setEditText}
-            onStartEdit={handleStartEdit}
-            onSaveEdit={handleSaveEdit}
-            onCancelEdit={handleCancelEdit}
-            onCopy={handleCopy}
-            onDelete={handleDelete}
-            onToggleFavorite={handleToggleFavorite}
-          />
-        </div>
-      </div>
-
-      {/* 新建标题弹窗 */}
-      <CreateTitleModal
-        open={createTitleModalOpen}
-        newTitleContent={newTitleContent}
-        newTitleType={newTitleType}
-        onContentChange={setNewTitleContent}
-        onTypeChange={setNewTitleType}
-        onCancel={handleCloseCreateModal}
-        onSubmit={handleCreateTitle}
-      />
-
-      {/* AI 生成标题弹窗 */}
-      <AIGenerateModal
-        open={aiModalOpen}
-        aiKeyword={aiKeyword}
-        aiLoading={aiLoading}
-        aiResults={aiResults}
-        onKeywordChange={setAiKeyword}
-        onGenerate={handleAIGenerate}
-        onCancel={handleCloseAIModal}
-        onCopy={handleCopyAI}
-        onAdopt={handleAdoptAITitle}
-      />
-    </div>
-  )
-}
-
-export default TitleLibrary

apps/web/src/pages/titles/components/title-library/AIGenerateModal.tsx

@@ -1,121 +0,0 @@
-import React from "react"
-import Modal from "@/components/ui/Modal"
-import { CopyOutlined, CheckOutlined } from "@ant-design/icons"
-import { Button, Input } from "@/components/ui"
-import { AI_KEYWORD_MAX_LENGTH } from "../../constants/titleLibrary"
-
-interface AIGenerateModalProps {
-  open: boolean
-  aiKeyword: string
-  aiLoading: boolean
-  aiResults: string[]
-  onKeywordChange: (keyword: string) => void
-  onGenerate: () => void
-  onCancel: () => void
-  onCopy: (text: string) => void
-  onAdopt: (text: string) => void
-}
-
-export const AIGenerateModal: React.FC<AIGenerateModalProps> = ({
-  open,
-  aiKeyword,
-  aiLoading,
-  aiResults,
-  onKeywordChange,
-  onGenerate,
-  onCancel,
-  onCopy,
-  onAdopt,
-}) => {
-  return (
-    <Modal
-      title="AI 生成标题"
-      open={open}
-      onCancel={onCancel}
-      onOk={onGenerate}
-      okText={aiLoading ? "生成中..." : "生成"}
-      cancelText="关闭"
-      okButtonProps={{ disabled: aiLoading }}
-      destroyOnClose
-      width={640}
-    >
-      <div
-        style={{
-          display: "flex",
-          flexDirection: "column",
-          gap: 16,
-          padding: "8px 0",
-        }}
-      >
-        <div>
-          <div
-            style={{
-              marginBottom: 6,
-              fontSize: "var(--font-size-sm)",
-              color: "var(--text-secondary)",
-            }}
-          >
-            输入关键词或主题
-          </div>
-          <Input
-            placeholder="例如：美食探店、科技评测、旅行攻略..."
-            value={aiKeyword}
-            onChange={(e) => onKeywordChange(e.target.value)}
-            maxLength={AI_KEYWORD_MAX_LENGTH}
-            onPressEnter={onGenerate}
-          />
-        </div>
-
-        {/* AI 加载动画 */}
-        {aiLoading && (
-          <div className="xx-ai-loading">
-            <div className="xx-ai-loading-dots">
-              <div className="xx-ai-loading-dot" />
-              <div className="xx-ai-loading-dot" />
-              <div className="xx-ai-loading-dot" />
-            </div>
-            <span>AI 正在生成标题候选...</span>
-          </div>
-        )}
-
-        {/* AI 生成结果列表 */}
-        {aiResults.length > 0 && (
-          <div className="xx-ai-results">
-            <div
-              style={{
-                fontSize: "var(--font-size-sm)",
-                color: "var(--text-secondary)",
-                marginBottom: 4,
-              }}
-            >
-              已生成 {aiResults.length} 个候选标题，点击采纳或复制：
-            </div>
-            {aiResults.map((text, idx) => (
-              <div key={idx} className="xx-ai-result-item">
-                <span className="xx-ai-result-text">{text}</span>
-                <div className="xx-ai-result-actions">
-                  <Button
-                    buttonType="ghost"
-                    buttonSize="sm"
-                    icon={<CopyOutlined />}
-                    onClick={() => onCopy(text)}
-                  >
-                    复制
-                  </Button>
-                  <Button
-                    buttonType="primary"
-                    buttonSize="sm"
-                    icon={<CheckOutlined />}
-                    onClick={() => onAdopt(text)}
-                  >
-                    采纳
-                  </Button>
-                </div>
-              </div>
-            ))}
-          </div>
-        )}
-      </div>
-    </Modal>
-  )
-}

apps/web/src/pages/titles/components/title-library/CategorySidebar.tsx

@@ -1,44 +0,0 @@
-import React from "react"
-import { FileTextOutlined } from "@ant-design/icons"
-import type { CategoryItem } from "../../types/titleLibrary"
-
-interface CategorySidebarProps {
-  categories: CategoryItem[]
-  activeCatId: string
-  onSelect: (catId: string) => void
-}
-
-export const CategorySidebar: React.FC<CategorySidebarProps> = ({
-  categories,
-  activeCatId,
-  onSelect,
-}) => {
-  return (
-    <div className="xx-title-category-list">
-      {categories.map((cat) => (
-        <div
-          key={cat.id}
-          className={`xx-title-category-item${cat.id === activeCatId ? " active" : ""}`}
-          onClick={() => onSelect(cat.id)}
-        >
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "space-between",
-              flex: 1,
-              minWidth: 0,
-            }}
-          >
-            <div style={{ minWidth: 0 }}>
-              <h4 style={{ margin: 0 }}>
-                <FileTextOutlined /> {cat.name}
-              </h4>
-              <span>{cat.count} 条</span>
-            </div>
-          </div>
-        </div>
-      ))}
-    </div>
-  )
-}

apps/web/src/pages/titles/components/title-library/CreateTitleModal.tsx

@@ -1,89 +0,0 @@
-import React from "react"
-import Modal from "@/components/ui/Modal"
-import { Input, Select } from "@/components/ui"
-import type { TitleType } from "../../types/titleLibrary"
-import { TITLE_MAX_LENGTH } from "../../constants/titleLibrary"
-
-const TITLE_TYPE_CREATE_OPTIONS: Array<{ value: TitleType; label: string }> = [
-  { value: "hot", label: "爆款" },
-  { value: "normal", label: "常规" },
-  { value: "creative", label: "创意" },
-]
-
-interface CreateTitleModalProps {
-  open: boolean
-  newTitleContent: string
-  newTitleType: TitleType
-  onContentChange: (content: string) => void
-  onTypeChange: (type: TitleType) => void
-  onCancel: () => void
-  onSubmit: () => void
-}
-
-export const CreateTitleModal: React.FC<CreateTitleModalProps> = ({
-  open,
-  newTitleContent,
-  newTitleType,
-  onContentChange,
-  onTypeChange,
-  onCancel,
-  onSubmit,
-}) => {
-  return (
-    <Modal
-      title="新建标题"
-      open={open}
-      onCancel={onCancel}
-      onOk={onSubmit}
-      okText="创建"
-      cancelText="取消"
-      destroyOnClose
-    >
-      <div
-        style={{
-          display: "flex",
-          flexDirection: "column",
-          gap: 16,
-          padding: "8px 0",
-        }}
-      >
-        <div>
-          <div
-            style={{
-              marginBottom: 6,
-              fontSize: "var(--font-size-sm)",
-              color: "var(--text-secondary)",
-            }}
-          >
-            标题内容
-          </div>
-          <Input.TextArea
-            placeholder="请输入标题内容"
-            value={newTitleContent}
-            onChange={(e) => onContentChange(e.target.value)}
-            rows={3}
-            maxLength={TITLE_MAX_LENGTH}
-            showCount
-          />
-        </div>
-        <div>
-          <div
-            style={{
-              marginBottom: 6,
-              fontSize: "var(--font-size-sm)",
-              color: "var(--text-secondary)",
-            }}
-          >
-            标题类型
-          </div>
-          <Select
-            value={newTitleType}
-            onChange={(v) => onTypeChange(v as TitleType)}
-            style={{ width: "100%" }}
-            options={TITLE_TYPE_CREATE_OPTIONS}
-          />
-        </div>
-      </div>
-    </Modal>
-  )
-}

apps/web/src/pages/titles/components/title-library/FilterBar.tsx

@@ -1,76 +0,0 @@
-import React from "react"
-import { SearchOutlined, PlusOutlined, RobotOutlined } from "@ant-design/icons"
-import { Button, Input, Select } from "@/components/ui"
-import type { Frequency } from "../../types/titleLibrary"
-import {
-  TITLE_TYPE_OPTIONS,
-  INDUSTRY_OPTIONS,
-  FREQUENCY_OPTIONS,
-} from "../../constants/titleLibrary"
-
-interface FilterBarProps {
-  searchText: string
-  onSearchChange: (text: string) => void
-  filterType: string
-  onFilterTypeChange: (value: string) => void
-  filterIndustry: string
-  onFilterIndustryChange: (value: string) => void
-  filterFrequency: Frequency
-  onFilterFrequencyChange: (value: Frequency) => void
-  onCreateClick: () => void
-  onAIClick: () => void
-}
-
-export const FilterBar: React.FC<FilterBarProps> = ({
-  searchText,
-  onSearchChange,
-  filterType,
-  onFilterTypeChange,
-  filterIndustry,
-  onFilterIndustryChange,
-  filterFrequency,
-  onFilterFrequencyChange,
-  onCreateClick,
-  onAIClick,
-}) => {
-  return (
-    <div className="xx-titles-filters">
-      <div className="xx-titles-filters-left">
-        <Input
-          placeholder="搜索标题关键词..."
-          prefix={<SearchOutlined />}
-          value={searchText}
-          onChange={(e) => onSearchChange(e.target.value)}
-          allowClear
-          style={{ width: 220 }}
-        />
-        <Select
-          value={filterType}
-          onChange={onFilterTypeChange}
-          style={{ width: 110 }}
-          options={TITLE_TYPE_OPTIONS}
-        />
-        <Select
-          value={filterIndustry}
-          onChange={onFilterIndustryChange}
-          style={{ width: 110 }}
-          options={INDUSTRY_OPTIONS}
-        />
-        <Select
-          value={filterFrequency}
-          onChange={(v) => onFilterFrequencyChange(v as Frequency)}
-          style={{ width: 120 }}
-          options={FREQUENCY_OPTIONS}
-        />
-      </div>
-      <div className="xx-titles-filters-right">
-        <Button buttonType="ghost" buttonSize="sm" icon={<PlusOutlined />} onClick={onCreateClick}>
-          新建标题
-        </Button>
-        <Button buttonType="primary" buttonSize="sm" icon={<RobotOutlined />} onClick={onAIClick}>
-          AI 生成标题
-        </Button>
-      </div>
-    </div>
-  )
-}

apps/web/src/pages/titles/components/title-library/TitleCard.tsx

@@ -1,121 +0,0 @@
-import React from "react"
-import { Popconfirm } from "antd"
-import {
-  StarOutlined,
-  StarFilled,
-  EditOutlined,
-  CopyOutlined,
-  DeleteOutlined,
-  CheckOutlined,
-} from "@ant-design/icons"
-import type { TitleData } from "../../types/titleLibrary"
-import { typeLabel } from "../../utils/titleLibrary"
-
-interface TitleCardProps {
-  title: TitleData
-  isEditing: boolean
-  editText: string
-  onEditChange: (text: string) => void
-  onStartEdit: () => void
-  onSaveEdit: () => void
-  onCancelEdit: () => void
-  onCopy: () => void
-  onDelete: () => void
-  onToggleFavorite: () => void
-}
-
-export const TitleCard: React.FC<TitleCardProps> = ({
-  title,
-  isEditing,
-  editText,
-  onEditChange,
-  onStartEdit,
-  onSaveEdit,
-  onCancelEdit,
-  onCopy,
-  onDelete,
-  onToggleFavorite,
-}) => {
-  return (
-    <div className="xx-title-card">
-      {/* 收藏按钮 */}
-      <button
-        className="xx-title-fav-btn"
-        onClick={onToggleFavorite}
-        title={title.isFavorited ? "取消收藏" : "收藏"}
-        style={{
-          position: "absolute",
-          top: 12,
-          right: 12,
-          color: title.isFavorited ? "#f59e0b" : "var(--text-tertiary)",
-        }}
-      >
-        {title.isFavorited ? <StarFilled /> : <StarOutlined />}
-      </button>
-
-      {/* 标题文本 / 编辑区 */}
-      {isEditing ? (
-        <textarea
-          className="xx-title-card-edit"
-          value={editText}
-          onChange={(e) => onEditChange(e.target.value)}
-          autoFocus
-          onKeyDown={(e) => {
-            if (e.key === "Enter" && !e.shiftKey) {
-              e.preventDefault()
-              onSaveEdit()
-            }
-            if (e.key === "Escape") {
-              onCancelEdit()
-            }
-          }}
-        />
-      ) : (
-        <div className="xx-title-card-text" style={{ paddingRight: 24 }}>
-          {title.content}
-        </div>
-      )}
-
-      {/* 底部元信息 */}
-      <div className="xx-title-card-meta">
-        <div className="xx-title-card-meta-left">
-          <span className={`xx-title-type-tag ${title.type}`}>{typeLabel(title.type)}</span>
-          <span className="xx-title-card-stat">使用 {title.usageCount} 次</span>
-          <span className="xx-title-card-stat">{title.createdAt}</span>
-        </div>
-
-        <div className="xx-title-card-actions">
-          {isEditing ? (
-            <>
-              <button className="xx-title-card-action-btn" onClick={onSaveEdit} title="保存">
-                <CheckOutlined />
-              </button>
-              <button className="xx-title-card-action-btn" onClick={onCancelEdit} title="取消">
-                ✕
-              </button>
-            </>
-          ) : (
-            <>
-              <button className="xx-title-card-action-btn" onClick={onCopy} title="复制">
-                <CopyOutlined />
-              </button>
-              <button className="xx-title-card-action-btn" onClick={onStartEdit} title="编辑">
-                <EditOutlined />
-              </button>
-              <Popconfirm
-                title="确定删除此标题？"
-                onConfirm={onDelete}
-                okText="删除"
-                cancelText="取消"
-              >
-                <button className="xx-title-card-action-btn danger" title="删除">
-                  <DeleteOutlined />
-                </button>
-              </Popconfirm>
-            </>
-          )}
-        </div>
-      </div>
-    </div>
-  )
-}

apps/web/src/pages/titles/components/title-library/TitleGrid.tsx

@@ -1,63 +0,0 @@
-import React from "react"
-import { FileTextOutlined } from "@ant-design/icons"
-import { TitleCard } from "./TitleCard"
-import type { TitleData } from "../../types/titleLibrary"
-
-interface TitleGridProps {
-  titles: TitleData[]
-  editingId: string | null
-  editText: string
-  searchText: string
-  onEditChange: (text: string) => void
-  onStartEdit: (title: TitleData) => void
-  onSaveEdit: () => void
-  onCancelEdit: () => void
-  onCopy: (title: TitleData) => void
-  onDelete: (id: string) => void
-  onToggleFavorite: (id: string) => void
-}
-
-export const TitleGrid: React.FC<TitleGridProps> = ({
-  titles,
-  editingId,
-  editText,
-  searchText,
-  onEditChange,
-  onStartEdit,
-  onSaveEdit,
-  onCancelEdit,
-  onCopy,
-  onDelete,
-  onToggleFavorite,
-}) => {
-  if (titles.length > 0) {
-    return (
-      <div className="xx-title-grid">
-        {titles.map((title) => (
-          <TitleCard
-            key={title.id}
-            title={title}
-            isEditing={editingId === title.id}
-            editText={editingId === title.id ? editText : ""}
-            onEditChange={onEditChange}
-            onStartEdit={() => onStartEdit(title)}
-            onSaveEdit={onSaveEdit}
-            onCancelEdit={onCancelEdit}
-            onCopy={() => onCopy(title)}
-            onDelete={() => onDelete(title.id)}
-            onToggleFavorite={() => onToggleFavorite(title.id)}
-          />
-        ))}
-      </div>
-    )
-  }
-
-  return (
-    <div className="xx-titles-empty">
-      <div className="xx-titles-empty-icon">
-        <FileTextOutlined />
-      </div>
-      <p>{searchText ? "未找到匹配的标题" : "暂无标题，点击「新建标题」或「AI 生成标题」开始"}</p>
-    </div>
-  )
-}

apps/web/src/pages/titles/constants/titleLibrary.ts

@@ -1,34 +0,0 @@
-import type { TitleType, Industry, Frequency } from "../types/titleLibrary"
-
-export const TITLE_TYPE_OPTIONS: Array<{ value: TitleType | "all"; label: string }> = [
-  { value: "all", label: "全部类型" },
-  { value: "hot", label: "爆款" },
-  { value: "normal", label: "常规" },
-  { value: "creative", label: "创意" },
-]
-
-export const INDUSTRY_OPTIONS: Array<{ value: Industry | "all"; label: string }> = [
-  { value: "all", label: "全部行业" },
-  { value: "food", label: "美食" },
-  { value: "tech", label: "科技" },
-  { value: "beauty", label: "美妆" },
-  { value: "education", label: "教育" },
-  { value: "travel", label: "旅行" },
-]
-
-export const FREQUENCY_OPTIONS: Array<{ value: Frequency; label: string }> = [
-  { value: "all", label: "全部频率" },
-  { value: "high", label: "高频使用" },
-  { value: "medium", label: "中频使用" },
-  { value: "low", label: "低频使用" },
-]
-
-export const FREQUENCY_THRESHOLDS = {
-  high: 100,
-  medium: 30,
-} as const
-
-export const AI_GENERATE_DELAY = 2000
-export const TITLE_MAX_LENGTH = 200
-export const AI_KEYWORD_MAX_LENGTH = 100
-export const ALL_CATEGORY_ID = "cat-all"

apps/web/src/pages/titles/hooks/useTitleAI.ts

@@ -1,84 +0,0 @@
-import { useState, useCallback } from "react"
-import { message } from "antd"
-import type { UseMutationResult } from "@tanstack/react-query"
-import type { TitleItem } from "@/api/titles"
-import { copyToClipboard } from "../utils/titleLibrary"
-import { AI_GENERATE_DELAY } from "../constants/titleLibrary"
-
-interface UseTitleAIProps {
-  createMutation: UseMutationResult<TitleItem, Error, string, unknown>
-}
-
-const generateMockTitles = (keyword: string): string[] => [
-  `${keyword}：这个方法让我事半功倍！`,
-  `关于${keyword}，99%的人都不知道的事`,
-  `${keyword}全攻略，看完这篇就够了`,
-  `我花了 3 个月研究${keyword}，总结出这些经验`,
-  `${keyword}避坑指南，帮你省下 1000 块`,
-]
-
-export const useTitleAI = ({ createMutation }: UseTitleAIProps) => {
-  const [aiModalOpen, setAiModalOpen] = useState(false)
-  const [aiKeyword, setAiKeyword] = useState("")
-  const [aiLoading, setAiLoading] = useState(false)
-  const [aiResults, setAiResults] = useState<string[]>([])
-
-  /* AI 生成标题 */
-  const handleAIGenerate = useCallback(() => {
-    if (!aiKeyword.trim()) {
-      message.warning("请输入关键词或主题")
-      return
-    }
-    setAiLoading(true)
-    setAiResults([])
-
-    setTimeout(() => {
-      const results = generateMockTitles(aiKeyword.trim())
-      setAiResults(results)
-      setAiLoading(false)
-    }, AI_GENERATE_DELAY)
-  }, [aiKeyword])
-
-  /* 采纳 AI 生成的标题 */
-  const handleAdoptAITitle = useCallback(
-    (text: string) => {
-      createMutation.mutate(text, {
-        onSuccess: () => {
-          message.success("标题已采纳并添加到标题库")
-        },
-      })
-    },
-    [createMutation],
-  )
-
-  /* 复制 AI 生成的标题 */
-  const handleCopyAI = useCallback(async (text: string) => {
-    const ok = await copyToClipboard(text)
-    if (ok) {
-      message.success("已复制到剪贴板")
-    } else {
-      message.error("复制失败")
-    }
-  }, [])
-
-  /* 关闭 AI 弹窗 */
-  const handleCloseAIModal = useCallback(() => {
-    setAiModalOpen(false)
-    setAiLoading(false)
-    setAiResults([])
-    setAiKeyword("")
-  }, [])
-
-  return {
-    aiModalOpen,
-    setAiModalOpen,
-    aiKeyword,
-    setAiKeyword,
-    aiLoading,
-    aiResults,
-    handleAIGenerate,
-    handleAdoptAITitle,
-    handleCopyAI,
-    handleCloseAIModal,
-  }
-}

apps/web/src/pages/titles/hooks/useTitleEdit.ts

@@ -1,87 +0,0 @@
-import { useState, useCallback } from "react"
-import { message } from "antd"
-import type { TitleData, TitleType } from "../types/titleLibrary"
-import type { UseMutationResult } from "@tanstack/react-query"
-import type { TitleItem } from "@/api/titles"
-
-interface UseTitleEditProps {
-  updateMutation: UseMutationResult<TitleItem, Error, { id: string; content: string }, unknown>
-  createMutation: UseMutationResult<TitleItem, Error, string, unknown>
-}
-
-export const useTitleEdit = ({ updateMutation, createMutation }: UseTitleEditProps) => {
-  /* 编辑状态 */
-  const [editingId, setEditingId] = useState<string | null>(null)
-  const [editText, setEditText] = useState("")
-
-  /* 新建标题弹窗 */
-  const [createTitleModalOpen, setCreateTitleModalOpen] = useState(false)
-  const [newTitleContent, setNewTitleContent] = useState("")
-  const [newTitleType, setNewTitleType] = useState<TitleType>("normal")
-
-  /* 开始编辑 */
-  const handleStartEdit = useCallback((title: TitleData) => {
-    setEditingId(title.id)
-    setEditText(title.content)
-  }, [])
-
-  /* 保存编辑 */
-  const handleSaveEdit = useCallback(() => {
-    if (!editText.trim()) {
-      message.warning("标题内容不能为空")
-      return
-    }
-    if (editingId) {
-      updateMutation.mutate({ id: editingId, content: editText.trim() })
-    }
-    setEditingId(null)
-    setEditText("")
-    message.success("标题已更新")
-  }, [editingId, editText, updateMutation])
-
-  /* 取消编辑 */
-  const handleCancelEdit = useCallback(() => {
-    setEditingId(null)
-    setEditText("")
-  }, [])
-
-  /* 新建标题提交 */
-  const handleCreateTitle = useCallback(() => {
-    if (!newTitleContent.trim()) {
-      message.warning("请输入标题内容")
-      return
-    }
-    createMutation.mutate(newTitleContent.trim(), {
-      onSuccess: () => {
-        setCreateTitleModalOpen(false)
-        setNewTitleContent("")
-        setNewTitleType("normal")
-        message.success("标题创建成功")
-      },
-    })
-  }, [newTitleContent, createMutation])
-
-  /* 关闭新建弹窗 */
-  const handleCloseCreateModal = useCallback(() => {
-    setCreateTitleModalOpen(false)
-    setNewTitleContent("")
-    setNewTitleType("normal")
-  }, [])
-
-  return {
-    editingId,
-    editText,
-    setEditText,
-    createTitleModalOpen,
-    setCreateTitleModalOpen,
-    newTitleContent,
-    setNewTitleContent,
-    newTitleType,
-    setNewTitleType,
-    handleStartEdit,
-    handleSaveEdit,
-    handleCancelEdit,
-    handleCreateTitle,
-    handleCloseCreateModal,
-  }
-}

apps/web/src/pages/titles/hooks/useTitleLibrary/index.ts

@@ -1,55 +0,0 @@
-import { useTitleFilters } from "./useTitleFilters"
-import { useTitleMutations } from "./useTitleMutations"
-import { useTitleData } from "./useTitleData"
-import { useTitleActions } from "./useTitleActions"
-
-export const useTitleLibrary = () => {
-  /* 数据获取与派生 */
-  const { titles, categories, activeCatId, activeCategory, setActiveCatId } = useTitleData()
-
-  /* 筛选 */
-  const {
-    searchText,
-    filterType,
-    filterIndustry,
-    filterFrequency,
-    setSearchText,
-    setFilterType,
-    setFilterIndustry,
-    setFilterFrequency,
-    filteredTitles,
-  } = useTitleFilters(titles, categories, activeCatId, activeCategory)
-
-  /* CRUD mutations */
-  const { createMutation, updateMutation, deleteMutation } = useTitleMutations()
-
-  /* 操作 handlers */
-  const { handleToggleFavorite, handleCopy, handleDelete } = useTitleActions(deleteMutation)
-
-  return {
-    /* 状态 */
-    titles,
-    categories,
-    activeCatId,
-    activeCategory,
-    filteredTitles,
-    searchText,
-    filterType,
-    filterIndustry,
-    filterFrequency,
-    /* mutations */
-    createMutation,
-    updateMutation,
-    deleteMutation,
-    /* setters */
-    setActiveCatId,
-    setSearchText,
-    setFilterType,
-    setFilterIndustry,
-    setFilterFrequency,
-    /* handlers */
-    handleToggleFavorite,
-    handleCopy,
-    handleDelete,
-  }
-}

apps/web/src/pages/titles/hooks/useTitleLibrary/useTitleActions.ts

@@ -1,34 +0,0 @@
-import { useCallback } from "react"
-import { message } from "antd"
-import type { UseMutationResult } from "@tanstack/react-query"
-import type { TitleData } from "../../types/titleLibrary"
-import { copyToClipboard } from "../../utils/titleLibrary"
-
-export const useTitleActions = (
-  deleteMutation: UseMutationResult<void, Error, string, unknown>,
-) => {
-  /* 操作：收藏 */
-  const handleToggleFavorite = useCallback((_id: string) => {
-    message.info("收藏功能即将上线")
-  }, [])
-
-  /* 操作：复制 */
-  const handleCopy = useCallback(async (title: TitleData) => {
-    const ok = await copyToClipboard(title.content)
-    if (ok) {
-      message.success("已复制到剪贴板")
-    } else {
-      message.error("复制失败")
-    }
-  }, [])
-
-  /* 操作：删除 */
-  const handleDelete = useCallback(
-    (id: string) => {
-      deleteMutation.mutate(id)
-    },
-    [deleteMutation],
-  )
-
-  return { handleToggleFavorite, handleCopy, handleDelete }
-}

apps/web/src/pages/titles/hooks/useTitleLibrary/useTitleData.ts

@@ -1,47 +0,0 @@
-import { useMemo, useState } from "react"
-import { useQuery } from "@tanstack/react-query"
-import { getTitles } from "@/api/titles"
-import type { TitleData, CategoryItem } from "../../types/titleLibrary"
-import { toTitleData } from "../../utils/titleLibrary"
-import { ALL_CATEGORY_ID } from "../../constants/titleLibrary"
-
-export const useTitleData = () => {
-  /* 分类 */
-  const [activeCatId, setActiveCatId] = useState<string>(ALL_CATEGORY_ID)
-
-  /* 数据获取 */
-  const { data: apiTitles = [] } = useQuery({
-    queryKey: ["titles"],
-    queryFn: getTitles,
-    staleTime: 30_000,
-  })
-
-  const titles: TitleData[] = useMemo(() => apiTitles.map(toTitleData), [apiTitles])
-
-  /* 动态派生分类 */
-  const categories: CategoryItem[] = useMemo(() => {
-    const cats = new Map<string, number>()
-    apiTitles.forEach((t) => {
-      const cat = t.category || "未分类"
-      cats.set(cat, (cats.get(cat) || 0) + 1)
-    })
-    return [
-      { id: ALL_CATEGORY_ID, name: "全部标题", count: apiTitles.length },
-      ...Array.from(cats.entries()).map(([name, count]) => ({
-        id: `cat-${name}`,
-        name,
-        count,
-      })),
-    ]
-  }, [apiTitles])
-
-  const activeCategory = categories.find((c) => c.id === activeCatId)
-
-  return {
-    titles,
-    categories,
-    activeCatId,
-    activeCategory,
-    setActiveCatId,
-  }
-}

apps/web/src/pages/titles/hooks/useTitleLibrary/useTitleFilters.ts

@@ -1,77 +0,0 @@
-import { useMemo, useState } from "react"
-import type { TitleData, CategoryItem, Frequency } from "../../types/titleLibrary"
-import { ALL_CATEGORY_ID, FREQUENCY_THRESHOLDS } from "../../constants/titleLibrary"
-
-export const useTitleFilters = (
-  titles: TitleData[],
-  _categories: CategoryItem[],
-  activeCatId: string,
-  activeCategory: CategoryItem | undefined,
-) => {
-  const [searchText, setSearchText] = useState("")
-  const [filterType, setFilterType] = useState<string>("all")
-  const [filterIndustry, setFilterIndustry] = useState<string>("all")
-  const [filterFrequency, setFilterFrequency] = useState<Frequency>("all")
-
-  /* 派生：筛选后的标题列表 */
-  const filteredTitles = useMemo(() => {
-    let list = titles
-
-    /* 按分类过滤 */
-    if (activeCatId !== ALL_CATEGORY_ID) {
-      const catName = activeCategory?.name || ""
-      if (catName) {
-        list = list.filter((t) => t.category === catName)
-      }
-    }
-
-    /* 按类型筛选 */
-    if (filterType !== "all") {
-      list = list.filter((t) => t.type === filterType)
-    }
-
-    /* 按行业筛选 */
-    if (filterIndustry !== "all") {
-      list = list.filter((t) => t.industry === filterIndustry)
-    }
-
-    /* 按使用频率筛选 */
-    if (filterFrequency !== "all") {
-      switch (filterFrequency) {
-        case "high":
-          list = list.filter((t) => t.usageCount >= FREQUENCY_THRESHOLDS.high)
-          break
-        case "medium":
-          list = list.filter(
-            (t) =>
-              t.usageCount >= FREQUENCY_THRESHOLDS.medium &&
-              t.usageCount < FREQUENCY_THRESHOLDS.high,
-          )
-          break
-        case "low":
-          list = list.filter((t) => t.usageCount < FREQUENCY_THRESHOLDS.medium)
-          break
-      }
-    }
-
-    /* 搜索 */
-    if (searchText.trim()) {
-      const q = searchText.trim().toLowerCase()
-      list = list.filter((t) => t.content.toLowerCase().includes(q))
-    }
-
-    return list
-  }, [titles, activeCatId, activeCategory, filterType, filterIndustry, filterFrequency, searchText])
-
-  return {
-    searchText,
-    setSearchText,
-    filterType,
-    setFilterType,
-    filterIndustry,
-    setFilterIndustry,
-    filterFrequency,
-    setFilterFrequency,
-    filteredTitles,
-  }
-}

apps/web/src/pages/titles/hooks/useTitleLibrary/useTitleMutations.ts

@@ -1,34 +0,0 @@
-import { useMutation, useQueryClient } from "@tanstack/react-query"
-import { message } from "antd"
-import { createTitle, updateTitle, deleteTitle } from "@/api/titles"
-
-export const useTitleMutations = () => {
-  const queryClient = useQueryClient()
-
-  const createMutation = useMutation({
-    mutationFn: (content: string) => createTitle({ content }),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["titles"] })
-    },
-    onError: () => message.error("创建标题失败"),
-  })
-
-  const updateMutation = useMutation({
-    mutationFn: ({ id, content }: { id: string; content: string }) => updateTitle(id, { content }),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["titles"] })
-    },
-    onError: () => message.error("更新标题失败"),
-  })
-
-  const deleteMutation = useMutation({
-    mutationFn: (id: string) => deleteTitle(id),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["titles"] })
-      message.success("标题已删除")
-    },
-    onError: () => message.error("删除标题失败"),
-  })
-
-  return { createMutation, updateMutation, deleteMutation }
-}

apps/web/src/pages/titles/titles.css

@@ -1,488 +0,0 @@
-/**
- * 标题库页面 - V21 设计系统样式
- * 两栏布局：左侧分类列表（220px）+ 右侧标题卡片网格（3列）
- * 统一使用 CSS 变量，支持深色/浅色主题
- */
-@import "../../styles/global.css";
-
-/* ============================================================
-   页面容器
-   ============================================================ */
-.xx-titles-page {
-  min-height: 100%;
-  padding: var(--space-xl);
-}
-
-/* ============================================================
-   两栏布局
-   ============================================================ */
-.xx-titles-layout {
-  display: grid;
-  grid-template-columns: 220px 1fr;
-  gap: 20px;
-  align-items: start;
-  overflow: visible;
-}
-
-/* ============================================================
-   左侧分类列表
-   ============================================================ */
-.xx-title-category-list {
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-sm);
-  position: sticky;
-  top: var(--space-md);
-  align-self: start;
-}
-
-.xx-title-category-item {
-  border: 1px solid var(--border-color);
-  background: var(--bg-primary);
-  border-radius: var(--radius-sm);
-  padding: 14px;
-  cursor: pointer;
-  transition: var(--transition-all);
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.xx-title-category-item:hover {
-  border-color: var(--primary-color);
-  background: var(--primary-soft);
-}
-
-.xx-title-category-item.active {
-  border-color: var(--primary-color);
-  background: var(--primary-soft);
-  box-shadow: var(--shadow-primary);
-}
-
-.xx-title-category-item h4 {
-  margin: 0 0 var(--space-xs);
-  font-size: var(--font-size-base);
-  font-weight: var(--font-weight-semibold);
-  color: var(--text-primary);
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.xx-title-category-item span {
-  font-size: var(--font-size-sm);
-  color: var(--text-secondary);
-}
-
-.xx-title-category-delete {
-  background: none;
-  border: none;
-  color: var(--text-tertiary);
-  cursor: pointer;
-  padding: 4px;
-  border-radius: var(--radius-xs);
-  font-size: var(--font-size-sm);
-  transition: var(--transition-all);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  opacity: 0;
-  flex-shrink: 0;
-}
-
-.xx-title-category-item:hover .xx-title-category-delete {
-  opacity: 1;
-}
-
-.xx-title-category-delete:hover {
-  color: var(--error-color);
-  background: var(--error-soft);
-}
-
-.xx-title-category-add {
-  border: 1px dashed var(--border-color);
-  background: transparent;
-  border-radius: var(--radius-sm);
-  padding: 14px;
-  cursor: pointer;
-  text-align: center;
-  color: var(--text-secondary);
-  font-size: var(--font-size-sm);
-  transition: var(--transition-all);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: var(--space-xs);
-}
-
-.xx-title-category-add:hover {
-  border-color: var(--primary-color);
-  color: var(--primary-color);
-  background: var(--primary-soft);
-}
-
-/* ============================================================
-   右侧内容区
-   ============================================================ */
-.xx-titles-content {
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-lg);
-}
-
-/* ============================================================
-   筛选栏
-   ============================================================ */
-.xx-titles-filters {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--space-md);
-  flex-wrap: wrap;
-}
-
-.xx-titles-filters-left {
-  display: flex;
-  align-items: center;
-  gap: var(--space-sm);
-}
-
-.xx-titles-filters-right {
-  display: flex;
-  align-items: center;
-  gap: var(--space-sm);
-}
-
-/* ============================================================
-   标题卡片网格（3列）
-   ============================================================ */
-.xx-title-grid {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 14px;
-}
-
-/* ============================================================
-   标题卡片
-   ============================================================ */
-.xx-title-card {
-  border: 1px solid var(--border-color);
-  background: var(--bg-primary);
-  border-radius: var(--radius-md);
-  padding: var(--space-md);
-  transition: var(--transition-all);
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  position: relative;
-}
-
-.xx-title-card:hover {
-  border-color: var(--primary-color);
-  box-shadow: var(--shadow-sm);
-}
-
-/* 标题文本 */
-.xx-title-card-text {
-  font-size: var(--font-size-base);
-  font-weight: var(--font-weight-semibold);
-  color: var(--text-primary);
-  line-height: 1.5;
-  word-break: break-word;
-  /* 最多3行，超出省略 */
-  display: -webkit-box;
-  -webkit-line-clamp: 3;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-}
-
-/* 编辑态 */
-.xx-title-card-edit {
-  width: 100%;
-  font-size: var(--font-size-base);
-  font-weight: var(--font-weight-semibold);
-  color: var(--text-primary);
-  line-height: 1.5;
-  border: 1px solid var(--primary-color);
-  border-radius: var(--radius-sm);
-  padding: 6px 10px;
-  background: var(--bg-primary);
-  outline: none;
-  resize: vertical;
-  min-height: 60px;
-  font-family: inherit;
-}
-
-.xx-title-card-edit:focus {
-  box-shadow: 0 0 0 2px var(--primary-soft);
-}
-
-/* 底部元信息 */
-.xx-title-card-meta {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--space-sm);
-  flex-wrap: wrap;
-}
-
-.xx-title-card-meta-left {
-  display: flex;
-  align-items: center;
-  gap: var(--space-xs);
-  flex-wrap: wrap;
-}
-
-/* 类型标签 */
-.xx-title-type-tag {
-  padding: 2px 10px;
-  border-radius: var(--radius-full);
-  font-size: var(--font-size-xs);
-  font-weight: var(--font-weight-medium);
-  white-space: nowrap;
-}
-
-.xx-title-type-tag.hot {
-  background: var(--error-soft);
-  color: var(--error-color);
-}
-
-.xx-title-type-tag.normal {
-  background: var(--primary-soft);
-  color: var(--primary-color);
-}
-
-.xx-title-type-tag.creative {
-  background: var(--warning-soft);
-  color: var(--warning-color);
-}
-
-/* 深色模式 */
-.dark .xx-title-type-tag.hot,
-[data-theme="dark"] .xx-title-type-tag.hot {
-  background: rgba(220, 38, 38, 0.15);
-  color: var(--error-color);
-}
-
-.dark .xx-title-type-tag.normal,
-[data-theme="dark"] .xx-title-type-tag.normal {
-  background: var(--primary-soft);
-  color: var(--primary-color);
-}
-
-.dark .xx-title-type-tag.creative,
-[data-theme="dark"] .xx-title-type-tag.creative {
-  background: rgba(202, 138, 4, 0.15);
-  color: var(--warning-color);
-}
-
-/* 使用次数 & 时间 */
-.xx-title-card-stat {
-  font-size: var(--font-size-xs);
-  color: var(--text-tertiary);
-  white-space: nowrap;
-}
-
-/* 操作按钮区 */
-.xx-title-card-actions {
-  display: flex;
-  align-items: center;
-  gap: var(--space-xs);
-}
-
-.xx-title-card-action-btn {
-  background: none;
-  border: none;
-  color: var(--text-tertiary);
-  cursor: pointer;
-  padding: 4px 6px;
-  border-radius: var(--radius-xs);
-  font-size: var(--font-size-sm);
-  transition: var(--transition-all);
-  display: flex;
-  align-items: center;
-  gap: var(--space-xxs);
-}
-
-.xx-title-card-action-btn:hover {
-  color: var(--primary-color);
-  background: var(--primary-soft);
-}
-
-.xx-title-card-action-btn.danger:hover {
-  color: var(--error-color);
-  background: var(--error-soft);
-}
-
-/* 收藏按钮 */
-.xx-title-fav-btn {
-  background: none;
-  border: none;
-  cursor: pointer;
-  font-size: var(--font-size-md);
-  padding: var(--space-xxs);
-  line-height: 1;
-  transition: var(--transition-all);
-}
-
-.xx-title-fav-btn:hover {
-  transform: scale(1.2);
-}
-
-/* ============================================================
-   空状态
-   ============================================================ */
-.xx-titles-empty {
-  text-align: center;
-  padding: var(--space-3xl) var(--space-xl);
-  color: var(--text-secondary);
-}
-
-.xx-titles-empty-icon {
-  font-size: var(--font-size-3xl);
-  margin-bottom: var(--space-md);
-  opacity: 0.5;
-}
-
-/* ============================================================
-   AI 生成结果列表
-   ============================================================ */
-.xx-ai-results {
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-sm);
-  margin-top: var(--space-md);
-}
-
-.xx-ai-result-item {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: var(--space-sm);
-  padding: 10px 14px;
-  border: 1px solid var(--border-color);
-  border-radius: var(--radius-sm);
-  background: var(--bg-secondary);
-  transition: var(--transition-all);
-}
-
-.xx-ai-result-item:hover {
-  border-color: var(--primary-color);
-  background: var(--primary-soft);
-}
-
-.xx-ai-result-text {
-  flex: 1;
-  font-size: var(--font-size-base);
-  color: var(--text-primary);
-  line-height: 1.5;
-}
-
-.xx-ai-result-actions {
-  display: flex;
-  align-items: center;
-  gap: var(--space-xs);
-  flex-shrink: 0;
-}
-
-/* AI 加载动画 */
-.xx-ai-loading {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: var(--space-md);
-  padding: var(--space-xl);
-  color: var(--text-secondary);
-}
-
-.xx-ai-loading-dots {
-  display: flex;
-  gap: 6px;
-}
-
-.xx-ai-loading-dot {
-  width: 10px;
-  height: 10px;
-  border-radius: var(--radius-full);
-  background: var(--primary-color);
-  animation: ai-dot-bounce 1.4s ease-in-out infinite both;
-}
-
-.xx-ai-loading-dot:nth-child(1) {
-  animation-delay: 0s;
-}
-.xx-ai-loading-dot:nth-child(2) {
-  animation-delay: 0.16s;
-}
-.xx-ai-loading-dot:nth-child(3) {
-  animation-delay: 0.32s;
-}
-
-@keyframes ai-dot-bounce {
-  0%,
-  80%,
-  100% {
-    transform: scale(0.4);
-    opacity: 0.4;
-  }
-  40% {
-    transform: scale(1);
-    opacity: 1;
-  }
-}
-
-/* ============================================================
-   响应式
-   ============================================================ */
-@media (max-width: 1200px) {
-  .xx-titles-layout {
-    grid-template-columns: 1fr;
-  }
-
-  .xx-title-category-list {
-    flex-direction: row;
-    overflow-x: auto;
-    position: static;
-    gap: var(--space-sm);
-    padding-bottom: var(--space-sm);
-  }
-
-  .xx-title-category-item {
-    min-width: 160px;
-    flex-shrink: 0;
-  }
-
-  .xx-title-grid {
-    grid-template-columns: repeat(2, 1fr);
-  }
-}
-
-@media (max-width: 768px) {
-  .xx-titles-page {
-    padding: var(--space-md);
-  }
-
-  .xx-title-grid {
-    grid-template-columns: 1fr;
-  }
-
-  .xx-titles-filters {
-    flex-direction: column;
-    align-items: stretch;
-  }
-
-  .xx-titles-filters-left,
-  .xx-titles-filters-right {
-    justify-content: flex-start;
-  }
-}
-
-@media (max-width: 480px) {
-  .xx-titles-page {
-    padding: var(--space-sm);
-  }
-
-  .xx-title-card {
-    padding: 12px;
-  }
-}

apps/web/src/pages/titles/types/titleLibrary.ts

@@ -1,20 +0,0 @@
-export type TitleType = "hot" | "normal" | "creative"
-export type Industry = "general" | "food" | "tech" | "beauty" | "education" | "travel"
-export type Frequency = "all" | "high" | "medium" | "low"
-
-export interface TitleData {
-  id: string
-  content: string
-  type: TitleType
-  industry: Industry
-  category: string
-  usageCount: number
-  isFavorited: boolean
-  createdAt: string
-}
-
-export interface CategoryItem {
-  id: string
-  name: string
-  count: number
-}

apps/web/src/pages/titles/utils/titleLibrary.ts

@@ -1,49 +0,0 @@
-import type { TitleData, TitleType } from "../types/titleLibrary"
-import type { TitleItem } from "@/api/titles"
-
-export const typeLabel = (type: TitleType): string => {
-  switch (type) {
-    case "hot":
-      return "爆款"
-    case "normal":
-      return "常规"
-    case "creative":
-      return "创意"
-  }
-}
-
-/** 后端 TitleItem → 前端 TitleData 映射 */
-export const toTitleData = (item: TitleItem): TitleData => ({
-  id: item.id,
-  content: item.content,
-  type: (item.category as TitleType) || "normal",
-  industry: "general",
-  category: item.category || "未分类",
-  usageCount: 0,
-  isFavorited: false,
-  createdAt: item.created_at?.slice(0, 10) || "",
-})
-
-/** 复制文本到剪贴板 */
-export const copyToClipboard = async (text: string): Promise<boolean> => {
-  try {
-    await navigator.clipboard.writeText(text)
-    return true
-  } catch {
-    /* 降级方案 */
-    const textarea = document.createElement("textarea")
-    textarea.value = text
-    textarea.style.position = "fixed"
-    textarea.style.opacity = "0"
-    document.body.appendChild(textarea)
-    textarea.select()
-    try {
-      document.execCommand("copy")
-      return true
-    } catch {
-      return false
-    } finally {
-      document.body.removeChild(textarea)
-    }
-  }
-}

apps/web/src/router/appRoutes.tsx

@@ -20,10 +20,6 @@ const appChildren: RouteObject[] = [
     path: "assets",
     lazy: lazyRoute(() => import("@/pages/assets/AssetLibrary")),
   },
-  {
-    path: "titles",
-    lazy: lazyRoute(() => import("@/pages/titles/TitleLibrary")),
-  },
   {
     path: "scripts",
     lazy: lazyRoute(() => import("@/pages/scripts/ScriptLibrary")),

apps/web/src/store/pointsStore.ts

@@ -1,83 +1,130 @@
 /**
- * 积分 & 会员状态管理（Zustand）
- * - 启动时拉取余额 & 订阅信息
- * - 提供刷新、余额扣减（乐观更新）等工具
+ * 积分 & 会员状态管理
+ * 对齐后端 staging 最终契约（2026-09-16）：
+ * - balance: GET /points/balance（无 free_clips_*）
+ * - dailyUsage: GET /usage/daily（每日免费额度）
+ * - membership: GET /points/subscription/membership（聚合会员信息）
+ * - rules: GET /points/rules（base_points + free_user_multiplier）
+ * - subscription: GET /subscription/current（plan_id + billing_cycle）
  */
 import { create } from "zustand"
-import type { PointsBalance, PointsRulesResponse, SubscriptionCurrent } from "@/api/points/types"
-import { getCurrentSubscription, getPointsBalance, getPointsRules } from "@/api/points"
+import { getPointsBalance, getPointsRules, getDailyUsage, getMembership } from "@/api/points"
+import { getCurrentSubscription } from "@/api/subscription"
+import type {
+  PointsBalance,
+  PointsRulesResponse,
+  DailyUsage,
+  MembershipResponse,
+} from "@/api/points/types"
+import type { SubscriptionInfo } from "@/api/subscription/types"
 
 interface PointsState {
-  /** 积分余额 & 会员状态（来自 /points/balance） */
   balance: PointsBalance | null
-  /** 订阅详情（来自 /subscription/current） */
-  subscription: SubscriptionCurrent | null
-  /** 积分消耗规则缓存 */
+  dailyUsage: DailyUsage | null
+  membership: MembershipResponse | null
   rules: PointsRulesResponse | null
+  subscription: SubscriptionInfo | null
   loading: boolean
   error: string | null
-  /** 初始化：拉取余额 + 订阅信息 + 规则 */
+  /** 初始化：并行拉取 balance / rules / subscription / dailyUsage / membership */
   init: () => Promise<void>
-  /** 强制刷新余额 */
+  /** 刷新余额（充值/消费后调用） */
   refreshBalance: () => Promise<void>
-  /** 乐观扣减：在支付/业务发起前调用，失败时用 refreshBalance 兜底 */
+  /** 乐观扣减 */
   optimisticDeduct: (points: number) => void
-  /** 乐观增加（充值成功后调用） */
+  /** 乐观增加 */
   optimisticAdd: (points: number) => void
+  /** 清除积分状态（退出登录） */
+  reset: () => void
 }
 
 export const usePointsStore = create<PointsState>((set, get) => ({
   balance: null,
-  subscription: null,
+  dailyUsage: null,
+  membership: null,
   rules: null,
+  subscription: null,
   loading: false,
   error: null,
 
   init: async () => {
-    if (get().loading) return
+    // 已加载过不重复拉取
+    if (get().balance && get().rules && get().subscription) return
     set({ loading: true, error: null })
     try {
-      const [balance, sub, rules] = await Promise.all([
-        getPointsBalance(),
-        getCurrentSubscription(),
-        getPointsRules(),
+      const [balance, rules, subscription, dailyUsage, membership] = await Promise.all([
+        getPointsBalance().catch(() => null),
+        getPointsRules().catch(() => null),
+        getCurrentSubscription().catch(() => null),
+        getDailyUsage().catch(() => null),
+        getMembership().catch(() => null),
       ])
-      set({ balance, subscription: sub, rules, loading: false })
-    } catch (e) {
-      set({ error: (e as Error).message, loading: false })
+      set({
+        balance,
+        rules,
+        subscription,
+        dailyUsage,
+        membership,
+        loading: false,
+      })
+    } catch (err) {
+      set({ error: (err as Error).message || "加载积分信息失败", loading: false })
     }
   },
 
   refreshBalance: async () => {
     try {
-      const balance = await getPointsBalance()
-      set({ balance })
-    } catch (e) {
-      set({ error: (e as Error).message })
+      const [balance, dailyUsage, membership, subscription] = await Promise.all([
+        getPointsBalance(),
+        getDailyUsage().catch(() => null),
+        getMembership().catch(() => null),
+        getCurrentSubscription().catch(() => get().subscription),
+      ])
+      set({ balance, dailyUsage, membership, subscription })
+    } catch (err) {
+      set({ error: (err as Error).message || "刷新积分失败" })
     }
   },
 
   optimisticDeduct: (points: number) => {
-    const b = get().balance
-    if (!b) return
+    const { balance, membership } = get()
+    if (!balance) return
     set({
       balance: {
-        ...b,
-        balance: Math.max(0, b.balance - points),
-        total_spent: b.total_spent + points,
+        ...balance,
+        balance: Math.max(0, balance.balance - points),
+        total_spent: balance.total_spent + points,
       },
+      membership: membership
+        ? { ...membership, points_balance: Math.max(0, membership.points_balance - points) }
+        : null,
     })
   },
 
   optimisticAdd: (points: number) => {
-    const b = get().balance
-    if (!b) return
+    const { balance, membership } = get()
+    if (!balance) return
     set({
       balance: {
-        ...b,
-        balance: b.balance + points,
-        total_earned: b.total_earned + points,
+        ...balance,
+        balance: balance.balance + points,
+        total_earned: balance.total_earned + points,
       },
+      membership: membership
+        ? { ...membership, points_balance: membership.points_balance + points }
+        : null,
+    })
+  },
+
+  reset: () => {
+    set({
+      balance: null,
+      dailyUsage: null,
+      membership: null,
+      rules: null,
+      subscription: null,
+      loading: false,
+      error: null,
     })
   },
 }))

apps/web/src/test/components/layout/Header.test.tsx

@@ -45,49 +45,60 @@ vi.mock("@/config/navigation", () => ({
   ],
 }))
 
-// mock antd icons
-vi.mock("@ant-design/icons", () => ({
-  LogoutOutlined: () => <span data-testid="logout-icon" />,
-  SettingOutlined: () => <span data-testid="setting-icon" />,
-  UserOutlined: () => <span data-testid="user-icon" />,
-  MenuOutlined: () => <span data-testid="menu-icon" />,
-}))
+// mock antd icons — 透传未显式 mock 的图标，避免 PointsBadge 等子组件引用新图标时报错
+vi.mock("@ant-design/icons", async () => {
+  const actual = (await vi.importActual<typeof import("@ant-design/icons")>(
+    "@ant-design/icons",
+  )) as Record<string, unknown>
+  return {
+    ...actual,
+    LogoutOutlined: () => <span data-testid="logout-icon" />,
+    SettingOutlined: () => <span data-testid="setting-icon" />,
+    UserOutlined: () => <span data-testid="user-icon" />,
+    MenuOutlined: () => <span data-testid="menu-icon" />,
+  }
+})
 
-// mock antd components
-vi.mock("antd", () => ({
-  Avatar: ({ children, className }: any) => (
-    <span data-testid="mock-avatar" className={className}>
-      {children}
-    </span>
-  ),
-  Dropdown: ({ children, menu }: any) => (
-    <div data-testid="mock-dropdown">
-      {children}
-      <div data-testid="dropdown-menu" style={{ display: "none" }}>
-        {menu.items?.map((item: any, idx: number) => (
-          <div key={idx} data-testid={`menu-item-${item.key}`} onClick={item.onClick}>
-            {item.label}
-          </div>
-        ))}
+// mock antd components — 用 importActual 透传未显式覆盖的组件（Popover/Button/Tag/Typography/Badge 等），
+// 避免 Header 子组件（PointsBadge）使用新 antd 导出时出现 "No xxx export is defined on the antd mock"
+vi.mock("antd", async () => {
+  const actual = (await vi.importActual<typeof import("antd")>("antd")) as Record<string, unknown>
+  return {
+    ...actual,
+    Avatar: ({ children, className }: any) => (
+      <span data-testid="mock-avatar" className={className}>
+        {children}
+      </span>
+    ),
+    Dropdown: ({ children, menu }: any) => (
+      <div data-testid="mock-dropdown">
+        {children}
+        <div data-testid="dropdown-menu" style={{ display: "none" }}>
+          {menu.items?.map((item: any, idx: number) => (
+            <div key={idx} data-testid={`menu-item-${item.key}`} onClick={item.onClick}>
+              {item.label}
+            </div>
+          ))}
+        </div>
       </div>
-    </div>
-  ),
-  Space: ({ children, className }: any) => (
-    <div data-testid="mock-space" className={className}>
-      {children}
-    </div>
-  ),
-  Drawer: ({ title, open, children, onClose, placement }: any) =>
-    open ? (
-      <div data-testid="mock-drawer" data-placement={placement}>
-        <div data-testid="drawer-title">{title}</div>
-        <button data-testid="drawer-close" onClick={onClose}>
-          Close
-        </button>
+    ),
+    Space: ({ children, className }: any) => (
+      <div data-testid="mock-space" className={className}>
         {children}
       </div>
-    ) : null,
-}))
+    ),
+    Drawer: ({ title, open, children, onClose, placement }: any) =>
+      open ? (
+        <div data-testid="mock-drawer" data-placement={placement}>
+          <div data-testid="drawer-title">{title}</div>
+          <button data-testid="drawer-close" onClick={onClose}>
+            Close
+          </button>
+          {children}
+        </div>
+      ) : null,
+  }
+})
 
 // mock CSS
 vi.mock("@/components/layout/Header.css", () => ({}))

apps/web/src/test/pages/TitleLibrary.test.tsx

@@ -1,90 +0,0 @@
-import React from "react"
-import { describe, expect, it, vi } from "vitest"
-import { render } from "@testing-library/react"
-import { MemoryRouter } from "react-router-dom"
-
-vi.mock("@/components/layout/PageHead", () => ({
-  default: ({ title }: { title: string }) => <div data-testid="page-head">{title}</div>,
-}))
-
-vi.mock("@tanstack/react-query", () => ({
-  useQuery: () => ({ data: [], isLoading: false, isError: false, refetch: vi.fn() }),
-  useMutation: () => ({ mutate: vi.fn(), mutateAsync: vi.fn(), isLoading: false }),
-  useQueryClient: () => ({ invalidateQueries: vi.fn() }),
-}))
-
-vi.mock("@/components/ui", () => ({
-  Button: ({ children, onClick }: any) => <button onClick={onClick}>{children}</button>,
-  Input: ({ placeholder }: any) => <input placeholder={placeholder} />,
-  Select: ({ options }: any) => (
-    <select>
-      {options?.map((o: any) => (
-        <option key={o.value}>{o.label}</option>
-      ))}
-    </select>
-  ),
-  Modal: ({ open, children }: any) => (open ? <div role="dialog">{children}</div> : null),
-  Empty: () => <div>Empty</div>,
-  Card: ({ children }: any) => <div>{children}</div>,
-  Tag: ({ children }: any) => <span>{children}</span>,
-  Tooltip: ({ children }: any) => <span>{children}</span>,
-}))
-
-vi.mock("antd", () => ({
-  Modal: ({ open, children }: any) => (open ? <div role="dialog">{children}</div> : null),
-  message: { success: vi.fn(), error: vi.fn(), warning: vi.fn() },
-  Popconfirm: ({ children }: any) => <span>{children}</span>,
-  Form: ({ children }: any) => <form>{children}</form>,
-  Input: ({ placeholder }: any) => <input placeholder={placeholder} />,
-  InputNumber: () => <input type="number" />,
-}))
-
-vi.mock("@ant-design/icons", () => ({
-  PlusOutlined: () => <span />,
-  EditOutlined: () => <span />,
-  DeleteOutlined: () => <span />,
-  SearchOutlined: () => <span />,
-  FileTextOutlined: () => <span />,
-  CopyOutlined: () => <span />,
-  RobotOutlined: () => <span />,
-  CheckOutlined: () => <span />,
-  StarOutlined: () => <span />,
-}))
-
-vi.mock("@/api/titles", () => ({
-  getTitles: vi.fn().mockResolvedValue([]),
-  createTitle: vi.fn().mockResolvedValue({ success: true }),
-  updateTitle: vi.fn().mockResolvedValue({ success: true }),
-  deleteTitle: vi.fn().mockResolvedValue({ success: true }),
-}))
-
-vi.mock("@/store/authStore", () => ({
-  useAuthStore: (sel: any) => sel({ user: { id: "1", vip_level: 0 }, isAuthenticated: true }),
-}))
-
-vi.mock("@/pages/titles/titles.css", () => ({}))
-
-import TitleLibrary from "@/pages/titles/TitleLibrary"
-import "@/pages/titles/types/titleLibrary"
-import "@/pages/titles/constants/titleLibrary"
-import "@/pages/titles/utils/titleLibrary"
-import "@/pages/titles/hooks/useTitleLibrary"
-import "@/pages/titles/hooks/useTitleEdit"
-import "@/pages/titles/hooks/useTitleAI"
-import "@/pages/titles/components/title-library/TitleCard"
-import "@/pages/titles/components/title-library/CategorySidebar"
-import "@/pages/titles/components/title-library/FilterBar"
-import "@/pages/titles/components/title-library/TitleGrid"
-import "@/pages/titles/components/title-library/CreateTitleModal"
-import "@/pages/titles/components/title-library/AIGenerateModal"
-
-describe("TitleLibrary Page", () => {
-  it("should render without crashing", () => {
-    const { container } = render(
-      <MemoryRouter>
-        <TitleLibrary />
-      </MemoryRouter>,
-    )
-    expect(container.firstChild).toBeTruthy()
-  })
-})

apps/web/src/test/pages/titles/smoke.test.tsx

@@ -1,29 +0,0 @@
-/**
- * TitleLibrary 模块 smoke test
- * 建立完整依赖链，确保 vitest related 模式能匹配到
- * titles 目录下所有文件的改动
- */
-import { describe, it, expect } from "vitest"
-
-// 主组件
-import "@/pages/titles/TitleLibrary"
-
-// Hooks
-import "@/pages/titles/hooks/useTitleLibrary"
-import "@/pages/titles/hooks/useTitleLibrary/useTitleData"
-import "@/pages/titles/hooks/useTitleLibrary/useTitleFilters"
-import "@/pages/titles/hooks/useTitleLibrary/useTitleMutations"
-import "@/pages/titles/hooks/useTitleLibrary/useTitleActions"
-
-// 类型与常量
-import "@/pages/titles/types/titleLibrary"
-import "@/pages/titles/constants/titleLibrary"
-
-// 工具函数
-import "@/pages/titles/utils/titleLibrary"
-
-describe("TitleLibrary module smoke test", () => {
-  it("should load all title modules", () => {
-    expect(true).toBe(true)
-  })
-})

deploy/configs/.env.production

@@ -216,6 +216,25 @@ MEDIAKIT_TIMEOUT=60
 # SENTRY_DSN=${SENTRY_DSN}
 
 
+# ==================== 豆包大模型 (火山引擎 ARK) ====================
+
+# 豆包大模型 API Key（ARK 平台颁发）
+# ${DOUBAO_API_KEY} — 替换为实际的 ARK API Key
+DOUBAO_API_KEY=${DOUBAO_API_KEY}
+
+# 模型 Endpoint ID
+DOUBAO_MODEL=${DOUBAO_MODEL}
+
+# API Base URL
+DOUBAO_BASE_URL=${DOUBAO_BASE_URL}
+
+# 请求超时（秒）
+DOUBAO_TIMEOUT=60
+
+# 最大重试次数
+DOUBAO_MAX_RETRIES=2
+
+
 # ==================== 微信开放平台 OAuth（网页扫码登录）====================
 # 回调域名：xiaoxiajianji.com（微信开放平台已配置）
 WECHAT_OPEN_APP_ID=${WECHAT_APP_ID}

deploy/configs/.env.staging

@@ -233,6 +233,25 @@ MEDIAKIT_BASE_URL=https://mediakit.cn-beijing.volces.com/api/v1
 MEDIAKIT_TIMEOUT=60
 
 
+# ==================== 豆包大模型 (火山引擎 ARK) ====================
+
+# 豆包大模型 API Key（ARK 平台颁发）
+# ${DOUBAO_API_KEY} — 替换为实际的 ARK API Key
+DOUBAO_API_KEY=${DOUBAO_API_KEY}
+
+# 模型 Endpoint ID（在 ARK 控制台创建推理接入点后获得）
+DOUBAO_MODEL=${DOUBAO_MODEL}
+
+# API Base URL
+DOUBAO_BASE_URL=${DOUBAO_BASE_URL}
+
+# 请求超时（秒）
+DOUBAO_TIMEOUT=60
+
+# 最大重试次数
+DOUBAO_MAX_RETRIES=2
+
+
 # ==================== 微信开放平台 OAuth（网页扫码登录）====================
 # 回调域名：xiaoxiajianji.com（微信开放平台已配置）
 WECHAT_OPEN_APP_ID=${WECHAT_APP_ID}

packages/adapters/sqlalchemy_impl/models.py

@@ -671,6 +671,10 @@ class ScriptModel(Base):
     content = Column(Text, nullable=False, default="")
     segments = Column(JSON, nullable=False, default=list)
     tags = Column(JSON, nullable=False, default=list)
+    # #1894: 废弃标题库整合到文案库 — 标题配置字段
+    title_text = Column(String(500), nullable=False, default="")
+    title_category = Column(String(50), nullable=False, default="")
+    title_config = Column(JSON, nullable=False, default=dict)
     created_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(UTC))
     updated_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(UTC))
 

packages/domain/points_rules.py

@@ -8,20 +8,51 @@ import math
 # 每个场景: base_points(基础积分), unit(计费单位), name(显示名称)
 
 POINTS_SCENES: dict[str, dict] = {
-    "ai_voice": {"base_points": 1, "unit": "分钟", "name": "AI 配音"},
+    "ai_voice": {
+        "base_points": 1,
+        "unit": "分钟",
+        "name": "AI 配音",
+        "description": "AI 配音每分钟消耗 1 积分（免费用户上浮 15%，会员 8~9 折）",
+    },
     "ai_video": {
         "base_points": 3,
         "unit": "条",
         "name": "智能混剪",
         "extra_per_30s": 1,
+        "description": "智能混剪每条 3 积分起，视频超过 30 秒后每 30 秒加 1 积分；免费用户每日 2 条免费额度",
     },
-    "ai_digital_human": {"base_points": 15, "unit": "分钟", "name": "AI 数字人"},
-    "voice_clone_train": {"base_points": 0, "unit": "次", "name": "声音克隆训练"},
-    "voice_clone_synth": {"base_points": 1, "unit": "分钟", "name": "声音克隆合成"},
-    "douyin_extract": {"base_points": 1, "unit": "次", "name": "抖音链接提取"},
-    "ai_rewrite": {"base_points": 1, "unit": "次", "name": "AI 改写文案"},
-    "ai_title": {"base_points": 1, "unit": "次", "name": "AI 标题生成"},
-    "ai_cover": {"base_points": 1, "unit": "张", "name": "AI 封面生成"},
+    "ai_digital_human": {
+        "base_points": 15,
+        "unit": "分钟",
+        "name": "AI 数字人",
+        "description": "AI 数字人每分钟消耗 15 积分",
+    },
+    "voice_clone_train": {
+        "base_points": 0,
+        "unit": "次",
+        "name": "声音克隆训练",
+        "description": "声音克隆训练免费（每用户限 1 个声音）",
+    },
+    "voice_clone_synth": {
+        "base_points": 1,
+        "unit": "分钟",
+        "name": "声音克隆合成",
+        "description": "克隆音色合成每分钟消耗 1 积分",
+    },
+    "douyin_extract": {
+        "base_points": 1,
+        "unit": "次",
+        "name": "抖音链接提取",
+        "description": "抖音文案提取每次 1 积分",
+    },
+    "ai_rewrite": {"base_points": 1, "unit": "次", "name": "AI 改写文案", "description": "AI 改写文案每次 1 积分"},
+    "ai_title": {
+        "base_points": 1,
+        "unit": "次",
+        "name": "AI 标题生成",
+        "description": "AI 生成标题每次 1 积分（免费用户实际上浮后 2 积分/次）",
+    },
+    "ai_cover": {"base_points": 1, "unit": "张", "name": "AI 封面生成", "description": "AI 封面生成每张 1 积分"},
 }
 
 # 免费用户积分消耗上浮系数

scripts/ci/run_integration_tests.sh

@@ -120,6 +120,29 @@ wait_tcp_ready() {
   return 1
 }
 
+# --- 幂等容器清理（无论成功/失败/被取消都回收临时 PG、Redis，杜绝泄漏）---
+# 背景：服务容器用 docker run -d 起在宿主机上，仅在脚本走到结尾时清理；
+# job 失败(set -e)或被取消(SIGTERM)时会永久残留，堆积压垮构建机。
+cleanup_containers() {
+  # 清理过程自身不能再次触发退出，避免掩盖原始退出码
+  set +e
+  if [ -n "${PG_CONTAINER:-}" ]; then
+    docker rm -f "$PG_CONTAINER" >/dev/null 2>&1 && echo "✅ 已清理PG容器: $PG_CONTAINER"
+  fi
+  if [ -n "${REDIS_CONTAINER:-}" ]; then
+    docker rm -f "$REDIS_CONTAINER" >/dev/null 2>&1 && echo "✅ 已清理Redis容器: $REDIS_CONTAINER"
+  fi
+}
+on_exit() {
+  local code=$?
+  cleanup_containers
+  exit "$code"
+}
+# 必须在启动任何服务容器之前注册；INT/TERM 覆盖 Gitea 取消任务场景
+trap on_exit EXIT
+trap 'exit 130' INT
+trap 'exit 143' TERM
+
 # --- 启动 Redis ---
 echo ""
 echo "=== 启动 Redis ==="
@@ -302,14 +325,10 @@ conn.close()
 " 2>/dev/null || echo "WARN: 数据库清理失败（可能已被清理）"
   echo "✅ 共享PG数据库已清理"
 else
-  # 清理临时PG容器
-  docker rm -f "$PG_CONTAINER" 2>/dev/null || true
-  echo "✅ PG容器已清理"
+  # 临时PG容器由 EXIT trap 的 cleanup_containers 统一回收（失败/取消也保证清理）
+  :
 fi
-
-# 清理Redis容器
-docker rm -f "$REDIS_CONTAINER" 2>/dev/null || true
-echo "✅ Redis容器已清理"
+# 临时Redis容器同样由 EXIT trap 统一回收
 
 # --- 覆盖率汇总 ---
 echo ""

scripts/ci/run_staging_tests.sh

@@ -16,6 +16,17 @@ CONTAINER_NAME="staging-${MODE}-$$"
 # 强制清理可能残留的同名容器
 docker rm -f "$CONTAINER_NAME" 2>/dev/null || true
 
+# 任何退出路径（成功/失败/被取消 SIGTERM）都回收容器，杜绝 staging 测试容器泄漏
+cleanup_container() {
+  local code=$?
+  set +e
+  docker rm -f "$CONTAINER_NAME" >/dev/null 2>&1 && echo "✅ 已清理容器: $CONTAINER_NAME"
+  exit "$code"
+}
+trap cleanup_container EXIT
+trap 'exit 130' INT
+trap 'exit 143' TERM
+
 if [ "$MODE" = "e2e" ]; then
   docker create --name "$CONTAINER_NAME" --ipc=host \
     -e E2E_BASE_URL=https://staging.xiaoxiajianji.com \
@@ -44,7 +55,5 @@ docker cp apps "$CONTAINER_NAME:/workspace/"
 docker start -a "$CONTAINER_NAME"
 EXIT_CODE=$(docker wait "$CONTAINER_NAME")
 
-# 清理容器
-docker rm "$CONTAINER_NAME" 2>/dev/null || true
-
+# 容器由 EXIT trap 的 cleanup_container 统一回收（失败/取消也保证清理）
 exit "$EXIT_CODE"

scripts/ci_production_deploy.sh

@@ -69,7 +69,11 @@ if [ -z "$IMAGE_TAG" ]; then
   exit 1
 fi
 
-test -f "$ENV_FILE"
+if [ ! -f "$ENV_FILE" ]; then
+  echo "ERROR: $ENV_FILE 不存在。CI 应先在 render_env 步骤渲染并上传此文件"
+  exit 1
+fi
+echo "✅ .env file found: $ENV_FILE ($(wc -l < $ENV_FILE) lines)"
 mkdir -p "$GENERATED_DIR"
 mkdir -p "$LEGACY_ASSETS_DIR"
 

scripts/render_env.sh

@@ -57,7 +57,7 @@ if [ "$TARGET_ENV" = "staging" ]; then
 fi
 
 # 共用 secrets 直接导出（如果存在）
-SHARED_SECRETS="OSS_ACCESS_KEY_ID OSS_ACCESS_KEY_SECRET COSYVOICE_API_KEY DASHSCOPE_API_KEY MEDIAKIT_API_KEY WECHAT_APP_ID WECHAT_APP_SECRET"
+SHARED_SECRETS="OSS_ACCESS_KEY_ID OSS_ACCESS_KEY_SECRET COSYVOICE_API_KEY DASHSCOPE_API_KEY MEDIAKIT_API_KEY DOUBAO_API_KEY DOUBAO_MODEL DOUBAO_BASE_URL WECHAT_APP_ID WECHAT_APP_SECRET"
 for var in $SHARED_SECRETS; do
   value="${!var:-}"
   # 已经在环境中了，无需额外操作

tests/unit/test_auth_register_points.py

@@ -0,0 +1,111 @@
+"""注册送积分单元测试 (#1895 P2 step 3)"""
+
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+
+@pytest.fixture
+def mock_settings(monkeypatch):
+    """默认关闭 points_enabled，不影响现有用例。"""
+    from app.config import settings
+
+    monkeypatch.setattr(settings, "points_enabled", False)
+    return settings
+
+
+class TestRegisterBonusPoints:
+    @pytest.mark.asyncio
+    async def test_bonus_when_enabled(self, mock_settings):
+        """开启积分时注册成功送50分。"""
+        from app.api.routes import auth
+        from app.api.routes.auth import RegisterRequest
+
+        mock_settings.points_enabled = True
+
+        mock_uc = MagicMock()
+        mock_resp = MagicMock()
+        mock_resp.user_id = "new-user-1"
+        mock_resp.email = "n***@example.com"
+        mock_resp.username = "newuser"
+        mock_resp.display_name = "New User"
+        mock_uc.execute.return_value = (mock_resp, None)
+
+        mock_svc = MagicMock()
+
+        def _mock_uc_cls(*args, **kwargs):
+            return mock_uc
+
+        db = MagicMock()
+
+        with (
+            patch("app.api.routes.auth.RegisterUserUseCase", side_effect=_mock_uc_cls),
+            patch("packages.domain.points_service.PointsService", return_value=mock_svc),
+        ):
+            req = RegisterRequest(email="n***@example.com", password="Secret123!", username="newuser")
+            resp = await auth.register(request=req, user_repository=MagicMock(), email_service=MagicMock(), db=db)
+            assert resp.user_id == "new-user-1"
+            mock_svc.add_points.assert_called_once()
+            call_kwargs = mock_svc.add_points.call_args.kwargs
+            assert call_kwargs["user_id"] == "new-user-1"
+            assert call_kwargs["amount"] == 50
+            assert call_kwargs["source"] == "task_reward"
+
+    @pytest.mark.asyncio
+    async def test_no_bonus_when_disabled(self, mock_settings):
+        """关闭积分时不送分。"""
+        from app.api.routes import auth
+        from app.api.routes.auth import RegisterRequest
+
+        mock_uc = MagicMock()
+        mock_resp = MagicMock()
+        mock_resp.user_id = "new-user-2"
+        mock_resp.email = "n***@example.com"
+        mock_resp.username = "newuser2"
+        mock_resp.display_name = "New User 2"
+        mock_uc.execute.return_value = (mock_resp, None)
+
+        def _mock_uc_cls(*args, **kwargs):
+            return mock_uc
+
+        db = MagicMock()
+        with (
+            patch("app.api.routes.auth.RegisterUserUseCase", side_effect=_mock_uc_cls),
+            patch("packages.domain.points_service.PointsService") as MockSvc,
+        ):
+            req = RegisterRequest(email="n***@example.com", password="Secret123!", username="newuser2")
+            resp = await auth.register(request=req, user_repository=MagicMock(), email_service=MagicMock(), db=db)
+            MockSvc.assert_not_called()
+            assert resp.user_id == "new-user-2"
+
+    @pytest.mark.asyncio
+    async def test_bonus_failure_does_not_break_register(self, mock_settings):
+        """送积分失败不应影响注册流程。"""
+        from app.api.routes import auth
+        from app.api.routes.auth import RegisterRequest
+
+        mock_settings.points_enabled = True
+        mock_uc = MagicMock()
+        mock_resp = MagicMock()
+        mock_resp.user_id = "new-user-3"
+        mock_resp.email = "n***@example.com"
+        mock_resp.username = "newuser3"
+        mock_resp.display_name = "New User 3"
+        mock_uc.execute.return_value = (mock_resp, None)
+
+        mock_svc = MagicMock()
+        mock_svc.add_points.side_effect = Exception("DB error")
+
+        def _mock_uc_cls(*args, **kwargs):
+            return mock_uc
+
+        db = MagicMock()
+        with (
+            patch("app.api.routes.auth.RegisterUserUseCase", side_effect=_mock_uc_cls),
+            patch("packages.domain.points_service.PointsService", return_value=mock_svc),
+        ):
+            req = RegisterRequest(email="n***@example.com", password="Secret123!", username="newuser3")
+            resp = await auth.register(request=req, user_repository=MagicMock(), email_service=MagicMock(), db=db)
+            assert resp.user_id == "new-user-3"

tests/unit/test_extract_from_douyin_errors.py

@@ -0,0 +1,222 @@
+"""验证 extract-from-douyin 在各种失败场景返回正确的 HTTP 状态码（绝不能 500）"""
+
+from __future__ import annotations
+
+import sys
+import types
+from unittest import mock
+
+import pytest
+from app.auth import AuthenticatedUser
+from fastapi import HTTPException, status
+
+
+class _FakeUser:
+    id = "u-test"
+    is_member = False
+    member_type = None
+
+
+@pytest.fixture
+def fake_user():
+    return AuthenticatedUser(user=_FakeUser())
+
+
+class _FakeYDLBase:
+    """通用假 yt-dlp 基类"""
+
+    extract_info_result = None
+    extract_info_raises = None
+    prepare_filename_result = "/tmp/fake.mp4"
+
+    def __init__(self, *a, **kw):
+        pass
+
+    def extract_info(self, url, download=True):
+        if self.__class__.extract_info_raises:
+            raise self.__class__.extract_info_raises
+        return self.__class__.extract_info_result
+
+    def prepare_filename(self, info):
+        return self.__class__.prepare_filename_result
+
+
+def _install_fake_ytdlp(fake_ydl_class, *, download_error_cls=None):
+    """把假 yt-dlp 注入 sys.modules，函数内 import yt_dlp 会拿到我们的假版本"""
+    fake_mod = types.ModuleType("yt_dlp")
+    fake_mod.YoutubeDL = fake_ydl_class
+    if download_error_cls is None:
+        download_error_cls = type("DownloadError", (Exception,), {})
+    fake_mod.DownloadError = download_error_cls
+    utils_mod = types.ModuleType("yt_dlp.utils")
+    utils_mod.DownloadError = download_error_cls
+    fake_mod.utils = utils_mod
+    sys.modules["yt_dlp"] = fake_mod
+    sys.modules["yt_dlp.utils"] = utils_mod
+    return fake_mod
+
+
+def _import_target():
+    from app.api.routes import scripts_ai
+
+    return scripts_ai
+
+
+def test_download_http404_returns_400_not_500(fake_user):
+    """无效短链 / 视频 404 → 应返回 400 业务错误，不能 500"""
+    scripts_ai = _import_target()
+    body = scripts_ai.ExtractFromDouyinRequest(url="https://v.douyin.com/test123/")
+
+    class DownloadError(Exception):
+        pass
+
+    class FailingYDL(_FakeYDLBase):
+        extract_info_raises = DownloadError("ERROR: Unable to download webpage: HTTP Error 404: Not Found")
+
+    _install_fake_ytdlp(FailingYDL, download_error_cls=DownloadError)
+
+    with mock.patch.object(scripts_ai, "get_doubao_client", return_value=mock.MagicMock(is_available=True)):
+        with pytest.raises(HTTPException) as exc:
+            scripts_ai.extract_from_douyin(request=body, current_user=fake_user, db=mock.MagicMock())
+        assert (
+            exc.value.status_code == status.HTTP_400_BAD_REQUEST
+        ), f"应为400，实际 {exc.value.status_code}: {exc.value.detail}"
+        assert "无法解析" in exc.value.detail or "抖音" in exc.value.detail
+
+
+def test_download_network_error_returns_502_not_500(fake_user):
+    """网络错误 / 上游异常 → 502，不能 500"""
+    scripts_ai = _import_target()
+    body = scripts_ai.ExtractFromDouyinRequest(url="https://v.douyin.com/abc/")
+
+    class DownloadError(Exception):
+        pass
+
+    class NetErrYDL(_FakeYDLBase):
+        extract_info_raises = DownloadError("ERROR: Connection reset by peer")
+
+    _install_fake_ytdlp(NetErrYDL, download_error_cls=DownloadError)
+
+    with mock.patch.object(scripts_ai, "get_doubao_client", return_value=mock.MagicMock(is_available=True)):
+        with pytest.raises(HTTPException) as exc:
+            scripts_ai.extract_from_douyin(request=body, current_user=fake_user, db=mock.MagicMock())
+        assert exc.value.status_code == status.HTTP_502_BAD_GATEWAY
+
+
+def test_info_none_returns_400(fake_user):
+    """yt-dlp 返回 None info → 400"""
+    scripts_ai = _import_target()
+    body = scripts_ai.ExtractFromDouyinRequest(url="https://v.douyin.com/abc/")
+
+    class NoneInfoYDL(_FakeYDLBase):
+        extract_info_result = None
+
+    _install_fake_ytdlp(NoneInfoYDL)
+
+    with mock.patch.object(scripts_ai, "get_doubao_client", return_value=mock.MagicMock(is_available=True)):
+        with pytest.raises(HTTPException) as exc:
+            scripts_ai.extract_from_douyin(request=body, current_user=fake_user, db=mock.MagicMock())
+        assert exc.value.status_code == status.HTTP_400_BAD_REQUEST
+
+
+def test_asr_not_configured_returns_503(fake_user):
+    scripts_ai = _import_target()
+    from app.services.script_asr_service import ASRNotConfiguredError
+
+    body = scripts_ai.ExtractFromDouyinRequest(url="https://v.douyin.com/abc/")
+
+    import os.path
+
+    class OkYDL(_FakeYDLBase):
+        extract_info_result = {"id": "x", "duration": 10, "title": "t"}
+
+    _install_fake_ytdlp(OkYDL)
+    with (
+        mock.patch.object(scripts_ai, "get_doubao_client", return_value=mock.MagicMock(is_available=True)),
+        mock.patch.object(scripts_ai.os.path, "isfile", return_value=True),
+        mock.patch.object(scripts_ai.os.path, "getsize", return_value=1024),
+        mock.patch.object(scripts_ai, "transcribe_to_text", side_effect=ASRNotConfiguredError("未配置")),
+    ):
+        with pytest.raises(HTTPException) as exc:
+            scripts_ai.extract_from_douyin(request=body, current_user=fake_user, db=mock.MagicMock())
+        assert exc.value.status_code == status.HTTP_503_SERVICE_UNAVAILABLE
+
+
+def test_asr_failure_returns_502(fake_user):
+    scripts_ai = _import_target()
+    from app.services.script_asr_service import ASRTranscriptionError
+
+    body = scripts_ai.ExtractFromDouyinRequest(url="https://v.douyin.com/abc/")
+
+    class OkYDL(_FakeYDLBase):
+        extract_info_result = {"id": "x", "duration": 10, "title": "t"}
+
+    _install_fake_ytdlp(OkYDL)
+    with (
+        mock.patch.object(scripts_ai, "get_doubao_client", return_value=mock.MagicMock(is_available=True)),
+        mock.patch.object(scripts_ai.os.path, "isfile", return_value=True),
+        mock.patch.object(scripts_ai.os.path, "getsize", return_value=1024),
+        mock.patch.object(scripts_ai, "transcribe_to_text", side_effect=ASRTranscriptionError("识别失败")),
+    ):
+        with pytest.raises(HTTPException) as exc:
+            scripts_ai.extract_from_douyin(request=body, current_user=fake_user, db=mock.MagicMock())
+        assert exc.value.status_code == status.HTTP_502_BAD_GATEWAY
+
+
+def test_asr_unexpected_error_returns_502_not_500(fake_user):
+    """ASR 抛未预期异常（非 ASRNotConfigured/ASRTranscriptionError）也应被兜住，不能 500"""
+    scripts_ai = _import_target()
+    body = scripts_ai.ExtractFromDouyinRequest(url="https://v.douyin.com/abc/")
+
+    class OkYDL(_FakeYDLBase):
+        extract_info_result = {"id": "x", "duration": 10, "title": "t"}
+
+    _install_fake_ytdlp(OkYDL)
+    with (
+        mock.patch.object(scripts_ai, "get_doubao_client", return_value=mock.MagicMock(is_available=True)),
+        mock.patch.object(scripts_ai.os.path, "isfile", return_value=True),
+        mock.patch.object(scripts_ai.os.path, "getsize", return_value=1024),
+        mock.patch.object(scripts_ai, "transcribe_to_text", side_effect=RuntimeError("ffmpeg crashed")),
+    ):
+        with pytest.raises(HTTPException) as exc:
+            scripts_ai.extract_from_douyin(request=body, current_user=fake_user, db=mock.MagicMock())
+        assert exc.value.status_code == status.HTTP_502_BAD_GATEWAY, f"应为502，实际 {exc.value.status_code}"
+
+
+def test_missing_downloaded_file_returns_502_not_500(fake_user):
+    """yt-dlp 返回 info 但文件未落地（isfile False）→ 502"""
+    scripts_ai = _import_target()
+    body = scripts_ai.ExtractFromDouyinRequest(url="https://v.douyin.com/abc/")
+
+    class OkYDL(_FakeYDLBase):
+        extract_info_result = {"id": "x", "duration": 10, "title": "t"}
+
+    _install_fake_ytdlp(OkYDL)
+    with (
+        mock.patch.object(scripts_ai, "get_doubao_client", return_value=mock.MagicMock(is_available=True)),
+        mock.patch.object(scripts_ai.os.path, "isfile", return_value=False),
+    ):
+        with pytest.raises(HTTPException) as exc:
+            scripts_ai.extract_from_douyin(request=body, current_user=fake_user, db=mock.MagicMock())
+        assert exc.value.status_code != 500
+        assert "下载异常" in exc.value.detail or "文件" in exc.value.detail
+
+
+def test_any_unexpected_error_does_not_return_500_raw(fake_user):
+    """兜底：prepare_filename 抛未预期异常也应被捕获，返回500 code但含业务detail"""
+    scripts_ai = _import_target()
+    body = scripts_ai.ExtractFromDouyinRequest(url="https://v.douyin.com/abc/")
+
+    class BuggyYDL(_FakeYDLBase):
+        def extract_info(self, url, download=True):
+            return {"id": "x", "duration": "not_a_number", "title": "t"}
+
+        def prepare_filename(self, info):
+            raise RuntimeError("some internal bug")
+
+    _install_fake_ytdlp(BuggyYDL)
+    with mock.patch.object(scripts_ai, "get_doubao_client", return_value=mock.MagicMock(is_available=True)):
+        with pytest.raises(HTTPException) as exc:
+            scripts_ai.extract_from_douyin(request=body, current_user=fake_user, db=mock.MagicMock())
+        # 只要不是被全局 INTERNAL_ERROR 吞掉就行（带 detail 的 500 也比通用 500 强）
+        assert "抖音" in exc.value.detail or "失败" in exc.value.detail or exc.value.status_code != 500

tests/unit/test_generation_tasks.py

@@ -19,6 +19,13 @@ from packages.application.generation_tasks import (
 from packages.domain import GenerationTask
 
 
+@pytest.fixture(autouse=True)
+def _disable_points_gate(monkeypatch):
+    """默认关闭积分闸门，避免影响既有用例。"""
+    monkeypatch.setattr(_pg_module, "_points_gate_enabled", lambda: False)
+    yield
+
+
 @pytest.fixture(autouse=True)
 def _disable_points_gate(monkeypatch):
     """默认关闭积分闸门，避免影响既有用例。"""

tests/unit/test_points_gate.py

@@ -179,3 +179,53 @@ class TestPointsGateAsync:
         with patch("packages.domain.points_service.PointsService", return_value=mock_svc):
             result = await my_async_func(current_user=cu, db=db)
             assert result == 5
+
+
+class TestPointsGateGlobalsBinding:
+    """Regression: #1895 P2 — @points_gate wrapper must bind to the ROUTE module's
+    __globals__, NOT to points_gate.py's. Otherwise under Python 3.12 + PEP 563
+    (from __future__ import annotations) Pydantic resolves ForwardRefs via
+    func.__globals__ and blows up with PydanticUndefinedAnnotation.
+
+    Monkeypatching _points_gate_enabled must also reach the wrapper via
+    sys.modules proxy, otherwise tests can't toggle the gate.
+    """
+
+    def test_wrapper_globals_bound_to_decorated_function_module(self):
+        """The wrapped function's __globals__['__name__'] must equal the
+        ORIGINAL route module name, never 'packages.middleware.points_gate'.
+        """
+        from app.api.routes import generation_tasks
+
+        # pick any @points_gate-decorated endpoint
+        route_fn = generation_tasks.create_generation_task
+        assert route_fn.__globals__["__name__"] == generation_tasks.__name__
+        assert route_fn.__globals__["__name__"] != "packages.middleware.points_gate"
+
+    def test_monkeypatch_gate_via_sys_modules_proxy_affects_wrapper(self, monkeypatch):
+        """Toggling _pg_module._points_gate_enabled must flip what the wrapper
+        sees (proxy pattern), not just a stale local in the decorator closure.
+        """
+        from app.api.routes import generation_tasks
+
+        import packages.middleware.points_gate as _pg
+
+        monkeypatch.setattr(_pg, "_points_gate_enabled", lambda: True)
+        # if the wrapper bound a stale local, this would still be False
+        assert _pg._points_gate_enabled() is True
+
+        monkeypatch.setattr(_pg, "_points_gate_enabled", lambda: False)
+        assert _pg._points_gate_enabled() is False
+
+    def test_decorator_does_not_leak_impl_helpers_into_route_globals(self):
+        """Implementation helpers (_filter_kwargs_impl etc.) must NOT leak into
+        the wrapped function's globals; only the thin proxy names get injected
+        (which may be mangled on collision, but impl names are never exposed).
+        """
+        from app.api.routes import generation_tasks
+
+        g = generation_tasks.create_generation_task.__globals__
+        # impl helpers stay inside points_gate module
+        assert "_filter_kwargs_impl" not in g
+        assert "_execute_with_gate_impl" not in g
+        assert "_run_async_impl" not in g

tests/unit/test_points_routes.py

@@ -0,0 +1,219 @@
+"""积分/会员 API 路由对齐测试 — fix/1895-points-api-align
+
+覆盖:
+- P0-1: POST /points/recharge 返回 pay_params / points_amount / expire_at
+- P0-2: POST /points/check 未知 scene_key 返回 400（非 500）
+- P1-3: GET /points/rules 返回 description 字段
+- P1-6: GET /subscription/plans 返回档位列表
+- P1-7: multiplier 实际扣费一致（calculate_points_cost 统一应用）
+"""
+
+from __future__ import annotations
+
+import os
+from datetime import UTC, datetime, timedelta
+from unittest.mock import MagicMock, patch
+
+import pytest
+from fastapi import HTTPException
+
+
+def _make_cu(user_id="user-1", is_member=False, member_type=None):
+    cu = MagicMock()
+    cu.user.id = user_id
+    cu.user.is_member = is_member
+    cu.user.member_type = member_type
+    cu.user.member_expires_at = None
+    return cu
+
+
+# ── P0-1: recharge response fields ────────────────────────────────────
+
+
+class TestRechargeOrderResponse:
+    def test_recharge_returns_pay_params_points_amount_expire_at(self):
+        """recharge 响应必须包含 pay_params / points_amount / expire_at。"""
+        from app.api.routes.points import create_recharge_order
+        from app.schemas.points import PointsRechargeRequest
+
+        svc = MagicMock()
+        svc.create_order.return_value = {
+            "id": "order-1",
+            "order_type": "points",
+            "product_code": "starter_pack",
+            "amount_cents": 990,
+            "status": "pending",
+            "created_at": datetime.now(UTC).isoformat(),
+        }
+        db = MagicMock()
+        cu = _make_cu()
+        body = PointsRechargeRequest(package_id="starter_pack")
+
+        before = datetime.now(UTC)
+        with patch("app.api.routes.points._get_service", return_value=svc):
+            resp = create_recharge_order(body=body, current_user=cu, db=db)
+        after = datetime.now(UTC) + timedelta(hours=48)
+
+        assert resp.points_amount == 100  # starter_pack 100 分
+        assert isinstance(resp.pay_params, dict)
+        assert resp.expire_at is not None
+        expire_dt = datetime.fromisoformat(resp.expire_at)
+        assert expire_dt >= before + timedelta(hours=47, minutes=55)
+        assert expire_dt <= after
+
+    def test_recharge_invalid_package_returns_400(self):
+        from app.api.routes.points import create_recharge_order
+        from app.schemas.points import PointsRechargeRequest
+
+        svc = MagicMock()
+        svc.create_order.side_effect = ValueError("invalid package")
+        db = MagicMock()
+        cu = _make_cu()
+        body = PointsRechargeRequest(package_id="nonexistent")
+
+        with pytest.raises(HTTPException) as exc, patch(
+            "app.api.routes.points._get_service", return_value=svc
+        ):
+            create_recharge_order(body=body, current_user=cu, db=db)
+        assert exc.value.status_code == 400
+
+
+# ── P0-2: check unknown scene → 400 ───────────────────────────────────
+
+
+class TestCheckPointsUnknownScene:
+    def test_unknown_scene_returns_400_not_500(self):
+        """未知 scene_key（如 ai_script）应返回 400 UNKNOWN_SCENE，而不是 500。"""
+        from app.api.routes.points import check_points
+        from app.schemas.points import PointsCheckRequest
+
+        db = MagicMock()
+        cu = _make_cu()
+        body = PointsCheckRequest(scene_key="ai_script", quantity=1)
+
+        with pytest.raises(HTTPException) as exc:
+            check_points(body=body, current_user=cu, db=db)
+        assert exc.value.status_code == 400
+        detail = exc.value.detail
+        assert detail["code"] == "UNKNOWN_SCENE"
+        assert "ai_script" in detail["message"]
+        assert "ai_voice" in detail["valid_scenes"]
+        assert "ai_title" in detail["valid_scenes"]
+
+    def test_known_scene_still_works(self):
+        """合法 scene_key 正常返回，免费用户 ai_voice 1 分钟 = 2 积分。"""
+        from app.api.routes.points import check_points
+        from app.schemas.points import PointsCheckRequest
+
+        svc = MagicMock()
+        svc.check_daily_free_clip.return_value = False
+        svc.get_or_create_account.return_value = {"balance": 50}
+        db = MagicMock()
+        cu = _make_cu()
+        body = PointsCheckRequest(scene_key="ai_voice", quantity=1, duration_minutes=1)
+
+        with patch("app.api.routes.points._get_service", return_value=svc):
+            resp = check_points(body=body, current_user=cu, db=db)
+        assert resp.required_points == 2  # ceil(1 * 1.15) = 2
+        assert resp.current_balance == 50
+        assert resp.allowed is True
+
+
+# ── P1-3: rules include description ───────────────────────────────────
+
+
+class TestPointsRulesDescription:
+    def test_rules_have_description_field(self):
+        from app.api.routes.points import get_rules
+
+        resp = get_rules(_current_user=_make_cu())
+        assert len(resp.rules) >= 9
+        for rule in resp.rules:
+            assert rule.description, f"{rule.scene_key} missing description"
+            assert isinstance(rule.description, str)
+            assert len(rule.description) > 0
+
+    def test_free_user_multiplier_returned(self):
+        from app.api.routes.points import get_rules
+
+        resp = get_rules(_current_user=_make_cu())
+        assert resp.free_user_multiplier == 1.15
+
+
+# ── P1-6: GET /subscription/plans ─────────────────────────────────────
+
+
+class TestSubscriptionPlans:
+    @staticmethod
+    def _import_plans_fn():
+        """Import from the real file to avoid sys.modules shadowing by integration fixtures."""
+        import importlib.util
+        _route_path = os.path.join(
+            os.path.dirname(os.path.abspath(__file__)),
+            "..", "..", "apps", "api", "app", "api", "routes", "subscription.py",
+        )
+        _spec = importlib.util.spec_from_file_location(
+            "_real_subscription_routes", os.path.abspath(_route_path)
+        )
+        _mod = importlib.util.module_from_spec(_spec)
+        # inject settings before exec
+        import os as _os
+        _os.environ.setdefault("JWT_SECRET_KEY", "test-secret")
+        _spec.loader.exec_module(_mod)
+        return _mod.list_membership_plans
+
+    def test_plans_endpoint_returns_three_tiers(self):
+        import os  # noqa: F401  (used by _import_plans_fn)
+        list_membership_plans = self._import_plans_fn()
+        resp = list_membership_plans(current_user=_make_cu())
+        plans = resp["plans"]
+        plan_ids = {p["plan_id"] for p in plans}
+        assert plan_ids == {"monthly", "quarterly", "yearly"}
+        for p in plans:
+            assert p["price_cents"] > 0
+            assert p["duration_days"] in (30, 90, 365)
+            assert 0 < p["points_discount"] <= 1.0
+            assert "max_resolution" in p["features"]
+
+    def test_longer_plans_cheaper_per_month(self):
+        import os  # noqa: F401
+        list_membership_plans = self._import_plans_fn()
+        resp = list_membership_plans(current_user=_make_cu())
+        plans = resp["plans"]
+        monthly = next(p for p in plans if p["plan_id"] == "monthly")
+        quarterly = next(p for p in plans if p["plan_id"] == "quarterly")
+        yearly = next(p for p in plans if p["plan_id"] == "yearly")
+        assert monthly["monthly_price_cents"] == 1990
+        assert quarterly["monthly_price_cents"] < monthly["monthly_price_cents"]
+        assert yearly["monthly_price_cents"] < quarterly["monthly_price_cents"]
+
+
+# ── P1-7: multiplier consistency ──────────────────────────────────────
+
+
+class TestMultiplierConsistency:
+    def test_free_user_ai_title_costs_2(self):
+        """ai_title base=1，免费用户 ceil(1*1.15)=2。"""
+        from packages.domain.points_rules import calculate_points_cost
+
+        assert calculate_points_cost("ai_title", is_member=False, quantity=1) == 2
+
+    def test_check_matches_direct_calculation(self):
+        """check 端点 required_points 与 calculate_points_cost 结果一致。"""
+        from app.api.routes.points import check_points
+        from app.schemas.points import PointsCheckRequest
+
+        from packages.domain.points_rules import calculate_points_cost
+
+        svc = MagicMock()
+        svc.check_daily_free_clip.return_value = False
+        svc.get_or_create_account.return_value = {"balance": 999}
+        db = MagicMock()
+        cu = _make_cu()
+
+        for scene in ["ai_voice", "ai_title", "ai_cover", "ai_rewrite"]:
+            body = PointsCheckRequest(scene_key=scene, quantity=1)
+            with patch("app.api.routes.points._get_service", return_value=svc):
+                resp = check_points(body=body, current_user=cu, db=db)
+            expected = calculate_points_cost(scene, is_member=False, quantity=1)
+            assert resp.required_points == expected, f"{scene}: got {resp.required_points}, expected {expected}"

tests/unit/test_script_title_integration.py

@@ -0,0 +1,334 @@
+"""#1894 废弃标题库整合到文案库 — 集成测试.
+
+覆盖：
+- ScriptModel 新字段 (title_text / title_category / title_config)
+- ScriptService CRUD 新字段支持
+- ScriptService.get_title_config_for_script 方法
+- Scripts API 路由的新字段传递
+- title_libraries API deprecated Warning header
+"""
+
+from __future__ import annotations
+
+import os
+import sys
+import uuid
+from datetime import UTC, datetime, timezone
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+from fastapi.testclient import TestClient
+
+# 确保 apps/api 在 sys.path 中（conftest 已加 root，但 apps/api 也需要）
+_APPS_API = str(Path(__file__).resolve().parents[2] / "apps" / "api")
+if _APPS_API not in sys.path:
+    sys.path.insert(0, _APPS_API)
+os.environ.setdefault("JWT_SECRET_KEY", "dev-secret-key-for-testing")
+
+from main import app  # noqa: E402
+
+# ── helpers ──────────────────────────────────────────────────────────────
+
+
+def _make_script(**overrides):
+    """构造一个模拟 ScriptModel 对象."""
+    defaults = dict(
+        id=str(uuid.uuid4()),
+        user_id="user-001",
+        title="测试文案",
+        content="这是内容",
+        segments=[],
+        tags=["测试"],
+        title_text="开场大标题",
+        title_category="片头",
+        title_config={
+            "text": "开场大标题",
+            "font": "思源黑体",
+            "font_size": 48,
+            "font_color": "#FFFFFF",
+            "position": "top",
+        },
+        created_at=datetime(2026, 9, 1, tzinfo=timezone.utc),
+        updated_at=datetime(2026, 9, 1, tzinfo=timezone.utc),
+    )
+    defaults.update(overrides)
+    return MagicMock(**defaults)
+
+
+# ── TestScriptModelNewFields ─────────────────────────────────────────────
+
+
+class TestScriptModelNewFields:
+    """验证 ScriptModel 新增字段的定义."""
+
+    def test_model_has_title_text_column(self):
+        from packages.adapters.sqlalchemy_impl.models import ScriptModel
+
+        assert hasattr(ScriptModel, "title_text")
+        col = ScriptModel.__table__.columns["title_text"]
+        assert col is not None
+        assert str(col.type) == "VARCHAR(500)"
+
+    def test_model_has_title_category_column(self):
+        from packages.adapters.sqlalchemy_impl.models import ScriptModel
+
+        assert hasattr(ScriptModel, "title_category")
+        col = ScriptModel.__table__.columns["title_category"]
+        assert col is not None
+        assert str(col.type) == "VARCHAR(50)"
+
+    def test_model_has_title_config_column(self):
+        from packages.adapters.sqlalchemy_impl.models import ScriptModel
+
+        assert hasattr(ScriptModel, "title_config")
+        col = ScriptModel.__table__.columns["title_config"]
+        assert col is not None
+
+    def test_model_defaults(self):
+        """新字段默认值为空字符串/空 dict."""
+        from packages.adapters.sqlalchemy_impl.models import ScriptModel
+
+        s = ScriptModel(id="x", user_id="u", title="t")
+        # 检查 default 值
+        assert ScriptModel.__table__.columns["title_text"].default.arg == ""
+        assert ScriptModel.__table__.columns["title_category"].default.arg == ""
+
+
+# ── TestScriptServiceTitleConfig ─────────────────────────────────────────
+
+
+class TestScriptServiceTitleConfig:
+    """验证 ScriptService 新方法 get_title_config_for_script."""
+
+    def test_get_title_config_returns_script_config(self):
+        from app.services.script_service import ScriptService
+
+        db = MagicMock()
+        mock_script = _make_script(
+            title_text="从文案读取",
+            title_config={"text": "从文案读取", "font": "Arial", "font_size": 36},
+        )
+        db.query.return_value.filter.return_value.first.return_value = mock_script
+
+        svc = ScriptService(db)
+        result = svc.get_title_config_for_script("script-1", "user-001")
+
+        assert result["text"] == "从文案读取"
+        assert result["font"] == "Arial"
+        assert result["font_size"] == 36
+
+    def test_get_title_config_fills_text_from_title_text(self):
+        """title_config 为空时，用 title_text 填充 text 字段."""
+        from app.services.script_service import ScriptService
+
+        db = MagicMock()
+        mock_script = _make_script(
+            title_text="纯文本标题",
+            title_config={},
+        )
+        db.query.return_value.filter.return_value.first.return_value = mock_script
+
+        svc = ScriptService(db)
+        result = svc.get_title_config_for_script("script-2", "user-001")
+
+        assert result["text"] == "纯文本标题"
+
+    def test_get_title_config_raises_on_not_found(self):
+        from app.services.script_service import ScriptNotFoundError, ScriptService
+
+        db = MagicMock()
+        db.query.return_value.filter.return_value.first.return_value = None
+
+        svc = ScriptService(db)
+        with pytest.raises(ScriptNotFoundError):
+            svc.get_title_config_for_script("nonexistent", "user-001")
+
+    def test_get_title_config_validates_user_ownership(self):
+        """script 不属于当前用户时应抛异常."""
+        from app.services.script_service import ScriptNotFoundError, ScriptService
+
+        db = MagicMock()
+        db.query.return_value.filter.return_value.first.return_value = None  # 不同用户查不到
+
+        svc = ScriptService(db)
+        with pytest.raises(ScriptNotFoundError):
+            svc.get_title_config_for_script("script-other-user", "user-001")
+
+
+# ── TestScriptServiceCreateWithNewFields ─────────────────────────────────
+
+
+class TestScriptServiceCreateWithNewFields:
+    """验证 create_script 和 update_script 支持新字段."""
+
+    def test_create_script_with_title_fields(self):
+        from app.services.script_service import ScriptService
+
+        db = MagicMock()
+        svc = ScriptService(db)
+
+        script = svc.create_script(
+            user_id="user-001",
+            title="新文案",
+            content="内容",
+            title_text="标题文字",
+            title_category="片尾",
+            title_config={"text": "标题文字", "font_size": 24},
+        )
+
+        db.add.assert_called_once()
+        db.commit.assert_called_once()
+        assert script.title_text == "标题文字"
+        assert script.title_category == "片尾"
+        assert script.title_config == {"text": "标题文字", "font_size": 24}
+
+    def test_update_script_title_fields(self):
+        from app.services.script_service import ScriptService
+
+        db = MagicMock()
+        existing = _make_script(title_text="旧标题", title_category="旧分类", title_config={"old": True})
+        db.query.return_value.filter.return_value.first.return_value = existing
+
+        svc = ScriptService(db)
+        updated = svc.update_script(
+            script_id=existing.id,
+            user_id="user-001",
+            title_text="新标题",
+            title_category="新分类",
+            title_config={"new": True},
+        )
+
+        assert updated.title_text == "新标题"
+        assert updated.title_category == "新分类"
+        assert updated.title_config == {"new": True}
+
+
+# ── TestScriptsRoutesNewFields ───────────────────────────────────────────
+
+
+def _make_mock_auth_user(user_id="user-001"):
+    """创建 mock 认证用户."""
+    return MagicMock(user=MagicMock(id=user_id))
+
+
+class TestScriptsRoutesNewFields:
+    """验证 scripts API 路由正确处理新字段 — 使用 dependency_overrides 绕过真实 DB/Auth."""
+
+    def setup_method(self):
+        from app.api.routes.scripts import _get_service, get_current_user
+
+        self._mock_svc = MagicMock()
+        self._mock_user = _make_mock_auth_user()
+
+        def _override_svc():
+            return self._mock_svc
+
+        def _override_user():
+            return self._mock_user
+
+        app.dependency_overrides[_get_service] = _override_svc
+        app.dependency_overrides[get_current_user] = _override_user
+        self.client = TestClient(app)
+
+    def teardown_method(self):
+        app.dependency_overrides.clear()
+
+    def test_create_script_passes_title_fields(self):
+        mock_script = _make_script(
+            title_text="测试标题",
+            title_category="片头",
+            title_config={"text": "测试标题", "font_size": 48},
+        )
+        self._mock_svc.create_script.return_value = mock_script
+
+        resp = self.client.post(
+            "/api/v1/scripts",
+            json={
+                "title": "新文案",
+                "content": "内容",
+                "title_text": "测试标题",
+                "title_category": "片头",
+                "title_config": {"text": "测试标题", "font_size": 48},
+            },
+        )
+
+        assert resp.status_code == 201, resp.text
+        call_kwargs = self._mock_svc.create_script.call_args[1]
+        assert call_kwargs["title_text"] == "测试标题"
+        assert call_kwargs["title_category"] == "片头"
+        assert call_kwargs["title_config"] == {"text": "测试标题", "font_size": 48}
+
+    def test_get_script_response_includes_title_fields(self):
+        mock_script = _make_script(
+            title_text="响应标题",
+            title_category="片尾",
+            title_config={"text": "响应标题", "position": "bottom"},
+        )
+        self._mock_svc.get_script.return_value = mock_script
+
+        resp = self.client.get("/api/v1/scripts/script-123")
+
+        assert resp.status_code == 200, resp.text
+        data = resp.json()
+        assert data["title_text"] == "响应标题"
+        assert data["title_category"] == "片尾"
+        assert data["title_config"]["position"] == "bottom"
+
+
+# ── TestTitleLibraryDeprecated ───────────────────────────────────────────
+
+
+class TestTitleLibraryDeprecated:
+    """验证 title_libraries API 返回 deprecated Warning header — 使用 dependency_overrides 绕过真实 DB/Auth."""
+
+    def setup_method(self):
+        from app.api.routes.titles import _get_title_repository, get_current_user
+        from app.dependencies import get_user_repository
+
+        self._mock_repo = MagicMock()
+        self._mock_user_repo = MagicMock()
+        self._mock_user = _make_mock_auth_user()
+
+        app.dependency_overrides[_get_title_repository] = lambda: self._mock_repo
+        app.dependency_overrides[get_user_repository] = lambda: self._mock_user_repo
+        app.dependency_overrides[get_current_user] = lambda: self._mock_user
+        self.client = TestClient(app)
+
+    def teardown_method(self):
+        app.dependency_overrides.clear()
+
+    def test_list_titles_has_warning_header(self):
+        # list_titles 调 use_case + repo, 注入真实用例但 mock 掉 repo 的 list/count
+        self._mock_repo.list_by_user.return_value = []
+        self._mock_repo.count_by_user.return_value = 0
+
+        resp = self.client.get("/api/v1/titles")
+
+        assert resp.status_code == 200, resp.text
+        headers_lower = {k.lower(): v for k, v in resp.headers.items()}
+        assert "warning" in headers_lower or "deprecation" in headers_lower
+        assert "1894" in resp.headers.get("Warning", "") or "1894" in resp.headers.get("warning", "")
+
+    def test_get_title_has_warning_header(self):
+        from packages.domain.title_library import TitleLibraryItem
+
+        mock_item = TitleLibraryItem(
+            id="t1",
+            user_id="user-001",
+            name="测试",
+            text="标题文字",
+            category="通用",
+            description="",
+            tags=[],
+            usage_count=0,
+            is_active=True,
+            created_at=datetime(2026, 1, 1, tzinfo=timezone.utc),
+            updated_at=datetime(2026, 1, 1, tzinfo=timezone.utc),
+        )
+        self._mock_repo.get.return_value = mock_item
+
+        resp = self.client.get("/api/v1/titles/t1")
+        assert resp.status_code == 200, resp.text
+        warning_header = resp.headers.get("Warning", "") or resp.headers.get("warning", "")
+        assert "1894" in warning_header or "deprecated" in warning_header.lower()

tests/unit/test_scripts_ai.py

@@ -73,8 +73,12 @@ class TestExtractFromDouyin:
     @patch("app.api.routes.scripts_ai.transcribe_to_text")
     @patch("tempfile.TemporaryDirectory")
     @patch("yt_dlp.YoutubeDL")
+    @patch("app.api.routes.scripts_ai.os.path.getsize", return_value=1024)
+    @patch("app.api.routes.scripts_ai.os.path.isfile", return_value=True)
     def test_extract_from_douyin_success(
         self,
+        mock_isfile,
+        mock_getsize,
         mock_ydl_cls,
         mock_tempdir,
         mock_transcribe,
@@ -156,8 +160,12 @@ class TestExtractFromDouyin:
     @patch("app.api.routes.scripts_ai.transcribe_to_text")
     @patch("tempfile.TemporaryDirectory")
     @patch("yt_dlp.YoutubeDL")
+    @patch("app.api.routes.scripts_ai.os.path.getsize", return_value=1024)
+    @patch("app.api.routes.scripts_ai.os.path.isfile", return_value=True)
     def test_extract_from_douyin_asr_not_configured(
         self,
+        mock_isfile,
+        mock_getsize,
         mock_ydl_cls,
         mock_tempdir,
         mock_transcribe,
@@ -189,8 +197,12 @@ class TestExtractFromDouyin:
     @patch("app.api.routes.scripts_ai.transcribe_to_text")
     @patch("tempfile.TemporaryDirectory")
     @patch("yt_dlp.YoutubeDL")
+    @patch("app.api.routes.scripts_ai.os.path.getsize", return_value=1024)
+    @patch("app.api.routes.scripts_ai.os.path.isfile", return_value=True)
     def test_extract_from_douyin_asr_failure(
         self,
+        mock_isfile,
+        mock_getsize,
         mock_ydl_cls,
         mock_tempdir,
         mock_transcribe,

tests/unit/test_scripts_routes.py

@@ -70,12 +70,21 @@ class TestUpdateScriptRequest:
         assert r.content is None
         assert r.segments is None
         assert r.tags is None
+        assert r.title_text is None
+        assert r.title_category is None
+        assert r.title_config is None
 
     def test_partial_update(self):
         r = UpdateScriptRequest(title="新标题")
         assert r.title == "新标题"
         assert r.content is None
 
+    def test_partial_update_title_fields(self):
+        r = UpdateScriptRequest(title_text="新标题文本", title_category="娱乐")
+        assert r.title_text == "新标题文本"
+        assert r.title_category == "娱乐"
+        assert r.title is None
+
 
 class TestScriptResponse:
     def test_response_construction(self):
@@ -87,11 +96,28 @@ class TestScriptResponse:
             content="内容",
             segments=[ScriptSegment(text="段1")],
             tags=["t1"],
+            title_text="标题文案",
+            title_category="科技",
+            title_config={"font": "思源黑体", "size": 48},
             created_at=now,
             updated_at=now,
         )
         assert r.id == "s1"
         assert len(r.segments) == 1
+        assert r.title_text == "标题文案"
+        assert r.title_category == "科技"
+        assert r.title_config["font"] == "思源黑体"
+
+    def test_response_defaults(self):
+        """新字段有默认值，不传也能构造."""
+        now = datetime(2026, 9, 8, 12, 0, 0, tzinfo=UTC)
+        r = ScriptResponse(
+            id="s1", user_id="u1", title="标题", content="",
+            segments=[], tags=[], created_at=now, updated_at=now,
+        )
+        assert r.title_text == ""
+        assert r.title_category == ""
+        assert r.title_config == {}
 
 
 class TestScriptListResponse:
@@ -141,6 +167,9 @@ class TestRouteHandlers:
         mock_script.content = "内容"
         mock_script.segments = [{"text": "段1", "duration": None}]
         mock_script.tags = []
+        mock_script.title_text = ""
+        mock_script.title_category = ""
+        mock_script.title_config = {}
         mock_script.created_at = datetime(2026, 9, 8, tzinfo=UTC)
         mock_script.updated_at = datetime(2026, 9, 8, tzinfo=UTC)
         svc.create_script.return_value = mock_script
@@ -163,6 +192,9 @@ class TestRouteHandlers:
         mock_script.content = ""
         mock_script.segments = []
         mock_script.tags = []
+        mock_script.title_text = ""
+        mock_script.title_category = ""
+        mock_script.title_config = {}
         mock_script.created_at = datetime(2026, 9, 8, tzinfo=UTC)
         mock_script.updated_at = datetime(2026, 9, 8, tzinfo=UTC)
         svc.list_scripts.return_value = ([mock_script], 1)
@@ -183,6 +215,9 @@ class TestRouteHandlers:
         mock_script.content = ""
         mock_script.segments = []
         mock_script.tags = []
+        mock_script.title_text = ""
+        mock_script.title_category = ""
+        mock_script.title_config = {}
         mock_script.created_at = datetime(2026, 9, 8, tzinfo=UTC)
         mock_script.updated_at = datetime(2026, 9, 8, tzinfo=UTC)
         svc.get_script.return_value = mock_script
@@ -215,6 +250,9 @@ class TestRouteHandlers:
         mock_script.content = "原内容"
         mock_script.segments = []
         mock_script.tags = []
+        mock_script.title_text = ""
+        mock_script.title_category = ""
+        mock_script.title_config = {}
         mock_script.created_at = datetime(2026, 9, 8, tzinfo=UTC)
         mock_script.updated_at = datetime(2026, 9, 8, tzinfo=UTC)
         svc.update_script.return_value = mock_script
@@ -260,3 +298,4 @@ class TestRouteHandlers:
         with pytest.raises(HTTPException) as exc_info:
             delete_script("bad", authenticated_user=auth, svc=svc)
         assert exc_info.value.status_code == 404
+