|
|
@@ -409,7 +409,7 @@
|
|
|
if(res.status === 0){
|
|
|
distributionFlag = true;
|
|
|
let records = res.data.records;
|
|
|
- let distributionPages = res.data.pages;
|
|
|
+ distributionPages = res.data.pages;
|
|
|
if(res.data && records.length > 0){
|
|
|
var str = '',
|
|
|
len = records.length;
|
|
|
@@ -442,7 +442,7 @@
|
|
|
let clientHeight = $('.time-container')[0].clientHeight;
|
|
|
let scrollHeight = $('.time-container')[0].scrollHeight;
|
|
|
if(scrollTop + clientHeight + 100 > scrollHeight){
|
|
|
- if(distributionFlag && distributionPageNum <= distributionPages + 1){
|
|
|
+ if(distributionFlag && distributionPageNum < distributionPages){
|
|
|
distributionFlag = false;
|
|
|
distributionPageNum++;
|
|
|
distributionRecord();
|
|
|
@@ -496,7 +496,7 @@
|
|
|
day = parseInt(resultTime / 1000 / 60 / 60 / 24),
|
|
|
hour = parseInt(resultTime / 1000 / 60 / 60 % 24),
|
|
|
time = day + "天" + hour + "时";
|
|
|
- recordsId = records[i].id;
|
|
|
+ recordsId = records[i].id;
|
|
|
str += `<div class="reward-row">
|
|
|
<img class="reward-row-bg" src="../static/img/doubleChristmasActivity/reward-row-bg.png" />
|
|
|
<div class="reward-row-content">
|
|
|
@@ -510,7 +510,7 @@
|
|
|
</div>
|
|
|
<div class="compute-block">
|
|
|
<img class="compute-icon cut" data-id=${recordsId} data-index=${i} src="../static/img/doubleChristmasActivity/cut.png" />
|
|
|
- <input class="ipt" data-id=${recordsId} data-index=${i} type="number" onkeyup="this.value=this.value.replace(/-/g,'')" value="0" />
|
|
|
+ <input class="ipt" data-id=${recordsId} data-index=${(pageNum)*4 + i} type="number" onkeyup="this.value=this.value.replace(/-/g,'')" value="0" />
|
|
|
<img class="compute-icon add" data-id=${recordsId} data-index=${i} src="../static/img/doubleChristmasActivity/add.png" />
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -536,6 +536,7 @@
|
|
|
let preTotalTime = 0;
|
|
|
let index = e.target.dataset.index;
|
|
|
let value = $('.ipt').eq(index).val();
|
|
|
+ console.log(value)
|
|
|
var position = String(value).indexOf(".");//获取小数点的位置
|
|
|
if(position != -1){
|
|
|
value = value.substr(0, position);
|
|
|
@@ -559,6 +560,7 @@
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
+ console.log('distributionList',distributionList)
|
|
|
currTotalTime = 0;
|
|
|
distributionList.map(item => { // 这一次的总数据
|
|
|
currTotalTime += parseInt(item.duration);
|
|
|
@@ -607,6 +609,8 @@
|
|
|
});
|
|
|
//点击分配时常确定按钮
|
|
|
$('.sure-distribution-sure')[0].addEventListener('click', (e) => {
|
|
|
+ console.log(distributionList);
|
|
|
+ return
|
|
|
$.ajax({
|
|
|
url: baseUrl + '/api/user/v1/activity/distributeRewardDuration',
|
|
|
type: 'post',
|
|
|
@@ -624,6 +628,8 @@
|
|
|
$('.reward-list').eq(0).text('');
|
|
|
getList();
|
|
|
getLists();
|
|
|
+ distributionPageNum = 0;
|
|
|
+ $('.time-list').eq(0).text('');
|
|
|
distributionRecord();
|
|
|
distributionList.map((val) => {
|
|
|
totalRecords.map((item, indexs) => {
|
heyang