feat: 充值订单审计与重新申请,优化赛事展示和余额刷新
- 新增 deposit_order_audit_logs 表,记录提交/审批/拒绝/撤销/重提全链路 - 管理端充值单页增加审计历史;玩家端充值历史支持时间线与重新申请 - 已拒绝订单可原单号重提;撤销入账使用 PLAYER_DEPOSIT_REVERSAL 并加强幂等 - 结算后清除热门标记,允许归档已结算赛事,完善今日赛事时区窗口 - 足球页今日/早盘独立折叠;资料与余额在进入钱包/个人页及下注后自动刷新 - 补充投注玩法、结算返水规则文档;新增 smoke/settlement CLI 脚本 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -87,8 +87,21 @@ const zh: Record<string, string> = {
|
||||
'deposit.confirm_reopen': '订单将恢复为待审核,可再次批准或拒绝。确定继续?',
|
||||
'deposit.delete': '删除',
|
||||
'deposit.confirm_delete': '【仅删除记录】将永久删除本订单记录及截图文件。确定继续?',
|
||||
'deposit.delete_failed': '删除失败',
|
||||
'deposit.prev': '上一页',
|
||||
'deposit.next': '下一页',
|
||||
'deposit.audit_history': '审核记录',
|
||||
'deposit.audit_action': '操作',
|
||||
'deposit.audit_actor': '操作人',
|
||||
'deposit.audit_time': '时间',
|
||||
'deposit.audit_remark': '备注',
|
||||
'deposit.audit_submitted': '提交申请',
|
||||
'deposit.audit_approved': '审核通过',
|
||||
'deposit.audit_rejected': '审核拒绝',
|
||||
'deposit.audit_revoked': '撤销审核',
|
||||
'deposit.audit_reopened': '重新审核',
|
||||
'deposit.audit_deleted': '已删除',
|
||||
'deposit.audit_empty': '暂无审核记录',
|
||||
'deposit.add_method': '+ 添加',
|
||||
'deposit.display_name': '展示名称',
|
||||
'deposit.details': '详情',
|
||||
@@ -357,8 +370,21 @@ const en: Record<string, string> = {
|
||||
'deposit.confirm_reopen': 'The order will return to pending for approve or reject. Continue?',
|
||||
'deposit.delete': 'Delete',
|
||||
'deposit.confirm_delete': '[Records only] Permanently delete this order record and screenshot. Continue?',
|
||||
'deposit.delete_failed': 'Delete failed',
|
||||
'deposit.prev': 'Prev',
|
||||
'deposit.next': 'Next',
|
||||
'deposit.audit_history': 'Review history',
|
||||
'deposit.audit_action': 'Action',
|
||||
'deposit.audit_actor': 'Actor',
|
||||
'deposit.audit_time': 'Time',
|
||||
'deposit.audit_remark': 'Remark',
|
||||
'deposit.audit_submitted': 'Submitted',
|
||||
'deposit.audit_approved': 'Approved',
|
||||
'deposit.audit_rejected': 'Rejected',
|
||||
'deposit.audit_revoked': 'Approval revoked',
|
||||
'deposit.audit_reopened': 'Reopened for review',
|
||||
'deposit.audit_deleted': 'Deleted',
|
||||
'deposit.audit_empty': 'No review history yet',
|
||||
'deposit.add_method': '+ Add',
|
||||
'deposit.display_name': 'Display Name',
|
||||
'deposit.details': 'Details',
|
||||
@@ -625,8 +651,21 @@ const ms: Record<string, string> = {
|
||||
'deposit.confirm_reopen': 'Pesanan kembali menunggu untuk lulus atau tolak. Teruskan?',
|
||||
'deposit.delete': 'Padam',
|
||||
'deposit.confirm_delete': '[Rekod sahaja] Padam rekod pesanan dan tangkapan skrin. Teruskan?',
|
||||
'deposit.delete_failed': 'Gagal memadam',
|
||||
'deposit.prev': 'Sebelum',
|
||||
'deposit.next': 'Seterus',
|
||||
'deposit.audit_history': 'Sejarah semakan',
|
||||
'deposit.audit_action': 'Tindakan',
|
||||
'deposit.audit_actor': 'Pengendali',
|
||||
'deposit.audit_time': 'Masa',
|
||||
'deposit.audit_remark': 'Catatan',
|
||||
'deposit.audit_submitted': 'Dihantar',
|
||||
'deposit.audit_approved': 'Diluluskan',
|
||||
'deposit.audit_rejected': 'Ditolak',
|
||||
'deposit.audit_revoked': 'Kelulusan dibatalkan',
|
||||
'deposit.audit_reopened': 'Dibuka semula',
|
||||
'deposit.audit_deleted': 'Dipadam',
|
||||
'deposit.audit_empty': 'Tiada sejarah semakan',
|
||||
'deposit.add_method': '+ Tambah',
|
||||
'deposit.display_name': 'Nama Paparan',
|
||||
'deposit.details': 'Butiran',
|
||||
|
||||
@@ -4,6 +4,9 @@ import 'element-plus/dist/index.css';
|
||||
import App from './App.vue';
|
||||
import router from './router';
|
||||
import { createAdminI18n } from './i18n';
|
||||
import { applyElementPlusDialogDefaults } from './plugins/element-plus-defaults';
|
||||
|
||||
applyElementPlusDialogDefaults();
|
||||
|
||||
async function bootstrap() {
|
||||
const i18n = await createAdminI18n();
|
||||
|
||||
6
apps/admin/src/plugins/element-plus-defaults.ts
Normal file
6
apps/admin/src/plugins/element-plus-defaults.ts
Normal file
@@ -0,0 +1,6 @@
|
||||
import { ElDialog } from 'element-plus';
|
||||
|
||||
/** Prevent accidental form data loss from mask clicks across admin dialogs. */
|
||||
export function applyElementPlusDialogDefaults() {
|
||||
ElDialog.props.closeOnClickModal.default = false;
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
import { ref, onMounted } from 'vue';
|
||||
import { ElMessage, ElMessageBox } from 'element-plus';
|
||||
import { useAdminLocale } from '../composables/useAdminLocale';
|
||||
import { resolveApiError } from '../i18n/form-validation';
|
||||
import api from '../api';
|
||||
import AdminTableEmpty from '../components/AdminTableEmpty.vue';
|
||||
import { formatAmount } from '../utils/format-amount';
|
||||
@@ -27,6 +28,20 @@ interface DepositOrderRow {
|
||||
paymentMethodName: string | null;
|
||||
}
|
||||
|
||||
interface DepositAuditLogRow {
|
||||
id: string;
|
||||
action: string;
|
||||
actorId: string | null;
|
||||
actorType: string;
|
||||
actorUsername: string | null;
|
||||
statusBefore: string | null;
|
||||
statusAfter: string;
|
||||
amount: string | null;
|
||||
approvedAmount: string | null;
|
||||
remark: string | null;
|
||||
createdAt: string;
|
||||
}
|
||||
|
||||
const items = ref<DepositOrderRow[]>([]);
|
||||
const total = ref(0);
|
||||
const page = ref(1);
|
||||
@@ -53,6 +68,12 @@ const rejectReason = ref('');
|
||||
const previewUrl = ref('');
|
||||
const previewVisible = ref(false);
|
||||
|
||||
// Audit history dialog
|
||||
const auditDialogVisible = ref(false);
|
||||
const auditTarget = ref<DepositOrderRow | null>(null);
|
||||
const auditLogs = ref<DepositAuditLogRow[]>([]);
|
||||
const auditLoading = ref(false);
|
||||
|
||||
async function fetchList() {
|
||||
loading.value = true;
|
||||
try {
|
||||
@@ -87,6 +108,32 @@ function openScreenshot(url: string) {
|
||||
previewVisible.value = true;
|
||||
}
|
||||
|
||||
async function openAuditHistory(row: DepositOrderRow) {
|
||||
auditTarget.value = row;
|
||||
auditDialogVisible.value = true;
|
||||
auditLoading.value = true;
|
||||
auditLogs.value = [];
|
||||
try {
|
||||
const { data } = await api.get(`/admin/deposit-orders/${row.id}/audit-logs`);
|
||||
auditLogs.value = data.data?.items ?? [];
|
||||
} catch {
|
||||
auditLogs.value = [];
|
||||
} finally {
|
||||
auditLoading.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
function auditActionLabel(action: string) {
|
||||
const key = `deposit.audit_${action.toLowerCase()}`;
|
||||
const translated = t(key);
|
||||
return translated !== key ? translated : action;
|
||||
}
|
||||
|
||||
function auditActorLabel(row: DepositAuditLogRow) {
|
||||
if (row.actorUsername) return row.actorUsername;
|
||||
return row.actorType === 'PLAYER' ? t('deposit.player') : '-';
|
||||
}
|
||||
|
||||
async function confirmDepositAction(message: string, title: string): Promise<boolean> {
|
||||
try {
|
||||
await ElMessageBox.confirm(message, title, {
|
||||
@@ -101,8 +148,7 @@ async function confirmDepositAction(message: string, title: string): Promise<boo
|
||||
}
|
||||
|
||||
function showApiError(e: unknown) {
|
||||
const msg = (e as { response?: { data?: { message?: string } } })?.response?.data?.message;
|
||||
ElMessage.error(msg || 'Error');
|
||||
ElMessage.error(resolveApiError(e, t, 'deposit.delete_failed'));
|
||||
}
|
||||
|
||||
async function handleApprove() {
|
||||
@@ -262,6 +308,7 @@ onMounted(fetchList);
|
||||
<td class="remark-cell">{{ row.remark || row.rejectReason || '-' }}</td>
|
||||
<td class="time-cell">{{ new Date(row.createdAt).toLocaleString() }}</td>
|
||||
<td>
|
||||
<button class="btn-sm btn-audit" @click="openAuditHistory(row)">{{ t('deposit.audit_history') }}</button>
|
||||
<template v-if="row.status === 'PENDING'">
|
||||
<button class="btn-sm btn-approve" @click="openApprove(row)">{{ t('deposit.approve') }}</button>
|
||||
<button class="btn-sm btn-reject" @click="openReject(row)">{{ t('deposit.reject') }}</button>
|
||||
@@ -293,7 +340,7 @@ onMounted(fetchList);
|
||||
</div>
|
||||
|
||||
<!-- Approve Dialog -->
|
||||
<div v-if="approveDialogVisible" class="dialog-overlay" @click.self="approveDialogVisible = false">
|
||||
<div v-if="approveDialogVisible" class="dialog-overlay">
|
||||
<div class="dialog-box">
|
||||
<h3>{{ t('deposit.approve_title') }}</h3>
|
||||
<p class="approve-check-hint">{{ t('deposit.approve_check_hint') }}</p>
|
||||
@@ -325,7 +372,7 @@ onMounted(fetchList);
|
||||
</div>
|
||||
|
||||
<!-- Reject Dialog -->
|
||||
<div v-if="rejectDialogVisible" class="dialog-overlay" @click.self="rejectDialogVisible = false">
|
||||
<div v-if="rejectDialogVisible" class="dialog-overlay">
|
||||
<div class="dialog-box">
|
||||
<h3>{{ t('deposit.reject_title') }}</h3>
|
||||
<div v-if="rejectTarget" class="reject-content">
|
||||
@@ -347,8 +394,41 @@ onMounted(fetchList);
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Audit History Dialog -->
|
||||
<div v-if="auditDialogVisible" class="dialog-overlay">
|
||||
<div class="dialog-box audit-dialog">
|
||||
<h3>{{ t('deposit.audit_history') }}</h3>
|
||||
<p v-if="auditTarget" class="audit-order-no">{{ auditTarget.orderNo }} · {{ auditTarget.playerUsername || auditTarget.playerId }}</p>
|
||||
<div v-if="auditLoading" class="audit-loading">{{ t('common.loading') }}</div>
|
||||
<div v-else-if="!auditLogs.length" class="audit-empty">{{ t('deposit.audit_empty') }}</div>
|
||||
<table v-else class="audit-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ t('deposit.audit_action') }}</th>
|
||||
<th>{{ t('deposit.audit_actor') }}</th>
|
||||
<th>{{ t('deposit.approved_amount') }}</th>
|
||||
<th>{{ t('deposit.audit_remark') }}</th>
|
||||
<th>{{ t('deposit.audit_time') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="log in auditLogs" :key="log.id">
|
||||
<td>{{ auditActionLabel(log.action) }}</td>
|
||||
<td>{{ auditActorLabel(log) }}</td>
|
||||
<td>{{ log.approvedAmount ? formatAmount(log.approvedAmount) : (log.amount ? formatAmount(log.amount) : '-') }}</td>
|
||||
<td class="remark-cell">{{ log.remark || '-' }}</td>
|
||||
<td class="time-cell">{{ new Date(log.createdAt).toLocaleString() }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="dialog-actions">
|
||||
<button class="btn-cancel" @click="auditDialogVisible = false">{{ t('common.cancel') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Screenshot Preview -->
|
||||
<div v-if="previewVisible" class="dialog-overlay" @click.self="previewVisible = false">
|
||||
<div v-if="previewVisible" class="dialog-overlay">
|
||||
<div class="preview-box">
|
||||
<img :src="previewUrl" class="preview-image" />
|
||||
<button class="close-preview" @click="previewVisible = false">✕</button>
|
||||
@@ -386,6 +466,15 @@ onMounted(fetchList);
|
||||
.btn-reject:hover { background: #4a2525; }
|
||||
.btn-reopen { background: #2a2410; color: #e6a23c; }
|
||||
.btn-reopen:hover { background: #3a3218; }
|
||||
.action-hint {
|
||||
display: inline-block;
|
||||
margin-left: 4px;
|
||||
font-size: 11px;
|
||||
color: #888;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.btn-audit { background: #1f2433; color: #8ab4ff; }
|
||||
.btn-audit:hover { background: #2a3348; }
|
||||
.btn-delete { background: #2a2a2a; color: #aaa; }
|
||||
.btn-delete:hover { background: #3a3a3a; color: #f56c6c; }
|
||||
.actions-cell { white-space: nowrap; }
|
||||
@@ -628,6 +717,13 @@ onMounted(fetchList);
|
||||
background: var(--danger-text);
|
||||
}
|
||||
|
||||
.audit-dialog { min-width: 520px; max-width: 760px; }
|
||||
.audit-order-no { margin: -8px 0 12px; font-size: 12px; color: var(--text-muted); }
|
||||
.audit-loading, .audit-empty { padding: 20px 0; text-align: center; color: var(--text-muted); font-size: 13px; }
|
||||
.audit-table { width: 100%; border-collapse: collapse; font-size: 12px; margin-bottom: 8px; }
|
||||
.audit-table th, .audit-table td { padding: 8px 6px; border-bottom: 1px solid var(--border-soft); text-align: left; }
|
||||
.audit-table th { color: var(--text-muted); font-weight: 700; }
|
||||
|
||||
.close-preview {
|
||||
background: var(--text);
|
||||
color: #ffffff;
|
||||
|
||||
@@ -238,7 +238,7 @@ async function doUpload() {
|
||||
</div>
|
||||
|
||||
<!-- Upload dialog -->
|
||||
<div v-if="uploadDialogVisible" class="dialog-overlay" @click.self="uploadDialogVisible = false">
|
||||
<div v-if="uploadDialogVisible" class="dialog-overlay">
|
||||
<div class="dialog">
|
||||
<div class="dialog-header">
|
||||
<span>{{ t('media.upload_dialog') }}</span>
|
||||
|
||||
@@ -234,7 +234,7 @@ onMounted(fetchList);
|
||||
</table>
|
||||
|
||||
<!-- Create/Edit Dialog -->
|
||||
<div v-if="dialogVisible" class="dialog-overlay" @click.self="dialogVisible = false">
|
||||
<div v-if="dialogVisible" class="dialog-overlay">
|
||||
<div class="dialog-box">
|
||||
<h3>{{ editingId ? t('deposit.edit_method') : t('deposit.create_method') }}</h3>
|
||||
<div class="form-group" v-if="!editingId">
|
||||
|
||||
Reference in New Issue
Block a user