Merge remote-tracking branch 'origin/master'

@@ -167,18 +167,16 @@
     </view>
 </view>
 <tabBar></tabBar>
-<view class="calendar-mask"
-      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"
-          day="27"
-          start-date="2018-09"
-          days-color="{{dayStyle}}"
-          binddayClick="dateChange"
-          active-type="rounded"
-          calendar-style="calendar"
-          header-style="calendar-header"
-          board-style="calendar-board"></calendar>
+<view class="calendar-mask" bindtap="calendarClose"
+      style="height:{{calendarMask?'100%':0}};" wx:if="{{calendarMaskLoad}}">
+    <view style="width: 100%; height:{{calendarMask?'100%':0}};overflow: hidden;position: relative;">
+        <calendar weeks-type="cn" catchtap="catchtap"
+                  start-date="2018-09"
+                  days-color="{{dayStyle}}"
+                  binddayClick="dateChange"
+                  active-type="rounded"
+                  calendar-style="calendar"
+                  header-style="calendar-header"
+                  board-style="calendar-board"></calendar>
+    </view>
 </view>
\ No newline at end of file

@@ -207,7 +207,7 @@
 .calendar {
   background-color: #eeedff;
   padding-top: 10px;
-  position: fixed;
+  position: absolute;
   bottom: 0;
   width: 100%;
 }

@@ -31,10 +31,11 @@
               <nothingBook height="{{listHeight}}"></nothingBook>
         </block>
         <block wx:else>
+            <view class="book-list-cut flex-ll font26r black-font">
+                <text>已定 {{bookList.length}}</text>
+            </view>
             <view bindcsroll="onPullDownRefresh" class="bg_white">
-                    <view class="book-list-cut flex-ll font26r black-font">
-                        <text>已定 {{bookList.length}}</text>
-                    </view>
+
                     <view class="book-list-thead flex-lr font34r black-font">
                         <view>桌号</view>
                         <view class="flex-cc">预定人</view>
@@ -53,18 +54,16 @@
 </block>
 <tabBar></tabBar>
 
-<view class="calendar-mask"
-      style="left:{{calendarMask?0:-5000}}px;" wx:if="{{calendarMaskLoad}}">
-    <view bindtap="calendarClose" style="width: 100%; height: 100%;"></view>
-<calendar weeks-type="cn"
-          year="{{showyear}}"
-          month="{{showmonth}}"
-          day="{{showday}}"
-          start-date="2018-09"
-          days-color="{{dayStyle}}"
-          binddayClick="dateChange"
-          active-type="rounded"
-          calendar-style="calendar"
-          header-style="calendar-header"
-          board-style="calendar-board"></calendar>
+<view class="calendar-mask" bindtap="calendarClose"
+      style="height:{{calendarMask?'100%':0}};" wx:if="{{calendarMaskLoad}}">
+    <view style="width: 100%; height:{{calendarMask?'100%':0}};overflow: hidden;position: relative;">
+    <calendar weeks-type="cn" catchtap="catchtap"
+              start-date="2018-09"
+              days-color="{{dayStyle}}"
+              binddayClick="dateChange"
+              active-type="rounded"
+              calendar-style="calendar"
+              header-style="calendar-header"
+              board-style="calendar-board"></calendar>
+    </view>
 </view>
\ No newline at end of file

@@ -46,7 +46,6 @@ page{
      box-sizing:border-box;
 }
 .book-list-cut{
-   width:100%;
    height:66rpx;
    background:#F5F5F5;
    padding-left:44rpx;
@@ -106,9 +105,10 @@ page{
 .calendar {
   background-color: #eeedff;
   padding-top: 10px;
-  position: fixed;
+  position: absolute;
   bottom: 0;
   width: 100%;
+  z-index: 999;
 }
 .calendar-header{
   font-size: large; /*修改了标题文字和按钮的大小*/