yinmeng/yinmeng-h5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
Dragon
2023-12-27 18:38:11 +08:00
parent bd2a6858b4
commit dd78d64fd2
11 changed files with 77 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
view/yinmeng/activity/2023-year/css/index.css
View File

@@ -398,6 +398,7 @@ body {
box-sizing: border-box; box-sizing: border-box;
padding: 0 0.64rem 0 0.4rem; padding: 0 0.64rem 0 0.4rem;
margin-bottom: 0.10667rem; margin-bottom: 0.10667rem;
position: relative;
} }
.page1 .box ul li .num { .page1 .box ul li .num {
@@ -512,6 +513,13 @@ body {
width: 100%; width: 100%;
height: 1.76rem; height: 1.76rem;
position: relative; position: relative;
background: url(../images/page1myBoxLIbg.png) no-repeat;
background-size: 100% 100%;
transform: translateX(8%);
margin-bottom: 0.18667rem;
box-sizing: border-box;
padding-right: 0.92rem;
overflow: hidden;
} }
.page1 .my .myBox .myBox_in .num { .page1 .my .myBox .myBox_in .num {
@@ -521,14 +529,14 @@ body {
float: left; float: left;
height: 100%; height: 100%;
line-height: 1.76rem; line-height: 1.76rem;
color: #fff; color: #523A22;
font-size: 0.42667rem; font-size: 0.42667rem;
font-weight: 400; font-weight: 400;
} }
.page1 .my .myBox .myBox_in .ts { .page1 .my .myBox .myBox_in .ts {
position: absolute; position: absolute;
left: 1.6rem; left: 0.7rem;
top: 0.18667rem; top: 0.18667rem;
width: 2.08rem; width: 2.08rem;
height: 1.09333rem; height: 1.09333rem;
@@ -539,7 +547,7 @@ body {
width: 0.98667rem; width: 0.98667rem;
height: 0.98667rem; height: 0.98667rem;
position: absolute; position: absolute;
left: 1.64667rem; left: 0.74667rem;
top: 0.25333rem; top: 0.25333rem;
border-radius: 50%; border-radius: 50%;
} }
@@ -548,7 +556,7 @@ body {
width: 0.98667rem; width: 0.98667rem;
height: 0.98667rem; height: 0.98667rem;
position: absolute; position: absolute;
left: 2.64667rem; left: 1.74667rem;
top: 0.25333rem; top: 0.25333rem;
border-radius: 50%; border-radius: 50%;
} }
@@ -556,45 +564,47 @@ body {
.page1 .my .myBox .myBox_in .lName { .page1 .my .myBox .myBox_in .lName {
width: 0.97333rem; width: 0.97333rem;
text-align: center; text-align: center;
color: #FFFFFF; color: #523A22;
font-size: 0.2rem; font-size: 0.2rem;
font-weight: 400;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
position: absolute; position: absolute;
left: 1.62667rem; left: 0.72667rem;
top: 1.33333rem; top: 1.4rem;
} }
.page1 .my .myBox .myBox_in .rName { .page1 .my .myBox .myBox_in .rName {
width: 0.97333rem; width: 0.97333rem;
text-align: center; text-align: center;
color: #FFFFFF; color: #523A22;
font-size: 0.2rem; font-size: 0.2rem;
font-weight: 400;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
position: absolute; position: absolute;
left: 2.61333rem; left: 1.74667rem;
top: 1.33333rem; top: 1.4rem;
} }
.page1 .my .myBox .myBox_in .score { .page1 .my .myBox .myBox_in .score {
float: right; float: right;
height: 100%; height: 100%;
line-height: 1.76rem; color: #523A22;
color: #FFFFFF;
font-size: 0.29333rem; font-size: 0.29333rem;
font-weight: 400; margin-top: 0.26667rem;
text-align: right;
}
.page1 .my .myBox .myBox_in .score P {
margin-bottom: 0.04rem;
} }
.page1 .my .myBox .NotUser { .page1 .my .myBox .NotUser {
width: 100%; width: 100%;
text-align: center; text-align: center;
line-height: 1.76rem; line-height: 1.76rem;
color: #fff; color: #523A22;
transform: translateX(8%); transform: translateX(8%);
} }
@@ -2140,7 +2150,7 @@ body {
bottom: 0; bottom: 0;
z-index: 3; z-index: 3;
box-sizing: border-box; box-sizing: border-box;
padding: 0 1.06667rem 0 0.76rem; padding: 0 0.66667rem 0 0.76rem;
} }
.page5 .my .num { .page5 .my .num {

45
view/yinmeng/activity/2023-year/css/index.scss
View File

@@ -404,6 +404,7 @@ body {
box-sizing: border-box; box-sizing: border-box;
padding: 0 px2rem(48) 0 px2rem(30); padding: 0 px2rem(48) 0 px2rem(30);
margin-bottom: px2rem(8); margin-bottom: px2rem(8);
position: relative;
.num { .num {
width: px2rem(35); width: px2rem(35);
@@ -518,6 +519,13 @@ body {
width: 100%; width: 100%;
height: 1.76rem; height: 1.76rem;
position: relative; position: relative;
background: url(../images/page1myBoxLIbg.png) no-repeat;
background-size: 100% 100%;
transform: translateX(8%);
margin-bottom: px2rem(14);
box-sizing: border-box;
padding-right: px2rem(69);
overflow: hidden;
.num { .num {
width: px2rem(35); width: px2rem(35);
@@ -526,14 +534,14 @@ body {
float: left; float: left;
height: 100%; height: 100%;
line-height: px2rem(132); line-height: px2rem(132);
color: #fff; color: #523A22;
font-size: px2rem(32); font-size: px2rem(32);
font-weight: 400; font-weight: 400;
} }
.ts { .ts {
position: absolute; position: absolute;
left: px2rem(120); left: 0.7rem;
top: px2rem(14); top: px2rem(14);
width: px2rem(156); width: px2rem(156);
height: px2rem(82); height: px2rem(82);
@@ -544,7 +552,7 @@ body {
width: px2rem(74); width: px2rem(74);
height: px2rem(74); height: px2rem(74);
position: absolute; position: absolute;
left: px2rem(123.5); left: 0.74667rem;
top: px2rem(19); top: px2rem(19);
border-radius: 50%; border-radius: 50%;
} }
@@ -553,7 +561,7 @@ body {
width: px2rem(74); width: px2rem(74);
height: px2rem(74); height: px2rem(74);
position: absolute; position: absolute;
left: px2rem(198.5); left: 1.74667rem;
top: px2rem(19); top: px2rem(19);
border-radius: 50%; border-radius: 50%;
} }
@@ -561,38 +569,41 @@ body {
.lName { .lName {
width: px2rem(73); width: px2rem(73);
text-align: center; text-align: center;
color: #FFFFFF; color: #523A22;
font-size: px2rem(15); font-size: px2rem(15);
font-weight: 400;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
position: absolute; position: absolute;
left: px2rem(122); left: 0.72667rem;
top: px2rem(100); top: px2rem(105);
} }
.rName { .rName {
width: px2rem(73); width: px2rem(73);
text-align: center; text-align: center;
color: #FFFFFF; color: #523A22;
font-size: px2rem(15); font-size: px2rem(15);
font-weight: 400;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
position: absolute; position: absolute;
left: px2rem(196); left: 1.74667rem;
top: px2rem(100); top: px2rem(105);
} }
.score { .score {
float: right; float: right;
height: 100%; height: 100%;
line-height: px2rem(132); // line-height: px2rem(132);
color: #FFFFFF; color: #523A22;
font-size: px2rem(22); font-size: px2rem(22);
font-weight: 400; margin-top: px2rem(20);
text-align: right;
P {
margin-bottom: px2rem(3);
}
} }
} }
@@ -600,7 +611,7 @@ body {
width: 100%; width: 100%;
text-align: center; text-align: center;
line-height: 1.76rem; line-height: 1.76rem;
color: #fff; color: #523A22;
transform: translateX(8%) transform: translateX(8%)
} }
} }
@@ -2148,7 +2159,7 @@ body {
bottom: 0; bottom: 0;
z-index: 3; z-index: 3;
box-sizing: border-box; box-sizing: border-box;
padding: 0 px2rem(80) 0 px2rem(57); padding: 0 px2rem(50) 0 px2rem(57);
.num { .num {
width: 1.3rem; width: 1.3rem;

BIN
view/yinmeng/activity/2023-year/images/page1myBg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
view/yinmeng/activity/2023-year/images/page1myBoxLIbg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
view/yinmeng/activity/2023-year/images/rule41.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 120 KiB

BIN
view/yinmeng/activity/2023-year/images/rule42.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 142 KiB

BIN
view/yinmeng/activity/2023-year/images/rule43.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 141 KiB

BIN
view/yinmeng/activity/2023-year/images/rule44.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 184 KiB

BIN
view/yinmeng/activity/2023-year/images/rule45.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 179 KiB

2
view/yinmeng/activity/2023-year/index.html
View File

@@ -82,7 +82,7 @@
<img src="./images/logo.png" alt="" class="rtx"> <img src="./images/logo.png" alt="" class="rtx">
<div class="lName">用户昵称</div> <div class="lName">用户昵称</div>
<div class="rName">用户昵称</div> <div class="rName">用户昵称</div>
<div class="score">xxxx友谊值</div> <div class="score"><p>xxxx友谊值</p><span>当前排名xxx</span></div>
</div> </div>
</div> </div>
</div> </div>

36
view/yinmeng/activity/2023-year/js/index.js
View File

@@ -342,7 +342,7 @@ function cpRank () {
rightAvatar: './images/logo.png', rightAvatar: './images/logo.png',
leftNick: '虚位以待', leftNick: '虚位以待',
rightNick: '虚位以待', rightNick: '虚位以待',
score: "0友谊值" score: "0"
}) })
top3.push(...arr) top3.push(...arr)
} }
@@ -385,7 +385,7 @@ function cpRank () {
<img src="${res.rightAvatar}" alt="" class="rtx"> <img src="${res.rightAvatar}" alt="" class="rtx">
<div class="lName">${res.leftNick}</div> <div class="lName">${res.leftNick}</div>
<div class="rName">${res.rightNick}</div> <div class="rName">${res.rightNick}</div>
<div class="score">${unitProcessing(res.score, 10000, 1, 'w')}友谊值</div> <div class="score"><div class="score"><p>${unitProcessing(res.score, 10000, 1, 'w')}友谊值</p><span>${res.ranking == 0 ? '暂未上榜' : '当前排名:' + res.ranking}</span></div></div>
</div> </div>
` `
}) })
@@ -531,7 +531,7 @@ function tyrantGetRank () {
<img src="./images/page2UlTs.png" alt="" class="ts"> <img src="./images/page2UlTs.png" alt="" class="ts">
<img src="${res.avatar}" alt="" class="tx"> <img src="${res.avatar}" alt="" class="tx">
<div class="name">${res.nick}</div> <div class="name">${res.nick}</div>
<div class="score">闪耀值: ${unitProcessing(res.score, 10000, 1, 'w')}</div> <div class="score">神豪值: ${unitProcessing(res.score, 10000, 1, 'w')}</div>
</li> </li>
` `
}) })
@@ -540,7 +540,7 @@ function tyrantGetRank () {
$('.page5 .my .num').text(res.data.meRank.ranking == 0 ? '未上榜' : res.data.meRank.ranking); $('.page5 .my .num').text(res.data.meRank.ranking == 0 ? '未上榜' : res.data.meRank.ranking);
$('.page5 .my .ts .tx').attr('src', res.data.meRank.avatar); $('.page5 .my .ts .tx').attr('src', res.data.meRank.avatar);
$('.page5 .my .name').text(res.data.meRank.nick); $('.page5 .my .name').text(res.data.meRank.nick);
$('.page5 .my .score').text(`闪耀值: ${unitProcessing(res.data.meRank.score, 10000, 1, 'w')}`); $('.page5 .my .score').text(`神豪值: ${unitProcessing(res.data.meRank.score, 10000, 1, 'w')}`);
} else { } else {
toastMsg(res.message) toastMsg(res.message)
} }
@@ -564,17 +564,19 @@ function getTask () {
// 处理自己 // 处理自己
$('.celebrationTask .celebrationTask_in .user .tx').attr('src', res.data.avatar); $('.celebrationTask .celebrationTask_in .user .tx').attr('src', res.data.avatar);
$('.celebrationTask .celebrationTask_in .user .score .sp1 b').text(unitProcessing(res.data.score, 10000, 1, 'w')) $('.celebrationTask .celebrationTask_in .user .score .sp1 b').text(unitProcessing(res.data.score, 10000, 1, 'w'))
$('.celebrationTask .celebrationTask_in .user .score .sp2 b').text(unitProcessing(res.data.nextStageDist, 10000, 1, 'w')) $('.celebrationTask .celebrationTask_in .user .score .sp2 b').text(res.data.nextStageDist)
$('.celebrationTask .celebrationTask_in .user p').text(res.data.nick); $('.celebrationTask .celebrationTask_in .user p').text(res.data.nick);
// 处理当前展示奖励 // 处理当前展示奖励
taskList = res.data.taskList; taskList = res.data.taskList;
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .but').hide(); $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .but').hide();
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .butNot').hide(); $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .butNot').hide();
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .but').hide();
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .butNot').hide();
if (taskType == 2) { if (taskType == 2) {
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .giftBox div').remove(); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .giftBox div').remove();
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox p b').text(taskGiftList1[taskListIndex1 + 1][0].value); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox p b').text(taskGiftList1[taskListIndex1 + 1][0].value);
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .title').text(`LV1`); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .title').text(`LV1`);
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox i').text(`0/8`); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox i').text(`1/8`);
var str = '' var str = ''
taskGiftList1[taskListIndex1 + 1].forEach((res, i) => { taskGiftList1[taskListIndex1 + 1].forEach((res, i) => {
str += ` str += `
@@ -600,7 +602,7 @@ function getTask () {
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .giftBox div').remove(); $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .giftBox div').remove();
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox p b').text(taskGiftList1[taskListIndex1 + 1][0].value); $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox p b').text(taskGiftList1[taskListIndex1 + 1][0].value);
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .title').text(`LV1`); $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .title').text(`LV1`);
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox i').text(`0/8`); $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox i').text(`1/8`);
var str = '' var str = ''
taskGiftList1[taskListIndex1 + 1].forEach((res, i) => { taskGiftList1[taskListIndex1 + 1].forEach((res, i) => {
str += ` str += `
@@ -672,6 +674,8 @@ $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .but,.celeb
data: { type: taskType, taskId }, data: { type: taskType, taskId },
success (res) { success (res) {
if (res.code === 200) { if (res.code === 200) {
taskListIndex1 = 0;
taskListIndex2 = 0;
getTask(); getTask();
toastMsg('领取成功，奖励已自动发放背包'); toastMsg('领取成功，奖励已自动发放背包');
} else { } else {
@@ -690,6 +694,8 @@ $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .but,.celeb
function taskListFunction1 (type) { function taskListFunction1 (type) {
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .but').hide(); $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .but').hide();
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .butNot').hide(); $('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .butNot').hide();
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .but').hide();
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .butNot').hide();
if (type == 1) { if (type == 1) {
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .giftBox div').remove(); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .giftBox div').remove();
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox p b').text(taskGiftList1[taskListIndex1 + 1][0].value); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox p b').text(taskGiftList1[taskListIndex1 + 1][0].value);
@@ -707,14 +713,14 @@ function taskListFunction1 (type) {
}); });
$('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .giftBox').append(str); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .giftBox').append(str);
if (taskList[taskListIndex1].status == 0) { if (taskList[taskListIndex1].status == 0) {
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .butNot').text('未满足条件'); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .butNot').text('未满足条件');
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .butNot').show(); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .butNot').show();
} else if (taskList[taskListIndex1].status == 1) { } else if (taskList[taskListIndex1].status == 1) {
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .but').attr('taskId', taskList[taskListIndex1].taskId); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .but').attr('taskId', taskList[taskListIndex1].taskId);
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .but').show(); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .but').show();
} else { } else {
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .butNot').text('已领取'); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .butNot').text('已领取');
$('.celebrationTask .celebrationTask_in .tabBox2 .celebrationTaskBox .butNot').show(); $('.celebrationTask .celebrationTask_in .tabBox1 .celebrationTaskBox .butNot').show();
} }
} else { } else {
@@ -1085,7 +1091,7 @@ function roomGetRank () {
<img src="./images/page2UlTs.png" alt="" class="ts" roomUid="${res.uid}"> <img src="./images/page2UlTs.png" alt="" class="ts" roomUid="${res.uid}">
<img src="${res.avatar}" alt="" class="tx"> <img src="${res.avatar}" alt="" class="tx">
<div class="name">${res.nick}</div> <div class="name">${res.nick}</div>
<div class="score">人气值: ${unitProcessing(res.score, 10000, 1, 'w')}</div> <div class="score">荣耀值: ${unitProcessing(res.score, 10000, 1, 'w')}</div>
</li> </li>
` `
}) })
@@ -1093,7 +1099,7 @@ function roomGetRank () {
// 处理自己榜单 // 处理自己榜单
$('.page4 .my .num').text(res.data.meRank.ranking == 0 ? '未上榜' : res.data.meRank.ranking); $('.page4 .my .num').text(res.data.meRank.ranking == 0 ? '未上榜' : res.data.meRank.ranking);
$('.page4 .my .ts .tx').attr('src', res.data.meRank.avatar); $('.page4 .my .ts .tx').attr('src', res.data.meRank.avatar);
$('.page4 .my .score').text(`人气值: ${unitProcessing(res.data.meRank.score, 10000, 1, 'w')}`) $('.page4 .my .score').text(`荣耀值: ${unitProcessing(res.data.meRank.score, 10000, 1, 'w')}`)
} else { } else {
toastMsg(res.message) toastMsg(res.message)
} }