From 5587100c0b8fbcbad78492376bc511ae46b662ee Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Mon, 24 Nov 2025 14:17:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(BD=E3=80=81BDLeader):=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/ar.json                |  6 +++-
 src/locales/en.json                |  6 +++-
 src/locales/zh.json                |  6 +++-
 src/views/BDCenter/index.vue       | 36 +++++++++++++++++---
 src/views/BDLeaderCenter/index.vue | 53 +++++++++++++++++++++++-------
 5 files changed, 88 insertions(+), 19 deletions(-)

diff --git a/src/locales/ar.json b/src/locales/ar.json
index eb5c534..59548c2 100644
--- a/src/locales/ar.json
+++ b/src/locales/ar.json
@@ -32,8 +32,8 @@
   "platform_policy": "سياسة المنصة",
   "num_teams": "عدد الفريق:",
   "team_top_up": "الفريق قيمة",
-  "bd_income_salary": "BD دخل (راتب)",
   "bd_income_top_up": "BD دخل (شحن)",
+  "bd_income_salary": "BD دخل (راتب)",
   "host_type": "نوع المضيف",
   "minutes": "دقائق",
   "gift_task": "مهمة الهدية",
@@ -266,6 +266,10 @@
   "bd": "BD",
   "bd_leader": "قائد BD",
   "bd_salary": "راتب BD",
+
+  "agency_list": "قائمة الوكالة",
+  "bd_list": "قائمة BD",
+
   "bd_leader_history": "سجل قائد BD",
 
   "current_status": "الحالة الحالية:",
diff --git a/src/locales/en.json b/src/locales/en.json
index f5e65e2..f9a1de0 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -32,8 +32,8 @@
   "platform_policy": "Platform Policy",
   "num_teams": "Number Of Teams：",
   "team_top_up": "Team top-up",
-  "bd_income_salary": "BD Income (Salary)",
   "bd_income_top_up": "BD Income (Top-up)",
+  "bd_income_salary": "BD Income (Salary)",
   "host_type": "Host type",
   "minutes": "Minutes",
   "gift_task": "Gift Task",
@@ -266,6 +266,10 @@
   "bd": "BD",
   "bd_leader": "BD Leader",
   "bd_salary": "BD Salary",
+
+  "agency_list": "Agency List",
+  "bd_list": "BD List",
+
   "bd_leader_history": "BD Leader History",
 
   "current_status": "Current status:",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 2b85f63..6a02f46 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -32,8 +32,8 @@
   "platform_policy": "平台政策",
   "num_teams": "团队数量:",
   "team_top_up": "团队充值",
-  "bd_income_salary": "BD收入（工资）",
   "bd_income_top_up": "BD收入（充值）",
+  "bd_income_salary": "BD收入（工资）",
   "host_type": "主播类型",
   "minutes": "分钟",
   "gift_task": "礼物任务",
@@ -266,6 +266,10 @@
   "bd": "BD",
   "bd_leader": "BD主管",
   "bd_salary": "BD工资",
+
+  "agency_list": "代理列表",
+  "bd_list": "BD列表",
+
   "bd_leader_history": "BD主管历史记录",
 
   "current_status": "当前状态：",
diff --git a/src/views/BDCenter/index.vue b/src/views/BDCenter/index.vue
index 786215e..8de4d10 100644
--- a/src/views/BDCenter/index.vue
+++ b/src/views/BDCenter/index.vue
@@ -292,14 +292,15 @@
                 long="true"
                 @showMore="showReportDetail(income.billBelong)"
               >
+                <!-- 进行中 -->
                 <template v-if="income.statusText == 'In Progress'" v-slot:content>
                   <div>{{ income.billTitle }}</div>
                   <div style="font-size: 0.9em">
-                    {{ t('agency_number') }}: {{ income.agencyNumber }}
+                    {{ t('agency_number') }}: {{ income.agencyNumber || 0 }}
                   </div>
                   <div style="display: flex; justify-content: space-between">
                     <div style="font-size: 0.9em">
-                      {{ t('team_salary') }}: ${{ income.teamSalaryAmount }}
+                      {{ t('team_salary') }}: ${{ income.teamSalaryAmount || 0 }}
                     </div>
                     <div style="font-size: 0.9em">
                       {{ t('bd_income_salary') }}: ${{ income.bdIncomeSalary || 0 }} ({{
@@ -319,15 +320,40 @@
                   </div>
                 </template>
 
+                <!-- 已完成 -->
                 <template v-else v-slot:content>
                   <div>{{ income.billTitle }}</div>
                   <div style="font-size: 0.9em">
-                    {{ t('num_teams') }}: {{ income.agencyNumber }}
+                    {{ t('num_teams') }}: {{ income.agencyNumber || 0 }}
                   </div>
-                  <div style="display: flex; justify-content: space-between">
+
+                  <!-- 展示团队薪资（高收入） -->
+                  <div
+                    v-if="income.hitPolicyType == 'TEAM_SALARY'"
+                    style="display: flex; justify-content: space-between"
+                  >
+                    <!-- 团队薪资 -->
                     <div style="font-size: 0.9em">
-                      {{ t('team_top_up') }}: ${{ income.teamRechargeAmount }}
+                      {{ t('team_salary') }}: ${{ income.teamSalaryAmount || 0 }}
                     </div>
+                    <!-- 薪资收益 -->
+                    <div style="font-size: 0.9em">
+                      {{ t('bd_income_salary') }}: ${{ income.settlementSalary || 0 }} ({{
+                        income.commissionRate || 0
+                      }}%)
+                    </div>
+                  </div>
+
+                  <!-- 展示团队充值（高支出） -->
+                  <div
+                    v-else-if="income.hitPolicyType == 'TEAM_RECHARGE'"
+                    style="display: flex; justify-content: space-between"
+                  >
+                    <!-- 团队充值 -->
+                    <div style="font-size: 0.9em">
+                      {{ t('team_top_up') }}: ${{ income.teamRechargeAmount || 0 }}
+                    </div>
+                    <!-- 充值收益 -->
                     <div style="font-size: 0.9em">
                       {{ t('bd_income_top_up') }}: ${{ income.settlementSalary || 0 }} ({{
                         income.commissionRate || 0
diff --git a/src/views/BDLeaderCenter/index.vue b/src/views/BDLeaderCenter/index.vue
index 21552d9..3446613 100644
--- a/src/views/BDLeaderCenter/index.vue
+++ b/src/views/BDLeaderCenter/index.vue
@@ -451,14 +451,15 @@
                   long="true"
                   @showMore="showReportDetail(income.billBelong)"
                 >
+                  <!-- 进行中 -->
                   <template v-if="income.statusText == 'In Progress'" v-slot:content>
                     <div>{{ income.billTitle }}</div>
                     <div style="font-size: 0.9em">
-                      {{ t('agency_number') }}: {{ income.agencyNumber }}
+                      {{ t('agency_number') }}: {{ income.agencyNumber || 0 }}
                     </div>
                     <div style="display: flex; justify-content: space-between">
                       <div style="font-size: 0.9em">
-                        {{ t('team_salary') }}: ${{ income.teamSalaryAmount }}
+                        {{ t('team_salary') }}: ${{ income.teamSalaryAmount || 0 }}
                       </div>
                       <div style="font-size: 0.9em">
                         {{ t('bd_income_salary') }}: ${{ income.bdIncomeSalary || 0 }} ({{
@@ -478,15 +479,40 @@
                     </div>
                   </template>
 
+                  <!-- 已完成 -->
                   <template v-else v-slot:content>
                     <div>{{ income.billTitle }}</div>
                     <div style="font-size: 0.9em">
-                      {{ t('agency_number') }}: {{ income.agencyNumber }}
+                      {{ t('agency_number') }}: {{ income.agencyNumber || 0 }}
                     </div>
-                    <div style="display: flex; justify-content: space-between">
+
+                    <!-- 展示团队薪资（高收入） -->
+                    <div
+                      v-if="income.hitPolicyType == 'TEAM_SALARY'"
+                      style="display: flex; justify-content: space-between"
+                    >
+                      <!-- 团队薪资 -->
                       <div style="font-size: 0.9em">
-                        {{ t('team_top_up') }}: ${{ income.teamRechargeAmount }}
+                        {{ t('team_salary') }}: ${{ income.teamSalaryAmount || 0 }}
                       </div>
+                      <!-- 薪资收益 -->
+                      <div style="font-size: 0.9em">
+                        {{ t('bd_income_salary') }}: ${{ income.settlementSalary || 0 }} ({{
+                          income.commissionRate || 0
+                        }}%)
+                      </div>
+                    </div>
+
+                    <!-- 展示团队充值（高支出） -->
+                    <div
+                      v-else-if="income.hitPolicyType == 'TEAM_RECHARGE'"
+                      style="display: flex; justify-content: space-between"
+                    >
+                      <!-- 团队充值 -->
+                      <div style="font-size: 0.9em">
+                        {{ t('team_top_up') }}: ${{ income.teamRechargeAmount || 0 }}
+                      </div>
+                      <!-- 充值收益 -->
                       <div style="font-size: 0.9em">
                         {{ t('bd_income_top_up') }}: ${{ income.settlementSalary || 0 }} ({{
                           income.commissionRate || 0
@@ -505,18 +531,23 @@
                   :type="income.statusText"
                   @showMore="showReportDetail(income.billBelong)"
                 >
+                  <!-- 进行中 -->
                   <template v-if="income.statusText == 'In Progress'" v-slot:content>
                     <div>{{ income.billTitle }}</div>
+
                     <div style="display: grid; grid-template-columns: repeat(2, 1fr); gap: 8px">
-                      <div>{{ t('bd_number') }}: {{ income.bdNumber }}</div>
-                      <div>{{ t('team_salary') }}: ${{ income.teamSalaryAmount }}</div>
+                      <div>{{ t('bd_number') }}: {{ income.bdNumber || 0 }}</div>
+                      <!-- 团队收入 -->
+                      <div>{{ t('team_salary') }}: ${{ income.teamSalaryAmount || 0 }}</div>
                     </div>
                   </template>
 
+                  <!-- 已完成 -->
                   <template v-else v-slot:content>
                     <div>{{ income.billTitle }}</div>
-                    <div>{{ t('num_teams') }}{{ income.bdNumber }}</div>
-                    <div>{{ t('team_recharge') }}: ${{ income.teamSalaryAmount }}</div>
+                    <div>{{ t('num_teams') }}{{ income.bdNumber || 0 }}</div>
+                    <!-- 团队收入 -->
+                    <div>{{ t('team_recharge') }}: ${{ income.teamSalaryAmount || 0 }}</div>
                   </template>
                 </historySalary>
               </template>
@@ -741,8 +772,8 @@ locale.value && setDocumentDirection(locale.value)
 
 // 标签页数据
 const tabs = ref([
-  { id: 1, langKey: 'bd' },
-  { id: 2, langKey: 'bd_leader' },
+  { id: 1, langKey: 'agency_list' },
+  { id: 2, langKey: 'bd_list' },
 ])
 
 const activeTab = ref(1)