Merge remote-tracking branch 'origin/master'

@@ -56,8 +56,11 @@ Component({
 					if(util.unixtoTime(date/1000,'YYYY-MM-DD')==this.data.date){      //当天
 						if(currenttimemark+0.5<endtime){
 							if(currenttimemark+0.5>starttime){
-								console.log(starttime,currenttimemark)
-								starttime=Math.round(currenttimemark+0.5);
+								if(currenttimemark+0.5>Math.round(currenttimemark+0.5)){
+									starttime=Math.round(currenttimemark+0.5)+0.5;
+								}else{
+									starttime=Math.round(currenttimemark+0.5);
+								}
 								console.log(starttime,currenttimemark)
 							}
 							let thisdurlist=this.getsinglelist(starttime,endtime)