Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/reserve/detail.js

@@ -8,7 +8,7 @@
 	</view>
 	</view>
 	<view class="week-calendar-week flex-lr">
 	<view class="week-calendar-week flex-lr">
 		<block wx:for="{{weeklist}}" wx:key="{{index}}">
 		<block wx:for="{{weeklist}}" wx:key="{{index}}">
-			<view class="gray-font font30r Semibold">{{item.weekfont}}</view>
+			<view class="gray-font font30r Semibold" style="line-height:40rpx;">{{item.weekfont}}</view>
 		</block>
 		</block>
 	</view>
 	</view>
 	<view class="week-calendar-content">
 	<view class="week-calendar-content">

@@ -20,7 +20,7 @@
 }
 }
 .week-calendar-day-list{
 .week-calendar-day-list{
 	width:100%;
 	width:100%;
-	margin-bottom:30rpx;	
+	margin-bottom:26rpx;	
 }
 }
 .week-calendar-day{
 .week-calendar-day{
 	width:70rpx;
 	width:70rpx;

@@ -289,18 +289,16 @@ Page({
 	//包间类型改变
 	//包间类型改变
 	selectroom(e){
 	selectroom(e){
 		console.log(e)
 		console.log(e)
-		this.reserve.selectroom=e.detail.selectroom;
+		this.reserve.selectroom=JSON.stringify(e.detail.selectroom);
 	},
 	},
 	complete(){
 	complete(){
 		if(!this.reserve.selectroom || (this.reserve.selectroom && this.reserve.selectroom.length==0)){
 		if(!this.reserve.selectroom || (this.reserve.selectroom && this.reserve.selectroom.length==0)){
 			return util.toast('请选择包间类型','none');
 			return util.toast('请选择包间类型','none');
 		}
 		}
-		let params={...this.reserve}
-    params.sid=this.options.id
-    params.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00');
-    params.selectroom=JSON.stringify(this.reserve.selectroom);
+		this.reserve.sid=this.options.id
+		this.reserve.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00');
 		wx.navigateTo({
 		wx.navigateTo({
-		  url:util.http_build_query(params,'./submit')
+		  url:util.http_build_query(this.reserve,'./submit')
 		})
 		})
 	},
 	},
   selecttime(e){//时间改变
   selecttime(e){//时间改变

@@ -68,8 +68,8 @@
             </view>
             </view>
         </view>
         </view>
     </view>
     </view>
-	<view class="item flex-lr" style="padding:0 30rpx;box-sizing: border-box;">
-	    <view class="item-label">备注</view>
+	<view class="item flex-lr">
+	    <view class="item-label" style="margin-left:30rpx;">备注</view>
 	    <view class="Medium">
 	    <view class="Medium">
 	        <input class="cusdem input" placeholder="您的特殊要求，我们会尽量安排（20字）"
 	        <input class="cusdem input" placeholder="您的特殊要求，我们会尽量安排（20字）"
 	               bindinput="changeInput"
 	               bindinput="changeInput"