feat(admin,api,player): 赛事分组管理、盘口独立页与多语言展示优化

- 管理端按联赛展示单场，新增赛事/单场流程与列表展开状态保持

- 盘口赔率迁至独立页面，保存按钮仅在有修改时高亮

- API 新增联赛列表与子场查询，按 locale 返回队名并修复编译

- 波胆其它选项与促销标签等 i18n 补齐，文案更易懂

apps/admin/src/views/Matches.vue

@@ -1,46 +1,70 @@
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue';
-import { useRouter } from 'vue-router';
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
 import { useAdminLocale } from '../composables/useAdminLocale';
 import { resolveFormError } from '../i18n/form-validation';
 import api from '../api';
-
-import { ElMessage, ElMessageBox } from 'element-plus';
-
-const { t } = useAdminLocale();
+import { ElMessage } from 'element-plus';
+import LeagueMatchesPanel from './matches/LeagueMatchesPanel.vue';
+import {
+  readMatchesListUiState,
+  writeMatchesListUiState,
+} from '../utils/matchesListState.ts';
 import {
   emptyMatchForm,
   buildPlatformPayload,
-  formFromDetail,
   type MatchCreateForm,
-  type AdminMatchDetail,
 } from './match-form.ts';
 
-const router = useRouter();
-const matches = ref<unknown[]>([]);
+const { t } = useAdminLocale();
+const leagues = ref<unknown[]>([]);
 const total = ref(0);
 const page = ref(1);
 const pageSize = ref(10);
 const filterStatus = ref('');
 const keyword = ref('');
+const expandedRowKeys = ref<string[]>([]);
+
+const createLeagueVisible = ref(false);
+const createLeagueLoading = ref(false);
+const leagueForm = ref({ leagueEn: '', leagueZh: '', leagueMs: '', logoUrl: '' });
 
 const createVisible = ref(false);
-const editVisible = ref(false);
 const importVisible = ref(false);
 const createLoading = ref(false);
-const editLoading = ref(false);
 const importLoading = ref(false);
 const importJson = ref('');
 const form = ref<MatchCreateForm>(emptyMatchForm());
-const editingId = ref('');
-const editingStatus = ref('');
+const createUnderLeagueLabel = ref('');
 
-const isEditPublished = computed(() => editingStatus.value === 'PUBLISHED');
+const isFixtureCreate = computed(() => !!form.value.leagueId.trim());
 
-onMounted(load);
+function persistListUiState() {
+  writeMatchesListUiState({
+    expandedLeagueIds: [...expandedRowKeys.value],
+    page: page.value,
+    pageSize: pageSize.value,
+    filterStatus: filterStatus.value,
+    keyword: keyword.value,
+  });
+}
 
-async function load() {
-  const { data } = await api.get('/admin/matches', {
+function applyExpandedFromSaved(savedIds: string[]) {
+  const allowed = new Set(leagues.value.map((row) => leagueId(row)));
+  expandedRowKeys.value = savedIds.filter((id) => allowed.has(id));
+}
+
+type LoadOptions = { restoreExpand?: boolean; keepExpand?: boolean };
+
+async function load(options: LoadOptions = {}) {
+  const saved = options.restoreExpand ? readMatchesListUiState() : null;
+  if (saved) {
+    page.value = saved.page;
+    pageSize.value = saved.pageSize;
+    filterStatus.value = saved.filterStatus;
+    keyword.value = saved.keyword;
+  }
+
+  const { data } = await api.get('/admin/leagues', {
     params: {
       page: page.value,
       pageSize: pageSize.value,
@@ -48,24 +72,77 @@ async function load() {
       keyword: keyword.value.trim() || undefined,
     },
   });
-  matches.value = data.data.items;
+  leagues.value = data.data.items;
   total.value = data.data.total;
+
+  if (options.restoreExpand && saved) {
+    applyExpandedFromSaved(saved.expandedLeagueIds);
+  } else if (!options.keepExpand) {
+    expandedRowKeys.value = [];
+  } else {
+    applyExpandedFromSaved(expandedRowKeys.value);
+  }
+  persistListUiState();
 }
 
+function onSearch() {
+  page.value = 1;
+  expandedRowKeys.value = [];
+  load();
+}
+
+onMounted(() => load({ restoreExpand: true }));
+onBeforeUnmount(persistListUiState);
+
 function onPageChange(p: number) {
   page.value = p;
-  load();
+  load({ keepExpand: true });
 }
 
 function onSizeChange(size: number) {
   pageSize.value = size;
   page.value = 1;
-  load();
+  load({ keepExpand: true });
 }
 
-function openCreate() {
+function openCreateLeague() {
+  leagueForm.value = { leagueEn: '', leagueZh: '', leagueMs: '', logoUrl: '' };
+  createLeagueVisible.value = true;
+}
+
+async function submitCreateLeague() {
+  const { leagueEn, leagueZh, leagueMs, logoUrl } = leagueForm.value;
+  if (!leagueZh.trim() && !leagueEn.trim()) {
+    ElMessage.warning(t('err.league_required'));
+    return;
+  }
+  createLeagueLoading.value = true;
+  try {
+    await api.post('/admin/leagues', {
+      leagueEn: leagueEn.trim(),
+      leagueZh: leagueZh.trim(),
+      leagueMs: leagueMs.trim() || undefined,
+      logoUrl: logoUrl.trim() || undefined,
+    });
+    ElMessage.success(t('msg.league_created'));
+    createLeagueVisible.value = false;
+    load({ keepExpand: true });
+  } catch (e: unknown) {
+    const err = e as { response?: { data?: { error?: string } } };
+    ElMessage.error(err.response?.data?.error ?? t('msg.create_failed'));
+  } finally {
+    createLeagueLoading.value = false;
+  }
+}
+
+function openCreateFixture(leagueRow: unknown) {
+  const r = rowOf(leagueRow);
   form.value = emptyMatchForm();
-  editingId.value = '';
+  form.value.leagueId = String(r.id ?? '');
+  form.value.leagueEn = String(r.leagueEn ?? '');
+  form.value.leagueZh = String(r.leagueZh ?? '');
+  form.value.leagueMs = String(r.leagueMs ?? '');
+  createUnderLeagueLabel.value = leagueTitle(leagueRow);
   createVisible.value = true;
 }
 
@@ -74,24 +151,6 @@ function openImport() {
   importVisible.value = true;
 }
 
-async function openEdit(id: string) {
-  try {
-    const { data } = await api.get(`/admin/matches/${id}`);
-    const detail = data.data as AdminMatchDetail;
-    if (detail.isOutright) {
-      ElMessage.warning(t('msg.outright_no_edit'));
-      return;
-    }
-    editingId.value = id;
-    editingStatus.value = detail.status;
-    form.value = formFromDetail(detail);
-    editVisible.value = true;
-  } catch (e: unknown) {
-    const err = e as { response?: { data?: { error?: string } } };
-    ElMessage.error(err.response?.data?.error ?? t('msg.load_matches_failed'));
-  }
-}
-
 async function submitCreate() {
   let payload: ReturnType<typeof buildPlatformPayload>;
   try {
@@ -104,8 +163,14 @@ async function submitCreate() {
   try {
     await api.post('/admin/matches', payload);
     ElMessage.success(t('msg.match_created_draft'));
+    createUnderLeagueLabel.value = '';
     createVisible.value = false;
-    load();
+    const lid = form.value.leagueId.trim();
+    await load({ keepExpand: true });
+    if (lid && !expandedRowKeys.value.includes(lid)) {
+      expandedRowKeys.value = [...expandedRowKeys.value, lid];
+      persistListUiState();
+    }
   } catch (e: unknown) {
     const err = e as { response?: { data?: { error?: string } } };
     ElMessage.error(err.response?.data?.error ?? t('msg.create_failed'));
@@ -114,47 +179,6 @@ async function submitCreate() {
   }
 }
 
-async function submitEdit() {
-  let payload: ReturnType<typeof buildPlatformPayload>;
-  try {
-    payload = buildPlatformPayload(form.value);
-  } catch (e) {
-    ElMessage.warning(resolveFormError(e, t));
-    return;
-  }
-  editLoading.value = true;
-  try {
-    await api.put(`/admin/matches/${editingId.value}`, payload);
-    ElMessage.success(t('msg.saved'));
-    editVisible.value = false;
-    load();
-  } catch (e: unknown) {
-    const err = e as { response?: { data?: { error?: string } } };
-    ElMessage.error(err.response?.data?.error ?? t('msg.save_failed'));
-  } finally {
-    editLoading.value = false;
-  }
-}
-
-async function confirmDelete(row: unknown) {
-  const id = matchId(row);
-  const title = matchTitle(row);
-  try {
-    await ElMessageBox.confirm(t('match.delete_confirm_body', { title }), t('match.delete_confirm_title'), {
-      type: 'warning',
-      confirmButtonText: t('common.delete'),
-      cancelButtonText: t('common.cancel'),
-    });
-    await api.delete(`/admin/matches/${id}`);
-    ElMessage.success(t('msg.deleted'));
-    load();
-  } catch (e) {
-    if (e === 'cancel' || (e as { message?: string })?.message === 'cancel') return;
-    const err = e as { response?: { data?: { error?: string } } };
-    ElMessage.error(err.response?.data?.error ?? t('msg.delete_failed'));
-  }
-}
-
 async function submitImport() {
   let payload: unknown;
   try {
@@ -181,7 +205,7 @@ async function submitImport() {
       }),
     );
     importVisible.value = false;
-    load();
+    load({ keepExpand: true });
   } catch (e: unknown) {
     const err = e as { response?: { data?: { error?: string } } };
     ElMessage.error(err.response?.data?.error ?? t('msg.import_failed'));
@@ -190,91 +214,47 @@ async function submitImport() {
   }
 }
 
-async function publish(id: string) {
-  await api.post(`/admin/matches/${id}/publish`);
-  await api.post(`/admin/matches/${id}/markets/templates`, {
-    marketTypes: [
-      'FT_1X2',
-      'FT_HANDICAP',
-      'FT_OVER_UNDER',
-      'FT_ODD_EVEN',
-      'HT_1X2',
-      'HT_HANDICAP',
-      'HT_OVER_UNDER',
-      'FT_CORRECT_SCORE',
-      'HT_CORRECT_SCORE',
-      'SH_CORRECT_SCORE',
-    ],
-  });
-  ElMessage.success(t('msg.published'));
-  load();
+function onExpandChange(_row: unknown, expanded: unknown[]) {
+  expandedRowKeys.value = expanded.map((r) => leagueId(r));
+  persistListUiState();
 }
 
-async function close(id: string) {
-  await api.post(`/admin/matches/${id}/close`);
-  ElMessage.success(t('msg.closed'));
-  load();
+function onRowClick(row: unknown, _column: unknown, event: MouseEvent) {
+  if ((event.target as HTMLElement).closest('.el-table__expand-icon')) return;
+  const id = leagueId(row);
+  expandedRowKeys.value = expandedRowKeys.value.includes(id) ? [] : [id];
+  persistListUiState();
 }
 
-function settle(id: string) {
-  router.push(`/settlement/${id}`);
+function rowClassName() {
+  return 'row-expandable';
 }
 
-type TagType = '' | 'info' | 'success' | 'warning' | 'danger';
-function matchStatusText(status: string) {
-  const key = `match.status.${status}`;
-  const v = t(key);
-  return v !== key ? v : status;
-}
-const statusTagTypes: Record<string, TagType> = {
-  DRAFT: 'info',
-  PUBLISHED: 'warning',
-  CLOSED: 'danger',
-  SETTLED: 'success',
-};
-
 function rowOf(row: unknown) {
   return row as Record<string, unknown>;
 }
-function matchStatus(row: unknown) {
-  return String(rowOf(row).status ?? '');
-}
-function matchStatusLabel(row: unknown) {
-  return matchStatusText(matchStatus(row));
-}
-function matchStatusType(row: unknown): TagType {
-  return statusTagTypes[matchStatus(row)] ?? 'info';
-}
-function matchId(row: unknown) {
+function leagueId(row: unknown) {
   return String(rowOf(row).id ?? '');
 }
-function matchTime(row: unknown) {
-  return new Date(String(rowOf(row).startTime)).toLocaleString();
-}
-function matchTitle(row: unknown) {
+function leagueTitle(row: unknown) {
   const r = rowOf(row);
-  if (r.matchName) return String(r.matchName);
-  const home = (r.homeTeam as { code?: string })?.code ?? '';
-  const away = (r.awayTeam as { code?: string })?.code ?? '';
-  return home && away ? `${home} vs ${away}` : '—';
+  const zh = String(r.leagueZh ?? '').trim();
+  const en = String(r.leagueEn ?? '').trim();
+  return zh || en || String(r.code ?? '—');
 }
-function canEdit(row: unknown) {
-  const r = rowOf(row);
-  if (r.isOutright) return false;
-  return matchStatus(row) === 'DRAFT' || matchStatus(row) === 'PUBLISHED';
+function leagueMatchCount(row: unknown) {
+  return Number(rowOf(row).matchCount ?? 0);
 }
-function canDelete(row: unknown) {
-  const r = rowOf(row);
-  if (r.isOutright) return false;
-  return matchStatus(row) === 'DRAFT';
+function isLeagueExpanded(id: string) {
+  return expandedRowKeys.value.includes(id);
 }
 </script>
 
 <template>
-  <div class="admin-list-page">
+  <div class="admin-list-page matches-page">
   <div class="page-toolbar">
     <el-button @click="openImport">{{ t('common.import') }}</el-button>
-    <el-button type="primary" @click="openCreate">{{ t('match.create_btn') }}</el-button>
+    <el-button type="primary" @click="openCreateLeague">{{ t('match.create_btn') }}</el-button>
   </div>
 
   <el-card class="filter-card" shadow="never">
@@ -297,67 +277,54 @@ function canDelete(row: unknown) {
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="load">{{ t('common.search') }}</el-button>
+        <el-button type="primary" @click="onSearch">{{ t('common.search') }}</el-button>
       </el-form-item>
     </el-form>
   </el-card>
 
   <el-card class="data-card" shadow="never">
+    <p class="table-hint">{{ t('match.expand_league_hint') }}</p>
     <div class="table-wrap">
-    <el-table :data="matches" stripe>
+    <el-table
+      :data="leagues"
+      stripe
+      row-key="id"
+      :expand-row-keys="expandedRowKeys"
+      :row-class-name="rowClassName"
+      @expand-change="onExpandChange"
+      @row-click="onRowClick"
+    >
+      <el-table-column type="expand" width="40">
+        <template #default="{ row }">
+          <LeagueMatchesPanel
+            v-if="isLeagueExpanded(leagueId(row))"
+            :league-id="leagueId(row)"
+            :filter-status="filterStatus"
+            :keyword="keyword"
+            @changed="() => load({ keepExpand: true })"
+            @add-match="openCreateFixture(row)"
+          />
+        </template>
+      </el-table-column>
       <el-table-column prop="id" label="ID" width="72" />
-      <el-table-column :label="t('match.col.matchup')" min-width="200">
-        <template #default="{ row }">{{ matchTitle(row) }}</template>
-      </el-table-column>
-      <el-table-column :label="t('common.status')" width="96">
+      <el-table-column :label="t('match.col.league')" min-width="220">
         <template #default="{ row }">
-          <el-tag :type="matchStatusType(row)" size="small">{{ matchStatusLabel(row) }}</el-tag>
+          <div class="league-cell">
+            <img
+              v-if="rowOf(row).logoUrl"
+              :src="String(rowOf(row).logoUrl)"
+              alt=""
+              class="league-logo"
+            />
+            <span class="matchup-link">{{ leagueTitle(row) }}</span>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column :label="t('match.col.kickoff')" min-width="160">
-        <template #default="{ row }">{{ matchTime(row) }}</template>
+      <el-table-column :label="t('match.col.fixture_count')" width="100" align="center">
+        <template #default="{ row }">{{ leagueMatchCount(row) }}</template>
       </el-table-column>
-      <el-table-column :label="t('common.actions')" width="340" align="center" fixed="right">
-        <template #default="{ row }">
-          <el-button
-            v-if="canEdit(row)"
-            size="small"
-            plain
-            @click="openEdit(matchId(row))"
-          >
-            {{ t('common.edit') }}
-          </el-button>
-          <el-button
-            v-if="canDelete(row)"
-            size="small"
-            type="danger"
-            plain
-            @click="confirmDelete(row)"
-          >
-            {{ t('common.delete') }}
-          </el-button>
-          <el-button
-            v-if="matchStatus(row) === 'DRAFT'"
-            size="small"
-            type="primary"
-            plain
-            @click="publish(matchId(row))"
-          >
-            {{ t('common.publish') }}
-          </el-button>
-          <el-button
-            v-if="matchStatus(row) === 'PUBLISHED'"
-            size="small"
-            type="danger"
-            plain
-            @click="close(matchId(row))"
-          >
-            {{ t('common.close_betting') }}
-          </el-button>
-          <el-button size="small" type="warning" plain @click="settle(matchId(row))">
-            {{ t('common.settle') }}
-          </el-button>
-        </template>
+      <el-table-column :label="t('match.col.league_code')" width="120">
+        <template #default="{ row }">{{ rowOf(row).code }}</template>
       </el-table-column>
     </el-table>
     </div>
@@ -375,16 +342,56 @@ function canDelete(row: unknown) {
     </div>
   </el-card>
 
-  <el-dialog v-model="createVisible" :title="t('match.dialog.create')" width="520px" destroy-on-close>
+  <el-dialog v-model="createLeagueVisible" :title="t('match.dialog.create_league')" width="520px" destroy-on-close>
     <el-form label-width="96px">
-      <el-form-item :label="t('match.field.league_en')">
-        <el-input v-model="form.leagueEn" :placeholder="t('match.ph.league_en')" />
-      </el-form-item>
       <el-form-item :label="t('match.field.league_zh')">
-        <el-input v-model="form.leagueZh" :placeholder="t('match.ph.league_zh')" />
+        <el-input v-model="leagueForm.leagueZh" :placeholder="t('match.ph.league_zh')" />
       </el-form-item>
+      <el-form-item :label="t('match.field.league_en')">
+        <el-input v-model="leagueForm.leagueEn" :placeholder="t('match.ph.league_en')" />
+      </el-form-item>
+      <el-form-item :label="t('match.field.league_ms')">
+        <el-input v-model="leagueForm.leagueMs" :placeholder="t('match.ph.league_ms')" />
+      </el-form-item>
+      <el-form-item :label="t('match.field.league_logo')">
+        <el-input v-model="leagueForm.logoUrl" :placeholder="t('matchEditor.ph.logo_url')" />
+      </el-form-item>
+      <p class="field-hint">{{ t('match.hint.create_league') }}</p>
+    </el-form>
+    <template #footer>
+      <el-button @click="createLeagueVisible = false">{{ t('common.cancel') }}</el-button>
+      <el-button type="primary" :loading="createLeagueLoading" @click="submitCreateLeague">
+        {{ t('user.btn.create') }}
+      </el-button>
+    </template>
+  </el-dialog>
+
+  <el-dialog
+    v-model="createVisible"
+    :title="t('match.dialog.create_fixture')"
+    width="520px"
+    destroy-on-close
+  >
+    <el-form label-width="96px">
+      <el-form-item v-if="isFixtureCreate" :label="t('match.col.league')">
+        <span class="league-readonly">{{ createUnderLeagueLabel }}</span>
+      </el-form-item>
+      <template v-else>
+        <el-form-item :label="t('match.field.league_en')">
+          <el-input v-model="form.leagueEn" :placeholder="t('match.ph.league_en')" />
+        </el-form-item>
+        <el-form-item :label="t('match.field.league_zh')">
+          <el-input v-model="form.leagueZh" :placeholder="t('match.ph.league_zh')" />
+        </el-form-item>
+      </template>
       <el-form-item :label="t('match.field.kickoff')" required>
-        <el-input v-model="form.startTime" :placeholder="t('match.ph.kickoff')" />
+        <el-date-picker
+          v-model="form.startTime"
+          type="datetime"
+          value-format="YYYY-MM-DDTHH:mm:ss"
+          :placeholder="t('matchEditor.ph.kickoff')"
+          style="width: 100%"
+        />
       </el-form-item>
       <el-form-item :label="t('match.field.home_en')">
         <el-input v-model="form.homeTeamEn" :placeholder="t('match.ph.home_en')" />
@@ -409,42 +416,6 @@ function canDelete(row: unknown) {
     </template>
   </el-dialog>
 
-  <el-dialog v-model="editVisible" :title="t('match.dialog.edit')" width="520px" destroy-on-close>
-    <el-form label-width="96px">
-      <p v-if="isEditPublished" class="field-hint edit-hint">
-        {{ t('match.hint.edit_published') }}
-      </p>
-      <el-form-item :label="t('match.field.league_en')">
-        <el-input v-model="form.leagueEn" :disabled="isEditPublished" />
-      </el-form-item>
-      <el-form-item :label="t('match.field.league_zh')">
-        <el-input v-model="form.leagueZh" :disabled="isEditPublished" />
-      </el-form-item>
-      <el-form-item :label="t('match.field.kickoff')" required>
-        <el-input v-model="form.startTime" />
-      </el-form-item>
-      <el-form-item :label="t('match.field.home_en')">
-        <el-input v-model="form.homeTeamEn" :disabled="isEditPublished" />
-      </el-form-item>
-      <el-form-item :label="t('match.field.home_zh')">
-        <el-input v-model="form.homeTeamZh" :disabled="isEditPublished" />
-      </el-form-item>
-      <el-form-item :label="t('match.field.away_en')">
-        <el-input v-model="form.awayTeamEn" :disabled="isEditPublished" />
-      </el-form-item>
-      <el-form-item :label="t('match.field.away_zh')">
-        <el-input v-model="form.awayTeamZh" :disabled="isEditPublished" />
-      </el-form-item>
-      <el-form-item :label="t('match.field.featured')">
-        <el-switch v-model="form.isHot" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="editVisible = false">{{ t('common.cancel') }}</el-button>
-      <el-button type="primary" :loading="editLoading" @click="submitEdit">{{ t('common.save') }}</el-button>
-    </template>
-  </el-dialog>
-
   <el-dialog v-model="importVisible" :title="t('match.dialog.import')" width="640px" destroy-on-close>
     <p class="dialog-hint">{{ t('match.import_hint') }}</p>
     <el-input
@@ -484,4 +455,85 @@ function canDelete(row: unknown) {
 .edit-hint {
   margin-bottom: 16px;
 }
+
+.action-btns {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+  justify-content: center;
+  align-items: center;
+}
+
+.action-btns :deep(.action-btn) {
+  margin: 0 !important;
+  min-width: 52px;
+  padding: 4px 8px !important;
+  font-size: 12px !important;
+  background: #1a1a1a !important;
+  border-color: #333 !important;
+  color: #bbb !important;
+}
+
+.action-btns :deep(.action-btn:not(.is-disabled):hover) {
+  background: #252525 !important;
+  border-color: #444 !important;
+  color: #fff !important;
+}
+
+.action-btns :deep(.action-btn.is-disabled) {
+  background: #121212 !important;
+  border-color: #252525 !important;
+  color: #444 !important;
+  opacity: 1 !important;
+  cursor: not-allowed !important;
+}
+
+.table-hint {
+  font-size: 12px;
+  color: #666;
+  margin: 0 0 10px;
+  line-height: 1.5;
+  flex-shrink: 0;
+}
+
+/* 列表表格随内容增高，滚动交给外层 table-wrap（仅赛事行） */
+.matches-page .table-wrap .el-table {
+  height: auto !important;
+}
+
+.matches-page :deep(.el-table__expanded-cell) {
+  padding: 0 !important;
+  background: #0a0a0a;
+}
+
+.data-card :deep(.row-expandable) {
+  cursor: pointer;
+}
+
+.data-card :deep(.row-no-expand .el-table__expand-icon) {
+  visibility: hidden;
+  pointer-events: none;
+}
+
+.matchup-link {
+  color: var(--green-text);
+}
+
+.league-cell {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.league-logo {
+  width: 28px;
+  height: 28px;
+  object-fit: contain;
+  flex-shrink: 0;
+}
+
+.league-readonly {
+  color: var(--green-text);
+  font-weight: 500;
+}
 </style>