Commit a7434664aea69225d521fa42221808d8cfcae9be

Authored by wangfan
1 parent f261951b

测试接口 & 增加推荐区域

@@ -161,9 +161,9 @@ Page({ @@ -161,9 +161,9 @@ Page({
161 */ 161 */
162 onShow: function () { 162 onShow: function () {
163 //if(!this.reserve_id || util.cache('tableid').length>0){ 163 //if(!this.reserve_id || util.cache('tableid').length>0){
164 - if (util.cache('tableid').length > 0) { 164 + //if (util.cache('tableid').length > 0) {
165 this.getTables(); 165 this.getTables();
166 - } 166 + //}
167 setTimeout(() => { 167 setTimeout(() => {
168 this.setData({ 168 this.setData({
169 calendarMaskLoad: true, 169 calendarMaskLoad: true,
@@ -332,7 +332,9 @@ Page({ @@ -332,7 +332,9 @@ Page({
332 let tablesLength = 0; 332 let tablesLength = 0;
333 if (tableid.length > 0) { 333 if (tableid.length > 0) {
334 let toastTables={...this.checkedTables} 334 let toastTables={...this.checkedTables}
335 - res.data.forEach(p => { 335 + let resData=res.data.slice(1,res.data.length);
  336 + console.log('resData',resData)
  337 + resData.forEach(p => {
336 //if(tables.length>=3) return true; 338 //if(tables.length>=3) return true;
337 p.list.forEach(t => { 339 p.list.forEach(t => {
338 delete toastTables[t.id] 340 delete toastTables[t.id]
@@ -363,6 +365,7 @@ Page({ @@ -363,6 +365,7 @@ Page({
363 } 365 }
364 wx.removeStorage({key: 'tableid'}) 366 wx.removeStorage({key: 'tableid'})
365 } 367 }
  368 + console.log('tables',tables);
366 if(tables.length<1){ 369 if(tables.length<1){
367 tablesLength=0; 370 tablesLength=0;
368 tables_tmp = []; 371 tables_tmp = [];
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <image src="http://qn.colorcun.com/custom/lite-yd/image/reserve-status-{{bookInfo.status}}.png"></image> 13 <image src="http://qn.colorcun.com/custom/lite-yd/image/reserve-status-{{bookInfo.status}}.png"></image>
14 </view> 14 </view>
15 <view class="flex-lr order-detail"> 15 <view class="flex-lr order-detail">
16 - <view class="gray-deep-font font30r">预定座位</view> 16 + <view class="gray-deep-font font30r">预订座位</view>
17 <view class="black-font font34r">{{tables.length}}个</view> 17 <view class="black-font font34r">{{tables.length}}个</view>
18 </view> 18 </view>
19 <view class="flex-lr order-desk"> 19 <view class="flex-lr order-desk">
@@ -87,10 +87,10 @@ @@ -87,10 +87,10 @@
87 </view> 87 </view>
88 <view class="notice-button-border font34r flex-lr"> 88 <view class="notice-button-border font34r flex-lr">
89 <view> 89 <view>
90 - <formids bindclick="gotoModify">变更预定</formids> 90 + <formids bindclick="gotoModify">变更预订</formids>
91 </view> 91 </view>
92 <view > 92 <view >
93 - <formids bindclick="cancelReserve">取消预定</formids> 93 + <formids bindclick="cancelReserve">取消预订</formids>
94 </view> 94 </view>
95 <view> 95 <view>
96 <formids bindclick="startDinner" data-status="2">确认到店</formids> 96 <formids bindclick="startDinner" data-status="2">确认到店</formids>
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 46
47 <view class="book-list-thead flex-lr font34r black-font"> 47 <view class="book-list-thead flex-lr font34r black-font">
48 <view>桌号</view> 48 <view>桌号</view>
49 - <view class="flex-cc">预定人</view> 49 + <view class="flex-cc">预订人</view>
50 <view class="flex-cc" bindtap="timeorder">时间<image src="http://qn.colorcun.com/custom/lite-yd/image/direction.png" class="icon22-26" background-size="cover"></image></view> 50 <view class="flex-cc" bindtap="timeorder">时间<image src="http://qn.colorcun.com/custom/lite-yd/image/direction.png" class="icon22-26" background-size="cover"></image></view>
51 <view class="flex-rr">操作</view> 51 <view class="flex-rr">操作</view>
52 </view> 52 </view>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <view class="tip">在这里维护你的常用预订信息</view> 4 <view class="tip">在这里维护你的常用预订信息</view>
5 <view class="card"> 5 <view class="card">
6 <view class="item flex-lr"> 6 <view class="item flex-lr">
7 - <view class="item-label">预 定 人</view> 7 + <view class="item-label">预 订 人</view>
8 <view class="Medium flex-rr"> 8 <view class="Medium flex-rr">
9 <input class="name input" placeholder="请输入姓名" 9 <input class="name input" placeholder="请输入姓名"
10 bindinput="changeInput" 10 bindinput="changeInput"
1 //正式 1 //正式
2 var uri={ 2 var uri={
3 3
4 - HOST__LINE:'https://xt04.colorcun.com/?s=', 4 + HOST__LINE:'https://xt05.colorcun.com/?s=',
5 5
6 //获取商家信息 6 //获取商家信息
7 CGI__USER_GETSELLERBYID: 'App.Seller.GetSellerById', 7 CGI__USER_GETSELLERBYID: 'App.Seller.GetSellerById',