diff --git a/src/components/reservation_order/reservation_order.vue b/src/components/reservation_order/reservation_order.vue
index ae59b04..78bc787 100644
--- a/src/components/reservation_order/reservation_order.vue
+++ b/src/components/reservation_order/reservation_order.vue
@@ -3,7 +3,7 @@
@@ -96,17 +96,6 @@ export default {
return _obj[`${status}`] || '-'
}
},
- zh_pay_type(){
- // 支付类型 0微信支付1支付宝支付2储值卡支付
- return status =>{
- const _obj = {
- '0': '微信支付',
- '1': '支付宝支付',
- '2': '储值卡支付',
- }
- return _obj[`${status}`] || '-'
- }
- },
zh_type_name(){
// 预订项目 0场次 1人次
let { orderInfo } = this
@@ -130,6 +119,15 @@ export default {
// 订单状态 -1已作废0未支付1已支付待使用2已使用3已失效4已退款
let _status = orderInfo.pay_status || '';
if(_status == 3&&orderInfo.is_active_release)return '已失效*'; // 20220929 新增状态 '已失效*'
+ // 20230705 新增状态 已取消
+ // end：如果金额为0而且是已退款的话就显示已取消， 或者是share_pid大于0但是已退款的
+ // extension.take_up_bboc && !extension.take_up_bboc_pay 这个表示未收款的挂账订单
+ if(
+ orderInfo.pay_status == 4&&
+ (orderInfo.share_pid > 0 ||
+ orderInfo.pay_amount == 0 ||
+ (orderInfo?.extension?.take_up_bboc && !orderInfo?.extension?.take_up_bboc_pay))
+ )return '已取消';
const _obj = {
'-1': '已作废',
'0': '未支付',
diff --git a/src/subpackage/common/pages/pay_type_select.vue b/src/subpackage/common/pages/pay_type_select.vue
index c952a07..95ec467 100644
--- a/src/subpackage/common/pages/pay_type_select.vue
+++ b/src/subpackage/common/pages/pay_type_select.vue
@@ -149,7 +149,7 @@ export default {
{ name: '支付宝支付', id: 1 },
{ name: '现金支付', id: 2 },
{ name: '储值卡支付', id: 3 },
- { name: '其他', id: 4 },
+ { name: '其它', id: 4 },
]
},
@@ -163,7 +163,7 @@ export default {
order_no: optionsQuery?.exQuery?.order_no || '',
take_up_pay_type: this.getPayMethodsName(payMethodsID)
}
- if(payMethodsID === 4)_data['remark'] = otherTypeRemark || '其它';
+ if(payMethodsID === 4)_data['take_up_pay_type'] = otherTypeRemark || '其它';
if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || '';
server.post({
url: API.takeUpBbocPay,
@@ -185,7 +185,7 @@ export default {
...exQuery,
take_up_pay_type: this.getPayMethodsName(payMethodsID) || ''
}
- if(payMethodsID === 4)_data['remark'] = otherTypeRemark || '其它';
+ if(payMethodsID === 4)_data['take_up_pay_type'] = otherTypeRemark || '其它';
if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || '';
util.showLoad();
server.post({
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 2e04b30..604b630 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
@@ -23,14 +23,21 @@
订单来源：{{ orderInfo.order_source_text || '-' }}
- 订单备注：{{ getMarkTxt || '-' }}
+ 订单备注：{{ take_up_details.remark || take_up_details.reason || '-' }}
验证信息
验证码：
- {{orderInfo.verify_code || '-'}}({{zh_pay_status(orderInfo)}})
+ {{orderInfo.verify_code || '-'}}({{zh_pay_status(orderInfo)}})
@@ -100,18 +107,18 @@
支付信息
支付方式：
- {{zh_pay_type(orderInfo.pay_type)}}
+ {{ getPayTypeText || '-' }}
支付时间：
{{orderInfo.pay_time || '-'}}
- 微信交易号：
- {{orderInfo.trade_no || ''}}
+ 交易号：
+ {{orderInfo.trade_no || '-'}}
-
+
退款时间：
{{orderInfo.refund_time || '-'}}
@@ -143,41 +150,15 @@ export default {
}
},
computed: {
- zh_verify_type(){
- /**
- * 20210527 新增核销方式
- * verify_type: 核销方式
- * 1: 验证码核销(pad)2: 人脸验证(pad)3: 扫码验证(pad)4: 扫码器验证(pad)
- * 5: 验证码核销(商家助手)6: 扫码核销(商家助手) 7: 扫码器核销(门闸)
- */
- return status =>{
- return [
- '扫码器核销(门闸)',
- '验证码核销(pad)',
- '人脸验证(pad)',
- '扫码验证(pad)',
- '扫码器验证(pad)',
- '验证码核销(商家助手)',
- '扫码核销(商家助手)',
- ][status] || '-';
-
- }
- },
- zh_pay_type(){
- // 支付类型 0微信支付1支付宝支付2储值卡支付
- return status =>{
- const _obj = {
- '0': '微信支付',
- '1': '支付宝支付',
- '2': '储值卡支付',
- }
- return _obj[`${status}`] || '-'
- }
- },
- getMarkTxt(){
+ take_up_details(){
let { orderInfo } = this;
- return orderInfo?.extension?.take_up_details?.reason || ''
+ return orderInfo?.extension?.take_up_details || {}
},
+ // 已取消只显示 '-'
+ getPayTypeText(){
+ let { orderInfo } = this;
+ return orderInfo?.extension?.pay_type_text || '-'
+ }
},
data() {
return {
@@ -188,6 +169,16 @@ export default {
// 订单状态 -1已作废0未支付1已支付待使用2已使用3已失效4已退款
let _status = orderInfo.pay_status || '';
if(_status == 3&&orderInfo.is_active_release)return '已失效*'; // 20220929 新增状态 '已失效*'
+ // 20230705 新增状态 已取消
+ // end：如果金额为0而且是已退款的话就显示已取消， 或者是share_pid大于0但是已退款的
+ // extension.take_up_bboc && !extension.take_up_bboc_pay 这个表示未收款的挂账订单
+ if(
+ orderInfo.pay_status == 4&&
+ (orderInfo.share_pid > 0 ||
+ orderInfo.pay_amount == 0 ||
+ (orderInfo?.extension?.take_up_bboc &&
+ !orderInfo?.extension?.take_up_bboc_pay))
+ )return '已取消';
const _obj = {
'-1': '已作废',
'0': '未支付',