Merge remote-tracking branch 'origin/master'

@@ -53,8 +53,8 @@ Page({
           [],
       ],
       timePickerIndex:[0,0,0],
+      tablesLength:0,
   },
-    tablesAll:[],
   /**
    * 生命周期函数--监听页面加载
    */
@@ -213,16 +213,19 @@ Page({
                 tid:form.tabid,
             }).then(res=>{
                 let tables=[];
+                let tablesLength=0;
                 res.data.forEach(p=>{
-                  if(tables.length>=3) return true;
+                  //if(tables.length>=3) return true;
                   p.list.forEach(t=>{
+                      tablesLength++;
                       if(tables.length>=3) return true;
                       tables.push(t);
                   })
                 })
-                this.tablesAll=res.data;
+                this.tablesLength=tablesLength;
                 this.setData({
-                    tables:tables
+                    tables:tables,
+                    tablesLength:tablesLength
                 })
             })
         }catch (e){
@@ -290,7 +293,8 @@ Page({
             [changeBg]: "#84e7d0"
         })
         this.setDateStr(util.timetouUnix(event.detail.year+'/'+event.detail.month+'/'+event.detail.day))
-        this.getTables()
+        this.getTables();
+        this.calendarClose();
     },
     calendarClose(){
         this.setData({

@@ -88,7 +88,7 @@
 
     <view class="page-full tables">
         <view class="page">
-            <view class="title">可订桌位<text wx:if="{{tables.length>0}}"> ({{tables.length}})</text></view>
+            <view class="title">可订桌位<text wx:if="{{tables.length>0}}"> ({{tablesLength}})</text></view>
             <view class="advice-desk-detail flex-lr" wx:if="{{tables.length>0}}">
                 <view class="flex-ll">
                     <block wx:for="{{tablesed||tables}}" wx:key="tables.key">
@@ -113,7 +113,7 @@
                         </view>
                     </block>
                 </view>
-                <view class="flex-rr advice-more" bindtap="selectdesk" wx:if="{{tables.length>3 || form.rid>0}}">
+                <view class="flex-rr advice-more" bindtap="selectdesk" wx:if="{{tablesLength>3 || form.rid>0}}">
                     <view style="padding-right:30rpx;" class="gray-deep-font font26r">更多</view>
                     <image src="../image/click.png" class="icon12-22"></image>
                 </view>
@@ -168,8 +168,8 @@
 </view>
 <tabBar></tabBar>
 <view class="calendar-mask"
-      bindtap="calendarClose"
       style="left:{{calendarMask?0:-5000}}px;" wx:if="{{calendarMaskLoad}}">
+    <view bindtap="calendarClose" style="width: 100%; height: 100%;"></view>
 <calendar weeks-type="cn"
           year="2018"
           month="9"