Commit 3068425628553f0ae9899c505d3c3079a3c5e795

Authored by vking
1 parent 68d633e4

master-rewrite-addnew online

... ... @@ -145,13 +145,15 @@ Component({
let time=this.dur_time
min=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+min+":00"))
max=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+max+":00"))
let hasUseDeftime=false
if(defTime && (this.type!=2 || this.hasManual)){//非修改时或手动选择,优先默认时间
defTime=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+defTime+":00"))
if(defTime>time || this.dateIndex>0){
time=defTime
hasUseDeftime=true
}
}
console.log('add-time-dur.ttime',defTime,util.unixtoTime(time,"YYYY-MM-DD HH:II:SS"))
console.log('add-time-dur.ttime',hasUseDeftime,util.unixtoTime(time,"YYYY-MM-DD HH:II:SS"))
let nowtime=parseInt(new Date()/1000)
let dur,timeCheckedIndex=-1,list=[];
for(dur=parseInt(min);dur<=max;dur+=1800){
... ... @@ -165,7 +167,7 @@ Component({
timeCheckedIndex++
}
}
if(this.dateIndex==0 && this.type==1 && !defTime){//新增 &&今天 无默认时间,+1
if(this.dateIndex==0 && this.type==1 && !hasUseDeftime){//新增 &&今天 &&未使用默认时间,+1
timeCheckedIndex+=1
}
timeCheckedIndex=timeCheckedIndex>=list.length?list.length-1:timeCheckedIndex
... ...