From 72681f209b3d027d9ce4936f128c7dd906b6dd28 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 3 Oct 2023 12:16:24 +0800
Subject: [PATCH] =?UTF-8?q?trade=EF=BC=9A=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E9=94=80=E7=95=8C=E9=9D=A2=E7=9A=84=20width=20=E5=88=97?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=EF=BC=8C=E5=92=8C=E4=B8=80=E4=BA=9B=E9=9D=9E?=
 =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 59ab6218ca950d166bca937b6a14d54b07b68565)
---
 src/views/mall/trade/brokerage/record/index.vue           | 4 ++--
 .../trade/brokerage/user/BrokerageOrderListDialog.vue     | 2 +-
 .../mall/trade/brokerage/user/BrokerageUserListDialog.vue | 2 +-
 src/views/mall/trade/brokerage/user/index.vue             | 4 ++--
 src/views/mall/trade/brokerage/withdraw/index.vue         | 8 +++++---
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/mall/trade/brokerage/record/index.vue b/src/views/mall/trade/brokerage/record/index.vue
index f9cae4e1..b3639c87 100644
--- a/src/views/mall/trade/brokerage/record/index.vue
+++ b/src/views/mall/trade/brokerage/record/index.vue
@@ -96,14 +96,14 @@
         align="center"
         prop="unfreezeTime"
         :formatter="dateFormatter"
-        width="170px"
+        width="180px"
       />
       <el-table-column
         label="创建时间"
         align="center"
         prop="createTime"
         :formatter="dateFormatter"
-        width="170px"
+        width="180px"
       />
     </el-table>
     <!-- 分页 -->
diff --git a/src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue b/src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue
index d2c0568f..54e3c16d 100644
--- a/src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue
+++ b/src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue
@@ -77,7 +77,7 @@
           align="center"
           prop="createTime"
           :formatter="dateFormatter"
-          width="170px"
+          width="180px"
         />
       </el-table>
       <!-- 分页 -->
diff --git a/src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue b/src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
index 2277cc01..87dc8f67 100644
--- a/src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
+++ b/src/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue
@@ -67,7 +67,7 @@
           align="center"
           prop="bindUserTime"
           :formatter="dateFormatter"
-          width="170px"
+          width="180px"
         />
       </el-table>
       <!-- 分页 -->
diff --git a/src/views/mall/trade/brokerage/user/index.vue b/src/views/mall/trade/brokerage/user/index.vue
index 52944391..741ca34b 100644
--- a/src/views/mall/trade/brokerage/user/index.vue
+++ b/src/views/mall/trade/brokerage/user/index.vue
@@ -109,7 +109,7 @@
         align="center"
         prop="brokerageTime"
         :formatter="dateFormatter"
-        width="170px"
+        width="180px"
       />
       <el-table-column label="上级推广员编号" align="center" prop="bindUserId" width="150px" />
       <el-table-column
@@ -117,7 +117,7 @@
         align="center"
         prop="bindUserTime"
         :formatter="dateFormatter"
-        width="170px"
+        width="180px"
       />
       <el-table-column label="操作" align="center" width="150px" fixed="right">
         <template #default="scope">
diff --git a/src/views/mall/trade/brokerage/withdraw/index.vue b/src/views/mall/trade/brokerage/withdraw/index.vue
index f76dc36d..ce4f8768 100644
--- a/src/views/mall/trade/brokerage/withdraw/index.vue
+++ b/src/views/mall/trade/brokerage/withdraw/index.vue
@@ -104,8 +104,8 @@
         <template #default="scope">
           <div v-if="scope.row.type === BrokerageWithdrawTypeEnum.WALLET.type"> 余额 </div>
           <div v-else>
-            {{ getDictLabel(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE, scope.row.type) }}账号：
-            {{ scope.row.accountNo }}
+            {{ getDictLabel(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE, scope.row.type) }}
+            <span v-if="scope.row.accountNo">账号：{{ scope.row.accountNo }}</span>
           </div>
           <template v-if="scope.row.type === BrokerageWithdrawTypeEnum.BANK.type">
             <div>真实姓名：{{ scope.row.name }}</div>
@@ -117,14 +117,16 @@
           </template>
         </template>
       </el-table-column>
-      <el-table-column label="收款码" align="left" prop="accountQrCodeUrl" width="70px">
+      <el-table-column label="收款码" align="left" prop="accountQrCodeUrl" min-width="70px">
         <template #default="scope">
           <el-image
+            v-if="scope.row.accountQrCodeUrl"
             :src="scope.row.accountQrCodeUrl"
             class="w-40px h-40px"
             :preview-src-list="[scope.row.accountQrCodeUrl]"
             preview-teleported
           />
+          <span v-else>无</span>
         </template>
       </el-table-column>
       <el-table-column