diff --git a/view/molistar/modules/guild-ar/BANK.html b/view/molistar/modules/guild-ar/BANK.html index 60873a8..e4da46a 100644 --- a/view/molistar/modules/guild-ar/BANK.html +++ b/view/molistar/modules/guild-ar/BANK.html @@ -13,7 +13,7 @@
- Bank + Bank
@@ -23,42 +23,46 @@
* - +
* - +
* - +
* - +
* - +
* - +
-
Confirm
+
-
Determine
+
-
Country
-
OK
-
asdasdasd
+
+
+
diff --git a/view/molistar/modules/guild-ar/PAYONNER.html b/view/molistar/modules/guild-ar/PAYONNER.html index d74eb3b..6c812de 100644 --- a/view/molistar/modules/guild-ar/PAYONNER.html +++ b/view/molistar/modules/guild-ar/PAYONNER.html @@ -4,7 +4,7 @@ - Payonner + @@ -13,40 +13,40 @@
- Payonner +
- +
* - +
* - +
* - +
-
Confirm
+
-
Determine
+
-
Country
-
OK
-
asdasdasd
+
+
+
diff --git a/view/molistar/modules/guild-ar/VODAFONE.html b/view/molistar/modules/guild-ar/VODAFONE.html index 763b175..36f9f7b 100644 --- a/view/molistar/modules/guild-ar/VODAFONE.html +++ b/view/molistar/modules/guild-ar/VODAFONE.html @@ -4,7 +4,7 @@ - Vodafone + Vodafone @@ -13,7 +13,7 @@
- Vodafone + Vodafone
@@ -23,26 +23,26 @@
* - - + +
* - +
-
Confirm
+
Confirm
-
Determine
+
Determine
-
Country
-
OK
-
asdasdasd
+
Country
+
OK
+
diff --git a/view/molistar/modules/guild-ar/css/salary.css b/view/molistar/modules/guild-ar/css/salary.css index d23dccd..0867c50 100644 --- a/view/molistar/modules/guild-ar/css/salary.css +++ b/view/molistar/modules/guild-ar/css/salary.css @@ -193,6 +193,12 @@ html { width: 0.42667rem; height: 0.42667rem; margin-top: 0.05333rem; +} + +.transfer_method li .wenhao, +.transfer_dollars li .wenhao { + width: 0.58667rem; + height: 0.58667rem; display: inline-block; } @@ -240,17 +246,16 @@ html { .transfer_method .agent_settlement .pop, .transfer_dollars .official_withdraw .pop, .transfer_dollars .agent_settlement .pop { - width: 4.8rem; - height: 1.12rem; - background: url(../images/pop.png) no-repeat; - background-size: 100% 100%; + min-width: 5.76rem; position: absolute; - top: -0.42667rem; - left: 3.52rem; + top: -2.1rem; + left: 2.52rem; font-size: 0.32rem; line-height: 0.42667rem; color: #ffffff; - padding: 0.10667rem 0.21333rem 0; + padding: 0.21333rem; + background: #04D5C6; + border-radius: 0.21333rem; } .transfer_dollars { @@ -380,7 +385,7 @@ html { .pubWithdrawal .pubWithdrawal_in { width: 9.14667rem; - height: 10.72rem; + min-height: 10.72rem; position: absolute; left: 50%; top: 50%; @@ -787,11 +792,6 @@ html { transform: rotate(180deg); } -.arabic .transfer_method .official_withdraw .pop { - left: unset; - right: 3.52rem; -} - .arabic .my_salary p img { transform: rotate(180deg); } @@ -806,12 +806,11 @@ html { padding-left: unset; } -.arabic .transfer_method .official_withdraw .pop, -.arabic .transfer_method .agent_settlement .pop, -.arabic .transfer_dollars .official_withdraw .pop, -.arabic .transfer_dollars .agent_settlement .pop { - background: url(../images/pop-ar.png) no-repeat; - background-size: 100% 100%; - left: auto; - right: 3.52rem; +.arabic .pubWithdrawal .pubWithdrawal_in { + height: 11.6rem; +} + +.arabic .pubWithdrawal .pubWithdrawal_in .boxw .right { + float: left; + white-space: nowrap; } diff --git a/view/molistar/modules/guild-ar/css/salary.scss b/view/molistar/modules/guild-ar/css/salary.scss index adb38c5..547e6ae 100644 --- a/view/molistar/modules/guild-ar/css/salary.scss +++ b/view/molistar/modules/guild-ar/css/salary.scss @@ -189,6 +189,11 @@ html { width: px2rem(16); height: px2rem(16); margin-top: px2rem(2); + } + + .wenhao { + width: px2rem(22); + height: px2rem(22); display: inline-block; } @@ -228,17 +233,19 @@ html { // display: none; .pop { - width: px2rem(180); - height: px2rem(42); - background: url(../images/pop.png) no-repeat; - background-size: 100% 100%; + min-width: px2rem(216); + // height: px2rem(42); + // background: url(../images/pop.png) no-repeat; + // background-size: 100% 100%; position: absolute; - top: px2rem(-16); - left: px2rem(132); + top: -2.1rem; + left: 2.52rem; font-size: px2rem(12); line-height: px2rem(16); color: #ffffff; - padding: px2rem(4) px2rem(8) 0; + padding: px2rem(8); + background: #04D5C6; + border-radius: px2rem(8); } } } @@ -370,7 +377,7 @@ html { // display: none; .pubWithdrawal_in { width: px2rem(343); - height: px2rem(402); + min-height: px2rem(402); position: absolute; left: 50%; top: 50%; @@ -412,6 +419,7 @@ html { .box3 { height: auto; + b { margin-bottom: px2rem(6); display: block; @@ -744,10 +752,10 @@ html { } } - .transfer_method .official_withdraw .pop { - left: unset; - right: 3.52rem; - } + // .transfer_method .official_withdraw .pop { + // left: unset; + // right: 3.52rem; + // } .my_salary p img { transform: rotate(180deg); @@ -765,13 +773,21 @@ html { } } - .transfer_method .official_withdraw .pop, - .transfer_method .agent_settlement .pop, - .transfer_dollars .official_withdraw .pop, - .transfer_dollars .agent_settlement .pop { - background: url(../images/pop-ar.png) no-repeat; - background-size: 100% 100%; - left: auto; - right: 3.52rem; + // .transfer_method .official_withdraw .pop, + // .transfer_method .agent_settlement .pop, + // .transfer_dollars .official_withdraw .pop, + // .transfer_dollars .agent_settlement .pop { + // background: url(../images/pop-ar.png) no-repeat; + // background-size: 100% 100%; + // left: auto; + // right: 3.52rem; + // } + .pubWithdrawal .pubWithdrawal_in { + height: 11.6rem; + + .boxw .right { + float: left; + white-space: nowrap; + } } } \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/images/wenhao.png b/view/molistar/modules/guild-ar/images/wenhao.png new file mode 100644 index 0000000..a8c4407 Binary files /dev/null and b/view/molistar/modules/guild-ar/images/wenhao.png differ diff --git a/view/molistar/modules/guild-ar/js/BANK.js b/view/molistar/modules/guild-ar/js/BANK.js index cad76c1..a512055 100644 --- a/view/molistar/modules/guild-ar/js/BANK.js +++ b/view/molistar/modules/guild-ar/js/BANK.js @@ -57,7 +57,16 @@ $(function () { function translateFun() { langReplace = window.lang.replace; localLang = window.lang; - // $('.text1').text(langReplace(localLang.bill.text1)); + $('.text1').text(langReplace(localLang.bank.text1)); + $('.text2').text(langReplace(localLang.bank.text2)); + $('.text3').text(langReplace(localLang.bank.text3)); + $('.text4').text(langReplace(localLang.bank.text4)); + $('.text5').attr('placeholder', langReplace(localLang.bank.text5)); + $('.text6').attr('placeholder', langReplace(localLang.bank.text6)); + $('.text7').attr('placeholder', langReplace(localLang.bank.text7)); + $('.text8').attr('placeholder', langReplace(localLang.bank.text8)); + $('.text9').attr('placeholder', langReplace(localLang.bank.text9)); + $('.text10').attr('placeholder', langReplace(localLang.bank.text10)); } // 获取 @@ -70,7 +79,7 @@ function get() { success: function (res) { if (res.code == 200) { // 回显数据 - $('.currencyType input').val('Currency Type:' + res.data.currency); + $('.currencyType input').val(langReplace(localLang.payonner.text6) + res.data.currency); fields = res.data.fields; if (fields.country == '') { $('.but .determine').hide(); @@ -142,7 +151,7 @@ $('.but .ok').click(function (params) { } update(JSON.stringify(objJson)); } else { - toastMsg('Mandatory fields cannot be blank'); + toastMsg(langReplace(localLang.payonner.text10)); } }) // 绑定更新信息 diff --git a/view/molistar/modules/guild-ar/js/PAYONNER.js b/view/molistar/modules/guild-ar/js/PAYONNER.js index 3d5936c..4111f82 100644 --- a/view/molistar/modules/guild-ar/js/PAYONNER.js +++ b/view/molistar/modules/guild-ar/js/PAYONNER.js @@ -57,7 +57,15 @@ $(function () { function translateFun() { langReplace = window.lang.replace; localLang = window.lang; - // $('.text1').text(langReplace(localLang.bill.text1)); + $('.text1').text(langReplace(localLang.payonner.text1)); + $('.text2').text(langReplace(localLang.payonner.text2)); + $('.text3').text(langReplace(localLang.payonner.text3)); + $('.text4').text(langReplace(localLang.payonner.text4)); + $('.text5').text(langReplace(localLang.payonner.text5)); + $('.text6').attr('placeholder',langReplace(localLang.payonner.text6)); + $('.text7').attr('placeholder',langReplace(localLang.payonner.text7)); + $('.text8').attr('placeholder',langReplace(localLang.payonner.text8)); + $('.text9').attr('placeholder',langReplace(localLang.payonner.text9)); } // 获取 @@ -70,7 +78,7 @@ function get() { success: function (res) { if (res.code == 200) { // 回显数据 - $('.currencyType input').val('Currency Type:' + res.data.currency); + $('.currencyType input').val(langReplace(localLang.payonner.text6) + res.data.currency); fields = res.data.fields; if (fields.country == '') { $('.but .determine').hide(); @@ -136,7 +144,7 @@ $('.but .ok').click(function (params) { } update(JSON.stringify(objJson)); } else { - toastMsg('Mandatory fields cannot be blank'); + toastMsg(langReplace(localLang.payonner.text10)); } }) // 绑定更新信息 diff --git a/view/molistar/modules/guild-ar/js/VODAFONE.js b/view/molistar/modules/guild-ar/js/VODAFONE.js index d340957..e06d78b 100644 --- a/view/molistar/modules/guild-ar/js/VODAFONE.js +++ b/view/molistar/modules/guild-ar/js/VODAFONE.js @@ -57,7 +57,12 @@ $(function () { function translateFun() { langReplace = window.lang.replace; localLang = window.lang; - // $('.text1').text(langReplace(localLang.bill.text1)); + $('.text2').text(langReplace(localLang.payonner.text2)); + $('.text3').text(langReplace(localLang.payonner.text3)); + $('.text4').text(langReplace(localLang.payonner.text4)); + $('.text5').text(langReplace(localLang.payonner.text5)); + $('.text7').attr('placeholder',langReplace(localLang.payonner.text7)); + $('.text8').attr('placeholder',langReplace(localLang.payonner.text8)); } // 获取 @@ -70,7 +75,7 @@ function get() { success: function (res) { if (res.code == 200) { // 回显数据 - $('.currencyType input').val('Currency Type:' + res.data.currency); + $('.currencyType input').val(langReplace(localLang.payonner.text6) + res.data.currency); fields = res.data.fields; if (fields.country == '') { $('.but .determine').hide(); @@ -134,7 +139,7 @@ $('.but .ok').click(function (params) { } update(JSON.stringify(objJson)); } else { - toastMsg('Mandatory fields cannot be blank'); + toastMsg(langReplace(localLang.payonner.text10)); } }) // 绑定更新信息 diff --git a/view/molistar/modules/guild-ar/js/bill.js b/view/molistar/modules/guild-ar/js/bill.js index a780e51..fa82ae7 100644 --- a/view/molistar/modules/guild-ar/js/bill.js +++ b/view/molistar/modules/guild-ar/js/bill.js @@ -101,7 +101,7 @@ function getData() { str += `
  • - ${(item.type == 5 || item.type == 6) ? `${(item.status == 0 ? 'In Review' : item.status == 1 ? 'Issued' : 'Rejected')}` : ''} + ${(item.type == 5 || item.type == 6) ? `${(item.status == 0 ? langReplace(localLang.bill.text10) : item.status == 1 ? langReplace(localLang.bill.text11) : langReplace(localLang.bill.text12))}` : ''}

    ${item.type == 1 ? `${langReplace(localLang.bill.text5)}` : item.type == 2 ? `${langReplace(localLang.bill.text6)}` : item.type == 3 ? `${langReplace(localLang.bill.text7)}` : item.type == 4 ? `ID:${type == 1 ? item.target.erbanNo : item.me.erbanNo} ${langReplace(localLang.bill.text8)} ID: ${type == 1 ? item.me.erbanNo : item.target.erbanNo}` : `${langReplace(localLang.bill.text9)}`}

    ${type == 1 ? '+ ' + item.operateUsdNum.toLocaleString() : item.operateUsdNum.toLocaleString()} ÜS
    diff --git a/view/molistar/modules/guild-ar/js/salary.js b/view/molistar/modules/guild-ar/js/salary.js index 6fca767..f4f2a02 100644 --- a/view/molistar/modules/guild-ar/js/salary.js +++ b/view/molistar/modules/guild-ar/js/salary.js @@ -93,6 +93,18 @@ $(function () { $('.text16').text(langReplace(localLang.salary.text16)); $('.text17').html(langReplace(localLang.salary.text17)); $('.text18').html(langReplace(localLang.salary.text18)); + $('.textnew1').html(langReplace(localLang.salary.textnew1)); + $('.textnew2').html(langReplace(localLang.salary.textnew2)); + $('.textnew3').html(langReplace(localLang.salary.textnew3)); + $('.textnew4').html(langReplace(localLang.salary.textnew4)); + $('.textnew5').html(langReplace(localLang.salary.textnew5)); + $('.textnew6').html(langReplace(localLang.salary.textnew6)); + $('.textnew7').html(langReplace(localLang.salary.textnew7)); + $('.textnew8').html(langReplace(localLang.salary.textnew8)); + $('.textnew9').html(langReplace(localLang.salary.textnew9)); + $('.textnew10').html(langReplace(localLang.salary.textnew10)); + $('.textnew11').html(langReplace(localLang.salary.textnew11)); + $('.textnew12').html(langReplace(localLang.salary.textnew12)); } }); // 获取usd操作的功能标签tab @@ -231,9 +243,10 @@ function typeTabFun(type) {

    ${langReplace(localLang.salary.text20)} +

    -
    - ${langReplace(localLang.salary.text21)} +
  • ` @@ -373,6 +386,12 @@ $('.transfer_method').on('click', 'li', function () { transfer_dollars_ArrType = type; dollarsFun(transfer_dollars_ArrType); }) +$('.transfer_method').on('click', 'li .wenhao', function () { + $('.pop').show(); +}) +$('.transfer_method').on('click', 'li .pop', function () { + $('.pop').hide(); +}) // 选择金额方式 $('.transfer_dollars').on('click', 'li', function () { $(this).addClass('li_act').siblings().removeClass('li_act'); @@ -499,7 +518,7 @@ function operateValue(than) { $('.pubWithdrawal .pubWithdrawal_in .box3 .right').text(`${than.attr('guildUsdNum') * withdrawRate} ${accountObj.currency}`); $('.pubWithdrawal').show(); } else { - toastMsg('Please select a withdrawal account') + toastMsg(langReplace(localLang.salary.textnew13)) } } else { var obj = { diff --git a/view/molistar/modules/guild-ar/local/ar.js b/view/molistar/modules/guild-ar/local/ar.js index b04461c..610a006 100644 --- a/view/molistar/modules/guild-ar/local/ar.js +++ b/view/molistar/modules/guild-ar/local/ar.js @@ -225,11 +225,24 @@ langAr = { text18: `(نسبة التبادل 1:7000)`, text19: `تبادل العملات`, text20: `السحب الرسمي`, - text21: `يمكن التسوية في الأول و 16 من كل شهر`, + text21: `تفتح قناة السحب في اليومين الأول والثاني من كل شهر، ووقت معالجة طلبات السحب يكون من اليوم الثالث إلى العاشر من كل شهر. `, text22: `تسوية الوكيل`, text23: `تسوية وكلاء الشحن`, text24: `يرجى إدخال المبلغ المراد استرداده`, - text25: `عملات` + text25: `عملات`, + textnew1: `حساب السحب`, + textnew2: `غير مرتبط`, + textnew3: `اختر الحساب`, + textnew4: `سحب`, + textnew5: `مبلغ السحب`, + textnew6: `معدل رسوم المعالجة`, + textnew7: `رسوم المعالجة`, + textnew8: `سعر الصرف من الدولار الأمريكي إلى الجنيه المصري: 1:`, + textnew9: `المبلغ المقدر`, + textnew10: `ملاحظة: قد يتأثر المبلغ المتوقع الوصول بسعر صرف البنك وما إلى ذلك.`, + textnew11: `سحب`, + textnew12: `إلغاء`, + textnew13: `يرجى اختيار حساب السحب`, }, bill: { text1: `الفاتورة`, @@ -241,6 +254,9 @@ langAr = { text7: `تحويل الراتب إلى عملات`, text8: `تحويل الراتب`, text9: `راتب الوكيل`, + text10: `قيد المراجعة`, + text11: `تم الإصدار`, + text12: `مرفوض`, }, success: { text1: `التسوية ناجحة`, @@ -259,5 +275,29 @@ langAr = { text14: `حساب التسوية`, text15: `الوقت`, text16: `طلب` - } + }, + payonner: { + text1: `Payonner`, + text2: `تأكيد`, + text3: `تحديد`, + text4: `البلد`, + text5: `موافق`, + text6: `نوع العملة:`, + text7: `البلد`, + text8: `رقم حساب المستلم`, + text9: `اسم المستلم`, + text10: `لا يمكن ترك الحقول الإلزامية فارغة`, + }, + bank: { + text1: `تأكيد`, + text2: `تحديد`, + text3: `البلد`, + text4: `موافق`, + text5: `البلد`, + text6: `رقم حساب المستلم`, + text7: `اسم البنك`, + text8: `رمز SWIFT`, + text9: `اسم المستلم`, + text10: `العنوان`, + }, } \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/local/en.js b/view/molistar/modules/guild-ar/local/en.js index 0afe76e..e1de883 100644 --- a/view/molistar/modules/guild-ar/local/en.js +++ b/view/molistar/modules/guild-ar/local/en.js @@ -223,11 +223,24 @@ langEn = { text18: `(Exchange at a ratio of 1:7000)`, text19: `Exchange coins`, text20: `Withdraw`, - text21: `Settlement available on the 1st and 16th of each month`, + text21: `The withdrawal channel opens on the 1st and 2nd of every month, and the processing time for withdrawal requests is from the 3rd to the 10th of every month.`, text22: `Agent settlement`, text23: `Recharge agent settlement`, text24: `Please enter the amount to be redeemed`, text25: `Coins`, + textnew1: `Withdrawal account`, + textnew2: `Unbound`, + textnew3: `Select Account`, + textnew4: `Withdrawal`, + textnew5: `Withdrawal amount `, + textnew6: `Handling Fee rate`, + textnew7: `Handling Fee`, + textnew8: `USD to EGP exchange rate: 1:`, + textnew9: `Estimated amount`, + textnew10: `Note: Estimated arrival amount may be affected by bank exchange rate, etc.`, + textnew11: `Withdraw`, + textnew12: `Cancel`, + textnew13: `Please select a withdrawal account`, }, bill: { text1: `Bill`, @@ -239,6 +252,10 @@ langEn = { text7: `Salary exchange for coins`, text8: `Salary transfer`, text9: `Agent salary`, + text10: `In Review `, + text11: `Issued`, + text12: `Rejected`, + text13: ``, }, success: { text1: `Settlement successful`, @@ -258,4 +275,28 @@ langEn = { text15: `Time`, text16: `Order`, }, + payonner: { + text1: `Payonner `, + text2: `Confirm`, + text3: `Determine`, + text4: `Country`, + text5: `OK`, + text6: `Currency Type:`, + text7: `Country`, + text8: `payeeAccountNo`, + text9: `payeeName`, + text10: `Mandatory fields cannot be blank`, + }, + bank: { + text1: `Confirm`, + text2: `Determine`, + text3: `Country`, + text4: `OK`, + text5: `Country`, + text6: `payeeAccountNo`, + text7: `Bank Name`, + text8: `SWIFT Code`, + text9: `payeeName`, + text10: `Address`, + }, } diff --git a/view/molistar/modules/guild-ar/local/zh.js b/view/molistar/modules/guild-ar/local/zh.js index 024d020..b7675ea 100644 --- a/view/molistar/modules/guild-ar/local/zh.js +++ b/view/molistar/modules/guild-ar/local/zh.js @@ -226,11 +226,24 @@ langZh = { text18: `(兌換比例為 1:7000)`, text19: `兌換硬幣`, text20: `官方提現`, - text21: `每月的 1 日和 16 日可結算`, + text21: `提款通道每月1日和2日開放,提款申請的處理時間為每月3日至10日。`, text22: `代理結算`, text23: `充值代理結算`, text24: `請輸入要贖回的金額`, - text25: `金幣` + text25: `金幣`, + textnew1: `提款賬戶`, + textnew2: `未綁定`, + textnew3: `選擇賬戶`, + textnew4: `提款`, + textnew5: `提款金額`, + textnew6: `手續費率`, + textnew7: `手續費`, + textnew8: `美元兌埃及鎊匯率:1:`, + textnew9: `預估金額`, + textnew10: `注意:預估到賬金額可能會受銀行匯率等影響。`, + textnew11: `提款`, + textnew12: `取消`, + textnew13: `請選擇提款賬戶`, }, bill: { text1: `賬單`, @@ -242,6 +255,9 @@ langZh = { text7: `薪資兌換為硬幣`, text8: `薪資轉賬`, text9: `代理薪資`, + text10: `審核中`, + text11: `已發放`, + text12: `已拒絕`, }, success: { text1: `結算成功`, @@ -261,4 +277,28 @@ langZh = { text15: `時間`, text16: `訂單` }, + payonner: { + text1: `Payonner`, + text2: `確認`, + text3: `確定`, + text4: `國家`, + text5: `確定`, + text6: `貨幣類型:`, + text7: `國家`, + text8: `收款人賬號`, + text9: `收款人姓名`, + text10: `必填字段不能為空`, + }, + bank: { + text1: `確認`, + text2: `確定`, + text3: `國家`, + text4: `確定`, + text5: `國家`, + text6: `收款人賬號`, + text7: `銀行名稱`, + text8: `SWIFT 代碼`, + text9: `收款人姓名`, + text10: `地址`, + }, } \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/salary_account.html b/view/molistar/modules/guild-ar/salary_account.html index e600f59..7d2b209 100644 --- a/view/molistar/modules/guild-ar/salary_account.html +++ b/view/molistar/modules/guild-ar/salary_account.html @@ -72,8 +72,8 @@
    -
    *Withdrawal account
    -
    Unbound
    +
    *
    +
    @@ -165,7 +165,7 @@
    -
    Select Account
    +
    -
    Withdrawal
    +
    -
    Withdrawal amount
    +
    0USD
    -
    Handling Fee rate
    +
    6%
    - Handling Fee -

    USD to EGP exchange rate: 1:50

    + +

    50

    0USD
    -
    Estimated amount
    +
    0USD
    -
    Note: Estimated arrival amount may be affected by bank exchange rate, etc.
    -
    Withdraw
    -
    Cancel
    +
    +
    +