xt / xcx-book · Commits

Go to a project

Commit 9d52ea6403676d0dac2d7358b86220c557372a6e

Authored by yiren
1 parent 30095987
build: skipped

邀请函

Inline Side-by-side
Showing 3 changed files with 12 additions and 7 deletions
@@ -12,6 +12,7 @@ Page({ @@ -12,6 +12,7 @@ Page({
12 options: { 12 options: {
13 tplid: '' 13 tplid: ''
14 }, 14 },
  15 + tableNum:0,
15 detail:{}, 16 detail:{},
16 between: false, 17 between: false,
17 is_display:true, 18 is_display:true,
@@ -111,13 +112,16 @@ Page({ @@ -111,13 +112,16 @@ Page({
111 rid: this.data.options.id 112 rid: this.data.options.id
112 }).then(res => { 113 }).then(res => {
113 let tables = [], //桌子信息 114 let tables = [], //桌子信息
114 - regions = []; //区域名称 115 + regions = [],//区域名称
  116 + tableNum =0;
115 res.data.tables.forEach(t => { 117 res.data.tables.forEach(t => {
116 tables.push(t.name); 118 tables.push(t.name);
  119 + tableNum+=t.table_pnum*1
117 if (regions.indexOf('t.rname') == -1) { 120 if (regions.indexOf('t.rname') == -1) {
118 regions.push(t.rname); 121 regions.push(t.rname);
119 } 122 }
120 }) 123 })
  124 + console.log(tableNum);
121 let reserev = RS.reserve(res.data) 125 let reserev = RS.reserve(res.data)
122 let dateSmart 126 let dateSmart
123 if (res.data.type == 1) { 127 if (res.data.type == 1) {
@@ -132,6 +136,7 @@ Page({ @@ -132,6 +136,7 @@ Page({
132 } 136 }
133 this.setData({ 137 this.setData({
134 detail: this.formatDatail(reserev, dateSmart), 138 detail: this.formatDatail(reserev, dateSmart),
  139 + tableNum,
135 seller: { 140 seller: {
136 name: reserev.seller.sellername, 141 name: reserev.seller.sellername,
137 sid:reserev.sid, 142 sid:reserev.sid,
@@ -32,10 +32,10 @@ @@ -32,10 +32,10 @@
32 <view class="label">【包间】</view> 32 <view class="label">【包间】</view>
33 <view class="contentData">{{seller.region}}{{seller.room}}</view> 33 <view class="contentData">{{seller.region}}{{seller.room}}</view>
34 </view> 34 </view>
35 - <!-- <view class="flex-11" wx:if="{{reserve.numderPeople}}"> 35 + <view class="flex-11" wx:if="{{detail.actual_pum || tableNum}}">
36 <view class="label">【人数】</view> 36 <view class="label">【人数】</view>
37 - <view class="contentData">{{reserve.numderPeople}}位</view>  
38 - </view>--> 37 + <view class="contentData">{{detail.actual_pum?detail.actual_pum:tableNum}}位</view>
  38 + </view>
39 <!-- <view class="flex-11" wx:if="{{reserve.park_info || detail.seller.map_address}}"> 39 <!-- <view class="flex-11" wx:if="{{reserve.park_info || detail.seller.map_address}}">
40 <view class="label">【地址】</view> 40 <view class="label">【地址】</view>
41 <view class="contentData">{{reserve.address?reserve.address:detail.seller.map_address}}</view> 41 <view class="contentData">{{reserve.address?reserve.address:detail.seller.map_address}}</view>
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 </view> 67 </view>
68 </view> 68 </view>
69 <view class="positioning" bindtap="looklocation"> 69 <view class="positioning" bindtap="looklocation">
70 - <image src="https://qn.colorcun.com/1541679628682_.pic.jpg" mode="" /> 70 + <image src="https://qn.colorcun.com/WechatIMG256.png" mode="" />
71 <view class="name"> 71 <view class="name">
72 <text>{{seller.name?seller.name:reserve.seller_name}}</text> 72 <text>{{seller.name?seller.name:reserve.seller_name}}</text>
73 <text>{{reserve.address?reserve.address:detail.seller.map_address}}</text> 73 <text>{{reserve.address?reserve.address:detail.seller.map_address}}</text>
@@ -188,8 +188,8 @@ @@ -188,8 +188,8 @@
188 } 188 }
189 189
190 .positioning image { 190 .positioning image {
191 - width: 52rpx;  
192 - height: 61rpx; 191 + width: 72rpx;
  192 + height: 116rpx;
193 margin-right: 38rpx; 193 margin-right: 38rpx;
194 } 194 }
195 195