新增汇率计算

view/molistar/activity/2024-newYear/css/index.css

@@ -135,7 +135,7 @@ body {
   font-weight: 600;
   position: absolute;
   left: 0;
-  bottom: -0.53333rem;
+  bottom: -0.65rem;
 }
 
 .timeBox {
@@ -936,3 +936,11 @@ body {
   background: url(../images/rewardBg-tr.png) no-repeat;
   background-size: 100% 100%;
 }
+
+.Turkiye .timeBox {
+  width: 10rem;
+}
+
+.Turkiye .timeBox div {
+  width: 1.6rem;
+}

view/molistar/activity/2024-newYear/css/index.scss

@@ -136,7 +136,7 @@ body {
                 font-weight: 600;
                 position: absolute;
                 left: 0;
-                bottom: px2rem(-40);
+                bottom: -0.65rem;
             }
         }
     }
@@ -949,4 +949,12 @@ body {
         background: url(../images/rewardBg-tr.png) no-repeat;
         background-size: 100% 100%;
     }
+
+    .timeBox {
+        width: px2rem(750);
+
+        div {
+            width: 1.6rem;
+        }
+    }
 }

view/molistar/activity/2024-newYear/js/index.js

@@ -128,7 +128,7 @@ function getConfig() {
                 if (listTo3.length < 3) {
                     let arr = new Array(3 - listTo3.length).fill({
                         avatar: './images/logo.png',
-                        name: '虚位以待',
+                        name: langReplace(localLang.demoModule.waiting),
                         erbanNo: null,
                         totalNum: null
                     })

view/molistar/activity/2024-newYear/local/ar.js

@@ -24,5 +24,6 @@ langAr = {
         more: 'أكثر',
         month: 'شهر ',
         day: 'يوم ',
+        waiting: 'منتظر',
     }
 }

view/molistar/activity/2024-newYear/local/en.js

@@ -28,5 +28,6 @@ langEn = {
         more: 'More',
         month: 'Month',
         day: 'Day',
+        waiting: 'Waiting',
     },
 }

view/molistar/activity/2024-newYear/local/tr.js

@@ -26,6 +26,7 @@ langTr = {
         more: 'Daha Fazla',
         month: 'Ay',
         day: 'Gün',
+        waiting: 'Beklemek',
     },
     
 }

view/molistar/activity/2024-newYear/local/zh.js

@@ -24,5 +24,6 @@ langZh = {
         more: '更多',
         month: '月',
         day: '日',
+        waiting: '虚位以待',
     }
 }

view/molistar/modules/guild-ar/css/personal.css

@@ -160,6 +160,47 @@ body {
   font-weight: 500;
 }
 
+.page1 .myDuration {
+  width: 9.14667rem;
+  height: 1.17333rem;
+  line-height: 1.17333rem;
+  background: #F2F3F7;
+  border-radius: 0.21333rem;
+  margin: 0 auto 0.34667rem;
+  box-sizing: border-box;
+  padding: 0 0.29333rem;
+  display: none;
+}
+
+.page1 .myDuration strong {
+  color: #313131;
+  font-size: 0.4rem;
+  font-weight: 500;
+  display: block;
+}
+
+.page1 .myDuration b {
+  color: #313131;
+  font-size: 0.4rem;
+  font-weight: 500;
+  display: block;
+  margin-right: 0.1rem;
+}
+
+.page1 .myDuration span {
+  display: block;
+  width: 1.62667rem;
+  height: 0.45333rem;
+  line-height: 0.45333rem;
+  font-weight: 600;
+  font-size: 0.26667rem;
+  color: #fff;
+  text-align: center;
+  background: #313131;
+  border-radius: 0.45333rem;
+  margin-top: 0.37333rem;
+}
+
 .page1 .incomeTitle {
   width: 9.14667rem;
   height: 0.66667rem;
@@ -654,6 +695,10 @@ body {
   font-weight: 400;
 }
 
+.arabic .page1 .myDuration span {
+  margin-right: 0.1rem;
+}
+
 .arabic .my .tx {
   float: right;
 }

view/molistar/modules/guild-ar/css/personal.scss

@@ -168,6 +168,47 @@ body {
         font-weight: 500;
     }
 
+    .myDuration {
+        width: px2rem(686);
+        height: px2rem(88);
+        line-height: px2rem(88);
+        background: #F2F3F7;
+        border-radius: px2rem(16);
+        margin: 0 auto px2rem(26);
+        box-sizing: border-box;
+        padding: 0 px2rem(22);
+        display: none;
+
+        strong {
+            color: #313131;
+            font-size: px2rem(30);
+            font-weight: 500;
+            display: block;
+        }
+
+        b {
+            color: #313131;
+            font-size: px2rem(30);
+            font-weight: 500;
+            display: block;
+            margin-right: 0.1rem;
+        }
+
+        span {
+            display: block;
+            width: px2rem(122);
+            height: px2rem(34);
+            line-height: px2rem(34);
+            font-weight: 600;
+            font-size: px2rem(20);
+            color: #fff;
+            text-align: center;
+            background: #313131;
+            border-radius: px2rem(34);
+            margin-top: px2rem(28);
+        }
+    }
+
     .incomeTitle {
         width: px2rem(686);
         height: px2rem(50);
@@ -664,6 +705,9 @@ body {
 }
 
 .arabic {
+    .page1 .myDuration span{
+        margin-right: 0.1rem;
+    }
     .my .tx {
         float: right;
     }

view/molistar/modules/guild-ar/js/index.js

@@ -37,6 +37,7 @@ var payoneer;
 var usdt;
 var payPal;
 var familyMemberId;
+var partitionId;
 // 初始化函數
 $(function () {
     getInfoFromClient();
@@ -144,6 +145,7 @@ function get() {
         success(res) {
             if (res.code === 200) {
                 // 存储分区id partitionId
+                partitionId = res.data.partitionId;
                 window.localStorage.setItem('partitionId', res.data.partitionId);
                 // 判断身份
                 roleTypes = res.data.roleType;
@@ -396,7 +398,7 @@ $('.guildInfoSet').click(function () {
 })
 // 我的收入
 $('.memberFlow').click(function (params) {
-    window.location.href = `./personal.html?roleTypes=${roleTypes}`
+    window.location.href = `./personal.html?roleTypes=${roleTypes}&partitionId=${partitionId}`
 })
 // 薪资账户
 $('.memberFlow2 b').click(function (params) {

view/molistar/modules/guild-ar/js/personal.js

@@ -57,7 +57,7 @@ $(function () {
         fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
         langReplace = window.lang.replace;
         localLang = window.lang;
-        if(getQueryString().roleTypes == 1){
+        if (getQueryString().roleTypes == 1) {
             $('.page2 .agencyDiamondIncome').show();
         }
         translateFun();
@@ -86,6 +86,7 @@ function translateFun() {
     $('.text17').text(langReplace(localLang.personal.text17));
     $('.text18').text(langReplace(localLang.personal.text18));
     $('.text19').text(langReplace(localLang.personal.text19));
+    $('.duration').text(langReplace(localLang.personal.duration));
     $('.agencyDiamondIncometext1').text(langReplace(localLang.agencyDiamondIncome.text1));
 }
 // 配置接口
@@ -117,6 +118,12 @@ function getAccount() {
                 $('.page1 .incomeBoxLast .d1 span').text(`${lastCycle.totalIncome} ÜS`);
                 $('.page1 .incomeBoxLast .d2 span').text(`${lastCycle.settledIncome} ÜS`);
                 $('.page1 .incomeBoxLast .d3 span').text(`${lastCycle.remainingIncome} ÜS`);
+                // 有效时长
+                if (getQueryString().partitionId == 8) {
+                    $('.page1 .myDuration b').text(res.data.person.curCycleMicRemainTime);
+                    $('.page1 .myDuration span').text(res.data.person.curCycle.cycleDate);
+                    $('.page1 .myDuration').css('display', 'flex');
+                }
                 // agency
                 if (res.data.agency) {
                     var agency = res.data.agency

view/molistar/modules/guild-ar/js/salary.js

@@ -509,12 +509,23 @@ function operateValue(than) {
       $('.pubWithdrawal .pubWithdrawal_in .ok').attr('type', type);
       $('.pubWithdrawal .pubWithdrawal_in .ok').attr('accountType', accountObj.type);
       if (accountObj.type == 'VODAFONE') {
-        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p').show();
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p strong').text(localLang.salary.textnew8);
         $('.pubWithdrawal .pubWithdrawal_in .box3 .left p span').text(accountObj.usdRatio);
-        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * 50} ${accountObj.currency}`);
+        var num = numberFun(((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * accountObj.usdRatio)
+        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${num} ${accountObj.currency}`);
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p').show();
+      } else if (accountObj.type == 'BANK_TRANSFER_LIRA') {
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p strong').text(localLang.salary.textnew8_TRY);
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p span').text(accountObj.usdRatio);
+        var num = numberFun(((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * accountObj.usdRatio)
+        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${num} ${accountObj.currency}`);
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p').show();
+        // Math.floor(((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * accountObj.usdRatio * 100) / 100
       } else {
         $('.pubWithdrawal .pubWithdrawal_in .box3 .left p').hide();
-        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate))} ${accountObj.currency}`);
+        console.log(accountObj.usdRatio);
+        var num = numberFun(((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * accountObj.usdRatio)
+        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${num} ${accountObj.currency}`);
       }
       $('.pubWithdrawal .pubWithdrawal_in .box1 .right').text(`${than.attr('guildUsdNum')} USD`);
       $('.pubWithdrawal .pubWithdrawal_in .box2 .right').text(withdrawRate * 100 + '%');
@@ -532,6 +543,19 @@ function operateValue(than) {
     operate(obj)
   }
 }
+// 保留两位小数函数
+function numberFun(num) {
+  // 將數字轉為字符串
+  var numStr = num.toString();
+  // 分割整數部分和小數部分
+  var parts = numStr.split('.');
+  // 如果有小數部分，截取前兩位，否則直接返回整數部分
+  var result = parts[0]; // 整數部分
+  if (parts[1]) { // 存在小數部分時
+    result += '.' + parts[1].substring(0, 2);
+  }
+  return parseFloat(result); // 返回數字
+}
 // 确认提现按钮
 $('.pubWithdrawal .pubWithdrawal_in .ok').click(function () {
   var guildUsdNum = $(this).attr('guildUsdNum');

view/molistar/modules/guild-ar/local/ar.js

@@ -204,6 +204,7 @@ langAr = {
         departed: 'غادر',
     },
     personal: {
+        duration: 'مدتي:',
         text1: `الشخصي`,
         text2: `الوكالة`,
         text3: `الماس الخاص بي:`,
@@ -269,6 +270,7 @@ langAr = {
         textnew6: `معدل رسوم المعالجة`,
         textnew7: `رسوم المعالجة`,
         textnew8: `سعر الصرف من الدولار الأمريكي إلى الجنيه المصري: 1:`,
+        textnew8_TRY: 'سعر صرف الدولار الأمريكي إلى الليرة التركية: 1:',
         textnew9: `المبلغ المقدر`,
         textnew10: `ملاحظة: قد يتأثر المبلغ المتوقع الوصول بسعر صرف البنك وما إلى ذلك.`,
         textnew11: `سحب`,

view/molistar/modules/guild-ar/local/en.js

@@ -204,6 +204,7 @@ langEn = {
         departed: 'Departed',
     },
     personal: {
+        duration: `My duration:`,
         text1: `Personal<span></span>`,
         text2: `Agency<span></span>`,
         text3: `My diamond:`,
@@ -269,6 +270,7 @@ langEn = {
         textnew6: `Handling Fee rate`,
         textnew7: `Handling Fee`,
         textnew8: `USD to EGP exchange rate: 1:`,
+        textnew8_TRY: `USD to TRY exchange rate: 1:`,
         textnew9: `Estimated amount`,
         textnew10: `Note: Estimated arrival amount may be affected by bank exchange rate, etc.`,
         textnew11: `Withdraw`,

view/molistar/modules/guild-ar/local/tr.js

@@ -203,6 +203,7 @@ langTr = {
         departed: 'Ayrıldılar',
     },
     personal: {
+        duration: 'Sürem:',
         text1: `Kişisel<span></span>`,
         text2: `Ajans<span></span>`,
         text3: `Benim elmasım:`,
@@ -269,6 +270,7 @@ langTr = {
         textnew6: `İşlem Ücreti Oranı`,
         textnew7: `İşlem Ücreti`,
         textnew8: `USD to EGP döviz kuru: 1:`,
+        textnew8_TRY: `USD ile TRY döviz kuru: 1:`,
         textnew9: `Tahmini Miktar`,
         textnew10: `Not: Tahmini varış miktarı banka döviz kuru gibi faktörlerden etkilenebilir.`,
         textnew11: `Çekim`,

view/molistar/modules/guild-ar/local/zh.js

@@ -206,6 +206,7 @@ langZh = {
         placeholder: '請添加',
     },
     personal: {
+        duration: '我的時長:',
         text1: `個人`,
         text2: `機構`,
         text3: `我的鑽石：`,
@@ -271,6 +272,7 @@ langZh = {
         textnew6: `手續費率`,
         textnew7: `手續費`,
         textnew8: `美元兌埃及鎊匯率：1：`,
+        textnew8_TRY: `美元兌土耳其里拉匯率：1：`,
         textnew9: `預估金額`,
         textnew10: `注意：預估到賬金額可能會受銀行匯率等影響。`,
         textnew11: `提款`,

view/molistar/modules/guild-ar/personal.html

@@ -37,6 +37,8 @@
         </div>
         <!-- 账户 -->
         <div class="account text5"></div>
+        <!-- 主播时长 -->
+        <div class="myDuration"><strong class="duration"></strong> <b>0s</b> <span>12.1-12.15</span></div>
         <!-- 当前收益 -->
         <div class="incomeTitle"><span></span><b class="text6"></b><i></i></div>
         <p class="copywriting1 text7"></p>

view/molistar/modules/guild-ar/salary_account.html

@@ -220,11 +220,11 @@
   <script src="../../common/js/vconsole.min.js"></script>
   <script src="../../common/js/common2.js"></script>
   <script src="../../common/js/layer.js"></script>
-  <script src="./local/en.js?v=1.0"></script>
-  <script src="./local/zh.js?v=1.0"></script>
-  <script src="./local/ar.js?v=1.0"></script>
-  <script src="./local/tr.js?v=1.0"></script>
-  <script src="./js/salary.js?v=1.0"></script>
+  <script src="./local/en.js?v=2.0"></script>
+  <script src="./local/zh.js?v=2.0"></script>
+  <script src="./local/ar.js?v=2.0"></script>
+  <script src="./local/tr.js?v=2.0"></script>
+  <script src="./js/salary.js?v=2.0"></script>
   <script src="../../common/local/langHandler.js"></script>
 </body>