From 9ad49bad57102f101521dd17d45d181aaceabc0c Mon Sep 17 00:00:00 2001
From: hajimi <phperbylyh@163.com>
Date: Mon, 3 Aug 2026 02:18:32 +0800
Subject: [PATCH] fix: load hot league matches for all filter

---
 server/app/api/controller/MatchController.php | 12 +++++++
 uniapp/src/api/match.ts                       | 11 ++++++-
 .../components/MatchCenterTabsPanel.vue       | 31 +++++++++----------
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/server/app/api/controller/MatchController.php b/server/app/api/controller/MatchController.php
index 8f1d2a1..5222914 100644
--- a/server/app/api/controller/MatchController.php
+++ b/server/app/api/controller/MatchController.php
@@ -94,6 +94,7 @@ class MatchController extends BaseApiController
     {
         $sportType = $this->request->get('sport_type/d', 0);
         $leagueName = $this->request->get('league_name/s', '');
+        $hotOnly = $this->request->get('hot_only/d', 0);
         $endedPage = $this->request->get('ended_page/d', 1);
         $endedPageSize = $this->request->get('ended_page_size/d', 20);
         $endedOnly = $this->request->get('ended_only/d', 0);
@@ -107,6 +108,17 @@ class MatchController extends BaseApiController
         }
         if (!empty($leagueName)) {
             $baseWhere[] = ['league_name', '=', $leagueName];
+        } elseif ($hotOnly) {
+            $hotLeagueQuery = League::where('is_show', 1)
+                ->where('type', 'league')
+                ->where('is_hot', 1);
+            if ($sportType > 0) {
+                $hotLeagueQuery->where('sport_type', $sportType);
+            }
+            $hotLeagues = $hotLeagueQuery->column('label');
+            $baseWhere[] = !empty($hotLeagues)
+                ? ['league_name', 'in', $hotLeagues]
+                : ['id', '=', 0];
         } elseif ($sportType <= 0) {
             $validLeagues = League::where('is_show', 1)->where('type', 'league')->column('label');
             if (!empty($validLeagues)) {
diff --git a/uniapp/src/api/match.ts b/uniapp/src/api/match.ts
index 646a85d..ba746cb 100644
--- a/uniapp/src/api/match.ts
+++ b/uniapp/src/api/match.ts
@@ -128,7 +128,16 @@ export interface WorldCupOddsMatchItem {
 export type MatchLiveCardItem = WorldCupLiveCardItem
 export type MatchOddsMatchItem = WorldCupOddsMatchItem
 
-export function getMatchList(data?: Record<string, any>) {
+export interface MatchListParams {
+    sport_type?: number
+    league_name?: string
+    hot_only?: 0 | 1
+    ended_page?: number
+    ended_page_size?: number
+    ended_only?: 0 | 1
+}
+
+export function getMatchList(data?: MatchListParams) {
     return request.get({ url: '/match/lists', data: data }, { withToken: false })
 }
 
diff --git a/uniapp/src/packages_match/components/MatchCenterTabsPanel.vue b/uniapp/src/packages_match/components/MatchCenterTabsPanel.vue
index 1017ab6..27b5efe 100644
--- a/uniapp/src/packages_match/components/MatchCenterTabsPanel.vue
+++ b/uniapp/src/packages_match/components/MatchCenterTabsPanel.vue
@@ -44,7 +44,7 @@
             <view class="league-tabs__inner">
                 <view class="league-tab" :class="{ 'league-tab--active': currentLeague === '' }"
                     @tap="switchLeague('')">
-                    <text>{{ hotLeagueMode ? '全部热门' : '全部' }}</text>
+                    <text>全部</text>
                 </view>
                 <view v-for="(league, idx) in leagueTabs" :key="idx" class="league-tab"
                     :class="{ 'league-tab--active': currentLeague === league.league_name }"
@@ -68,8 +68,8 @@
                             <text class="match-group__arrow">›</text>
                         </view>
                     </view>
-                    <view v-for="item in group.items" :key="item.id || item.match_id" v-show="!collapsedGroups[group.type]"
-                        class="match-card-wrap" @tap="goDetail(item)">
+                    <view v-for="item in group.items" :key="item.id || item.match_id"
+                        v-show="!collapsedGroups[group.type]" class="match-card-wrap" @tap="goDetail(item)">
                         <MatchCenterScheduleCard :match="item" @detail="goDetail(item)" @ai="goAiAnalysis(item)" />
                     </view>
                 </view>
@@ -79,8 +79,7 @@
                     <text>加载中...</text>
                 </view>
                 <view v-if="!scheduleLoading && !matchGroups.length" class="content-empty">
-                    <u-empty :text="hotLeagueMode && !leagueTabs.length ? '暂无后台配置的热门联赛' : '暂无赛事'"
-                        mode="data" />
+                    <u-empty :text="hotLeagueMode && !leagueTabs.length ? '暂无热门联赛' : '暂无赛事'" mode="data" />
                 </view>
                 <view v-if="endedNoMore && endedList.length" class="content-nomore">
                     <text>没有更多赛事了</text>
@@ -131,8 +130,10 @@
                                 <text class="match-live-card__anchor-name">{{ liveAnchorName(live) }}</text>
                             </view>
                             <view class="match-live-card__stats">
-                                <text class="match-live-card__stat">观看 {{ formatLiveCount(live.room_view_count) }}</text>
-                                <text class="match-live-card__stat">关注 {{ formatLiveCount(live.room_focus_count) }}</text>
+                                <text class="match-live-card__stat">观看 {{ formatLiveCount(live.room_view_count)
+                                    }}</text>
+                                <text class="match-live-card__stat">关注 {{ formatLiveCount(live.room_focus_count)
+                                    }}</text>
                             </view>
                             <text class="match-live-card__notice">{{ liveRoomNotice(live) }}</text>
                         </view>
@@ -145,12 +146,10 @@
 
             <block v-else>
                 <view class="match-odds-filter">
-                    <scroll-view scroll-x
-                        class="match-odds-filter__tabs match-odds-filter__platforms"
+                    <scroll-view scroll-x class="match-odds-filter__tabs match-odds-filter__platforms"
                         show-scrollbar="false">
                         <view class="match-odds-filter__tabs-inner">
-                            <view v-for="item in oddsPlatformOptions" :key="item.key"
-                                class="match-odds-filter__tab"
+                            <view v-for="item in oddsPlatformOptions" :key="item.key" class="match-odds-filter__tab"
                                 :class="{ 'match-odds-filter__tab--active': oddsSourceSite === item.key }"
                                 @tap="switchOddsSourceSite(item.key)">
                                 <text>{{ item.label }}</text>
@@ -225,7 +224,7 @@
                                     <text class="match-odds-platform__tag">{{ platform.show_type_text }}</text>
                                 </view>
                                 <text class="match-odds-platform__update">{{ formatOddsUpdateTime(platform.update_time)
-                                    }}</text>
+                                }}</text>
                             </view>
 
                             <view v-for="market in platform.markets"
@@ -405,12 +404,9 @@ const ensureSelectedMatchDate = () => {
 }
 
 const filterScheduleItems = (items: any[]) => {
-    const dateFiltered = selectedDateKey.value
+    return selectedDateKey.value
         ? items.filter((item: any) => getMatchDateKey(item) === selectedDateKey.value)
         : items
-    if (!hotLeagueMode.value || currentLeague.value) return dateFiltered
-    const hotLeagueNames = new Set(leagueTabs.value.map((item: any) => String(item?.league_name || '')))
-    return dateFiltered.filter((item: any) => hotLeagueNames.has(String(item?.league_name || '')))
 }
 
 const leagueTabs = computed(() => {
@@ -505,6 +501,7 @@ const fetchMatchList = async (refresh = false) => {
         }
         if (currentSport.value > 0) params.sport_type = currentSport.value
         if (currentLeague.value) params.league_name = currentLeague.value
+        if (hotLeagueMode.value && !currentLeague.value) params.hot_only = 1
         if (!refresh) params.ended_only = 1
         const data = await getMatchList(params)
         if (refresh) {
@@ -1455,7 +1452,7 @@ onMounted(() => {
     padding-top: 14rpx;
     border-top: 1rpx solid #eef2f7;
 
-    & + & {
+    &+& {
         margin-top: 14rpx;
     }
 }