Commit 5320a9b00087c7f29bca4128455de8c1e6635817

Authored by vking
2 parents 6459689f 940194cc

Merge remote-tracking branch 'origin/master'

Showing 1 changed file with 3 additions and 1 deletions
... ... @@ -56,7 +56,9 @@ Component({
if(util.unixtoTime(date/1000,'YYYY-MM-DD')==this.data.date){ //当天
if(currenttimemark+0.5<endtime){
if(currenttimemark+0.5>starttime){
starttime=Math.round(currenttimemark)+0.5;
console.log(starttime,currenttimemark)
starttime=Math.round(currenttimemark+0.5);
console.log(starttime,currenttimemark)
}
let thisdurlist=this.getsinglelist(starttime,endtime)
durlist=durlist.concat(thisdurlist)
... ...