+
@@ -162,12 +162,12 @@
-
碎片不足
+
鉆石余額不足
-
当前碎片不足，购买头像框获取碎片
+
当前鉆石不足
diff --git a/view/peko/activity/act-ocean/js/index.js b/view/peko/activity/act-ocean/js/index.js
index 881aba4..d3e12a8 100644
--- a/view/peko/activity/act-ocean/js/index.js
+++ b/view/peko/activity/act-ocean/js/index.js
@@ -16,7 +16,7 @@ const showLoading = (content = '加載中...') => {
type: 2,
shadeClose: false,
content,
- success(e) {
+ success (e) {
layerIndex = $(e).attr('index')
}
})
@@ -32,9 +32,9 @@ const toastMsg = (content = '操作完成', time = 2) => {
})
}
-if(!browser.app){
+if (!browser.app) {
toastMsg('請在app內打開！');
-}else{
+} else {
$('.wrap').removeClass('no-in-app')
}
@@ -45,21 +45,21 @@ const getUserInfo = (param) => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/getUserActInfo',
- success(res){
- if(res.code === 200){
+ success (res) {
+ if (res.code === 200) {
$('.info-bottom').find('.avatar img').attr('src', res.data.avatar)
-
- if(res.data.todayReward.toString().length >= 5) {
- res.data.todayReward = (res.data.todayReward/10000).toFixed(2) + 'w'
+
+ if (res.data.todayReward.toString().length >= 5) {
+ res.data.todayReward = (res.data.todayReward / 10000).toFixed(2) + 'w'
}
$('.info-bottom').find('.award span').html(res.data.todayReward)
- $('.info-bottom').find('.fragment span').html(res.data.pieceNum)
- myFragment = res.data.pieceNum
- }else{
+ $('.info-bottom').find('.fragment span').html(res.data.diamonds)
+ myFragment = res.data.diamonds
+ } else {
return toastMsg(res.message)
}
},
- error(err){
+ error (err) {
toastMsg('網絡錯誤，請退出重進')
}
})
@@ -69,16 +69,16 @@ const getUserPieceNum = () => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/getUserActInfo',
- success(res){
- if(res.code === 200){
- $('.info-bottom').find('.fragment span').html(res.data.pieceNum)
- myFragment = res.data.pieceNum
- }else{
+ success (res) {
+ if (res.code === 200) {
+ $('.info-bottom').find('.fragment span').html(res.data.diamonds)
+ myFragment = res.data.diamonds;
+ } else {
return toastMsg(res.message)
}
lock = !lock
},
- error(err){
+ error (err) {
toastMsg('網絡錯誤，請退出重進')
}
})
@@ -90,15 +90,15 @@ const getGameMode = () => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/getTimeConfig',
- success(res){
- if(res.code === 200){
+ success (res) {
+ if (res.code === 200) {
modelType = res.data.modelType
getNewestAct()
- }else{
+ } else {
return toastMsg(res.message)
}
},
- error(err){
+ error (err) {
toastMsg('網絡錯誤，請退出重進')
}
})
@@ -115,19 +115,19 @@ const getNewestAct = () => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/getNewestAct',
- success(res){
- if(res.code === 200){
- if($.isEmptyObject(res.data) || res.data.status === 4 ) {
+ success (res) {
+ if (res.code === 200) {
+ if ($.isEmptyObject(res.data) || res.data.status === 4) {
return showLoading('服務器正在維護中...')
- }else{
- console.log(res.timestamp>res.data.endTime);
- if(res.timestamp >= res.data.endTime){ //請求的還是上一輪的數據，重新請求
+ } else {
+ console.log(res.timestamp > res.data.endTime);
+ if (res.timestamp >= res.data.endTime) { //請求的還是上一輪的數據，重新請求
console.log('請求的還是上一輪的數據，必須重新請求');
showLoading()
timer2 = setTimeout(() => {
getNewestAct()
}, 600);
- }else{
+ } else {
clearTimeout(timer2)
hideLoading(layerIndex)
@@ -135,12 +135,12 @@ const getNewestAct = () => {
getListItem(roundId, modelType)
// 進行下一輪時，arrTime重新置為空數組，不然在下一輪開始的時候也會執行location.reload()
- if(roundIdArr.length < 2){
+ if (roundIdArr.length < 2) {
roundIdArr = [roundId, roundId]
- }else{
+ } else {
roundIdArr[0] = roundIdArr[1]
roundIdArr[1] = roundId
- if(roundIdArr[0] != roundIdArr[1]){
+ if (roundIdArr[0] != roundIdArr[1]) {
arrTime = []
arrTime2 = []
arrTime3 = []
@@ -149,28 +149,28 @@ const getNewestAct = () => {
userComeinTime = res.timestamp
-
+
startTime = res.data.startTime
drawStageStartTime = res.data.drawStageStartTime
showResultStageStartTime = res.data.showResultStageStartTime
endTime = res.data.endTime
- console.log('獲取5個時間戳的值-----','timestamp:',userComeinTime, 'startTime:', startTime, 'drawStageStartTime:', drawStageStartTime, 'showResultStageStartTime:', showResultStageStartTime, 'endTime:', endTime);
+ console.log('獲取5個時間戳的值-----', 'timestamp:', userComeinTime, 'startTime:', startTime, 'drawStageStartTime:', drawStageStartTime, 'showResultStageStartTime:', showResultStageStartTime, 'endTime:', endTime);
showView()
}
}
- }else{
+ } else {
return toastMsg(res.message)
}
},
- error(err){
+ error (err) {
toastMsg('網絡錯誤，請退出重進')
}
})
}
//不為3繼續請求 為3拿數據 為4彈窗
-let status
-
+let status
+
// 顯示哪個界面
let $countDown
@@ -184,19 +184,19 @@ let fragmentNum
let reg = /^[0-9]*$/
const showView = () => {
- if( startTime <= userComeinTime && userComeinTime < drawStageStartTime ){
+ if (startTime <= userComeinTime && userComeinTime < drawStageStartTime) {
// 第一階段
console.log('進入第一階段');
isSelectTab = false
$('.select-time').show().siblings().hide()
$countDown = $('.select-time .count-down .count-down-num')
- mySelect = sessionStorage.getItem("mySelect")
- if(reg.test(mySelect)){
+ mySelect = sessionStorage.getItem("mySelect")
+ if (reg.test(mySelect)) {
$('.btn-wrap div').eq(mySelect).addClass('active').siblings().removeClass('active')
fragmentNum = parseInt($('.btn-wrap div').eq(mySelect).html())
isSelectTab = true
- }else{
+ } else {
$('.btn-wrap div').eq(0).addClass('active').siblings().removeClass('active')
fragmentNum = parseInt($('.btn-wrap div').eq(0).html())
isSelectTab = true
@@ -209,7 +209,7 @@ const showView = () => {
showCountDown(userComeinTime, startTime, drawStageStartTime)
getUserInfo()
- }else if( drawStageStartTime <= userComeinTime && userComeinTime < showResultStageStartTime ){
+ } else if (drawStageStartTime <= userComeinTime && userComeinTime < showResultStageStartTime) {
// 第二階段
console.log('進入第二階段');
@@ -234,14 +234,14 @@ const showView = () => {
// 播放5s動畫
let player = new SVGA.Player('.wait-time');
let parser = new SVGA.Parser('.wait-time');
- parser.load('./images/wait.svga', function(videoItem){
- // player.loops = 2;
- player.clearsAfterStop = false;
- player.setVideoItem(videoItem);
- player.startAnimation();
- })
+ parser.load('./images/wait.svga', function (videoItem) {
+ // player.loops = 2;
+ player.clearsAfterStop = false;
+ player.setVideoItem(videoItem);
+ player.startAnimation();
+ })
- }else if( showResultStageStartTime <= userComeinTime && userComeinTime < endTime ){
+ } else if (showResultStageStartTime <= userComeinTime && userComeinTime < endTime) {
// 第三階段
console.log('進入第三階段');
$('.draw-time').show().siblings().hide()
@@ -264,75 +264,75 @@ let timer
let delayTime
let interval
const showCountDown = (timestamp, startTime, endTime) => {
- deltaT = ( (endTime - startTime) - (timestamp - startTime) )/1000 //12.361
- if( deltaT >= 1 ){
+ deltaT = ((endTime - startTime) - (timestamp - startTime)) / 1000 //12.361
+ if (deltaT >= 1) {
interval = 1
- }else{
+ } else {
interval = 0
}
- console.log('deltaT----------',deltaT);
- countDownTime = Math.floor( deltaT ) //12.361 => 12
+ console.log('deltaT----------', deltaT);
+ countDownTime = Math.floor(deltaT) //12.361 => 12
delayTime = deltaT - countDownTime //請求接口的延遲時間
$countDown.html(countDownTime)
timer = setInterval(() => {
- if(browser.ios){
- if(!isStatus3 && !isStatus2){
+ if (browser.ios) {
+ if (!isStatus3 && !isStatus2) {
// 處理第一階段
- if(arrTime.length < 2){
+ if (arrTime.length < 2) {
arrTime = [new Date().getTime(), new Date().getTime()]
- }else{
+ } else {
arrTime[0] = arrTime[1]
arrTime[1] = new Date().getTime()
- if((arrTime[1] - arrTime[0])/1000 > 1.5){
+ if ((arrTime[1] - arrTime[0]) / 1000 > 1.5) {
window.location.reload()
}
}
- }else if(isStatus2){
+ } else if (isStatus2) {
// 第二階段也要處理
- if(arrTime2.length < 2){
+ if (arrTime2.length < 2) {
arrTime2 = [new Date().getTime(), new Date().getTime()]
- }else{
+ } else {
arrTime2[0] = arrTime2[1]
arrTime2[1] = new Date().getTime()
- if((arrTime2[1] - arrTime2[0])/1000 > 1.5){
+ if ((arrTime2[1] - arrTime2[0]) / 1000 > 1.5) {
window.location.reload()
}
}
- }else if(isStatus3){
+ } else if (isStatus3) {
// 第三階段也要處理
- if(arrTime3.length < 2){
+ if (arrTime3.length < 2) {
arrTime3 = [new Date().getTime(), new Date().getTime()]
- }else{
+ } else {
arrTime3[0] = arrTime3[1]
arrTime3[1] = new Date().getTime()
- if((arrTime3[1] - arrTime3[0])/1000 > 1.5){
+ if ((arrTime3[1] - arrTime3[0]) / 1000 > 1.5) {
window.location.reload()
}
}
}
}
countDownTime--
- if(countDownTime <= 0){
- $countDown.html( 0 )
+ if (countDownTime <= 0) {
+ $countDown.html(0)
clearInterval(timer)
- if(isStatus2){ // 倒計時為0時，處於第二階段的處理
- if(status){
+ if (isStatus2) { // 倒計時為0時，處於第二階段的處理
+ if (status) {
// hideLoading(layerIndex)
setTimeout(() => {
getNewestAct()
}, delayTime * 1000)
isStatus2 = false
- }else{
+ } else {
showLoading()
// toastMsg('服務器繁忙，請稍等')
- console.log('status的值-----------',status);
+ console.log('status的值-----------', status);
judgeStatus()
}
- }else if(isStatus3){ //倒計時為0時，處於第三階段的處理
+ } else if (isStatus3) { //倒計時為0時，處於第三階段的處理
setTimeout(() => {
getNewestAct()
// getListItem(roundId)
@@ -340,12 +340,12 @@ const showCountDown = (timestamp, startTime, endTime) => {
// getNewestAct()
// getListItem()
isStatus3 = false
- }else{
+ } else {
setTimeout(() => {
getNewestAct()
}, delayTime * 1000)
}
-
+
// else {
// setTimeout(() => {
@@ -353,7 +353,7 @@ const showCountDown = (timestamp, startTime, endTime) => {
// }, delayTime * 1000)
// }
- }else{
+ } else {
$countDown.html(countDownTime)
}
}, interval * 1000)
@@ -369,38 +369,38 @@ const judgeStatus = () => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/getNewestAct',
- success(res){
- if(res.code === 200){
- console.log('res.data的值------------',res.data);
- if($.isEmptyObject(res.data) || res.data.status === 4){
+ success (res) {
+ if (res.code === 200) {
+ console.log('res.data的值------------', res.data);
+ if ($.isEmptyObject(res.data) || res.data.status === 4) {
console.log('程序崩了！！！');
return showLoading('服務器正在維護中...')
- }else if(res.data.status === 3){
+ } else if (res.data.status === 3) {
clearTimeout(timer4)
status = true
- if(isStatus2 && countDownTime <= 0){
+ if (isStatus2 && countDownTime <= 0) {
showCountDown(userComeinTime, drawStageStartTime, showResultStageStartTime)
}
// hideLoading(layerIndex)
- console.log('status為3時返回的數據--------------',res.data);
+ console.log('status為3時返回的數據--------------', res.data);
drawInfo = res.data
img = res.data.drawImageUrl
- if(isStatus3){
- getPreviousResults(11, roundId)
+ if (isStatus3) {
+ getPreviousResults(11, roundId)
}
renderDrawInfo()
- }else{
-
- timer4 = setTimeout(() => {
- judgeStatus()
- }, 1000)
-
+ } else {
+
+ timer4 = setTimeout(() => {
+ judgeStatus()
+ }, 1000)
+
}
- }else{
+ } else {
toastMsg(res.message)
}
},
- error(err){
+ error (err) {
toastMsg('網絡錯誤，請退出重進')
}
})
@@ -412,18 +412,18 @@ const renderDrawInfo = () => {
$('.draw-time .current-tip .current-result').html(drawInfo.drawName)
$('.draw-pic img').attr('src', drawInfo.drawImageUrl)
- if(isStatus3){
- if(drawInfo.userDrawResult.drawStatus === 1){
+ if (isStatus3) {
+ if (drawInfo.userDrawResult.drawStatus === 1) {
$('.award-info .desc').html('恭喜你，猜中了！')
- if(modelType === 1){
+ if (modelType === 1) {
$('.award-wrap').html(`獲得
${drawInfo.userDrawResult.prizeDiamonds} 鉆石`)
- }else{
+ } else {
$('.award-wrap').html(`獲得
${drawInfo.userDrawResult.prizeName} (
${drawInfo.userDrawResult.prizePrice}鉆)*
${drawInfo.userDrawResult.prizeCount}個 累計
${drawInfo.userDrawResult.prizeDiamonds}鉆石`)
}
- }else if(drawInfo.userDrawResult.drawStatus === 2){
+ } else if (drawInfo.userDrawResult.drawStatus === 2) {
$('.award-info .desc').html('很遺憾，本輪未猜中')
$('.award-wrap').hide()
- }else if(drawInfo.userDrawResult.drawStatus === 3){
+ } else if (drawInfo.userDrawResult.drawStatus === 3) {
$('.award-info .desc').html('本輪未參與')
$('.award-wrap').hide()
}
@@ -432,18 +432,18 @@ const renderDrawInfo = () => {
// 渲染前三名
topThreeArr = drawInfo.rankUserList
let str = ''
- if(topThreeArr.length === 0){
+ if (topThreeArr.length === 0) {
$('.topthree-desc').html('本輪無人猜中')
$('.top-three-list p img').attr('src', './images/default-hui.png')
- }else{
+ } else {
$('.topthree-desc').html('本輪前三名')
- topThreeArr.map((item, index) => {
+ topThreeArr.map((item, index) => {
$('.top-three-list p img').eq(index).attr('src', item)
})
- if(topThreeArr.length === 1){
+ if (topThreeArr.length === 1) {
$('.top-three-list p img').eq(1).attr('src', './images/default-hui.png')
$('.top-three-list p img').eq(2).attr('src', './images/default-hui.png')
- }else if(topThreeArr.length === 2){
+ } else if (topThreeArr.length === 2) {
$('.top-three-list p img').eq(2).attr('src', './images/default-hui.png')
}
}
@@ -459,15 +459,15 @@ const getListItem = (roundId, type) => {
roundId,
type
},
- success(res){
- if(res.code === 200){
+ success (res) {
+ if (res.code === 200) {
listItem = res.data
renderListItem()
- }else{
+ } else {
toastMsg(res.message)
}
},
- error(err){
+ error (err) {
toastMsg('網絡錯誤，請退出重進')
}
})
@@ -475,15 +475,15 @@ const getListItem = (roundId, type) => {
// 2s氣泡定時器
let timer2s
-let time2sIndex = 0
+let time2sIndex = 0
const setTimeout2s = () => {
- clearTimeout(timer2s)
+ clearTimeout(timer2s)
$('.bubble-2s').eq(time2sIndex).fadeIn(50)
- timer2s = setTimeout(function(){
+ timer2s = setTimeout(function () {
$('.bubble-2s').eq(time2sIndex).fadeOut(50)
- if(time2sIndex >= listItem.length-1){
+ if (time2sIndex >= listItem.length - 1) {
time2sIndex = 0
- }else{
+ } else {
time2sIndex++;
}
setTimeout2s()
@@ -493,7 +493,7 @@ const setTimeout2s = () => {
// 渲染每一輪抽獎的選項
const renderListItem = () => {
let str = ''
- if(modelType === 1){
+ if (modelType === 1) {
listItem.map((item) => {
str += `
@@ -508,13 +508,13 @@ const renderListItem = () => {
`
})
- }else{
+ } else {
listItem.map((item) => {
str += `
x${item.multiple}
- ${item.name}
${item.price ? `(${item.price}鉆石)` : '' }
${item.name}
${item.price ? `(${item.price}鉆石)` : ''}
點擊選取
賺 ${item.multiple} 倍獎勵
@@ -534,17 +534,17 @@ const getPreviousResults = (count, roundId) => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/listLuckySeaActInfo',
- data:{
+ data: {
count,
roundId
},
- success(res){
- if(res.code === 200){
+ success (res) {
+ if (res.code === 200) {
previousResults = res.data
renderPreviousResults()
}
},
- error(err){
+ error (err) {
toastMsg('網絡錯誤，請退出重進')
}
})
@@ -552,22 +552,22 @@ const getPreviousResults = (count, roundId) => {
// 渲染往輪遊戲結果
const renderPreviousResults = () => {
-
+
let str = ''
- if(previousResults.length < 5){
+ if (previousResults.length < 5) {
let len = 5 - previousResults.length
let arr = new Array(len).fill(1)
previousResults.push(...arr)
}
- if(isStatus3){
- if(img){
+ if (isStatus3) {
+ if (img) {
previousResults.pop()
previousResults.unshift({
drawImageUrl: img
})
console.log(previousResults);
}
-
+
}
previousResults.map((item) => {
str += `
@@ -587,14 +587,17 @@ const sendUserDrawInfo = (itemId, num) => {
"itemId":${itemId},
"num":${num}
}]`,
- success(res){
- if(res.code === 200){
-
- }else{
+ success (res) {
+ if (res.code === 200) {
+
+ } else if (31005) (
+ toastMsg(res.message)
+ )
+ else {
toastMsg(res.message)
}
},
- error(err){
+ error (err) {
toastMsg('網絡錯誤，請退出重進')
}
})
@@ -616,7 +619,7 @@ let rankListD = []
let pageN = 1
let myInfoN = []
let rankListN = []
-let clickTabCanNetworkN = true
+let clickTabCanNetworkN = true
let isLockD = true
let isLockN = true
@@ -625,23 +628,23 @@ let isLock = true
let canRequsetNextPageD = true
let canRequsetNextPageN = true
-const getListRank = (type, page) => {
+const getListRank = (type, page) => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/listRank',
- data:{
+ data: {
type,
page,
pageSize
},
- success(res){
- if(res.code === 200){
- if(type === 1){
+ success (res) {
+ if (res.code === 200) {
+ if (type === 1) {
// 鉆石榜單
- if(res.data.rankList.length === pageSize){
+ if (res.data.rankList.length === pageSize) {
// 可以請求下一頁
canRequsetNextPageD = true
- }else{
+ } else {
// 不再請求下一頁
canRequsetNextPageD = false
}
@@ -650,11 +653,11 @@ const getListRank = (type, page) => {
renderMyInfo()
renderRankList()
isLockD = true
- }else{
- if(res.data.rankList.length === pageSize){
+ } else {
+ if (res.data.rankList.length === pageSize) {
// 可以請求下一頁
canRequsetNextPageN = true
- }else{
+ } else {
// 不再請求下一頁
canRequsetNextPageN = false
}
@@ -664,11 +667,11 @@ const getListRank = (type, page) => {
renderRankList()
isLockN = true
}
- }else{
+ } else {
toastMsg(res.message)
}
},
- error(err){
+ error (err) {
toastMsg('網絡錯誤')
}
})
@@ -676,46 +679,46 @@ const getListRank = (type, page) => {
// 渲染底部個人信息
const renderMyInfo = () => {
- if(type === 1){
+ if (type === 1) {
// 鉆石榜單
let erbanNo = myInfoD.erbanNo
let myIndex = rankListD.findIndex((item, index) => {
return item.erbanNo === erbanNo
})
- if(myIndex === -1){
+ if (myIndex === -1) {
$('.mine-rank').html('未上榜')
- }else{
+ } else {
$('.mine-rank').html(myIndex + 1)
}
$('.mine-info').find('img').attr('src', myInfoD.avatar)
- if(myInfoD.nick){
+ if (myInfoD.nick) {
myInfoD.nick.length > 5 ? myInfoD.nick.slice(0, 5) + '...' : myInfoD.nick
- }else{
+ } else {
myInfoD.nick = '未知'
}
$('.mine-info').find('.mine-nick').html(myInfoD.nick)
let tostr = myInfoD.num.toString()
let num
- if(tostr.length >= 5) {
- num = (myInfoD.num/10000).toFixed(2) + 'w'
- }else{
+ if (tostr.length >= 5) {
+ num = (myInfoD.num / 10000).toFixed(2) + 'w'
+ } else {
num = myInfoD.num
}
$('.mine-diamond-num').html('今日獎勵' + num)
- }else{
+ } else {
let erbanNo = myInfoN.erbanNo
let myIndex = rankListN.findIndex((item, index) => {
return item.erbanNo === erbanNo
})
- if(myIndex === -1){
+ if (myIndex === -1) {
$('.mine-rank').html('未上榜')
- }else{
+ } else {
$('.mine-rank').html(myIndex + 1)
}
$('.mine-info').find('img').attr('src', myInfoN.avatar)
- if(myInfoN.nick){
+ if (myInfoN.nick) {
myInfoN.nick.length > 5 ? myInfoN.nick.slice(0, 5) + '...' : myInfoN.nick
- }else{
+ } else {
myInfoN.nick = '未知'
}
$('.mine-info').find('.mine-nick').html(myInfoN.nick)
@@ -725,11 +728,11 @@ const renderMyInfo = () => {
// 渲染榜單信息
const renderRankList = () => {
- if(type === 1){
+ if (type === 1) {
// 鉆石榜單
// 渲染前3
let topThreeArr = rankListD.slice(0, 1)
- if(rankListD.length === 0){
+ if (rankListD.length === 0) {
let len = 1 - rankListD.length
let arr = new Array(len).fill({
nick: '虛位以待',
@@ -742,12 +745,12 @@ const renderRankList = () => {
topThreeArr.map((item) => {
let tostr = item.num.toString()
let num
- if(tostr.length >= 5) {
- num = (item.num/10000).toFixed(2) + 'w'
- }else{
+ if (tostr.length >= 5) {
+ num = (item.num / 10000).toFixed(2) + 'w'
+ } else {
num = item.num
}
-
+
topThreeStr = `
@@ -755,12 +758,12 @@ const renderRankList = () => {
${num}
-
${item.nick.length > 5 ? item.nick.slice(0,5) + '...' : item.nick}
+
${item.nick.length > 5 ? item.nick.slice(0, 5) + '...' : item.nick}
`
})
$('.topthree-wrap').html(topThreeStr)
-
+
// 渲染非前3
let othersArr = rankListD.slice(1)
@@ -768,28 +771,28 @@ const renderRankList = () => {
othersArr.map((item, index) => {
let tostr = item.num.toString()
let num
- if(tostr.length >= 5) {
- num = (item.num/10000).toFixed(2) + 'w'
- }else{
+ if (tostr.length >= 5) {
+ num = (item.num / 10000).toFixed(2) + 'w'
+ } else {
num = item.num
}
others += `
- ${index+2}
+ ${index + 2}
-
${item.nick.length > 5 ? item.nick.slice(0,5) + '...' : item.nick}
+
${item.nick.length > 5 ? item.nick.slice(0, 5) + '...' : item.nick}
距離上一名${num}
`
})
$('.other-rank').html(others)
- }else{
+ } else {
// 歐皇榜單
// 渲染前3
let topThreeArr = rankListN.slice(0, 1)
- if(rankListN.length === 0){
+ if (rankListN.length === 0) {
let len = 1 - rankListN.length
let arr = new Array(len).fill({
nick: '虛位以待',
@@ -800,8 +803,8 @@ const renderRankList = () => {
let topThreeStr = ''
topThreeArr.map((item) => {
let num = ''
- if(item.erbanNo){
- num = '猜中'+item.num + '次'
+ if (item.erbanNo) {
+ num = '猜中' + item.num + '次'
}
topThreeStr = `
@@ -810,7 +813,7 @@ const renderRankList = () => {
${num}
-
${item.nick.length > 5 ? item.nick.slice(0,5) + '...' : item.nick}
+
${item.nick.length > 5 ? item.nick.slice(0, 5) + '...' : item.nick}
`
})
@@ -822,15 +825,15 @@ const renderRankList = () => {
let others = ''
othersArr.map((item, index) => {
let num
- if(item.erbanNo){
- num = '猜中'+item.num + '次'
+ if (item.erbanNo) {
+ num = '猜中' + item.num + '次'
}
others += `
- ${index+2}
+ ${index + 2}
-
${item.nick.length > 5 ? item.nick.slice(0,5) + '...' : item.nick}
+
${item.nick.length > 5 ? item.nick.slice(0, 5) + '...' : item.nick}
${num}
@@ -838,13 +841,13 @@ const renderRankList = () => {
})
$('.other-rank').html(others)
}
-
+
}
-$(function(){
+$(function () {
getInfoFromClient()
- setTimeout(function(){
+ setTimeout(function () {
// getUserInfo()
getGameMode()
// getNewestAct()
@@ -854,55 +857,55 @@ $(function(){
// 監聽按鈕點擊事件
// let fragmentNum
// let isSelectTab = false
- $('.btn-wrap').on('click', 'div', function(){
+ $('.btn-wrap').on('click', 'div', function () {
$(this).addClass('active').siblings().removeClass('active')
fragmentNum = parseInt($(this).html())
isSelectTab = true
sessionStorage.setItem("mySelect", $(this).index())
})
// 監聽規則按鈕點擊事件
- $('.rule').on('click', function(){
+ $('.rule').on('click', function () {
$('.shade-mask').show()
})
// 關閉規則彈窗
- $('.shade-mask').on('click', function(){
+ $('.shade-mask').on('click', function () {
$(this).hide()
})
- $('.shade-content').on('click', function(e){
+ $('.shade-content').on('click', function (e) {
e.stopPropagation()
})
// 跳轉特權商城
- $('.mall').on('click', function(){
+ $('.mall').on('click', function () {
window.location.href = './mall.html'
})
- $('.add').on('click', function(){
+ $('.add').on('click', function () {
window.location.href = './mall.html'
})
// 監聽遊戲記錄按鈕點擊事件
- $('.record').on('click', function(){
+ $('.record').on('click', function () {
window.location.href = './record.html'
})
// 監聽今日排名按鈕點擊事件
- $('.rank').on('click', function(){
+ $('.rank').on('click', function () {
getListRank(type, pageD)
$('.shade-mask-rank').show()
})
// 監聽今日排名tab
- $('.tab-wrap').on('click', 'span', function(){
+ $('.tab-wrap').on('click', 'span', function () {
$(this).addClass('active').siblings().removeClass('active')
- if(type === $(this).index() + 1) return
+ if (type === $(this).index() + 1) return
type = $(this).index() + 1
$('.other-rank').scrollTop(0)
- if(type === 1){
+ if (type === 1) {
renderRankList()
renderMyInfo()
- }else{
- if(clickTabCanNetworkN){
+ } else {
+ if (clickTabCanNetworkN) {
getListRank(type, pageN)
- }else{
+ } else {
renderRankList()
renderMyInfo()
}
@@ -910,7 +913,7 @@ $(function(){
}
})
// 關閉排名彈窗
- $('.shade-mask-rank').on('click', function(){
+ $('.shade-mask-rank').on('click', function () {
$(this).hide()
type = 1
pageD = 1
@@ -923,54 +926,54 @@ $(function(){
$('.diamond-rank').addClass('active').siblings('.num-rank').removeClass('active')
$('.other-rank').html('')
})
- $('.shade-content-rank').on('click', function(e){
+ $('.shade-content-rank').on('click', function (e) {
e.stopPropagation()
})
// 監聽滾動
- $('.other-rank').on('scroll', function(){
+ $('.other-rank').on('scroll', function () {
let scrollTop = $(this).scrollTop();//這是已經卷進去滾動條的的高度
let scrollHeight = $('.other-rank')[0].scrollHeight;//這個是other-rank包含滾動條的總高度
let ulHeight = $(this).innerHeight();//這個是other-rank的高度
-
+
//這樣距離到底還有一段距離就請求，但是會導致重復請求，所以要加鎖限製
- if(scrollTop + ulHeight + 100 >= scrollHeight){
- if(type === 1){
- if(isLockD){
+ if (scrollTop + ulHeight + 100 >= scrollHeight) {
+ if (type === 1) {
+ if (isLockD) {
isLockD = false
pageD++
- if(pageSize * pageD > 30){
+ if (pageSize * pageD > 30) {
toastMsg('沒有更多數據啦~')
- }else{
- if(canRequsetNextPageD){
- getListRank(type,pageD);
- }else{
+ } else {
+ if (canRequsetNextPageD) {
+ getListRank(type, pageD);
+ } else {
toastMsg('沒有更多數據啦~')
}
}
- }else{
- if(scrollTop + ulHeight >= scrollHeight){
- if(pageSize * pageD > 30){
+ } else {
+ if (scrollTop + ulHeight >= scrollHeight) {
+ if (pageSize * pageD > 30) {
toastMsg('沒有更多數據啦~')
}
}
}
- }else{
- if(isLockN){
+ } else {
+ if (isLockN) {
isLockN = false
pageN++
- if(pageSize * pageN > 30){
+ if (pageSize * pageN > 30) {
toastMsg('沒有更多數據啦~')
- }else{
- if(canRequsetNextPageN){
- getListRank(type,pageN);
- }else{
+ } else {
+ if (canRequsetNextPageN) {
+ getListRank(type, pageN);
+ } else {
toastMsg('沒有更多數據啦')
}
}
- }else{
- if(scrollTop + ulHeight >= scrollHeight){
- if(pageSize * pageN > 30){
+ } else {
+ if (scrollTop + ulHeight >= scrollHeight) {
+ if (pageSize * pageN > 30) {
toastMsg('沒有更多數據啦~')
}
}
@@ -978,11 +981,11 @@ $(function(){
}
}
})
-
+
// 播放3s動畫
let player1 = new SVGA.Player('.draw-time');
let parser1 = new SVGA.Parser('.draw-time');
- parser1.load('./images/draw.svga', function(videoItem){
+ parser1.load('./images/draw.svga', function (videoItem) {
// player.loops = 2;
player1.clearsAfterStop = false;
player1.setVideoItem(videoItem);
@@ -990,67 +993,85 @@ $(function(){
})
// 關閉碎片不足提示彈窗
- $('.cancel-btn').on('click', function(){
+ $('.cancel-btn').on('click', function () {
$('.shade-mask-fragmentNum').hide()
})
- $('.shade-mask-fragmentNum').on('click', function(){
+ $('.shade-mask-fragmentNum').on('click', function () {
$(this).hide()
})
- $('.shade-content-fragmentNum').on('click', function(e){
+ $('.shade-content-fragmentNum').on('click', function (e) {
e.stopPropagation()
})
-
- $('.confirm-btn').on('click', function(){
- window.location.href = './mall.html'
+ $('.confirm-btn').on('click', function () {
+ // window.location.href = './mall.html'
+ if (browser.app) {
+ if (browser.android) {
+ let channel = JSON.parse(pubInfo.deviceInfo).channel;
+ console.log(pubInfo.deviceInfo);
+ var channel;
+ if (channel == "google") {
+ window.androidJsObj.openChargePage();
+ } else {
+ // window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+ }
+ } else if (browser.ios) {
+ window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+ }
+ } else {
+ toastMsg('请在app内打开')
+ }
$('.shade-mask-fragmentNum').hide()
})
+
+
// 點擊海鮮動物的動畫以及發送請求
- $('.select-time ul').on('click', 'li', function(){
- if(!isSelectTab){
+ $('.select-time ul').on('click', 'li', function () {
+ if (!isSelectTab) {
return toastMsg('請先選擇碎片數量')
}
- if(myFragment < fragmentNum){
+ if (myFragment < fragmentNum) {
$('.shade-mask-fragmentNum').show()
+ // toastMsg('鉆石余額不足');
return
}
- if(!lock){
+ if (!lock) {
lock = !lock
console.log($(this).data('total-num'));
console.log($(this).data('total-num').number);
console.log(fragmentNum);
$(this).data('total-num').number = parseInt($(this).data('total-num').number) + fragmentNum
$(this)
- .stop(true,true)
- .animate({scale: 1.1}, 200)
- .animate({scale: 1}, 200, function(){
- if(lock){
- $(this).find('.select-num').html('+' + $(this).data('total-num').number).hide().fadeIn(200)
- }
- setTimeout(() => {
- // getUserInfo()
- getUserPieceNum()
- // getListItem(roundId)
- },100)
- })
- sendUserDrawInfo($(this).data('total-num').id , fragmentNum)
+ .stop(true, true)
+ .animate({ scale: 1.1 }, 200)
+ .animate({ scale: 1 }, 200, function () {
+ if (lock) {
+ $(this).find('.select-num').html('+' + $(this).data('total-num').number).hide().fadeIn(200)
+ }
+ setTimeout(() => {
+ // getUserInfo()
+ getUserPieceNum()
+ // getListItem(roundId)
+ }, 100)
+ })
+ sendUserDrawInfo($(this).data('total-num').id, fragmentNum)
}
})
-
+
// ios去到後臺或者鎖屏後再回來倒計時不準確
let leftTime, deltaTime, startTime, endTime
- document.addEventListener('visibilitychange',function(){
- if(document.visibilityState == 'hidden'){
+ document.addEventListener('visibilitychange', function () {
+ if (document.visibilityState == 'hidden') {
leftTime = countDownTime
startTime = new Date().getTime()
- }else if(document.visibilityState == 'visible'){
+ } else if (document.visibilityState == 'visible') {
endTime = new Date().getTime()
- deltaTime = Math.floor( ( endTime - startTime )/1000 ) //出去了多久
- if(deltaTime > 300){
+ deltaTime = Math.floor((endTime - startTime) / 1000) //出去了多久
+ if (deltaTime > 300) {
window.location.reload()
}
countDownTime = leftTime - deltaTime
- if(countDownTime < 0){
+ if (countDownTime < 0) {
countDownTime = 0
}
$countDown.html(countDownTime)
diff --git a/view/peko/modules/game/images/banner.png b/view/peko/modules/game/images/banner.png
index 4b69bdd..863b6bc 100644
Binary files a/view/peko/modules/game/images/banner.png and b/view/peko/modules/game/images/banner.png differ
diff --git a/view/peko/modules/rule-yinyou/images/patrician.png b/view/peko/modules/rule-yinyou/images/patrician.png
index 1e6d8c5..a5e8922 100644
Binary files a/view/peko/modules/rule-yinyou/images/patrician.png and b/view/peko/modules/rule-yinyou/images/patrician.png differ
diff --git a/view/peko/modules/rule/images/patrician.png b/view/peko/modules/rule/images/patrician.png
index 1e6d8c5..a5e8922 100644
Binary files a/view/peko/modules/rule/images/patrician.png and b/view/peko/modules/rule/images/patrician.png differ
diff --git a/view/peko/modules/weekStar/images/newimages/rule_content.png b/view/peko/modules/weekStar/images/newimages/rule_content.png
index 5093653..4cb0128 100644
Binary files a/view/peko/modules/weekStar/images/newimages/rule_content.png and b/view/peko/modules/weekStar/images/newimages/rule_content.png differ
