diff --git a/components/TrafficCard.vue b/components/TrafficCard.vue index 4d37bb2..93353fe 100644 --- a/components/TrafficCard.vue +++ b/components/TrafficCard.vue @@ -39,12 +39,23 @@ + \ No newline at end of file diff --git a/pages/asset-package-history/asset-package-history.vue b/pages/asset-package-history/asset-package-history.vue index 45365e1..6d8085e 100644 --- a/pages/asset-package-history/asset-package-history.vue +++ b/pages/asset-package-history/asset-package-history.vue @@ -111,33 +111,28 @@ // 获取已使用流量 const getUsedFlow = (item) => { if (item.enable_virtual_data) { - // 启用虚流量,显示已用虚流量 return formatMB(item.virtual_used_mb || 0); } else { - // 未启用虚流量,显示已用真流量 - return formatMB(item.data_usage_mb || 0); + return formatMB(item.real_used_mb || 0); } }; // 获取总流量 const getTotalFlow = (item) => { if (item.enable_virtual_data) { - // 启用虚流量,显示虚流量总量 - return formatMB(item.virtual_limit_mb || 0); + return formatMB(item.virtual_total_mb || 0); } else { - // 未启用虚流量,显示真流量总量 - return formatMB(item.data_limit_mb || 0); + return formatMB(item.real_total_mb || 0); } }; // 获取剩余流量 const getRemainFlow = (item) => { if (item.enable_virtual_data) { - // 启用虚流量,显示剩余虚流量 - return formatMB(item.virtual_remain_mb || 0); + const remain = (item.virtual_total_mb || 0) - (item.virtual_used_mb || 0); + return formatMB(remain); } else { - // 未启用虚流量,计算剩余真流量 - const remain = (item.data_limit_mb || 0) - (item.data_usage_mb || 0); + const remain = (item.real_total_mb || 0) - (item.real_used_mb || 0); return formatMB(remain); } }; @@ -147,13 +142,11 @@ let used, total; if (item.enable_virtual_data) { - // 启用虚流量 used = item.virtual_used_mb || 0; - total = item.virtual_limit_mb || 0; + total = item.virtual_total_mb || 0; } else { - // 未启用虚流量 - used = item.data_usage_mb || 0; - total = item.data_limit_mb || 0; + used = item.real_used_mb || 0; + total = item.real_total_mb || 0; } if (!total) return 0;