fix: bug
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 2m9s

This commit is contained in:
sexygoat
2026-04-23 14:59:05 +08:00
parent a9467e8a0c
commit a5e76313cb
28 changed files with 1284 additions and 702 deletions

View File

@@ -5,7 +5,7 @@
<ArtSearchBar
v-model:filter="searchForm"
:items="searchFormItems"
:show-expand="false"
show-expand
@reset="handleReset"
label-width="100"
@search="handleSearch"
@@ -356,8 +356,11 @@
order_no: '',
buyer_phone: '',
payment_status: undefined,
payment_method: undefined,
order_type: undefined,
purchase_role: undefined,
identifier: '',
is_expired: undefined,
start_time: '',
end_time: ''
}
@@ -378,6 +381,28 @@
// 搜索表单配置
const searchFormItems: SearchFormItem[] = [
{
label: '订单号',
prop: 'order_no',
type: 'input',
placeholder: '请输入订单号',
config: {
maxlength: 50,
clearable: true
},
labelWidth: '100'
},
{
label: '资产标识符',
prop: 'identifier',
type: 'input',
placeholder: 'ICCID 或 VirtualNo',
config: {
maxlength: 30,
clearable: true
},
labelWidth: '100'
},
{
label: '买家手机号',
prop: 'buyer_phone',
@@ -389,6 +414,21 @@
},
labelWidth: '100'
},
{
label: '支付方式',
prop: 'payment_method',
type: 'select',
placeholder: '请选择支付方式',
options: [
{ label: '钱包支付', value: 'wallet' },
{ label: '微信支付', value: 'wechat' },
{ label: '支付宝支付', value: 'alipay' },
{ label: '线下支付', value: 'offline' }
],
config: {
clearable: true
}
},
{
label: '支付状态',
prop: 'payment_status',
@@ -404,6 +444,19 @@
clearable: true
}
},
{
label: '是否过期',
prop: 'is_expired',
type: 'select',
placeholder: '请选择',
options: [
{ label: '已过期', value: true },
{ label: '未过期', value: false }
],
config: {
clearable: true
}
},
{
label: '订单类型',
prop: 'order_type',
@@ -433,14 +486,15 @@
}
},
{
label: '创建时间',
label: '开始至结束',
prop: 'dateRange',
type: 'daterange',
type: 'date',
config: {
clearable: true,
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
valueFormat: 'YYYY-MM-DD HH:mm:ss'
type: 'daterange',
rangeSeparator: '',
startPlaceholder: '开始日期',
endPlaceholder: '结束日期',
valueFormat: 'YYYY-MM-DD'
}
}
]
@@ -459,15 +513,16 @@
{ label: '买家昵称', prop: 'buyer_nickname' },
{ label: '订单类型', prop: 'order_type' },
{ label: '买家类型', prop: 'buyer_type' },
{ label: '资产标识符', prop: 'asset_identifier' },
{ label: '订单渠道', prop: 'purchase_role' },
{ label: '购买备注', prop: 'purchase_remark' },
{ label: '操作者', prop: 'operator_name' },
{ label: '支付状态', prop: 'payment_status' },
{ label: '佣金状态', prop: 'commission_status_name' },
{ label: '订单金额', prop: 'total_amount' },
{ label: '实付金额', prop: 'actual_paid_amount' },
{ label: '支付方式', prop: 'payment_method' },
{ label: '支付时间', prop: 'paid_at' },
{ label: '创建时间', prop: 'created_at' }
{ label: '支付时间', prop: 'paid_at' }
]
const createFormRef = ref<FormInstance>()
@@ -794,6 +849,12 @@
)
}
},
{
prop: 'asset_identifier',
label: '资产标识符',
width: 180,
formatter: (row: Order) => row.asset_identifier || '-'
},
{
prop: 'purchase_role',
label: '订单渠道',
@@ -838,6 +899,12 @@
)
}
},
{
prop: 'commission_status_name',
label: '佣金状态',
width: 120,
formatter: (row: Order) => row.commission_status_name || '-'
},
{
prop: 'total_amount',
label: '订单金额',
@@ -864,12 +931,6 @@
label: '支付时间',
width: 180,
formatter: (row: Order) => (row.paid_at ? formatDateTime(row.paid_at) : '-')
},
{
prop: 'created_at',
label: '创建时间',
width: 180,
formatter: (row: Order) => formatDateTime(row.created_at)
}
])
@@ -896,8 +957,11 @@
order_no: searchForm.order_no || undefined,
buyer_phone: searchForm.buyer_phone || undefined,
payment_status: searchForm.payment_status,
payment_method: searchForm.payment_method,
order_type: searchForm.order_type,
purchase_role: searchForm.purchase_role,
identifier: searchForm.identifier || undefined,
is_expired: searchForm.is_expired,
start_time: searchForm.start_time || undefined,
end_time: searchForm.end_time || undefined
}