xt / xcx-book · Commits

Go to a project

Commit 12531decdc86037b7fa0c19b974418ac3e910f96

Authored by zhangyan
2 parents be55ba24 26b97789

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 2 changed files with 12 additions and 8 deletions
@@ -53,8 +53,8 @@ Page({ @@ -53,8 +53,8 @@ Page({
53 [], 53 [],
54 ], 54 ],
55 timePickerIndex:[0,0,0], 55 timePickerIndex:[0,0,0],
  56 + tablesLength:0,
56 }, 57 },
57 - tablesAll:[],  
58 /** 58 /**
59 * 生命周期函数--监听页面加载 59 * 生命周期函数--监听页面加载
60 */ 60 */
@@ -213,16 +213,19 @@ Page({ @@ -213,16 +213,19 @@ Page({
213 tid:form.tabid, 213 tid:form.tabid,
214 }).then(res=>{ 214 }).then(res=>{
215 let tables=[]; 215 let tables=[];
  216 + let tablesLength=0;
216 res.data.forEach(p=>{ 217 res.data.forEach(p=>{
217 - if(tables.length>=3) return true; 218 + //if(tables.length>=3) return true;
218 p.list.forEach(t=>{ 219 p.list.forEach(t=>{
  220 + tablesLength++;
219 if(tables.length>=3) return true; 221 if(tables.length>=3) return true;
220 tables.push(t); 222 tables.push(t);
221 }) 223 })
222 }) 224 })
223 - this.tablesAll=res.data; 225 + this.tablesLength=tablesLength;
224 this.setData({ 226 this.setData({
225 - tables:tables 227 + tables:tables,
  228 + tablesLength:tablesLength
226 }) 229 })
227 }) 230 })
228 }catch (e){ 231 }catch (e){
@@ -290,7 +293,8 @@ Page({ @@ -290,7 +293,8 @@ Page({
290 [changeBg]: "#84e7d0" 293 [changeBg]: "#84e7d0"
291 }) 294 })
292 this.setDateStr(util.timetouUnix(event.detail.year+'/'+event.detail.month+'/'+event.detail.day)) 295 this.setDateStr(util.timetouUnix(event.detail.year+'/'+event.detail.month+'/'+event.detail.day))
293 - this.getTables() 296 + this.getTables();
  297 + this.calendarClose();
294 }, 298 },
295 calendarClose(){ 299 calendarClose(){
296 this.setData({ 300 this.setData({
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 88
89 <view class="page-full tables"> 89 <view class="page-full tables">
90 <view class="page"> 90 <view class="page">
91 - <view class="title">可订桌位<text wx:if="{{tables.length>0}}"> ({{tables.length}})</text></view> 91 + <view class="title">可订桌位<text wx:if="{{tables.length>0}}"> ({{tablesLength}})</text></view>
92 <view class="advice-desk-detail flex-lr" wx:if="{{tables.length>0}}"> 92 <view class="advice-desk-detail flex-lr" wx:if="{{tables.length>0}}">
93 <view class="flex-ll"> 93 <view class="flex-ll">
94 <block wx:for="{{tablesed||tables}}" wx:key="tables.key"> 94 <block wx:for="{{tablesed||tables}}" wx:key="tables.key">
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 </view> 113 </view>
114 </block> 114 </block>
115 </view> 115 </view>
116 - <view class="flex-rr advice-more" bindtap="selectdesk" wx:if="{{tables.length>3 || form.rid>0}}"> 116 + <view class="flex-rr advice-more" bindtap="selectdesk" wx:if="{{tablesLength>3 || form.rid>0}}">
117 <view style="padding-right:30rpx;" class="gray-deep-font font26r">更多</view> 117 <view style="padding-right:30rpx;" class="gray-deep-font font26r">更多</view>
118 <image src="../image/click.png" class="icon12-22"></image> 118 <image src="../image/click.png" class="icon12-22"></image>
119 </view> 119 </view>
@@ -168,8 +168,8 @@ @@ -168,8 +168,8 @@
168 </view> 168 </view>
169 <tabBar></tabBar> 169 <tabBar></tabBar>
170 <view class="calendar-mask" 170 <view class="calendar-mask"
171 - bindtap="calendarClose"  
172 style="left:{{calendarMask?0:-5000}}px;" wx:if="{{calendarMaskLoad}}"> 171 style="left:{{calendarMask?0:-5000}}px;" wx:if="{{calendarMaskLoad}}">
  172 + <view bindtap="calendarClose" style="width: 100%; height: 100%;"></view>
173 <calendar weeks-type="cn" 173 <calendar weeks-type="cn"
174 year="2018" 174 year="2018"
175 month="9" 175 month="9"