From c32c2202e8955bb1580ce6d2b4bfa15192f3b1bb Mon Sep 17 00:00:00 2001 From: dragon <3013557874@qq.com> Date: Thu, 31 Oct 2024 17:16:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=A8=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/molistar/modules/guild-ar/css/index.css | 15 +++++++++++++++ view/molistar/modules/guild-ar/css/index.scss | 16 ++++++++++++++++ .../modules/guild-ar/css/weeklyRewards.css | 15 +++++++++++++++ .../modules/guild-ar/css/weeklyRewards.scss | 15 +++++++++++++++ view/molistar/modules/guild-ar/index.html | 8 ++++++-- view/molistar/modules/guild-ar/js/index.js | 9 ++++++--- .../modules/guild-ar/js/weeklyRewards.js | 8 ++++++-- .../molistar/modules/guild-ar/weeklyRewards.html | 8 ++++++-- view/molistar/modules/guildAr/css/index.css | 15 +++++++++++++++ view/molistar/modules/guildAr/css/index.scss | 14 ++++++++++++++ .../modules/guildAr/css/weeklyRewards.css | 16 ++++++++++++++++ .../modules/guildAr/css/weeklyRewards.scss | 16 ++++++++++++++++ view/molistar/modules/guildAr/index.html | 8 ++++++-- view/molistar/modules/guildAr/js/index.js | 7 +++++-- .../molistar/modules/guildAr/js/weeklyRewards.js | 8 ++++++-- view/molistar/modules/guildAr/weeklyRewards.html | 8 ++++++-- 16 files changed, 169 insertions(+), 17 deletions(-) diff --git a/view/molistar/modules/guild-ar/css/index.css b/view/molistar/modules/guild-ar/css/index.css index fb90a50..08a46df 100644 --- a/view/molistar/modules/guild-ar/css/index.css +++ b/view/molistar/modules/guild-ar/css/index.css @@ -399,6 +399,21 @@ body { top: 0; } +.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress { + width: 100%; + display: flex; + justify-content: space-between; + margin-top: 0.08rem; + height: 0.45333rem; + line-height: 0.45333rem; +} + +.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress span, .weeklyRewards .weeklyRewards_in .box .right .speedOfProgress b { + color: #7B7B7D; + font-size: 0.32rem; + font-weight: 400; +} + .weeklyRewards .weeklyRewards_in .bottom { width: 100%; box-sizing: border-box; diff --git a/view/molistar/modules/guild-ar/css/index.scss b/view/molistar/modules/guild-ar/css/index.scss index d57f3d0..0ccf301 100644 --- a/view/molistar/modules/guild-ar/css/index.scss +++ b/view/molistar/modules/guild-ar/css/index.scss @@ -342,6 +342,7 @@ body { border: none; color: #fff; } + .getOut { background: #CDCED6; border: none; @@ -400,6 +401,21 @@ body { top: 0; } } + + .speedOfProgress { + width: 100%; + display: flex; + justify-content: space-between; + margin-top: px2rem(6); + height: px2rem(34); + line-height: px2rem(34); + + span,b { + color: #7B7B7D; + font-size: px2rem(24); + font-weight: 400; + } + } } } diff --git a/view/molistar/modules/guild-ar/css/weeklyRewards.css b/view/molistar/modules/guild-ar/css/weeklyRewards.css index e9cc86c..67a8c27 100644 --- a/view/molistar/modules/guild-ar/css/weeklyRewards.css +++ b/view/molistar/modules/guild-ar/css/weeklyRewards.css @@ -217,6 +217,21 @@ body { top: 0; } +.box ul li .right .speedOfProgress { + width: 100%; + display: flex; + justify-content: space-between; + margin-top: 0.08rem; + height: 0.45333rem; + line-height: 0.45333rem; +} + +.box ul li .right .speedOfProgress span, .box ul li .right .speedOfProgress b { + color: #7B7B7D; + font-size: 0.32rem; + font-weight: 400; +} + .arabic .back .backIcon { left: auto; right: 0.42667rem; diff --git a/view/molistar/modules/guild-ar/css/weeklyRewards.scss b/view/molistar/modules/guild-ar/css/weeklyRewards.scss index a46e4a6..10f4146 100644 --- a/view/molistar/modules/guild-ar/css/weeklyRewards.scss +++ b/view/molistar/modules/guild-ar/css/weeklyRewards.scss @@ -217,6 +217,21 @@ body { top: 0; } } + + .speedOfProgress { + width: 100%; + display: flex; + justify-content: space-between; + margin-top: px2rem(6); + height: px2rem(34); + line-height: px2rem(34); + + span,b { + color: #7B7B7D; + font-size: px2rem(24); + font-weight: 400; + } + } } } } diff --git a/view/molistar/modules/guild-ar/index.html b/view/molistar/modules/guild-ar/index.html index c9536eb..5b7e9a1 100644 --- a/view/molistar/modules/guild-ar/index.html +++ b/view/molistar/modules/guild-ar/index.html @@ -7,7 +7,7 @@ - + @@ -114,6 +114,10 @@
+
+ 0 + 0 +
@@ -184,5 +188,5 @@ - + \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/js/index.js b/view/molistar/modules/guild-ar/js/index.js index 07295e6..e99ef00 100644 --- a/view/molistar/modules/guild-ar/js/index.js +++ b/view/molistar/modules/guild-ar/js/index.js @@ -214,9 +214,12 @@ function get() { if (res.data.weekLevelReward.dateRange && res.data.weekLevelReward.itemList[0]) { $('.weeklyRewards .weeklyRewards_in .box .left span').text(unitProcessingAr(res.data.weekLevelReward.itemList[0].rewardNum, 2)); $('.weeklyRewards .weeklyRewards_in .box .right .textTop .l b').text(res.data.weekLevelReward.itemList[0].level); - $('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b1').text(res.data.weekLevelReward.itemList[0].processNum); + $('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b1').text(res.data.weekLevelReward.itemList[0].processNum + res.data.weekLevelReward.itemList[0].preMaxNum); $('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b2').text(res.data.weekLevelReward.itemList[0].maxNum); - $('.weeklyRewards .weeklyRewards_in .box .right .line .line_in').css('width', `${(res.data.weekLevelReward.itemList[0].processNum / res.data.weekLevelReward.itemList[0].maxNum) * 100}%`); + $('.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress span').text(res.data.weekLevelReward.itemList[0].preMaxNum); + $('.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress b').text(res.data.weekLevelReward.itemList[0].maxNum); + var widthVal = ((res.data.weekLevelReward.itemList[0].processNum + res.data.weekLevelReward.itemList[0].preMaxNum) - (res.data.weekLevelReward.itemList[0].preMaxNum)) / (res.data.weekLevelReward.itemList[0].maxNum - res.data.weekLevelReward.itemList[0].preMaxNum) * 100 + $('.weeklyRewards .weeklyRewards_in .box .right .line .line_in').css('width', `${widthVal}%`); $('.weeklyRewards .weeklyRewards_in .box .left .get').attr('id', res.data.weekLevelReward.itemList[0].id); if (res.data.weekLevelReward.itemList[0].status == 1) { $('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('getAct'); @@ -226,7 +229,7 @@ function get() { $('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('getOut'); $('.weeklyRewards .weeklyRewards_in .box .left .get').text(langReplace(localLang.weeklyRewards.text5)) } - }else{ + } else { $('.weeklyRewards').hide(); } } else { diff --git a/view/molistar/modules/guild-ar/js/weeklyRewards.js b/view/molistar/modules/guild-ar/js/weeklyRewards.js index 60259c5..6886ee2 100644 --- a/view/molistar/modules/guild-ar/js/weeklyRewards.js +++ b/view/molistar/modules/guild-ar/js/weeklyRewards.js @@ -120,11 +120,15 @@ function ulFun(index) {
${langReplace(localLang.weeklyRewards.text4)}${res.level}
- ${res.processNum}/${res.maxNum} + ${res.processNum + res.preMaxNum}/${res.maxNum}
-
+
+
+
+ ${res.preMaxNum} + ${res.maxNum}
diff --git a/view/molistar/modules/guild-ar/weeklyRewards.html b/view/molistar/modules/guild-ar/weeklyRewards.html index abc99f4..7c0d48e 100644 --- a/view/molistar/modules/guild-ar/weeklyRewards.html +++ b/view/molistar/modules/guild-ar/weeklyRewards.html @@ -6,7 +6,7 @@ - + @@ -38,6 +38,10 @@
+
+ 0 + 0 +
@@ -54,5 +58,5 @@ - + \ No newline at end of file diff --git a/view/molistar/modules/guildAr/css/index.css b/view/molistar/modules/guildAr/css/index.css index 54a7aea..ca6dc65 100644 --- a/view/molistar/modules/guildAr/css/index.css +++ b/view/molistar/modules/guildAr/css/index.css @@ -403,6 +403,21 @@ body { top: 0; } +.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress { + width: 100%; + display: flex; + justify-content: space-between; + margin-top: 0.08rem; + height: 0.45333rem; + line-height: 0.45333rem; +} + +.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress span, .weeklyRewards .weeklyRewards_in .box .right .speedOfProgress b { + color: #7B7B7D; + font-size: 0.32rem; + font-weight: 400; +} + .weeklyRewards .weeklyRewards_in .bottom { width: 100%; box-sizing: border-box; diff --git a/view/molistar/modules/guildAr/css/index.scss b/view/molistar/modules/guildAr/css/index.scss index 1879dc8..506389f 100644 --- a/view/molistar/modules/guildAr/css/index.scss +++ b/view/molistar/modules/guildAr/css/index.scss @@ -405,6 +405,20 @@ body { top: 0; } } + .speedOfProgress { + width: 100%; + display: flex; + justify-content: space-between; + margin-top: px2rem(6); + height: px2rem(34); + line-height: px2rem(34); + + span,b { + color: #7B7B7D; + font-size: px2rem(24); + font-weight: 400; + } + } } } diff --git a/view/molistar/modules/guildAr/css/weeklyRewards.css b/view/molistar/modules/guildAr/css/weeklyRewards.css index e9cc86c..21870bb 100644 --- a/view/molistar/modules/guildAr/css/weeklyRewards.css +++ b/view/molistar/modules/guildAr/css/weeklyRewards.css @@ -217,6 +217,22 @@ body { top: 0; } +.box ul li .right .speedOfProgress { + width: 100%; + display: flex; + justify-content: space-between; + margin-top: 0.08rem; + height: 0.45333rem; + line-height: 0.45333rem; +} + +.box ul li .right .speedOfProgress span, +.box ul li .right .speedOfProgress b { + color: #7B7B7D; + font-size: 0.32rem; + font-weight: 400; +} + .arabic .back .backIcon { left: auto; right: 0.42667rem; diff --git a/view/molistar/modules/guildAr/css/weeklyRewards.scss b/view/molistar/modules/guildAr/css/weeklyRewards.scss index f09e3ec..9220560 100644 --- a/view/molistar/modules/guildAr/css/weeklyRewards.scss +++ b/view/molistar/modules/guildAr/css/weeklyRewards.scss @@ -217,6 +217,22 @@ body { top: 0; } } + + .speedOfProgress { + width: 100%; + display: flex; + justify-content: space-between; + margin-top: px2rem(6); + height: px2rem(34); + line-height: px2rem(34); + + span, + b { + color: #7B7B7D; + font-size: px2rem(24); + font-weight: 400; + } + } } } } diff --git a/view/molistar/modules/guildAr/index.html b/view/molistar/modules/guildAr/index.html index b3d080f..17a054c 100644 --- a/view/molistar/modules/guildAr/index.html +++ b/view/molistar/modules/guildAr/index.html @@ -7,7 +7,7 @@ - + @@ -110,6 +110,10 @@
+
+ 0 + 0 +
@@ -180,5 +184,5 @@ - + \ No newline at end of file diff --git a/view/molistar/modules/guildAr/js/index.js b/view/molistar/modules/guildAr/js/index.js index 9df6028..b661be4 100644 --- a/view/molistar/modules/guildAr/js/index.js +++ b/view/molistar/modules/guildAr/js/index.js @@ -180,9 +180,12 @@ function get() { if (res.data.weekLevelReward.dateRange && res.data.weekLevelReward.itemList[0]) { $('.weeklyRewards .weeklyRewards_in .box .left span').text(unitProcessingAr(res.data.weekLevelReward.itemList[0].rewardNum, 2)); $('.weeklyRewards .weeklyRewards_in .box .right .textTop .l b').text(res.data.weekLevelReward.itemList[0].level); - $('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b1').text(res.data.weekLevelReward.itemList[0].processNum); + $('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b1').text(res.data.weekLevelReward.itemList[0].processNum + res.data.weekLevelReward.itemList[0].preMaxNum); $('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b2').text(res.data.weekLevelReward.itemList[0].maxNum); - $('.weeklyRewards .weeklyRewards_in .box .right .line .line_in').css('width', `${(res.data.weekLevelReward.itemList[0].processNum / res.data.weekLevelReward.itemList[0].maxNum) * 100}%`); + $('.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress span').text(res.data.weekLevelReward.itemList[0].preMaxNum); + $('.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress b').text(res.data.weekLevelReward.itemList[0].maxNum); + var widthVal = ((res.data.weekLevelReward.itemList[0].processNum + res.data.weekLevelReward.itemList[0].preMaxNum) - (res.data.weekLevelReward.itemList[0].preMaxNum)) / (res.data.weekLevelReward.itemList[0].maxNum - res.data.weekLevelReward.itemList[0].preMaxNum) * 100 + $('.weeklyRewards .weeklyRewards_in .box .right .line .line_in').css('width', `${widthVal}%`); $('.weeklyRewards .weeklyRewards_in .box .left .get').attr('id', res.data.weekLevelReward.itemList[0].id); if (res.data.weekLevelReward.itemList[0].status == 1) { $('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('getAct'); diff --git a/view/molistar/modules/guildAr/js/weeklyRewards.js b/view/molistar/modules/guildAr/js/weeklyRewards.js index 821d191..c09c932 100644 --- a/view/molistar/modules/guildAr/js/weeklyRewards.js +++ b/view/molistar/modules/guildAr/js/weeklyRewards.js @@ -120,11 +120,15 @@ function ulFun(index) {
${langReplace(localLang.weeklyRewards.text4)}${res.level}
- ${res.processNum}/${res.maxNum} + ${res.processNum + res.preMaxNum}/${res.maxNum}
-
+
+
+
+ ${res.preMaxNum} + ${res.maxNum}
diff --git a/view/molistar/modules/guildAr/weeklyRewards.html b/view/molistar/modules/guildAr/weeklyRewards.html index 2e06b5f..e693131 100644 --- a/view/molistar/modules/guildAr/weeklyRewards.html +++ b/view/molistar/modules/guildAr/weeklyRewards.html @@ -6,7 +6,7 @@ - + @@ -38,6 +38,10 @@
+
+ 0 + 0 +
@@ -54,5 +58,5 @@ - + \ No newline at end of file