|
|
@@ -167,7 +167,7 @@
|
|
|
var topVal = -0.5;
|
|
|
let obj = {};
|
|
|
// 上线分享环境改为0,图片路径改为正式站路径
|
|
|
- // var baseUrl = 'https://test.androidscloud.com'
|
|
|
+ var baseUrl = 'https://test.androidscloud.com'
|
|
|
var loc = window.location.search,
|
|
|
n1 = loc.length,//地址的总长度
|
|
|
n2 = loc.indexOf("="),//取得=号的位置
|
|
|
@@ -182,6 +182,7 @@
|
|
|
let christmasDoubleReward = 0;
|
|
|
let currTotalTime = 0;
|
|
|
let distributionList = [];
|
|
|
+ let totalRecords = [];
|
|
|
var pageNum = 0;
|
|
|
var distributionFlag = true;
|
|
|
var distributionPageNum = 0;
|
|
|
@@ -256,6 +257,11 @@
|
|
|
const objData = res.data;
|
|
|
userName = objData.userName;
|
|
|
christmasDoubleReward = objData.christmasDoubleReward;
|
|
|
+ // 解决ios时间显示为NaN
|
|
|
+ objData.now = objData.now.replace(/T/g, ' ');
|
|
|
+ objData.now = objData.now.replace(/\-/g, '/');
|
|
|
+ objData.endTime = objData.endTime.replace(/T/g, ' ');
|
|
|
+ objData.endTime = objData.endTime.replace(/\-/g, '/');
|
|
|
$('.meal-price-num').eq(0).text(objData.price);
|
|
|
let currTime = parseInt(Date.parse(objData.now)),
|
|
|
closeTime = parseInt(Date.parse(objData.endTime)),
|
|
|
@@ -414,6 +420,7 @@
|
|
|
},
|
|
|
})
|
|
|
}
|
|
|
+ //分配列表数据下拉加载
|
|
|
$('.time-container')[0].addEventListener('scroll',function () {
|
|
|
let scrollTop = $('.time-container')[0].scrollTop;
|
|
|
let clientHeight = $('.time-container')[0].clientHeight;
|
|
|
@@ -429,7 +436,7 @@
|
|
|
// 活动获取用户云机列表，分页
|
|
|
function getLists(){
|
|
|
const sliderLen = Array.from($('.slider-item')).length;
|
|
|
- if(sliderLen > sliderNumber){
|
|
|
+ if(sliderLen != 0 && sliderLen >= sliderNumber){
|
|
|
return
|
|
|
}
|
|
|
$.ajax({
|
|
|
@@ -449,14 +456,24 @@
|
|
|
success: function (res) {
|
|
|
if(res.status === 0){
|
|
|
let records = res.data.userCardPage.records;
|
|
|
+ totalRecords = [...totalRecords, ...records];
|
|
|
+ if(records.length === 0){
|
|
|
+ $('.page-row').eq(0).css('display','none');
|
|
|
+ let sliderItemDom = `<div class="slider-item no-slider">暂无可分配的云手机</div>`;
|
|
|
+ $('#slider-list').append(sliderItemDom);
|
|
|
+ return
|
|
|
+ }
|
|
|
if(res.data && records.length > 0){
|
|
|
sliderNumber = res.data.userCardPage.pages;
|
|
|
var str = '',
|
|
|
len = records.length;
|
|
|
for (var i = 0; i < len; i++) {
|
|
|
+ // 解决ios时间显示为NaN
|
|
|
+ var now = res.data.now.replace(/T/g, ' ');
|
|
|
+ now = now.replace(/\-/g, '/');
|
|
|
+ var exceptTime = records[i].exceptTime.replace(/T/g, ' ');
|
|
|
+ exceptTime = exceptTime.replace(/\-/g, '/');
|
|
|
var diskName = records[i].diskName,
|
|
|
- exceptTime = records[i].exceptTime,
|
|
|
- now = res.data.now,
|
|
|
currTime = parseInt(Date.parse(now)),
|
|
|
closeTime = parseInt(Date.parse(exceptTime)),
|
|
|
resultTime = closeTime - currTime,
|
|
|
@@ -477,21 +494,19 @@
|
|
|
</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(/[^0-9]/g,'')" value="0" />
|
|
|
+ <input class="ipt" data-id=${recordsId} data-index=${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>
|
|
|
</div>`
|
|
|
|
|
|
}
|
|
|
- let sliderItemDom = res.data.length === 0 ? `<div class="slider-item no-slider">暂无可分配的云手机</div>` : `<div class="slider-item">${str}</div>`;
|
|
|
+ let sliderItemDom = `<div class="slider-item">${str}</div>`;
|
|
|
$('#slider-list').append(sliderItemDom);
|
|
|
- if(records.length === 0){
|
|
|
- $('.left-ear').eq(0).css('display','none');
|
|
|
- $('.right-ear').eq(0).css('display','none');
|
|
|
- $('.page-row').eq(0).css('display','none');
|
|
|
- $('.distribution-reward-btn').eq(0).css('display','none');
|
|
|
- }
|
|
|
+ $('.left-ear').eq(0).css('display','block');
|
|
|
+ $('.right-ear').eq(0).css('display','block');
|
|
|
+ $('.distribution-reward-btn').eq(0).css('display','block');
|
|
|
+ $('.schedule-child-line').eq(0).css('width',`${36/sliderNumber}px`);
|
|
|
$('.page').eq(0).text(`${pageNum + 1}/${sliderNumber}页`);
|
|
|
if(sliderNumber === 1){
|
|
|
$('.page-row').eq(0).css('display','none');
|
|
|
@@ -505,6 +520,10 @@
|
|
|
let preTotalTime = 0;
|
|
|
let index = e.target.dataset.index;
|
|
|
let value = $('.ipt').eq(index).val();
|
|
|
+ var position = String(value).indexOf(".");//获取小数点的位置
|
|
|
+ if(position != -1){
|
|
|
+ value = value.substr(0, position);
|
|
|
+ }
|
|
|
distributionList.map(item => { // 上一次的总数据
|
|
|
preTotalTime += parseInt(item.duration);
|
|
|
})
|
|
|
@@ -541,6 +560,7 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
+ console.log(distributionList)
|
|
|
if(value.length > 5) value=value.slice(0, 5);
|
|
|
$('.ipt').eq(index).val(value);
|
|
|
}
|
|
|
@@ -582,15 +602,25 @@
|
|
|
dataType: 'json',
|
|
|
cache: false,
|
|
|
success: function (res) {
|
|
|
- console.log(res)
|
|
|
if(res.status === 0){
|
|
|
operate('dt_双旦_h5_分配奖励_确定');
|
|
|
$('.sure-distribution-wrap').eq(0).css('display','none');
|
|
|
$('.reward-list').eq(0).text('');
|
|
|
getList();
|
|
|
getLists();
|
|
|
+ distributionRecord();
|
|
|
+ distributionList.map((val) => {
|
|
|
+ totalRecords.map((item, indexs) => {
|
|
|
+ if(val.cardId == item.id){
|
|
|
+ console.log('indexs',indexs)
|
|
|
+ $('.ipt').eq(indexs).val(0);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
+ distributionList = [];
|
|
|
stopManyClick(() => {
|
|
|
- toastr.error('分配时长成功，请前往云机列表查看');
|
|
|
+ toastr.error('分配成功，请前往云机列表查看');
|
|
|
})
|
|
|
}else{
|
|
|
stopManyClick(() => {
|
|
|
@@ -615,6 +645,12 @@
|
|
|
cardId: id,
|
|
|
duration: +number + 1
|
|
|
});
|
|
|
+ }else{
|
|
|
+ distributionList.map(item => {
|
|
|
+ if(item.cardId == id){
|
|
|
+ item.duration++;
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
}else{
|
|
|
distributionList.map(item => {
|
|
|
@@ -626,7 +662,8 @@
|
|
|
distributionList.map(item => { // 这一次的总数据
|
|
|
currTotalTime += parseInt(item.duration);
|
|
|
})
|
|
|
-
|
|
|
+ console.log(currTotalTime)
|
|
|
+ console.log(totalTime)
|
|
|
if(currTotalTime <= totalTime){
|
|
|
number++;
|
|
|
$('.ipt').eq(index).val(number);
|
heyang