+
@@ -192,6 +208,10 @@ function openSlip() {
padding: 0 12px 16px;
}
+.parlay-panel.has-fixed-foot {
+ padding-bottom: 100px;
+}
+
.panel-head {
background: #141414;
border: 1px solid #2a2a2a;
@@ -231,15 +251,45 @@ function openSlip() {
margin-bottom: 10px;
}
-.slip-link {
- padding: 6px 12px;
- border-radius: 6px;
- font-size: 12px;
+.parlay-foot-fixed {
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: calc(50px + env(safe-area-inset-bottom, 0px));
+ z-index: 95;
+ padding: 10px 12px 10px;
+ background: rgba(14, 14, 14, 0.98);
+ border-top: 1px solid var(--border-gold-soft);
+ box-shadow: 0 -6px 20px rgba(0, 0, 0, 0.45);
}
-.slip-count {
- margin-left: 4px;
+.foot-hint,
+.foot-meta {
+ margin: 0 0 8px;
+ font-size: 11px;
+ color: var(--text-muted);
+ text-align: center;
+}
+
+.foot-meta {
color: var(--primary-light);
+ font-weight: 600;
+}
+
+.market-foot-btn {
+ display: block;
+ width: 100%;
+ padding: 9px;
+ border-radius: 4px;
+ border: 1px solid var(--border-gold-soft);
+ background: rgba(212, 175, 55, 0.1);
+ color: var(--primary-light);
+ font-size: 13px;
+ font-weight: 800;
+}
+
+.market-foot-btn:disabled {
+ opacity: 0.45;
}
.toolbar {
diff --git a/apps/player/src/main.ts b/apps/player/src/main.ts
index b6043ee..d8c73be 100644
--- a/apps/player/src/main.ts
+++ b/apps/player/src/main.ts
@@ -61,6 +61,11 @@ const i18n = createI18n({
outright_success: '下注成功',
outright_done: '完毕',
outright_bet_failed: '下注失败',
+ outright_insufficient: '余额不足',
+ stake_label: '投注金额',
+ stake_placeholder: '输入金额',
+ stake_max: '全部',
+ placing: '提交中…',
no_outright: '暂无冠军盘口',
cancel: '取消',
parlay_title: '串关投注',
@@ -90,8 +95,43 @@ const i18n = createI18n({
col_draw: '平',
col_away: '客场',
cs_stake_required: '请至少在一个比分输入投注金额',
+ cs_confirm_title: '确认波胆下注',
+ cs_confirm_count: '共 {n} 注',
+ cs_confirm_total_stake: '总投注额',
cs_place_success: '下注成功',
cs_place_failed: '下注失败',
+ guide_title: '怎么下注？',
+ guide_help_aria: '查看下注说明',
+ guide_got_it: '知道了',
+ guide_flow_normal: '让球 / 大小 / 独赢等',
+ guide_normal_1: '点「展开玩法」打开赔率',
+ guide_normal_2: '点一项赔率选中（金边），再点同一项可取消',
+ guide_normal_3: '选中后在当前玩法底部点「确认下单」填金额并提交',
+ guide_flow_cs: '波胆（猜比分）',
+ guide_cs_1: '点「展开玩法」在表格里填各比分金额',
+ guide_cs_2: '填好金额后点该玩法底部「确认下单」，核对后提交',
+ guide_cs_3: '可一次填多个比分，会拆成多笔注单',
+ mode_cs_tag: '本页直接下注',
+ mode_slip_tag: '加入投注单',
+ cs_confirm_btn: '确认下注',
+ cs_confirm_cell: '确认下单',
+ cs_panel_hint: '在下方表格填写金额，填好后点上方「确认下注」',
+ slip_panel_hint: '点赔率加入投注单，选好后用页面底部入口打开投注单',
+ slip_pick_hint: '点选项加入投注单；金边表示已选，再点一次可取消',
+ picked_tag: '已选',
+ pick_added: '已加入投注单',
+ pick_removed: '已从投注单移除',
+ slip_bar_ready: '已选一项',
+ slip_bar_go: '投注单',
+ cs_top_hint: '① 在比分格填金额 ② 点上方「确认下注」',
+ slip_empty_hint: '点击赔率加入投注单',
+ slip_remove: '移除',
+ slip_singles_hint: '共 {n} 笔单关（串关请用「串关投注」页）',
+ slip_stake_per_bet: '每笔投注金额',
+ slip_est_return: '预计总返还',
+ slip_parlay_odds: '组合赔率 {odds}',
+ place_success: '下注成功',
+ place_failed: '下注失败',
},
profile: {
edit: '修改资料',
@@ -168,6 +208,11 @@ const i18n = createI18n({
outright_success: 'Bet placed',
outright_done: 'Done',
outright_bet_failed: 'Bet failed',
+ outright_insufficient: 'Insufficient balance',
+ stake_label: 'Stake',
+ stake_placeholder: 'Enter amount',
+ stake_max: 'Max',
+ placing: 'Placing…',
no_outright: 'No outright markets',
cancel: 'Cancel',
parlay_title: 'Parlay',
@@ -197,8 +242,43 @@ const i18n = createI18n({
col_draw: 'Draw',
col_away: 'Away',
cs_stake_required: 'Enter stake on at least one score',
+ cs_confirm_title: 'Confirm correct score bets',
+ cs_confirm_count: '{n} bet(s)',
+ cs_confirm_total_stake: 'Total stake',
cs_place_success: 'Bet placed',
cs_place_failed: 'Bet failed',
+ guide_title: 'How to bet',
+ guide_help_aria: 'Betting help',
+ guide_got_it: 'Got it',
+ guide_flow_normal: 'Handicap / O-U / 1X2 etc.',
+ guide_normal_1: 'Tap Expand to show odds',
+ guide_normal_2: 'Tap one odds to select (gold border); tap again to cancel',
+ guide_normal_3: 'Tap Place order under that market, enter stake and confirm',
+ guide_flow_cs: 'Correct score',
+ guide_cs_1: 'Expand and enter stake on each score',
+ guide_cs_2: 'Enter stakes, then tap Place order at the bottom of that market',
+ guide_cs_3: 'Multiple scores = multiple bets',
+ mode_cs_tag: 'Bet here',
+ mode_slip_tag: 'Add to slip',
+ cs_confirm_btn: 'Confirm bet',
+ cs_confirm_cell: 'Place order',
+ cs_panel_hint: 'Enter stakes below, then tap Confirm bet above',
+ slip_panel_hint: 'Tap odds to add; use the bottom bar when done',
+ slip_pick_hint: 'Tap to add/remove from slip; gold border = selected',
+ picked_tag: 'Selected',
+ pick_added: 'Added to bet slip',
+ pick_removed: 'Removed from bet slip',
+ slip_bar_ready: '1 selection',
+ slip_bar_go: 'Bet slip',
+ cs_top_hint: '① Enter stake ② Tap Confirm bet above',
+ slip_empty_hint: 'Tap odds to add to bet slip',
+ slip_remove: 'Remove',
+ slip_singles_hint: '{n} single bet(s). Use Parlay tab for parlays.',
+ slip_stake_per_bet: 'Stake per bet',
+ slip_est_return: 'Est. total return',
+ slip_parlay_odds: 'Combined odds {odds}',
+ place_success: 'Bet placed',
+ place_failed: 'Bet failed',
},
profile: {
edit: 'Edit Profile',
@@ -281,6 +361,11 @@ const i18n = createI18n({
outright_success: 'Pertaruhan berjaya',
outright_done: 'Selesai',
outright_bet_failed: 'Pertaruhan gagal',
+ outright_insufficient: 'Baki tidak mencukupi',
+ stake_label: 'Jumlah',
+ stake_placeholder: 'Masukkan jumlah',
+ stake_max: 'Maks',
+ placing: 'Memproses…',
no_outright: 'Tiada pasaran juara',
cancel: 'Batal',
parlay_title: 'Pertaruhan Berganda',
@@ -310,8 +395,43 @@ const i18n = createI18n({
col_draw: 'Seri',
col_away: 'Away',
cs_stake_required: 'Masukkan jumlah pada sekurang-kurangnya satu skor',
+ cs_confirm_title: 'Sahkan pertaruhan skor tepat',
+ cs_confirm_count: '{n} pertaruhan',
+ cs_confirm_total_stake: 'Jumlah pertaruhan',
cs_place_success: 'Pertaruhan berjaya',
cs_place_failed: 'Pertaruhan gagal',
+ guide_title: 'Cara pertaruhan',
+ guide_help_aria: 'Bantuan pertaruhan',
+ guide_got_it: 'Faham',
+ guide_flow_normal: 'Handicap / O-U / 1X2',
+ guide_normal_1: 'Ketik Kembang untuk lihat odds',
+ guide_normal_2: 'Pilih satu odds (sisi emas); ketik lagi untuk batal',
+ guide_normal_3: 'Ketik Sahkan pesanan di bawah pasaran, isi jumlah dan sahkan',
+ guide_flow_cs: 'Skor tepat',
+ guide_cs_1: 'Kembang dan isi jumlah setiap skor',
+ guide_cs_2: 'Isi jumlah, kemudian Sahkan pesanan di bawah pasaran itu',
+ guide_cs_3: 'Beberapa skor = beberapa pertaruhan',
+ mode_cs_tag: 'Pertaruhan di sini',
+ mode_slip_tag: 'Tambah ke slip',
+ cs_confirm_btn: 'Sahkan pertaruhan',
+ cs_confirm_cell: 'Sahkan pesanan',
+ cs_panel_hint: 'Isi jumlah di bawah, kemudian Sahkan di atas',
+ slip_panel_hint: 'Ketik odds; guna bar bawah apabila siap',
+ slip_pick_hint: 'Ketik untuk tambah/buang; sisi emas = dipilih',
+ picked_tag: 'Dipilih',
+ pick_added: 'Ditambah ke slip',
+ pick_removed: 'Dikeluarkan dari slip',
+ slip_bar_ready: '1 pilihan',
+ slip_bar_go: 'Buka slip',
+ cs_top_hint: '① Isi jumlah ② Ketik Sahkan di atas',
+ slip_empty_hint: 'Ketik odds untuk tambah ke slip',
+ slip_remove: 'Buang',
+ slip_singles_hint: '{n} pertaruhan tunggal. Guna tab Berganda untuk parlay.',
+ slip_stake_per_bet: 'Jumlah setiap pertaruhan',
+ slip_est_return: 'Anggaran pulangan',
+ slip_parlay_odds: 'Odds gabungan {odds}',
+ place_success: 'Pertaruhan berjaya',
+ place_failed: 'Pertaruhan gagal',
},
profile: {
edit: 'Edit Profil',
diff --git a/apps/player/src/stores/betSlip.ts b/apps/player/src/stores/betSlip.ts
index 872e9b3..f3c0f29 100644
--- a/apps/player/src/stores/betSlip.ts
+++ b/apps/player/src/stores/betSlip.ts
@@ -17,37 +17,40 @@ export const useBetSlipStore = defineStore('betSlip', () => {
const mode = ref<'single' | 'parlay'>('single');
const count = computed(() => items.value.length);
- const isParlay = computed(() => items.value.length >= 2);
+ const isParlay = computed(() => mode.value === 'parlay' && items.value.length >= 2);
+ /** 球赛/详情页：仅单关，且投注单同时只能有 1 项 */
function addItem(item: SlipItem) {
+ if (mode.value === 'parlay') items.value = [];
+ mode.value = 'single';
+
const existing = items.value.findIndex(
(i) => i.selectionId === item.selectionId,
);
if (existing >= 0) {
- items.value.splice(existing, 1);
- if (items.value.length < 2) mode.value = 'single';
+ items.value = [];
return;
}
- items.value.push(item);
- if (items.value.length >= 2) mode.value = 'parlay';
+ items.value = [item];
}
- /** 串关：同场只保留一个选项；再次点击已选项则取消 */
+ /** 串关页专用：跨场组合，同场只保留一个选项 */
function addParlayLeg(item: SlipItem) {
+ if (mode.value === 'single') items.value = [];
+ mode.value = 'parlay';
+
const samePick = items.value.findIndex((i) => i.selectionId === item.selectionId);
if (samePick >= 0) {
items.value.splice(samePick, 1);
- if (items.value.length < 2) mode.value = 'single';
return;
}
items.value = items.value.filter((i) => i.matchId !== item.matchId);
items.value.push(item);
- mode.value = items.value.length >= 2 ? 'parlay' : 'single';
}
function removeItem(selectionId: string) {
items.value = items.value.filter((i) => i.selectionId !== selectionId);
- if (items.value.length < 2) mode.value = 'single';
+ if (!items.value.length) mode.value = 'single';
}
function clear() {
@@ -59,13 +62,13 @@ export const useBetSlipStore = defineStore('betSlip', () => {
items.value.reduce((acc, i) => acc * i.odds, 1),
);
- const potentialReturn = computed(() =>
- mode.value === 'parlay'
- ? stake.value * totalOdds.value
- : items.value.length === 1
- ? stake.value * items.value[0].odds
- : 0,
- );
+ const potentialReturn = computed(() => {
+ if (!items.value.length) return 0;
+ if (mode.value === 'parlay' && items.value.length >= 2) {
+ return stake.value * totalOdds.value;
+ }
+ return stake.value * items.value[0].odds;
+ });
const hasSameMatch = computed(() => {
const matchIds = items.value.map((i) => i.matchId);
diff --git a/apps/player/src/utils/marketCatalog.ts b/apps/player/src/utils/marketCatalog.ts
index cb2061c..1e9d386 100644
--- a/apps/player/src/utils/marketCatalog.ts
+++ b/apps/player/src/utils/marketCatalog.ts
@@ -5,6 +5,18 @@ export const FEATURED_MARKET_TYPES = [
'SH_CORRECT_SCORE',
] as const;
+/** 详情页统一列表顺序：波胆在前，其余玩法在后 */
+export const DETAIL_MARKET_TYPES = [
+ ...FEATURED_MARKET_TYPES,
+ 'FT_HANDICAP',
+ 'FT_OVER_UNDER',
+ 'FT_1X2',
+ 'FT_ODD_EVEN',
+ 'HT_HANDICAP',
+ 'HT_OVER_UNDER',
+ 'HT_1X2',
+] as const;
+
export const GRID_MARKET_TYPES = [
'FT_HANDICAP',
'FT_OVER_UNDER',
diff --git a/apps/player/src/views/MatchDetailView.vue b/apps/player/src/views/MatchDetailView.vue
index 5d2f67d..d26e6eb 100644
--- a/apps/player/src/views/MatchDetailView.vue
+++ b/apps/player/src/views/MatchDetailView.vue
@@ -5,16 +5,15 @@ import { useI18n } from 'vue-i18n';
import api from '../api';
import { useBetSlipStore } from '../stores/betSlip';
import { teamFlagUrl } from '../utils/teamFlag';
-import {
- FEATURED_MARKET_TYPES,
- GRID_MARKET_TYPES,
- MARKET_I18N_KEY,
-} from '../utils/marketCatalog';
-import FeaturedMarketRow from '../components/match-detail/FeaturedMarketRow.vue';
+import { DETAIL_MARKET_TYPES, MARKET_I18N_KEY } from '../utils/marketCatalog';
+import MatchBetGuide from '../components/match-detail/MatchBetGuide.vue';
import MarketTypeTile from '../components/match-detail/MarketTypeTile.vue';
import MarketSelectionsPanel from '../components/match-detail/MarketSelectionsPanel.vue';
import CorrectScorePanel from '../components/match-detail/CorrectScorePanel.vue';
-import { isCorrectScoreMarket } from '../utils/correctScoreLayout';
+import CorrectScoreConfirmModal, {
+ type CsConfirmLine,
+} from '../components/match-detail/CorrectScoreConfirmModal.vue';
+import { isCorrectScoreMarket, parseScoreCode } from '../utils/correctScoreLayout';
const route = useRoute();
const router = useRouter();
@@ -53,7 +52,8 @@ const expandedKey = ref
(null);
const correctScoreStakes = ref>({});
const placingCs = ref(false);
const csMessage = ref('');
-
+const csConfirmOpen = ref(false);
+const csConfirmMarketType = ref(null);
const marketsByType = computed(() => {
const map = new Map();
for (const m of match.value?.markets ?? []) {
@@ -103,27 +103,57 @@ function closeMarket() {
expandedKey.value = null;
}
-function clearMarketSlip(marketType: string) {
- if (!match.value) return;
- const toRemove = slip.items.filter(
- (i) => i.matchId === match.value!.id && i.marketType === marketType,
- );
- for (const item of toRemove) slip.removeItem(item.selectionId);
- if (isCorrectScoreMarket(marketType)) {
- const market = marketsByType.value.get(marketType);
- if (market) {
- const next = { ...correctScoreStakes.value };
- for (const s of market.selections) delete next[s.id];
- correctScoreStakes.value = next;
- }
- }
- if (expandedKey.value === expandKey(marketType)) expandedKey.value = null;
+function toggleMarket(marketType: string) {
+ if (!marketsByType.value.has(marketType)) return;
+ if (isExpanded(marketType)) closeMarket();
+ else openMarket(marketType);
}
function genRequestId() {
return `${Date.now()}-${Math.random().toString(36).slice(2)}`;
}
+const csConfirmLines = computed((): CsConfirmLine[] => {
+ const marketType = csConfirmMarketType.value;
+ if (!marketType) return [];
+ const market = marketsByType.value.get(marketType);
+ if (!market) return [];
+ return market.selections
+ .filter((s) => (correctScoreStakes.value[s.id] ?? 0) > 0)
+ .map((s) => {
+ const parsed = parseScoreCode(s.selectionCode);
+ return {
+ scoreDisplay: parsed?.display ?? s.selectionName,
+ odds: s.odds,
+ stake: correctScoreStakes.value[s.id],
+ };
+ });
+});
+
+function openCorrectScoreConfirm(marketType: string) {
+ const market = marketsByType.value.get(marketType);
+ if (!market || !match.value) return;
+ const hasStake = market.selections.some((s) => (correctScoreStakes.value[s.id] ?? 0) > 0);
+ if (!hasStake) {
+ csMessage.value = t('bet.cs_stake_required');
+ return;
+ }
+ csMessage.value = '';
+ csConfirmMarketType.value = marketType;
+ csConfirmOpen.value = true;
+}
+
+function closeCorrectScoreConfirm() {
+ csConfirmOpen.value = false;
+}
+
+async function confirmCorrectScoreBets() {
+ const marketType = csConfirmMarketType.value;
+ if (!marketType) return;
+ csConfirmOpen.value = false;
+ await placeCorrectScoreBets(marketType);
+}
+
async function placeCorrectScoreBets(marketType: string) {
const market = marketsByType.value.get(marketType);
if (!market || !match.value) return;
@@ -188,20 +218,37 @@ function toggleSelection(sel: Selection, market: Market) {
function onPickSelection(selId: string, marketType: string) {
const market = marketsByType.value.get(marketType);
const sel = market?.selections.find((s) => s.id === selId);
- if (market && sel) toggleSelection(sel, market);
+ if (!market || !sel) return;
+ toggleSelection(sel, market);
+}
+
+function openBetSlipDrawer() {
+ slip.openDrawer();
+}
+
+/** 当前玩法是否已选入投注单（单关、仅一项） */
+function hasSlipPickForMarket(marketType: string) {
+ if (!match.value || slip.mode !== 'single' || slip.items.length !== 1) return false;
+ const item = slip.items[0];
+ return item.matchId === match.value.id && item.marketType === marketType;
}