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) + } } }