diff --git a/view/molistar/modules/guild-ar/css/salary.css b/view/molistar/modules/guild-ar/css/salary.css index 0fbf6896..846f6f5b 100644 --- a/view/molistar/modules/guild-ar/css/salary.css +++ b/view/molistar/modules/guild-ar/css/salary.css @@ -443,6 +443,7 @@ html { text-align: center; } +.secondary_pop, .agent_pop, .president_pop { position: fixed; @@ -454,8 +455,13 @@ html { z-index: 999; display: none; } +.secondary_pop .secondary_in, +.secondary_pop .agent_pop_in, +.secondary_pop .president_pop_in, +.agent_pop .secondary_in, .agent_pop .agent_pop_in, .agent_pop .president_pop_in, +.president_pop .secondary_in, .president_pop .agent_pop_in, .president_pop .president_pop_in { width: 7.7333333333rem; @@ -466,8 +472,13 @@ html { top: 50%; transform: translate(-50%, -50%); } +.secondary_pop .secondary_in .title, +.secondary_pop .agent_pop_in .title, +.secondary_pop .president_pop_in .title, +.agent_pop .secondary_in .title, .agent_pop .agent_pop_in .title, .agent_pop .president_pop_in .title, +.president_pop .secondary_in .title, .president_pop .agent_pop_in .title, .president_pop .president_pop_in .title { width: 100%; @@ -477,8 +488,13 @@ html { text-align: center; padding: 0.3733333333rem 0; } +.secondary_pop .secondary_in h2, +.secondary_pop .agent_pop_in h2, +.secondary_pop .president_pop_in h2, +.agent_pop .secondary_in h2, .agent_pop .agent_pop_in h2, .agent_pop .president_pop_in h2, +.president_pop .secondary_in h2, .president_pop .agent_pop_in h2, .president_pop .president_pop_in h2 { font-size: 0.32rem; @@ -487,8 +503,13 @@ html { text-align: center; padding: 0 0.2133333333rem 0.2133333333rem; } +.secondary_pop .secondary_in .wrap, +.secondary_pop .agent_pop_in .wrap, +.secondary_pop .president_pop_in .wrap, +.agent_pop .secondary_in .wrap, .agent_pop .agent_pop_in .wrap, .agent_pop .president_pop_in .wrap, +.president_pop .secondary_in .wrap, .president_pop .agent_pop_in .wrap, .president_pop .president_pop_in .wrap { width: 6.9866666667rem; @@ -497,14 +518,24 @@ html { overflow-y: auto; -webkit-overflow-scrolling: touch; } +.secondary_pop .secondary_in .wrap::-webkit-scrollbar, +.secondary_pop .agent_pop_in .wrap::-webkit-scrollbar, +.secondary_pop .president_pop_in .wrap::-webkit-scrollbar, +.agent_pop .secondary_in .wrap::-webkit-scrollbar, .agent_pop .agent_pop_in .wrap::-webkit-scrollbar, .agent_pop .president_pop_in .wrap::-webkit-scrollbar, +.president_pop .secondary_in .wrap::-webkit-scrollbar, .president_pop .agent_pop_in .wrap::-webkit-scrollbar, .president_pop .president_pop_in .wrap::-webkit-scrollbar { display: none; } +.secondary_pop .secondary_in .wrap li, +.secondary_pop .agent_pop_in .wrap li, +.secondary_pop .president_pop_in .wrap li, +.agent_pop .secondary_in .wrap li, .agent_pop .agent_pop_in .wrap li, .agent_pop .president_pop_in .wrap li, +.president_pop .secondary_in .wrap li, .president_pop .agent_pop_in .wrap li, .president_pop .president_pop_in .wrap li { box-sizing: border-box; @@ -516,8 +547,13 @@ html { margin-bottom: 0.2666666667rem; position: relative; } +.secondary_pop .secondary_in .wrap li .avatar, +.secondary_pop .agent_pop_in .wrap li .avatar, +.secondary_pop .president_pop_in .wrap li .avatar, +.agent_pop .secondary_in .wrap li .avatar, .agent_pop .agent_pop_in .wrap li .avatar, .agent_pop .president_pop_in .wrap li .avatar, +.president_pop .secondary_in .wrap li .avatar, .president_pop .agent_pop_in .wrap li .avatar, .president_pop .president_pop_in .wrap li .avatar { width: 1.4666666667rem; @@ -528,8 +564,13 @@ html { transform: translateY(-50%); left: 0.24rem; } +.secondary_pop .secondary_in .wrap li .name, +.secondary_pop .agent_pop_in .wrap li .name, +.secondary_pop .president_pop_in .wrap li .name, +.agent_pop .secondary_in .wrap li .name, .agent_pop .agent_pop_in .wrap li .name, .agent_pop .president_pop_in .wrap li .name, +.president_pop .secondary_in .wrap li .name, .president_pop .agent_pop_in .wrap li .name, .president_pop .president_pop_in .wrap li .name { display: flex; @@ -538,8 +579,13 @@ html { top: 0.2933333333rem; left: 2.0266666667rem; } +.secondary_pop .secondary_in .wrap li .name p, +.secondary_pop .agent_pop_in .wrap li .name p, +.secondary_pop .president_pop_in .wrap li .name p, +.agent_pop .secondary_in .wrap li .name p, .agent_pop .agent_pop_in .wrap li .name p, .agent_pop .president_pop_in .wrap li .name p, +.president_pop .secondary_in .wrap li .name p, .president_pop .agent_pop_in .wrap li .name p, .president_pop .president_pop_in .wrap li .name p { max-width: 3rem; @@ -551,15 +597,25 @@ html { color: #333333; line-height: 0.5866666667rem; } +.secondary_pop .secondary_in .wrap li .name .flag, +.secondary_pop .agent_pop_in .wrap li .name .flag, +.secondary_pop .president_pop_in .wrap li .name .flag, +.agent_pop .secondary_in .wrap li .name .flag, .agent_pop .agent_pop_in .wrap li .name .flag, .agent_pop .president_pop_in .wrap li .name .flag, +.president_pop .secondary_in .wrap li .name .flag, .president_pop .agent_pop_in .wrap li .name .flag, .president_pop .president_pop_in .wrap li .name .flag { width: 0.4533333333rem; height: 0.32rem; } +.secondary_pop .secondary_in .wrap li .starLevel, +.secondary_pop .agent_pop_in .wrap li .starLevel, +.secondary_pop .president_pop_in .wrap li .starLevel, +.agent_pop .secondary_in .wrap li .starLevel, .agent_pop .agent_pop_in .wrap li .starLevel, .agent_pop .president_pop_in .wrap li .starLevel, +.president_pop .secondary_in .wrap li .starLevel, .president_pop .agent_pop_in .wrap li .starLevel, .president_pop .president_pop_in .wrap li .starLevel { height: 0.4rem; @@ -569,8 +625,13 @@ html { left: 2.0266666667rem; top: 1.28rem; } +.secondary_pop .secondary_in .wrap li .starLevel span, +.secondary_pop .agent_pop_in .wrap li .starLevel span, +.secondary_pop .president_pop_in .wrap li .starLevel span, +.agent_pop .secondary_in .wrap li .starLevel span, .agent_pop .agent_pop_in .wrap li .starLevel span, .agent_pop .president_pop_in .wrap li .starLevel span, +.president_pop .secondary_in .wrap li .starLevel span, .president_pop .agent_pop_in .wrap li .starLevel span, .president_pop .president_pop_in .wrap li .starLevel span { height: 0.4rem; @@ -578,8 +639,13 @@ html { color: #7B7B7D; font-size: 0.3466666667rem; } +.secondary_pop .secondary_in .wrap li .starLevel img, +.secondary_pop .agent_pop_in .wrap li .starLevel img, +.secondary_pop .president_pop_in .wrap li .starLevel img, +.agent_pop .secondary_in .wrap li .starLevel img, .agent_pop .agent_pop_in .wrap li .starLevel img, .agent_pop .president_pop_in .wrap li .starLevel img, +.president_pop .secondary_in .wrap li .starLevel img, .president_pop .agent_pop_in .wrap li .starLevel img, .president_pop .president_pop_in .wrap li .starLevel img { width: 0.4rem; @@ -587,8 +653,13 @@ html { display: block; margin: 0 0.04rem; } +.secondary_pop .secondary_in .wrap li .id, +.secondary_pop .agent_pop_in .wrap li .id, +.secondary_pop .president_pop_in .wrap li .id, +.agent_pop .secondary_in .wrap li .id, .agent_pop .agent_pop_in .wrap li .id, .agent_pop .president_pop_in .wrap li .id, +.president_pop .secondary_in .wrap li .id, .president_pop .agent_pop_in .wrap li .id, .president_pop .president_pop_in .wrap li .id { font-weight: 400; @@ -598,15 +669,25 @@ html { top: 0.88rem; left: 2.0266666667rem; } +.secondary_pop .secondary_in .wrap .li_act, +.secondary_pop .agent_pop_in .wrap .li_act, +.secondary_pop .president_pop_in .wrap .li_act, +.agent_pop .secondary_in .wrap .li_act, .agent_pop .agent_pop_in .wrap .li_act, .agent_pop .president_pop_in .wrap .li_act, +.president_pop .secondary_in .wrap .li_act, .president_pop .agent_pop_in .wrap .li_act, .president_pop .president_pop_in .wrap .li_act { box-sizing: border-box; border: 2px solid #04D5C6; } +.secondary_pop .secondary_in .wrap li.no, +.secondary_pop .agent_pop_in .wrap li.no, +.secondary_pop .president_pop_in .wrap li.no, +.agent_pop .secondary_in .wrap li.no, .agent_pop .agent_pop_in .wrap li.no, .agent_pop .president_pop_in .wrap li.no, +.president_pop .secondary_in .wrap li.no, .president_pop .agent_pop_in .wrap li.no, .president_pop .president_pop_in .wrap li.no { width: 100%; @@ -616,8 +697,52 @@ html { font-size: 0.2666666667rem; color: #7b7b7d; } +.secondary_pop .secondary_in .tip_txt1, +.secondary_pop .secondary_in .tip_txt2, +.secondary_pop .agent_pop_in .tip_txt1, +.secondary_pop .agent_pop_in .tip_txt2, +.secondary_pop .president_pop_in .tip_txt1, +.secondary_pop .president_pop_in .tip_txt2, +.agent_pop .secondary_in .tip_txt1, +.agent_pop .secondary_in .tip_txt2, +.agent_pop .agent_pop_in .tip_txt1, +.agent_pop .agent_pop_in .tip_txt2, +.agent_pop .president_pop_in .tip_txt1, +.agent_pop .president_pop_in .tip_txt2, +.president_pop .secondary_in .tip_txt1, +.president_pop .secondary_in .tip_txt2, +.president_pop .agent_pop_in .tip_txt1, +.president_pop .agent_pop_in .tip_txt2, +.president_pop .president_pop_in .tip_txt1, +.president_pop .president_pop_in .tip_txt2 { + font-family: PingFang SC, PingFang SC; + font-weight: 500; + font-size: 0.32rem; + color: #AFB1B3; + line-height: 0.4533333333rem; + text-align: center; + font-style: normal; + text-transform: none; + margin: 0 0.2666666667rem; +} +.secondary_pop .secondary_in .tip_txt2, +.secondary_pop .agent_pop_in .tip_txt2, +.secondary_pop .president_pop_in .tip_txt2, +.agent_pop .secondary_in .tip_txt2, +.agent_pop .agent_pop_in .tip_txt2, +.agent_pop .president_pop_in .tip_txt2, +.president_pop .secondary_in .tip_txt2, +.president_pop .agent_pop_in .tip_txt2, +.president_pop .president_pop_in .tip_txt2 { + margin-top: 0.16rem; +} +.secondary_pop .secondary_in .btn_wrap, +.secondary_pop .agent_pop_in .btn_wrap, +.secondary_pop .president_pop_in .btn_wrap, +.agent_pop .secondary_in .btn_wrap, .agent_pop .agent_pop_in .btn_wrap, .agent_pop .president_pop_in .btn_wrap, +.president_pop .secondary_in .btn_wrap, .president_pop .agent_pop_in .btn_wrap, .president_pop .president_pop_in .btn_wrap { width: 6.9866666667rem; @@ -625,10 +750,20 @@ html { display: flex; justify-content: space-evenly; } +.secondary_pop .secondary_in .btn_wrap .cancel, +.secondary_pop .secondary_in .btn_wrap .sure, +.secondary_pop .agent_pop_in .btn_wrap .cancel, +.secondary_pop .agent_pop_in .btn_wrap .sure, +.secondary_pop .president_pop_in .btn_wrap .cancel, +.secondary_pop .president_pop_in .btn_wrap .sure, +.agent_pop .secondary_in .btn_wrap .cancel, +.agent_pop .secondary_in .btn_wrap .sure, .agent_pop .agent_pop_in .btn_wrap .cancel, .agent_pop .agent_pop_in .btn_wrap .sure, .agent_pop .president_pop_in .btn_wrap .cancel, .agent_pop .president_pop_in .btn_wrap .sure, +.president_pop .secondary_in .btn_wrap .cancel, +.president_pop .secondary_in .btn_wrap .sure, .president_pop .agent_pop_in .btn_wrap .cancel, .president_pop .agent_pop_in .btn_wrap .sure, .president_pop .president_pop_in .btn_wrap .cancel, @@ -643,8 +778,13 @@ html { line-height: 0.96rem; text-align: center; } +.secondary_pop .secondary_in .btn_wrap .cancel, +.secondary_pop .agent_pop_in .btn_wrap .cancel, +.secondary_pop .president_pop_in .btn_wrap .cancel, +.agent_pop .secondary_in .btn_wrap .cancel, .agent_pop .agent_pop_in .btn_wrap .cancel, .agent_pop .president_pop_in .btn_wrap .cancel, +.president_pop .secondary_in .btn_wrap .cancel, .president_pop .agent_pop_in .btn_wrap .cancel, .president_pop .president_pop_in .btn_wrap .cancel { background: #ebebeb; diff --git a/view/molistar/modules/guild-ar/css/salary.scss b/view/molistar/modules/guild-ar/css/salary.scss index 05747ac5..13bee3e7 100644 --- a/view/molistar/modules/guild-ar/css/salary.scss +++ b/view/molistar/modules/guild-ar/css/salary.scss @@ -486,6 +486,7 @@ html { text-align: center; } +.secondary_pop, .agent_pop, .president_pop { position: fixed; @@ -497,6 +498,7 @@ html { z-index: 999; display: none; + .secondary_in, .agent_pop_in, .president_pop_in { width: px2rem(290); @@ -630,6 +632,22 @@ html { } } + .tip_txt1, + .tip_txt2 { + font-family: PingFang SC, PingFang SC; + font-weight: 500; + font-size: px2rem(12); + color: #AFB1B3; + line-height: px2rem(17); + text-align: center; + font-style: normal; + text-transform: none; + margin: 0 px2rem(10); + } + .tip_txt2{ + margin-top: px2rem(6); + } + .btn_wrap { width: px2rem(262); margin: px2rem(10) auto; @@ -830,9 +848,10 @@ html { } .arabic { - .agent_pop .agent_pop_in .wrap li{ + .agent_pop .agent_pop_in .wrap li { direction: ltr; } + .nav { .back { right: px2rem(15); diff --git a/view/molistar/modules/guild-ar/js/salary.js b/view/molistar/modules/guild-ar/js/salary.js index 1e853cce..22e38ed7 100644 --- a/view/molistar/modules/guild-ar/js/salary.js +++ b/view/molistar/modules/guild-ar/js/salary.js @@ -108,6 +108,8 @@ $(function () { $('.textnew12').html(langReplace(localLang.salary.textnew12)); $('.textnew15').html(langReplace(localLang.salary.textnew15)); $('.textnew17').html(langReplace(localLang.salary.textnew17)); + $('.Reminder').html(langReplace(localLang.salary.Reminder)); + $('.tip_txt2').html(langReplace(localLang.salary.tip_txt2)); if(partitionId !=16){ $('.textnew16').html(langReplace(localLang.salary.textnew16)); @@ -372,8 +374,30 @@ $('.president_pop .sure').click(function () { targetUid: targetUid, type, }; - operate(obj) + // operate(obj) + // 打开二次确认弹窗 + let avatar = $('.president_pop .avatar').attr('src'); + let name = $('.president_pop .name p').text(); + let id = $('.president_pop .id').text(); + $('.secondary_pop .avatar').attr('src',avatar); + $('.secondary_pop .name p').text(`${name}`); + $('.secondary_pop .id').text(`${id}`); + $('.tip_txt1').html(langReplace(localLang.salary.tip_txt1(guildUsdNum))); + $('.secondary_pop .sure').attr('obj',JSON.stringify(obj)) $('.president_pop').hide(); + $('.secondary_pop').show() + bodyScroolFun(false); +}) +// 二次弹窗确认 +$('.secondary_pop .sure').click(function () { + var obj = JSON.parse($(this).attr('obj')); + operate(obj) + $('.secondary_pop').hide() + bodyScroolFun(false); +}) +// 关闭二次确认弹窗 +$('.secondary_pop .cancel').click(function () { + $('.secondary_pop').hide(); bodyScroolFun(false); }) // 关闭代理结算弹窗 @@ -392,7 +416,17 @@ $('.agent_pop .sure').click(function () { targetUid: targetUid, type, }; - operate(obj) + // operate(obj) + // 打开二次确认弹窗 + let avatar = $('.agent_pop .li_act .avatar').attr('src'); + let name = $('.agent_pop .li_act .name p').text(); + let id = $('.agent_pop .li_act .id').text(); + $('.secondary_pop .avatar').attr('src',avatar); + $('.secondary_pop .name p').text(`${name}`); + $('.secondary_pop .id').text(`${id}`); + $('.tip_txt1').html(langReplace(localLang.salary.tip_txt1(guildUsdNum))); + $('.secondary_pop .sure').attr('obj',JSON.stringify(obj)) + $('.secondary_pop').show() $('.agent_pop').hide(); bodyScroolFun(false); }) @@ -529,6 +563,7 @@ function operateValue(than) { $('.agent_pop').show(); bodyScroolFun(true); } else if (type == 4) { + console.log(666666); $('.president_pop').show(); bodyScroolFun(true); } else if (type == 5 || type == 8) { diff --git a/view/molistar/modules/guild-ar/local/ar.js b/view/molistar/modules/guild-ar/local/ar.js index 3b1c8b9f..b145c797 100644 --- a/view/molistar/modules/guild-ar/local/ar.js +++ b/view/molistar/modules/guild-ar/local/ar.js @@ -294,7 +294,11 @@ langAr = { textnew15: `نجاح`, textnew16: `وقت معالجة طلبات السحب يكون من اليوم الثالث إلى العاشر من كل شهر.`, textnew17: `موافق`, textnew18: 'تقييم النجوم:', - + Reminder:'تذكير', + tip_txt1:function (num) { + return `هل أنت متأكد من رغبتك في تحويل الراتب (دولار أمريكي:{${num}}) إلى هذا المستخدم؟` +}, + tip_txt2:'لا يمكن التراجع عن العملية، يُرجى توخي الحذر!', }, newENsalary:{ textnew16:'تم الإرسال بنجاح! لقد قبل النظام طلبك وسيُعالجه في أقرب وقت ممكن.', diff --git a/view/molistar/modules/guild-ar/local/en.js b/view/molistar/modules/guild-ar/local/en.js index 1a07a15e..af15499e 100644 --- a/view/molistar/modules/guild-ar/local/en.js +++ b/view/molistar/modules/guild-ar/local/en.js @@ -295,6 +295,11 @@ langEn = { textnew16: `The processing time for withdrawal requests is from the 3rd to the 10th of every month.`, textnew17: `OK`, textnew18: `Star rating:`, + Reminder:'Reminder', + tip_txt1:function (num) { + return `Are you sure you want to transfer the salary (USD:{${num}}) to this user?` +}, + tip_txt2:'The operation cannot be undone, please operate with caution!', }, newENsalary:{ textnew16:'Submission successful! The system has accepted your application and will process it as soon as possible.', diff --git a/view/molistar/modules/guild-ar/local/tr.js b/view/molistar/modules/guild-ar/local/tr.js index 1989f493..7b8e0bb5 100644 --- a/view/molistar/modules/guild-ar/local/tr.js +++ b/view/molistar/modules/guild-ar/local/tr.js @@ -294,7 +294,11 @@ langTr = { textnew15: `Başarı`, textnew16: `Çekim taleplerinin işlenme süresi her ayın 3'ü ile 10'u arasındadır.`, textnew17: `Tamam`, textnew18: 'Yıldız puanı:', - + Reminder:'Hatırlatma', + tip_txt1:function (num) { + return `Maaşı (USD:{${num}}) bu kullanıcıya aktarmak istediğinizden emin misiniz?` +}, + tip_txt2:'İşlem geri alınamaz, lütfen dikkatli çalışın!', }, newENsalary:{ textnew16:'Gönderim başarılı! Sistem başvurunuzu kabul etti ve en kısa sürede işleme koyacak.', diff --git a/view/molistar/modules/guild-ar/local/zh.js b/view/molistar/modules/guild-ar/local/zh.js index d69eaeea..d6464df6 100644 --- a/view/molistar/modules/guild-ar/local/zh.js +++ b/view/molistar/modules/guild-ar/local/zh.js @@ -295,7 +295,11 @@ langZh = { textnew15: `成功`, textnew16: `提款申請的處理時間為每月3日至10日。`, textnew17: `確定`, textnew18: '星級評分:', - + Reminder:'提醒', + tip_txt1:function (num) { + return`您确定要将工资(美元:{${num}})转给此用户吗?` +}, + tip_txt2:'此操作无法撤消,请谨慎操作!', }, newENsalary:{ textnew16:'提交成功!系統已受理您的申請,將盡快為您處理。', diff --git a/view/molistar/modules/guild-ar/salary_account.html b/view/molistar/modules/guild-ar/salary_account.html index 15659d49..ccde8d41 100644 --- a/view/molistar/modules/guild-ar/salary_account.html +++ b/view/molistar/modules/guild-ar/salary_account.html @@ -124,6 +124,30 @@ + + +
ID:-
+