From 406f14150d73d978d623fef289a74b52b3cc2047 Mon Sep 17 00:00:00 2001
From: hzm <934585316@qq.com>
Date: Sun, 8 Feb 2026 06:38:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=B2=E7=99=BB=E5=BD=95=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9C=AC=E5=9C=B0=E4=B8=8E=E4=BA=91=E7=AB=AF=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E5=88=99=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/page.jsx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/page.jsx b/app/page.jsx
index 5f8cbe2..d0de71e 100644
--- a/app/page.jsx
+++ b/app/page.jsx
@@ -3339,13 +3339,10 @@ export default function HomePage() {
         const cloudComparable = getComparablePayload(data.data);
 
         if (localComparable !== cloudComparable) {
-          const cloudTime = new Date(data.updated_at || 0).getTime();
-          const localTime = new Date(localStorage.getItem('localUpdatedAt') || 0).getTime();
-          
-          if (localTime > cloudTime + 2000) {
-            setCloudConfigModal({ open: true, userId, type: 'conflict', cloudData: data.data });
-            return;
-          }
+          // 如果数据不一致，无论时间戳如何，都提示用户
+          // 用户可以选择使用本地数据覆盖云端，或者使用云端数据覆盖本地
+          setCloudConfigModal({ open: true, userId, type: 'conflict', cloudData: data.data });
+          return;
         }
 
         await applyCloudConfig(data.data, data.updated_at);