Commit c2c6b3e8f5edb21f52bf4abe456b49474e61c78b

Authored by wangfan
1 parent f84d0ee3

快速预定

... ... @@ -108,7 +108,7 @@ Page({
onShareAppMessage: function () {
return {
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){
... ...
... ... @@ -51,15 +51,15 @@
<view class="pages">
<view class="infos">
<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>
<view class="flex-lr item">
<view>人数:</view>
<view class="item-label">人数:</view>
<view class="">{{order.pnum||''}}</view>
</view>
<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>
</view>
... ...
... ... @@ -94,7 +94,11 @@
.infos .item:last-child{
border-bottom-width:0;
}
.infos .item-label{
min-width: 100rpx;
overflow: hidden;
white-space:nowrap;
}
.optx{
height: 96rpx;
line-height: 96rpx;
... ...
... ... @@ -175,5 +175,10 @@ Page({
}).then(()=>{
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')
});
},
})
\ No newline at end of file
... ...
... ... @@ -7,6 +7,7 @@
"step":"/components/book/step/step",
"board":"/components/book/board/board",
"cancel":"/components/book/reserveCancel/cancel",
"nav":"/components/nav/nav"
"nav":"/components/nav/nav",
"formids":"/components/formids/formids"
}
}
\ No newline at end of file
... ...
... ... @@ -77,7 +77,12 @@
<!--通知预订人-->
<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 bindtap="gotoModify">变更预定</view>
<view bindtap="cancelReserve">取消预定</view>
... ...
... ... @@ -112,7 +112,7 @@ view{
color: #199095;
}
.notice-button-border view{
width: 49%;
width: 100%;
border-right: 2rpx solid #199095;
text-align: center;
height: 50rpx;
... ...
... ... @@ -50,7 +50,7 @@
</view>
<view class="book-list" style="padding-bottom:118rpx;">
<view class="book-list-body">
<block wx:for="{{bookList}}">
<block wx:for="{{bookList}}" wx:key="bookList.key">
<bookList item="{{item}}" class="orderbook"></bookList>
</block>
</view>
... ...
... ... @@ -31,7 +31,7 @@
"list": []
},
"miniprogram": {
"current": 25,
"current": 15,
"list": [
{
"id": 0,
... ... @@ -74,7 +74,7 @@
"id": 6,
"name": "pages/customer/index",
"pathName": "pages/customer/index",
"query": "id=1196&fromid=1111&hasInvitation=1",
"query": "id=1762&fromid=1111&hasInvitation=1",
"scene": "1044",
"shareInfo": {
"groupName": "测试模拟群1",
... ... @@ -156,7 +156,7 @@
"id": 15,
"name": "预定本详情",
"pathName": "pages/book/b_detail",
"query": "id=1465",
"query": "id=1762",
"scene": "1001"
},
{
... ...