From 40a0e08f9c646ad2f344b6fd80e901c1d13e204c Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Mon, 24 Nov 2025 19:55:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(BD=E3=80=81BDLeader):=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=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/BDCenter/index.vue       |  8 ++++++++
 src/views/BDLeaderCenter/index.vue | 20 ++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/views/BDCenter/index.vue b/src/views/BDCenter/index.vue
index 8de4d10..c6a80b3 100644
--- a/src/views/BDCenter/index.vue
+++ b/src/views/BDCenter/index.vue
@@ -557,6 +557,10 @@ const apiGetBdMemberBillList = async () => {
   const res = await getBdMemberBillList('BD')
   if (res.status && res.body) {
     BDData.value = res.body || {}
+    // 如果BDSalary.value获取完数据就整合数据
+    if (BDSalary.value.incomeDetails) {
+      BDSalary.value.incomeDetails.unshift(BDData.value.bdHistoryCO)
+    }
   }
 }
 
@@ -565,6 +569,10 @@ const apiGetBdHistory = async () => {
   const res = await getBdHistory()
   if (res.status && res.body) {
     BDSalary.value = res.body || {}
+    // 如果BDData.value获取完数据就整合数据
+    if (BDData.value.bdHistoryCO) {
+      BDSalary.value.incomeDetails.unshift(BDData.value.bdHistoryCO)
+    }
   }
 }
 
diff --git a/src/views/BDLeaderCenter/index.vue b/src/views/BDLeaderCenter/index.vue
index 3446613..4ee2b53 100644
--- a/src/views/BDLeaderCenter/index.vue
+++ b/src/views/BDLeaderCenter/index.vue
@@ -868,14 +868,22 @@ const apiGetBdMemberBillList = async () => {
   const res = await getBdMemberBillList('BD')
   if (res.status && res.body) {
     BDData.value = res.body || {}
+    // 如果BDSalary.value获取完数据就整合数据
+    if (BDSalary.value.incomeDetails) {
+      BDSalary.value.incomeDetails.unshift(BDData.value.bdHistoryCO)
+    }
   }
 }
 
-// 查询BD成员账单列表
+// 查询BDLeader成员账单列表
 const apiGetBdLeaderMemberBillList = async () => {
   const res = await getBdMemberBillList('BDLEADER')
   if (res.status && res.body) {
     BDLeaderData.value = res.body || {}
+    // 如果BDLeaderSalary.value获取完数据就整合数据
+    if (BDLeaderSalary.value.incomeDetails) {
+      BDLeaderSalary.value.incomeDetails.unshift(BDLeaderData.value.bdHistoryCO)
+    }
   }
 }
 
@@ -884,14 +892,22 @@ const apiGetBdHistory = async () => {
   const res = await getBdHistory()
   if (res.status && res.body) {
     BDSalary.value = res.body || {}
+    // 如果BDData.value获取完数据就整合数据
+    if (BDData.value.bdHistoryCO) {
+      BDSalary.value.incomeDetails.unshift(BDData.value.bdHistoryCO)
+    }
   }
 }
 
-// 查询BD历史记录
+// 查询BDLeader历史记录
 const apiGetBdLeaderHistory = async () => {
   const res = await getBdLeaderHistory()
   if (res.status && res.body) {
     BDLeaderSalary.value = res.body || {}
+    // 如果BDLeaderData.value获取完数据就整合数据
+    if (BDLeaderData.value.bdHistoryCO) {
+      BDLeaderSalary.value.incomeDetails.unshift(BDLeaderData.value.bdHistoryCO)
+    }
   }
 }