Merge remote-tracking branch 'origin/master'

@@ -33,7 +33,7 @@ Component({
 		getroomtype(){
 			let parmdata={
 				sellerid:this.data.seller.id,
-				day:new Date(this.data.date+' 00:00:00')/1000,
+				day:util.timetouUnix(this.data.date+' 00:00:00'),
 				interval:dur.indexOf(this.data.section)+1
 			}
 			App.Seller.GetSellerTableClass(parmdata).then((json)=>{
@@ -73,7 +73,7 @@ Component({
 				console.log('置满')
 				let  parmdata={
 					 classid:_target.id,
-					 day:new Date(this.data.date+' 00:00:00')/1000,
+					 day:util.timetouUnix(this.data.date+' 00:00:00'),
 					 interval:dur.indexOf(this.data.section)+1
 				}
 				if(_target.fid){

@@ -21,6 +21,7 @@ Component({
 				let today=util.unixtoTime(new Date()/1000,'YYYY-MM-DD');
 				this.getsectionlist();
 				if(today==newdate){
+					console.log('xxxxxxx')
 					this.markoversection();
 					if(this.data.section){
 						this.changesectionstyle(this.data.section);
@@ -72,13 +73,12 @@ Component({
 			let interval=[];
 			sectionlist.forEach((v,i)=>{
 				let sectionarr=v.sectiondur.split('-');
-				if(curtimestamp>=new Date(today+' '+sectionarr[1]+':00')/1000){
+				if(curtimestamp>Number(util.timetouUnix(today+' '+sectionarr[1]+':00'))){
 					v.overdate=true
 				}
 				if(!v.overdate){
-					let intervaldur=curtimestamp-new Date(today+' '+sectionarr[0]+':00')/1000;
+					let intervaldur=curtimestamp-Number(util.timetouUnix(today+' '+sectionarr[1]+':00'));
 					interval.push({
-						intervaldur:intervaldur,
 						index:i
 					})
 				}
@@ -106,8 +106,8 @@ Component({
 			let today=util.unixtoTime(new Date()/1000,'YYYY-MM-DD');
 			let curtimestamp=new Date()/1000;
 			let sectionarr=this.data.sectionlist[index].sectiondur.split('-');
-			let starttimestamp=new Date(today+' '+sectionarr[0]+':00')/1000;
-			let endtimestamp=new Date(today+' '+sectionarr[1]+':00')/1000;
+			let starttimestamp=Number(util.timetouUnix(today+' '+sectionarr[1]+':00'));
+			let endtimestamp=Number(util.timetouUnix(today+' '+sectionarr[1]+':00'));
 			let obj={
 				section:selectsection,
 				action:action

@@ -276,12 +276,11 @@ Page({
 	//时段改变
 	selectsection(e){
 		console.log(e);
-		let t=setTimeout(()=>{
+		setTimeout(()=>{
 			this.setData({
 				reserveSection:e.detail.section,
 				seletroomlist:e.detail.action=='click' ? [] : this.data.seletroomlist,
 			})
-			clearTimeout(t);
 		},0)
 		
 		this.reserve.section=e.detail.section;

@@ -49,13 +49,13 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 56,
+			"current": 0,
 			"list": [
 				{
 					"id": 0,
 					"name": "预订本-商家1",
 					"pathName": "pack-book/pages/book/b_index",
-					"query": "seller_id=154&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
+					"query": "seller_id=1001&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
 					"scene": 1001
 				},
 				{