Merge branch 'develop' into refactor/subscription-api

将 106 行的 subscription.ts 拆分为目录化结构：
- types.ts: 类型定义（Plan/SubscriptionInfo/BillingRecord 等）
- subscription.ts: 全部 5 个 API 函数
- index.ts: 统一入口 re-export，保持 @/api/subscription 路径向后兼容

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

@@ -0,0 +1,26 @@
+/**
+ * 订阅 API — 目录化入口
+ * 保持与原 subscription.ts 相同导出，向后兼容
+ */
+
+// 类型
+export type {
+  PlanType,
+  SubscriptionStatus,
+  BillingStatus,
+  BillingCycle,
+  Plan,
+  SubscriptionInfo,
+  BillingRecord,
+  ChangePlanRequest,
+  ChangePlanResponse,
+} from "./types"
+
+// API 函数
+export {
+  getCurrentSubscription,
+  getBillingRecords,
+  changePlan,
+  cancelSubscription,
+  toggleAutoRenew,
+} from "./subscription"

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

@@ -0,0 +1,47 @@
+/**
+ * 订阅相关 API 函数
+ */
+import apiClient from "../client"
+import type {
+  BillingRecord,
+  ChangePlanRequest,
+  ChangePlanResponse,
+  SubscriptionInfo,
+} from "./types"
+
+/** 获取当前订阅信息 */
+export const getCurrentSubscription = async (): Promise<SubscriptionInfo> => {
+  const response = await apiClient.get("/subscription/current")
+  return response.data
+}
+
+/** 获取账单记录列表 */
+export const getBillingRecords = async (): Promise<BillingRecord[]> => {
+  const response = await apiClient.get("/subscription/billing-records")
+  return response.data
+}
+
+/** 升级/降级套餐 */
+export const changePlan = async (request: ChangePlanRequest): Promise<ChangePlanResponse> => {
+  const response = await apiClient.post("/subscription/change-plan", request)
+  return response.data
+}
+
+/** 取消订阅 */
+export const cancelSubscription = async (): Promise<{
+  success: boolean
+  message: string
+}> => {
+  const response = await apiClient.post("/subscription/cancel")
+  return response.data
+}
+
+/** 切换自动续费 */
+export const toggleAutoRenew = async (
+  enabled: boolean,
+): Promise<{ success: boolean; message: string }> => {
+  const response = await apiClient.post("/subscription/toggle-auto-renew", {
+    enabled,
+  })
+  return response.data
+}

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

@@ -1,8 +1,6 @@
 /**
- * 订阅 API 模块
- * 对接后端订阅管理接口
+ * 订阅相关类型定义
  */
-import apiClient from "./client"
 
 /** 套餐类型 */
 export type PlanType = "free" | "standard" | "pro" | "enterprise"
@@ -65,42 +63,3 @@ export interface ChangePlanResponse {
   message: string
   new_subscription?: SubscriptionInfo
 }
-
-// ============ API 函数 ============
-
-/** 获取当前订阅信息 */
-export const getCurrentSubscription = async (): Promise<SubscriptionInfo> => {
-  const response = await apiClient.get("/subscription/current")
-  return response.data
-}
-
-/** 获取账单记录列表 */
-export const getBillingRecords = async (): Promise<BillingRecord[]> => {
-  const response = await apiClient.get("/subscription/billing-records")
-  return response.data
-}
-
-/** 升级/降级套餐 */
-export const changePlan = async (request: ChangePlanRequest): Promise<ChangePlanResponse> => {
-  const response = await apiClient.post("/subscription/change-plan", request)
-  return response.data
-}
-
-/** 取消订阅 */
-export const cancelSubscription = async (): Promise<{
-  success: boolean
-  message: string
-}> => {
-  const response = await apiClient.post("/subscription/cancel")
-  return response.data
-}
-
-/** 切换自动续费 */
-export const toggleAutoRenew = async (
-  enabled: boolean,
-): Promise<{ success: boolean; message: string }> => {
-  const response = await apiClient.post("/subscription/toggle-auto-renew", {
-    enabled,
-  })
-  return response.data
-}

apps/web/src/pages/editing-planner/components/pip-config/LayerConfig.tsx

@@ -1,5 +1,286 @@
 /**
- * LayerConfig 入口（向后兼容）
- * 实际实现位于 ./layer-config/ 目录
+ * 混剪单图层配置区
  */
-export { default } from "./layer-config"
+import React from "react"
+import type {
+  PipLayer,
+  PipAnimType,
+  PipSlideDirection,
+  PipGridPosition,
+} from "@/pages/editing-planner/types"
+import {
+  GRID_POSITIONS,
+  ANIM_OPTIONS,
+  SLIDE_DIR_OPTIONS,
+  LAYER_COLORS,
+} from "@/pages/editing-planner/constants/pipConfig"
+
+interface LayerConfigProps {
+  layer: PipLayer | null
+  layers: PipLayer[]
+  totalDuration: number
+  onUpdate: (id: string, partial: Partial<PipLayer>) => void
+  onGridClick: (pos: PipGridPosition) => void
+  onWidthChange: (val: number) => void
+  onHeightChange: (val: number) => void
+}
+
+const LayerConfig: React.FC<LayerConfigProps> = ({
+  layer,
+  layers,
+  totalDuration,
+  onUpdate,
+  onGridClick,
+  onWidthChange,
+  onHeightChange,
+}) => {
+  if (!layer) {
+    return (
+      <div className="pip-config-area">
+        <div className="pip-config-empty">选择或添加图层以配置</div>
+      </div>
+    )
+  }
+
+  return (
+    <div className="pip-config-area">
+      {/* ── 迷你预览 ── */}
+      <div className="pip-preview-box">
+        {layers.map((l, idx) => (
+          <div
+            key={l.id}
+            className={`pip-preview-layer${layer.id === l.id ? " selected" : ""}`}
+            style={{
+              left: `${l.x}%`,
+              top: `${l.y}%`,
+              width: `${l.width}%`,
+              height: `${l.height}%`,
+              background: LAYER_COLORS[idx % LAYER_COLORS.length],
+              opacity: l.opacity / 100,
+              borderRadius: `${l.border_radius}%`,
+            }}
+          >
+            <span className="pip-preview-label">{l.name}</span>
+          </div>
+        ))}
+      </div>
+
+      {/* ── 素材类型 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">素材类型</label>
+        <div className="pip-type-btns">
+          <button
+            className={`pip-type-btn${layer.material_type === "image" ? " active" : ""}`}
+            onClick={() => onUpdate(layer.id, { material_type: "image" })}
+          >
+            🖼️ 图片
+          </button>
+          <button
+            className={`pip-type-btn${layer.material_type === "video" ? " active" : ""}`}
+            onClick={() => onUpdate(layer.id, { material_type: "video" })}
+          >
+            🎬 视频
+          </button>
+        </div>
+      </div>
+
+      {/* ── 素材 URL ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">
+          {layer.material_type === "image" ? "图片" : "视频"} URL
+        </label>
+        <input
+          className="pip-input"
+          type="text"
+          placeholder={
+            layer.material_type === "image"
+              ? "https://example.com/image.png"
+              : "https://example.com/video.mp4"
+          }
+          value={layer.material_url}
+          onChange={(e) => onUpdate(layer.id, { material_url: e.target.value })}
+        />
+      </div>
+
+      {/* ── 位置：九宫格 + 坐标 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">位置</label>
+        <div style={{ display: "flex", gap: 16, alignItems: "flex-start" }}>
+          <div className="pip-grid">
+            {GRID_POSITIONS.map((pos) => (
+              <button
+                key={pos}
+                className={`pip-grid-btn${layer.grid_position === pos ? " active" : ""}`}
+                onClick={() => onGridClick(pos)}
+              >
+                <span className="pip-grid-dot" />
+              </button>
+            ))}
+          </div>
+          <div className="pip-field-row" style={{ flex: 1 }}>
+            <div>
+              <label className="pip-field-label">X (%)</label>
+              <input
+                className="pip-number"
+                type="number"
+                min={0}
+                max={100}
+                value={layer.x}
+                onChange={(e) => onUpdate(layer.id, { x: Number(e.target.value) })}
+              />
+            </div>
+            <div>
+              <label className="pip-field-label">Y (%)</label>
+              <input
+                className="pip-number"
+                type="number"
+                min={0}
+                max={100}
+                value={layer.y}
+                onChange={(e) => onUpdate(layer.id, { y: Number(e.target.value) })}
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* ── 尺寸 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">尺寸</label>
+        <div className="pip-slider-row">
+          <span style={{ fontSize: 12, color: "#999", width: 20 }}>宽</span>
+          <input
+            className="pip-slider"
+            type="range"
+            min={10}
+            max={80}
+            value={layer.width}
+            onChange={(e) => onWidthChange(Number(e.target.value))}
+          />
+          <span className="pip-slider-value">{layer.width}%</span>
+        </div>
+        <div className="pip-slider-row" style={{ marginTop: 6 }}>
+          <span style={{ fontSize: 12, color: "#999", width: 20 }}>高</span>
+          <input
+            className="pip-slider"
+            type="range"
+            min={10}
+            max={80}
+            value={layer.height}
+            onChange={(e) => onHeightChange(Number(e.target.value))}
+          />
+          <span className="pip-slider-value">{layer.height}%</span>
+        </div>
+        <div
+          className="pip-lock-row"
+          style={{ marginTop: 6 }}
+          onClick={() => onUpdate(layer.id, { aspect_lock: !layer.aspect_lock })}
+        >
+          <span className="pip-lock-icon">{layer.aspect_lock ? "🔒" : "🔓"}</span>
+          <span>{layer.aspect_lock ? "已锁定比例" : "锁定宽高比"}</span>
+        </div>
+      </div>
+
+      {/* ── 圆角 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">圆角</label>
+        <div className="pip-slider-row">
+          <input
+            className="pip-slider"
+            type="range"
+            min={0}
+            max={50}
+            value={layer.border_radius}
+            onChange={(e) => onUpdate(layer.id, { border_radius: Number(e.target.value) })}
+          />
+          <span className="pip-slider-value">{layer.border_radius}%</span>
+        </div>
+      </div>
+
+      {/* ── 透明度 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">透明度</label>
+        <div className="pip-slider-row">
+          <input
+            className="pip-slider"
+            type="range"
+            min={0}
+            max={100}
+            value={layer.opacity}
+            onChange={(e) => onUpdate(layer.id, { opacity: Number(e.target.value) })}
+          />
+          <span className="pip-slider-value">{layer.opacity}%</span>
+        </div>
+      </div>
+
+      {/* ── 时间 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">时间</label>
+        <div className="pip-field-row">
+          <div>
+            <label className="pip-field-label">开始 (s)</label>
+            <input
+              className="pip-number"
+              type="number"
+              min={0}
+              max={totalDuration || 999}
+              step={0.1}
+              value={layer.start_time}
+              onChange={(e) => onUpdate(layer.id, { start_time: Number(e.target.value) })}
+            />
+          </div>
+          <div>
+            <label className="pip-field-label">持续 (s)</label>
+            <input
+              className="pip-number"
+              type="number"
+              min={0.1}
+              max={totalDuration || 999}
+              step={0.1}
+              value={layer.duration}
+              onChange={(e) => onUpdate(layer.id, { duration: Number(e.target.value) })}
+            />
+          </div>
+        </div>
+      </div>
+
+      {/* ── 入场动画 ── */}
+      <div className="pip-field">
+        <label className="pip-field-label">入场动画</label>
+        <select
+          className="pip-select"
+          value={layer.animation}
+          onChange={(e) => onUpdate(layer.id, { animation: e.target.value as PipAnimType })}
+        >
+          {ANIM_OPTIONS.map((opt) => (
+            <option key={opt.value} value={opt.value}>
+              {opt.label}
+            </option>
+          ))}
+        </select>
+      </div>
+
+      {/* 滑入方向（仅 slide_in 时显示） */}
+      {layer.animation === "slide_in" && (
+        <div className="pip-field">
+          <label className="pip-field-label">滑入方向</label>
+          <select
+            className="pip-select"
+            value={layer.slide_direction}
+            onChange={(e) =>
+              onUpdate(layer.id, { slide_direction: e.target.value as PipSlideDirection })
+            }
+          >
+            {SLIDE_DIR_OPTIONS.map((opt) => (
+              <option key={opt.value} value={opt.value}>
+                {opt.label}
+              </option>
+            ))}
+          </select>
+        </div>
+      )}
+    </div>
+  )
+}
+
+export default LayerConfig

apps/web/src/pages/editing-planner/components/pip-config/layer-config/LayerPositionSize.tsx

@@ -1,172 +0,0 @@
-import React from "react"
-import type { PipLayer, PipGridPosition } from "@/pages/editing-planner/types"
-import { GRID_POSITIONS } from "@/pages/editing-planner/constants/pipConfig"
-
-interface LayerPositionSizeProps {
-  layer: PipLayer
-  onUpdate: (id: string, partial: Partial<PipLayer>) => void
-  onGridClick: (pos: PipGridPosition) => void
-  onWidthChange: (val: number) => void
-  onHeightChange: (val: number) => void
-}
-
-/**
- * 图层位置与尺寸配置面板
- */
-export const LayerPositionSize: React.FC<LayerPositionSizeProps> = ({
-  layer,
-  onUpdate,
-  onGridClick,
-  onWidthChange,
-  onHeightChange,
-}) => (
-  <>
-    {/* 素材类型 */}
-    <div className="pip-field">
-      <label className="pip-field-label">素材类型</label>
-      <div className="pip-type-btns">
-        <button
-          className={`pip-type-btn${layer.material_type === "image" ? " active" : ""}`}
-          onClick={() => onUpdate(layer.id, { material_type: "image" })}
-        >
-          🖼️ 图片
-        </button>
-        <button
-          className={`pip-type-btn${layer.material_type === "video" ? " active" : ""}`}
-          onClick={() => onUpdate(layer.id, { material_type: "video" })}
-        >
-          🎬 视频
-        </button>
-      </div>
-    </div>
-
-    {/* 素材 URL */}
-    <div className="pip-field">
-      <label className="pip-field-label">
-        {layer.material_type === "image" ? "图片" : "视频"} URL
-      </label>
-      <input
-        className="pip-input"
-        type="text"
-        placeholder={
-          layer.material_type === "image"
-            ? "https://example.com/image.png"
-            : "https://example.com/video.mp4"
-        }
-        value={layer.material_url}
-        onChange={(e) => onUpdate(layer.id, { material_url: e.target.value })}
-      />
-    </div>
-
-    {/* 位置：九宫格 + 坐标 */}
-    <div className="pip-field">
-      <label className="pip-field-label">位置</label>
-      <div style={{ display: "flex", gap: 16, alignItems: "flex-start" }}>
-        <div className="pip-grid">
-          {GRID_POSITIONS.map((pos) => (
-            <button
-              key={pos}
-              className={`pip-grid-btn${layer.grid_position === pos ? " active" : ""}`}
-              onClick={() => onGridClick(pos)}
-            >
-              <span className="pip-grid-dot" />
-            </button>
-          ))}
-        </div>
-        <div className="pip-field-row" style={{ flex: 1 }}>
-          <div>
-            <label className="pip-field-label">X (%)</label>
-            <input
-              className="pip-number"
-              type="number"
-              min={0}
-              max={100}
-              value={layer.x}
-              onChange={(e) => onUpdate(layer.id, { x: Number(e.target.value) })}
-            />
-          </div>
-          <div>
-            <label className="pip-field-label">Y (%)</label>
-            <input
-              className="pip-number"
-              type="number"
-              min={0}
-              max={100}
-              value={layer.y}
-              onChange={(e) => onUpdate(layer.id, { y: Number(e.target.value) })}
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-
-    {/* 尺寸 */}
-    <div className="pip-field">
-      <label className="pip-field-label">尺寸</label>
-      <div className="pip-slider-row">
-        <span style={{ fontSize: 12, color: "#999", width: 20 }}>宽</span>
-        <input
-          className="pip-slider"
-          type="range"
-          min={10}
-          max={80}
-          value={layer.width}
-          onChange={(e) => onWidthChange(Number(e.target.value))}
-        />
-        <span className="pip-slider-value">{layer.width}%</span>
-      </div>
-      <div className="pip-slider-row" style={{ marginTop: 6 }}>
-        <span style={{ fontSize: 12, color: "#999", width: 20 }}>高</span>
-        <input
-          className="pip-slider"
-          type="range"
-          min={10}
-          max={80}
-          value={layer.height}
-          onChange={(e) => onHeightChange(Number(e.target.value))}
-        />
-        <span className="pip-slider-value">{layer.height}%</span>
-      </div>
-      <div
-        className="pip-lock-row"
-        style={{ marginTop: 6 }}
-        onClick={() => onUpdate(layer.id, { aspect_lock: !layer.aspect_lock })}
-      >
-        <span className="pip-lock-icon">{layer.aspect_lock ? "🔒" : "🔓"}</span>
-        <span>{layer.aspect_lock ? "已锁定比例" : "锁定宽高比"}</span>
-      </div>
-    </div>
-
-    {/* 圆角 */}
-    <div className="pip-field">
-      <label className="pip-field-label">圆角</label>
-      <div className="pip-slider-row">
-        <input
-          className="pip-slider"
-          type="range"
-          min={0}
-          max={50}
-          value={layer.border_radius}
-          onChange={(e) => onUpdate(layer.id, { border_radius: Number(e.target.value) })}
-        />
-        <span className="pip-slider-value">{layer.border_radius}%</span>
-      </div>
-    </div>
-
-    {/* 透明度 */}
-    <div className="pip-field">
-      <label className="pip-field-label">透明度</label>
-      <div className="pip-slider-row">
-        <input
-          className="pip-slider"
-          type="range"
-          min={0}
-          max={100}
-          value={layer.opacity}
-          onChange={(e) => onUpdate(layer.id, { opacity: Number(e.target.value) })}
-        />
-        <span className="pip-slider-value">{layer.opacity}%</span>
-      </div>
-    </div>
-  </>
-)

apps/web/src/pages/editing-planner/components/pip-config/layer-config/LayerTimingAnimation.tsx

@@ -1,87 +0,0 @@
-import React from "react"
-import type { PipLayer, PipAnimType, PipSlideDirection } from "@/pages/editing-planner/types"
-import { ANIM_OPTIONS, SLIDE_DIR_OPTIONS } from "@/pages/editing-planner/constants/pipConfig"
-
-interface LayerTimingAnimationProps {
-  layer: PipLayer
-  totalDuration: number
-  onUpdate: (id: string, partial: Partial<PipLayer>) => void
-}
-
-/**
- * 图层时间与动画配置面板
- */
-export const LayerTimingAnimation: React.FC<LayerTimingAnimationProps> = ({
-  layer,
-  totalDuration,
-  onUpdate,
-}) => (
-  <>
-    {/* 时间 */}
-    <div className="pip-field">
-      <label className="pip-field-label">时间</label>
-      <div className="pip-field-row">
-        <div>
-          <label className="pip-field-label">开始 (s)</label>
-          <input
-            className="pip-number"
-            type="number"
-            min={0}
-            max={totalDuration || 999}
-            step={0.1}
-            value={layer.start_time}
-            onChange={(e) => onUpdate(layer.id, { start_time: Number(e.target.value) })}
-          />
-        </div>
-        <div>
-          <label className="pip-field-label">持续 (s)</label>
-          <input
-            className="pip-number"
-            type="number"
-            min={0.1}
-            max={totalDuration || 999}
-            step={0.1}
-            value={layer.duration}
-            onChange={(e) => onUpdate(layer.id, { duration: Number(e.target.value) })}
-          />
-        </div>
-      </div>
-    </div>
-
-    {/* 入场动画 */}
-    <div className="pip-field">
-      <label className="pip-field-label">入场动画</label>
-      <select
-        className="pip-select"
-        value={layer.animation}
-        onChange={(e) => onUpdate(layer.id, { animation: e.target.value as PipAnimType })}
-      >
-        {ANIM_OPTIONS.map((opt) => (
-          <option key={opt.value} value={opt.value}>
-            {opt.label}
-          </option>
-        ))}
-      </select>
-    </div>
-
-    {/* 滑入方向（仅 slide_in 时显示） */}
-    {layer.animation === "slide_in" && (
-      <div className="pip-field">
-        <label className="pip-field-label">滑入方向</label>
-        <select
-          className="pip-select"
-          value={layer.slide_direction}
-          onChange={(e) =>
-            onUpdate(layer.id, { slide_direction: e.target.value as PipSlideDirection })
-          }
-        >
-          {SLIDE_DIR_OPTIONS.map((opt) => (
-            <option key={opt.value} value={opt.value}>
-              {opt.label}
-            </option>
-          ))}
-        </select>
-      </div>
-    )}
-  </>
-)

apps/web/src/pages/editing-planner/components/pip-config/layer-config/PipPreview.tsx

@@ -1,33 +0,0 @@
-import React from "react"
-import type { PipLayer } from "@/pages/editing-planner/types"
-import { LAYER_COLORS } from "@/pages/editing-planner/constants/pipConfig"
-
-interface PipPreviewProps {
-  layers: PipLayer[]
-  selectedId: string
-}
-
-/**
- * PIP 图层迷你预览组件
- */
-export const PipPreview: React.FC<PipPreviewProps> = ({ layers, selectedId }) => (
-  <div className="pip-preview-box">
-    {layers.map((l, idx) => (
-      <div
-        key={l.id}
-        className={`pip-preview-layer${selectedId === l.id ? " selected" : ""}`}
-        style={{
-          left: `${l.x}%`,
-          top: `${l.y}%`,
-          width: `${l.width}%`,
-          height: `${l.height}%`,
-          background: LAYER_COLORS[idx % LAYER_COLORS.length],
-          opacity: l.opacity / 100,
-          borderRadius: `${l.border_radius}%`,
-        }}
-      >
-        <span className="pip-preview-label">{l.name}</span>
-      </div>
-    ))}
-  </div>
-)

apps/web/src/pages/editing-planner/components/pip-config/layer-config/index.tsx

@@ -1,57 +0,0 @@
-/**
- * 混剪单图层配置区
- */
-import React from "react"
-import type { PipLayer, PipGridPosition } from "@/pages/editing-planner/types"
-import { PipPreview } from "./PipPreview"
-import { LayerPositionSize } from "./LayerPositionSize"
-import { LayerTimingAnimation } from "./LayerTimingAnimation"
-
-interface LayerConfigProps {
-  layer: PipLayer | null
-  layers: PipLayer[]
-  totalDuration: number
-  onUpdate: (id: string, partial: Partial<PipLayer>) => void
-  onGridClick: (pos: PipGridPosition) => void
-  onWidthChange: (val: number) => void
-  onHeightChange: (val: number) => void
-}
-
-const LayerConfig: React.FC<LayerConfigProps> = ({
-  layer,
-  layers,
-  totalDuration,
-  onUpdate,
-  onGridClick,
-  onWidthChange,
-  onHeightChange,
-}) => {
-  if (!layer) {
-    return (
-      <div className="pip-config-area">
-        <div className="pip-config-empty">选择或添加图层以配置</div>
-      </div>
-    )
-  }
-
-  return (
-    <div className="pip-config-area">
-      {/* 迷你预览 */}
-      <PipPreview layers={layers} selectedId={layer.id} />
-
-      {/* 位置与尺寸 */}
-      <LayerPositionSize
-        layer={layer}
-        onUpdate={onUpdate}
-        onGridClick={onGridClick}
-        onWidthChange={onWidthChange}
-        onHeightChange={onHeightChange}
-      />
-
-      {/* 时间与动画 */}
-      <LayerTimingAnimation layer={layer} totalDuration={totalDuration} onUpdate={onUpdate} />
-    </div>
-  )
-}
-
-export default LayerConfig