From c65278cb28af87338dcd72dbbae7e079ce88cceb Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 9 Jan 2025 14:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=8E=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finance/components/withdraw-manage.vue    | 29 +++++++++++--------
 .../finance/components/withdrawTotal.vue      |  4 +--
 src/views/finance/financeList.vue             |  2 +-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/views/finance/components/withdraw-manage.vue b/src/views/finance/components/withdraw-manage.vue
index b01ab46..be2b713 100644
--- a/src/views/finance/components/withdraw-manage.vue
+++ b/src/views/finance/components/withdraw-manage.vue
@@ -31,7 +31,8 @@
             </el-form-item>
             <el-form-item label="日期">
                 <el-date-picker v-model="timeValue" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-                    end-placeholder="结束日期" @change="changeTime" :default-time="['00:00:00', '23:59:59']">
+                    end-placeholder="结束日期" @change="changeTime" value-format="yyyy-MM-DD HH:mm:ss"
+                    :default-time="['00:00:00', '23:59:59']">
                 </el-date-picker>
             </el-form-item>
             <el-form-item>
@@ -58,6 +59,11 @@
                     </template>
                 </template>
             </el-table-column>
+            <el-table-column label="提现账号" prop="zhifubao" width="200">
+                <template slot-scope="scope">
+                    {{ scope.row.zhifubaoName }} / {{ scope.row.zhifubao }}
+                </template>
+            </el-table-column>
             <el-table-column label="提现信息" width="200">
                 <template slot-scope="scope">
                     <div>提现金额：￥{{ scope.row.money }}</div>
@@ -78,11 +84,6 @@
                     <div>待审提现申请笔数：{{ scope.row.verifyCount }}</div>
                 </template>
             </el-table-column>
-            <el-table-column label="支付宝信息" prop="zhifubao" width="200">
-                <template slot-scope="scope">
-                    {{ scope.row.zhifubaoName }} / {{ scope.row.zhifubao }}
-                </template>
-            </el-table-column>
             <el-table-column label="申请时间" prop="createAt" width="200"></el-table-column>
             <el-table-column label="转账时间" prop="outAt" width="200"></el-table-column>
             <el-table-column label="状态" prop="state" width="200">
@@ -93,12 +94,8 @@
                     <el-tag type="success" v-if="scope.row.state == 1" disable-transitions>
                         成功
                     </el-tag>
-                    <div style="display: flex;flex-direction: column;" v-if="scope.row.state == 2">
-                        <div>
-                            <el-tag type="danger" disable-transitions>
-                                失败：{{ scope.row.refund }}
-                            </el-tag>
-                        </div>
+                    <div class="tag_danger" v-if="scope.row.state == 2">
+                        失败：{{ scope.row.refund }}
                     </div>
                     <el-tag type="warning" v-if="scope.row.state == 3" disable-transitions>
                         待审核
@@ -289,4 +286,12 @@ export default {
         }
     }
 }
+
+.tag_danger {
+    background-color: rgba(245, 108, 108, .1);
+    color: #f56c6c;
+    border-radius: 4px;
+    border: 1px solid rgba(245, 108, 108, .2);
+    padding: 2px 10px;
+}
 </style>
diff --git a/src/views/finance/components/withdrawTotal.vue b/src/views/finance/components/withdrawTotal.vue
index 344d417..59536f3 100644
--- a/src/views/finance/components/withdrawTotal.vue
+++ b/src/views/finance/components/withdrawTotal.vue
@@ -72,9 +72,9 @@
                     <div>提现次数：{{ scope.row.subCount }}</div>
                 </template>
             </el-table-column>
-            <el-table-column label="支付宝信息" prop="zhifubao">
+            <el-table-column label="提现账号" prop="zhifubao">
                 <template slot-scope="scope">
-                    {{ scope.row.zhifubaoName }} / {{ scope.row.zhifubao }}
+                    {{ scope.row.zhiFuBaoName }} / {{ scope.row.zhiFuBao }}
                 </template>
             </el-table-column>
         </el-table>
diff --git a/src/views/finance/financeList.vue b/src/views/finance/financeList.vue
index 278356b..7558abd 100644
--- a/src/views/finance/financeList.vue
+++ b/src/views/finance/financeList.vue
@@ -4,7 +4,7 @@
       <el-tab-pane label="提现审核" name="withdraw">
         <WithdrawManage></WithdrawManage>
       </el-tab-pane>
-      <el-tab-pane label="支付宝提现统计" name="withdrawTotal">
+      <el-tab-pane label="提现统计" name="withdrawTotal">
         <WithdrawTotal></WithdrawTotal>
       </el-tab-pane>
       <!-- 拒绝弹框 -->