From 6d8d46763b95d2feec512390b4c56f326f9f4eee Mon Sep 17 00:00:00 2001
From: 1019933623 <1019933623@qq.com>
Date: Wed, 21 Apr 2021 15:49:06 +0800
Subject: [PATCH] fix bug
---
src/components/timing_order/timing_order.vue | 2 +-
src/pages/order_search/order_search.vue | 5 ++++-
.../reservation_people_detail.vue | 22 +++++++++++++++-------
.../reservation_site_detail.vue | 2 +-
.../device/pages/order_manage/order_manage.vue | 3 ++-
5 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/components/timing_order/timing_order.vue b/src/components/timing_order/timing_order.vue
index 1b6d1c1..7d1b965 100644
--- a/src/components/timing_order/timing_order.vue
+++ b/src/components/timing_order/timing_order.vue
@@ -26,7 +26,7 @@
-
+
实付款 ¥{{orderInfo.pay_amount || 0}}
diff --git a/src/pages/order_search/order_search.vue b/src/pages/order_search/order_search.vue
index 05fae3b..9b651c7 100644
--- a/src/pages/order_search/order_search.vue
+++ b/src/pages/order_search/order_search.vue
@@ -17,6 +17,7 @@
+
@@ -27,7 +28,7 @@
import reservation_order from '../../components/reservation_order/reservation_order';
import integral_order from '../../components/integral_order/integral_order';
import membership_order from '../../components/membership_order/membership_order';
-
+import timing_order from '../../components/timing_order/timing_order.vue'
import { API } from '../../js/api';
import { servers } from '../../js/server';
import util from '../../utils/util';
@@ -38,6 +39,7 @@ export default {
'reservation-order': reservation_order,
'membership-order': membership_order,
'integral-order': integral_order,
+ 'timing-order': timing_order,
},
computed: {
...mapState(['brandInfo']),
@@ -88,6 +90,7 @@ export default {
if(type == 3)return API.reservationOrder;
if(type == 4)return API.membershipOrder;
if(type == 5)return API.integralOrder;
+ if(type == 1)return API.timeOrder;
},
getOrderList({
key = "",
diff --git a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
index 446a124..e521190 100644
--- a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
+++ b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
@@ -46,7 +46,7 @@
验证码{{i+1}}：
- {{e.verify_code || '-'}} ({{zh_verify_status(e.status)}})
+ {{e.verify_code || '-'}} ({{zh_verify_status(e.status)}})
核销方式：{{zh_verify_type(e.verify_type)}}
核销时间：{{e.verify_time || '-'}}
@@ -64,7 +64,7 @@
数量：{{orderInfo.number || 0}}
- 类型：{{ zh_spec_names }}
+ 类型：{{ zh_spec_names || '-'}}
@@ -77,7 +77,7 @@
折扣金额
- -¥{{orderInfo.deduction_amount || 0}}
+ -¥{{orderInfo.discount_amount || 0}}
优惠券优惠
@@ -136,13 +136,13 @@
筛选卡号
-
+
-
+
@@ -240,7 +240,7 @@ export default {
let { orderInfo } = this
if(!orderInfo.person_number_spec_names)return '';
let spec = orderInfo.person_number_spec_names.join('+')
- return spec;
+ return spec || '';
},
zh_order_type(){
//订单类型 0预约订单 1课程订单
@@ -345,6 +345,7 @@ export default {
// ic卡列表
getICCardList({key=''}){
let { brandInfo, curIdx, storehouseList } = this
+ this.iccardList.splice(0)
util.showLoad();
deviceServer.get({
url: deviceApi.iccardList,
@@ -358,7 +359,10 @@ export default {
})
.then(res=>{
util.hideLoad()
- this.iccardList = res.list || []
+ let _list = res.list || []
+ for(var i in _list){
+ this.iccardList.push(_list[i].erp_iccard_no)
+ }
})
},
// 校验ic卡
@@ -424,6 +428,7 @@ export default {
.then(res=>{
util.hideLoad()
util.showNone('操作成功！');
+ this.$emit('okChange');
})
}
}
@@ -570,6 +575,9 @@ export default {
font-size: 28rpx;
line-height: 46rpx;
}
+ .rs-active{
+ color: #009874;
+ }
}
}
}
diff --git a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
index 5bf219f..7cdda00 100644
--- a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
+++ b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
@@ -61,7 +61,7 @@
折扣金额
- -¥{{orderInfo.deduction_amount || 0}}
+ -¥{{orderInfo.discount_amount || 0}}
优惠券优惠
diff --git a/src/subpackage/device/pages/order_manage/order_manage.vue b/src/subpackage/device/pages/order_manage/order_manage.vue
index a2ca0d7..a56b9e0 100644
--- a/src/subpackage/device/pages/order_manage/order_manage.vue
+++ b/src/subpackage/device/pages/order_manage/order_manage.vue
@@ -49,7 +49,8 @@ const tabList = [
{
id: 4,
name: "储值卡订单",
- path: '/pages/order_list/order_list',
+ // path: '/pages/order_list/order_list',
+ path: '',
},
{
id: 6,