From 56e20211e428178f7673585e590d82484bff7b47 Mon Sep 17 00:00:00 2001
From: hzm <934585316@qq.com>
Date: Sat, 7 Mar 2026 20:18:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/page.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/page.jsx b/app/page.jsx
index 1bf0085..e5fbc78 100644
--- a/app/page.jsx
+++ b/app/page.jsx
@@ -3181,7 +3181,7 @@ export default function HomePage() {
     try {
       const { data: meta, error: metaError } = await supabase
         .from('user_configs')
-        .select('id, updated_at')
+        .select(`id, updated_at${checkConflict ? ', data' : ''}`)
         .eq('user_id', userId)
         .maybeSingle();
 
@@ -3195,6 +3195,10 @@ export default function HomePage() {
         setCloudConfigModal({ open: true, userId, type: 'empty' });
         return;
       }
+      if (checkConflict) {
+        setCloudConfigModal({ open: true, userId, type: 'conflict', cloudData: meta.data });
+        return;
+      }
 
       const localUpdatedAt = window.localStorage.getItem('localUpdatedAt');
       if (localUpdatedAt && meta.updated_at && new Date(meta.updated_at) < new Date(localUpdatedAt)) {