From a4cf902fd47b3e6da2bbe054732126c2d95bc041 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 29 Jul 2024 08:42:33 +0800
Subject: [PATCH] =?UTF-8?q?style=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wechat/config/WechatPayConfigEdit.vue     |  15 +--
 .../merchant/channel/ChannelConfigList.vue    |   5 +
 .../admin/order/refund/RefundOrderList.vue    | 108 +++++++++---------
 .../order/transfer/TransferOrderList.vue      |  93 +++++++--------
 4 files changed, 112 insertions(+), 109 deletions(-)

diff --git a/src/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue b/src/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue
index 938f67177..b4185fae3 100644
--- a/src/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue
+++ b/src/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue
@@ -65,18 +65,11 @@
         </a-form-item>
         <a-form-item label="API版本" name="apiVersion">
           <a-radio-group v-model:value="form.apiVersion" button-style="solid">
-            <a-radio-button value="apiV2"> Api_V2 </a-radio-button>
-            <a-radio-button value="apiV3"> Api_V3 </a-radio-button>
+            <a-radio-button value="apiV2"> API_V2 </a-radio-button>
+            <a-radio-button value="apiV3"> API_V3 </a-radio-button>
           </a-radio-group>
         </a-form-item>
-        <a-form-item name="apiKeyV2">
-          <template #label>
-            <basic-title
-              helpMessage="付款码支付方式只支持微信支付V2版, 使用V3时也需要进行配置, 否则无法使用付款码支付"
-            >
-              APIv2密钥
-            </basic-title>
-          </template>
+        <a-form-item name="apiKeyV2" label="APIv2密钥">
           <a-textarea
             :rows="3"
             :disabled="showable"
@@ -163,7 +156,7 @@
         </a-form-item>
         <a-form-item name="p12">
           <template #label>
-            <basic-title helpMessage="例如退款、转账时，必须要配置p12证书才可以执行">
+            <basic-title helpMessage="V2版本中例如退款、转账时，必须要配置p12证书才可以执行">
               p12证书
             </basic-title>
           </template>
diff --git a/src/views/daxpay/admin/merchant/channel/ChannelConfigList.vue b/src/views/daxpay/admin/merchant/channel/ChannelConfigList.vue
index 2ffb28cb3..b8e5b6911 100644
--- a/src/views/daxpay/admin/merchant/channel/ChannelConfigList.vue
+++ b/src/views/daxpay/admin/merchant/channel/ChannelConfigList.vue
@@ -136,4 +136,9 @@
     justify-content: center;
     align-items: center;
   }
+  :deep(.ant-card-meta-description) {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 </style>
diff --git a/src/views/daxpay/admin/order/refund/RefundOrderList.vue b/src/views/daxpay/admin/order/refund/RefundOrderList.vue
index 1f49d6cf8..1a34b9432 100644
--- a/src/views/daxpay/admin/order/refund/RefundOrderList.vue
+++ b/src/views/daxpay/admin/order/refund/RefundOrderList.vue
@@ -19,59 +19,61 @@
           >
         </template>
       </vxe-toolbar>
-      <vxe-table
-        height="auto"
-        row-id="id"
-        ref="xTable"
-        :cell-style="cellStyle"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        :data="pagination.records"
-        :loading="loading"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="refundNo" title="退款号" :min-width="230">
-          <template #default="{ row }">
-            <a @click="show(row)">
-              {{ row.refundNo }}
-            </a>
-          </template>
-        </vxe-column>
-        <vxe-column field="title" title="原支付标题" :min-width="160" />
-        <vxe-column field="orderNo" title="支付订单号" :min-width="230">
-          <template #default="{ row }">
-            <a @click="showPayOrder(row)">
-              {{ row.orderNo }}
-            </a>
-          </template>
-        </vxe-column>
-        <vxe-column field="channel" title="支付通道" :min-width="120">
-          <template #default="{ row }">
-            {{ dictConvert('PayChannel', row.channel) }}
-          </template>
-        </vxe-column>
-        <vxe-column field="amount" title="退款金额(元)" :min-width="140">
-          <template #default="{ row }">
-            {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }}
-          </template>
-        </vxe-column>
-        <vxe-column field="refundStatus" title="状态" :min-width="80">
-          <template #default="{ row }">
-            {{ dictConvert('RefundStatus', row.status) }}
-          </template>
-        </vxe-column>
-        <vxe-column field="createTime" title="创建时间" sortable :min-width="230" />
-        <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <a-link @click="show(row)">查看</a-link>
-            <a-divider type="vertical" />
-            <!--      钱包不可以同步      -->
-            <a-link @click="sync(row)">同步</a-link>
-            <a-divider type="vertical" />
-            <a-link :disabled="!(row.status === 'fail')" @click="reset(row)">重试</a-link>
-          </template>
-        </vxe-column>
-      </vxe-table>
+      <div class="h-65vh">
+        <vxe-table
+          height="auto"
+          row-id="id"
+          ref="xTable"
+          :cell-style="cellStyle"
+          :sort-config="{ remote: true, trigger: 'cell' }"
+          :data="pagination.records"
+          :loading="loading"
+          @sort-change="sortChange"
+        >
+          <vxe-column type="seq" title="序号" width="60" />
+          <vxe-column field="refundNo" title="退款号" :min-width="230">
+            <template #default="{ row }">
+              <a @click="show(row)">
+                {{ row.refundNo }}
+              </a>
+            </template>
+          </vxe-column>
+          <vxe-column field="title" title="原支付标题" :min-width="160" />
+          <vxe-column field="orderNo" title="支付订单号" :min-width="230">
+            <template #default="{ row }">
+              <a @click="showPayOrder(row)">
+                {{ row.orderNo }}
+              </a>
+            </template>
+          </vxe-column>
+          <vxe-column field="channel" title="支付通道" :min-width="120">
+            <template #default="{ row }">
+              {{ dictConvert('PayChannel', row.channel) }}
+            </template>
+          </vxe-column>
+          <vxe-column field="amount" title="退款金额(元)" :min-width="140">
+            <template #default="{ row }">
+              {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }}
+            </template>
+          </vxe-column>
+          <vxe-column field="refundStatus" title="状态" :min-width="80">
+            <template #default="{ row }">
+              {{ dictConvert('RefundStatus', row.status) }}
+            </template>
+          </vxe-column>
+          <vxe-column field="createTime" title="创建时间" sortable :min-width="230" />
+          <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
+            <template #default="{ row }">
+              <a-link @click="show(row)">查看</a-link>
+              <a-divider type="vertical" />
+              <!--      钱包不可以同步      -->
+              <a-link @click="sync(row)">同步</a-link>
+              <a-divider type="vertical" />
+              <a-link :disabled="!(row.status === 'fail')" @click="reset(row)">重试</a-link>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </div>
       <vxe-pager
         size="medium"
         :loading="loading"
diff --git a/src/views/daxpay/admin/order/transfer/TransferOrderList.vue b/src/views/daxpay/admin/order/transfer/TransferOrderList.vue
index 10113ed68..f002e531e 100644
--- a/src/views/daxpay/admin/order/transfer/TransferOrderList.vue
+++ b/src/views/daxpay/admin/order/transfer/TransferOrderList.vue
@@ -17,51 +17,54 @@
           <span style="font-size: 18px">转账金额: {{ totalAmount }}元</span>
         </template>
       </vxe-toolbar>
-      <vxe-table
-        row-id="id"
-        ref="xTable"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        :data="pagination.records"
-        :loading="loading"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="transferNo" title="转账号" :min-width="230">
-          <template #default="{ row }">
-            <a @click="show(row)">
-              {{ row.transferNo }}
-            </a>
-          </template>
-        </vxe-column>
-        <vxe-column field="bizTransferNo" title="商户转账号" :min-width="230" />
-        <vxe-column field="title" title="标题" :min-width="160" />
-        <vxe-column field="channel" title="转账通道" :min-width="120">
-          <template #default="{ row }">
-            {{ dictConvert('PayChannel', row.channel) }}
-          </template>
-        </vxe-column>
-        <vxe-column field="amount" title="金额(元)" :min-width="140">
-          <template #default="{ row }">
-            {{ row.amount }}
-          </template>
-        </vxe-column>
-        <vxe-column field="status" title="状态" :min-width="80">
-          <template #default="{ row }">
-            {{ dictConvert('TransferStatus', row.status) }}
-          </template>
-        </vxe-column>
-        <vxe-column field="reason" title="转账原因" :min-width="160" />
-        <vxe-column field="createTime" title="创建时间" sortable :min-width="230" />
-        <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <a-link @click="show(row)">查看</a-link>
-            <a-divider type="vertical" />
-            <a-link @click="sync(row)">同步</a-link>
-            <a-divider type="vertical" />
-            <a-link @click="reset(row)">重试</a-link>
-          </template>
-        </vxe-column>
-      </vxe-table>
+      <div class="h-64vh">
+        <vxe-table
+          height="auto"
+          row-id="id"
+          ref="xTable"
+          :sort-config="{ remote: true, trigger: 'cell' }"
+          :data="pagination.records"
+          :loading="loading"
+          @sort-change="sortChange"
+        >
+          <vxe-column type="seq" title="序号" width="60" />
+          <vxe-column field="transferNo" title="转账号" :min-width="230">
+            <template #default="{ row }">
+              <a @click="show(row)">
+                {{ row.transferNo }}
+              </a>
+            </template>
+          </vxe-column>
+          <vxe-column field="bizTransferNo" title="商户转账号" :min-width="230" />
+          <vxe-column field="title" title="标题" :min-width="160" />
+          <vxe-column field="channel" title="转账通道" :min-width="120">
+            <template #default="{ row }">
+              {{ dictConvert('PayChannel', row.channel) }}
+            </template>
+          </vxe-column>
+          <vxe-column field="amount" title="金额(元)" :min-width="140">
+            <template #default="{ row }">
+              {{ row.amount }}
+            </template>
+          </vxe-column>
+          <vxe-column field="status" title="状态" :min-width="80">
+            <template #default="{ row }">
+              {{ dictConvert('TransferStatus', row.status) }}
+            </template>
+          </vxe-column>
+          <vxe-column field="reason" title="转账原因" :min-width="160" />
+          <vxe-column field="createTime" title="创建时间" sortable :min-width="230" />
+          <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
+            <template #default="{ row }">
+              <a-link @click="show(row)">查看</a-link>
+              <a-divider type="vertical" />
+              <a-link @click="sync(row)">同步</a-link>
+              <a-divider type="vertical" />
+              <a-link @click="reset(row)">重试</a-link>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </div>
       <vxe-pager
         size="medium"
         :loading="loading"