diff --git a/src/views/TeamBillView.vue b/src/views/TeamBillView.vue index 14327a8..df5c4f1 100644 --- a/src/views/TeamBillView.vue +++ b/src/views/TeamBillView.vue @@ -204,26 +204,17 @@ const fetchTeamBill = async (teamId) => { const response = await getTeamBill(teamId) if (response.status && response.body) { - const userIdentity = await getUserIdentity() billList.value = response.body.map((bill) => ({ ...bill, // 将时间戳转换为可读格式 date: `${bill.billBelong.toString().substring(0, 4)}.${bill.billBelong .toString() .substring(4, 6)}`, - target: getTargetLevel(bill.target?.acceptGiftValue), // 使用政策数据计算等级 + target: getTargetLevel(bill.acceptGiftValue), // 使用政策数据计算等级 status: formatStatus(bill.status), - salary: - formatSalaryValue( - userIdentity.body?.agent - ? (bill.target?.settlementResult?.ownSalary || 0) + - (bill.target?.settlementResult?.memberSalary || 0) - : userIdentity.body?.anchor - ? bill.target?.settlementResult?.memberSalary - : null - ) || '-', - totalSalary: formatSalaryValue(bill.target?.settlementResult?.totalSalary) || '-', - timeDays: bill.target?.effectiveDay || '-', + salary: formatSalaryValue(bill.settleResult?.ownSalary || 0) || '-', + totalSalary: formatSalaryValue(bill.settleResult?.totalSalary) || '-', + timeDays: bill.effectiveDay || '-', createTimeFormatted: new Date(bill.createTime).toLocaleDateString(), updateTimeFormatted: new Date(bill.updateTime).toLocaleDateString(), }))