diff --git a/public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.html b/public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.html index 36f1a3ecd..60faacdd6 100644 --- a/public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.html +++ b/public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.html @@ -12,9 +12,7 @@
-
- +
+
+
+
+ +
+
+ +
-
+
@@ -39,82 +48,61 @@ - + 订单编号 - + 商品 - + 核销数量 - + 就餐日期 - + 就餐时间 - + 就餐人 - + 就餐人电话 - + 核销时间 - - - - - - - - - - + 备注 - - - - - - - - {{reserveDining.goodsName}}({{reserveDining.goodsId}}) - - {{reserveDining.paramsName}} - {{reserveDining.paramWay == '1'?'日':'周'}} - - {{reserveDining.maxQuantity}} - {{reserveDining.hoursMaxQuantity}} - {{reserveDining.price}} - {{reserveDining.startDate}}~{{reserveDining.endDate}} - - {{reserveDining.startTime}} - {{reserveDining.sort}} - {{reserveDining.state=='1001'?'未上线':'上线'}} + + {{item.orderId}} + + {{item.goodsName}} + + + {{item.quantity}} + -
- -
-
- -
-
- -
+ {{item.appointmentTime}} + + + {{item.hours}} + + + {{item.personName}} + + + {{item.personTel}} + + + {{item.createTime}} + + + {{item.remark}} - diff --git a/public/pages/reserve/doDining/doDining.js b/public/pages/reserve/doDining/doDining.js index 39d9ec7d3..643bccdb9 100644 --- a/public/pages/reserve/doDining/doDining.js +++ b/public/pages/reserve/doDining/doDining.js @@ -8,6 +8,7 @@ data: { doDiningInfo: { reserveDinings: [], + orders:[], total: 0, records: 1, goodsId: '', @@ -25,9 +26,18 @@ }, _initMethod: function() { $that._listReserveDinings(1, 200); + + document.getElementById("qrCode").focus(); + // 心跳一直 保持 选中 + setInterval(function(){ + document.getElementById("qrCode").focus(); + },5000); + vc.component._listReserveConfirms(_currentPage, DEFAULT_ROWS); }, _initEvent: function() { - + vc.on('pagination', 'page_event', function(_currentPage) { + vc.component._listReserveConfirms(_currentPage, DEFAULT_ROWS); + }); }, methods: { @@ -53,10 +63,59 @@ }, _chooseDining: function(_dining) { $that.doDiningInfo.goodsId = _dining.goodsId; + document.getElementById("qrCode").focus(); }, _doDining: function() { - } + let _data = { + communityId:vc.getCurrentCommunity().communityId, + goodsId:$that.doDiningInfo.goodsId, + qrCode:$that.doDiningInfo.qrCode + } + + vc.http.apiPost( + '/reserveOrder.doDining', + JSON.stringify(_data), { + emulateJSON: true + }, + function(json, res) { + let _data = JSON.parse(json); + if (_data.code != 0) { + vc.toast(_data.msg); + return; + } + $that._listReserveConfirms(DEFAULT_PAGE,DEFAULT_ROWS); + }, + function(errInfo, error) { + console.log('请求失败处理'); + vc.toast(errInfo); + } + ); + }, + _listReserveConfirms: function(_page, _rows) { + $that.doDiningInfo.conditions.page = _page; + $that.doDiningInfo.conditions.row = _rows; + let param = { + params: $that.doDiningInfo.conditions + }; + //发送get请求 + vc.http.apiGet('/reserveOrder.listReserveGoodsConfirmOrder', + param, + function(json, res) { + let _doDiningInfo = JSON.parse(json); + $that.doDiningInfo.total = _doDiningInfo.total; + $that.doDiningInfo.records = _doDiningInfo.records; + $that.doDiningInfo.orders = _doDiningInfo.data; + vc.emit('pagination', 'init', { + total: $that.doDiningInfo.records, + currentPage: _page + }); + }, + function(errInfo, error) { + console.log('请求失败处理'); + } + ); + }, } }); })(window.vc); \ No newline at end of file