|
|
@@ -70,10 +70,12 @@
|
|
|
<span class="reward-text">购买套餐累计时长</span>
|
|
|
<span class="total-time-num"></span>
|
|
|
<span class="reward-text">天</span>
|
|
|
- <span class="time-line">|</span>
|
|
|
- <span class="reward-text">距离下一个奖励还差</span>
|
|
|
- <span class="next-time-num"></span>
|
|
|
- <span class="reward-text">天</span>
|
|
|
+ <span class="next-reward">
|
|
|
+ <span class="time-line">|</span>
|
|
|
+ <span class="reward-text">距离下一个奖励还差</span>
|
|
|
+ <span class="next-time-num"></span>
|
|
|
+ <span class="reward-text">天</span>
|
|
|
+ </span>
|
|
|
</div>
|
|
|
<div class="reward-tip-row">
|
|
|
<img class="reward-tip-img" src="../static/img/doubleChristmasActivity/reward-tip-img.png" />
|
|
|
@@ -189,18 +191,20 @@
|
|
|
} else {
|
|
|
isMiniprogram = false;
|
|
|
}
|
|
|
- let userName = '';
|
|
|
- let totalTime = 0;
|
|
|
- let christmasDoubleReward = 0;
|
|
|
- let currTotalTime = 0;
|
|
|
- let distributionList = [];
|
|
|
- let totalRecords = [];
|
|
|
- var pageNum = 0;
|
|
|
- var distributionFlag = true;
|
|
|
- var distributionPageNum = 0;
|
|
|
- var distributionPages = 0;
|
|
|
- var sliderNumber = 0;//滑块是数量，控制溢出不能滑动
|
|
|
+ let tabIndex = 0,
|
|
|
+ userName = '',
|
|
|
+ totalTime = 0,
|
|
|
+ christmasDoubleReward = 0,
|
|
|
+ currTotalTime = 0,
|
|
|
+ distributionList = [],
|
|
|
+ totalRecords = [],
|
|
|
+ pageNum = 0,
|
|
|
+ distributionFlag = true,
|
|
|
+ distributionPageNum = 0,
|
|
|
+ distributionPages = 0,
|
|
|
+ sliderNumber = 0;//滑块是数量，控制溢出不能滑动
|
|
|
getBaseData();
|
|
|
+ getLists();
|
|
|
//点击立即参与按钮
|
|
|
$('.join-activity-btn')[0].addEventListener('click', () => {
|
|
|
operate('dt_双旦_h5_立即参与');
|
|
|
@@ -235,9 +239,10 @@
|
|
|
//点击tab选项卡
|
|
|
$('.tab-row')[0].addEventListener('click', (e) => {
|
|
|
const index = e.target.dataset.index;
|
|
|
- if (!index) {
|
|
|
+ if (!index || tabIndex == index) {
|
|
|
return
|
|
|
}
|
|
|
+ tabIndex = index;
|
|
|
if (index == 0) {
|
|
|
operate('dt_双旦_h5_tab_充值奖励');
|
|
|
$('.tab-item')[1].className = 'tab-item';
|
|
|
@@ -247,8 +252,6 @@
|
|
|
$('.distribution-container').eq(1).css('display', 'none');
|
|
|
} else {
|
|
|
operate('dt_双旦_h5_tab_分配奖励');
|
|
|
- getLists();
|
|
|
- distributionRecord();
|
|
|
$('.tab-item')[0].className = 'tab-item';
|
|
|
$('.tab-bg')[0].className = 'tab-bg tab-right';
|
|
|
$('.reward-container').eq(0).css('display', 'none');
|
|
|
@@ -272,6 +275,7 @@
|
|
|
getList();
|
|
|
const objData = res.data;
|
|
|
userName = objData.userName;
|
|
|
+ distributionRecord();
|
|
|
christmasDoubleReward = objData.christmasDoubleReward;
|
|
|
// 解决ios时间显示为NaN
|
|
|
objData.now = objData.now.replace(/T/g, ' ');
|
|
|
@@ -380,6 +384,9 @@
|
|
|
$('.time-title-usedDuration').eq(0).text(usedDuration);
|
|
|
totalTime = noDistributionDuration;
|
|
|
$('.no-distribution-num').eq(0).text(noDistributionDuration);
|
|
|
+ if(totalDuration >= 2022){
|
|
|
+ $('.next-reward').eq(0).css('display', 'none');
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
stopManyClick(() => {
|
|
|
@@ -495,8 +502,11 @@
|
|
|
resultTime = closeTime - currTime,
|
|
|
day = parseInt(resultTime / 1000 / 60 / 60 / 24),
|
|
|
hour = parseInt(resultTime / 1000 / 60 / 60 % 24),
|
|
|
- time = day + "天" + hour + "时";
|
|
|
+ time = day + "天" + hour + "时",
|
|
|
recordsId = records[i].id;
|
|
|
+ if(hour <= 0){
|
|
|
+ time = '已过期';
|
|
|
+ }
|
|
|
str += `<div class="reward-row">
|
|
|
<img class="reward-row-bg" src="../static/img/doubleChristmasActivity/reward-row-bg.png" />
|
|
|
<div class="reward-row-content">
|
|
|
@@ -505,7 +515,7 @@
|
|
|
<div class="reward-day">${diskName}</div>
|
|
|
<div class="total-day time-row">
|
|
|
<img class="time-icon" src="../static/img/doubleChristmasActivity/time-icon.png" />
|
|
|
- <span>${time}</span>
|
|
|
+ <span class=${time === '已过期'?'time-overdue':''}>${time}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="compute-block">
|
heyang