Merge remote-tracking branch 'origin/master'

@@ -2,11 +2,11 @@
 	<block wx:for="{{roomlist}}" wx:key="{{index}}">
 	<block wx:for="{{roomlist}}" wx:key="{{index}}">
 		<block wx:if="{{item.status==1}}">
 		<block wx:if="{{item.status==1}}">
 			<view class="room-item black-font {{(item.isFull && item.isFull==1) || (item.isorderFull && item.isorderFull==1) ? 'border-gray bg-gray' : 'border-yellow bg-yellow'}} flex-vl" style="justify-content:center;" data-id="{{item.id}}" data-index="{{index}}" data-selectnum="{{item.selectnum ? item.selectnum : 0}}" data-fid="{{item.fid ? item.fid : null}}" catchtap="{{usecondition=='seller' ? (item.isorderFull && item.isorderFull==1 ? '' : 'selectroom') : (item.isFull && item.isFull==1 ? '' : 'selectroom')}}">
 			<view class="room-item black-font {{(item.isFull && item.isFull==1) || (item.isorderFull && item.isorderFull==1) ? 'border-gray bg-gray' : 'border-yellow bg-yellow'}} flex-vl" style="justify-content:center;" data-id="{{item.id}}" data-index="{{index}}" data-selectnum="{{item.selectnum ? item.selectnum : 0}}" data-fid="{{item.fid ? item.fid : null}}" catchtap="{{usecondition=='seller' ? (item.isorderFull && item.isorderFull==1 ? '' : 'selectroom') : (item.isFull && item.isFull==1 ? '' : 'selectroom')}}">
-				<view class="font30r font-bold">{{item.name}}</view>
-				<block wx:if="{{item.max}}">
+				<view class="font30r font-bold" style="width:100%;padding-right:62rpx;box-sizing:border-box; block;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item.name}}</view>
+				<block wx:if="{{item.max && item.max!=0}}">
 					<view class="font24r room-more">最多可坐{{item.max}}人</view>
 					<view class="font24r room-more">最多可坐{{item.max}}人</view>
 				</block>
 				</block>
-				<block wx:if="{{item.low}}">
+				<block wx:if="{{item.low && item.low!=0}}">
 					<view class="font20r room-consume">最低消费{{item.low}}元</view>
 					<view class="font20r room-consume">最低消费{{item.low}}元</view>
 				</block>
 				</block>
 				<block wx:if="{{item.selectnum && item.selectnum>0}}">
 				<block wx:if="{{item.selectnum && item.selectnum>0}}">

@@ -21,7 +21,11 @@ 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){
+						this.changesectionstyle(this.data.section);
+					}else{
+						this.markoversection();
+					}
 				}else{
 				}else{
 					if(this.data.section){
 					if(this.data.section){
 						this.changesectionstyle(this.data.section);
 						this.changesectionstyle(this.data.section);

@@ -2,7 +2,7 @@
 	<view class="select-rooms-title black-font font-bold font30r flex-ll">已选包间</view>
 	<view class="select-rooms-title black-font font-bold font30r flex-ll">已选包间</view>
 	<block wx:for="{{seletroomlist}}" wx:key="{{index}}">
 	<block wx:for="{{seletroomlist}}" wx:key="{{index}}">
 		<view class="select-rooms-item flex-vc" data-index="{{index}}" data-id="{{item.id}}" catchtap="cancelroom">
 		<view class="select-rooms-item flex-vc" data-index="{{index}}" data-id="{{item.id}}" catchtap="cancelroom">
-			<view class="white-font font-bold font30r">{{item.name}}</view>
+			<view class="white-font font-bold font30r" style="width:100%;block;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;text-align:center;">{{item.name}}</view>
 			<view class="select-rooms-close flex-cc">
 			<view class="select-rooms-close flex-cc">
 				<image src="../../../pages/image/close.jpg" class="close-icon"></image>
 				<image src="../../../pages/image/close.jpg" class="close-icon"></image>
 			</view>
 			</view>

@@ -20,6 +20,8 @@
 	border-radius:10rpx;
 	border-radius:10rpx;
 	position: relative;
 	position: relative;
 	margin-bottom:20rpx;
 	margin-bottom:20rpx;
+	padding:0 12rpx;
+	box-sizing: border-box;
 }
 }
 .select-rooms-close{
 .select-rooms-close{
 	width:36rpx;
 	width:36rpx;

@@ -60,7 +60,7 @@ Component({
 			App.Customer.GetHouseFullDate(parmdata).then((json)=>{
 			App.Customer.GetHouseFullDate(parmdata).then((json)=>{
 				console.log(json)
 				console.log(json)
 				if(json.ret==200){
 				if(json.ret==200){
-					let marklist=this.marklist;
+					let marklist=[];
 					console.log(marklist)
 					console.log(marklist)
 					if(json.data && json.data.length>0){
 					if(json.data && json.data.length>0){
 						json.data.forEach((v,i)=>{
 						json.data.forEach((v,i)=>{

@@ -68,7 +68,11 @@ Page({
     App.Customer.SetCustomerInfo({
     App.Customer.SetCustomerInfo({
       ...this.user
       ...this.user
     }).then(res=>{
     }).then(res=>{
-      App.Customer.GetCustomerInfo({},'clear')
+			if(res.ret==200){
+				App.Customer.GetCustomerInfo({},'clear')
+			}else{
+				return util.toast(res.msg,'none')
+			}
       wx.navigateBack()
       wx.navigateBack()
     })
     })
   },
   },

@@ -49,13 +49,13 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 0,
+			"current": 56,
 			"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=154&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
+					"query": "seller_id=80&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
 					"scene": 1001
 					"scene": 1001
 				},
 				},
 				{
 				{
@@ -471,7 +471,7 @@
 					"id": 56,
 					"id": 56,
 					"name": "测试组件",
 					"name": "测试组件",
 					"pathName": "pages/reserve/detail",
 					"pathName": "pages/reserve/detail",
-					"query": "id=48",
+					"query": "id=80",
 					"scene": null
 					"scene": null
 				},
 				},
 				{
 				{