lisang
/
jeepay-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退款相关页面优化

This commit is contained in:
xiaoyu 2021-06-18 11:34:09 +08:00
parent 4a16ee57c8
commit cf03d8835f
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jeepay-ui-manager/src/views/order/notify/MchNotifyList.vue
View File

@ -64,6 +64,14 @@
{{ record.state === 1?'通知中':record.state === 2?'通知成功':record.state === 3?'通知失败':'未知' }}
</a-tag>
</template>
<template slot="orderTypeSlot" slot-scope="{record}">
<a-tag
:key="record.orderType"
:color="record.orderType === 1?'green':record.orderType === 2?'volcano':'orange'"
>
{{ record.orderType === 1?'支付':record.orderType === 2?'退款':'未知' }}
</a-tag>
</template>
<template slot="opSlot" slot-scope="{record}"> <!-- 操作列插槽 -->
<JeepayTableColumns>
<a-button type="link" v-if="$access('ENT_MCH_NOTIFY_VIEW')" @click="detailFunc(record.notifyId)">详情</a-button>
@ -202,6 +210,7 @@
{ key: 'orderId', title: '订单ID', fixed: 'left', dataIndex: 'orderId' },
{ key: 'mchOrderNo', title: '商户订单号', dataIndex: 'mchOrderNo' },
{ key: 'state', title: '通知状态', width: '130px', scopedSlots: { customRender: 'stateSlot' } },
{ key: 'orderType', title: '通知状态', width: '130px', scopedSlots: { customRender: 'orderTypeSlot' } },
{ key: 'createdAt', dataIndex: 'createdAt', title: '创建日期' },
{ key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }
]

18
jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
View File

@ -74,6 +74,14 @@
{{ record.state === 0?'订单生成':record.state === 1?'支付中':record.state === 2?'支付成功':record.state === 3?'支付失败':record.state === 4?'已撤销':record.state === 5?'已退款':record.state === 6?'订单关闭':'未知' }}
</a-tag>
</template>
<template slot="refundStateSlot" slot-scope="{record}">
<a-tag
:key="record.refundState"
:color="record.refundState === 0?'blue':record.refundState === 1?'orange':record.refundState === 2?'green':'volcano'"
>
{{ record.refundState === 0?'未发起':record.refundState === 1?'部分退款':record.refundState === 2?'全额退款':'未知' }}
</a-tag>
</template>
<template slot="notifySlot" slot-scope="{record}">
<a-badge :status="record.notifyState === 1?'processing':'error'" :text="record.notifyState === 1?'已发送':'未发送'" />
</template>
@ -286,6 +294,15 @@
</a-descriptions-item>
</a-descriptions>
</a-col>
<a-col :sm="12">
<a-descriptions>
<a-descriptions-item label="退款状态">
<a-tag :color="detailData.refundState === 0?'blue':detailData.refundState === 1?'orange':detailData.refundState === 2?'green':'volcano'">
{{ detailData.refundState === 0?'未发起':detailData.refundState === 1?'部分退款':detailData.refundState === 2?'全额退款':'未知' }}
</a-tag>
</a-descriptions-item>
</a-descriptions>
</a-col>
<a-col :sm="12">
<a-descriptions>
<a-descriptions-item label="退款次数">
@ -335,6 +352,7 @@ const tableColumns = [
{ key: 'mchOrderNo', title: '商户订单号', dataIndex: 'mchOrderNo' },
{ key: 'wayName', title: '支付方式', dataIndex: 'wayName', width: 150 },
{ key: 'state', title: '支付状态', scopedSlots: { customRender: 'stateSlot' }, width: 100 },
{ key: 'refundState', title: '退款状态', scopedSlots: { customRender: 'refundStateSlot' }, width: 100 },
{ key: 'notifyState', title: '回调状态', scopedSlots: { customRender: 'notifySlot' }, width: 100 },
{ key: 'createdAt', dataIndex: 'createdAt', title: '创建日期', width: 180 },
{ key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }

5
jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
View File

@ -170,7 +170,7 @@
</a-descriptions-item>
</a-descriptions>
</a-col>
<a-col :sm="24">
<a-col :sm="12">
<a-descriptions>
<a-descriptions-item label="退款成功时间">
{{ detailData.successTime }}
@ -297,10 +297,9 @@
{ key: 'payAmount', title: '支付金额', fixed: 'left', scopedSlots: { customRender: 'payAmountSlot' } },
{ key: 'refundAmount', title: '退款金额', scopedSlots: { customRender: 'refundAmountSlot' } },
{ key: 'refundOrderId', title: '退款订单号', dataIndex: 'refundOrderId' },
{ key: 'channelPayOrderNo', title: '渠道订单号', dataIndex: 'channelPayOrderNo' },
{ key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' },
{ key: 'mchRefundNo', title: '商户退款单号', dataIndex: 'mchRefundNo' },
{ key: 'state', title: '支付状态', scopedSlots: { customRender: 'stateSlot' }, width: 100 },
{ key: 'state', title: '状态', scopedSlots: { customRender: 'stateSlot' }, width: 100 },
{ key: 'createdAt', dataIndex: 'createdAt', title: '创建日期' },
{ key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } }
]