Merge remote-tracking branch 'origin/master'

@@ -50,6 +50,7 @@ Component({
 				day:util.timetouUnix(this.data.date+' 00:00:00'),
 				day:util.timetouUnix(this.data.date+' 00:00:00'),
 				interval:dur.indexOf(this.data.section)+1
 				interval:dur.indexOf(this.data.section)+1
 			}
 			}
+			console.log('参数',this.data.date,parmdata)
 			App.Seller.GetSellerTableClass(parmdata).then((json)=>{
 			App.Seller.GetSellerTableClass(parmdata).then((json)=>{
 				console.log('roomlist',json)
 				console.log('roomlist',json)
 				if(json.ret==200){
 				if(json.ret==200){
@@ -73,8 +74,10 @@ Component({
 			let _target=e.currentTarget.dataset;
 			let _target=e.currentTarget.dataset;
 			console.log(typeof _target.selectnum,this.data.usecondition)
 			console.log(typeof _target.selectnum,this.data.usecondition)
 			if(this.data.usecondition=='custom'){
 			if(this.data.usecondition=='custom'){
+				console.log('custom:true为点击了订满的包间类型',this.data.roomlist[_target.index].isorderFull==1 || this.data.roomlist[_target.index].isFull==1)
 				if(this.data.roomlist[_target.index].isorderFull==1 || this.data.roomlist[_target.index].isFull==1){
 				if(this.data.roomlist[_target.index].isorderFull==1 || this.data.roomlist[_target.index].isFull==1){
 				}else{
 				}else{
+					console.log('执行了选中包间类型');
 					if((this.data.seletroomlist && this.data.seletroomlist.length<3) || !this.data.seletroomlist){
 					if((this.data.seletroomlist && this.data.seletroomlist.length<3) || !this.data.seletroomlist){
 						let setkey='roomlist['+_target.index+'].selectnum';
 						let setkey='roomlist['+_target.index+'].selectnum';
 						this.setData({
 						this.setData({

@@ -139,6 +139,7 @@ Page({
 		this.options.room_demand.forEach((v,i)=>{
 		this.options.room_demand.forEach((v,i)=>{
 			roomids.push(v.id)
 			roomids.push(v.id)
 		})
 		})
+		console.log('ceshi',roomids);
     App.Customer.SetReserveInfo({
     App.Customer.SetReserveInfo({
       sid:this.options.sid,
       sid:this.options.sid,
       ddate:this.options.ddate,
       ddate:this.options.ddate,
@@ -150,6 +151,7 @@ Page({
 			ddate_solt:dur.indexOf(this.options.section)+1,
 			ddate_solt:dur.indexOf(this.options.section)+1,
 			roomids:roomids.toString(),
 			roomids:roomids.toString(),
     }).then(res=>{
     }).then(res=>{
+			console.log('ceshi',this.hasSubmit,res);
       if(res.ret!=200){
       if(res.ret!=200){
         this.hasSubmit=true;
         this.hasSubmit=true;
         return util.toast(res.msg,'none');
         return util.toast(res.msg,'none');

@@ -49,7 +49,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 56,
+			"current": 0,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,