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 @@
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 @@
-
+
@@ -13,40 +13,40 @@
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 @@
-
+
@@ -13,7 +13,7 @@
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 == 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
USD to EGP exchange rate: 1:50
+ +50