From aff4ca59ab80743a36a3114afcfaee3dceffc187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B1=BC=E5=BC=80=E5=8F=91?= <git@xiaoyu.com>
Date: Sun, 17 May 2026 20:48:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=9B=E4=BD=9C=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98/=E5=8A=A0=E8=BD=BD=20+=20=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=BF=87=E6=9C=9F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ScriptCreation: 大类/小类 selection 持久化到 project meta
- ProjectMeta: 新增 subcategoryCode 字段
- projectStore: 新增 setSubcategoryCode action
- localStorage: orderedMeta 补全 categoryCode/subcategoryCode
- RechargeModal: 过期后点击'我已支付'给出 toast 提示，按钮禁用并显示'二维码已过期'
---
 tauri-app/src/api/modules/localStorage.ts     |  2 ++
 .../RechargeModal/RechargeModal.tsx           |  9 +++----
 .../pages/VideoCreation/ScriptCreation.tsx    | 24 +++++++++++++++++--
 tauri-app/src/store/projectStore.ts           |  8 +++++++
 tauri-app/src/types/project.ts                |  1 +
 tauri-app/src/utils/projectMeta.ts            |  1 +
 6 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/tauri-app/src/api/modules/localStorage.ts b/tauri-app/src/api/modules/localStorage.ts
index 925a9ff..371fc7a 100644
--- a/tauri-app/src/api/modules/localStorage.ts
+++ b/tauri-app/src/api/modules/localStorage.ts
@@ -93,6 +93,8 @@ export const localProjectApi = {
       id: meta.id,
       title: meta.title,
       topic: meta.topic,
+      categoryCode: meta.categoryCode,
+      subcategoryCode: meta.subcategoryCode,
       status: meta.status,
       currentStep: meta.currentStep,
       createdAt: meta.createdAt,
diff --git a/tauri-app/src/components/RechargeModal/RechargeModal.tsx b/tauri-app/src/components/RechargeModal/RechargeModal.tsx
index abfe327..d4d04e1 100644
--- a/tauri-app/src/components/RechargeModal/RechargeModal.tsx
+++ b/tauri-app/src/components/RechargeModal/RechargeModal.tsx
@@ -179,10 +179,11 @@ export default function RechargeModal({
     const orderId = orderIdRef.current;
     if (!orderId) {return;}
 
-    // 二维码已过期，直接提示
-    if (Date.now() >= expireAtRef.current) {
+    // 二维码已过期，明确提示用户
+    if (isExpired || Date.now() >= expireAtRef.current) {
       clearTimers();
       setIsExpired(true);
+      toast.info('二维码已过期，请点击刷新二维码或重新下单');
       return;
     }
 
@@ -353,9 +354,9 @@ export default function RechargeModal({
           <button
             className="btn btn-primary"
             onClick={handleQueryPayment}
-            disabled={isLoading}
+            disabled={isLoading || isExpired}
           >
-            {isLoading ? '查询中...' : '我已支付'}
+            {isLoading ? '查询中...' : isExpired ? '二维码已过期' : '我已支付'}
           </button>
           <button
             className="btn btn-ghost"
diff --git a/tauri-app/src/pages/VideoCreation/ScriptCreation.tsx b/tauri-app/src/pages/VideoCreation/ScriptCreation.tsx
index 134d385..153aab2 100644
--- a/tauri-app/src/pages/VideoCreation/ScriptCreation.tsx
+++ b/tauri-app/src/pages/VideoCreation/ScriptCreation.tsx
@@ -21,8 +21,11 @@ export default function ScriptCreation() {
   const segments = useProjectStore(state => state.segments);
   const setSegments = useProjectStore(state => state.setSegments);
   const updateSegment = useProjectStore(state => state.updateSegment);
+  const categoryCode = useProjectStore(state => state.categoryCode);
+  const subcategoryCode = useProjectStore(state => state.subcategoryCode);
   const setTopic = useProjectStore(state => state.setTopic);
   const setCategoryCode = useProjectStore(state => state.setCategoryCode);
+  const setSubcategoryCode = useProjectStore(state => state.setSubcategoryCode);
 
   const [generating, setGenerating] = useState(false);
   const requestLock = useRef(false);
@@ -30,8 +33,8 @@ export default function ScriptCreation() {
   // 分类列表（从后端动态加载）
   const [categories, setCategories] = useState<CategoryItem[]>([]);
   // 选中的大类和小类
-  const [selectedCategory, setSelectedCategory] = useState<string>('');
-  const [selectedSubcategory, setSelectedSubcategory] = useState<string>('');
+  const [selectedCategory, setSelectedCategory] = useState<string>(categoryCode || '');
+  const [selectedSubcategory, setSelectedSubcategory] = useState<string>(subcategoryCode || '');
 
   // 加载分类列表（带本地缓存 + 静默刷新）
   useEffect(() => {
@@ -50,6 +53,22 @@ export default function ScriptCreation() {
       });
   }, []);
 
+  // 分类列表加载后，恢复之前保存的选中状态
+  useEffect(() => {
+    if (categories.length === 0) {return;}
+    if (categoryCode && subcategoryCode) {
+      // 验证保存的 code 是否在当前分类列表中有效
+      const catExists = categories.some(c => c.code === categoryCode);
+      const subExists = categories.some(c =>
+        c.code === categoryCode && c.subcategories.some(s => s.code === subcategoryCode)
+      );
+      if (catExists && subExists) {
+        setSelectedCategory(categoryCode);
+        setSelectedSubcategory(subcategoryCode);
+      }
+    }
+  }, [categories, categoryCode, subcategoryCode]);
+
   // 编辑状态：存储正在编辑的字段键（如 "1-scene", "2-voiceover"）
   const [editingFields, setEditingFields] = useState<Set<string>>(new Set());
 
@@ -336,6 +355,7 @@ export default function ScriptCreation() {
                       setSelectedSubcategory(sub.code);
                       setTopic(sub.name);
                       setCategoryCode(cat.code);
+                      setSubcategoryCode(sub.code);
                     }}
                   >
                     {sub.name}
diff --git a/tauri-app/src/store/projectStore.ts b/tauri-app/src/store/projectStore.ts
index ca3649c..4156e55 100644
--- a/tauri-app/src/store/projectStore.ts
+++ b/tauri-app/src/store/projectStore.ts
@@ -31,6 +31,7 @@ interface ProjectActions {
   setVoiceVolume: (_volume: number) => void;
   setVoicePitch: (_pitch: number) => void;
   setCategoryCode: (_code: string) => void;
+  setSubcategoryCode: (_code: string) => void;
   setIsLoading: (_loading: boolean) => void;
   setHasHydrated: (_hydrated: boolean) => void;
 }
@@ -231,6 +232,13 @@ export const useProjectStore = create<ProjectStore>()(
           });
           saveMetaToLocalFile({ categoryCode: code });
         },
+        setSubcategoryCode: code => {
+          set(state => {
+            state.subcategoryCode = code;
+            state.updatedAt = Date.now();
+          });
+          saveMetaToLocalFile({ subcategoryCode: code });
+        },
 
       }),
       {
diff --git a/tauri-app/src/types/project.ts b/tauri-app/src/types/project.ts
index 993a175..6703286 100644
--- a/tauri-app/src/types/project.ts
+++ b/tauri-app/src/types/project.ts
@@ -82,6 +82,7 @@ export interface ProjectMeta {
   // === 创作参数 ===
   topic?: string;
   categoryCode?: string;
+  subcategoryCode?: string;
 
   // === 素材选择 ===
   selectedVoiceId?: string;
diff --git a/tauri-app/src/utils/projectMeta.ts b/tauri-app/src/utils/projectMeta.ts
index 93b5eb8..8896ae8 100644
--- a/tauri-app/src/utils/projectMeta.ts
+++ b/tauri-app/src/utils/projectMeta.ts
@@ -140,6 +140,7 @@ export function migrateMeta(raw: unknown): Partial<ProjectMeta> {
 export const BLANK_META_OVERRIDES: MetaOverrides = {
   topic: undefined,
   categoryCode: undefined,
+  subcategoryCode: undefined,
   selectedVoiceId: undefined,
   finalVideoPath: undefined,
   coverPath: undefined,