快速预定

@@ -108,7 +108,7 @@ Page({
   onShareAppMessage: function () {
   onShareAppMessage: function () {
     return {
     return {
       title:'一起来点菜啦！',
       title:'一起来点菜啦！',
-      imageUrl:'http://qn.colorcun.com/custom/lite-yd-cook/image/share-show.jpg',
+      imageUrl:'http://qn.colorcun.com/custom/lite-yd-cook/image/share-go.jpg',
     }
     }
   },
   },
   formatCookList(list){
   formatCookList(list){

@@ -51,15 +51,15 @@
 <view class="pages">
 <view class="pages">
     <view class="infos">
     <view class="infos">
         <view class="flex-lr item" wx:if="{{order.remark}}">
         <view class="flex-lr item" wx:if="{{order.remark}}">
-            <view>备注：</view>
+            <view class="item-label">备注：</view>
             <view class="" style="max-width: 85%;line-height: 40rpx; ">{{order.remark||''}}</view>
             <view class="" style="max-width: 85%;line-height: 40rpx; ">{{order.remark||''}}</view>
         </view>
         </view>
         <view class="flex-lr item">
         <view class="flex-lr item">
-            <view>人数：</view>
+            <view class="item-label">人数：</view>
             <view class="">{{order.pnum||''}}</view>
             <view class="">{{order.pnum||''}}</view>
         </view>
         </view>
         <view class="flex-lr item">
         <view class="flex-lr item">
-            <view>桌位：</view>
+            <view class="item-label">桌位：</view>
             <view class="" style="max-width: 85%;line-height: 40rpx; ">{{detail.tableSubInfo}}</view>
             <view class="" style="max-width: 85%;line-height: 40rpx; ">{{detail.tableSubInfo}}</view>
         </view>
         </view>
     </view>
     </view>

@@ -94,7 +94,11 @@
 .infos .item:last-child{
 .infos .item:last-child{
   border-bottom-width:0;
   border-bottom-width:0;
 }
 }
-
+.infos .item-label{
+  min-width: 100rpx;
+  overflow: hidden;
+  white-space:nowrap;
+}
 .optx{
 .optx{
   height: 96rpx;
   height: 96rpx;
   line-height: 96rpx;
   line-height: 96rpx;

@@ -175,5 +175,10 @@ Page({
     }).then(()=>{
     }).then(()=>{
       this.getDetail(this.data.bookInfo.id,true);
       this.getDetail(this.data.bookInfo.id,true);
     });
     });
-  }
+  },
+  showOrder(){
+    wx.navigateTo({
+      url:util.http_build_query({rid:this.data.bookInfo.id,oid:this.data.bookInfo.orderid,identity:2},'/pack-cookbook/pages/success')
+    });
+  },
 })
 })

@@ -7,6 +7,7 @@
     "step":"/components/book/step/step",
     "step":"/components/book/step/step",
     "board":"/components/book/board/board",
     "board":"/components/book/board/board",
     "cancel":"/components/book/reserveCancel/cancel",
     "cancel":"/components/book/reserveCancel/cancel",
-    "nav":"/components/nav/nav"
+    "nav":"/components/nav/nav",
+    "formids":"/components/formids/formids"
   }
   }
 }
 }

@@ -77,7 +77,12 @@
 
 
 <!--通知预订人-->
 <!--通知预订人-->
 <view class="notice-opt" wx:if="{{bookInfo.status==1}}">
 <view class="notice-opt" wx:if="{{bookInfo.status==1}}">
-    <view class="notice-button white-font font34r flex-cc" bindtap="noticeCall">通知预订人</view>
+    <view class="notice-button-border font34r flex-lr">
+        <view bindtap="noticeCall">通知预订人</view>
+        <view wx:if="{{bookInfo.order && bookInfo.order.cookbooklist.length>0}}">
+            <formids bindclick="showOrder">查看菜品</formids>
+        </view>
+    </view>
     <view class="notice-button-border font34r flex-lr">
     <view class="notice-button-border font34r flex-lr">
         <view bindtap="gotoModify">变更预定</view>
         <view bindtap="gotoModify">变更预定</view>
         <view bindtap="cancelReserve">取消预定</view>
         <view bindtap="cancelReserve">取消预定</view>

@@ -112,7 +112,7 @@ view{
     color: #199095;
     color: #199095;
 }
 }
 .notice-button-border view{
 .notice-button-border view{
-    width: 49%;
+    width: 100%;
     border-right: 2rpx solid #199095;
     border-right: 2rpx solid #199095;
     text-align: center;
     text-align: center;
     height: 50rpx;
     height: 50rpx;

@@ -50,7 +50,7 @@
                     </view>
                     </view>
                     <view class="book-list" style="padding-bottom:118rpx;">
                     <view class="book-list" style="padding-bottom:118rpx;">
                          <view class="book-list-body">
                          <view class="book-list-body">
-                            <block wx:for="{{bookList}}">
+                            <block wx:for="{{bookList}}" wx:key="bookList.key">
                                 <bookList item="{{item}}" class="orderbook"></bookList>
                                 <bookList item="{{item}}" class="orderbook"></bookList>
                             </block>
                             </block>
                          </view>
                          </view>

@@ -31,7 +31,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 25,
+			"current": 15,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -74,7 +74,7 @@
 					"id": 6,
 					"id": 6,
 					"name": "pages/customer/index",
 					"name": "pages/customer/index",
 					"pathName": "pages/customer/index",
 					"pathName": "pages/customer/index",
-					"query": "id=1196&fromid=1111&hasInvitation=1",
+					"query": "id=1762&fromid=1111&hasInvitation=1",
 					"scene": "1044",
 					"scene": "1044",
 					"shareInfo": {
 					"shareInfo": {
 						"groupName": "测试模拟群1",
 						"groupName": "测试模拟群1",
@@ -156,7 +156,7 @@
 					"id": 15,
 					"id": 15,
 					"name": "预定本详情",
 					"name": "预定本详情",
 					"pathName": "pages/book/b_detail",
 					"pathName": "pages/book/b_detail",
-					"query": "id=1465",
+					"query": "id=1762",
 					"scene": "1001"
 					"scene": "1001"
 				},
 				},
 				{
 				{