moliparty/peko-h5
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

厨房：修复进入闪烁第三阶段问题，修复钻石异常问题，修复名字重叠问题

Browse Source
This commit is contained in:
Dragon
2023-03-07 11:30:20 +08:00
parent c12b08e3f8
commit edc6375e11
4 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
view/peko/activity/act-ocean/css/index.css
View File

@@ -436,13 +436,18 @@ body {
} }
.wrap .game-area .draw-time .top-three .top-three-list .no1 .nick { .wrap .game-area .draw-time .top-three .top-three-list .no1 .nick {
width: 100%; width: 100%;
height: 1rem;
line-height: 0.6rem;
font-size: 0.2933333333rem; font-size: 0.2933333333rem;
color: #fff; color: #fff;
text-align: center; text-align: center;
position: absolute; position: absolute;
top: 1.1733333333rem; top: 1.1333333333rem;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.wrap .game-area .draw-time .top-three .top-three-list .no1 .num { .wrap .game-area .draw-time .top-three .top-three-list .no1 .num {
width: 100%; width: 100%;
@@ -488,13 +493,18 @@ body {
} }
.wrap .game-area .draw-time .top-three .top-three-list .no2 .nick { .wrap .game-area .draw-time .top-three .top-three-list .no2 .nick {
width: 100%; width: 100%;
height: 1rem;
line-height: 0.6rem;
font-size: 0.2933333333rem; font-size: 0.2933333333rem;
color: #fff; color: #fff;
text-align: center; text-align: center;
position: absolute; position: absolute;
top: 1.0133333333rem; top: 0.9333333333rem;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.wrap .game-area .draw-time .top-three .top-three-list .no2 .num { .wrap .game-area .draw-time .top-three .top-three-list .no2 .num {
width: 100%; width: 100%;
@@ -541,13 +551,18 @@ body {
} }
.wrap .game-area .draw-time .top-three .top-three-list .no3 .nick { .wrap .game-area .draw-time .top-three .top-three-list .no3 .nick {
width: 100%; width: 100%;
height: 1rem;
line-height: 0.6rem;
font-size: 0.2933333333rem; font-size: 0.2933333333rem;
color: #fff; color: #fff;
text-align: center; text-align: center;
position: absolute; position: absolute;
top: 1.0133333333rem; top: 0.9333333333rem;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
.wrap .game-area .draw-time .top-three .top-three-list .no3 .num { .wrap .game-area .draw-time .top-three .top-three-list .no3 .num {
width: 100%; width: 100%;

21
view/peko/activity/act-ocean/css/index.scss
View File

@@ -601,13 +601,18 @@ body {
.nick { .nick {
width: 100%; width: 100%;
height: 1rem;
line-height: 0.6rem;
font-size: px2rem(22, ); font-size: px2rem(22, );
color: #fff; color: #fff;
text-align: center; text-align: center;
position: absolute; position: absolute;
top: px2rem(88, ); top: px2rem(85, );
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis; //溢出显示省略号
} }
.num { .num {
@@ -664,13 +669,18 @@ body {
.nick { .nick {
width: 100%; width: 100%;
height: 1rem;
line-height: 0.6rem;
font-size: px2rem(22, ); font-size: px2rem(22, );
color: #fff; color: #fff;
text-align: center; text-align: center;
position: absolute; position: absolute;
top: px2rem(76, ); top: px2rem(70, );
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis; //溢出显示省略号
} }
.num { .num {
@@ -725,13 +735,18 @@ body {
.nick { .nick {
width: 100%; width: 100%;
height: 1rem;
line-height: 0.6rem;
font-size: px2rem(22, ); font-size: px2rem(22, );
color: #fff; color: #fff;
text-align: center; text-align: center;
position: absolute; position: absolute;
top: px2rem(76, ); top: px2rem(70, );
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis; //溢出显示省略号
} }
.num { .num {

10
view/peko/activity/act-ocean/index.html
View File

@@ -35,8 +35,8 @@
<!-- <div class="add"><img src="./images/add.png" alt=""></div> --> <!-- <div class="add"><img src="./images/add.png" alt=""></div> -->
<div class="recharge"><img src="./images/mall/recharge.png" alt=""></div> <div class="recharge"><img src="./images/mall/recharge.png" alt=""></div>
</div> </div>
<!-- 游戏区域 --> <!-- 游戏区域 style="display: none;"-->
<div class="game-area"> <div class="game-area" >
<!-- 本轮轮次 --> <!-- 本轮轮次 -->
<div class="roundId"></div> <div class="roundId"></div>
<!-- 选择时间 --> <!-- 选择时间 -->
@@ -102,7 +102,7 @@
<div class="nick">虚位以待</div> <div class="nick">虚位以待</div>
<div class="num"> <div class="num">
<img src="./images/diamond.png" class="diamond" alt=""> <img src="./images/diamond.png" class="diamond" alt="">
<span></span> <span>0</span>
</div> </div>
</div> </div>
<div class="no no2"> <div class="no no2">
@@ -111,7 +111,7 @@
<div class="nick">虚位以待</div> <div class="nick">虚位以待</div>
<div class="num"> <div class="num">
<img src="./images/diamond.png" class="diamond" alt=""> <img src="./images/diamond.png" class="diamond" alt="">
<span></span> <span>0</span>
</div> </div>
</div> </div>
<div class="no no3"> <div class="no no3">
@@ -120,7 +120,7 @@
<div class="nick">虚位以待</div> <div class="nick">虚位以待</div>
<div class="num"> <div class="num">
<img src="./images/diamond.png" class="diamond" alt=""> <img src="./images/diamond.png" class="diamond" alt="">
<span></span> <span>0</span>
</div> </div>
</div> </div>
</div> </div>

16
view/peko/activity/act-ocean/js/index.js
View File

@@ -17,7 +17,8 @@ const showLoading = (content = '加載中...') => {
shadeClose: false, shadeClose: false,
content, content,
success (e) { success (e) {
layerIndex = $(e).attr('index') layerIndex = $(e).attr('index');
$('.layui-m-layer').css("z-index", '9999');
} }
}) })
} }
@@ -31,7 +32,6 @@ const toastMsg = (content = '操作完成', time = 2) => {
skin: 'msg' skin: 'msg'
}) })
} }
if (false) { //!browser.app if (false) { //!browser.app
toastMsg('請在app內打開！'); toastMsg('請在app內打開！');
} else { } else {
@@ -39,7 +39,10 @@ if (false) { //!browser.app
} }
console.log(document.body.clientWidth); console.log(document.body.clientWidth);
console.log(document.body.clientHeight); console.log(document.body.clientHeight);
if (document.body.clientHeight <= 700 || document.body.clientWidth >= 360) { if (document.body.clientHeight <= 700) {
$('body,html').css({ "height": '19.2rem' });
}
if (document.body.clientWidth >= 365) {
$('body,html').css({ "height": '19.2rem' }); $('body,html').css({ "height": '19.2rem' });
} }
// 獲取用戶相關信息 // 獲取用戶相關信息
@@ -139,9 +142,9 @@ const getNewestAct = () => {
clearTimeout(timer2) clearTimeout(timer2)
hideLoading(layerIndex) hideLoading(layerIndex)
roundId = res.data.roundId roundId = res.data.roundId
getPreviousResults(20, roundId)
$('.game-area .roundId').html(roundId) $('.game-area .roundId').html(roundId)
getListItem(roundId, modelType) getListItem(roundId, modelType)
getPreviousResults(20, roundId)
// 進行下一輪時，arrTime重新置為空數組，不然在下一輪開始的時候也會執行location.reload() // 進行下一輪時，arrTime重新置為空數組，不然在下一輪開始的時候也會執行location.reload()
if (roundIdArr.length < 2) { if (roundIdArr.length < 2) {
@@ -266,6 +269,7 @@ const showView = () => {
judgeStatus() judgeStatus()
getUserInfo() getUserInfo()
} }
$('.game-area').show();
} }
// 顯示倒計時 // 顯示倒計時
@@ -512,8 +516,8 @@ const renderDrawInfo = () => {
topThreeArr.map((item, index) => { topThreeArr.map((item, index) => {
$(`.top-three-list .no${index + 1} .tx`).attr('uid', item.uid) $(`.top-three-list .no${index + 1} .tx`).attr('uid', item.uid)
$(`.top-three-list .no${index + 1} .tx`).attr('src', item.avatar) $(`.top-three-list .no${index + 1} .tx`).attr('src', item.avatar)
$(`.top-three-list .no${index + 1} .nick`).html(item.nick) $(`.top-three-list .no${index + 1} .nick`).text(item.nick)
$(`.top-three-list .no${index + 1} .num span`).html(item.prizeDiamonds) $(`.top-three-list .no${index + 1} .num span`).text(item.prizeDiamonds ? item.prizeDiamonds : '')
}) })
} }