修改周奖励

This commit is contained in:
dragon
2024-10-31 17:16:33 +08:00
parent 4c4d621ee9
commit c32c2202e8
16 changed files with 169 additions and 17 deletions

View File

@@ -399,6 +399,21 @@ body {
top: 0; 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 { .weeklyRewards .weeklyRewards_in .bottom {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;

View File

@@ -342,6 +342,7 @@ body {
border: none; border: none;
color: #fff; color: #fff;
} }
.getOut { .getOut {
background: #CDCED6; background: #CDCED6;
border: none; border: none;
@@ -400,6 +401,21 @@ body {
top: 0; 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;
}
}
} }
} }

View File

@@ -217,6 +217,21 @@ body {
top: 0; 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 { .arabic .back .backIcon {
left: auto; left: auto;
right: 0.42667rem; right: 0.42667rem;

View File

@@ -217,6 +217,21 @@ body {
top: 0; 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;
}
}
} }
} }
} }

View File

@@ -7,7 +7,7 @@
<title class="text1"></title> <title class="text1"></title>
<!-- 公会首页 --> <!-- 公会首页 -->
<link rel="stylesheet" href="../../common/css/reset.css"> <link rel="stylesheet" href="../../common/css/reset.css">
<link rel="stylesheet" href="./css/index.css?v1.0"> <link rel="stylesheet" href="./css/index.css?v1.11">
</head> </head>
<body> <body>
@@ -114,6 +114,10 @@
<div class="line"> <div class="line">
<div class="line_in"></div> <div class="line_in"></div>
</div> </div>
<div class="speedOfProgress">
<span>0</span>
<b>0</b>
</div>
</div> </div>
</div> </div>
<div class="bottom weeklyRewardsText5"></div> <div class="bottom weeklyRewardsText5"></div>
@@ -184,5 +188,5 @@
<script src="./local/en.js"></script> <script src="./local/en.js"></script>
<script src="./local/zh.js"></script> <script src="./local/zh.js"></script>
<script src="./local/ar.js"></script> <script src="./local/ar.js"></script>
<script src="./js/index.js?v=1.3"></script> <script src="./js/index.js?v=1.11"></script>
<script src="../../common/local/langHandler.js"></script> <script src="../../common/local/langHandler.js"></script>

View File

@@ -214,9 +214,12 @@ function get() {
if (res.data.weekLevelReward.dateRange && res.data.weekLevelReward.itemList[0]) { 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 .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 .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 .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); $('.weeklyRewards .weeklyRewards_in .box .left .get').attr('id', res.data.weekLevelReward.itemList[0].id);
if (res.data.weekLevelReward.itemList[0].status == 1) { if (res.data.weekLevelReward.itemList[0].status == 1) {
$('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('getAct'); $('.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').addClass('getOut');
$('.weeklyRewards .weeklyRewards_in .box .left .get').text(langReplace(localLang.weeklyRewards.text5)) $('.weeklyRewards .weeklyRewards_in .box .left .get').text(langReplace(localLang.weeklyRewards.text5))
} }
}else{ } else {
$('.weeklyRewards').hide(); $('.weeklyRewards').hide();
} }
} else { } else {

View File

@@ -120,11 +120,15 @@ function ulFun(index) {
<div class="textTop"> <div class="textTop">
<div class="l">${langReplace(localLang.weeklyRewards.text4)}<b>${res.level}</b></div> <div class="l">${langReplace(localLang.weeklyRewards.text4)}<b>${res.level}</b></div>
<div class="r"> <div class="r">
<b class="b1">${res.processNum}</b>/<b class="b2">${res.maxNum}</b><img src="./images/diamondss.png" alt=""> <b class="b1">${res.processNum + res.preMaxNum}</b>/<b class="b2">${res.maxNum}</b><img src="./images/diamondss.png" alt="">
</div> </div>
</div> </div>
<div class="line"> <div class="line">
<div class="line_in" style="width:${(res.processNum / res.maxNum) * 100}%"></div> <div class="line_in" style="width:${((res.processNum + res.preMaxNum) - (res.preMaxNum)) / (res.maxNum - res.preMaxNum) * 100}%"></div>
</div>
<div class="speedOfProgress">
<span>${res.preMaxNum}</span>
<b>${res.maxNum}</b>
</div> </div>
</div> </div>
</li> </li>

View File

@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title class="text1"></title> <title class="text1"></title>
<link rel="stylesheet" href="../../common/css/reset.css"> <link rel="stylesheet" href="../../common/css/reset.css">
<link rel="stylesheet" href="./css/weeklyRewards.css?v1.0"> <link rel="stylesheet" href="./css/weeklyRewards.css?v1.11">
</head> </head>
<body> <body>
@@ -38,6 +38,10 @@
<div class="line"> <div class="line">
<div class="line_in"></div> <div class="line_in"></div>
</div> </div>
<div class="speedOfProgress">
<span>0</span>
<b>0</b>
</div>
</div> </div>
</li> </li>
</ul> </ul>
@@ -54,5 +58,5 @@
<script src="./local/en.js"></script> <script src="./local/en.js"></script>
<script src="./local/zh.js"></script> <script src="./local/zh.js"></script>
<script src="./local/ar.js"></script> <script src="./local/ar.js"></script>
<script src="./js/weeklyRewards.js?v=1.3"></script> <script src="./js/weeklyRewards.js?v=1.11"></script>
<script src="../../common/local/langHandler.js"></script> <script src="../../common/local/langHandler.js"></script>

View File

@@ -403,6 +403,21 @@ body {
top: 0; 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 { .weeklyRewards .weeklyRewards_in .bottom {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;

View File

@@ -405,6 +405,20 @@ body {
top: 0; 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;
}
}
} }
} }

View File

@@ -217,6 +217,22 @@ body {
top: 0; 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 { .arabic .back .backIcon {
left: auto; left: auto;
right: 0.42667rem; right: 0.42667rem;

View File

@@ -217,6 +217,22 @@ body {
top: 0; 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;
}
}
} }
} }
} }

View File

@@ -7,7 +7,7 @@
<title class="text1"></title> <title class="text1"></title>
<!-- 公会首页 --> <!-- 公会首页 -->
<link rel="stylesheet" href="../../common/css/reset.css"> <link rel="stylesheet" href="../../common/css/reset.css">
<link rel="stylesheet" href="./css/index.css?v1.2"> <link rel="stylesheet" href="./css/index.css?v1.11">
</head> </head>
<body> <body>
@@ -110,6 +110,10 @@
<div class="line"> <div class="line">
<div class="line_in"></div> <div class="line_in"></div>
</div> </div>
<div class="speedOfProgress">
<span>0</span>
<b>0</b>
</div>
</div> </div>
</div> </div>
<div class="bottom weeklyRewardsText5"></div> <div class="bottom weeklyRewardsText5"></div>
@@ -180,5 +184,5 @@
<script src="./local/en.js?v=1.0"></script> <script src="./local/en.js?v=1.0"></script>
<script src="./local/zh.js?v=1.0"></script> <script src="./local/zh.js?v=1.0"></script>
<script src="./local/ar.js?v=1.0"></script> <script src="./local/ar.js?v=1.0"></script>
<script src="./js/index.js?v=1.0"></script> <script src="./js/index.js?v=1.11"></script>
<script src="../../common/local/langHandler.js"></script> <script src="../../common/local/langHandler.js"></script>

View File

@@ -180,9 +180,12 @@ function get() {
if (res.data.weekLevelReward.dateRange && res.data.weekLevelReward.itemList[0]) { 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 .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 .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 .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); $('.weeklyRewards .weeklyRewards_in .box .left .get').attr('id', res.data.weekLevelReward.itemList[0].id);
if (res.data.weekLevelReward.itemList[0].status == 1) { if (res.data.weekLevelReward.itemList[0].status == 1) {
$('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('getAct'); $('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('getAct');

View File

@@ -120,11 +120,15 @@ function ulFun(index) {
<div class="textTop"> <div class="textTop">
<div class="l">${langReplace(localLang.weeklyRewards.text4)}<b>${res.level}</b></div> <div class="l">${langReplace(localLang.weeklyRewards.text4)}<b>${res.level}</b></div>
<div class="r"> <div class="r">
<b class="b1">${res.processNum}</b>/<b class="b2">${res.maxNum}</b><img src="./images/coin.png" alt=""> <b class="b1">${res.processNum + res.preMaxNum}</b>/<b class="b2">${res.maxNum}</b><img src="./images/coin.png" alt="">
</div> </div>
</div> </div>
<div class="line"> <div class="line">
<div class="line_in" style="width:${(res.processNum / res.maxNum) * 100}%"></div> <div class="line_in" style="width:${((res.processNum + res.preMaxNum) - (res.preMaxNum)) / (res.maxNum - res.preMaxNum) * 100}%"></div>
</div>
<div class="speedOfProgress">
<span>${res.preMaxNum}</span>
<b>${res.maxNum}</b>
</div> </div>
</div> </div>
</li> </li>

View File

@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title class="text1"></title> <title class="text1"></title>
<link rel="stylesheet" href="../../common/css/reset.css"> <link rel="stylesheet" href="../../common/css/reset.css">
<link rel="stylesheet" href="./css/weeklyRewards.css?v1.0"> <link rel="stylesheet" href="./css/weeklyRewards.css?v1.11">
</head> </head>
<body> <body>
@@ -38,6 +38,10 @@
<div class="line"> <div class="line">
<div class="line_in"></div> <div class="line_in"></div>
</div> </div>
<div class="speedOfProgress">
<span>0</span>
<b>0</b>
</div>
</div> </div>
</li> </li>
</ul> </ul>
@@ -54,5 +58,5 @@
<script src="./local/en.js?v=1.0"></script> <script src="./local/en.js?v=1.0"></script>
<script src="./local/zh.js?v=1.0"></script> <script src="./local/zh.js?v=1.0"></script>
<script src="./local/ar.js?v=1.0"></script> <script src="./local/ar.js?v=1.0"></script>
<script src="./js/weeklyRewards.js?v=1.0"></script> <script src="./js/weeklyRewards.js?v=1.11"></script>
<script src="../../common/local/langHandler.js"></script> <script src="../../common/local/langHandler.js"></script>