From 1889382b6f23dac025595811ee5b10b955ca2012 Mon Sep 17 00:00:00 2001 From: dragon <3013557874@qq.com> Date: Mon, 30 Dec 2024 15:53:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B1=87=E7=8E=87=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/molistar/modules/guild-ar/js/salary.js | 30 +++++++++++++++++-- view/molistar/modules/guild-ar/local/ar.js | 1 + view/molistar/modules/guild-ar/local/en.js | 1 + view/molistar/modules/guild-ar/local/tr.js | 1 + view/molistar/modules/guild-ar/local/zh.js | 1 + .../modules/guild-ar/salary_account.html | 10 +++---- 6 files changed, 36 insertions(+), 8 deletions(-) diff --git a/view/molistar/modules/guild-ar/js/salary.js b/view/molistar/modules/guild-ar/js/salary.js index 3e5200f2..dcfa3bdd 100644 --- a/view/molistar/modules/guild-ar/js/salary.js +++ b/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'); diff --git a/view/molistar/modules/guild-ar/local/ar.js b/view/molistar/modules/guild-ar/local/ar.js index 8ef3c74a..99f3284c 100644 --- a/view/molistar/modules/guild-ar/local/ar.js +++ b/view/molistar/modules/guild-ar/local/ar.js @@ -270,6 +270,7 @@ langAr = { textnew6: `معدل رسوم المعالجة`, textnew7: `رسوم المعالجة`, textnew8: `سعر الصرف من الدولار الأمريكي إلى الجنيه المصري: 1:`, + textnew8_TRY: 'سعر صرف الدولار الأمريكي إلى الليرة التركية: 1:', textnew9: `المبلغ المقدر`, textnew10: `ملاحظة: قد يتأثر المبلغ المتوقع الوصول بسعر صرف البنك وما إلى ذلك.`, textnew11: `سحب`, diff --git a/view/molistar/modules/guild-ar/local/en.js b/view/molistar/modules/guild-ar/local/en.js index 40d595dc..9b53a8c5 100644 --- a/view/molistar/modules/guild-ar/local/en.js +++ b/view/molistar/modules/guild-ar/local/en.js @@ -270,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`, diff --git a/view/molistar/modules/guild-ar/local/tr.js b/view/molistar/modules/guild-ar/local/tr.js index 22a5ec42..61df1ece 100644 --- a/view/molistar/modules/guild-ar/local/tr.js +++ b/view/molistar/modules/guild-ar/local/tr.js @@ -270,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`, diff --git a/view/molistar/modules/guild-ar/local/zh.js b/view/molistar/modules/guild-ar/local/zh.js index dd4b350c..034ea2a7 100644 --- a/view/molistar/modules/guild-ar/local/zh.js +++ b/view/molistar/modules/guild-ar/local/zh.js @@ -272,6 +272,7 @@ langZh = { textnew6: `手續費率`, textnew7: `手續費`, textnew8: `美元兌埃及鎊匯率：1：`, + textnew8_TRY: `美元兌土耳其里拉匯率：1：`, textnew9: `預估金額`, textnew10: `注意：預估到賬金額可能會受銀行匯率等影響。`, textnew11: `提款`, diff --git a/view/molistar/modules/guild-ar/salary_account.html b/view/molistar/modules/guild-ar/salary_account.html index 51bce2ff..b8e9213f 100644 --- a/view/molistar/modules/guild-ar/salary_account.html +++ b/view/molistar/modules/guild-ar/salary_account.html @@ -220,11 +220,11 @@ - - - - - + + + + +