From 5f739fae13ff7debf54b2d8b9c17e77de6bc6b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8?= <frankyang0820@outlook.com>
Date: Wed, 20 May 2026 14:05:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=A0=E5=80=BC=E9=97=AE=E9=A2=98=E5=8F=8A?=
 =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91=E5=AF=BC=E8=88=AA=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Pagination.vue | 26 ++---------
 src/components/layout/Breadcrumb.vue | 67 ++++++++++++++++++++++++----
 src/components/layout/Tabs.vue       |  6 +--
 src/views/agent/user/index.vue       |  3 +-
 src/views/capital/fundFlow/index.vue |  4 +-
 src/views/capital/withdraw/index.vue | 10 ++---
 src/views/order/history/index.vue    |  3 +-
 src/views/order/transfer/index.vue   |  4 +-
 src/views/profile/agent/index.vue    |  3 +-
 9 files changed, 82 insertions(+), 44 deletions(-)

diff --git a/src/components/common/Pagination.vue b/src/components/common/Pagination.vue
index f03bf38..147df07 100644
--- a/src/components/common/Pagination.vue
+++ b/src/components/common/Pagination.vue
@@ -80,34 +80,16 @@ const pageSize = computed({
   set: (val: number) => emit('update:pageSizeValue', val),
 })
 
-// 监听当前页变化，派发事件
-watch(
-  () => currentPage,
-  (newVal) => {
-    emit('update:modelValue', newVal)
-    emit('pagination-change', { currentPage: newVal, pageSize })
-  },
-)
-
-// 监听每页条数变化，派发事件
-watch(
-  () => pageSize,
-  (newVal) => {
-    emit('update:pageSizeValue', newVal)
-    emit('pagination-change', { currentPage, pageSize: newVal })
-  },
-)
-
-// 每页条数变更处理（兼容Element Plus原生事件）
+// 每页条数变更处理
 const handleSizeChange = (val: number) => {
   emit('update:pageSizeValue', val)
-  emit('pagination-change', { currentPage, pageSize: val })
+  emit('pagination-change', { currentPage: currentPage.value, pageSize: val })
 }
 
-// 当前页变更处理（兼容Element Plus原生事件）
+// 当前页变更处理
 const handleCurrentChange = (val: number) => {
   emit('update:modelValue', val)
-  emit('pagination-change', { currentPage: val, pageSize })
+  emit('pagination-change', { currentPage: val, pageSize: pageSize.value })
 }
 </script>
 
diff --git a/src/components/layout/Breadcrumb.vue b/src/components/layout/Breadcrumb.vue
index fd466a8..60f1cd7 100644
--- a/src/components/layout/Breadcrumb.vue
+++ b/src/components/layout/Breadcrumb.vue
@@ -13,17 +13,68 @@
 </template>
 
 <script setup lang="ts">
-import { useTabsStore } from '@/stores/modules/tabs'
+import { useUserStore } from '@/stores/modules/user'
+import type { BreadcrumbItem } from '@/stores/modules/tabs'
 
-interface BreadcrumbItem {
-  title: string
-  path: string
-}
+const route = useRoute()
+const userStore = useUserStore()
 
-const tabsStore = useTabsStore()
+// 监听路由变化，直接计算面包屑
+const breadcrumbList = computed<BreadcrumbItem[]>(() => {
+  const path = route.path
+  const list: BreadcrumbItem[] = []
 
-// 从 tabs store 获取当前激活标签页的面包屑
-const breadcrumbList = computed<BreadcrumbItem[]>(() => tabsStore.currentBreadcrumbs)
+  // 如果是首页，直接返回首页
+  if (path === '/dashboard') {
+    list.push({ title: '首页', path: '/dashboard' })
+    return list
+  }
+
+  // 从菜单中查找当前路由的层级信息
+  const findMenuPath = (menus: any[], targetPath: string, parentMenu: any = null): any => {
+    for (const menu of menus) {
+      const menuPath = menu.path || menu.api || `/menu-${menu.id}`
+
+      if (menuPath === targetPath) {
+        return { current: menu, parent: parentMenu }
+      }
+
+      const subMenus = menu.children || menu.son
+      if (subMenus && subMenus.length > 0) {
+        const result = findMenuPath(subMenus, targetPath, menu)
+        if (result) return result
+      }
+    }
+    return null
+  }
+
+  const menuResult = findMenuPath(userStore.sideMenu, path)
+
+  if (menuResult) {
+    const { current, parent } = menuResult
+
+    if (parent) {
+      const firstChildMenus = parent.children || parent.son
+      const firstChildPath = firstChildMenus && firstChildMenus.length > 0
+        ? (firstChildMenus[0].path || firstChildMenus[0].api || `/menu-${firstChildMenus[0].id}`)
+        : parent.path || parent.api || `/menu-${parent.id}`
+
+      list.push({ title: parent.label, path: firstChildPath })
+    }
+
+    list.push({
+      title: current.label,
+      path: current.path || current.api || `/menu-${current.id}`
+    })
+  }
+
+  // 如果没有找到菜单信息，默认添加首页
+  if (list.length === 0) {
+    list.push({ title: '首页', path: '/dashboard' })
+  }
+
+  return list
+})
 </script>
 
 <style scoped lang="scss">
diff --git a/src/components/layout/Tabs.vue b/src/components/layout/Tabs.vue
index 5b8696d..0aea79b 100644
--- a/src/components/layout/Tabs.vue
+++ b/src/components/layout/Tabs.vue
@@ -46,7 +46,7 @@
     </button>
     
     <!-- 当前页面下拉菜单 -->
-    <el-dropdown trigger="click" @command="handleDropdownCommand" placement="bottom-end" ref="pageDropdownRef">
+    <!-- <el-dropdown trigger="click" @command="handleDropdownCommand" placement="bottom-end" ref="pageDropdownRef">
       <button class="current-page-btn" @click.stop="togglePageDropdown">
         <el-icon><MoreFilled /></el-icon>
       </button>
@@ -70,7 +70,7 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </template>
-    </el-dropdown>
+    </el-dropdown> -->
 
     <!-- 右键菜单 -->
     <teleport to="body">
@@ -448,7 +448,7 @@ const closeContextMenu = () => {
     }
     
     &.scroll-btn-right {
-      right: 66px;
+      right: 6px;
     }
   }
 
diff --git a/src/views/agent/user/index.vue b/src/views/agent/user/index.vue
index 8a55d31..b2617f5 100644
--- a/src/views/agent/user/index.vue
+++ b/src/views/agent/user/index.vue
@@ -485,8 +485,9 @@ const handleGetSubList = async (row: any) => {
 /**
  * @description: 定义分页方法
  */
-const handlePaginationChange = (page: { currentPage: number; size: number }) => {
+const handlePaginationChange = (page: { currentPage: number; pageSize: number }) => {
   currentPage.value = page.currentPage
+  pageSize.value = page.pageSize
   getCustomerList(userId.value)
 }
 
diff --git a/src/views/capital/fundFlow/index.vue b/src/views/capital/fundFlow/index.vue
index 6fe80b4..8b9d705 100644
--- a/src/views/capital/fundFlow/index.vue
+++ b/src/views/capital/fundFlow/index.vue
@@ -120,8 +120,8 @@ const handleReset = () => {
   searchForm.value = {
     username: '',
     subAccountId: '',
-    startTime: '',
-    endTime: '',
+    startTime: initTime.start,
+    endTime: initTime.end,
   }
   getFundDetailList()
 }
diff --git a/src/views/capital/withdraw/index.vue b/src/views/capital/withdraw/index.vue
index ed1b0da..d4dd634 100644
--- a/src/views/capital/withdraw/index.vue
+++ b/src/views/capital/withdraw/index.vue
@@ -12,12 +12,12 @@
         <el-button type="primary" size="small" @click.stop="handleWithdraw(row)">取款</el-button>
       </template>
     </Table>
-    <Pagination
-      v-model:page="queryParams.page"
-      v-model:limit="queryParams.limit"
+    <!-- <Pagination
+      v-model="queryParams.page"
+      v-model:pageSizeValue="queryParams.limit"
       :total="total"
-      @pagination="getList"
-    />
+      @pagination-change="getList"
+    /> -->
     <WithdrawDialog
       :visible="withdrawDialogVisible"
       :channel-id="currentChannelId"
diff --git a/src/views/order/history/index.vue b/src/views/order/history/index.vue
index 5192a2f..b252a89 100644
--- a/src/views/order/history/index.vue
+++ b/src/views/order/history/index.vue
@@ -168,8 +168,9 @@ const handleReset = () => {
 /**
  * @description: 定义分页方法
  */
-const handlePaginationChange = (page: { currentPage: number, size: number }) => {
+const handlePaginationChange = (page: { currentPage: number; pageSize: number }) => {
     currentPage.value = page.currentPage
+    pageSize.value = page.pageSize
     getCustomerTradeOrderList()
 }
 </script>
diff --git a/src/views/order/transfer/index.vue b/src/views/order/transfer/index.vue
index 47c0dfc..123ba45 100644
--- a/src/views/order/transfer/index.vue
+++ b/src/views/order/transfer/index.vue
@@ -144,7 +144,9 @@ const handleExport = async () => {
 /**
  * @description: 定义分页方法
  */
-const handlePaginationChange = async () => {
+const handlePaginationChange = async (page: { currentPage: number; pageSize: number }) => {
+  currentPage.value = page.currentPage
+  pageSize.value = page.pageSize
   getTransferDetailList()
 }
 </script>
diff --git a/src/views/profile/agent/index.vue b/src/views/profile/agent/index.vue
index e998f3f..c224a6c 100644
--- a/src/views/profile/agent/index.vue
+++ b/src/views/profile/agent/index.vue
@@ -428,8 +428,9 @@ const handleGetSubList = async (row: any) => {
 /**
  * @description: 定义分页方法
  */
-const handlePaginationChange = (page: { currentPage: number; size: number }) => {
+const handlePaginationChange = (page: { currentPage: number; pageSize: number }) => {
   currentPage.value = page.currentPage
+  pageSize.value = page.pageSize
   getCustomerList()
 }