diff --git a/src/api/merchant.js b/src/api/merchant.js
index 7015a05..a0d10c4 100644
--- a/src/api/merchant.js
+++ b/src/api/merchant.js
@@ -526,6 +526,20 @@ const merchant = {
             data: data
         });
     },
+    getRechargeLog: async (data) => {
+        return request({
+            url: '/index/business/getRechargeLog',
+            method: Method.POST,
+            data: data
+        });
+    },
+    getWithdrawalLog: async (data) => {
+        return request({
+            url: '/index/business/getWithdrawalLog',
+            method: Method.POST,
+            data: data
+        });
+    },
 }
 
 export default merchant;
diff --git a/src/pages/merchant/pages/my-wallet/wallet-overview.vue b/src/pages/merchant/pages/my-wallet/wallet-overview.vue
index f59fbb2..60a21c2 100644
--- a/src/pages/merchant/pages/my-wallet/wallet-overview.vue
+++ b/src/pages/merchant/pages/my-wallet/wallet-overview.vue
@@ -1,44 +1,89 @@
 <script setup>
 import Recharge from "./components/Recharge.vue";
 import Reflect from "./components/Reflect.vue";
-import {onMounted, reactive} from "vue";
+import {onMounted, reactive, ref} from "vue";
 import useTableQuery from "../../../../hooks/useTableQuery.js";
 import Api from "../../../../api/index.js";
 
+const activeKey = ref('Recharge');
 const columns = [
     {
         title: '充值日期',
-        dataIndex: 'key'
+        dataIndex: 'rechargetime'
     },
     {
         title: '充值时间',
-        dataIndex: 'key'
+        dataIndex: 'rechargeday'
     },
     {
         title: '交易流水号',
-        dataIndex: 'key'
+        dataIndex: 'order_sn'
     },
     {
         title: '动账渠道',
-        dataIndex: 'key'
+        dataIndex: 'platform_name'
     },
     {
         title: '动账用途',
-        dataIndex: 'key'
+        dataIndex: 'dzyt',
+        slotName: 'dzyt'
     },
     {
         title: '充值金额(元)',
-        dataIndex: 'key'
+        dataIndex: 'money'
     },
     {
         title: '付款人账户',
-        dataIndex: 'key'
+        dataIndex: 'money'
     },
     {
         title: '收款人账户',
-        dataIndex: 'key'
+        dataIndex: 'skrzh',
+        slotName: 'skrzh'
     },
 ];
+const columns2 = [
+    {
+        title: '提现日期',
+        dataIndex: 'createday'
+    },
+    {
+        title: '提现时间',
+        dataIndex: 'createhour'
+    },
+    {
+        title: '交易流水号',
+        dataIndex: 'uid'
+    },
+    {
+        title: '状态',
+        dataIndex: 'status',
+        slotName: 'status'
+    },
+    {
+        title: '动账渠道',
+        dataIndex: 'type_text'
+    },
+    {
+        title: '动账用途',
+        dataIndex: 'dzyt',
+        slotName: 'dzyt'
+    },
+    {
+        title: '提现金额(元)',
+        dataIndex: 'money',
+        slotName: 'money',
+    },
+    {
+        title: '付款人账户',
+        dataIndex: 'fkrzh',
+        slotName: 'fkrzh',
+    },
+    {
+        title: '收款人账户',
+        dataIndex: 'account'
+    }
+];
 
 const vo = reactive({
     page: '',
@@ -48,16 +93,33 @@ const vo = reactive({
 const po = reactive({
     wd: null,
 });
+const vo2 = reactive({
+    page: '',
+    rows: [],
+    total: 0,
+});
+const po2 = reactive({
+    wd: null,
+});
 
 const {loading, pagination, initFetchData} = useTableQuery({
     parameter: po,
-    api: Api.system.getData,
+    api: Api.merchant.getRechargeLog,
     callback: (data) => {
         Object.assign(vo, data);
         console.log(vo);
     }
 });
 
+const {loading: loading2, pagination: pagination2, initFetchData: initFetchData2} = useTableQuery({
+    parameter: po2,
+    api: Api.merchant.getWithdrawalLog,
+    callback: (data) => {
+        Object.assign(vo2, data);
+        console.log(vo2);
+    }
+});
+
 const businessInfo = reactive({
     money: 0,
     coin: 0,
@@ -107,7 +169,7 @@ onMounted(() => {
         </div>
 
         <a-card>
-            <a-tabs type="rounded">
+            <a-tabs type="rounded" v-model:active-key="activeKey">
                 <a-tab-pane key="Recharge" title="我的充值">
                     <Recharge></Recharge>
                 </a-tab-pane>
@@ -117,7 +179,7 @@ onMounted(() => {
             </a-tabs>
         </a-card>
 
-        <div class="mock-card">
+        <div class="mock-card" v-if="activeKey==='Recharge'">
             <div class="title">充值记录</div>
             <a-table
                 @page-change="(e) => pagination.current = e"
@@ -125,6 +187,37 @@ onMounted(() => {
                 :data="vo.rows"
                 :loading="loading"
                 :columns="columns">
+                <template v-slot:dzyt>
+                    余额充值
+                </template>
+                <template v-slot:skrzh>
+                    平台账户
+                </template>
+            </a-table>
+        </div>
+        <div class="mock-card" v-else>
+            <div class="title">提现记录</div>
+            <a-table
+                @page-change="(e) => pagination2.current = e"
+                :pagination="pagination2"
+                :data="vo2.rows"
+                :loading="loading2"
+                :columns="columns2">
+                <template v-slot:status="{record}">
+                    <div v-if="record.status===2" class="status success">{{ record.status_text }}</div>
+                    <div v-if="record.status===0" class="status primary">{{ record.status_text }}</div>
+                    <div v-if="record.status===1" class="status warning">{{ record.status_text }}</div>
+                    <div v-if="record.status===-1" class="status danger">{{ record.status_text }}</div>
+                </template>
+                <template v-slot:dzyt>
+                    余额提现
+                </template>
+                <template v-slot:money="{record}">
+                    -{{ record.money }}
+                </template>
+                <template v-slot:fkrzh>
+                    我的钱包
+                </template>
             </a-table>
         </div>
     </div>
@@ -145,4 +238,36 @@ onMounted(() => {
     letter-spacing: 0;
     margin-bottom: 20px;
 }
+
+.status {
+    @apply flex whitespace-nowrap items-center gap-[6px];
+    &::before {
+        content: '';
+        @apply block size-[6px] rounded-[50%];
+    }
+}
+
+.success {
+    &::before {
+        @apply bg-[rgb(var(--green-6))];
+    }
+}
+
+.danger {
+    &::before {
+        @apply bg-[rgb(var(--red-6))];
+    }
+}
+
+.warning {
+    &::before {
+        @apply bg-[rgb(var(--orange-6))];
+    }
+}
+
+.primary {
+    &::before {
+        @apply bg-[rgb(var(--arcoblue-6))];
+    }
+}
 </style>