Browse Source

fix order status

privacy
刘嘉炜 2 years ago
parent
commit
802fbb5152
  1. 22
      src/components/reservation_order/reservation_order.vue
  2. 6
      src/subpackage/common/pages/pay_type_select.vue
  3. 69
      src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue

22
src/components/reservation_order/reservation_order.vue

@ -3,7 +3,7 @@
<view class="ro-header">
<view class="rh-view">{{orderInfo.stadium_name || '-'}}</view>
<text
:class="[ 'rh-text', orderInfo.pay_status == 1?'rh-active':'', orderInfo.pay_status == 4?'rh-red':'' ]"
:class="[ 'rh-text', orderInfo.pay_status == 1?'rh-active':'', zh_order_status(orderInfo) == '已退款'?'rh-red':'' ]"
>{{zh_order_status(orderInfo)}}</text>
</view>
<view class="ro-section">
@ -96,17 +96,6 @@ export default {
return _obj[`${status}`] || '-'
}
},
zh_pay_type(){
// 012
return status =>{
const _obj = {
'0': '微信支付',
'1': '支付宝支付',
'2': '储值卡支付',
}
return _obj[`${status}`] || '-'
}
},
zh_type_name(){
// 0 1
let { orderInfo } = this
@ -130,6 +119,15 @@ export default {
// -101使2使34退
let _status = orderInfo.pay_status || '';
if(_status == 3&&orderInfo.is_active_release)return '已失效*'; // 20220929 '*'
// 20230705
// end0退 share_pid0退
// 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': '未支付',

6
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({

69
src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue

@ -23,14 +23,21 @@
<view>订单来源<text>{{ orderInfo.order_source_text || '-' }}</text></view>
</view>
<view class="rh-line">
<view>订单备注<text>{{ getMarkTxt || '-' }}</text></view>
<view>订单备注<text>{{ take_up_details.remark || take_up_details.reason || '-' }}</text></view>
</view>
</view>
<view class="rs-box">
<view class="rb-title">验证信息</view>
<view class="rb-line">
<view class="rl-view">验证码</view>
<view :class="['rl-code1', orderInfo.pay_status==2?'rl-code2':'', orderInfo.pay_status==3?'rl-code3':'', orderInfo.pay_status==4?'rl-code4':'']" >{{orderInfo.verify_code || '-'}}<text>({{zh_pay_status(orderInfo)}})</text></view>
<view
:class="[
'rl-code1',
orderInfo.pay_status==2?'rl-code2':'',
orderInfo.pay_status==3?'rl-code3':'',
zh_pay_status(orderInfo) == '已取消'?'rl-code3':'',
zh_pay_status(orderInfo) == '已退款'?'rl-code4':'']"
>{{orderInfo.verify_code || '-'}}<text>({{zh_pay_status(orderInfo)}})</text></view>
</view>
<!-- 已使用 -->
<block v-if="orderInfo.pay_status==2 || orderInfo.pay_status==8">
@ -100,18 +107,18 @@
<view class="rb-title">支付信息</view>
<view class="rb-line">
<view class="rl-view">支付方式</view>
<text class="rl-text">{{zh_pay_type(orderInfo.pay_type)}}</text>
<text class="rl-text">{{ getPayTypeText || '-' }}</text>
</view>
<view class="rb-line">
<view class="rl-view">支付时间</view>
<text class="rl-text">{{orderInfo.pay_time || '-'}}</text>
</view>
<view class="rb-line">
<view class="rl-view">微信交易号</view>
<text class="rl-text">{{orderInfo.trade_no || ''}}</text>
<view class="rl-view">交易号</view>
<text class="rl-text">{{orderInfo.trade_no || '-'}}</text>
</view>
<!-- 已退款 -->
<block v-if="orderInfo.pay_status == 4">
<block v-if="zh_pay_status(orderInfo) == '已退款'">
<view class="rb-line">
<view class="rl-view">退款时间</view>
<text class="rl-text">{{orderInfo.refund_time || '-'}}</text>
@ -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(){
// 012
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 {
// -101使2使34退
let _status = orderInfo.pay_status || '';
if(_status == 3&&orderInfo.is_active_release)return '已失效*'; // 20220929 '*'
// 20230705
// end0退 share_pid0退
// 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': '未支付',

Loading…
Cancel
Save