Merge remote-tracking branch 'origin/master'

doum

2026-04-30 f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e

 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>

@@ -76,6 +76,7 @@
    return {
      totalAmount: '0.00',
      searchForm: {
        memberType: 2,
        shopName: '',
        createTime1: '',
        createStartTime: '',
@@ -98,6 +99,7 @@
        capacity: 99999,
        pageNum: 1,
        model: {
          memberType: 2,
          shopName: this.searchForm.shopName,
          createStartTime: this.searchForm.createStartTime,
          createEndTime: this.searchForm.createEndTime,
@@ -126,6 +128,7 @@
      this.searchForm = {
        shopName: '',
        createTime1: '',
        memberType: 2,
        createStartTime: '',
        createEndTime: '',
        auditStatus: ''