预订本调整

@@ -48,7 +48,6 @@ Page({
         this.setData({
             opt: options
         })
-
         this.getDateBox = this.selectComponent("#getDate");
         this.getOftenNote()
         this.getSellerInfo()
@@ -726,13 +725,17 @@ Page({
     onShow() {
         var pages = getCurrentPages()
         var currPage = pages[pages.length - 1]
-        let PageTid = currPage.data.PageTid || ''
-        if (PageTid) {
+        let PageTid = currPage.data.PageTid;
+        if (PageTid && PageTid.length>0) {
             console.log('PageTid', PageTid);
             this.setData({
                 PageTid,
                 'detail.table_photo': PageTid,
             })
+        }else{
+            this.setData({
+                'detail.table_photo': this.data.detail.table_photo,
+            })
         }
     },
     //转订单中时间戳为日期格式

@@ -237,6 +237,7 @@
     border: 2rpx solid #438E93;
     text-align: center;
     border-radius: 10rpx;
+    background: #fff;
 }
 
 .btns1 button {

@@ -8,6 +8,7 @@ Page({
      */
     data: {
         opt: {},
+        barHeight:'',
         homeList: [],
         allfloorList: [],
         allfloorList: [],
@@ -26,6 +27,20 @@ Page({
             objpush: JSON.parse(options.table_photo)
         })
         this.getMealSectionByDayFun()
+        let systemInfo = wx.getSystemInfoSync();
+        let reg = /ios/i;
+        let pt = 20; //导航状态栏上内边距
+        let h = 44; //导航状态栏高度
+        if (reg.test(systemInfo.system)) {
+            pt = systemInfo.statusBarHeight;
+            h = 44;
+        } else {
+            pt = systemInfo.statusBarHeight;
+            h = 48;
+        }
+        this.setData({
+            barHeight: pt + h,
+        })
     },
     // 点击确定
     editTable() {
@@ -215,10 +230,10 @@ Page({
         })
         let list = []
         if (items.name === "全部") {
-            this.getReversList();
             this.setData({
                 homeList: [],
             })
+            this.getMealSectionByDayFun();
         } else {
             let allfloorList = this.data.allfloorList;
             let obj = allfloorList.filter(i => {

 <!--pack-book/pages/reservation/moreTable.wxml-->
 <nav id="nav" backgroundColor="#199095" color="#fefefe">选择桌位</nav>
-<view class="topWrap">
+<view class="topWrap" style="top: {{barHeight}}px;">
     <view class="tables">
         <view bind:tap="floorClick" data-item="{{item}}" class="tablesItems {{activeIndex==item.id?'activeLi':''}}" wx:for="{{floorList}}" wx:key="index">
             <view class="names font32r">{{item.name}}</view>

@@ -127,7 +127,6 @@
 
 .topWrap {
     position: fixed;
-    top: 176rpx;
     left: 0;
     background: #fff;
     padding: 10rpx 20rpx 18rpx 20rpx;

@@ -11,6 +11,7 @@ Page({
      */
     data: {
         threeText: '今天', //今天、明天、后天
+        barHeight:'',
         date: '',
         date1: '',
         week: '',
@@ -45,14 +46,14 @@ Page({
     onLoad(options) {
         console.log('options---', options);
         let obj = {}
-        if (options) {
+        if (options.seller_id) util.cache('sellerid', options.seller_id)
+        if (options.seller_id && options.manager_id && options.seller_openid) {
             obj = {
                 seller_id: options.seller_id,
                 manager_id: options.manager_id,
                 seller_openid: options.seller_openid,
             }
             util.cache('enter_params', obj)
-            if (options.seller_id) util.cache('sellerid', options.seller_id)
         }
         this.getDateBox = this.selectComponent("#getDate");
         this.getBook = this.selectComponent("#getBook");
@@ -62,6 +63,20 @@ Page({
             let role_name = res.data.seller_user.role_name;
             util.cache('roleName', role_name)
         })
+        let systemInfo = wx.getSystemInfoSync();
+        let reg = /ios/i;
+        let pt = 20; //导航状态栏上内边距
+        let h = 44; //导航状态栏高度
+        if (reg.test(systemInfo.system)) {
+            pt = systemInfo.statusBarHeight;
+            h = 44;
+        } else {
+            pt = systemInfo.statusBarHeight;
+            h = 48;
+        }
+        this.setData({
+            barHeight: pt + h,
+        })
     },
     /**
      * 生命周期函数--监听页面显示

 <!--pack-book/pages/reservation/reservation.wxml-->
 <nav id="nav" backgroundColor="#199095" color="#fefefe">预订本</nav>
-<view class="topWrap">
+<view class="topWrap" style="top: {{barHeight}}px;">
     <view class="dateInfo" bind:tap="showDateModal">
         <view class="threeDays font40r">{{threeText}}</view>
         <view class="dateText font32r">{{date}}</view>
@@ -19,7 +19,7 @@
         </view>
     </view>
 </view>
-<view class="mainCenter">
+<view class="mainCenter" style="padding-top: {{barHeight+40}}px;;">
     <view data-item="{{item}}" data-index="{{index}}" bind:tap="getTapHandler" class="itemsBox {{item.show?'checked':''}} {{(item.reserveLock == '1' || item.lockstitch) ? 'lockstitchBox':''}} {{item.reserveList?'orderInfo':''}} {{item.banquetList && item.banquetList.length>0?'banquetsInfo':''}}" wx:for="{{homeList}}" wx:key="{{item.id}}">
         <view class="wordName font32r">{{ item.name }}</view>
         <block wx:if="{{item.reserveList}}">

 /* pack-book/pages/reservation/reservation.wxss */
 .topWrap {
     position: fixed;
-    top: 176rpx;
     left: 0;
     background: #fff;
     padding: 10rpx 20rpx 18rpx 20rpx;