From a8d3ec68beabff466b57e91c4c64c33684d8debe Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Fri, 21 Nov 2025 18:58:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=A3=E7=90=86=E4=B8=AD=E5=BF=83?=
=?UTF-8?q?=E9=A1=B5):=20=E8=AE=A1=E7=AE=97=E5=8E=86=E5=8F=B2=E8=96=AA?=
=?UTF-8?q?=E8=B5=84=E5=B9=B6=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/AgencyCenter/index.vue | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/views/AgencyCenter/index.vue b/src/views/AgencyCenter/index.vue
index dc331a0..b56be41 100644
--- a/src/views/AgencyCenter/index.vue
+++ b/src/views/AgencyCenter/index.vue
@@ -114,7 +114,7 @@
{{ t('history_salary') }}
- ${{ salaryInfo.hostSalary }}
+ ${{ totalSalary }}
@@ -341,6 +341,7 @@ import { getTeamId, getUserId } from '@/utils/userStore.js'
import { clearSelectedPayee } from '@/utils/payeeStore.js'
import { getTeamMemberCount, getTeamBill, getTeamMemberWork } from '@/api/teamBill.js'
+import { getUserIdentity } from '@/api/wallet.js'
import GeneralHeader from '@/components/GeneralHeader.vue'
import workReportBox from '@/components/workReportBox.vue'
@@ -351,6 +352,8 @@ const router = useRouter()
// 监听语言变化并设置文档方向
locale.value && setDocumentDirection(locale.value)
+const totalSalary = ref('0') //历史收入
+
// 任务标签
const taskTab = ref('host')
const tabHost = ref(null)
@@ -413,7 +416,7 @@ const fetchMemberWorkData = async () => {
}
const response = await getTeamMemberWork(userId)
- if (response && response.status && response.body) {
+ if (response.status && response.body) {
const data = response.body
// 取第一条target数据(最新的工作数据)
@@ -452,6 +455,30 @@ const fetchMemberWorkData = async () => {
} else {
console.warn('No targets data available')
}
+
+ const targets = response.body.targets || []
+ const userIdentity = await getUserIdentity()
+
+ // 计算总薪资 - 根据用户身份选择对应的薪资字段
+ const totalAmount = targets.reduce((sum, target) => {
+ let salary = 0
+
+ // 根据用户身份决定使用哪个薪资字段
+ if (userIdentity.body?.agent) {
+ // agent 为 true 时,使用 ownSalary
+ salary = parseFloat(
+ (target.target?.settlementResult?.ownSalary || 0) +
+ (target.target?.settlementResult?.memberSalary || 0)
+ )
+ } else if (userIdentity.body?.anchor) {
+ // anchor 为 true 时,使用 memberSalary
+ salary = parseFloat(target.target?.settlementResult?.memberSalary || 0)
+ }
+
+ return sum + salary
+ }, 0)
+
+ totalSalary.value = totalAmount.toFixed(2)
} else {
console.warn('No member work data available')
}