Commit 82638a335fdcf435d77338453ac22a04811c54f4

Authored by vking
1 parent da9c6275

master-rewrite-addnew online

@@ -147,19 +147,22 @@ Component({ @@ -147,19 +147,22 @@ Component({
147 time=defTime 147 time=defTime
148 } 148 }
149 } 149 }
150 -  
151 - let dur,timeCheckedIndex=this.type==1?0:-1,list=[]; 150 + let nowtime=parseInt(new Date()/1000)
  151 + let dur,timeCheckedIndex=-1,list=[];
152 for(dur=parseInt(min);dur<=max;dur+=1800){ 152 for(dur=parseInt(min);dur<=max;dur+=1800){
153 let t={ 153 let t={
154 hasChecked:time<=dur, 154 hasChecked:time<=dur,
155 time:dur, 155 time:dur,
156 - disabled:this.dateIndex==0 && this.type==1 && time>dur,//新增 &&今天 && 过期 时 disabled 156 + disabled:this.dateIndex==0 && this.type==1 && nowtime>dur,//新增 &&今天 && 过期 时 disabled
157 } 157 }
158 list.push(t) 158 list.push(t)
159 if(dur<=time){ 159 if(dur<=time){
160 timeCheckedIndex++ 160 timeCheckedIndex++
161 } 161 }
162 } 162 }
  163 + if(this.dateIndex==0 && this.type==1 && !defTime){//新增 &&今天 无默认时间,+1
  164 + timeCheckedIndex+=1
  165 + }
163 timeCheckedIndex=timeCheckedIndex>=list.length?list.length-1:timeCheckedIndex 166 timeCheckedIndex=timeCheckedIndex>=list.length?list.length-1:timeCheckedIndex
164 console.log('add-time-dur.tindex',list,timeCheckedIndex) 167 console.log('add-time-dur.tindex',list,timeCheckedIndex)
165 return {list:list,listIndex:timeCheckedIndex} 168 return {list:list,listIndex:timeCheckedIndex}