From 8fdbd2505b040338634fd71dd223150c0fc961fc Mon Sep 17 00:00:00 2001
From: hzm <934585316@qq.com>
Date: Sat, 7 Feb 2026 22:25:48 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=87=8D=E6=96=B0=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=BF=E7=99=BB=E5=BD=95=E6=B5=8B=E8=AF=95=E7=89=88=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/page.jsx | 56 ++++++++++++++++++++++++++++++++--------------------
 package.json |  2 +-
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/app/page.jsx b/app/page.jsx
index 906b72e..68a6972 100644
--- a/app/page.jsx
+++ b/app/page.jsx
@@ -1232,7 +1232,7 @@ function CloudConfigModal({ onConfirm, onCancel, type = 'empty' }) {
         </div>
         <p className="muted" style={{ marginBottom: 20, fontSize: '14px', lineHeight: '1.6' }}>
           {isConflict
-            ? '检测到本地配置比云端更新，请选择操作：'
+            ? '检测到本地配置与云端不一致，请选择操作：'
             : '是否将本地配置同步到云端？'}
         </p>
         <div className="row" style={{ flexDirection: 'column', gap: 12 }}>
@@ -1858,11 +1858,6 @@ export default function HomePage() {
   const [latestVersion, setLatestVersion] = useState('');
   const [updateContent, setUpdateContent] = useState('');
 
-  // FIXME 强制登出
-  useLayoutEffect(() => {
-    handleLogout();
-  }, []);
-
   useEffect(() => {
     const checkUpdate = async () => {
       try {
@@ -3317,12 +3312,18 @@ export default function HomePage() {
         return;
       }
       if (data?.data && typeof data.data === 'object' && Object.keys(data.data).length > 0) {
-        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;
+        const localPayload = collectLocalPayload();
+        const localComparable = getComparablePayload(localPayload);
+        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;
+          }
         }
 
         await applyCloudConfig(data.data, data.updated_at);
@@ -3606,16 +3607,17 @@ export default function HomePage() {
           >
             <RefreshIcon className={refreshing ? 'spin' : ''} width="18" height="18" />
           </button>
-          <button
-            className="icon-button"
-            aria-label="打开设置"
-            onClick={() => setSettingsOpen(true)}
-            title="设置"
-          >
-            <SettingsIcon width="18" height="18" />
-          </button>
+          {/*<button*/}
+          {/*  className="icon-button"*/}
+          {/*  aria-label="打开设置"*/}
+          {/*  onClick={() => setSettingsOpen(true)}*/}
+          {/*  title="设置"*/}
+          {/*  hidden*/}
+          {/*>*/}
+          {/*  <SettingsIcon width="18" height="18" />*/}
+          {/*</button>*/}
           {/* 用户菜单 */}
-          <div className="user-menu-container" ref={userMenuRef} hidden>
+          <div className="user-menu-container" ref={userMenuRef}>
             <button
               className={`icon-button user-menu-trigger ${user ? 'logged-in' : ''}`}
               aria-label={user ? '用户菜单' : '登录'}
@@ -4914,6 +4916,18 @@ export default function HomePage() {
 
             <form onSubmit={handleSendOtp}>
               <div className="form-group" style={{ marginBottom: 16 }}>
+                <div style={{
+                  marginBottom: 12,
+                  padding: '8px 12px',
+                  background: 'rgba(230, 162, 60, 0.1)',
+                  border: '1px solid rgba(230, 162, 60, 0.2)',
+                  borderRadius: '4px',
+                  fontSize: '0.8rem',
+                  color: '#e6a23c',
+                  lineHeight: '1.4'
+                }}>
+                  ⚠️ 登录功能目前正在测试，使用过程中如遇到问题欢迎大家在 <a href="https://github.com/hzm0321/real-time-fund/issues" target="_blank" style={{ textDecoration: 'underline', color: 'inherit' }}>Github</a> 上反馈
+                </div>
                 <div className="muted" style={{ marginBottom: 8, fontSize: '0.8rem' }}>
                   请输入邮箱，我们将发送验证码到您的邮箱
                 </div>
diff --git a/package.json b/package.json
index 7ec9324..56e863e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "real-time-fund",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": true,
   "scripts": {
     "dev": "next dev",