xt / xcx-book · Commits

Go to a project

Commit 647b3b2c8cb60357b5a0f25642ef27235f3d20d3

Authored by vking
1 parent 4312e8ae
build: skipped

online

Inline Side-by-side
Showing 4 changed files with 12 additions and 3 deletions
@@ -74,7 +74,7 @@ Component({ @@ -74,7 +74,7 @@ Component({
74 if (this.data.detail.tableFirst) { 74 if (this.data.detail.tableFirst) {
75 tableSubInfo = (this.data.detail.tableFirst || '') + ' ' + (this.data.detail.tableSubInfo || ''); 75 tableSubInfo = (this.data.detail.tableFirst || '') + ' ' + (this.data.detail.tableSubInfo || '');
76 tableFirst = this.data.detail.tableFirst 76 tableFirst = this.data.detail.tableFirst
77 - } else { 77 + } else if(this.data.detail.tables) {
78 tableFirst = this.data.detail.tables[0].name 78 tableFirst = this.data.detail.tables[0].name
79 tableSubInfo = this.data.detail.tables[0].name; 79 tableSubInfo = this.data.detail.tables[0].name;
80 if (this.data.detail.tables.length > 1) { 80 if (this.data.detail.tables.length > 1) {
@@ -20,7 +20,11 @@ @@ -20,7 +20,11 @@
20 <view class="value">{{rdateStr}}</view> 20 <view class="value">{{rdateStr}}</view>
21 </view> 21 </view>
22 <view class="line"></view> 22 <view class="line"></view>
23 - <view class="right info Medium"> 23 + <view class="right info Medium" wx:if="{{hasOnlineReserve}}">
  24 + <view class="label">人数</view>
  25 + <view class="value">{{detail.pnum}}人包间</view>
  26 + </view>
  27 + <view class="right info Medium" wx:else="">
24 <view class="label">包间{{detail.tables.length>1?(" ("+detail.tables.length+"个)"):""}}</view> 28 <view class="label">包间{{detail.tables.length>1?(" ("+detail.tables.length+"个)"):""}}</view>
25 <view class="value">{{tableFirst}}</view> 29 <view class="value">{{tableFirst}}</view>
26 </view> 30 </view>
@@ -14,6 +14,7 @@ Page({ @@ -14,6 +14,7 @@ Page({
14 */ 14 */
15 data: { 15 data: {
16 seller:null, 16 seller:null,
  17 + detail:null,
17 user:_u, 18 user:_u,
18 }, 19 },
19 20
@@ -82,6 +83,10 @@ Page({ @@ -82,6 +83,10 @@ Page({
82 let seller = res.data 83 let seller = res.data
83 this.setData({ 84 this.setData({
84 seller: seller, 85 seller: seller,
  86 + detail:{
  87 + ddate:options.ddate,
  88 + pnum:options.pnum,
  89 + }
85 }) 90 })
86 } 91 }
87 }) 92 })
@@ -460,7 +460,7 @@ @@ -460,7 +460,7 @@
460 "id": 55, 460 "id": 55,
461 "name": "pages/reserve/submit", 461 "name": "pages/reserve/submit",
462 "pathName": "pages/reserve/submit", 462 "pathName": "pages/reserve/submit",
463 - "query": "sid=1", 463 + "query": "sid=1&ddate=1234567890&pnum=10",
464 "scene": null 464 "scene": null
465 } 465 }
466 ] 466 ]