Merge pull request #1 from RSJWY/main

fix：打开#settings页面时后端在没有订阅链接的情况下返回 null，导致页面异常
2026-03-06 15:59:00 +08:00
parent a31ac4f51a c454446fb9
commit c37f26f376
1 changed files with 2 additions and 1 deletions
@@ -78,7 +78,8 @@ export default function SettingsPanel() {
          fetchSettings(),
          refreshSubStatus(),
        ])
-        const merged = { ...defaultSettings, ...settingsData }
+        const subscriptions = settingsData.subscriptions || []
+        const merged = { ...defaultSettings, ...settingsData, subscriptions }
        setSettings(merged)
        setSavedSettings(merged)
        setIsDirty(false)