From 3b17a2345bd547f8258c89bf6fa203d4d5b429b9 Mon Sep 17 00:00:00 2001 From: hzj <1304805162@qq.com> Date: Fri, 9 Jan 2026 15:04:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=B7=A5=E4=BD=9C=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=BB=84=E4=BB=B6):=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/AgencyCenter/TeamBill.vue | 4 +--- src/views/AgencyCenter/index.vue | 12 +++--------- src/views/HostCenter/index.vue | 12 +++--------- src/views/Wallet/Detail/HistorySalary.vue | 12 +++++------- 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/views/AgencyCenter/TeamBill.vue b/src/views/AgencyCenter/TeamBill.vue index 434bc4b..d557726 100644 --- a/src/views/AgencyCenter/TeamBill.vue +++ b/src/views/AgencyCenter/TeamBill.vue @@ -198,9 +198,7 @@ const fetchTeamBill = async (teamId) => { return { ...bill, // 将时间戳转换为可读格式 - date: `${bill.billBelong.toString().substring(0, 4)}.${bill.billBelong - .toString() - .substring(4, 6)}`, + date: bill.billTitle, status: formatStatus(bill.status), hostSalary: formatSalaryValue(bill.settleResult?.memberSalary || 0) || '-', agencySalary: formatSalaryValue(bill.settleResult?.ownSalary || 0) || '-', diff --git a/src/views/AgencyCenter/index.vue b/src/views/AgencyCenter/index.vue index 36fcd53..db80879 100644 --- a/src/views/AgencyCenter/index.vue +++ b/src/views/AgencyCenter/index.vue @@ -418,12 +418,6 @@ const fetchMemberWorkData = async () => { if (data.targets && data.targets.length > 0) { const latestTarget = data.targets[0] - // 格式化日期：202508 -> 08/2025 - const billBelong = latestTarget.billBelong.toString() - const year = billBelong.substring(0, 4) - const month = billBelong.substring(4, 6) - const day = billBelong.substring(6, 8) - // 格式化状态 const formatStatus = (status) => { const statusMap = { @@ -441,7 +435,7 @@ const fetchMemberWorkData = async () => { // 更新数据 Object.assign(progressInfo, { - date: `${year}.${month}.${day}`, + date: latestTarget.billTitle, status: formatStatus(latestTarget.status), target: level, salary: latestTarget.target?.settlementResult?.memberSalary?.toFixed(2) || '–', @@ -466,7 +460,7 @@ const fetchMemberWorkData = async () => { // agent 为 true 时，使用 ownSalary salary = parseFloat( (target.target?.settlementResult?.ownSalary || 0) + - (target.target?.settlementResult?.memberSalary || 0) + (target.target?.settlementResult?.memberSalary || 0), ) } else if (userIdentity.body?.anchor) { // anchor 为 true 时，使用 memberSalary @@ -509,7 +503,7 @@ watch( color.value = 'rgba(174, 174, 174, 1)' } return - } + }, ) // 页面跳转方法 diff --git a/src/views/HostCenter/index.vue b/src/views/HostCenter/index.vue index fc0d2a8..2469e21 100644 --- a/src/views/HostCenter/index.vue +++ b/src/views/HostCenter/index.vue @@ -169,12 +169,6 @@ const fetchMemberWorkData = async () => { if (data.targets && data.targets.length > 0) { const latestTarget = data.targets[0] - // 格式化日期：202508 -> 08/2025 - const billBelong = latestTarget.billBelong.toString() - const year = billBelong.substring(0, 4) - const month = billBelong.substring(4, 6) - const day = billBelong.substring(6, 8) - // 格式化状态 const formatStatus = (status) => { const statusMap = { @@ -194,7 +188,7 @@ const fetchMemberWorkData = async () => { // 更新数据 Object.assign(progressInfo, { - date: `${year}.${month}.${day}`, + date: latestTarget.billTitle, status: formatStatus(latestTarget.status), target: level, salary: @@ -203,8 +197,8 @@ const fetchMemberWorkData = async () => { ? (latestTarget.target?.settlementResult?.ownSalary || 0) + (latestTarget.target?.settlementResult?.memberSalary || 0) : userIdentity.body?.anchor - ? latestTarget.target?.settlementResult?.memberSalary - : null + ? latestTarget.target?.settlementResult?.memberSalary + : null, ) || '-', income: latestTarget.target?.settlementResult?.acceptGiftValue, timeDays: latestTarget.target?.effectiveDay || '–', diff --git a/src/views/Wallet/Detail/HistorySalary.vue b/src/views/Wallet/Detail/HistorySalary.vue index cdcc0fa..ba8fd46 100644 --- a/src/views/Wallet/Detail/HistorySalary.vue +++ b/src/views/Wallet/Detail/HistorySalary.vue @@ -308,7 +308,7 @@ watch( color.value = 'rgba(174, 174, 174, 1)' } return - } + }, ) // 获取政策数据 @@ -374,9 +374,7 @@ const fetchWorkReports = async (userId) => { workReports.value = targets.map((target) => ({ id: target.id, - date: `${target.billBelong.toString().substring(0, 4)}.${target.billBelong - .toString() - .substring(4, 6)}`, + date: target.billTitle, status: getStatusText(target.status), income: target.target?.acceptGiftValue, target: getLevelFromPolicy(target.target?.acceptGiftValue), // 使用政策数据计算等级 @@ -386,8 +384,8 @@ const fetchWorkReports = async (userId) => { ? (target.target?.settlementResult?.ownSalary || 0) + (target.target?.settlementResult?.memberSalary || 0) : userIdentity.body?.anchor - ? target.target?.settlementResult?.memberSalary - : null + ? target.target?.settlementResult?.memberSalary + : null, ) || '-', totalSalary: formatSalaryValue(target.target?.settlementResult?.totalSalary) || '-', timeDays: target.target?.effectiveDay || '-', @@ -407,7 +405,7 @@ const fetchWorkReports = async (userId) => { // agent 为 true 时，使用 ownSalary salary = parseFloat( (target.target?.settlementResult?.ownSalary || 0) + - (target.target?.settlementResult?.memberSalary || 0) + (target.target?.settlementResult?.memberSalary || 0), ) } else if (userIdentity.body?.anchor) { // anchor 为 true 时，使用 memberSalary