From 9d7f8dfeee725d00dda5130b7ddf0a381af99613 Mon Sep 17 00:00:00 2001
From: shangfangjian <shangfangjian@bilidili.cn>
Date: Sun, 20 Sep 2026 20:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=A6=96=E9=A1=B5=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=8C=89=E9=92=AE:=E5=90=88=E5=B9=B6=E3=80=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8E=E7=BB=AD=E3=80=8D=E4=B8=8E=E3=80=8C?=
 =?UTF-8?q?=E8=BD=BD=E5=85=A5=E6=9B=B4=E5=A4=9A=E3=80=8D=E4=B8=BA=E5=8D=95?=
 =?UTF-8?q?=E4=B8=80=E6=99=BA=E8=83=BD=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 3 天视图且有折叠比赛时 →「显示后续 N 场未开赛」(展开)
- 展开全部后 / 非 3 天视图 →「载入更多赛程」(从服务器拉取下一页)
- 移除重复按钮,保留「收起」文字链接回 3 天视图

Co-Authored-By: new-provider/LongCat-2.0 <<EMAIL>>
---
 frontend/src/pages/Matches.tsx | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/frontend/src/pages/Matches.tsx b/frontend/src/pages/Matches.tsx
index 7ac436a..25a1bea 100644
--- a/frontend/src/pages/Matches.tsx
+++ b/frontend/src/pages/Matches.tsx
@@ -642,15 +642,21 @@ export default function Matches() {
           </div>
         ))}
 
-        {/* 未开赛视图:从「未来 3 天」展开全部已加载的未开赛 */}
-        {!loading && hasHiddenUpcoming && (
+        {/* 单一「加载更多」按钮:3 天视图时先展开,展开后从服务器拉取下一页 */}
+        {!loading && (hasHiddenUpcoming || nextCursor) && (
           <div className="flex justify-center pt-4">
-            <button
-              onClick={() => setShowAllUpcoming(true)}
-              className="btn btn-outline min-h-[44px] w-full max-w-xs sm:w-auto"
-            >
-              显示后续 {matches.length - visibleMatches.length} 场未开赛
-            </button>
+            {hasHiddenUpcoming ? (
+              <button
+                onClick={() => setShowAllUpcoming(true)}
+                className="btn btn-outline min-h-[44px] w-full max-w-xs sm:w-auto"
+              >
+                显示后续 {matches.length - visibleMatches.length} 场未开赛
+              </button>
+            ) : (
+              <button onClick={loadMore} disabled={loadingMore} className="btn min-h-[44px] w-full max-w-xs sm:w-auto">
+                {loadingMore ? (<><Spinner /> 获取中</>) : '载入更多赛程'}
+              </button>
+            )}
           </div>
         )}
 
@@ -665,14 +671,6 @@ export default function Matches() {
             </button>
           </div>
         )}
-
-        {!loading && nextCursor && (
-          <div className="flex justify-center pt-4">
-            <button onClick={loadMore} disabled={loadingMore} className="btn min-h-[44px] w-full max-w-xs sm:w-auto">
-              {loadingMore ? (<><Spinner /> 获取中</>) : '载入更多赛程'}
-            </button>
-          </div>
-        )}
       </section>
 
     </div>