diff --git a/view/moliparty/modules/taskCenter/css/index.css b/view/moliparty/modules/taskCenter/css/index.css index 9ef1593..c176dd1 100644 --- a/view/moliparty/modules/taskCenter/css/index.css +++ b/view/moliparty/modules/taskCenter/css/index.css @@ -456,6 +456,10 @@ body { min-width: 1.9466666667rem; height: 0.4533333333rem; } +.Daily_list .task_List .task_box .right .Receive_btn img { + width: 0.48rem; + height: 0.48rem; +} .Daily_list .task_List .task_box .right .Receive_btn_RECEIVED { background: #F2F3F7; color: #AFB1B3; @@ -466,10 +470,32 @@ body { color: #AFB1B3; border: 0.0266666667rem solid #D1D1D1; } +.Daily_list .task_List .task_box .right .roomDayGoldReward { + padding: 0.1066666667rem 0.28rem; + min-width: 0.88rem; +} .Daily_list .task_List .diamondVo { margin-top: 0.32rem; } +.Daily_list .task_List .diamondVo .day_tab_list { + display: flex; + align-items: center; + gap: 0.4533333333rem; +} +.Daily_list .task_List .diamondVo .day_tab_list .day_tab_box { + font-family: PingFang SC, PingFang SC; + font-weight: 500; + font-size: 0.32rem; + color: #AFB1B3; + line-height: 0.4533333333rem; + font-style: normal; + text-transform: none; +} +.Daily_list .task_List .diamondVo .day_tab_list .active_day { + color: #FF8C03; +} .Daily_list .task_List .diamondVo .levelVos_list { + margin-top: 0.24rem; display: flex; gap: 0.1333333333rem; overflow-x: auto; @@ -614,6 +640,10 @@ body { min-width: 1.9466666667rem; height: 0.4533333333rem; } +.Daily_list .task_List .diamondVo .goldBean_wrap .Receive_btn img { + width: 0.48rem; + height: 0.48rem; +} .Daily_list .task_List .diamondVo .goldBean_wrap .Receive_btn_RECEIVED { background: #F2F3F7; color: #AFB1B3; diff --git a/view/moliparty/modules/taskCenter/css/index.scss b/view/moliparty/modules/taskCenter/css/index.scss index b40ffaf..75b538f 100644 --- a/view/moliparty/modules/taskCenter/css/index.scss +++ b/view/moliparty/modules/taskCenter/css/index.scss @@ -147,12 +147,13 @@ body { } .Mall_box { - background-image: url("../images/mall.png"); + background-image: url("../images/mall.png"); background-size: cover; width: px2rem(200); height: px2rem(108); position: relative; - margin:0 px2rem(12); + margin: 0 px2rem(12); + .mall_img { width: px2rem(44); height: px2rem(44); @@ -442,14 +443,17 @@ body { color: #313131; } } - .week_img{ + + .week_img { display: none; - margin-top: px2rem(20); - img{ - width: 100%; - height: px2rem(1442); - } + margin-top: px2rem(20); + + img { + width: 100%; + height: px2rem(1442); + } } + .task_List { position: relative; @@ -558,6 +562,10 @@ body { min-width: px2rem(146); height: px2rem(34); // border: px2rem(2) solid #FCC074; + img{ + width: px2rem(36); + height: px2rem(36); + } } .Receive_btn_RECEIVED { @@ -571,19 +579,41 @@ body { color: #AFB1B3; border: px2rem(2) solid #D1D1D1; } + .roomDayGoldReward { + padding: px2rem(8) px2rem(21); + min-width: px2rem(66); + } } } .diamondVo { margin-top: px2rem(24); + .day_tab_list { + display: flex; + align-items: center; + gap: px2rem(34); + .day_tab_box { + font-family: PingFang SC, PingFang SC; + font-weight: 500; + font-size: px2rem(24); + color: #AFB1B3; + line-height: px2rem(34); + font-style: normal; + text-transform: none; + } + .active_day{ + color: #FF8C03; + } + } + .levelVos_list { + margin-top: px2rem(18); display: flex; gap: px2rem(10); overflow-x: auto; -webkit-overflow-scrolling: touch; scrollbar-width: none; - /* 隐藏滚动条 */ &::-webkit-scrollbar { display: none; // 隐藏 Webkit 浏览器（如 iOS、Chrome）滚动条 @@ -741,6 +771,10 @@ body { min-width: px2rem(146); height: px2rem(34); // border: px2rem(2) solid #FCC074; + img{ + width: px2rem(36); + height: px2rem(36); + } } .Receive_btn_RECEIVED { @@ -754,6 +788,7 @@ body { color: #AFB1B3; border: px2rem(2) solid #D1D1D1; } + } } @@ -1437,9 +1472,11 @@ body { right: px2rem(100); left: auto; } - .Daily_list .box_en2 .bottom_fixed_box .bg_box{ - border-radius:px2rem(32) 0px 0 0; + + .Daily_list .box_en2 .bottom_fixed_box .bg_box { + border-radius: px2rem(32) 0px 0 0; } + .box_en2 .contant_box .rewards_list .top_info .right .heitou { left: px2rem(50); right: auto; @@ -1451,16 +1488,19 @@ body { top: px2rem(-170); } } -.Turkiye{ + +.Turkiye { .Daily_list .box_en2 .bottom_fixed_box .top_box .tip_box { top: px2rem(-170); } } -.brazil{ + +.brazil { .Daily_list .box_en2 .bottom_fixed_box .top_box .tip_box { top: px2rem(-170); } - .contant_box .rewards_list .top_info .middle img { + + .contant_box .rewards_list .top_info .middle img { margin-top: px2rem(50); } diff --git a/view/moliparty/modules/taskCenter/js/index.js b/view/moliparty/modules/taskCenter/js/index.js index b1bb33f..e95f2cb 100644 --- a/view/moliparty/modules/taskCenter/js/index.js +++ b/view/moliparty/modules/taskCenter/js/index.js @@ -109,7 +109,7 @@ function getTaskTab() { ` }) - tabLocked = res.data[0].locked; + tabLocked = String(res.data[0].locked); $('.tab_list').append(str) } else { toastMsg(res.message) @@ -152,6 +152,7 @@ $('.tab_list').on('click', '.tab_box', function () { $(this).find('.xian').show(); tasktabtypeNum = $(this).attr('tasktabtype'); getTaskList(tasktabtypeNum) + diamondindexvo = 0; }) var signDayData = {}; function getCheckData() { @@ -243,9 +244,10 @@ $('.Sign_btn').click(function () { }, }) }) -var guildCreateTaskVos; -var guildLivestreamTaskVos; -var guildShiningTaskVos; +var guildCreateTaskVos;//公会开业 - 数据 +var guildLivestreamTaskVos;//麦上活跃1 - 数据 +var guildShiningTaskVos; //麦上活跃2 - 数据 +var RoomCoinsIncome;//房间金币流水 - data // 任务列表 function getTaskList(taskTabType) { $('.box_en2').hide(); @@ -298,9 +300,10 @@ function getTaskList(taskTabType) { ` } else if (item.taskType == 'ROOM_DAY_DIAMOND') { + RoomCoinsIncome = item.diamondVo; // 房间日流水奖励 let levelVos = '' - item.diamondVo.levelVos.forEach((itemTwo, indexTwo) => { + RoomCoinsIncome[0].levelVos.forEach((itemTwo, indexTwo) => { levelVos += `
${itemTwo.level}
` @@ -315,14 +318,20 @@ function getTaskList(taskTabType) { ${funTaskType(item.taskType, item.reachNum, item.standardValue)} -
${'*' + item.diamondVo.levelVos[0].rewardNum}
+
${'*' + RoomCoinsIncome[0].levelVos[0].rewardNum}
-
${item.diamondVo.levelVos[0].status == 2 ? langReplace(localLang.demoModule.Received) : langReplace(localLang.demoModule.Receive)}
+
${RoomCoinsIncome[0].levelVos[0].status == 2 ? langReplace(localLang.demoModule.Received) : RoomCoinsIncome[0].levelVos[0].status == 3 ? langReplace(localLang.demoModule.Available_tomorrow) : RoomCoinsIncome[0].levelVos[0].status == 0 ? langReplace(localLang.demoModule.Not_available_collection) : langReplace(localLang.demoModule.Receive)}
+ +
+
${langReplace(localLang.demoModule.Today)}
+
${langReplace(localLang.demoModule.Yesterday)}
+
+
${levelVos}
@@ -330,15 +339,15 @@ function getTaskList(taskTabType) {
-
+
-
${item.diamondVo.levelVos[0].preMaxNum}
-
${item.diamondVo.levelVos[0].maxNum}
+
${RoomCoinsIncome[0].levelVos[0].preMaxNum}
+
${RoomCoinsIncome[0].levelVos[0].maxNum}
- ${item.diamondVo.levelVos[0].processNum / item.diamondVo.levelVos[0].maxNum >= 1 ? '' : ''} + ${RoomCoinsIncome[0].levelVos[0].processNum / RoomCoinsIncome[0].levelVos[0].maxNum >= 1 ? '' : ''}
@@ -864,6 +873,94 @@ function funTaskTypeImg(type) { } return obj[type] } +var diamondindexvo = 0;//0今日，1昨日 +//房间钻石流水任务 - 今日昨日点击切换 +$('.Daily_list').on('click', '.day_tab_box', function () { + $(this).addClass('active_day').siblings().removeClass('active_day'); + diamondindexvo = $(this).attr('diamondindexvo'); //0今日，1昨日 + $('.levelVos_list .levelVos_box').remove(); + let levelVos = '' + RoomCoinsIncome[diamondindexvo].levelVos.forEach((itemTwo, indexTwo) => { + levelVos += ` +
${itemTwo.level}
+ ` + }) + $('.levelVos_list').append(levelVos) + + // 找到当前点击元素所在的 .task_max_box 容器 + let container = $(this).closest('.task_max_box'); + + // 更新进度条 + let progressBar = container.find('.progress-bar'); + let progressWidth = Math.min(100, Math.round(RoomCoinsIncome[diamondindexvo].levelVos[0].processNum / (RoomCoinsIncome[diamondindexvo].levelVos[0].maxNum - RoomCoinsIncome[diamondindexvo].levelVos[0].preMaxNum) * 100)); + progressBar.css('width', progressWidth + '%'); + + // 更新进度文本 + container.find('.preMaxNum').text(RoomCoinsIncome[diamondindexvo].levelVos[0].preMaxNum); + container.find('.maxNum').html(RoomCoinsIncome[diamondindexvo].levelVos[0].maxNum + ' '); + + // 更新进度图片 + if (progressWidth >= 100) { + container.find('.right img').attr('src', './images/gougou.png'); + } else { + container.find('.right img').attr('src', './images/weigougou.png'); + } + + // 更新按钮状态，如果是昨日，则用外层status;如果是今日，则用levelVos[0]的status + if (diamondindexvo == 0) { + // 今日 + // 更新按钮状态 + if (RoomCoinsIncome[diamondindexvo].levelVos[0].status == 0) { + // 未完成 + container.find('.roomDayGoldReward').addClass('Receive_btn_RECEIVED'); + container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); + container.find('.roomDayGoldReward').html(langReplace(localLang.demoModule.Not_available_collection)) + } else if (RoomCoinsIncome[diamondindexvo].levelVos[0].status == 1) { + // 可领取 + container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); + container.find('.roomDayGoldReward').removeClass('Receive_btn_RECEIVED'); + container.find('.roomDayGoldReward').text(langReplace(localLang.demoModule.Receive)) + + } else if (RoomCoinsIncome[diamondindexvo].levelVos[0].status == 2) { + // 已领取 + container.find('.roomDayGoldReward').addClass('Receive_btn_RECEIVED'); + container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); + container.find('.roomDayGoldReward').text(langReplace(localLang.demoModule.Received)) + } else { + // 明日可领取 + container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); + container.find('.roomDayGoldReward').removeClass('Receive_btn_RECEIVED'); + container.find('.roomDayGoldReward').text(langReplace(localLang.demoModule.Available_tomorrow)) + } + container.find('.roomDayGoldReward ').attr('status', RoomCoinsIncome[diamondindexvo].levelVos[0].status); + } else { + // 昨日 + // 更新按钮状态 + if (RoomCoinsIncome[diamondindexvo].status == 0) { + // 未完成 + container.find('.roomDayGoldReward').addClass('Receive_btn_RECEIVED'); + container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); + container.find('.roomDayGoldReward').html(langReplace(localLang.demoModule.Not_available_collection)) + } else if (RoomCoinsIncome[diamondindexvo].status == 1) { + // 可领取 + container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); + container.find('.roomDayGoldReward').removeClass('Receive_btn_RECEIVED'); + container.find('.roomDayGoldReward').text(langReplace(localLang.demoModule.Receive)) + + } else if (RoomCoinsIncome[diamondindexvo].status == 2) { + // 已领取 + container.find('.roomDayGoldReward').addClass('Receive_btn_RECEIVED'); + container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); + container.find('.roomDayGoldReward').text(langReplace(localLang.demoModule.Received)) + } + container.find('.roomDayGoldReward ').attr('status', RoomCoinsIncome[diamondindexvo].status); + container.find('.roomDayGoldReward ').attr('level', RoomCoinsIncome[diamondindexvo].maxLevel); + container.find('.goldBean_num .num').text('*' + RoomCoinsIncome[diamondindexvo].totalRewardNum); + } + container.find('.roomDayGoldReward ').attr('receiveDate', RoomCoinsIncome[diamondindexvo].statDate); + + +}) // 房间钻石流水任务 - 档位点击切换 $('.Daily_list').on('click', '.levelVos_box', function () { let levelvos = JSON.parse($(this).attr('levelvos')) @@ -873,8 +970,7 @@ $('.Daily_list').on('click', '.levelVos_box', function () { // 找到当前点击元素所在的 .task_max_box 容器 let container = $(this).closest('.task_max_box'); - // 更新奖励数量 - container.find('.goldBean_num .num').text('*' + levelvos.rewardNum); + // 更新进度条 let progressBar = container.find('.progress-bar'); @@ -892,27 +988,45 @@ $('.Daily_list').on('click', '.levelVos_box', function () { container.find('.right img').attr('src', './images/weigougou.png'); } + // 更新按钮状态 + if (diamondindexvo == 0) { + container.find('.roomDayGoldReward ').attr('status', levelvos.status); + container.find('.roomDayGoldReward ').attr('level', levelvos.level); + } else { + container.find('.roomDayGoldReward ').attr('status', RoomCoinsIncome[diamondindexvo].status); + container.find('.roomDayGoldReward ').attr('level', RoomCoinsIncome[diamondindexvo].maxLevel); + } + + + if (diamondindexvo == 1) return + + // 更新奖励数量 + container.find('.goldBean_num .num').text('*' + levelvos.rewardNum); + // 更新按钮状态 if (levelvos.status == 0) { // 未完成 - container.find('.roomDayGoldReward').addClass('Receive_btn_UNCOMPLETED'); - container.find('.roomDayGoldReward').removeClass('Receive_btn_RECEIVED'); - container.find('.roomDayGoldReward').text(langReplace(localLang.demoModule.Receive)) + container.find('.roomDayGoldReward').addClass('Receive_btn_RECEIVED'); + container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); + container.find('.roomDayGoldReward').html(langReplace(localLang.demoModule.Not_available_collection)) } else if (levelvos.status == 1) { // 可领取 container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); container.find('.roomDayGoldReward').removeClass('Receive_btn_RECEIVED'); container.find('.roomDayGoldReward').text(langReplace(localLang.demoModule.Receive)) - } else { + } else if (levelvos.status == 2) { // 已领取 container.find('.roomDayGoldReward').addClass('Receive_btn_RECEIVED'); container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); container.find('.roomDayGoldReward').text(langReplace(localLang.demoModule.Received)) - + } else { + // 明日可领取 + container.find('.roomDayGoldReward').removeClass('Receive_btn_UNCOMPLETED'); + container.find('.roomDayGoldReward').removeClass('Receive_btn_RECEIVED'); + container.find('.roomDayGoldReward').text(langReplace(localLang.demoModule.Available_tomorrow)) } - container.find('.roomDayGoldReward ').attr('status', levelvos.status); - container.find('.roomDayGoldReward ').attr('level', levelvos.level); + }) // 公会开业仪式 - 档位点击切换 $('.Daily_list').on('click', '.guildTaskVos_box', function () { @@ -1052,9 +1166,9 @@ $('.Daily_list').on('click', '.guildLivestreamTaskVos_box', function () { $('.guildBtnLivestream').text(langReplace(localLang.demoModule.Expired)); } else if (guildLivestreamTaskVos[arrIndex].receiveStatus == 'NOTYETOPEN') { // 未开启 - $('.guildBtnLivestream').addClass('Receive_btn_UNCOMPLETED'); - $('.guildBtnLivestream').removeClass('Receive_btn_RECEIVED'); - $('.guildBtnLivestream').text(langReplace(localLang.demoModule.Receive)); + $('.guildBtnLivestream').addClass('Receive_btn_RECEIVED'); + $('.guildBtnLivestream').removeClass('Receive_btn_UNCOMPLETED'); + $('.guildBtnLivestream').html(langReplace(localLang.demoModule.Not_available_collection)) } $('.guildBtnLivestream').attr('reachId', guildLivestreamTaskVos[arrIndex].reachId); $('.guildBtnLivestream').attr('receiveStatus', guildLivestreamTaskVos[arrIndex].receiveStatus); @@ -1138,9 +1252,9 @@ $('.Daily_list').on('click', '.guildShiningTaskVos_box', function () { $('.guildBtnShining').text(langReplace(localLang.demoModule.Expired)); } else if (guildShiningTaskVos[arrIndex].receiveStatus == 'NOTYETOPEN') { // 未开启 - $('.guildBtnShining').addClass('Receive_btn_UNCOMPLETED'); - $('.guildBtnShining').removeClass('Receive_btn_RECEIVED'); - $('.guildBtnShining').text(langReplace(localLang.demoModule.Receive)); + $('.guildBtnShining').addClass('Receive_btn_RECEIVED'); + $('.guildBtnShining').removeClass('Receive_btn_UNCOMPLETED'); + $('.guildBtnShining').html(langReplace(localLang.demoModule.Not_available_collection)) } $('.guildBtnShining').attr('reachId', guildShiningTaskVos[arrIndex].reachId); $('.guildBtnShining').attr('receiveStatus', guildShiningTaskVos[arrIndex].receiveStatus); @@ -1276,10 +1390,9 @@ $('.Daily_list').on('click', '.roomDayGoldReward', function () { url: urlPrefix + "/roomDayGoldReward/recv", data: { // uid: pubInfo.uid, - uid: 3838, roomUid, receiveDate, - level + level, }, success: function (res) { if (res.code == 200) { @@ -1538,6 +1651,6 @@ document.addEventListener('visibilitychange', () => { console.log(tabLocked); if (tabLocked != 'true') return getTaskList(tasktabtypeNum); - + diamondindexvo = 0; } }); \ No newline at end of file diff --git a/view/moliparty/modules/taskCenter/local/ar.js b/view/moliparty/modules/taskCenter/local/ar.js index 72fbb3f..17bdb87 100644 --- a/view/moliparty/modules/taskCenter/local/ar.js +++ b/view/moliparty/modules/taskCenter/local/ar.js @@ -105,6 +105,11 @@ langAr = { hours_time:'3 ساعات من وقت الميكروفون', The_wallet:'لقد تم استلام المكافأة بنجاح وتم وضع الكونزات في محفظتك', valid_day:'يجب إكمال مدة الثلاث ساعات الصالحة في الميكروفون خلال يوم واحد. إذا لم يتم الوصول إلى هذه المدة في نفس اليوم، فسيتم إعادة ضبط إحصائيات مدة الميكروفون في اليوم التالي.', + Today:'اليوم', + Yesterday:'أمس', + Available_tomorrow:'متاح غدًا', + Not_available_collection:'' + } } \ No newline at end of file diff --git a/view/moliparty/modules/taskCenter/local/br.js b/view/moliparty/modules/taskCenter/local/br.js index 6b335f2..897f393 100644 --- a/view/moliparty/modules/taskCenter/local/br.js +++ b/view/moliparty/modules/taskCenter/local/br.js @@ -104,5 +104,10 @@ langBr = { hours_time:'3 horas de tempo de microfone', The_wallet:'A recompensa foi recebida com sucesso e as moedas de ouro foram colocadas em sua carteira.', valid_day:'A duração válida de 3 horas no microfone deve ser concluída em um dia. Se a duração de 3 horas não for atingida no mesmo dia, as estatísticas de duração no microfone serão zeradas no dia seguinte.', + Today:'Hoje', + Yesterday:'Ontem', + Available_tomorrow:'Disponível amanhã', + Not_available_collection:'' + } } \ No newline at end of file diff --git a/view/moliparty/modules/taskCenter/local/en.js b/view/moliparty/modules/taskCenter/local/en.js index 105f14a..a71d3c4 100644 --- a/view/moliparty/modules/taskCenter/local/en.js +++ b/view/moliparty/modules/taskCenter/local/en.js @@ -105,5 +105,10 @@ langEn = { hours_time:'3 hours of mic time', The_wallet:'The reward has been successfully received and the coins have been put into your wallet.', valid_day:'The valid 3-hour on-microphone duration must be completed within one day. If the 3-hour duration is not reached on the same day, the on-microphone duration statistics will be reset the next day.', + Today:'Today', + Yesterday:'Yesterday', + Available_tomorrow:'Available tomorrow', + Not_available_collection:'' + } } \ No newline at end of file diff --git a/view/moliparty/modules/taskCenter/local/tr.js b/view/moliparty/modules/taskCenter/local/tr.js index 52daaf3..80fed55 100644 --- a/view/moliparty/modules/taskCenter/local/tr.js +++ b/view/moliparty/modules/taskCenter/local/tr.js @@ -106,5 +106,10 @@ langTr = { hours_time:'3 saat mikrofon süresi', The_wallet:'Ödül başarıyla alındı ​​ve altın paralar cüzdanınıza yatırıldı.', valid_day:'Geçerli 3 saatlik mikrofonda kalma süresi bir gün içinde tamamlanmalıdır. Aynı gün 3 saatlik süreye ulaşılamazsa, mikrofonda kalma süresi istatistikleri ertesi gün sıfırlanacaktır.', + Today:'Bugün', + Yesterday:'Dün', + Available_tomorrow:'Yarın alınabilir', + Not_available_collection:'' + } } \ No newline at end of file diff --git a/view/moliparty/modules/taskCenter/local/zh.js b/view/moliparty/modules/taskCenter/local/zh.js index 1e42fb5..5ea1e9c 100644 --- a/view/moliparty/modules/taskCenter/local/zh.js +++ b/view/moliparty/modules/taskCenter/local/zh.js @@ -105,5 +105,9 @@ langZh = { hours_time:'3小時麥上聊天', The_wallet:'領取成功，獎勵的金幣已經放入你的錢包～', valid_day:'有效的3小時麥克風使用時長必須在一天內完成。若當天未達3小時，麥克風使用時長統計將於隔天重設。', + Today:'今日', + Yesterday:'昨日', + Available_tomorrow:'明日可领取', + Not_available_collection:'' } } \ No newline at end of file