快速预定

@@ -103,6 +103,7 @@ Component({
               orderid: this.data.orderid,
               orderid: this.data.orderid,
               cookbookid: this.data.item.id,
               cookbookid: this.data.item.id,
               status: this.data.fromSoucre != '' ? 2 : '',//只查没有下单的
               status: this.data.fromSoucre != '' ? 2 : '',//只查没有下单的
+              identity: this.data.identity
             }).then(res => {
             }).then(res => {
               this.setData({
               this.setData({
                 selectKind: res.data[0],
                 selectKind: res.data[0],
@@ -139,6 +140,7 @@ Component({
               orderid: this.data.orderid,
               orderid: this.data.orderid,
               cookbookid: this.data.item.id,
               cookbookid: this.data.item.id,
               status: this.data.fromSoucre != '' ? 2 : '',//只查没有下单的
               status: this.data.fromSoucre != '' ? 2 : '',//只查没有下单的
+              identity: this.data.identity
             }).then(res => {
             }).then(res => {
               this.setData({
               this.setData({
                 selectKind: res.data[0],
                 selectKind: res.data[0],
@@ -283,6 +285,7 @@ Component({
           request_uri: this.data.request_uri == true ? 1 : '',//服务员通过消息通知进来 又加菜的标识
           request_uri: this.data.request_uri == true ? 1 : '',//服务员通过消息通知进来 又加菜的标识
           status: this.data.fromSoucre != '' ? 2 : '',//只查没有下单的
           status: this.data.fromSoucre != '' ? 2 : '',//只查没有下单的
           source: 2,
           source: 2,
+          identity: this.data.identity
         });
         });
       });
       });
     },
     },
@@ -348,6 +351,7 @@ Component({
         status: this.data.fromSoucre ? 2 : '',//只查没有下单的
         status: this.data.fromSoucre ? 2 : '',//只查没有下单的
         request_uri: this.data.request_uri == true ? 1 : '',//服务员通过消息通知进来 又加菜的标识
         request_uri: this.data.request_uri == true ? 1 : '',//服务员通过消息通知进来 又加菜的标识
         source: 2,
         source: 2,
+        identity: this.data.identity
       };
       };
       if (specid > 0) {
       if (specid > 0) {
         params.specid = specid;
         params.specid = specid;

@@ -248,4 +248,7 @@ Page({
       url: util.http_build_query(this.data.options,'./cart')
       url: util.http_build_query(this.data.options,'./cart')
     })
     })
   },
   },
+  bindscroll(e){
+    console.log(e);
+  }
 })
 })

@@ -8,6 +8,7 @@
             style = "height:{{totalHeight}}px;width:100%;z-index:{{scrollZindex}}; position: fixed;"
             style = "height:{{totalHeight}}px;width:100%;z-index:{{scrollZindex}}; position: fixed;"
             scroll-into-view = "{{toView}}"
             scroll-into-view = "{{toView}}"
             scroll-with-animation
             scroll-with-animation
+            bindscroll="bindscroll"
     >
     >
         <view style = "padding-left:180rpx;">
         <view style = "padding-left:180rpx;">
             <view class="section" wx:for="{{cookbooklist}}" wx:key="cookbooklist-key">
             <view class="section" wx:for="{{cookbooklist}}" wx:key="cookbooklist-key">

@@ -9,6 +9,7 @@ Page({
    */
    */
   data: {
   data: {
     moreDisplay:false,
     moreDisplay:false,
+    detail:{},
   },
   },
 
 
   /**
   /**
@@ -19,6 +20,7 @@ Page({
       options:options
       options:options
     })
     })
     this.initOrder()
     this.initOrder()
+    this.getDetail()
   },
   },
 
 
   /**
   /**
@@ -113,5 +115,24 @@ Page({
     wx.redirectTo({
     wx.redirectTo({
       url: util.http_build_query(options,'./index')
       url: util.http_build_query(options,'./index')
     })
     })
-  }
+  },
+  getDetail(fouce=false){
+    App.Reserve.Detail({
+      rid: this.data.options.rid,
+      openid: getApp().openid
+    },fouce).then(res => {
+      this.setData({
+        detail:this.formatDatail(res.data)
+      })
+    })
+  },
+  formatDatail(detail){
+    detail.rdateStr=util.unixtoTime(detail.ddate,'MM月DD日 WW HH:II');
+    detail.tableSubInfo=[];
+    detail.tables.forEach(t=>{
+      detail.tableSubInfo.push(t.name);
+    })
+    detail.tableSubInfo=detail.tableSubInfo.join('、')
+    return detail;
+  },
 })
 })

@@ -55,6 +55,10 @@
             <view>人数：</view>
             <view>人数：</view>
             <view class="">{{order.pnum||''}}</view>
             <view class="">{{order.pnum||''}}</view>
         </view>
         </view>
+        <view class="flex-lr item">
+            <view>桌位：</view>
+            <view class="" style="max-width: 85%;line-height: 40rpx; ">{{detail.tableSubInfo}}</view>
+        </view>
     </view>
     </view>
 </view>
 </view>
 <view class="hr"></view>
 <view class="hr"></view>

@@ -70,10 +70,12 @@
 .infos{
 .infos{
   background-color: #fefefe;
   background-color: #fefefe;
   font-size: 28rpx;
   font-size: 28rpx;
+  padding-bottom: 20rpx;
 }
 }
 .infos .item{
 .infos .item{
   height: 80rpx;
   height: 80rpx;
   line-height: 80rpx;
   line-height: 80rpx;
+  border-bottom: 2rpx solid #F5F5F5;
 }
 }
 .infos input{
 .infos input{
   text-align: right;
   text-align: right;
@@ -85,10 +87,8 @@
   max-width: 95%;
   max-width: 95%;
   color: #999999;
   color: #999999;
 }
 }
-.infos .item:first-child{
-  border-bottom: 2rpx solid #F5F5F5;
-  height: 100rpx;
-  line-height: 100rpx;
+.infos .item:last-child{
+  border-bottom-width:0;
 }
 }
 
 
 .optx{
 .optx{