From 211eb2a6b60b43de6ac2da7910c72b67042d7c9d Mon Sep 17 00:00:00 2001 From: yujiacong <1016029365@qq.com> Date: Wed, 24 Sep 2025 18:27:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E8=81=94=E4=BD=93=20-=20=E5=85=AC?= =?UTF-8?q?=E4=BC=9A=E4=BF=A1=E6=81=AF=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/guild-ar/css/general_Income.css | 16 +++--- .../modules/guild-ar/css/general_Income.scss | 16 +++--- .../modules/guild-ar/css/personal_CIS.css | 14 +++-- .../modules/guild-ar/css/personal_CIS.scss | 22 ++++---- .../modules/guild-ar/js/general_Income.js | 4 ++ view/moliparty/modules/guild-ar/js/index.js | 5 +- .../modules/guild-ar/js/personal_CIS.js | 18 ++++--- view/moliparty/modules/guild-ar/js/salary.js | 54 ++++++++++--------- view/moliparty/modules/guild-ar/local/ar.js | 1 + view/moliparty/modules/guild-ar/local/br.js | 1 + view/moliparty/modules/guild-ar/local/en.js | 1 + view/moliparty/modules/guild-ar/local/es.js | 1 + view/moliparty/modules/guild-ar/local/ru.js | 1 + view/moliparty/modules/guild-ar/local/tr.js | 1 + view/moliparty/modules/guild-ar/local/uz.js | 1 + view/moliparty/modules/guild-ar/local/zh.js | 1 + .../modules/guild-ar/personal_CIS.html | 10 +++- 17 files changed, 97 insertions(+), 70 deletions(-) diff --git a/view/moliparty/modules/guild-ar/css/general_Income.css b/view/moliparty/modules/guild-ar/css/general_Income.css index 65c2e87..933dd08 100644 --- a/view/moliparty/modules/guild-ar/css/general_Income.css +++ b/view/moliparty/modules/guild-ar/css/general_Income.css @@ -187,15 +187,15 @@ body { .content_agency_list .content_box .diamondNumBox .diamondNum { font-family: PingFang SC, PingFang SC; font-weight: 500; - font-size: 0.5333333333rem; + font-size: 0.4rem; color: #03AFFF; - line-height: 0.7466666667rem; + line-height: 0.56rem; font-style: normal; text-transform: none; } .content_agency_list .content_box .diamondNumBox img { - width: 0.7466666667rem; - height: 0.7466666667rem; + width: 0.56rem; + height: 0.56rem; margin: 0 0.0533333333rem; } @@ -301,15 +301,15 @@ body { .content_penson_list .content_box .content .diamondNumBox .diamondNum { font-family: PingFang SC, PingFang SC; font-weight: 500; - font-size: 0.5333333333rem; + font-size: 0.4rem; color: #03AFFF; - line-height: 0.7466666667rem; + line-height: 0.56rem; font-style: normal; text-transform: none; } .content_penson_list .content_box .content .diamondNumBox img { - width: 0.7466666667rem; - height: 0.7466666667rem; + width: 0.56rem; + height: 0.56rem; margin: 0 0.0533333333rem; } diff --git a/view/moliparty/modules/guild-ar/css/general_Income.scss b/view/moliparty/modules/guild-ar/css/general_Income.scss index d26ebc8..e4f9f5f 100644 --- a/view/moliparty/modules/guild-ar/css/general_Income.scss +++ b/view/moliparty/modules/guild-ar/css/general_Income.scss @@ -208,16 +208,16 @@ body { .diamondNum { font-family: PingFang SC, PingFang SC; font-weight: 500; - font-size: px2rem(40); + font-size: px2rem(30); color: #03AFFF; - line-height: px2rem(56); + line-height: px2rem(42); font-style: normal; text-transform: none; } img { - width: px2rem(56); - height: px2rem(56); + width: px2rem(42); + height: px2rem(42); margin: 0 px2rem(4); } @@ -338,16 +338,16 @@ body { .diamondNum { font-family: PingFang SC, PingFang SC; font-weight: 500; - font-size: px2rem(40); + font-size: px2rem(30); color: #03AFFF; - line-height: px2rem(56); + line-height: px2rem(42); font-style: normal; text-transform: none; } img { - width: px2rem(56); - height: px2rem(56); + width: px2rem(42); + height: px2rem(42); margin: 0 px2rem(4); } diff --git a/view/moliparty/modules/guild-ar/css/personal_CIS.css b/view/moliparty/modules/guild-ar/css/personal_CIS.css index c21d0f5..b27a885 100644 --- a/view/moliparty/modules/guild-ar/css/personal_CIS.css +++ b/view/moliparty/modules/guild-ar/css/personal_CIS.css @@ -59,28 +59,26 @@ body { text-align: center; font-style: normal; text-transform: none; + position: relative; } -.tab_box div span { +.tab_box div .xian { width: 0.3733333333rem; height: 0.1066666667rem; border-radius: 0.1066666667rem; - background: #04D5C6; + background: linear-gradient(270deg, #E29030 0%, #FCC074 100%); position: absolute; left: 50%; transform: translateX(-50%); - bottom: -0.5333333333rem; + bottom: -0.2666666667rem; display: none; } .tab_box .act { color: #313131; font-size: 0.4266666667rem; } -.tab_box .act span { - display: block; -} .personal_content { - margin: 3.3333333333rem 0.4266666667rem 0; + margin: 3.4666666667rem 0.4266666667rem 0; display: none; } .personal_content .user_box { @@ -168,7 +166,7 @@ body { background: #F2F3F7; border-radius: 0.2133333333rem; padding-bottom: 0.3733333333rem; - margin-top: 3.3333333333rem; + margin-top: 3.4666666667rem; } .content_CycleIncome_box .CycleIncome_box .top_title { background: linear-gradient(270deg, #F2F3F7 0%, #FFF6C8 100%); diff --git a/view/moliparty/modules/guild-ar/css/personal_CIS.scss b/view/moliparty/modules/guild-ar/css/personal_CIS.scss index d2c3900..02d5b4f 100644 --- a/view/moliparty/modules/guild-ar/css/personal_CIS.scss +++ b/view/moliparty/modules/guild-ar/css/personal_CIS.scss @@ -56,7 +56,6 @@ body { top: 0; background: #FFFFFF; width: 100%; - div { font-family: PingFang SC, PingFang SC; font-weight: 500; @@ -66,16 +65,16 @@ body { text-align: center; font-style: normal; text-transform: none; - - span { + position: relative; + .xian { width: px2rem(28); height: px2rem(8); border-radius: px2rem(8); - background: #04D5C6; + background: linear-gradient( 270deg, #E29030 0%, #FCC074 100%); position: absolute; left: 50%; transform: translateX(-50%); - bottom: px2rem(-40); + bottom: px2rem(-20); display: none; } } @@ -83,15 +82,16 @@ body { .act { color: #313131; font-size: px2rem(32); - - span { - display: block; - } + // width: px2rem(26); + // height: px2rem(8); + // background: linear-gradient( 270deg, #E29030 0%, #FCC074 100%); + // border-radius: px2rem(520); + // position: absolute; } } .personal_content { - margin: px2rem(250) px2rem(32) 0; + margin: px2rem(260) px2rem(32) 0; display: none; .user_box { @@ -190,7 +190,7 @@ body { background: #F2F3F7; border-radius: px2rem(16); padding-bottom: px2rem(28); - margin-top: px2rem(250); + margin-top: px2rem(260); .CycleIncome_box { .top_title { background: linear-gradient(270deg, #F2F3F7 0%, #FFF6C8 100%); diff --git a/view/moliparty/modules/guild-ar/js/general_Income.js b/view/moliparty/modules/guild-ar/js/general_Income.js index f9abfcb..ee6dfe1 100644 --- a/view/moliparty/modules/guild-ar/js/general_Income.js +++ b/view/moliparty/modules/guild-ar/js/general_Income.js @@ -53,7 +53,11 @@ $(function () { localLang = window.lang; translateFun(); getData(); + if(beginDate == endDate){ + $('.time_box').text(`${beginDate}`) + }else{ $('.time_box').text(`${beginDate}~${endDate}`) + } if (urlData.Cycle_Income) { $('.time_flex .change_start span').text(beginDate); $('.time_flex .change_end span').text(endDate); diff --git a/view/moliparty/modules/guild-ar/js/index.js b/view/moliparty/modules/guild-ar/js/index.js index d1b6161..89a4381 100644 --- a/view/moliparty/modules/guild-ar/js/index.js +++ b/view/moliparty/modules/guild-ar/js/index.js @@ -171,7 +171,10 @@ function get() { if(partitionId == 16){ $('.weeklyRewardsText5').text(langReplace(localLang.demoModule.weeklyRewardsText6)); $('.headerBox .headerBox_in div .why').hide(); - }else{ + }else if(partitionId == 32){ + $('.headerBox .headerBox_in div .why').hide(); + } + else{ $('.weeklyRewardsText5').text(langReplace(localLang.demoModule.weeklyRewardsText5)); } // 判断身份 diff --git a/view/moliparty/modules/guild-ar/js/personal_CIS.js b/view/moliparty/modules/guild-ar/js/personal_CIS.js index 52faf4e..a7f4288 100644 --- a/view/moliparty/modules/guild-ar/js/personal_CIS.js +++ b/view/moliparty/modules/guild-ar/js/personal_CIS.js @@ -90,13 +90,13 @@ function getAccount() { // 判断是否展示agency if (incomeData.agency) { funTranslateData(incomeData.agency); - dataType = incomeData.agency.diamondDateList.dataType + dataType = incomeData.agency.diamondDateList.dataType; } else { funTranslateData(incomeData.person); $('.tab_box div').eq(0).hide(); $('.tab_box div').eq(1).addClass('act'); dataType = incomeData.person.diamondDateList.dataType - $('.content_CycleIncome_box').css('margin-top', '0.42rem') + $('.content_CycleIncome_box').css('margin-top', '0.45rem') $('.Today_box .right img').hide(); $('.Yesterday_box .right img').hide(); $('.thisWeek_box .right img').hide(); @@ -104,6 +104,7 @@ function getAccount() { $('.thisMonth_box .right img').hide(); $('.lastMonth_box .right img').hide(); } + $('.tab_box .act .xian').show(); } else { toastMsg(res.message) } @@ -118,7 +119,7 @@ function getAccount() { function funTranslateData(data) { // 周期收益 // 本周期 - $('.ThisCycle_box .periodDateStr').text(formattedNumber(data.diamondDateList.curCycle.periodDateStr)) + $('.ThisCycle_box .periodDateStr').text(data.diamondDateList.curCycle.periodDateStr) $('.ThisCycle_box .diamondNum').text(formattedNumber(data.diamondDateList.curCycle.diamondNum)) $('.content_CycleIncome_box .CycleIncome_box .top_title').attr('dataObj', JSON.stringify(data.diamondDateList.curCycle)) // 上周期 @@ -159,29 +160,34 @@ $('.tab_box div').click(function () { funTranslateData(incomeData.agency); $('.personal_content').hide(); dataType = 2; - $('.content_CycleIncome_box').css('margin-top', '3.4rem') + $('.content_CycleIncome_box').css('margin-top', '3.5rem') $('.Today_box .right img').show(); $('.Yesterday_box .right img').show(); $('.thisWeek_box .right img').show(); $('.lastWeek_box .right img').show(); $('.thisMonth_box .right img').show(); $('.lastMonth_box .right img').show(); + $(this).find('.xian').show(); + $(this).siblings().find('.xian').hide(); } else { funTranslateData(incomeData.person); dataType = 1; - $('.content_CycleIncome_box').css('margin-top', '0.42rem') + $('.content_CycleIncome_box').css('margin-top', '0.45rem') $('.Today_box .right img').hide(); $('.Yesterday_box .right img').hide(); $('.thisWeek_box .right img').hide(); $('.lastWeek_box .right img').hide(); $('.thisMonth_box .right img').hide(); $('.lastMonth_box .right img').hide(); + $(this).find('.xian').show(); + $(this).siblings().find('.xian').hide(); + } }) // 千分位 function formattedNumber(num) { if (num === null || num === undefined) return ''; - return Math.floor(num).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); + return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); }; // 跳转提现 diff --git a/view/moliparty/modules/guild-ar/js/salary.js b/view/moliparty/modules/guild-ar/js/salary.js index a67bf9a..d920f95 100644 --- a/view/moliparty/modules/guild-ar/js/salary.js +++ b/view/moliparty/modules/guild-ar/js/salary.js @@ -110,13 +110,15 @@ $(function () { $('.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)); - - }else{ - $('.textnew16').html(langReplace(localLang.newENsalary.textnew16)); + if (partitionId == 16) { + $('.textnew16').html(langReplace(localLang.newENsalary.textnew16)); + } else if (partitionId == 32) { + $('.textnew16').html(langReplace(localLang.newENsalary.textnew32)); + } else { + $('.textnew16').html(langReplace(localLang.salary.textnew16)); } + } }); var rechargeUserLimitTip; @@ -140,8 +142,8 @@ function getTab() { $('.agent_pop .wrap li').remove() var agent_popStr = ''; rechargeUserLimitTip = res.data.rechargeUserLimitTip; - var rechargeUserList = res.data.rechargeUserLimitTip?[]:res.data.rechargeUserList; - if (rechargeUserList.length <= 0 ) { + var rechargeUserList = res.data.rechargeUserLimitTip ? [] : res.data.rechargeUserList; + if (rechargeUserList.length <= 0) { $('.agent_pop .wrap').append(`
+
${langReplace(localLang.salary.text15)}
@@ -380,11 +382,11 @@ $('.president_pop .sure').click(function () {
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))
+ $('.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);
@@ -422,11 +424,11 @@ $('.agent_pop .sure').click(function () {
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 .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);
@@ -563,7 +565,7 @@ function operateValue(than) {
var targetUid = than.attr('uid');
var type = than.attr('type');
if (type == 3) {
- if(rechargeUserLimitTip){
+ if (rechargeUserLimitTip) {
toastMsg(rechargeUserLimitTip);
return;
}
@@ -700,9 +702,9 @@ $('.selectAccount .selectAccount_in .accountBox').on('click', ' .account .eid',
var type = $(this).attr('type');
var name = $(this).attr('name');
if (partitionId != 16) {
- if(type == 'BANK' || type == 'VODAFONE' || type == 'PAYONNER'){
- location.href = `./${type}.html?type=${type}`
- }else{
+ if (type == 'BANK' || type == 'VODAFONE' || type == 'PAYONNER') {
+ location.href = `./${type}.html?type=${type}`
+ } else {
location.href = `./generalSalary.html?type=${type}&name=${name}`
}
} else {
diff --git a/view/moliparty/modules/guild-ar/local/ar.js b/view/moliparty/modules/guild-ar/local/ar.js
index 81d5e91..66f0036 100644
--- a/view/moliparty/modules/guild-ar/local/ar.js
+++ b/view/moliparty/modules/guild-ar/local/ar.js
@@ -351,6 +351,7 @@ langAr = {
},
newENsalary:{
textnew16:'تم الإرسال بنجاح! لقد قبل النظام طلبك وسيُعالجه في أقرب وقت ممكن.',
+ textnew32:'مدة معالجة السحب هي خلال 7 أيام عمل',
text21:'يمكن للوكيل الانسحاب مرة واحدة في الأسبوع.'
},
bill: {
diff --git a/view/moliparty/modules/guild-ar/local/br.js b/view/moliparty/modules/guild-ar/local/br.js
index e14d781..dce949e 100644
--- a/view/moliparty/modules/guild-ar/local/br.js
+++ b/view/moliparty/modules/guild-ar/local/br.js
@@ -348,6 +348,7 @@ langBr = {
},
newENsalary:{
textnew16:'Submissão bem-sucedida! O sistema aceitou sua aplicação e a processará o mais rápido possível.',
+ textnew32:'O tempo de processamento da retirada é de 7 dias úteis',
text21:'O Agente pode sacar uma vez por semana.'
},
bill: {
diff --git a/view/moliparty/modules/guild-ar/local/en.js b/view/moliparty/modules/guild-ar/local/en.js
index 9f63b7e..ffe32ff 100644
--- a/view/moliparty/modules/guild-ar/local/en.js
+++ b/view/moliparty/modules/guild-ar/local/en.js
@@ -352,6 +352,7 @@ langEn = {
},
newENsalary:{
textnew16:'Submission successful! The system has accepted your application and will process it as soon as possible.',
+ textnew32:'Withdrawal processing time is within 7 working days',
text21:'The Agent can withdraw once a week.'
},
bill: {
diff --git a/view/moliparty/modules/guild-ar/local/es.js b/view/moliparty/modules/guild-ar/local/es.js
index 7e3b225..06d5cfc 100644
--- a/view/moliparty/modules/guild-ar/local/es.js
+++ b/view/moliparty/modules/guild-ar/local/es.js
@@ -451,6 +451,7 @@ langEs = {
},
newENsalary:{
textnew16:'¡Envío exitoso! El sistema ha aceptado su solicitud y la procesará lo antes posible.',
+ textnew32:'El tiempo de procesamiento del retiro es de 7 días hábiles.',
text21:'El Agente puede retirar una vez por semana.'
},
bill: {
diff --git a/view/moliparty/modules/guild-ar/local/ru.js b/view/moliparty/modules/guild-ar/local/ru.js
index 3e2243b..a3f9584 100644
--- a/view/moliparty/modules/guild-ar/local/ru.js
+++ b/view/moliparty/modules/guild-ar/local/ru.js
@@ -352,6 +352,7 @@ langRu = {
},
newENsalary: {
textnew16: 'Заявка успешно отправлена! Система приняла вашу заявку и обработает ее как можно скорее.',
+ textnew32: 'Срок обработки вывода средств — в течение 7 рабочих дней.',
text21: 'Агент может выводить деньги один раз в неделю.'
},
bill: {
diff --git a/view/moliparty/modules/guild-ar/local/tr.js b/view/moliparty/modules/guild-ar/local/tr.js
index 0992a7b..9c81b29 100644
--- a/view/moliparty/modules/guild-ar/local/tr.js
+++ b/view/moliparty/modules/guild-ar/local/tr.js
@@ -351,6 +351,7 @@ langTr = {
},
newENsalary:{
textnew16:'Gönderim başarılı! Sistem başvurunuzu kabul etti ve en kısa sürede işleme koyacak.',
+ textnew32:'Para çekme işlemi 7 iş günü içinde gerçekleşir',
text21:'Acente haftada bir kez çekim yapabilir.'
},
bill: {
diff --git a/view/moliparty/modules/guild-ar/local/uz.js b/view/moliparty/modules/guild-ar/local/uz.js
index 35f0dba..7d8161e 100644
--- a/view/moliparty/modules/guild-ar/local/uz.js
+++ b/view/moliparty/modules/guild-ar/local/uz.js
@@ -655,6 +655,7 @@ langUz = {
},
newENsalary:{
textnew16:'Submission successful! The system has accepted your application and will process it as soon as possible.',
+ textnew32:`Pul o'tkazish muddati 7 ish kuni ichida`,
text21:'The Agent can withdraw once a week.'
},
bill: {
diff --git a/view/moliparty/modules/guild-ar/local/zh.js b/view/moliparty/modules/guild-ar/local/zh.js
index 70a59e7..b165353 100644
--- a/view/moliparty/modules/guild-ar/local/zh.js
+++ b/view/moliparty/modules/guild-ar/local/zh.js
@@ -351,6 +351,7 @@ langZh = {
},
newENsalary:{
textnew16:'提交成功!系統已受理您的申請,將盡快為您處理。',
+ textnew32:'提款處理時間為7個工作天內',
text21:'公会长每周可提现1次。'
},
bill: {
diff --git a/view/moliparty/modules/guild-ar/personal_CIS.html b/view/moliparty/modules/guild-ar/personal_CIS.html
index b9c9609..6568ed3 100644
--- a/view/moliparty/modules/guild-ar/personal_CIS.html
+++ b/view/moliparty/modules/guild-ar/personal_CIS.html
@@ -16,8 +16,14 @@