From 953e7003ee113ea311e4c2a315c45cba67554796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=A2=93=E5=BD=AD?= <tianbohe0@163.com>
Date: Tue, 21 Apr 2026 20:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marchant/order/index.vue |  2 +-
 src/views/match/order/index.vue    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/marchant/order/index.vue b/src/views/marchant/order/index.vue
index c9bc9a1..5625233 100644
--- a/src/views/marchant/order/index.vue
+++ b/src/views/marchant/order/index.vue
@@ -94,9 +94,9 @@ 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: 'originalAmount', label: '原金额', minWidth: 120 },
+	{ prop: 'actualAmount', label: '实付金额', minWidth: 120 },
 	{ prop: 'discountAmount', label: '优惠金额', minWidth: 120 },
 	{ prop: 'refundAmount', label: '退款金额', minWidth: 120 },
-	{ prop: 'actualAmount', 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 },
 	{ 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 04085ff..89a85f8 100644
--- a/src/views/match/order/index.vue
+++ b/src/views/match/order/index.vue
@@ -17,7 +17,9 @@
 				{{ scope.row.paymentMethod || '-' }}
 			</template>
 			<template #orderType="scope">
-				<el-tag :type="scope.row.orderType == '收入' ? 'success' : 'error'">{{ scope.row.orderType || '-' }}</el-tag>
+				<el-tag :type="scope.row.orderType == '收入'? 'success' : 'error'">
+					{{ (scope.row.orderType == '收入' ? '收款' : scope.row.orderType) || '-' }}
+				</el-tag>
 			</template>
 			<template #registrationMode="scope">
 				{{ scope.row.registrationMode || '-' }}
@@ -109,7 +111,7 @@ const columns = ref([
 	{ prop: 'orderNo', label: '订单编号', align: 'center', search: { el: 'input', }, fixed: 'left', width: 150 },
 	{ width: 180, prop: 'unitName', label: '单位名称', align: 'center', },
 	{ width: 120, prop: 'eventName', label: '所属赛事', search: { el: 'input', }, },
-	{ width: 100, prop: 'orderType', label: '订单类型', search: { el: 'select', }, enum: [{ label: '全部', value: 0 }, { label: '收款', value: 1 }, { label: '退款', value: 2 },], },
+	{ width: 120, prop: 'orderType', label: '订单类型', search: { el: 'select', }, enum: [{ label: '全部', value: 0 }, { label: '收款', value: 1 }, { label: '退款', value: 2 },], },
 	{ width: 120, prop: 'relatedOrderNo', label: '关联订单' },
 	{ width: 100, prop: 'paymentMethod', label: '支付方式', search: { el: 'select', }, enum: [{ label: '全部', value: 0 }, { label: '线上', value: 2 }, { label: '线下', value: 1 },], },
 	{ width: 100, prop: 'paymentProofUrl', label: '付款凭证' },
@@ -117,10 +119,10 @@ const columns = ref([
 	{ width: 120, prop: 'contactName', label: '报名用户' },
 	{ width: 120, prop: 'contactPhone', label: '报名账号', search: { el: 'input' } },
 	{ width: 100, prop: 'originalAmount', label: '原金额' },
-	{ 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: 120, prop: 'actualAmount', label: '实付金额' },
 	{ width: 100, prop: 'discountAmount', label: '优惠金额' },
 	{ width: 100, prop: 'refundAmount', label: '退款金额', align: 'center' },
-	{ width: 120, prop: 'actualAmount', label: '实付金额' },
+	{ 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: 160, prop: 'createdTime', label: '生成时间', search: { el: 'date-picker', props: { type: 'daterange' } } },
 	{ prop: 'action', label: '操作', align: 'center', fixed: 'right', width: 120, },
 ]);