deploy: auto commit repo-root changes 2026-07-13 13:26:55

server/app/api/controller/MatchController.php

@@ -533,7 +533,11 @@ class MatchController extends BaseApiController
                 $this->request->get('include_special/d', 0),
                 min(max($this->request->get('limit/d', 120), 1), 300),
                 $this->request->get('sport_type/d', 0),
-                trim($this->request->get('league_name/s', ''))
+                trim($this->request->get('league_name/s', '')),
+                false,
+                trim($this->request->get('home_team/s', '')),
+                trim($this->request->get('away_team/s', '')),
+                trim($this->request->get('match_date/s', ''))
             ),
             'platform_options' => $this->getOddsPlatformOptions(),
         ]);
@@ -565,7 +569,10 @@ class MatchController extends BaseApiController
         int $limit,
         int $sportType = 0,
         string $leagueName = '',
-        bool $worldCupEventOnly = false
+        bool $worldCupEventOnly = false,
+        string $homeTeam = '',
+        string $awayTeam = '',
+        string $matchDate = ''
     ): array {
         $validShowTypes = ['live', 'today', 'early'];
 
@@ -601,6 +608,25 @@ class MatchController extends BaseApiController
                     ->whereOr('match_time_text', 'like', $likeKeyword);
             });
         }
+        if ($homeTeam !== '') {
+            $query->where('home_team', 'like', '%' . addcslashes($homeTeam, '\\%_') . '%');
+        }
+        if ($awayTeam !== '') {
+            $query->where('away_team', 'like', '%' . addcslashes($awayTeam, '\\%_') . '%');
+        }
+        $matchDatePatterns = $this->buildOddsMatchDatePatterns($matchDate);
+        if (!empty($matchDatePatterns)) {
+            $query->where(function ($query) use ($matchDatePatterns) {
+                foreach ($matchDatePatterns as $index => $pattern) {
+                    $likePattern = '%' . addcslashes($pattern, '\\%_') . '%';
+                    if ($index === 0) {
+                        $query->where('match_time_text', 'like', $likePattern);
+                    } else {
+                        $query->whereOr('match_time_text', 'like', $likePattern);
+                    }
+                }
+            });
+        }
 
         $rows = $query
             ->field('id,source_site,source_url,source_match_id,source_league_id,sport_type,show_type,odds_type,league_name,match_time_text,home_team,away_team,handicap_line,handicap_home_odds,handicap_away_odds,total_line,total_over_odds,total_under_odds,home_win_odds,draw_odds,away_win_odds,update_time')
@@ -734,6 +760,42 @@ class MatchController extends BaseApiController
         return trim($matchTimeText);
     }
 
+    private function buildOddsMatchDatePatterns(string $matchDate): array
+    {
+        $matchDate = trim($matchDate);
+        if ($matchDate === '') {
+            return [];
+        }
+
+        $normalized = str_replace('/', '-', $matchDate);
+        if (preg_match('/^(\d{4})-(\d{1,2})-(\d{1,2})$/', $normalized, $matches)) {
+            $year = (int)$matches[1];
+            $month = (int)$matches[2];
+            $day = (int)$matches[3];
+            return array_values(array_unique([
+                sprintf('%04d-%02d-%02d', $year, $month, $day),
+                sprintf('%04d/%02d/%02d', $year, $month, $day),
+                sprintf('%02d-%02d', $month, $day),
+                sprintf('%02d/%02d', $month, $day),
+                sprintf('%d-%d', $month, $day),
+                sprintf('%d/%d', $month, $day),
+            ]));
+        }
+
+        if (preg_match('/^(\d{1,2})-(\d{1,2})$/', $normalized, $matches)) {
+            $month = (int)$matches[1];
+            $day = (int)$matches[2];
+            return array_values(array_unique([
+                sprintf('%02d-%02d', $month, $day),
+                sprintf('%02d/%02d', $month, $day),
+                sprintf('%d-%d', $month, $day),
+                sprintf('%d/%d', $month, $day),
+            ]));
+        }
+
+        return [$matchDate];
+    }
+
     private function buildTeamPairKey(string $homeTeam, string $awayTeam): string
     {
         $homeTeam = preg_replace('/\s+/u', '', trim($homeTeam));

uniapp/src/api/match.ts

@@ -181,6 +181,9 @@ export function getMatchOdds(data?: {
     show_type?: 'live' | 'today' | 'early'
     source_site?: string
     keyword?: string
+    home_team?: string
+    away_team?: string
+    match_date?: string
     include_special?: number
     limit?: number
 }) {

uniapp/src/components/match-odds-detail/match-odds-detail.vue

@@ -0,0 +1,345 @@
+<template>
+    <view class="match-odds-detail">
+        <scroll-view scroll-x class="match-odds-detail__tabs" show-scrollbar="false">
+            <view class="match-odds-detail__tabs-inner">
+                <view v-for="item in platformOptions" :key="item.key" class="match-odds-detail__tab"
+                    :class="{ 'match-odds-detail__tab--active': sourceSite === item.key }"
+                    @tap="switchPlatform(item.key)">
+                    <text>{{ item.label }}</text>
+                </view>
+            </view>
+        </scroll-view>
+
+        <view v-if="loading" class="match-odds-detail__state">
+            <u-loading mode="circle" />
+            <text>赔率加载中...</text>
+        </view>
+
+        <view v-else-if="platforms.length" class="match-odds-detail__list">
+            <view v-for="platform in platforms"
+                :key="`${platform.platform_key}-${platform.source_match_id || platform.update_time || 0}`"
+                class="match-odds-platform">
+                <view class="match-odds-platform__head">
+                    <view class="match-odds-platform__name">
+                        <text>{{ platform.platform_name }}</text>
+                        <text v-if="platform.show_type_text" class="match-odds-platform__tag">
+                            {{ platform.show_type_text }}
+                        </text>
+                    </view>
+                    <text class="match-odds-platform__update">{{ formatUpdateTime(platform.update_time) }}</text>
+                </view>
+
+                <view v-for="market in platform.markets" :key="`${platform.source_match_id}-${market.label}`"
+                    class="match-odds-market">
+                    <view class="match-odds-market__title">
+                        <text>{{ market.label }}</text>
+                        <text v-if="market.line" class="match-odds-market__line">{{ market.line }}</text>
+                    </view>
+                    <view class="match-odds-market__values">
+                        <view v-for="item in market.values" :key="`${market.label}-${item.label}`"
+                            class="match-odds-value">
+                            <text class="match-odds-value__label">{{ item.label }}</text>
+                            <text class="match-odds-value__number">{{ item.value }}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <view v-else class="match-odds-detail__state">
+            <u-empty text="暂无赔率" mode="data" />
+        </view>
+    </view>
+</template>
+
+<script lang="ts" setup>
+import { computed, onMounted, ref, watch } from 'vue'
+import {
+    getMatchOdds,
+    type WorldCupOddsPlatform,
+    type MatchOddsMatchItem,
+} from '@/api/match'
+import { getLocalMatchDate } from '@/utils/match-time'
+
+type PlatformOption = { key: string; label: string }
+
+const props = withDefaults(defineProps<{
+    homeTeam?: string
+    awayTeam?: string
+    matchTime?: number | string
+    competitionId?: number | string
+    leagueName?: string
+}>(), {
+    homeTeam: '',
+    awayTeam: '',
+    matchTime: 0,
+    competitionId: 0,
+    leagueName: '',
+})
+
+const defaultPlatformOptions: PlatformOption[] = [
+    { key: '', label: '全部平台' },
+    { key: 'hg', label: '滚球' },
+    { key: 'titan007', label: '球探' },
+]
+
+const oddsList = ref<MatchOddsMatchItem[]>([])
+const platformOptions = ref<PlatformOption[]>([...defaultPlatformOptions])
+const sourceSite = ref('')
+const loading = ref(false)
+const loaded = ref(false)
+const requestSeq = ref(0)
+
+const platforms = computed<WorldCupOddsPlatform[]>(() => {
+    const result: WorldCupOddsPlatform[] = []
+    const seen = new Set<string>()
+    oddsList.value.forEach((match) => {
+        const matchPlatforms = match.platforms || []
+        matchPlatforms.forEach((platform) => {
+            const key = `${platform.platform_key}-${platform.source_match_id || ''}`
+            if (seen.has(key)) return
+            seen.add(key)
+            result.push(platform)
+        })
+    })
+    return result
+})
+
+const matchDate = computed(() => {
+    const date = getLocalMatchDate(props.matchTime, {
+        competition_id: props.competitionId,
+        league_name: props.leagueName,
+    })
+    if (!date) return ''
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    return `${year}-${month}-${day}`
+})
+
+const mergePlatformOptions = (options: unknown) => {
+    const map = new Map<string, PlatformOption>()
+    defaultPlatformOptions.forEach((item) => map.set(item.key, item))
+    if (Array.isArray(options)) {
+        options.forEach((item: any) => {
+            const key = String(item?.key || '').trim()
+            const label = String(item?.label || '').trim()
+            if (key && label) map.set(key, { key, label })
+        })
+    }
+    platformOptions.value = Array.from(map.values())
+}
+
+const fetchOdds = async (force = false) => {
+    if (!force && (loaded.value || loading.value)) return
+    if (!props.homeTeam.trim() || !props.awayTeam.trim() || !matchDate.value) {
+        oddsList.value = []
+        loaded.value = true
+        return
+    }
+
+    const seq = requestSeq.value + 1
+    requestSeq.value = seq
+    loading.value = true
+    try {
+        const data = await getMatchOdds({
+            home_team: props.homeTeam.trim(),
+            away_team: props.awayTeam.trim(),
+            match_date: matchDate.value,
+            source_site: sourceSite.value || undefined,
+            limit: 120,
+        })
+        if (seq !== requestSeq.value) return
+        oddsList.value = Array.isArray(data?.list) ? data.list : []
+        mergePlatformOptions(data?.platform_options)
+        loaded.value = true
+    } catch (error) {
+        if (seq !== requestSeq.value) return
+        console.error('获取比赛赔率失败', error)
+        oddsList.value = []
+    } finally {
+        if (seq === requestSeq.value) loading.value = false
+    }
+}
+
+const switchPlatform = (platformKey: string) => {
+    if (sourceSite.value === platformKey) return
+    sourceSite.value = platformKey
+    loaded.value = false
+    void fetchOdds(true)
+}
+
+const formatUpdateTime = (timestamp?: number) => {
+    const value = Number(timestamp || 0)
+    if (!value) return ''
+    const date = new Date(value * 1000)
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    const hour = String(date.getHours()).padStart(2, '0')
+    const minute = String(date.getMinutes()).padStart(2, '0')
+    return `${month}-${day} ${hour}:${minute}`
+}
+
+watch(
+    () => [props.homeTeam, props.awayTeam, props.matchTime, props.competitionId, props.leagueName],
+    () => {
+        loaded.value = false
+        oddsList.value = []
+        void fetchOdds(true)
+    },
+)
+
+onMounted(() => {
+    void fetchOdds()
+})
+</script>
+
+<style lang="scss" scoped>
+.match-odds-detail {
+    min-height: 100%;
+    padding: 20rpx 24rpx 32rpx;
+    box-sizing: border-box;
+}
+
+.match-odds-detail__tabs {
+    width: 100%;
+    margin-bottom: 20rpx;
+    white-space: nowrap;
+}
+
+.match-odds-detail__tabs-inner {
+    display: inline-flex;
+    gap: 12rpx;
+}
+
+.match-odds-detail__tab {
+    min-width: 112rpx;
+    height: 58rpx;
+    padding: 0 22rpx;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    border: 1rpx solid #e2e8f0;
+    border-radius: 8rpx;
+    background: #ffffff;
+    color: #64748b;
+    font-size: 24rpx;
+}
+
+.match-odds-detail__tab--active {
+    border-color: #2563eb;
+    background: #2563eb;
+    color: #ffffff;
+    font-weight: 600;
+}
+
+.match-odds-detail__state {
+    min-height: 360rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 18rpx;
+    color: #94a3b8;
+    font-size: 24rpx;
+}
+
+.match-odds-detail__list {
+    display: flex;
+    flex-direction: column;
+    gap: 20rpx;
+}
+
+.match-odds-platform {
+    padding: 22rpx;
+    border: 1rpx solid #e2e8f0;
+    border-radius: 8rpx;
+    background: #ffffff;
+}
+
+.match-odds-platform__head,
+.match-odds-platform__name,
+.match-odds-market__title,
+.match-odds-market__values {
+    display: flex;
+    align-items: center;
+}
+
+.match-odds-platform__head {
+    justify-content: space-between;
+    gap: 16rpx;
+    margin-bottom: 18rpx;
+}
+
+.match-odds-platform__name {
+    min-width: 0;
+    gap: 12rpx;
+    color: #0f172a;
+    font-size: 28rpx;
+    font-weight: 700;
+}
+
+.match-odds-platform__tag {
+    padding: 4rpx 10rpx;
+    border-radius: 6rpx;
+    background: #eff6ff;
+    color: #2563eb;
+    font-size: 20rpx;
+    font-weight: 500;
+}
+
+.match-odds-platform__update {
+    flex-shrink: 0;
+    color: #94a3b8;
+    font-size: 20rpx;
+}
+
+.match-odds-market {
+    padding: 16rpx 0;
+    border-top: 1rpx solid #f1f5f9;
+}
+
+.match-odds-market__title {
+    justify-content: space-between;
+    margin-bottom: 12rpx;
+    color: #334155;
+    font-size: 24rpx;
+    font-weight: 600;
+}
+
+.match-odds-market__line {
+    color: #2563eb;
+    font-size: 22rpx;
+}
+
+.match-odds-market__values {
+    gap: 12rpx;
+}
+
+.match-odds-value {
+    flex: 1;
+    min-width: 0;
+    min-height: 86rpx;
+    padding: 12rpx 8rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 6rpx;
+    box-sizing: border-box;
+    border-radius: 6rpx;
+    background: #f8fafc;
+}
+
+.match-odds-value__label {
+    color: #64748b;
+    font-size: 21rpx;
+}
+
+.match-odds-value__number {
+    color: #0f172a;
+    font-size: 27rpx;
+    font-weight: 700;
+}
+</style>

uniapp/src/packages_match/components/MatchCenterTabsPanel.vue

@@ -248,11 +248,14 @@ type MatchCenterTab = 'schedule' | 'live' | 'odds'
 type OddsShowType = '' | 'live' | 'today' | 'early'
 type OddsPlatformOption = { key: string; label: string }
 
-const contentTabs: { key: MatchCenterTab; label: string }[] = [
+const showStandaloneOddsTab = false
+
+const allContentTabs: { key: MatchCenterTab; label: string }[] = [
     { key: 'schedule', label: '赛程' },
     { key: 'live', label: '直播' },
     { key: 'odds', label: '赔率' },
 ]
+const contentTabs = allContentTabs.filter((item) => showStandaloneOddsTab || item.key !== 'odds')
 
 const oddsShowTypeOptions: { key: OddsShowType; label: string }[] = [
     { key: '', label: '全部盘口' },

uniapp/src/packages_match/components/WorldCupPanel.vue

@@ -381,7 +381,9 @@ const emit = defineEmits<{
     (e: 'back'): void
 }>()
 
-const tabs: { key: MainTab; label: string }[] = [
+const showStandaloneOddsTab = false
+
+const allTabs: { key: MainTab; label: string }[] = [
     { key: 'live', label: '直播' },
     { key: 'schedule', label: '比分和赛程' },
     { key: 'odds', label: '赔率' },
@@ -389,6 +391,7 @@ const tabs: { key: MainTab; label: string }[] = [
     { key: 'bracket', label: '对阵图' },
     { key: 'news', label: '新闻' }
 ]
+const tabs = allTabs.filter((item) => showStandaloneOddsTab || item.key !== 'odds')
 
 const oddsShowTypeOptions: { key: OddsShowType; label: string }[] = [
     { key: '', label: '全部盘口' },
@@ -1042,8 +1045,10 @@ const initViewState = async () => {
         activeTab.value = 'live'
     } else if (legacyTab === 'schedule') {
         activeTab.value = 'schedule'
-    } else if (legacyTab === 'odds') {
+    } else if (legacyTab === 'odds' && showStandaloneOddsTab) {
         activeTab.value = 'odds'
+    } else if (legacyTab === 'odds') {
+        activeTab.value = 'schedule'
     } else if (legacyTab === 'rank' || legacyTab === 'standings') {
         activeTab.value = 'rank'
         rankingMode.value = 'standings'

uniapp/src/pages/match_detail/match_detail.vue

@@ -177,7 +177,7 @@
                 <!-- ====== 比赛数据 ====== -->
                 <scroll-view v-if="activeTab === 'data'" scroll-y class="detail-tab-scroll">
                     <!-- 赔率 -->
-                    <view class="tab-card" v-if="match.home_odds > 0">
+                    <view class="tab-card" v-if="showLegacyMatchOdds && match.home_odds > 0">
                         <view class="tab-card__title"><text>赔率信息</text></view>
                         <view class="match-odds">
                             <view class="match-odds__item">
@@ -235,11 +235,18 @@
                             </view>
                         </view>
                     </view> -->
-                    <view v-if="match.status === 0 && !(match.home_odds > 0)" class="live-text__empty">
+                    <view v-if="match.status === 0" class="live-text__empty">
                         <text>比赛尚未开始</text>
                     </view>
                 </scroll-view>
 
+                <!-- ====== 赔率 ====== -->
+                <scroll-view v-if="activeTab === 'odds'" scroll-y class="detail-tab-scroll">
+                    <MatchOddsDetail :home-team="match.home_team" :away-team="match.away_team"
+                        :match-time="match.match_time" :competition-id="match.competition_id"
+                        :league-name="match.league_name" />
+                </scroll-view>
+
                 <!-- ====== 阵容 ====== -->
                 <scroll-view v-if="activeTab === 'lineup'" scroll-y class="detail-tab-scroll">
                     <view v-if="lineupList.length">
@@ -476,6 +483,7 @@
 <script lang="ts" setup>
 import { ref, computed, nextTick, onMounted, watch } from 'vue'
 import MatchDetailHeader from '@/components/match-detail-header/match-detail-header.vue'
+import MatchOddsDetail from '@/components/match-odds-detail/match-odds-detail.vue'
 import SharePopup from '@/components/share-popup/share-popup.vue'
 import GlobalPopup from '@/components/global-popup/global-popup.vue'
 import { onLoad, onUnload } from '@dcloudio/uni-app'
@@ -540,10 +548,12 @@ const liveSourceText = computed(() => {
 const tabList = [
     { key: 'live', label: '文字直播' },
     { key: 'data', label: '比赛数据' },
+    { key: 'odds', label: '赔率' },
     { key: 'lineup', label: '阵容' },
     { key: 'recent', label: '近期战绩' },
     { key: 'ai', label: 'AI分析' },
 ]
+const showLegacyMatchOdds = false
 const activeTab = ref('live')
 const lineupList = ref<any[]>([])
 const homeStarters = computed(() => lineupList.value.filter((p: any) => p.team_side === 1 && p.is_starter === 1))