From 8dda8992f0323f2f9662809bb6e0c1e9a233f866 Mon Sep 17 00:00:00 2001
From: xiaoyu <17601026937@163.com>
Date: Thu, 18 Nov 2021 11:35:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E6=8F=92=E6=A7=BD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeepay-ui-manager/src/views/order/pay/PayOrderList.vue        | 4 ++--
 jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue  | 4 ++--
 .../src/views/order/transfer/TransferOrderList.vue            | 4 ++--
 jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue       | 4 ++--
 jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue | 4 ++--
 .../src/views/order/transfer/TransferOrderList.vue            | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
index 288b25a..b179ef1 100644
--- a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
@@ -98,7 +98,7 @@
         <template slot="orderSlot" slot-scope="{record}">
           <div class="order-list">
             <p><span style="color:#729ED5;background:#e7f5f7">支付</span>{{ record.payOrderId }}</p>
-            <p>
+            <p style="margin-bottom: 0">
               <span style="color:#56cf56;background:#d8eadf">商户</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
@@ -107,7 +107,7 @@
                 {{ record.mchOrderNo.length <= record.payOrderId.length ? record.mchOrderNo:record.mchOrderNo.substring(0, record.payOrderId.length) + "..." }}
               </a-tooltip>
             </p>
-            <p v-if="record.channelOrderNo">
+            <p v-if="record.channelOrderNo" style="margin-bottom: 0;margin-top: 10px">
               <span style="color:#fff;background:#E09C4D;">渠道</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
diff --git a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
index f67ecba..e93d7e3 100644
--- a/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/refund/RefundOrderList.vue
@@ -72,7 +72,7 @@
         <template slot="payOrderSlot" slot-scope="{record}">
           <div class="order-list">
             <p><span style="color:#729ED5;background:#e7f5f7">支付</span>{{ record.payOrderId }}</p>
-            <p v-if="record.channelPayOrderNo">
+            <p v-if="record.channelPayOrderNo" style="margin-bottom: 0;">
               <span style="color:#fff;background:#E09C4D">渠道</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
@@ -87,7 +87,7 @@
         <template slot="refundOrderSlot" slot-scope="{record}">
           <div class="order-list">
             <p><span style="color:#729ED5;background:#e7f5f7">退款</span>{{ record.refundOrderId }}</p>
-            <p>
+            <p style="margin-bottom: 0;">
               <span style="color:#56cf56;background:#d8eadf">商户</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
diff --git a/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue b/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
index 3201655..2564c9f 100644
--- a/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/transfer/TransferOrderList.vue
@@ -60,7 +60,7 @@
         <template slot="orderSlot" slot-scope="{record}">
           <div class="order-list">
             <p><span style="color:#729ED5;background:#e7f5f7">转账</span>{{ record.transferId }}</p>
-            <p>
+            <p style="margin-bottom: 0;">
               <span style="color:#56cf56;background:#d8eadf">商户</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
@@ -69,7 +69,7 @@
                 {{ record.mchOrderNo.length <= record.transferId.length ? record.mchOrderNo:record.mchOrderNo.substring(0, record.transferId.length) + "..." }}
               </a-tooltip>
             </p>
-            <p v-if="record.channelOrderNo">
+            <p v-if="record.channelOrderNo" style="margin-bottom: 0;margin-top: 10px">
               <span style="color:#fff;background:#E09C4D">渠道</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
diff --git a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
index f65c4db..6c5257c 100644
--- a/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/pay/PayOrderList.vue
@@ -91,7 +91,7 @@
         <template slot="orderSlot" slot-scope="{record}">
           <div class="order-list">
             <p><span style="color:#729ED5;background:#e7f5f7">支付</span>{{ record.payOrderId }}</p>
-            <p>
+            <p style="margin-bottom: 0">
               <span style="color:#56cf56;background:#d8eadf">商户</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
@@ -100,7 +100,7 @@
                 {{ record.mchOrderNo.length <= record.payOrderId.length ? record.mchOrderNo:record.mchOrderNo.substring(0, record.payOrderId.length) + "..." }}
               </a-tooltip>
             </p>
-            <p v-if="record.channelOrderNo">
+            <p v-if="record.channelOrderNo" style="margin-bottom: 0;margin-top: 10px">
               <span style="color:#fff;background:#E09C4D">渠道</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
diff --git a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
index 65904b3..d1a608d 100644
--- a/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/refund/RefundOrderList.vue
@@ -65,7 +65,7 @@
         <template slot="payOrderSlot" slot-scope="{record}">
           <div class="order-list">
             <p><span style="color:#729ED5;background:#e7f5f7">支付</span>{{ record.payOrderId }}</p>
-            <p v-if="record.channelPayOrderNo">
+            <p v-if="record.channelPayOrderNo" style="margin-bottom: 0;">
               <span style="color:#fff;background:#E09C4D">渠道</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
@@ -80,7 +80,7 @@
         <template slot="refundOrderSlot" slot-scope="{record}">
           <div class="order-list">
             <p><span style="color:#729ED5;background:#e7f5f7">退款</span>{{ record.refundOrderId }}</p>
-            <p>
+            <p style="margin-bottom: 0;">
               <span style="color:#56cf56;background:#d8eadf">商户</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
diff --git a/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue b/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
index da8ed19..5034414 100644
--- a/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
+++ b/jeepay-ui-merchant/src/views/order/transfer/TransferOrderList.vue
@@ -59,7 +59,7 @@
         <template slot="orderSlot" slot-scope="{record}">
           <div class="order-list">
             <p><span style="color:#729ED5;background:#e7f5f7">转账</span>{{ record.transferId }}</p>
-            <p>
+            <p style="margin-bottom: 0">
               <span style="color:#56cf56;background:#d8eadf">商户</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">
@@ -68,7 +68,7 @@
                 {{ record.mchOrderNo.length <= record.transferId.length ? record.mchOrderNo:record.mchOrderNo.substring(0, record.transferId.length) + "..." }}
               </a-tooltip>
             </p>
-            <p v-if="record.channelOrderNo">
+            <p v-if="record.channelOrderNo" style="margin-bottom: 0;margin-top: 10px">
               <span style="color:#fff;background:#E09C4D">渠道</span>
               <a-tooltip placement="bottom" style="font-weight: normal;">
                 <template slot="title">