diff --git a/Utils/Api.js b/Utils/Api.js
index f58041d..63b247a 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -407,3 +407,8 @@ export const recover = params => {
export const getActivityAccount = params => {
return POST('GET', `${base}/rebateActivityAccount/getActivityAccount`, params).then(res => res.data);
}
+
+//退款
+export const refund = params => {
+ return POST('POST', `${base}/tradeOrderRefund/refund`, params).then(res => res.data);
+}
\ No newline at end of file
diff --git a/Utils/groupBuying.js b/Utils/groupBuying.js
index 33861b0..5e86f39 100644
--- a/Utils/groupBuying.js
+++ b/Utils/groupBuying.js
@@ -196,4 +196,13 @@ export const queryCurrentOrder = params => {
// 操作订单产品
export const operateOrderProduct = params => {
return POST('POST', `${base}/mealTableOrder/operateOrderProduct`, params).then(res => res.data);
+}
+
+//查询订单列表
+export const queryOrderList = params => {
+ return POST('GET', `${base}/mealTableOrder/queryOrderList`, params).then(res => res.data);
+}
+//查询订单详情
+export const queryOrderDetail = params => {
+ return POST('GET', `${base}/mealTableOrder/queryOrderDetail`, params).then(res => res.data);
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index a0d0d51..6b380a8 100644
--- a/pages.json
+++ b/pages.json
@@ -716,10 +716,15 @@
"navigationBarTitleText": "桌台信息"
}
},{
- "path":"groupBuyingConfiguration/tableMessage/editTableOrder",
+ "path":"groupBuyingConfiguration/scanOrderList/editTableOrder",
"style": {
"navigationBarTitleText": "修改订单"
}
+ },{
+ "path":"groupBuyingConfiguration/scanOrderList/scanOrderList",
+ "style": {
+ "navigationBarTitleText": "点餐订单"
+ }
}
]
diff --git a/pages/index/collectNotes/collectNotes.vue b/pages/index/collectNotes/collectNotes.vue
index 2785f94..75c0820 100644
--- a/pages/index/collectNotes/collectNotes.vue
+++ b/pages/index/collectNotes/collectNotes.vue
@@ -15,7 +15,14 @@
{{enddate}}
-
+
+ 订单类型 :
+
+ {{statusName}}
+ 请选择
+
+
业务员 :
-->
-
- 交易金额
-
-
- 交易笔数
-
+
+
+ 交易金额
+
+
+ 交易笔数
+
+
+
+
+ 退款金额
+
+
+ 退款笔数
+
+
@@ -148,6 +165,16 @@
salesmanList: [], //业务员列表
salesmanid: '', //业务员id
salesmanname: '', //业务员名称
+
+ status:3,//已支付的订单
+ statusName:"已支付",
+ statusList:[{
+ name:'已支付',
+ id:3
+ },{
+ name:'已退款',
+ id:6
+ }]
}
},
computed: {
@@ -171,6 +198,12 @@
if (this.userInfo.secUser.objectType == 4) {
this.getStoreListByMer(this.userInfo.mer.id);
}
+
+ },
+ onShow() {
+ this.pageNum = 1;
+ this.notesList = [];
+ this.isNoMoreData = false;
this.getTradeOrderList();
},
onReachBottom() {
@@ -286,7 +319,17 @@
this.isNoMoreData = false;
this.getTradeOrderList();
},
-
+ //订单类型
+ bindDateChange5(e){
+ console.log(this.statusList[e.target.value])
+ this.status = this.statusList[e.target.value].id;
+ this.statusName = this.statusList[e.target.value].name;
+ this.pageNum = 1;
+ this.notesList = [];
+ this.isNoMoreData = false;
+ this.getTradeOrderList();
+ },
+
toSearch() {
this.pageNum = 1;
this.notesList = [];
@@ -308,7 +351,7 @@
let endTime = b + 57599000;
let pagenum = this.pageNum;
let datas = {
- status: 3,
+ status: this.status,
payTimeS: startTime,
payTimeE: endTime,
outTradeNo: this.orderNo,
diff --git a/pages/index/order-list-details/order-list-details.vue b/pages/index/order-list-details/order-list-details.vue
index 320f02c..d8600c3 100644
--- a/pages/index/order-list-details/order-list-details.vue
+++ b/pages/index/order-list-details/order-list-details.vue
@@ -64,17 +64,32 @@
{{orderByOutTradeOrder.platformMerNo}}
+
+
+
+
+
+
+
+
+
+
+
@@ -123,4 +202,20 @@
padding: 30rpx 0 30rpx 20rpx;
border-bottom: 1px solid #f6f6f6;
}
+
+ .btn-fix{
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ padding: 10px 0;
+ .btn{
+ width: 70%;
+ color: white;
+ background-color: #089bf5;
+ border-radius: 6px;
+ height: 45px;
+ line-height: 45px;
+ }
+ }
\ No newline at end of file
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 87ee49c..d1e5e0a 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -161,7 +161,7 @@
url: '/subpackages/groupBuyingConfiguration/groupVerifyOrder/groupVerifyOrder',
img: '/static/img/apply.png'
},{
- title:'团购配置',
+ title:'扫码点餐',
url:"/subpackages/groupBuyingConfiguration/groupBuyingConfiguration?storeId="+this.userInfo.store.id,
img: '/static/img/home4.png'
}
diff --git a/subpackages/groupBuyingConfiguration/groupBuyingConfiguration.vue b/subpackages/groupBuyingConfiguration/groupBuyingConfiguration.vue
index 39634d6..292b3f2 100644
--- a/subpackages/groupBuyingConfiguration/groupBuyingConfiguration.vue
+++ b/subpackages/groupBuyingConfiguration/groupBuyingConfiguration.vue
@@ -11,9 +11,11 @@
+
+
\ No newline at end of file
diff --git a/subpackages/groupBuyingConfiguration/tableMessage/tableMessage.vue b/subpackages/groupBuyingConfiguration/tableMessage/tableMessage.vue
index 8d07f77..17efa99 100644
--- a/subpackages/groupBuyingConfiguration/tableMessage/tableMessage.vue
+++ b/subpackages/groupBuyingConfiguration/tableMessage/tableMessage.vue
@@ -161,7 +161,7 @@
},
filters: {
/* type:桌台状态 0：不可用 1：未开台 2：已开台 */
- /* 1:编辑，2:开台，3：关台，4：删除，5查看订单 */
+ /* 1:编辑，2:开台，3：关台，4：删除， */
filterDataList(type) {
switch (type) {
case 0:
@@ -193,10 +193,7 @@
}, {
id: 4,
text: '删除',
- }, {
- id: 5,
- text: '订单',
- }, ];
+ } ];
default:
return [{
id: 1,
@@ -237,16 +234,10 @@
this.endTableMethod(item)
}else if (data.id == 4) { //删除
this.toDeleteTable(item)
- }else if(data.id == 5){
- this.goEditTableOrder(item)
}
console.log(data, item)
},
- goEditTableOrder(item){
- uni.navigateTo({
- url:`./editTableOrder?storeId=${item.storeId}&serialNumber=${item.serialNumber}`
- })
- },
+
/* 开台 -确认 pupup-回调 */
dialogOpenTableConfirm(e){
let reg = /^\+?[1-9][0-9]*$/;