|
...
|
...
|
@@ -147,19 +147,22 @@ Component({ |
|
|
|
time=defTime
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let dur,timeCheckedIndex=this.type==1?0:-1,list=[];
|
|
|
|
let nowtime=parseInt(new Date()/1000)
|
|
|
|
let dur,timeCheckedIndex=-1,list=[];
|
|
|
|
for(dur=parseInt(min);dur<=max;dur+=1800){
|
|
|
|
let t={
|
|
|
|
hasChecked:time<=dur,
|
|
|
|
time:dur,
|
|
|
|
disabled:this.dateIndex==0 && this.type==1 && time>dur,//新增 &&今天 && 过期 时 disabled
|
|
|
|
disabled:this.dateIndex==0 && this.type==1 && nowtime>dur,//新增 &&今天 && 过期 时 disabled
|
|
|
|
}
|
|
|
|
list.push(t)
|
|
|
|
if(dur<=time){
|
|
|
|
timeCheckedIndex++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(this.dateIndex==0 && this.type==1 && !defTime){//新增 &&今天 无默认时间,+1
|
|
|
|
timeCheckedIndex+=1
|
|
|
|
}
|
|
|
|
timeCheckedIndex=timeCheckedIndex>=list.length?list.length-1:timeCheckedIndex
|
|
|
|
console.log('add-time-dur.tindex',list,timeCheckedIndex)
|
|
|
|
return {list:list,listIndex:timeCheckedIndex}
|
...
|
...
|
|