Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/customer/detail_owner.js

@@ -21,10 +21,9 @@ Component({
 				let today=util.unixtoTime(new Date()/1000,'YYYY-MM-DD');
 				let today=util.unixtoTime(new Date()/1000,'YYYY-MM-DD');
 				this.getsectionlist();
 				this.getsectionlist();
 				if(today==newdate){
 				if(today==newdate){
+					this.markoversection();
 					if(this.data.section){
 					if(this.data.section){
 						this.changesectionstyle(this.data.section);
 						this.changesectionstyle(this.data.section);
-					}else{
-						this.markoversection();
 					}
 					}
 				}else{
 				}else{
 					if(this.data.section){
 					if(this.data.section){
@@ -85,9 +84,11 @@ Component({
 				}
 				}
 			})
 			})
 			console.log(interval)
 			console.log(interval)
-			if(interval.length>0){
-				sectionlist[interval[0].index].isselected=true;
-				this.tellsection(sectionlist[interval[0].index].section,'defalut',interval[0].index)
+			if(!this.data.section){
+				if(interval.length>0){
+					sectionlist[interval[0].index].isselected=true;
+					this.tellsection(sectionlist[interval[0].index].section,'defalut',interval[0].index)
+				}
 			}
 			}
 			this.setData({
 			this.setData({
 				sectionlist:sectionlist
 				sectionlist:sectionlist

@@ -15,6 +15,7 @@ Page({
 	  console.log('selectdate',e);
 	  console.log('selectdate',e);
 	  this.setData({
 	  this.setData({
 	    reserveDate:e.detail.date,
 	    reserveDate:e.detail.date,
+		reserveSection:e.detail.action=='click' ? null : this.data.reserveSection
 	  })
 	  })
 	},
 	},
 	//时段改变
 	//时段改变

@@ -211,7 +211,6 @@ Page({
       rid: this.id
       rid: this.id
     }).then(res => {
     }).then(res => {
       let detail=this.formatDatail(res.data)
       let detail=this.formatDatail(res.data)
-			//detail.room_demand=JSON.parse(detail.room_demand);
 			detail.ddate_solt=Number(detail.ddate_solt);
 			detail.ddate_solt=Number(detail.ddate_solt);
       this.setData({
       this.setData({
         detail: detail,
         detail: detail,

@@ -65,6 +65,9 @@ Page({
     if(!this.user.name){
     if(!this.user.name){
       return util.toast('请填写预定人','none')
       return util.toast('请填写预定人','none')
     }
     }
+		if(!this.user.phone){
+			return util.toast('请填写正确的手机号','none')
+		}
     App.Customer.SetCustomerInfo({
     App.Customer.SetCustomerInfo({
       ...this.user
       ...this.user
     }).then(res=>{
     }).then(res=>{
@@ -84,6 +87,13 @@ Page({
       val = util.attr(e, 'val');
       val = util.attr(e, 'val');
 			console.log(val)
 			console.log(val)
     } else {
     } else {
+			if(key=='phone'){
+				console.log('key',key)
+				let myreg=/^[1][3,4,5,7,8][0-9]{9}$/;
+				if(!myreg.test(util.val(e))){
+					return util.val(e);
+				}
+			}
       val = util.val(e);
       val = util.val(e);
     }
     }
     this.user[key] = val;
     this.user[key] = val;

@@ -38,7 +38,7 @@
                        data-key="phone"
                        data-key="phone"
                        type="number"
                        type="number"
                        value="{{user.phone}}"
                        value="{{user.phone}}"
-                       placeholder-class="input-pl" maxlength="20"/>
+                       placeholder-class="input-pl" maxlength="11"/>
             </view>
             </view>
 			<view class="flex-rr">
 			<view class="flex-rr">
 			    <!-- 一键获取 -->
 			    <!-- 一键获取 -->

@@ -281,7 +281,6 @@ Page({
 				reserveSection:e.detail.section,
 				reserveSection:e.detail.section,
 				seletroomlist:e.detail.action=='click' ? [] : this.data.seletroomlist,
 				seletroomlist:e.detail.action=='click' ? [] : this.data.seletroomlist,
 			})
 			})
-			this.reserve.selectroom=e.detail.action=='click' ? [] : this.reserve.selectroom;
 			clearTimeout(t);
 			clearTimeout(t);
 		},0)
 		},0)
 		
 		
@@ -294,15 +293,14 @@ Page({
 		this.setData({
 		this.setData({
 			seletroomlist:e.detail.selectroom
 			seletroomlist:e.detail.selectroom
 		})
 		})
-		this.reserve.selectroom=e.detail.selectroom;
 	},
 	},
 	complete(){
 	complete(){
-		if(!this.reserve.selectroom || (this.reserve.selectroom && this.reserve.selectroom.length==0)){
+		if(!this.data.seletroomlist || (this.data.seletroomlist && this.data.seletroomlist.length==0)){
 			return util.toast('请选择包间类型','none');
 			return util.toast('请选择包间类型','none');
 		}
 		}
 		this.reserve.sid=this.options.id
 		this.reserve.sid=this.options.id
 		this.reserve.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00');
 		this.reserve.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00');
-		this.reserve.room_demand=JSON.stringify(this.reserve.selectroom)
+		this.reserve.room_demand=JSON.stringify(this.data.seletroomlist)
 		wx.navigateTo({
 		wx.navigateTo({
 		  url:util.http_build_query(this.reserve,'./submit')
 		  url:util.http_build_query(this.reserve,'./submit')
 		})
 		})
@@ -337,7 +335,6 @@ Page({
       })
       })
     }
     }
     this.reserve.date=e.detail.date;
     this.reserve.date=e.detail.date;
-		this.reserve.selectroom=e.detail.action=='click' ? [] : this.reserve.selectroom;
     this.setData({
     this.setData({
       reserveDate:e.detail.date,
       reserveDate:e.detail.date,
 			seletroomlist:e.detail.action=='click' ? [] : this.data.seletroomlist,
 			seletroomlist:e.detail.action=='click' ? [] : this.data.seletroomlist,

@@ -109,6 +109,12 @@ Page({
     if (key == 'sex') {
     if (key == 'sex') {
       val = util.attr(e, 'val');
       val = util.attr(e, 'val');
     } else {
     } else {
+			if(key=='phone'){
+				let myreg=/^[1][3,4,5,7,8][0-9]{9}$/;
+				if(!myreg.test(util.val(e))){
+					return util.val(e);
+				}
+			}
       val = util.val(e);
       val = util.val(e);
     }
     }
     this.user[key] = val;
     this.user[key] = val;
@@ -124,7 +130,7 @@ Page({
       return util.toast('请填写姓名','none')
       return util.toast('请填写姓名','none')
     }
     }
     if(!this.user.phone){
     if(!this.user.phone){
-      return util.toast('请填写手机','none')
+      return util.toast('请填写正确的手机号','none')
     }
     }
     this.hasSubmit=false;
     this.hasSubmit=false;
 		let roomids=[];
 		let roomids=[];

@@ -58,7 +58,7 @@
                        data-key="phone"
                        data-key="phone"
                        type="number"
                        type="number"
                        value="{{user.phone}}"
                        value="{{user.phone}}"
-                       placeholder-class="input-pl" maxlength="20"/>
+                       placeholder-class="input-pl" maxlength="11"/>
                 <view class="flex-rr">
                 <view class="flex-rr">
                     <!-- 一键获取 -->
                     <!-- 一键获取 -->
 					<phone bindgetphone="getphone">
 					<phone bindgetphone="getphone">

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