From f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/shopWithdrawList.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/business/shopWithdrawList.vue b/admin/src/views/business/shopWithdrawList.vue
index 0e5cd33..a74564c 100644
--- a/admin/src/views/business/shopWithdrawList.vue
+++ b/admin/src/views/business/shopWithdrawList.vue
@@ -25,7 +25,7 @@
         <span>绱鎻愮幇锛毬{ totalAmount }}</span>
       </div>
       <el-table
-        :height="tableHeightNew"
+        :height="tableHeightNew -60"
         v-loading="isWorking.search"
         :data="tableData.list"
         stripe
@@ -57,7 +57,7 @@
         :pagination="tableData.pagination"
       ></pagination>
     </template>
-    <OperaWithdrawDetailWindow ref="operaWithdrawDetailWindow" @success="search" />
+    <OperaWithdrawDetailWindow ref="operaWithdrawDetailWindow" @success="handlePageChange" />
   </TableLayout>
 </template>
 
@@ -128,6 +128,7 @@
       this.searchForm = {
         shopName: '',
         createTime1: '',
+        memberType: 2,
         createStartTime: '',
         createEndTime: '',
         auditStatus: ''

--
Gitblit v1.9.3