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({ @@ -56,7 +56,9 @@ Component({
56 if(util.unixtoTime(date/1000,'YYYY-MM-DD')==this.data.date){ //当天 56 if(util.unixtoTime(date/1000,'YYYY-MM-DD')==this.data.date){ //当天
57 if(currenttimemark+0.5<endtime){ 57 if(currenttimemark+0.5<endtime){
58 if(currenttimemark+0.5>starttime){ 58 if(currenttimemark+0.5>starttime){
59 - starttime=Math.round(currenttimemark)+0.5; 59 + console.log(starttime,currenttimemark)
  60 + starttime=Math.round(currenttimemark+0.5);
  61 + console.log(starttime,currenttimemark)
60 } 62 }
61 let thisdurlist=this.getsinglelist(starttime,endtime) 63 let thisdurlist=this.getsinglelist(starttime,endtime)
62 durlist=durlist.concat(thisdurlist) 64 durlist=durlist.concat(thisdurlist)