xt / xcx-book · Commits

Go to a project

Commit e4d279b9320e01f04b91ec16ca135e8c411dea5c

Authored by vking
1 parent 59d37a22

商户在线预订展示调整

Inline Side-by-side
Showing 8 changed files with 55 additions and 9 deletions
@@ -32,6 +32,10 @@ Component({ @@ -32,6 +32,10 @@ Component({
32 type:String, 32 type:String,
33 value:'', 33 value:'',
34 }, 34 },
  35 + roomDemand:{
  36 + type:Boolean,
  37 + value:false
  38 + },
35 }, 39 },
36 40
37 /** 41 /**
@@ -4,7 +4,14 @@ @@ -4,7 +4,14 @@
4 bindtap="boardClick"> 4 bindtap="boardClick">
5 <view class="info"> 5 <view class="info">
6 <view class="name">{{board.name}}</view> 6 <view class="name">{{board.name}}</view>
7 - <view class="pnum" style="{{board.reserve_name?'color:#199095;':''}}"> 7 + <block wx:if="{{roomDemand}}">
  8 + <view class="pnum" wx:if="{{board.max>0}}">最多可坐{{board.max}}人</view>
  9 + <view class="low" wx:if="{{board.low>0}}">
  10 + <view>最低消费</view>
  11 + <view>{{board.low}}元</view>
  12 + </view>
  13 + </block>
  14 + <view class="pnum" wx:else="" style="{{board.reserve_name?'color:#199095;':''}}">
8 {{board.reserve_name?board.reserve_name:(board.table_pnum+((board.most_pnum*1>board.table_pnum*1)?'-'+board.most_pnum:'')+'人')}} 15 {{board.reserve_name?board.reserve_name:(board.table_pnum+((board.most_pnum*1>board.table_pnum*1)?'-'+board.most_pnum:'')+'人')}}
9 </view> 16 </view>
10 </view> 17 </view>
@@ -39,7 +39,6 @@ @@ -39,7 +39,6 @@
39 } 39 }
40 .board .info{ 40 .board .info{
41 text-align: center; 41 text-align: center;
42 - width: 80%;  
43 margin: -10rpx 10% 0; 42 margin: -10rpx 10% 0;
44 color: #353535; 43 color: #353535;
45 } 44 }
@@ -55,6 +54,14 @@ @@ -55,6 +54,14 @@
55 overflow: hidden; 54 overflow: hidden;
56 max-height: 50rpx; 55 max-height: 50rpx;
57 line-height: 26rpx; 56 line-height: 26rpx;
  57 + white-space:nowrap;
  58 +}
  59 +.board .low{
  60 + font-size: 20rpx;
  61 + overflow: hidden;
  62 + line-height: 28rpx;
  63 + white-space:nowrap;
  64 + color: #199095;
58 } 65 }
59 66
60 .board.highlight .status,.board.disabled-highlight .status{ 67 .board.highlight .status,.board.disabled-highlight .status{
@@ -81,4 +88,7 @@ @@ -81,4 +88,7 @@
81 } 88 }
82 .board.noBottom .pnum{ 89 .board.noBottom .pnum{
83 margin-top: 20rpx; 90 margin-top: 20rpx;
  91 +}
  92 +.board.noBottom .low{
  93 + margin-top: 0rpx;
84 } 94 }
1 var util = require('../../../utils/util.js') 1 var util = require('../../../utils/util.js')
2 var uri = require('../../../utils/uri.js') 2 var uri = require('../../../utils/uri.js')
3 import App from '../../../utils/api'; 3 import App from '../../../utils/api';
  4 +import RS from '../../../utils/reserveStatus'
4 5
5 const {regeneratorRuntime} = global 6 const {regeneratorRuntime} = global
6 import TP from '../../../utils/tpls'; 7 import TP from '../../../utils/tpls';
@@ -152,11 +153,11 @@ Page({ @@ -152,11 +153,11 @@ Page({
152 if (res.data.status == 4 && res.data.cancel) { 153 if (res.data.status == 4 && res.data.cancel) {
153 res.data.cancel.cdateStr = util.unixtoTime(res.data.cancel.cdate, "YYYY.MM.DD HH:II") 154 res.data.cancel.cdateStr = util.unixtoTime(res.data.cancel.cdate, "YYYY.MM.DD HH:II")
154 } 155 }
155 - this.detailData = res.data; 156 + this.detailData = RS.reserve(res.data);
156 157
157 this.setData({ 158 this.setData({
158 tables: res.data.tables, 159 tables: res.data.tables,
159 - bookInfo: res.data, 160 + bookInfo: this.detailData,
160 }) 161 })
161 }, 162 },
162 gotoModify() { 163 gotoModify() {
@@ -5,23 +5,36 @@ @@ -5,23 +5,36 @@
5 <view class="gray-deep-font font30r">到店时间</view> 5 <view class="gray-deep-font font30r">到店时间</view>
6 <view class="black-font font34r">{{bookInfo.rdateStr}}</view> 6 <view class="black-font font34r">{{bookInfo.rdateStr}}</view>
7 </view> 7 </view>
8 - <view class="flex-lr order-detail"> 8 + <view class="flex-lr order-detail" wx:if="{{bookInfo.type==1}}">
  9 + <view class="gray-deep-font font30r">包间需求</view>
  10 + <view class="black-font font34r">{{bookInfo.room_demand.length}}个</view>
  11 + </view>
  12 + <view class="flex-lr order-detail" wx:else="">
9 <view class="gray-deep-font font30r">用餐人数</view> 13 <view class="gray-deep-font font30r">用餐人数</view>
10 <view class="black-font font34r">{{bookInfo.pnum_str||bookInfo.pnum}}人</view> 14 <view class="black-font font34r">{{bookInfo.pnum_str||bookInfo.pnum}}人</view>
11 </view> 15 </view>
12 <view class="reserve-status-tip" wx:if="{{bookInfo.status!=null}}"> 16 <view class="reserve-status-tip" wx:if="{{bookInfo.status!=null}}">
13 <image src="http://qn.colorcun.com/custom/lite-yd/image/reserve-status-{{bookInfo.status}}.png"></image> 17 <image src="http://qn.colorcun.com/custom/lite-yd/image/reserve-status-{{bookInfo.status}}.png"></image>
14 </view> 18 </view>
  19 + <view class="flex-lr order-desk">
  20 + <view class="flex-re" style="width:100%;flex-wrap:wrap;">
  21 + <block wx:for="{{bookInfo.room_demand}}" wx:key="tables.key">
  22 + <board width="160" height="180" board="{{item}}"
  23 + roomDemand
  24 + className="noBottom"
  25 + style="margin-left:20rpx; margin-bottom: 20rpx;"></board>
  26 + </block>
  27 + </view>
  28 + </view>
15 <view class="flex-lr order-detail"> 29 <view class="flex-lr order-detail">
16 <view class="gray-deep-font font30r">预订座位</view> 30 <view class="gray-deep-font font30r">预订座位</view>
17 <view class="black-font font34r">{{tables.length}}个</view> 31 <view class="black-font font34r">{{tables.length}}个</view>
18 </view> 32 </view>
19 <view class="flex-lr order-desk"> 33 <view class="flex-lr order-desk">
20 - <view class="gray-deep-font font30r"></view>  
21 <view class="flex-re" style="width:100%;flex-wrap:wrap;"> 34 <view class="flex-re" style="width:100%;flex-wrap:wrap;">
22 <block wx:for="{{tables}}" wx:key="tables.key"> 35 <block wx:for="{{tables}}" wx:key="tables.key">
23 <board width="160" height="180" board="{{item}}" className="noBottom" 36 <board width="160" height="180" board="{{item}}" className="noBottom"
24 - style="margin-left:20rpx;zoom: 0.8; margin-bottom: 20rpx;"></board> 37 + style="margin-left:20rpx; margin-bottom: 20rpx;"></board>
25 </block> 38 </block>
26 </view> 39 </view>
27 </view> 40 </view>
@@ -81,7 +94,7 @@ @@ -81,7 +94,7 @@
81 <view style="height: 250rpx;"></view> 94 <view style="height: 250rpx;"></view>
82 95
83 <!--通知预订人--> 96 <!--通知预订人-->
84 -<view class="notice-opt" wx:if="{{bookInfo.status==1}}"> 97 +<view class="notice-opt" wx:if="{{bookInfo.hasRunning}}">
85 <view class="notice-button-border font34r flex-lr"> 98 <view class="notice-button-border font34r flex-lr">
86 <view> 99 <view>
87 <formids bindclick="noticeCall">通知客户</formids> 100 <formids bindclick="noticeCall">通知客户</formids>
@@ -131,4 +131,7 @@ view{ @@ -131,4 +131,7 @@ view{
131 .reserve-status-tip image{ 131 .reserve-status-tip image{
132 width: 100%; 132 width: 100%;
133 height: 100%; 133 height: 100%;
  134 +}
  135 +.gray-deep-font{
  136 + min-width: 140rpx;
134 } 137 }
@@ -352,7 +352,7 @@ @@ -352,7 +352,7 @@
352 "id": 39, 352 "id": 39,
353 "name": "pages/reserve/detail 在线订座 ", 353 "name": "pages/reserve/detail 在线订座 ",
354 "pathName": "pages/reserve/detail", 354 "pathName": "pages/reserve/detail",
355 - "query": "id=1&fromid=&activeTab=reserve", 355 + "query": "id=80&fromid=&activeTab=reserve",
356 "scene": null 356 "scene": null
357 }, 357 },
358 { 358 {
@@ -494,6 +494,13 @@ @@ -494,6 +494,13 @@
494 "pathName": "pack-book/pages/book/roomtype/roomtype", 494 "pathName": "pack-book/pages/book/roomtype/roomtype",
495 "query": "seller_id=154", 495 "query": "seller_id=154",
496 "scene": null 496 "scene": null
  497 + },
  498 + {
  499 + "id": 60,
  500 + "name": "pack-book/pages/book/b_detail",
  501 + "pathName": "pack-book/pages/book/b_detail",
  502 + "query": "id=30711",
  503 + "scene": null
497 } 504 }
498 ] 505 ]
499 } 506 }
@@ -41,6 +41,7 @@ export default { @@ -41,6 +41,7 @@ export default {
41 let ns = new Date() / 1000 41 let ns = new Date() / 1000
42 let flag=true; 42 let flag=true;
43 if(detail.status==0 || detail.status==6 || detail.status==4) return false//未进行状态 43 if(detail.status==0 || detail.status==6 || detail.status==4) return false//未进行状态
  44 + if(detail.status==3) return false //用餐完成（离店）
44 if(ns > detail.edate) return false//超时 45 if(ns > detail.edate) return false//超时
45 return flag 46 return flag
46 } 47 }