diff --git a/src/subpackage/common/pages/pay_type_select.vue b/src/subpackage/common/pages/pay_type_select.vue
index 60ea767..ec2f3b2 100644
--- a/src/subpackage/common/pages/pay_type_select.vue
+++ b/src/subpackage/common/pages/pay_type_select.vue
@@ -137,7 +137,9 @@ export default {
const eventChannel = this.getOpenerEventChannel();
// md0612 支付订单需求
eventChannel.on('emitFromSiteOrder', async data =>{
- this.depositOrderInfo = data?.depositInfo ?? null;
+ let _dpInfo = data?.depositInfo || null;
+ this.depositOrderInfo = _dpInfo;
+ if(_dpInfo?.order_no)this.payMethodsID = 5;
})
},
methods: {
diff --git a/src/subpackage/order/js/api.js b/src/subpackage/order/js/api.js
index aafc3db..cacf445 100644
--- a/src/subpackage/order/js/api.js
+++ b/src/subpackage/order/js/api.js
@@ -58,6 +58,7 @@ export const ORDER_API = {
// md 250612
orderPayinfo: `${ORIGIN}/admin/assistant/billing/order/payinfo`, // 【1001429】【收银系统】场时 - 支付信息
orderPay: `${ORIGIN}/admin/assistant/billing/order/pay`, // 【1001429】【收银系统】场时 - 支付
+ orderBfuend: `${ORIGIN}/admin/assistant/billing/order/bfuend`, // 【1001984】【商家助手】- 场时 - 用前结算结束订单
}
diff --git a/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue b/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
index 03ebd2d..3adf366 100644
--- a/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
+++ b/src/subpackage/order/pages/timekeeping/modules/order_list/site.vue
@@ -28,6 +28,7 @@
取消预约
结束计费
+ 提前结束订单
@@ -36,7 +37,10 @@
@@ -80,7 +132,7 @@ export default {
margin-top: 24upx;
@include ctf(flex-end);
.lb-item{
- width: 192upx;
+ padding: 0 20upx;
height: 80upx;
text-align: center;
border-radius: 10upx;
diff --git a/src/subpackage/order/pages/timekeeping/order_detail/site.vue b/src/subpackage/order/pages/timekeeping/order_detail/site.vue
index a8e34ab..74cba73 100644
--- a/src/subpackage/order/pages/timekeeping/order_detail/site.vue
+++ b/src/subpackage/order/pages/timekeeping/order_detail/site.vue
@@ -36,6 +36,10 @@
¥{{ orderInfo.amount || '0' }}
-¥{{ orderInfo.discount_amount || '0' }}
-¥{{ orderInfo.deduction_amount || '0' }}
+ -¥{{ orderInfo.deposit_deduction_amount || '0' }}
+
+ -¥{{ orderInfo.extension.meituan_args.meituan_coupon_deduction_amount || '0' }}
+
-¥{{ orderInfo.coupons_amount || '0' }}
diff --git a/src/subpackage/order/pages/timekeeping/order_list.vue b/src/subpackage/order/pages/timekeeping/order_list.vue
index ce02e6d..1de2ebd 100644
--- a/src/subpackage/order/pages/timekeeping/order_list.vue
+++ b/src/subpackage/order/pages/timekeeping/order_list.vue
@@ -14,7 +14,7 @@
-
+
@@ -123,6 +123,11 @@ export default {
})
},
methods: {
+ // 场地计时订单提前结束
+ siteOrderEndEarly(e, idx){
+ this.orderList[idx] = e;
+ this.$nextTick(this.$forceUpdate);
+ },
// 搜索订单
searchOrder(){
let { brand_id, order_type } = this;