diff --git a/view/peko/activity/act-ocean/css/index.css b/view/peko/activity/act-ocean/css/index.css index e69905a..0672229 100644 --- a/view/peko/activity/act-ocean/css/index.css +++ b/view/peko/activity/act-ocean/css/index.css @@ -436,13 +436,18 @@ body { } .wrap .game-area .draw-time .top-three .top-three-list .no1 .nick { width: 100%; + height: 1rem; + line-height: 0.6rem; font-size: 0.2933333333rem; color: #fff; text-align: center; position: absolute; - top: 1.1733333333rem; + top: 1.1333333333rem; left: 50%; transform: translateX(-50%); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .wrap .game-area .draw-time .top-three .top-three-list .no1 .num { width: 100%; @@ -488,13 +493,18 @@ body { } .wrap .game-area .draw-time .top-three .top-three-list .no2 .nick { width: 100%; + height: 1rem; + line-height: 0.6rem; font-size: 0.2933333333rem; color: #fff; text-align: center; position: absolute; - top: 1.0133333333rem; + top: 0.9333333333rem; left: 50%; transform: translateX(-50%); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .wrap .game-area .draw-time .top-three .top-three-list .no2 .num { width: 100%; @@ -541,13 +551,18 @@ body { } .wrap .game-area .draw-time .top-three .top-three-list .no3 .nick { width: 100%; + height: 1rem; + line-height: 0.6rem; font-size: 0.2933333333rem; color: #fff; text-align: center; position: absolute; - top: 1.0133333333rem; + top: 0.9333333333rem; left: 50%; transform: translateX(-50%); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .wrap .game-area .draw-time .top-three .top-three-list .no3 .num { width: 100%; diff --git a/view/peko/activity/act-ocean/css/index.scss b/view/peko/activity/act-ocean/css/index.scss index 4f5f49d..65bdbc3 100644 --- a/view/peko/activity/act-ocean/css/index.scss +++ b/view/peko/activity/act-ocean/css/index.scss @@ -601,13 +601,18 @@ body { .nick { width: 100%; + height: 1rem; + line-height: 0.6rem; font-size: px2rem(22, ); color: #fff; text-align: center; position: absolute; - top: px2rem(88, ); + top: px2rem(85, ); left: 50%; transform: translateX(-50%); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; //溢出显示省略号 } .num { @@ -664,13 +669,18 @@ body { .nick { width: 100%; + height: 1rem; + line-height: 0.6rem; font-size: px2rem(22, ); color: #fff; text-align: center; position: absolute; - top: px2rem(76, ); + top: px2rem(70, ); left: 50%; transform: translateX(-50%); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; //溢出显示省略号 } .num { @@ -725,13 +735,18 @@ body { .nick { width: 100%; + height: 1rem; + line-height: 0.6rem; font-size: px2rem(22, ); color: #fff; text-align: center; position: absolute; - top: px2rem(76, ); + top: px2rem(70, ); left: 50%; transform: translateX(-50%); + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; //溢出显示省略号 } .num { diff --git a/view/peko/activity/act-ocean/index.html b/view/peko/activity/act-ocean/index.html index f22c510..cd22458 100644 --- a/view/peko/activity/act-ocean/index.html +++ b/view/peko/activity/act-ocean/index.html @@ -35,8 +35,8 @@
- -
+ +
@@ -102,7 +102,7 @@
虚位以待
- + 0
@@ -111,7 +111,7 @@
虚位以待
- + 0
@@ -120,7 +120,7 @@
虚位以待
- + 0
diff --git a/view/peko/activity/act-ocean/js/index.js b/view/peko/activity/act-ocean/js/index.js index 4d910a7..a5a8790 100644 --- a/view/peko/activity/act-ocean/js/index.js +++ b/view/peko/activity/act-ocean/js/index.js @@ -17,7 +17,8 @@ const showLoading = (content = '加載中...') => { shadeClose: false, content, 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' }) } - if (false) { //!browser.app toastMsg('請在app內打開!'); } else { @@ -39,7 +39,10 @@ if (false) { //!browser.app } console.log(document.body.clientWidth); 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' }); } // 獲取用戶相關信息 @@ -139,9 +142,9 @@ const getNewestAct = () => { clearTimeout(timer2) hideLoading(layerIndex) roundId = res.data.roundId - getPreviousResults(20, roundId) $('.game-area .roundId').html(roundId) getListItem(roundId, modelType) + getPreviousResults(20, roundId) // 進行下一輪時,arrTime重新置為空數組,不然在下一輪開始的時候也會執行location.reload() if (roundIdArr.length < 2) { @@ -266,6 +269,7 @@ const showView = () => { judgeStatus() getUserInfo() } + $('.game-area').show(); } // 顯示倒計時 @@ -512,8 +516,8 @@ const renderDrawInfo = () => { topThreeArr.map((item, index) => { $(`.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} .nick`).html(item.nick) - $(`.top-three-list .no${index + 1} .num span`).html(item.prizeDiamonds) + $(`.top-three-list .no${index + 1} .nick`).text(item.nick) + $(`.top-three-list .no${index + 1} .num span`).text(item.prizeDiamonds ? item.prizeDiamonds : '') }) }