Merge remote-tracking branch 'origin/master'

@@ -37,16 +37,12 @@ Component({
 		},
 		},
 		//获得默认所有可订时间段
 		//获得默认所有可订时间段
 		getdurlist(houseFull){
 		getdurlist(houseFull){
+			console.log(houseFull)
 			let currenttimemark=date.getHours()+date.getMinutes()/60;
 			let currenttimemark=date.getHours()+date.getMinutes()/60;
 			let timedur=this.data.seller.daily;
 			let timedur=this.data.seller.daily;
-			for(let key in houseFull){
-				if(houseFull[key]==1){
-					delete timedur[key];
-				}
-			}
 			let durlist=[];
 			let durlist=[];
 			for(let key in timedur){
 			for(let key in timedur){
-				if(timedur[key]!=""){
+				if(timedur[key]!="" && houseFull[key]==0){
 					let arr=timedur[key].split('-');
 					let arr=timedur[key].split('-');
 					//每个时段的开始时间、结束时间
 					//每个时段的开始时间、结束时间
 					let starttime=Number(arr[0].split(':')[0]);
 					let starttime=Number(arr[0].split(':')[0]);