diff --git a/app.js b/app.js index 2f1c18d48..3aa078f84 100644 --- a/app.js +++ b/app.js @@ -36,12 +36,12 @@ let opts = { //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); +app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); +app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); -app.use('/callComponent',proxy('http://192.168.1.16:8012',opts)); -app.use('/app',proxy('http://192.168.1.16:8012',opts)); +//app.use('/callComponent',proxy('http://192.168.1.16:8012',opts)); +//app.use('/app',proxy('http://192.168.1.16:8012',opts)); //app.listen(3000); app.use(express.json()); diff --git a/public/components/property/carCreateFeeAdd/carCreateFeeAdd.js b/public/components/property/carCreateFeeAdd/carCreateFeeAdd.js index fdf78c0da..1f1bfeaee 100644 --- a/public/components/property/carCreateFeeAdd/carCreateFeeAdd.js +++ b/public/components/property/carCreateFeeAdd/carCreateFeeAdd.js @@ -14,7 +14,7 @@ carState:'SH', isMore:false, locationTypeCdName:'', - startTime:'' + startTime: vc.dateTimeFormat(new Date().getTime()) } }, _initMethod: function() { @@ -155,6 +155,7 @@ carState:'SH', isMore:false, locationTypeCdName:'', + startTime: vc.dateTimeFormat(new Date().getTime()) }; vc.component.carCreateFeeAddInfo.feeTypeCds = _feeTypeCds; diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js index d09020c50..4cb5c88cc 100644 --- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js +++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js @@ -18,7 +18,7 @@ roomState: ['2001'], isMore: false, locationTypeCdName: '', - startTime:'' + startTime: vc.dateTimeFormat(new Date().getTime()) } }, _initMethod: function () { @@ -189,7 +189,7 @@ roomState: ['2001'], isMore: false, locationTypeCdName: '', - startTime:'' + startTime: vc.dateTimeFormat(new Date().getTime()) }; vc.component.roomCreateFeeAddInfo.feeTypeCds = _feeTypeCds; diff --git a/public/pages/admin/orderDetailManage/orderDetailManage.html b/public/pages/admin/orderDetailManage/orderDetailManage.html index e1b7cf7e7..00947db30 100644 --- a/public/pages/admin/orderDetailManage/orderDetailManage.html +++ b/public/pages/admin/orderDetailManage/orderDetailManage.html @@ -2,7 +2,7 @@
-
订单明细
+
受理单明细
+
+
+
+ + diff --git a/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js b/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js new file mode 100644 index 000000000..3a6d053fc --- /dev/null +++ b/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js @@ -0,0 +1,68 @@ +//订单查询 +(function(vc){ + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data:{ + storeOrderCartManageInfo:{ + orderCarts:[], + total:0, + records:1, + orderDetail:false, + conditions:{ + oId:'', + extTransactionId:'', + orderTypeCd:'', + appId:'', + } + } + }, + _initMethod:function(){ + vc.component._listOrders(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent:function(){ + vc.on('storeOrderCartManage','goBack',function(_param){ + vc.component.storeOrderCartManageInfo.orderDetail = false; + }); + vc.on('pagination','page_event',function(_currentPage){ + vc.component._listOrders(_currentPage,DEFAULT_ROWS); + }); + }, + methods:{ + _listOrders:function(_page, _rows){ + vc.component.storeOrderCartManageInfo.conditions.page = _page; + vc.component.storeOrderCartManageInfo.conditions.row = _rows; + var param = { + params:vc.component.storeOrderCartManageInfo.conditions + }; + //发送get请求 + vc.http.get('cstoreOrderCartManage', + 'list', + param, + function(json,res){ + var _storeOrderCartManageInfo=JSON.parse(json); + vc.component.storeOrderCartManageInfo.total = _storeOrderCartManageInfo.total; + vc.component.storeOrderCartManageInfo.records = _storeOrderCartManageInfo.records; + vc.component.storeOrderCartManageInfo.orderCarts = _storeOrderCartManageInfo.corderDataVos; + vc.component.storeOrderCartManageInfo.orderCarts.map(item=>{ + item.requestTime=item.requestTime.substring(0,4)+"-"+item.requestTime.substring(4,6)+"-"+item.requestTime.substring(6,8)+" "+item.requestTime.substring(8,10)+":"+item.requestTime.substring(10,12)+":"+item.requestTime.substring(12,14) + }) + vc.emit('pagination','init',{ + total:vc.component.storeOrderCartManageInfo.records, + currentPage:_page + }); + },function(errInfo,error){ + console.log('请求失败处理'); + } + ); + }, + _queryOrdersMethod:function(){ + vc.component._listOrders(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _openOrderDetailModel:function(_order){ + vc.component.storeOrderCartManageInfo.orderDetail = true; + vc.emit('orderDetailManage','listOrderDetails',_order.cBusiness); + } + } + }); +})(window.vc);