YD/YD_Event.Web
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

验证

Browse Source
This commit is contained in:
马梓彭 2026-04-15 09:58:32 +08:00
commit 27f2a0b31b
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/marchant/order/index.vue
View File

@ -12,7 +12,7 @@
{{ scope.row.paymentMethod || '-' }}
</template>
<template #orderStatus="scope">
{{ scope.row.orderStatusText || '-' }}
{{ scope.row.orderStatusText || '-' }} {{ scope.row.orderStatus == 3 ? '：' + scope.row.refundAmount + '元' : '' }}
</template>
<template #actualAmount="scope">
{{ formatAmount(scope.row.actualAmount) }}
@ -80,7 +80,7 @@ const columns = ref([
{ prop: 'eventName', label: '所属赛事', search: { el: 'input', }, minWidth: 150 },
{ prop: 'paymentMethod', label: '支付方式', search: { el: 'select', }, enum: [{ label: '全部', value: 0 }, { label: '线上', value: 2 }, { label: '线下', value: 1 },], minWidth: 100 },
{ prop: 'actualAmount', label: '实付金额', minWidth: 120 },
{ prop: 'orderStatus', label: '订单状态', search: { el: 'select', }, enum: [{ label: '全部', value: '' }, { label: '待支付', value: 0 }, { label: '已支付', value: 1 }, { label: '已取消', value: 2 }, { label: '已退款', value: 3 }, { label: '已发货', value: 4 }, { label: '已完成', value: 5 },], minWidth: 100 },
{ width: 130, prop: 'orderStatus', label: '订单状态', search: { el: 'select', }, enum: [{ label: '全部', value: '' }, { label: '待支付', value: 0 }, { label: '已支付', value: 1 }, { label: '已取消', value: 2 }, { label: '已退款', value: 3 }, { label: '已发货', value: 4 }, { label: '已完成', value: 5 },], minWidth: 100 },
{ prop: 'createdTime', label: '生成时间', search: { el: 'date-picker', props: { type: 'daterange' } }, minWidth: 160 },
{ prop: 'action', label: '操作', align: 'center', fixed: 'right', width: 120, },
]);

2
src/views/match/coupon/index.vue
View File

@ -218,7 +218,7 @@ const columns = ref([
{ prop: 'startTime', label: '有效期' },
{ prop: 'eventNames', label: '可用赛事' },
{ prop: 'action', label: '操作', align: 'center', fixed: 'right', isShow: auths(['coupon:delete', 'coupon:edit']) },
{ prop: 'action', label: '操作', width: 260, align: 'center', fixed: 'right', isShow: auths(['coupon:delete', 'coupon:edit']) },
]);
const isShowDialog = ref(false);

5
src/views/match/order/index.vue
View File

@ -23,7 +23,7 @@
{{ scope.row.registrationMode || '-' }}
</template>
<template #orderStatus="scope">
{{ scope.row.orderStatusText || '-' }}
{{ scope.row.orderStatusText || '-' }} {{ scope.row.orderStatus == 3 ? '：' + scope.row.refundAmount : '' }}
</template>
<template #paymentProofUrl="scope">
<el-image v-if="scope.row.paymentProofUrl"
@ -116,9 +116,10 @@ const columns = ref([
{ width: 120, prop: 'originalAmount', label: '原金额' },
{ width: 120, prop: 'discountAmount', label: '优惠金额' },
{ width: 120, prop: 'actualAmount', label: '实付金额' },
{ width: 100, prop: 'orderStatus', label: '订单状态', search: { el: 'select', }, enum: [{ label: '全部', value: '' }, { label: '待支付', value: 0 }, { label: '已支付', value: 1 }, { label: '已取消', value: 2 }, { label: '已退款', value: 3 }, { label: '已发货', value: 4 }, { label: '已完成', value: 5 },], },
{ width: 130, prop: 'orderStatus', label: '订单状态', search: { el: 'select', }, enum: [{ label: '全部', value: '' }, { label: '待支付', value: 0 }, { label: '已支付', value: 1 }, { label: '已取消', value: 2 }, { label: '已退款', value: 3 }, { label: '已发货', value: 4 }, { label: '已完成', value: 5 },], },
{ width: 160, prop: 'createdTime', label: '生成时间', search: { el: 'date-picker', props: { type: 'daterange' } } },
{ prop: 'action', label: '操作', align: 'center', fixed: 'right', width: 120, },
{ prop: 'refundAmount', label: '退款金额', align: 'center', width: 120, isShow: false },
]);
const isShowDialog = ref(false);

6
src/views/user/registration/index.vue
View File

@ -454,7 +454,7 @@
</div>
<div v-if="validatedCoupon" class="coupon-result success">
<el-icon style="color: #67c23a;"><CircleCheck /></el-icon>
<span>{{ validatedCoupon.couponName }}，优惠 -{{ validatedCoupon.discountAmount }} 元</span>
<span>{{ validatedCoupon.couponName }}，{{validatedCoupon.discountType == 0 ? `优惠价${validatedCoupon.discountValue / 10}折` : `优惠 ${validatedCoupon.discountAmount}元`}}</span>
</div>
</div>
@ -1720,10 +1720,6 @@ const handleStep1Next = async () => {
setActiveTeam(group.id, 1);
}
});
// 进入步骤2时立即进行一次完整验证
await nextTick();
validateAllMembers();
};
const handleStep2Next = async () => {