diff --git a/jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue b/jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue index e828a26..22050f8 100644 --- a/jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue +++ b/jeepay-ui-manager/src/components/JeepayTable/JeepayTable.vue @@ -117,3 +117,16 @@ export default { } } + diff --git a/jeepay-ui-manager/src/components/JeepayTable/JeepayTableColumns.vue b/jeepay-ui-manager/src/components/JeepayTable/JeepayTableColumns.vue index f4f5a9b..ae726e1 100644 --- a/jeepay-ui-manager/src/components/JeepayTable/JeepayTableColumns.vue +++ b/jeepay-ui-manager/src/components/JeepayTable/JeepayTableColumns.vue @@ -41,3 +41,9 @@ export default { } } + diff --git a/jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue b/jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue index a15bc57..07afcd9 100644 --- a/jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue +++ b/jeepay-ui-merchant/src/components/JeepayTable/JeepayTable.vue @@ -117,3 +117,16 @@ export default { } } + diff --git a/jeepay-ui-merchant/src/components/JeepayTable/JeepayTableColumns.vue b/jeepay-ui-merchant/src/components/JeepayTable/JeepayTableColumns.vue index cb7c8d7..425be10 100644 --- a/jeepay-ui-merchant/src/components/JeepayTable/JeepayTableColumns.vue +++ b/jeepay-ui-merchant/src/components/JeepayTable/JeepayTableColumns.vue @@ -40,3 +40,9 @@ export default { } } + diff --git a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue index ab51b48..f65c4db 100644 --- a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue +++ b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue @@ -381,7 +381,7 @@ import moment from 'moment' // eslint-disable-next-line no-unused-vars const tableColumns = [ { key: 'amount', title: '支付金额', scopedSlots: { customRender: 'amountSlot' } }, - { key: 'refundAmount', title: '退款金额', scopedSlots: { customRender: 'refundAmountSlot' } }, + { key: 'refundAmount', title: '退款', scopedSlots: { customRender: 'refundAmountSlot' } }, { key: 'mchFeeAmount', dataIndex: 'mchFeeAmount', title: '手续费', customRender: (text) => '¥' + (text / 100).toFixed(2) }, { key: 'orderNo', title: '订单号', scopedSlots: { customRender: 'orderSlot' }, width: '260px' }, // { key: 'payOrderId', title: '支付订单号', dataIndex: 'payOrderId' }, @@ -390,7 +390,7 @@ const tableColumns = [ { key: 'state', title: '支付状态', scopedSlots: { customRender: 'stateSlot' } }, { key: 'divisionState', title: '分账状态', scopedSlots: { customRender: 'divisionStateSlot' }, align: 'center' }, { key: 'createdAt', dataIndex: 'createdAt', title: '创建日期' }, - { key: 'op', title: '操作', width: '100px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } } + { key: 'op', title: '操作', width: '120px', fixed: 'right', align: 'center', scopedSlots: { customRender: 'opSlot' } } ] export default { @@ -462,6 +462,15 @@ export default { }