diff --git a/src/views/BDCenterView.vue b/src/views/BDCenterView.vue index da4d7e4..143a951 100644 --- a/src/views/BDCenterView.vue +++ b/src/views/BDCenterView.vue @@ -70,7 +70,7 @@ ID: {{ userInfo.id || userInfo.account }}

-
+
@@ -262,55 +262,50 @@
- -
@@ -330,12 +325,14 @@ " @click.stop > -
2025.10.01-2025.10.15:
+
{{ BDSalaryMore.period }}
- Team total recharge: $400 Team total salary: $400 + Team total recharge: ${{ BDSalaryMore.teamTotalRecharge }}, Team total salary: ${{ + BDSalaryMore.teamTotalSalary + }}
- aaaaa + {{ member.userName }}
- ID: 321654 + ID: {{ member.account }}
-
Salary: $100
-
Recharge: $500
-
Host:8
+
Salary: ${{ member.salary }}
+
Recharge: ${{ member.recharge }}
+
Host:{{ member.hostCount }}
@@ -411,7 +408,7 @@ import { computed, onMounted, ref } from 'vue' import { useRouter } from 'vue-router' import MobileHeader from '@/components/MobileHeader.vue' import { getAgentMonthLastTarget, getAgentMonthTarget, getBdAgentList } from '@/api/teamBill.js' -import { getBdMemberBillList, getBdHistory } from '@/api/bdCenter.js' +import { getBdMemberBillList, getBdHistory, getBdHistoryMore } from '@/api/bdCenter.js' import { getTeamId } from '@/utils/userStore.js' import { usePageInitializationWithConfig } from '@/utils/pageConfig.js' import { isInApp } from '@/utils/appBridge.js' @@ -425,7 +422,9 @@ const router = useRouter() const teamMemberCount = ref(0) const showHistory = ref(false) //历史弹窗 const showMore = ref(false) //更多弹窗 + const BDSalary = ref({}) //BD历史收入 +const BDSalaryMore = ref({}) //BD历史收入更多 const BDData = ref({}) //BD成员数据 const defaultAvatarUrl = (e) => { @@ -438,22 +437,17 @@ const maskLayerShow = computed(() => { return showHistory.value || showMore.value }) -const showReportDetail = () => { - showHistory.value = false - showMore.value = true -} - // 关闭弹窗 const closedPopup = () => { showHistory.value = false showMore.value = false } -// 前往团队成员 -const goToTeamMember = () => { +// 前往政策页 +const gotoPolicy = () => { router.push({ - path: '/team-member', - query: { source: 'bd-center', members: teamMemberCount.value }, + path: '/policy', + query: { from: 'BD' }, }) } @@ -502,13 +496,24 @@ const apiGetBdHistory = async () => { } } +// 查询BD历史记录 +const showReportDetail = async (billBelong) => { + const res = await getBdHistoryMore(billBelong) + if (res.status && res.body) { + // 处理返回的数据 + console.log('BD History More:', res.body) + BDSalaryMore.value = res.body || {} + + showHistory.value = false + showMore.value = true + } +} + // 页面初始化数据 const initData = async () => { // 示例调用方式 apiGetBdMemberBillList() //BD成员账单列表 apiGetBdHistory() //BD历史记录 - // apiGetBdMemberBillDetailList(456) - // apiGetBdMonthlyIncome(789) } onMounted(() => { @@ -524,7 +529,12 @@ onMounted(() => { } .bd-center { - font-family: -apple-system, BlinkMacSystemFont, sans-serif; + max-height: 100vh; + overflow-y: auto; +} + +.bd-center::-webkit-scrollbar { + display: none; } /* APP连接状态 */ diff --git a/src/views/BDLeaderCenter/index.vue b/src/views/BDLeaderCenter/index.vue index 0753b95..8135468 100644 --- a/src/views/BDLeaderCenter/index.vue +++ b/src/views/BDLeaderCenter/index.vue @@ -66,7 +66,7 @@ ID: {{ userInfo.id || userInfo.account || '1234567890' }}

-
+
@@ -87,6 +87,7 @@
+
-
2025.10.01-2025.10.15:
+
{{ BDData.billTitle }}
- Team total recharge: $400 Team total salary: $400 + Team total recharge: ${{ BDData.totalRecharge }}, Team total salary: ${{ + BDData.totalSalary + }}
- {{ member.name }} + {{ BDInfo.agentName }}
- ID: {{ member.id }} + ID: {{ BDInfo.agentAccount }}
-
Salary: ${{ member.salary }}
- Recharge: ${{ member.recharge }} + Salary: ${{ BDInfo.teamSalaryAmount }} +
+
+ Recharge: ${{ BDInfo.teamRechargeAmount }} +
+
+ Host:{{ BDInfo.teamMemberCount }}
-
Host: {{ member.host }}
-
+
-
2025.10.01-2025.10.15:
+
{{ BDLeaderData.billTitle }}
- Team total recharge: $400 Team total salary: $400 + Team total recharge: ${{ BDLeaderData.totalRecharge || 0 }}, Team total salary: ${{ + BDLeaderData.totalSalary || 0 + }}
- {{ member.name }} + {{ BDInfo.agentName }}
- ID: {{ member.id }} + ID: {{ BDInfo.agentAccount }}
- Team Salary: ${{ member.salary }} + Team Salary: ${{ BDInfo.teamSalaryAmount }}
- Agencies: {{ member.agencies }} + Agencies: {{ BDInfo.teamMemberCount }}
@@ -369,7 +377,7 @@
- +
-
Total income: $1000
-
Previous period income: $1000
+
+ Total income: ${{ + currentHistoryType === 'bd' ? BDSalary.totalIncome : BDLeaderSalary.totalIncome + }} +
+
+ Previous period income: ${{ + currentHistoryType === 'bd' + ? BDSalary.previousPeriodIncome + : BDLeaderSalary.previousPeriodIncome + }} +
+
-
- +