From 3e6b3981f41e5efe591220835a967166e758dd2f Mon Sep 17 00:00:00 2001 From: sexygoat <1538832180@qq.com> Date: Mon, 1 Jun 2026 14:10:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AE=9E=E4=BB=98=E9=87=91=E9=A2=9D=E4=BB=A3?= =?UTF-8?q?=E7=90=86/=E4=BC=81=E4=B8=9A=E4=B8=8D=E5=8F=AF=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/api/asset.ts | 1 + .../components/CurrentPackageCard.vue | 7 +- .../components/PackageListCard.vue | 9 +- .../composables/useAssetInfo.ts | 1 + .../order-management/order-list/detail.vue | 330 ++++++++------- .../order-management/order-list/index.vue | 387 ++++++++++-------- 6 files changed, 397 insertions(+), 338 deletions(-) diff --git a/src/types/api/asset.ts b/src/types/api/asset.ts index 185f81d..c81b779 100644 --- a/src/types/api/asset.ts +++ b/src/types/api/asset.ts @@ -233,6 +233,7 @@ export interface AssetPackageUsageRecord { reduction_pct?: number // 展示增幅比例(小数,如 0.428571) enable_virtual_data?: boolean // 是否启用虚流量 paid_amount?: number // 实际支付金额(分) + retail_amount?: number // 零售价(分) package_price?: number // 套餐价格(分) start_time?: string // 开始时间(兼容前端现有映射字段) expire_time?: string // 到期时间(兼容前端现有映射字段) diff --git a/src/views/asset-management/asset-information/components/CurrentPackageCard.vue b/src/views/asset-management/asset-information/components/CurrentPackageCard.vue index a0b1a91..1ac1c3a 100644 --- a/src/views/asset-management/asset-information/components/CurrentPackageCard.vue +++ b/src/views/asset-management/asset-information/components/CurrentPackageCard.vue @@ -193,8 +193,11 @@ {{ currentPackage.package_name || '-' }} - - {{ formatAmount(currentPackage.paid_amount || currentPackage.package_price || 0) }} + + {{ formatAmount(currentPackage.paid_amount || 0) }} + + + {{ formatAmount(currentPackage.retail_amount || 0) }} {{ getPackageTypeName(currentPackage.package_type) }} diff --git a/src/views/asset-management/asset-information/components/PackageListCard.vue b/src/views/asset-management/asset-information/components/PackageListCard.vue index ba3f1fe..9ee7b75 100644 --- a/src/views/asset-management/asset-information/components/PackageListCard.vue +++ b/src/views/asset-management/asset-information/components/PackageListCard.vue @@ -48,9 +48,14 @@ {{ scope.row.package_name }} - + + + + diff --git a/src/views/asset-management/asset-information/composables/useAssetInfo.ts b/src/views/asset-management/asset-information/composables/useAssetInfo.ts index 88d8875..503cc4f 100644 --- a/src/views/asset-management/asset-information/composables/useAssetInfo.ts +++ b/src/views/asset-management/asset-information/composables/useAssetInfo.ts @@ -245,6 +245,7 @@ export function useAssetInfo() { order_no: pkg.order_no || '', package_name: pkg.package_name || '', paid_amount: pkg.paid_amount || 0, + retail_amount : pkg.retail_amount || 0, real_total_mb: pkg.real_total_mb || 0, real_used_mb: pkg.real_used_mb || 0, real_remaining_mb: (pkg.real_total_mb || 0) - (pkg.real_used_mb || 0), diff --git a/src/views/order-management/order-list/detail.vue b/src/views/order-management/order-list/detail.vue index 081ca6e..f1d5da1 100644 --- a/src/views/order-management/order-list/detail.vue +++ b/src/views/order-management/order-list/detail.vue @@ -60,7 +60,7 @@