diff --git a/view/molistar/activity/luckyNumbers/js/index.js b/view/molistar/activity/luckyNumbers/js/index.js
index 57456cd..6416a82 100644
--- a/view/molistar/activity/luckyNumbers/js/index.js
+++ b/view/molistar/activity/luckyNumbers/js/index.js
@@ -84,10 +84,17 @@ function translateFun() {
$('.my_history').html(langReplace(localLang.demoModule.My_history));
$('.Number_participants').html(langReplace(localLang.demoModule.Number_participants));
$('.Rewards').html(langReplace(localLang.demoModule.Rewards));
-
+ $('.top_bg .rules').html(langReplace(localLang.demoModule.Rules));
+ $('.popup_rule .popup_content .title').html(langReplace(localLang.demoModule.Rules));
+ $('.fortunate_number .history_btn').html(langReplace(localLang.demoModule.History));
+ $('.Hours').html(langReplace(localLang.demoModule.Hours));
+ $('.Mins').html(langReplace(localLang.demoModule.Mins));
+ $('.Secs').html(langReplace(localLang.demoModule.Secs));
+
}
var totalSeconds;
+
function getData() {
showLoading();
networkRequest({
@@ -114,40 +121,61 @@ function getData() {
`
$('.top_bg .tip_chang .tip_txt').html(str)
}
- $('.my_number .numberList').text(res.data.numberList.join(' 、'))
- // 开奖
+ // 幸运数字个位数情况
if (res.data.luckyNumber) {
if (String(res.data.luckyNumber).length == 1) {
res.data.luckyNumber = '0' + res.data.luckyNumber
}
// 关闭数字滚动动画
- pauseAnimation();
+ // pauseAnimation(res.data);
+ let numStr = '';
+ res.data.numberList.forEach((item, index) => {
+ if (item == res.data.luckyNumber) {
+ numStr += `
${item}`
+ } else {
+ numStr += `
${item} `
+ }
+ if (index < res.data.numberList.length - 1) {
+ numStr += '、';
+ }
+ })
+ $('.my_number .numberList').html(numStr)
- $('.fortunate_number .num_show .left_txt .no_animation').text(String(res.data.luckyNumber).substring(0, 1))
- $('.fortunate_number .num_show .right_txt .no_animation').text(String(res.data.luckyNumber).substring(1, 2))
- $('.fortunate_number .num_show .left_txt').css('top', '15%')
- $('.fortunate_number .num_show .right_txt').css('top', '15%')
+ } else {
+ $('.my_number .numberList').text(res.data.numberList.join(' 、'))
}
- // 如果中奖了，弹窗
- if (res.data.numberList.includes(res.data.luckyNumber)) {
- $('.popup_congratulations').show();
- // 阻止背景滚动
- $('body').css('overflow', 'hidden');
- $('.popup_congratulations .popup_content .detail_txt .date').text(res.data.date)
- }
-
-
-
-
totalSeconds = res.data.countDownSecond;
// // 初始化时分秒显示
const initialTime = formatTime(totalSeconds);
updateCountdownDisplay(initialTime);
pauseCountdown();
if (totalSeconds != 0) {
+ localStorage.setItem("displayStatus", JSON.stringify(false));
// 开始倒计时
startCountdown();
+ } else {
+ let displayStatus = JSON.parse(localStorage.getItem('displayStatus'))
+ // 不为true执行下面 有一次滚动动画 ，true只会渲染数字
+ if (!displayStatus) {
+ // 开启滚动动画
+ startAnimation()
+ setTimeout(() => {
+ // 关闭数字滚动动画
+ pauseAnimation(res.data);
+ // 渲染幸运数字
+ $('.fortunate_number .num_show .left_txt .no_animation').text(String(res.data.luckyNumber).substring(0, 1))
+ $('.fortunate_number .num_show .right_txt .no_animation').text(String(res.data.luckyNumber).substring(1, 2))
+ $('.fortunate_number .num_show .left_txt').css('top', '15%')
+ $('.fortunate_number .num_show .right_txt').css('top', '15%')
+ }, 3000);
+ } else {
+ // 渲染幸运数字
+ $('.fortunate_number .num_show .left_txt .no_animation').text(String(res.data.luckyNumber).substring(0, 1))
+ $('.fortunate_number .num_show .right_txt .no_animation').text(String(res.data.luckyNumber).substring(1, 2))
+ $('.fortunate_number .num_show .left_txt').css('top', '15%')
+ $('.fortunate_number .num_show .right_txt').css('top', '15%')
+ }
}
} else {
toastMsg(res.message)
@@ -160,7 +188,7 @@ function getData() {
},
})
}
-
+// 数字滚动动画
function startAnimation() {
$('.fortunate_number .num_show .left_txt .animation_box').show();
$('.fortunate_number .num_show .right_txt .animation_box').show();
@@ -169,13 +197,29 @@ function startAnimation() {
$('.fortunate_number .num_show .left_txt .txt_container').css('animation-play-state', 'running');
$('.fortunate_number .num_show .right_txt .txt_container').css('animation-play-state', 'running');
}
-function pauseAnimation() {
+// 关闭数字滚动动画
+function pauseAnimation(obj) {
$('.fortunate_number .num_show .left_txt .animation_box').hide();
$('.fortunate_number .num_show .right_txt .animation_box').hide();
$('.fortunate_number .num_show .left_txt .no_animation').show();
$('.fortunate_number .num_show .right_txt .no_animation').show();
$('.fortunate_number .num_show .left_txt .txt_container').css('animation-play-state', 'paused');
$('.fortunate_number .num_show .right_txt .txt_container').css('animation-play-state', 'paused');
+ // 如果中奖了，弹窗
+ if (obj.numberList.includes(obj.luckyNumber)) {
+ let displayStatus = JSON.parse(localStorage.getItem('displayStatus'))
+ // 为true不执行下面
+ if (displayStatus) return
+ console.log('中奖了弹窗');
+ // 展示弹窗
+ $('.popup_congratulations').show();
+ // 阻止背景滚动
+ $('body').css('overflow', 'hidden');
+ $('.popup_congratulations .popup_content .detail_txt .date').text(obj.date)
+ localStorage.setItem("displayStatus", JSON.stringify(true));
+ } else {
+ localStorage.setItem("displayStatus", JSON.stringify(true));
+ }
}
// 历史轮次
function getListHistoryRound() {
@@ -234,6 +278,7 @@ function updateCountdownDisplay(time) {
$('#hours').text(time.hours);
$('#minutes').text(time.minutes);
$('#seconds').text(time.seconds);
+ $('.countdown_txt').text(time.hours + ':' + time.minutes + ':' + time.seconds)
}
var countdownInterval;
// 倒计时函数
@@ -246,8 +291,8 @@ function startCountdown() {
startAnimation()
pauseCountdown();
setTimeout(() => {
- getData();
- }, 2000);
+ getData();
+ }, 3000);
console.log('Countdown ended!');
return;
}
@@ -260,11 +305,11 @@ function startCountdown() {
totalSeconds--;
}, 1000);
}
-
+// 清除计时器
function pauseCountdown() {
clearInterval(countdownInterval);
}
-
+// 监听页面显示事件
document.addEventListener('visibilitychange', () => {
if (document.hidden) {
pauseCountdown();
@@ -282,12 +327,13 @@ $('.fortunate_bottom .participate_btn').click(function () {
// 阻止背景滚动
$('body').css('overflow', 'hidden');
});
-// 关闭
+// 关闭投入弹窗
$('.popup_sumbit .popup_content .close_btn').click(function () {
$('.popup_sumbit').hide();
// 阻止背景滚动
$('body').css('overflow', 'auto');
});
+// 提交选择的幸运数字
$('.popup_sumbit .popup_content .sumbit_btn').click(function () {
let number = String(leftNumber) + String(rightNumber);
submitLuckyNumber(number)
@@ -322,7 +368,7 @@ $('.fortunate_number .history_btn').click(function () {
// 阻止背景滚动
$('body').css('overflow', 'hidden');
});
-// 关闭
+// 关闭历史轮次
$('.popup_history .popup_content .close_btn').click(function () {
$('.popup_history').hide();
// 阻止背景滚动
@@ -334,7 +380,7 @@ $('.top_bg .rules').click(function () {
// 阻止背景滚动
$('body').css('overflow', 'hidden');
});
-// 关闭
+// 关闭规则
$('.popup_rule .popup_content .close_btn').click(function () {
$('.popup_rule').hide();
// 阻止背景滚动
diff --git a/view/molistar/activity/luckyNumbers/js/myHistory.js b/view/molistar/activity/luckyNumbers/js/myHistory.js
index c2b7a81..5b615c3 100644
--- a/view/molistar/activity/luckyNumbers/js/myHistory.js
+++ b/view/molistar/activity/luckyNumbers/js/myHistory.js
@@ -68,19 +68,23 @@ function getData() {
success: function (res) {
if (res.code == 200) {
let str = '';
- res.data.forEach(item => {
+ res.data.forEach((item, index) => {
if (String(item.luckyNumber).length == 1) {
item.luckyNumber = '0' + item.luckyNumber
}
- let numStr =''
- item.numberList.forEach(itemTwo=>{
- if(String(itemTwo).length == 1){
+ let numStr = ''
+ item.numberList.forEach((itemTwo, indexTwo) => {
+ if (String(itemTwo).length == 1) {
itemTwo = '0' + itemTwo
}
- if(item.luckyNumber == itemTwo){
- numStr += `
${itemTwo}`
- }else{
- numStr += `
${itemTwo} `
+ if (item.luckyNumber == itemTwo) {
+ numStr += `
${itemTwo}`
+ } else {
+ numStr += `
${itemTwo} `
+ }
+ // 只有不是最后一个元素时才加顿号
+ if (indexTwo < item.numberList.length - 1) {
+ numStr += '、';
}
})
str += `
@@ -100,7 +104,7 @@ function getData() {
${langReplace(localLang.demoModule.My_Participate_Number)}: ${numStr}
+