-
+
- 钻石榜
- 今日歐皇榜
+ 今日礼物榜
+ 今日欧皇榜
-
+
-
+
-
+
-
+
-
![]()
+
@@ -161,12 +162,12 @@
-
钻石不足
+
碎片不足
-
當前钻石不足
+
当前碎片不足，购买头像框获取碎片
@@ -178,7 +179,7 @@
-
+
\ No newline at end of file
diff --git a/view/peko/activity/act-ocean/js/index.js b/view/peko/activity/act-ocean/js/index.js
index bab74e3..881aba4 100644
--- a/view/peko/activity/act-ocean/js/index.js
+++ b/view/peko/activity/act-ocean/js/index.js
@@ -6,17 +6,17 @@ if (env == 'test') {
new VConsole();
}
-let lock = false //防止用户暴力点击加的锁
+let lock = false //防止用戶暴力點擊加的鎖
-// 封装layer消息提醒框
+// 封裝layer消息提醒框
let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
layer.open({
type: 2,
shadeClose: false,
content,
- success (e) {
+ success(e) {
layerIndex = $(e).attr('index')
}
})
@@ -32,99 +32,80 @@ const toastMsg = (content = '操作完成', time = 2) => {
})
}
-if (!browser.app) {//
+if(!browser.app){
toastMsg('請在app內打開！');
-} else {
+}else{
$('.wrap').removeClass('no-in-app')
- if (browser.ios) {window.webkit.messageHandlers.getChannel.postMessage(null);}
}
-// 获取用户相关信息
+// 獲取用戶相關信息
let myFragment
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').html(res.data.nick)
- myFragment = res.data.diamonds
- $('.info-bottom .activeBalance span').text(res.data.diamonds);
- } else {
+ $('.info-bottom').find('.award span').html(res.data.todayReward)
+ $('.info-bottom').find('.fragment span').html(res.data.pieceNum)
+ myFragment = res.data.pieceNum
+ }else{
return toastMsg(res.message)
}
},
- error (err) {
+ error(err){
toastMsg('網絡錯誤，請退出重進')
}
})
}
-function numberFormat (value) {
- var param = {};
- var k = 10000,
- sizes = ['', 'W', '亿', '万亿'],
- i;
- if (value < k) {
- param.value = value
- param.unit = ''
- } else {
- i = Math.floor(Math.log(value) / Math.log(k));
-
- param.value = ((value / Math.pow(k, i))).toFixed(2);
- param.unit = sizes[i];
- }
- console.log(param)
- return param;
-}
-// 获取用户碎片信息
+// 獲取用戶碎片信息
const getUserPieceNum = () => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/getUserActInfo',
- success (res) {
- if (res.code === 200) {
- $('.info-bottom').find('.fragment span').html(res.data.diamonds)
- myFragment = res.data.diamonds
- } else {
+ success(res){
+ if(res.code === 200){
+ $('.info-bottom').find('.fragment span').html(res.data.pieceNum)
+ myFragment = res.data.pieceNum
+ }else{
return toastMsg(res.message)
}
lock = !lock
},
- error (err) {
+ error(err){
toastMsg('網絡錯誤，請退出重進')
}
})
}
-// 获取游戏模式 1普通模式 2礼物模式
+// 獲取遊戲模式 1普通模式 2禮物模式
let modelType
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('網絡錯誤，請退出重進')
}
})
}
-let userComeinTime //用户进入游戏界面时间，后端返回的timestamp
-let startTime, drawStageStartTime, showResultStageStartTime, endTime //4个时间戳判断落于哪个界面
+let userComeinTime //用戶進入遊戲界面時間，後端返回的timestamp
+let startTime, drawStageStartTime, showResultStageStartTime, endTime //4個時間戳判斷落於哪個界面
let timer2
let roundId
let roundIdArr = []
@@ -134,32 +115,32 @@ const getNewestAct = () => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/getNewestAct',
- 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) { //请求的还是上一轮的数据，重新请求
- console.log('请求的还是上一轮的数据，必须重新请求');
+ 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){ //請求的還是上一輪的數據，重新請求
+ console.log('請求的還是上一輪的數據，必須重新請求');
showLoading()
timer2 = setTimeout(() => {
getNewestAct()
}, 600);
- } else {
+ }else{
clearTimeout(timer2)
hideLoading(layerIndex)
roundId = res.data.roundId
getListItem(roundId, modelType)
- // 进行下一轮时，arrTime重新置为空数组，不然在下一轮开始的时候也会执行location.reload()
- if (roundIdArr.length < 2) {
+ // 進行下一輪時，arrTime重新置為空數組，不然在下一輪開始的時候也會執行location.reload()
+ 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 = []
@@ -168,32 +149,32 @@ 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
-
-// 显示哪个界面
+//不為3繼續請求 為3拿數據 為4彈窗
+let status
+
+// 顯示哪個界面
let $countDown
-//区分倒计时到0时的区别处理的字段，处于第二阶段时isStatus2为真,处于第三阶段时isStatus3为真
+//區分倒計時到0時的區別處理的字段，處於第二階段時isStatus2為真,處於第三階段時isStatus3為真
let isStatus2
let isStatus3
@@ -203,20 +184,19 @@ let fragmentNum
let reg = /^[0-9]*$/
const showView = () => {
- if (startTime <= userComeinTime && userComeinTime < drawStageStartTime) {
- // 第一阶段
- console.log('进入第一阶段');
- $('.previous-result').show();
+ 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
@@ -225,138 +205,134 @@ const showView = () => {
$('.award-wrap').html('').show()
$('.award-info .desc').html('')
- getPreviousResults(6, roundId)
+ getPreviousResults(11, roundId)
showCountDown(userComeinTime, startTime, drawStageStartTime)
getUserInfo()
- } else if (drawStageStartTime <= userComeinTime && userComeinTime < showResultStageStartTime) {
- // 第二阶段
- console.log('进入第二阶段');
+ }else if( drawStageStartTime <= userComeinTime && userComeinTime < showResultStageStartTime ){
+ // 第二階段
+ console.log('進入第二階段');
+
sessionStorage.removeItem("mySelect")
$('.wait-time').show().siblings().hide()
$countDown = $('.wait-time .count-down .count-down-num')
- clearTimeout(timer2s) //清除第一阶段的2s气泡定时器
+ clearTimeout(timer2s) //清除第一階段的2s氣泡定時器
time2sIndex = 0
- isStatus2 = true //处于第二阶段的标识
+ isStatus2 = true //處於第二階段的標識
console.log('isStatus2的值------------', isStatus2);
// $('.btn-wrap').find('div').removeClass('active')
- getPreviousResults(6, roundId)
+ getPreviousResults(11, roundId)
showCountDown(userComeinTime, drawStageStartTime, showResultStageStartTime)
judgeStatus()
getUserInfo()
- // 播放5s动画
+ // 播放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();
- $('.previous-result').hide();
- $('.current-tip').hide();
- })
+ parser.load('./images/wait.svga', function(videoItem){
+ // player.loops = 2;
+ player.clearsAfterStop = false;
+ player.setVideoItem(videoItem);
+ player.startAnimation();
+ })
- } else if (showResultStageStartTime <= userComeinTime && userComeinTime < endTime) {
- // 第三阶段
- console.log('进入第三阶段');
+ }else if( showResultStageStartTime <= userComeinTime && userComeinTime < endTime ){
+ // 第三階段
+ console.log('進入第三階段');
$('.draw-time').show().siblings().hide()
$countDown = $('.draw-time .count-down .count-down-num')
- isStatus3 = true //处于第三阶段的标识
+ isStatus3 = true //處於第三階段的標識
console.log('isStatus3的值------------', isStatus3);
showCountDown(userComeinTime, showResultStageStartTime, endTime)
judgeStatus()
getUserInfo()
- // getPreviousResults(6, roundId)
- $('.previous-result').hide();
- $('.current-tip').hide();
- $('.current-tip').hide();
+ // getPreviousResults(11, roundId)
}
}
-// 显示倒计时
+// 顯示倒計時
let countDownTime
let deltaT
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
- delayTime = deltaT - countDownTime //请求接口的延迟时间
+ 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 (arrTime.length < 2) {
+ if(browser.ios){
+ if(!isStatus3 && !isStatus2){
+ // 處理第一階段
+ 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) {
- // 第二阶段也要处理
- if (arrTime2.length < 2) {
+ }else if(isStatus2){
+ // 第二階段也要處理
+ 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) {
- // 第三阶段也要处理
- if (arrTime3.length < 2) {
+ }else if(isStatus3){
+ // 第三階段也要處理
+ 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);
+ // toastMsg('服務器繁忙，請稍等')
+ console.log('status的值-----------',status);
judgeStatus()
}
- } else if (isStatus3) { //倒计时为0时，处于第三阶段的处理
+ }else if(isStatus3){ //倒計時為0時，處於第三階段的處理
setTimeout(() => {
getNewestAct()
// getListItem(roundId)
@@ -364,12 +340,12 @@ const showCountDown = (timestamp, startTime, endTime) => {
// getNewestAct()
// getListItem()
isStatus3 = false
- } else {
+ }else{
setTimeout(() => {
getNewestAct()
}, delayTime * 1000)
}
-
+
// else {
// setTimeout(() => {
@@ -377,120 +353,103 @@ const showCountDown = (timestamp, startTime, endTime) => {
// }, delayTime * 1000)
// }
- } else {
+ }else{
$countDown.html(countDownTime)
}
}, interval * 1000)
}
-//判断status的状态
+//判斷status的狀態
let timer4
let drawInfo
-let img //第三阶段的中奖动物img
+let img //第三階段的中獎動物img
const judgeStatus = () => {
- console.log('进入二阶段时轮询查看结果是否已经出了');
+ console.log('進入二階段時輪詢查看結果是否已經出了');
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) {
+ return showLoading('服務器正在維護中...')
+ }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(6, roundId)
+ if(isStatus3){
+ getPreviousResults(11, roundId)
}
renderDrawInfo()
- if (res.data.rankUserList.length != 0) {
- if (res.data.rankUserList[0] != undefined) {
- $('.top_three .img1').css({ "background": `url(${res.data.rankUserList[0]}) no-repeat`, "background-size": '100% 100%' });
- $('.top_three .img1').text('');
- };
- if (res.data.rankUserList[1] != undefined) {
- $('.top_three .img2').css({ "background": `url(${res.data.rankUserList[1]}) no-repeat`, "background-size": '100% 100%' })
- $('.top_three .img2').text('');
- };
- if (res.data.rankUserList[2] != undefined) {
- $('.top_three .img3').css({ "background": `url(${res.data.rankUserList[2]}) no-repeat`, "background-size": '100% 100%' })
- $('.top_three .img3').text('');
- };
- $('.top_three').show();
- } else {
- $('.top_three').hide();
- }
- } else {
-
- timer4 = setTimeout(() => {
- judgeStatus()
- }, 1000)
-
+ }else{
+
+ timer4 = setTimeout(() => {
+ judgeStatus()
+ }, 1000)
+
}
- } else {
+ }else{
toastMsg(res.message)
}
},
- error (err) {
+ error(err){
toastMsg('網絡錯誤，請退出重進')
}
})
}
-// 渲染开奖信息
+// 渲染開獎信息
let topThreeArr = []
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) {
- // $('.award-info .desc').html('恭喜你，猜中了！')
- // if (modelType === 1) {
- // $('.award-wrap').html(`获得
${drawInfo.userDrawResult.prizeDiamonds} 鉆石`)
- // } else {
- // $('.award-wrap').html(`获得
${drawInfo.userDrawResult.prizeName} (
${drawInfo.userDrawResult.prizePrice}钻)*
${drawInfo.userDrawResult.prizeCount}个 累计
${drawInfo.userDrawResult.prizeDiamonds}鉆石`)
- // }
- // } else if (drawInfo.userDrawResult.drawStatus === 2) {
- // $('.award-info .desc').html('很遗憾，本轮未猜中')
- // $('.award-wrap').hide()
- // } else if (drawInfo.userDrawResult.drawStatus === 3) {
- // $('.award-info .desc').html('本轮未参与')
- // $('.award-wrap').hide()
- // }
- // }
+ if(isStatus3){
+ if(drawInfo.userDrawResult.drawStatus === 1){
+ $('.award-info .desc').html('恭喜你，猜中了！')
+ if(modelType === 1){
+ $('.award-wrap').html(`獲得
${drawInfo.userDrawResult.prizeDiamonds} 鉆石`)
+ }else{
+ $('.award-wrap').html(`獲得
${drawInfo.userDrawResult.prizeName} (
${drawInfo.userDrawResult.prizePrice}鉆)*
${drawInfo.userDrawResult.prizeCount}個 累計
${drawInfo.userDrawResult.prizeDiamonds}鉆石`)
+ }
+ }else if(drawInfo.userDrawResult.drawStatus === 2){
+ $('.award-info .desc').html('很遺憾，本輪未猜中')
+ $('.award-wrap').hide()
+ }else if(drawInfo.userDrawResult.drawStatus === 3){
+ $('.award-info .desc').html('本輪未參與')
+ $('.award-wrap').hide()
+ }
+ }
// 渲染前三名
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 {
- $('.topthree-desc').html('')
- topThreeArr.map((item, index) => {
+ }else{
+ $('.topthree-desc').html('本輪前三名')
+ 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')
}
}
}
-// 获取每一轮抽奖的相关配置
+// 獲取每一輪抽獎的相關配置
let listItem = []
const getListItem = (roundId, type) => {
networkRequest({
@@ -500,41 +459,41 @@ 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('網絡錯誤，請退出重進')
}
})
}
-// 2s气泡定时器
+// 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()
}, 2000)
}
-// 渲染每一轮抽奖的选项
+// 渲染每一輪抽獎的選項
const renderListItem = () => {
let str = ''
- if (modelType === 1) {
+ if(modelType === 1){
listItem.map((item) => {
str += `
@@ -542,23 +501,23 @@ const renderListItem = () => {
x${item.multiple}
${item.name}
-
收獲
-
${item.multiple} 倍獎勵
+
點擊選取
+
賺 ${item.multiple} 倍獎勵
${item.costPieceNum === 0 ? '' : '+ ' + item.costPieceNum}
`
})
- } else {
+ }else{
listItem.map((item) => {
str += `
x${item.multiple}
- ${item.name}
${item.price ? `(${item.price}鉆石)` : ''}
${item.name}
${item.price ? `(${item.price}鉆石)` : '' }
-
收獲
-
${item.multiple} 倍獎勵
+
點擊選取
+
賺 ${item.multiple} 倍獎勵
${item.costPieceNum === 0 ? '' : '+ ' + item.costPieceNum}
@@ -569,46 +528,46 @@ const renderListItem = () => {
setTimeout2s()
}
-// 获取往轮游戏结果
+// 獲取往輪遊戲結果
let previousResults = []
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('網絡錯誤，請退出重進')
}
})
}
-// 渲染往轮游戏结果
+// 渲染往輪遊戲結果
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 += `
@@ -618,7 +577,7 @@ const renderPreviousResults = () => {
$('.result-list').html(str)
}
-// 发送用户抽奖数量
+// 發送用戶抽獎數量
const sendUserDrawInfo = (itemId, num) => {
networkRequest({
type: 'POST',
@@ -628,36 +587,36 @@ const sendUserDrawInfo = (itemId, num) => {
"itemId":${itemId},
"num":${num}
}]`,
- success (res) {
- if (res.code === 200) {
+ success(res){
+ if(res.code === 200){
- } else {
+ }else{
toastMsg(res.message)
}
},
- error (err) {
+ error(err){
toastMsg('網絡錯誤，請退出重進')
}
})
}
-/******************************************** 今日排名相关 ********************************************/
+/******************************************** 今日排名相關 ********************************************/
-// 榜单类型，1是鉆石榜，2是欧皇榜
+// 榜單類型，1是鉆石榜，2是歐皇榜
let type = 1
let pageSize = 10
-// 鉆石榜单
+// 鉆石榜單
let pageD = 1
let myInfoD = []
let rankListD = []
-// 欧皇榜单
+// 歐皇榜單
let pageN = 1
let myInfoN = []
let rankListN = []
-let clickTabCanNetworkN = true
+let clickTabCanNetworkN = true
let isLockD = true
let isLockN = true
@@ -666,24 +625,24 @@ 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) {
- // 鉆石榜单
- if (res.data.rankList.length === pageSize) {
- // 可以请求下一页
+ success(res){
+ if(res.code === 200){
+ if(type === 1){
+ // 鉆石榜單
+ if(res.data.rankList.length === pageSize){
+ // 可以請求下一頁
canRequsetNextPageD = true
- } else {
- // 不再请求下一页
+ }else{
+ // 不再請求下一頁
canRequsetNextPageD = false
}
rankListD.push(...res.data.rankList)
@@ -691,12 +650,12 @@ 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
}
rankListN.push(...res.data.rankList)
@@ -705,58 +664,58 @@ const getListRank = (type, page) => {
renderRankList()
isLockN = true
}
- } else {
+ }else{
toastMsg(res.message)
}
},
- error (err) {
+ error(err){
toastMsg('網絡錯誤')
}
})
}
-// 渲染底部个人信息
+// 渲染底部個人信息
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)
@@ -764,13 +723,13 @@ 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: '虛位以待',
@@ -783,12 +742,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 = `
@@ -796,12 +755,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)
@@ -809,28 +768,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: '虛位以待',
@@ -841,8 +800,8 @@ const renderRankList = () => {
let topThreeStr = ''
topThreeArr.map((item) => {
let num = ''
- if (item.erbanNo) {
- num = '猜中' + item.num + '次'
+ if(item.erbanNo){
+ num = '猜中'+item.num + '次'
}
topThreeStr = `
@@ -851,7 +810,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}
`
})
@@ -863,15 +822,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}
@@ -879,84 +838,79 @@ const renderRankList = () => {
})
$('.other-rank').html(others)
}
-
+
}
-$(function () {
+$(function(){
getInfoFromClient()
- setTimeout(function () {
+ setTimeout(function(){
// getUserInfo()
getGameMode()
// getNewestAct()
// getListItem()
}, 50)
- // 监听按钮点击事件
+ // 監聽按鈕點擊事件
// 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())
- console.log(fragmentNum)
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-close').on('click', function () {
- $('.shade-mask').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 () {
- // getListRank(type, pageD)
- // $('.shade-mask-rank').show()
- window.location.href = './rank.html'
+ // 監聽今日排名按鈕點擊事件
+ $('.rank').on('click', function(){
+ getListRank(type, pageD)
+ $('.shade-mask-rank').show()
})
- // 监听今日排名tab
- $('.tab-wrap').on('click', 'span', function () {
+ // 監聽今日排名tab
+ $('.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()
}
clickTabCanNetworkN = false
}
})
- // 关闭排名弹窗
- $('.shade-mask-rank').on('click', function () {
+ // 關閉排名彈窗
+ $('.shade-mask-rank').on('click', function(){
$(this).hide()
type = 1
pageD = 1
@@ -969,169 +923,137 @@ $(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 () {
- 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) {
+ // 監聽滾動
+ $('.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){
isLockD = false
pageD++
- if (pageSize * pageD > 30) {
- toastMsg('没有更多数据啦~')
- } else {
- if (canRequsetNextPageD) {
- getListRank(type, pageD);
- } else {
- toastMsg('没有更多数据啦~')
+ if(pageSize * pageD > 30){
+ toastMsg('沒有更多數據啦~')
+ }else{
+ if(canRequsetNextPageD){
+ getListRank(type,pageD);
+ }else{
+ toastMsg('沒有更多數據啦~')
}
}
- } else {
- if (scrollTop + ulHeight >= scrollHeight) {
- if (pageSize * pageD > 30) {
- toastMsg('没有更多数据啦~')
+ }else{
+ if(scrollTop + ulHeight >= scrollHeight){
+ if(pageSize * pageD > 30){
+ toastMsg('沒有更多數據啦~')
}
}
}
- } else {
- if (isLockN) {
+ }else{
+ if(isLockN){
isLockN = false
pageN++
- if (pageSize * pageN > 30) {
- toastMsg('没有更多数据啦~')
- } else {
- if (canRequsetNextPageN) {
- getListRank(type, pageN);
- } else {
- toastMsg('没有更多数据啦')
+ if(pageSize * pageN > 30){
+ toastMsg('沒有更多數據啦~')
+ }else{
+ if(canRequsetNextPageN){
+ getListRank(type,pageN);
+ }else{
+ toastMsg('沒有更多數據啦')
}
}
- } else {
- if (scrollTop + ulHeight >= scrollHeight) {
- if (pageSize * pageN > 30) {
- toastMsg('没有更多数据啦~')
+ }else{
+ if(scrollTop + ulHeight >= scrollHeight){
+ if(pageSize * pageN > 30){
+ toastMsg('沒有更多數據啦~')
}
}
}
}
}
})
-
- // 播放3s动画
+
+ // 播放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);
player1.startAnimation();
})
- // 关闭碎片不足提示弹窗
- $('.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 () {
- if (browser.ios) {//ios
- console.log(pubInfo.channel)
- if (pubInfo.channel == 'appstore') {
- window.webkit.messageHandlers.openChargePage.postMessage(null);
- } else {
- window.location.href = '../../modules/payApp/index.html';
- }
- } else if (browser.android) {//android
- let getChannel = window.androidJsObj.getChannel();
- if (getChannel == 'google') {
- var jsonObj = '{"routerType":"5"}';
- window.androidJsObj.jumpAppointPage(jsonObj)
- } else {
- window.location.href = '../../modules/payApp/index.html';
- }
- }
+ $('.confirm-btn').on('click', function(){
+ window.location.href = './mall.html'
$('.shade-mask-fragmentNum').hide()
})
- $('.activeBalance b').click(function () {
- if (browser.ios) {//ios
- console.log(pubInfo.channel)
- if (pubInfo.channel == 'appstore') {
- window.webkit.messageHandlers.openChargePage.postMessage(null);
- } else {
- window.location.href = '../../modules/payApp/index.html';
- }
- } else if (browser.android) {//android
- let getChannel = window.androidJsObj.getChannel();
- if (getChannel == 'google') {
- var jsonObj = '{"routerType":"5"}';
- window.androidJsObj.jumpAppointPage(jsonObj)
- } else {
- window.location.href = '../../modules/payApp/index.html';
- }
+ // 點擊海鮮動物的動畫以及發送請求
+ $('.select-time ul').on('click', 'li', function(){
+ if(!isSelectTab){
+ return toastMsg('請先選擇碎片數量')
}
- })
- // 点击海鲜动物的动画以及发送请求
- $('.select-time ul').on('click', 'li', function () {
- if (!isSelectTab) {
- return toastMsg('请先选择碎片数量')
- }
- if (myFragment < fragmentNum) {
+ if(myFragment < fragmentNum){
$('.shade-mask-fragmentNum').show()
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去到后台或者锁屏后再回来倒计时不准确
+
+ // 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)
}
})
-})
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/view/peko/activity/act-ocean/js/mall.js b/view/peko/activity/act-ocean/js/mall.js
index 8432c25..c178fd3 100644
--- a/view/peko/activity/act-ocean/js/mall.js
+++ b/view/peko/activity/act-ocean/js/mall.js
@@ -5,14 +5,14 @@ if (env == 'test') {
new VConsole();
}
-// 封装layer消息提醒框
+// 封裝layer消息提醒框
let layerIndex
const showLoading = () => {
layer.open({
type: 2,
shadeClose: false,
- content: '加载中...',
- success(e) {
+ content: '加載中...',
+ success (e) {
layerIndex = $(e).attr('index')
}
})
@@ -27,51 +27,51 @@ const toastMsg = (content = '操作完成', time = 2) => {
skin: 'msg'
})
}
-// 获取用户相关信息
+// 獲取用戶相關信息
const getUserInfo = (param) => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/getUserActInfo',
- success(res){
- if(res.code === 200){
+ success (res) {
+ if (res.code === 200) {
// console.log(res.data);
$('.bottom').find('.avatar img').attr('src', res.data.avatar)
- if(res.data.nick.length > 10){
- res.data.nick = res.data.nick.slice(0,10) + '...'
+ if (res.data.nick.length > 10) {
+ res.data.nick = res.data.nick.slice(0, 10) + '...'
}
$('.bottom').find('.nick').html(res.data.nick)
$('.bottom').find('.diamond-num span').html(res.data.diamonds)
- if(param){
- $('.bottom').find('.fragment-num span')[0].innerHTML = parseInt($('.bottom').find('.fragment-num span')[0].innerHTML) + param
- } else{
+ if (param) {
+ $('.bottom').find('.fragment-num span')[0].innerHTML = parseInt($('.bottom').find('.fragment-num span')[0].innerHTML) + param
+ } else {
$('.bottom').find('.fragment-num span').html(res.data.pieceNum)
}
}
},
- error(err){
- toastMsg('网络错误')
+ error (err) {
+ toastMsg('網絡錯誤')
}
})
}
-// 获取头饰礼包信息
+// 獲取頭飾禮包信息
let listPack = []
const getListPack = () => {
networkRequest({
type: 'GET',
url: urlPrefix + '/act/luckySea/listPack',
- success(res){
- if(res.code === 200){
+ success (res) {
+ if (res.code === 200) {
// console.log(res.data);
listPack = res.data
renderList()
}
},
- error(err){
- toastMsg('网络错误')
+ error (err) {
+ toastMsg('網絡錯誤')
}
})
}
-// 渲染礼包
+// 渲染禮包
const renderList = () => {
listPack.map((item, index) => {
let $li = $('ul.buy-area li').eq(index)
@@ -89,19 +89,19 @@ const renderList = () => {
})
}
-$(function(){
+$(function () {
getInfoFromClient()
- setTimeout(function(){
+ setTimeout(function () {
getUserInfo()
getListPack()
}, 50)
- // 监听购买按钮点击事件
- $('ul.buy-area').on('click', '.buy-btn', function(){
+ // 監聽購買按鈕點擊事件
+ $('ul.buy-area').on('click', '.buy-btn', function () {
console.log($(this).data());
if (!$(this).data('name') || !$(this).data('day') || !$(this).data('gold') || !$(this).data('giftId')) {
- toastMsg('礼包信息不完整')
+ toastMsg('禮包信息不完整')
return
}
@@ -113,67 +113,67 @@ $(function(){
giftObj['num'] = 1
giftObj['ticketNum'] = $(this).data('ticketNum')
-
+
$('.shade-mask-buy').find('.title span').html(giftObj['name'])
$('.shade-mask-buy').find('.buy-day span').html(giftObj['day'])
$('.shade-mask-buy').find('.buy-price span').html(giftObj['gold'])
$('.shade-mask-buy').find('.inputNum').val(giftObj['num'])
$('.shade-mask-buy').fadeIn(50)
})
- // 关闭购买弹窗
- $('.cancel').on('click', function(){
+ // 關閉購買彈窗
+ $('.cancel').on('click', function () {
$('.shade-mask-buy').fadeOut(50)
})
- $('.shade-mask-buy').on('click', function(){
+ $('.shade-mask-buy').on('click', function () {
$('.shade-mask-buy').fadeOut(50)
})
- $('.shade-content-buy').on('click', function(e){
+ $('.shade-content-buy').on('click', function (e) {
e.stopPropagation()
})
- // 关闭余额不足弹窗
- $('.shade-mask-no-money').on('click', function(){
+ // 關閉余額不足彈窗
+ $('.shade-mask-no-money').on('click', function () {
$('.shade-mask-no-money').fadeOut(50)
})
- $('.shade-content-no-money').on('click', function(e){
+ $('.shade-content-no-money').on('click', function (e) {
e.stopPropagation()
})
- // 增加购买数量
- $('.increase').on('click', function(){
- if(giftObj['num']<9999){
+ // 增加購買數量
+ $('.increase').on('click', function () {
+ if (giftObj['num'] < 9999) {
giftObj['num']++;
giftObj['day']++;
let allPrice = giftObj['num'] * giftObj['gold'];
$('.inputNum').val(giftObj['num'])
$('.buy-day span').html(giftObj['day'])
$('.buy-price span').html(allPrice)
- }else{
- toastMsg('单次购买数量最多为9999')
+ } else {
+ toastMsg('單次購買數量最多為9999')
}
})
- // 减少购买数量
- $('.decrease').on('click', function(){
- if($('.inputNum').val()>0){
+ // 減少購買數量
+ $('.decrease').on('click', function () {
+ if ($('.inputNum').val() > 0) {
giftObj['num']--;
giftObj['day']--;
let allPrice = giftObj['num'] * giftObj['gold'];
$('.inputNum').val(giftObj['num'])
$('.buy-day span').html(giftObj['day'])
$('.buy-price span').html(allPrice)
- }else{
- toastMsg('最少购买数量为1')
+ } else {
+ toastMsg('最少購買數量為1')
}
})
- // 手动输入购买数量
- $('.inputNum').on('input', function(){
+ // 手動輸入購買數量
+ $('.inputNum').on('input', function () {
let exp = /^[0-9]+$/
if (!exp.test($(this).val())) {
- toastMsg('请输入数字')
+ toastMsg('請輸入數字')
// $(this).val(1)
return
}
- if($(this).val() > 9999){
+ if ($(this).val() > 9999) {
giftObj['num'] = 9999
- }else{
+ } else {
giftObj['num'] = $(this).val()
}
giftObj['day'] = giftObj['num'];
@@ -182,19 +182,19 @@ $(function(){
$('.buy-day span').html(giftObj['day'])
$('.buy-price span').html(allPrice)
})
- // 确认购买
+ // 確認購買
let lock = false
- $('.confirm').on('click', function(){
+ $('.confirm').on('click', function () {
let exp = /^[0-9]+$/
- if(!exp.test($('.inputNum').val())){
- toastMsg('请输入数字')
+ if (!exp.test($('.inputNum').val())) {
+ toastMsg('請輸入數字')
$('.inputNum').val(1)
return
}
- if($('.inputNum').val() == 0){
- return toastMsg('最少购买数量为1')
+ if ($('.inputNum').val() == 0) {
+ return toastMsg('最少購買數量為1')
}
- if(!lock){
+ if (!lock) {
lock = true
networkRequest({
type: 'POST',
@@ -205,51 +205,51 @@ $(function(){
packNum: giftObj.num,
ticket: pubInfo.ticket
},
- success(res){
- if(res.code === 200){
+ success (res) {
+ if (res.code === 200) {
$('.shade-mask-buy').hide()
- toastMsg('购买成功！')
+ toastMsg('購買成功！')
getUserInfo(res.data)
- }else if(res.code === 2103){
+ } else if (res.code === 2103) {
$('.shade-mask-buy').hide()
$('.shade-mask-no-money').show()
- }else{
+ } else {
toastMsg(res.message)
}
lock = false
},
- error(err){
- toastMsg('网络错误')
+ error (err) {
+ toastMsg('網絡錯誤')
}
})
}
-
+
})
- // 跳转充值
+ // 跳轉充值
$('.recharge, .no-money-recharge').on('click', function () {
- if(browser.app){
- if(browser.android){
+ if (browser.app) {
+ if (browser.android) {
// window.androidJsObj.openChargePage()
tools.nativeUtils.jumpAppointPage('RECHARGE_PAGE')
- }else if(browser.ios){
+ } else if (browser.ios) {
window.webkit.messageHandlers.openChargePage.postMessage(null)
}
- }else{
- toastMsg('请在app内打开')
+ } else {
+ toastMsg('請在app內打開')
}
})
- //返回页面 重新请求接口
+ //返回頁面 重新請求接口
var hiddenProperty = 'hidden' in document ? 'hidden' :
- 'webkitHidden' in document ? 'webkitHidden' :
- 'mozHidden' in document ? 'mozHidden' : null;
+ 'webkitHidden' in document ? 'webkitHidden' :
+ 'mozHidden' in document ? 'mozHidden' : null;
var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');
var onVisibilityChange = function () {
- if(!document[hiddenProperty]){
+ if (!document[hiddenProperty]) {
$('.shade-mask-no-money').hide()
getUserInfo()
- }
+ }
}
document.addEventListener(visibilityChangeEvent, onVisibilityChange);
})
\ No newline at end of file
diff --git a/view/peko/activity/act-ocean/js/rank.js b/view/peko/activity/act-ocean/js/rank.js
deleted file mode 100644
index 499142e..0000000
--- a/view/peko/activity/act-ocean/js/rank.js
+++ /dev/null
@@ -1,369 +0,0 @@
-let urlPrefix = getUrlPrefix()
-let browser = checkVersion()
-let env = EnvCheck();
-if (env == 'test') {
- new VConsole();
-}
-
-// 封装layer消息提醒框
-let layerIndex
-const showLoading = () => {
- layer.open({
- type: 2,
- shadeClose: false,
- content: '加載中...',
- success(e) {
- layerIndex = $(e).attr('index')
- }
- })
-}
-const hideLoading = (index) => {
- layer.close(index)
-}
-const toastMsg = (content = '操作完成', time = 2) => {
- layer.open({
- content,
- time,
- skin: 'msg'
- })
-}
-
-if(!browser.app){
- toastMsg('请在app内打开！');
-}else{
- $('body').removeClass('no-in-app')
-}
-
-// 榜单类型，1是钻石榜，2是欧皇榜
-let type = 1
-
-let pageSize = 20
-
-// 钻石榜单
-let pageD = 1
-let myInfoD = []
-let rankListD = []
-// 欧皇榜单
-let pageN = 1
-let myInfoN = []
-let rankListN = []
-let clickTabCanNetworkN = true
-
-let isLockD = true
-let isLockN = true
-let isLock = true
-
-let canRequsetNextPageD = true
-let canRequsetNextPageN = true
-
-const getListRank = (type, page) => {
- networkRequest({
- type: 'GET',
- url: urlPrefix + '/act/luckySea/listRank',
- data:{
- type,
- page,
- pageSize
- },
- success(res){
- if(res.code === 200){
- if(type === 1){
- // 钻石榜单
- if(res.data.rankList.length === pageSize){
- // 可以请求下一页
- canRequsetNextPageD = true
- }else{
- // 不再请求下一页
- canRequsetNextPageD = false
- }
- rankListD.push(...res.data.rankList)
- // 底部个人信息只渲染一次 x
- // if(pageD === 1){
- // }
- myInfoD = res.data.myRankInfo
- renderMyInfo()
- renderRankList()
- isLockD = true
- }else{
- if(res.data.rankList.length === pageSize){
- // 可以请求下一页
- console.log('gekk');
- canRequsetNextPageN = true
- }else{
- // 不再请求下一页
- canRequsetNextPageN = false
- }
- rankListN.push(...res.data.rankList)
- // 底部个人信息只渲染一次 x
- // if(pageN === 1){
- // }
- myInfoN = res.data.myRankInfo
- renderMyInfo()
- // renderMyInfo()
- renderRankList()
- isLockN = true
- }
- // isLock = true
- }else{
- toastMsg(res.message)
- }
- },
- error(err){
- toastMsg('網絡錯誤')
- }
- })
-}
-
-// 渲染底部个人信息
-const renderMyInfo = () => {
- if(type === 1){
- // 钻石榜单
- let erbanNo = myInfoD.erbanNo
- let myIndex = rankListD.findIndex((item, index) => {
- return item.erbanNo === erbanNo
- })
- if(myIndex === -1){
- $('.mine-rank').html('未上榜')
- }else{
- $('.mine-rank').html(myIndex + 1)
- }
- $('.mine-info').find('img').attr('src', myInfoD.avatar)
- $('.mine-info').find('.mine-nick').html(myInfoD.nick)
- // if(myInfoD.num.toString().length >= 5) {
- // myInfoD.num = (myInfoD.num/10000).toFixed(2) + 'w'
- // }
- let tostr = myInfoD.num.toString()
- let num
- if(tostr.length >= 5) {
- num = (myInfoD.num/10000).toFixed(2) + 'w'
- }else{
- num = myInfoD.num
- }
- $('.mine-diamond-num').html(num)
- }else{
- let erbanNo = myInfoN.erbanNo
- let myIndex = rankListN.findIndex((item, index) => {
- return item.erbanNo === erbanNo
- })
- if(myIndex === -1){
- $('.mine-rank').html('未上榜')
- }else{
- $('.mine-rank').html(myIndex + 1)
- }
- $('.mine-info').find('img').attr('src', myInfoN.avatar)
- $('.mine-info').find('.mine-nick').html(myInfoN.nick)
- $('.mine-diamond-num').html('猜對' + myInfoN.num + '次')
- }
-}
-
-// 渲染榜单信息
-const renderRankList = () => {
- if(type === 1){
- // 钻石榜单
- // 渲染前3
- let topThreeArr = rankListD.slice(0, 3)
- console.log(topThreeArr);
- if(rankListD.length < 3){
- let len = 3 - rankListD.length
- let arr = new Array(len).fill({
- nick: '虛位以待',
- avatar: './images/default.png',
- num: ''
- })
- topThreeArr.push(...arr)
- }
- let topThreeStr = ''
- topThreeArr.map((item) => {
- let tostr = item.num.toString()
- let num
- if(tostr.length >= 5) {
- num = (item.num/10000).toFixed(2) + 'w'
- }else{
- num = item.num
- }
-
- topThreeStr += `
-
-
-
-
-
-
${item.nick.length > 5 ? item.nick.slice(0,5) + '...' : item.nick}
-
${num}
-
- `
- })
- $('.topthree-wrap').html(topThreeStr)
-
-
- // 渲染非前3
- let othersArr = rankListD.slice(3)
- console.log(othersArr);
- let others = ''
- othersArr.map((item, index) => {
- let tostr = item.num.toString()
- let num
- if(tostr.length >= 5) {
- num = (item.num/10000).toFixed(2) + 'w'
- }else{
- num = item.num
- }
- others += `
-
- ${index+4}
-
-
-
${item.nick}
-
- `
- })
- $('.other-rank').html(others)
- }else{
- // 欧皇榜单
- // 渲染前3
- let topThreeArr = rankListN.slice(0, 3)
- console.log(topThreeArr);
- if(rankListN.length < 3){
- let len = 3 - rankListN.length
- let arr = new Array(len).fill({
- nick: '虛位以待',
- avatar: './images/default.png'
- })
- topThreeArr.push(...arr)
- }
- let topThreeStr = ''
- topThreeArr.map((item) => {
- let num = ''
- if(item.erbanNo){
- num = '猜對'+item.num + '次'
- }
- topThreeStr += `
-
-
-
-
-
-
${item.nick.length > 5 ? item.nick.slice(0,5) + '...' : item.nick}
-
${num}
-
- `
- })
- $('.topthree-wrap').html(topThreeStr)
-
- // 渲染非前3
- let othersArr = rankListN.slice(3)
- console.log(othersArr);
- let others = ''
- othersArr.map((item, index) => {
- let num
- if(item.erbanNo){
- num = '猜對'+item.num + '次'
- }
- others += `
-
- ${index+4}
-
-
-
${item.nick}
-
- `
- })
- $('.other-rank').html(others)
- }
-
-}
-
-$(function(){
- getInfoFromClient()
- setTimeout(function(){
- getListRank(type, pageD)
- }, 50)
-
- $('.other-rank').height($(window).innerHeight() - $('.rank-top').height());
-
- $('.tab-wrap').on('click', 'span', function(){
- $(this).addClass('active').siblings().removeClass('active')
- if(type === $(this).index() + 1) return
- type = $(this).index() + 1
-
-
- $('.other-rank').scrollTop(0)
- if(type === 1){
- renderRankList()
- renderMyInfo()
- // getListRank(type, pageD)
- }else{
- if(clickTabCanNetworkN){
- getListRank(type, pageN)
- }else{
- renderRankList()
- renderMyInfo()
- }
- clickTabCanNetworkN = false
- }
- })
-
- // 监听滚动
- $('.other-rank').scroll(function(){
-
- let scrollTop = $(this).scrollTop();//这是已经卷进去滚动条的的高度
- let scrollHeight = $('.other-rank')[0].scrollHeight;//这个是other-rank包含滚动条的总高度
- let ulHeight = $(this).innerHeight();//这个是other-rank的高度
- console.log(ulHeight,scrollTop, scrollHeight);
-
- // 安卓可以只触发一次(安卓机型太多，不确定是否所有安卓都能触发一次)，ios会触发多次，ios要加锁, pc端触发不了
-
-
- //这样距离到底还有一段距离就请求，但是会导致重复请求，所以要加锁限制
- if(scrollTop + ulHeight + 100 >= scrollHeight){
- console.log('到底了');
- if(type === 1){
- if(isLockD){
- isLockD = false
- pageD++
- if(pageSize * pageD > 100){
- toastMsg('沒有更多數據啦~')
- }else{
- if(canRequsetNextPageD){
- getListRank(type,pageD);
- }else{
- toastMsg('沒有更多數據啦~')
- }
- }
- }else{
- if(scrollTop + ulHeight >= scrollHeight){
- if(pageSize * pageD > 100){
- toastMsg('沒有更多數據啦~')
- }
- }
- }
-
- }else{
- // getListRank(type,++pageN);
- if(isLockN){
- isLockN = false
- pageN++
- if(pageSize * pageN > 100){
- toastMsg('沒有更多數據啦~')
- }else{
- if(canRequsetNextPageN){
- getListRank(type,pageN);
- }else{
- toastMsg('没有更多数据啦')
- }
- }
- }else{
- if(scrollTop + ulHeight >= scrollHeight){
- if(pageSize * pageN > 100){
- toastMsg('沒有更多數據啦~')
- }
- }
- }
- }
- }
- })
-})
\ No newline at end of file
diff --git a/view/peko/activity/act-ocean/js/record.js b/view/peko/activity/act-ocean/js/record.js
index 541ce99..4930091 100644
--- a/view/peko/activity/act-ocean/js/record.js
+++ b/view/peko/activity/act-ocean/js/record.js
@@ -2,13 +2,13 @@ let urlPrefix = getUrlPrefix()
let browser = checkVersion()
if (EnvCheck() === 'test') new VConsole
-// 封装layer消息提醒框
+// 封裝layer消息提醒框
let layerIndex
const showLoading = () => {
layer.open({
type: 2,
shadeClose: false,
- content: '加载中...',
+ content: '加載中...',
success (e) {
layerIndex = $(e).attr('index')
}
@@ -26,7 +26,7 @@ const toastMsg = (content = '操作完成', time = 2) => {
}
-// 获取用户的游戏记录
+// 獲取用戶的遊戲記錄
let recordList = []
let page = 1
let pageSize = 10
@@ -43,58 +43,107 @@ const getUserRecord = () => {
success (res) {
if (res.code === 200) {
if (res.data.length === pageSize) {
- // 能够继续请求下一页
+ // 能夠繼續請求下一頁
canNext = true
} else {
canNext = false
}
recordList.push(...res.data)
- renderRecord(res)
+ renderRecord()
isLock = true
} else {
toastMsg(res.message)
}
},
error (err) {
- toastMsg('网络错误')
+ toastMsg('網絡錯誤')
}
})
}
-// 渲染游戏记录
-const renderRecord = (res) => {
+// 渲染遊戲記錄
+const renderRecord = () => {
if (recordList.length === 0) {
- $('.record-list').hide();
- $('.img').show();
+ $('.record-list').html('
暫無遊戲記錄')
} else {
- $('.record-list').show();
- $('.img').hide();
- var str = '';
- let str2 = '';
- let drawId = [];;
- var results = [];
- console.log(res.data)
- res.data.forEach((res, index) => {
- drawId.push(res.drawId);
- str += `
-
- ${dateFormat(res.drawTime, 'yy-MM-dd hh:mm:ss')}
-
- 遊戲獎勵：
- ${res.reward}钻石
-
-
- 哎呀~猜錯了o(╥﹏╥)o
- 厲害~猜對了୧(๑•̀◡•́๑)૭
-
- `
- results.push(res.results);
- });
- $('.record-list').append(str)
- results.forEach((res, index) => {
- res.forEach(val => {
- $('.record-list li').eq(index).children('.marine_organism').append(`
+${val.costPiece}`)
+ let str = ''
+ recordList.map((item, index) => {
+ let drawId = item.drawId
+ let itemType = item.itemType
+ // 渲染li裏面的ul
+ let str1 = ''
+ let userCostPiece = '' //用戶投註情況
+ let userReward = '' //用戶獎勵情況
+ item.results.map((item1, index) => {
+ if (itemType === 1) {
+ userCostPiece = '+' + item1.costPiece
+ } else {
+ userCostPiece = item1.multiple * 10 + '*' + item1.costPiece
+ }
+
+ str1 += `
+
+
+ ${userCostPiece}
+
+ `
+
+ if (item1.itemId === drawId) {
+ $('.none').html(str1)
+ $('.none').find('li').eq(index).addClass('active')
+ str1 = $('.none').html()
+ }
})
- });
+
+ if (itemType === 1) {
+ if (item.reward) {
+ userReward = `
+
${item.reward}
+
+ `
+ } else {
+ userReward = `
+
未猜中
+ `
+ }
+ } else {
+ if (item.reward) {
+ userReward = `
+
+ ${item.itemName} (${item.price}) *${item.reward / item.price}個 (共計${item.reward})
+
+ `
+
+ } else {
+ userReward = `
+
未猜中
+ `
+ }
+ }
+
+ // 渲染li
+ let text = ''
+ if (item.drawStatus === 1) {
+ text = '厲害~猜對了(*^▽^*)'
+ } else {
+ text = '哎呀~猜錯了o(╥﹏╥)o'
+ }
+ str += `
+
+ ${dateFormat(item.drawTime, "yyyy-MM-dd hh:mm:ss")}
+
+
遊戲獎勵：
+
+ ${userReward}
+
+
${text}
+
+ `
+ })
+ $('.record-list').html(str)
}
}
@@ -103,14 +152,14 @@ $(function () {
setTimeout(function () {
getUserRecord()
}, 50)
- // 监听滚动
+ // 監聽滾動
$('ul').scroll(function () {
let scrollTop = $(this).scrollTop()
let scrollHeight = $('ul')[0].scrollHeight
let ulHeight = $(this).innerHeight()
if (scrollTop + ulHeight + 100 >= scrollHeight) {
if (isLock) {
- // 请求下一页
+ // 請求下一頁
if (canNext) {
getUserRecord(page++)
isLock = false
diff --git a/view/peko/activity/act-ocean/rank.html b/view/peko/activity/act-ocean/rank.html
deleted file mode 100644
index 8dfbc8f..0000000
--- a/view/peko/activity/act-ocean/rank.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
- 今日排名
-
-
-
-
-
-
-
-
-
- 钻石榜
- 欧皇榜
-
-
-
-
-
-
-
-
-
![]()
-
-
-
0
-
@@ -21,17 +24,30 @@
