Commit b35957a64e32dc8a369d8e9ba2b02def1bb8a624

Authored by vking
1 parent 81cc9f1b

迁移到New接口,使用ddate_solt

@@ -481,9 +481,10 @@ Page({ @@ -481,9 +481,10 @@ Page({
481 sid: util.cache('enter_params')['seller_id'], 481 sid: util.cache('enter_params')['seller_id'],
482 //pnum_str:form.pnum_str, 482 //pnum_str:form.pnum_str,
483 pnum: form.pnum, 483 pnum: form.pnum,
484 - rdate: rdate, 484 + rdate: util.unixtoTime(rdate.substr(0,10),'YYYYMMDD'),
485 tid: form.tabid, 485 tid: form.tabid,
486 rid: this.reserve_id, 486 rid: this.reserve_id,
  487 + ddate_solt:parseInt(form.time)+1
487 }).then(res => { 488 }).then(res => {
488 let tables = []; 489 let tables = [];
489 let tablesLength = 0; 490 let tablesLength = 0;
@@ -602,6 +603,7 @@ Page({ @@ -602,6 +603,7 @@ Page({
602 form.ddate = util.timetouUnix(ddateStr); 603 form.ddate = util.timetouUnix(ddateStr);
603 } 604 }
604 form.ddate_solt=form.time+1 605 form.ddate_solt=form.time+1
  606 + form.is_set_ddate=1
605 App.Reserve.SetReserveInfo(form).then(res => { 607 App.Reserve.SetReserveInfo(form).then(res => {
606 if (res.ret == 200) { 608 if (res.ret == 200) {
607 this.getCustomRemark() 609 this.getCustomRemark()
@@ -691,6 +693,7 @@ Page({ @@ -691,6 +693,7 @@ Page({
691 + '&pnum=' + this.data.form.pnum 693 + '&pnum=' + this.data.form.pnum
692 + '&checked_tids=' + this.data.form.tid 694 + '&checked_tids=' + this.data.form.tid
693 + '&rid=' + this.reserve_id 695 + '&rid=' + this.reserve_id
  696 + + '&ddate_solt='+(this.data.form.time+1)
694 }) 697 })
695 }, 698 },
696 conditionInfo: function () { 699 conditionInfo: function () {
@@ -13,7 +13,7 @@ Page({ @@ -13,7 +13,7 @@ Page({
13 options:null, 13 options:null,
14 onLoad: function (opt) { 14 onLoad: function (opt) {
15 console.log('onLoad', opt) 15 console.log('onLoad', opt)
16 - wx.removeStorageSync({key: 'tableid'}) 16 + wx.removeStorageSync('tableid')
17 this.options=opt; 17 this.options=opt;
18 var radio = 750 / util.getsystem().windowWidth; 18 var radio = 750 / util.getsystem().windowWidth;
19 var contentHeight = util.getsystem().windowHeight - Math.ceil(350 / radio); 19 var contentHeight = util.getsystem().windowHeight - Math.ceil(350 / radio);
@@ -112,13 +112,13 @@ Page({ @@ -112,13 +112,13 @@ Page({
112 }, 112 },
113 async getbooklist(){ 113 async getbooklist(){
114 let obj={}; 114 let obj={};
115 -  
116 let formdata={}; 115 let formdata={};
117 formdata.sid=this.sellerid; 116 formdata.sid=this.sellerid;
118 formdata.x=1; 117 formdata.x=1;
119 formdata.y=200; 118 formdata.y=200;
120 - formdata.rdate=this.options.rdate;  
121 formdata.status='1,2,5'; 119 formdata.status='1,2,5';
  120 + formdata.rdate=util.unixtoTime(this.options.rdate.substr(0,10),"YYYYMMDD");
  121 + formdata.ddate_solt=this.options.ddate_solt
122 let tids={}; 122 let tids={};
123 let reserves=await App.Reserve.GetReserveList(formdata); 123 let reserves=await App.Reserve.GetReserveList(formdata);
124 if(reserves.data.length>0){ 124 if(reserves.data.length>0){
@@ -128,7 +128,8 @@ Page({ @@ -128,7 +128,8 @@ Page({
128 formdata.x=1; 128 formdata.x=1;
129 formdata.y=200; 129 formdata.y=200;
130 let rdate=await bookOrder.getTimeSpace(this.data.dateStr,time,null,null,this.YYYY); 130 let rdate=await bookOrder.getTimeSpace(this.data.dateStr,time,null,null,this.YYYY);
131 - formdata.rdate=rdate; 131 + formdata.rdate=util.unixtoTime(rdate.substr(0,10),"YYYYMMDD");
  132 + formdata.ddate_solt=parseInt(time)+1
132 if(isExport){ 133 if(isExport){
133 this.__exportFile(formdata); 134 this.__exportFile(formdata);
134 }else{ 135 }else{
@@ -483,9 +483,10 @@ Page({ @@ -483,9 +483,10 @@ Page({
483 sid: util.cache('enter_params')['seller_id'], 483 sid: util.cache('enter_params')['seller_id'],
484 //pnum_str:form.pnum_str, 484 //pnum_str:form.pnum_str,
485 pnum: form.pnum, 485 pnum: form.pnum,
486 - rdate: rdate, 486 + rdate: util.unixtoTime(rdate.substr(0,10),'YYYYMMDD'),
487 tid: form.tabid, 487 tid: form.tabid,
488 rid: this.reserve_id, 488 rid: this.reserve_id,
  489 + ddate_solt:parseInt(form.time)+1
489 }).then(res => { 490 }).then(res => {
490 let tables = []; 491 let tables = [];
491 let tablesLength = 0; 492 let tablesLength = 0;
@@ -691,6 +692,7 @@ Page({ @@ -691,6 +692,7 @@ Page({
691 + '&pnum=' + this.data.form.pnum 692 + '&pnum=' + this.data.form.pnum
692 + '&checked_tids=' + this.data.form.tid 693 + '&checked_tids=' + this.data.form.tid
693 + '&rid=' + this.reserve_id 694 + '&rid=' + this.reserve_id
  695 + + '&ddate_solt='+(this.data.form.time+1)
694 }) 696 })
695 }, 697 },
696 conditionInfo: function () { 698 conditionInfo: function () {
@@ -522,6 +522,27 @@ @@ -522,6 +522,27 @@
522 "pathName": "pages/customer/list", 522 "pathName": "pages/customer/list",
523 "query": "hasRelaTip=1", 523 "query": "hasRelaTip=1",
524 "scene": null 524 "scene": null
  525 + },
  526 + {
  527 + "id": 64,
  528 + "name": "pack-book/pages/book/b_addnew 桌位进入",
  529 + "pathName": "pack-book/pages/book/b_addnew",
  530 + "query": "hasQuick=1&tid=487&tname=%E5%A4%A7%E5%8E%85%E4%B8%80&pnum=4&ddate=1574676000-1574694000",
  531 + "scene": null
  532 + },
  533 + {
  534 + "id": 65,
  535 + "name": "pack-book/pages/book/online_update",
  536 + "pathName": "pack-book/pages/book/online_update",
  537 + "query": "id=43762",
  538 + "scene": null
  539 + },
  540 + {
  541 + "id": -1,
  542 + "name": "pages/customer/detail_owner_invitation",
  543 + "pathName": "pages/customer/detail_owner_invitation",
  544 + "query": "id=43762&hasInvitation=1&hasSellerShare=1&tplid=1",
  545 + "scene": null
525 } 546 }
526 ] 547 ]
527 } 548 }
@@ -56,6 +56,7 @@ export default { @@ -56,6 +56,7 @@ export default {
56 //预订列表 56 //预订列表
57 'App.Reserve.GetReserveList': { 57 'App.Reserve.GetReserveList': {
58 silence: false, 58 silence: false,
  59 + alias:'App.Reserve.NewGetReserveList'
59 }, 60 },
60 61
61 //地图页-商家 62 //地图页-商家
@@ -73,6 +74,16 @@ export default { @@ -73,6 +74,16 @@ export default {
73 cachetime: 60, 74 cachetime: 60,
74 }, 75 },
75 76
  77 + //获得推荐桌位
  78 + 'App.Reserve.GetTableList':{
  79 + alias:'App.Reserve.NewGetTableList'
  80 + },
  81 +
  82 + //录入预订
  83 + 'App.Reserve.SetReserveInfo':{
  84 + alias:'App.Reserve.NewSetReserveInfo'
  85 + },
  86 +
76 // 修改当前预订状态 0:待确认,1:已定座,2:确认到店,3:用餐完成 87 // 修改当前预订状态 0:待确认,1:已定座,2:确认到店,3:用餐完成
77 'App.Reserve.SetReserveStatus': { 88 'App.Reserve.SetReserveStatus': {
78 silence: false, 89 silence: false,
@@ -98,6 +109,7 @@ export default { @@ -98,6 +109,7 @@ export default {
98 //导出 109 //导出
99 'App.Reserve.ExportReserve': { 110 'App.Reserve.ExportReserve': {
100 silence: false, 111 silence: false,
  112 + alias:'App.Reserve.NewExportReserve'
101 }, 113 },
102 114
103 //查询短信剩余及套餐 115 //查询短信剩余及套餐