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

Merge branch 'main' of http://8.153.108.90:3000/YD/YD_Event.Web

Browse Source
This commit is contained in:
ltx 2026-05-15 13:44:06 +08:00
commit 7118f74eb5
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/match/usereventregistration.js
View File

@ -50,6 +50,7 @@ export const usereventregistrationListGet = (params) => {
* registrationEndTime: string,
* isNeedMaterial: boolean,
* materialRemark: string,
* materialUploadStartTime: string,
* materialUploadEndTime: string,
* matchStartTime: string,
* matchEndTime: string,

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

@ -97,7 +97,7 @@ const columns = ref([
{ prop: 'actualAmount', label: '实付金额', minWidth: 120 },
{ prop: 'discountAmount', label: '优惠金额', minWidth: 120 },
{ prop: 'refundAmount', label: '退款金额', minWidth: 120 },
{ 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 },
{ width: 130, prop: 'orderStatus', label: '订单状态', search: { el: 'select', }, enum: [{ label: '全部', value: '' }, { label: '待支付', value: 0 }, { label: '已支付', value: 1 }, { label: '已退款', value: 3 }, { label: '报名失败', value: 6 },], 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/order/index.vue
View File

@ -122,7 +122,7 @@ const columns = ref([
{ width: 120, prop: 'actualAmount', label: '实付金额' },
{ width: 100, prop: 'discountAmount', label: '优惠金额' },
{ width: 100, prop: 'refundAmount', label: '退款金额', align: 'center' },
{ width: 90, 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: 90, prop: 'orderStatus', label: '订单状态', search: { el: 'select', }, enum: [{ label: '全部', value: '' }, { label: '待支付', value: 0 }, { label: '已支付', value: 1 }, { label: '已退款', value: 3 }, { label: '报名失败', value: 6 },], },
{ width: 160, prop: 'createdTime', label: '生成时间', search: { el: 'date-picker', props: { type: 'daterange' } } },
{ prop: 'action', label: '操作', align: 'center', fixed: 'right', width: 120, },
]);