修复bug

view/molistar/modules/guildAr/js/incomeStatistics.js

@@ -69,9 +69,9 @@ function translateFun() {
     $('.text9').text(langReplace(localLang.incomeStatistics.text9));
     if (roleTypes != 1) {
         $('.Member').hide();
-        $('.income h3').text(langReplace(localLang.incomeStatistics.text222));
-    } else {
         $('.income h3').text(langReplace(localLang.incomeStatistics.text22));
+    } else {
+        $('.income h3').text(langReplace(localLang.incomeStatistics.text222));
     }
 }
 //接口
@@ -99,8 +99,10 @@ function income(startDate, endDate) {
                 $('.dayDate').append(dailyIncomeListStr);
                 // 渲染成员收益统计
                 var memberIncomeStr = '';
-                res.data.memberIncome.memberIncomeList.forEach((res, i) => {
-                    memberIncomeStr += `
+                if (res.data.memberIncome) {
+                    totalGoldIncome[1] = res.data.memberIncome.totalGoldIncome;
+                    res.data.memberIncome.memberIncomeList.forEach((res, i) => {
+                        memberIncomeStr += `
                             <li class="${(i + 1) % 2 === 0 ? 'act' : ''}">
                                 <div class="tx">
                                     <img src="${res.member.avatar}" alt="">
@@ -114,8 +116,9 @@ function income(startDate, endDate) {
                                 <div class="duration">${res.micRemainTime}</div>
                             </li>
                     `
-                })
-                $('.userInfo').append(memberIncomeStr);
+                    })
+                    $('.userInfo').append(memberIncomeStr);
+                }
                 // 渲染周期
                 var str = '';
                 res.data.cycleDateList.forEach((val, i) => {
@@ -127,7 +130,6 @@ function income(startDate, endDate) {
                 // 首次处理
                 $('.titleInfo div').eq(0).text(index == 0 ? langReplace(localLang.incomeStatistics.text5) : langReplace(localLang.incomeStatistics.text9));
                 totalGoldIncome[0] = res.data.dailyIncome.totalGoldIncome;
-                totalGoldIncome[1] = res.data.memberIncome.totalGoldIncome;
                 $('.income .gold b').text(totalGoldIncome[index - 1]);
             } else {
                 toastMsg(res.message)
@@ -151,10 +153,12 @@ $('.tab div').click(function () {
         $('.titleInfo').removeClass('titleInfoAct');
         $('.titleInfo div').eq(0).text(langReplace(localLang.incomeStatistics.text5));
         $('.dayDate').show();
+        $('.income h3').text(langReplace(localLang.incomeStatistics.text222));
     } else {
         $('.titleInfo').addClass('titleInfoAct');
         $('.titleInfo div').eq(0).text(langReplace(localLang.incomeStatistics.text9));
         $('.userInfo').show();
+        $('.income h3').text(langReplace(localLang.incomeStatistics.text22));
     }
 })
 // 打开周期选择

view/molistar/modules/guildAr/local/ar.js

@@ -170,9 +170,9 @@ langAr = {
     incomeStatistics: {
         text1: `إحصائيات الدخل`,
         text2: `إجمالي دخل العملات`,
-        text22:`دخل الوكالة`,  
-        text222:`الدخل الشخصي`,  
-        text3: `بيانات يومية`,
+        text22: `دخل الوكالة`,
+        text222: `الدخل الشخصي`,
+        text3: `البيانات الشخصية`,
         text4: `بيانات الأعضاء`,
         text5: `التاريخ`,
         text6: `دخل العملات`,

view/molistar/modules/guildAr/local/en.js

@@ -170,7 +170,7 @@ langEn = {
         text2:`Total Coins Income`,
         text22:`Agnecy Income`,
         text222:`Personal Income`,
-        text3:`Daily Data`,
+        text3:`Personal Data`,
         text4:`Member Data`,
         text5:`Date`,
         text6:`Coins Income`,

view/molistar/modules/guildAr/local/zh.js

@@ -171,9 +171,9 @@ langZh = {
     incomeStatistics: {
         text1: `收入統計`,
         text2: `總幣收入`,
-        text22:`機構收入`,  
+        text22:`公會收入`,  
         text222:`個人收入`,  
-        text3: `每日數據`,
+        text3:`個人資料`,  
         text4: `會員數據`,
         text5: `日期`,
         text6: `幣收入`,