Commit 13b99e1970042ad300ce5159d9907d6f68419a22

Authored by vking
1 parent 735c6d1b

master-rewrite-addnew

@@ -141,7 +141,7 @@ Component({ @@ -141,7 +141,7 @@ Component({
141 let time=this.dur_time 141 let time=this.dur_time
142 min=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+min+":00")) 142 min=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+min+":00"))
143 max=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+max+":00")) 143 max=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+max+":00"))
144 - if(defTime && this.type!=1){//非修改时,优先默认时间 144 + if(defTime && this.type!=2){//非修改时,优先默认时间
145 defTime=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+defTime+":00")) 145 defTime=util.timetouUnix(util.unixtoTime(time,"YYYY-MM-DD "+defTime+":00"))
146 if(defTime>time || this.dateIndex>0){ 146 if(defTime>time || this.dateIndex>0){
147 time=defTime 147 time=defTime