From 5c8f4e0200d7211bfe6243366df2642ba727d51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E6=A2=93=E5=BD=AD?= Date: Fri, 15 May 2026 11:07:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/match/usereventregistration.js | 1 + src/views/marchant/order/index.vue | 2 +- src/views/match/order/index.vue | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/api/match/usereventregistration.js b/src/api/match/usereventregistration.js index 1708079..13d86bd 100644 --- a/src/api/match/usereventregistration.js +++ b/src/api/match/usereventregistration.js @@ -50,6 +50,7 @@ export const usereventregistrationListGet = (params) => { * registrationEndTime: string, * isNeedMaterial: boolean, * materialRemark: string, + * materialUploadStartTime: string, * materialUploadEndTime: string, * matchStartTime: string, * matchEndTime: string, diff --git a/src/views/marchant/order/index.vue b/src/views/marchant/order/index.vue index 6e93664..4a98b28 100644 --- a/src/views/marchant/order/index.vue +++ b/src/views/marchant/order/index.vue @@ -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, }, ]); diff --git a/src/views/match/order/index.vue b/src/views/match/order/index.vue index 40bb50c..8a1a3cd 100644 --- a/src/views/match/order/index.vue +++ b/src/views/match/order/index.vue @@ -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, }, ]);