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

This commit is contained in:
sexygoat
2026-04-11 12:19:35 +08:00
parent 90ae585651
commit 33e15314ac
30 changed files with 1077 additions and 532 deletions

View File

@@ -23,6 +23,17 @@
<h3 class="section-title">订单项列表</h3>
<ElTable :data="detailData.items" border style="margin-top: 10px">
<ElTableColumn prop="package_name" label="套餐名称" min-width="150" />
<ElTableColumn prop="package_type" label="套餐类型" width="120">
<template #default="{ row }">
{{
row.package_type === 'formal'
? '正式套餐'
: row.package_type === 'addon'
? '加油包'
: '-'
}}
</template>
</ElTableColumn>
<ElTableColumn prop="quantity" label="数量" width="100" />
<ElTableColumn prop="unit_price" label="单价" width="120">
<template #default="{ row }">
@@ -145,6 +156,16 @@
label: '买家类型',
formatter: (_, data) => (data.buyer_type ? getBuyerTypeText(data.buyer_type) : '-')
},
{
label: '买家手机号',
prop: 'buyer_phone',
formatter: (value) => value || '-'
},
{
label: '买家昵称',
prop: 'buyer_nickname',
formatter: (value) => value || '-'
},
{
label: '买家ID',
prop: 'buyer_id',

View File

@@ -234,6 +234,12 @@
<ElDescriptionsItem :label="'买家类型'">
{{ getBuyerTypeText(currentOrder.buyer_type) }}
</ElDescriptionsItem>
<ElDescriptionsItem :label="'买家手机号'">
{{ currentOrder.buyer_phone || '-' }}
</ElDescriptionsItem>
<ElDescriptionsItem :label="'买家昵称'">
{{ currentOrder.buyer_nickname || '-' }}
</ElDescriptionsItem>
<ElDescriptionsItem :label="'佣金状态'">
{{ getCommissionStatusText(currentOrder.commission_status) }}
</ElDescriptionsItem>
@@ -256,6 +262,17 @@
<h4>{{ '订单项' }}</h4>
<ElTable :data="currentOrder.items" border style="margin-top: 10px">
<ElTableColumn prop="package_name" :label="'套餐名称'" min-width="150" />
<ElTableColumn prop="package_type" :label="'套餐类型'" width="120">
<template #default="{ row }">
{{
row.package_type === 'formal'
? '正式套餐'
: row.package_type === 'addon'
? '加油包'
: '-'
}}
</template>
</ElTableColumn>
<ElTableColumn prop="quantity" :label="'数量'" width="100" />
<ElTableColumn prop="unit_price" :label="'单价'" width="120">
<template #default="{ row }">
@@ -330,6 +347,7 @@
// 搜索表单初始值
const initialSearchState: OrderQueryParams = {
order_no: '',
buyer_phone: '',
payment_status: undefined,
order_type: undefined,
purchase_role: undefined,
@@ -353,6 +371,16 @@
// 搜索表单配置
const searchFormItems: SearchFormItem[] = [
{
label: '买家手机号',
prop: 'buyer_phone',
type: 'input',
placeholder: '请输入买家手机号',
config: {
maxlength: 20,
clearable: true
}
},
{
label: '支付状态',
prop: 'payment_status',
@@ -419,6 +447,8 @@
// 列配置
const columnOptions = [
{ label: '订单编号', prop: 'order_no' },
{ label: '买家手机号', prop: 'buyer_phone' },
{ label: '买家昵称', prop: 'buyer_nickname' },
{ label: '订单类型', prop: 'order_type' },
{ label: '买家类型', prop: 'buyer_type' },
{ label: '订单渠道', prop: 'purchase_role' },
@@ -707,6 +737,18 @@
)
}
},
{
prop: 'buyer_phone',
label: '买家手机号',
width: 130,
formatter: (row: Order) => row.buyer_phone || '-'
},
{
prop: 'buyer_nickname',
label: '买家昵称',
width: 130,
formatter: (row: Order) => row.buyer_nickname || '-'
},
{
prop: 'order_type',
label: '订单类型',
@@ -854,6 +896,7 @@
page: pagination.page,
page_size: pagination.page_size,
order_no: searchForm.order_no || undefined,
buyer_phone: searchForm.buyer_phone || undefined,
payment_status: searchForm.payment_status,
order_type: searchForm.order_type,
purchase_role: searchForm.purchase_role,