From dc9cba09b25cacc4dd922604c7c7c584afa0cf11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8?= <frankyang0820@outlook.com>
Date: Mon, 11 May 2026 17:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/user.scss          |  6 +++
 src/components/common/Pagination.vue | 16 ++++++--
 src/components/common/Table.vue      | 15 ++++++--
 src/components/layout/Layout.vue     |  9 +++--
 src/views/mould/risk/index.vue       |  5 ++-
 src/views/profile/agent/index.vue    | 56 ++++++++++++++--------------
 src/views/profile/business/index.vue | 25 +++++--------
 src/views/profile/user/index.vue     |  5 +++
 src/views/system/menu/index.vue      |  2 +-
 src/views/system/role/index.vue      |  2 +-
 src/views/system/setting/index.vue   |  2 +-
 src/views/trade/variety/index.vue    |  2 +-
 12 files changed, 85 insertions(+), 60 deletions(-)

diff --git a/src/assets/styles/user.scss b/src/assets/styles/user.scss
index 108dce3..f19d971 100644
--- a/src/assets/styles/user.scss
+++ b/src/assets/styles/user.scss
@@ -100,4 +100,10 @@
 .form-switch-leave-to {
   opacity: 0;
   transform: translateX(-10px) scale(0.98);
+}
+
+.table_form-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
 }
\ No newline at end of file
diff --git a/src/components/common/Pagination.vue b/src/components/common/Pagination.vue
index d3145f6..f03bf38 100644
--- a/src/components/common/Pagination.vue
+++ b/src/components/common/Pagination.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="pagination-container">
     <el-pagination
+      style="width: auto;"
       v-model:current-page="currentPage"
       v-model:page-size="pageSize"
       :page-sizes="pageSizes"
@@ -112,9 +113,16 @@ const handleCurrentChange = (val: number) => {
 
 <style scoped lang="scss">
 .pagination-container {
-  position: fixed;
-  bottom: 20px;
-  right: 20px;
-  z-index: 1000;
+  // position: fixed;
+  // bottom: 20px;
+  // float: right;
+  width: 100%;
+  display: flex;
+  padding: 10px;
+  background-color: #fff;
+  justify-content: flex-end;
+  align-items: flex-end;
+  // right: 20px;
+  // z-index: 1000;
 }
 </style>
diff --git a/src/components/common/Table.vue b/src/components/common/Table.vue
index 7b2147f..7d4cb68 100644
--- a/src/components/common/Table.vue
+++ b/src/components/common/Table.vue
@@ -2,8 +2,7 @@
   <div class="table-container">
     <el-table
       ref="tableRef"
-      height="100%"
-      style="width: 100%"
+      style="width: 100%; flex: 1"
       :data="tableData"
       :row-key="rowKey"
       :tree-props="treeProps"
@@ -142,7 +141,15 @@ defineExpose({
 <style scoped lang="scss">
 .table-container {
   width: 100%;
-  height: 100%;
-  // overflow: hidden;
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  :deep(.el-table) {
+    flex: 1;
+    overflow: auto;
+  }
 }
 </style>
diff --git a/src/components/layout/Layout.vue b/src/components/layout/Layout.vue
index a85d494..88fd09b 100644
--- a/src/components/layout/Layout.vue
+++ b/src/components/layout/Layout.vue
@@ -11,14 +11,17 @@
       <!-- 右侧内容区：面包屑 + 页签 + 主体内容 -->
       <section class="content-container">
         <!-- 面包屑导航 -->
-<!--        <Breadcrumb />-->
+        <!--        <Breadcrumb />-->
 
         <!-- 页签标签栏 -->
-<!--        <Tabs />-->
+        <!--        <Tabs />-->
 
         <!-- 主体内容区 -->
         <main class="main-content">
-          <transition name="fade-transform" mode="out-in">
+          <transition name="fade-transform" mode="out-in" 
+              style="height: 100%;
+                    display: flex;
+                    flex-direction: column;">
             <router-view v-slot="{ Component }">
               <KeepAlive>
                 <component :is="Component" :key="route.path" />
diff --git a/src/views/mould/risk/index.vue b/src/views/mould/risk/index.vue
index 3109978..5a75ede 100644
--- a/src/views/mould/risk/index.vue
+++ b/src/views/mould/risk/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="risk">
+  <div class="risk table_form-container">
     <div class="bar">
       <span>风控管理</span>
       <el-button type="primary" @click="handleAddRisk" v-auth="'riskControl_createRiskControl'"
@@ -380,12 +380,14 @@ const handleClose = () => {
   }
 
   .risk-table-content {
+    flex: 1;
     display: flex;
     gap: 10px;
 
     .table-switch {
       flex-basis: 20%;
       min-width: 200px;
+      height: 100%;
 
       :deep(.el-table__row.current-row) {
         background-color: #ecf5ff !important;
@@ -395,6 +397,7 @@ const handleClose = () => {
 
   .table-content {
     flex: 1;
+    height: 100%;
 
     .risk-content-group {
       display: flex;
diff --git a/src/views/profile/agent/index.vue b/src/views/profile/agent/index.vue
index 69f2f09..86ba2fa 100644
--- a/src/views/profile/agent/index.vue
+++ b/src/views/profile/agent/index.vue
@@ -3,36 +3,36 @@
     <!-- 搜索 -->
     <CustomerListSearch :search-form="searchForm" :search-options="searchOptions" @search="handleSearch"
       @reset="handleReset"></CustomerListSearch>
-    <!-- 表格 -->
-    <CustomerListTable :table-data="tableTree" :columns="tableColumnsOptions" row-key="userId"
-      :default-sort="{ prop: 'createTime', order: 'descending' }" @expand-change="handleGetSubList">
-      <template #marginRatio="{ row }">
-        <el-button v-if="row.role_id === 5" type="primary" size="small" v-auth="'agent_getSelfVarietyPointDiffConfig'"
-          @click="handleMarginRatio(row)">
-          修改
-        </el-button>
-      </template>
-      <template #commissionRatio="{ row }">
-        {{ row.commissionRatio }}
-        <el-button v-if="row.role_id === 5" type="primary" size="small" @click="handleCommissionRatio(row)"
-          v-auth="'agent_editAgent'">
-          修改
-        </el-button>
-      </template>
-      <template #action="{ row }">
-        <!-- <el-button link type="primary" size="small" @click="handleDetail(row)" v-if="row.userId">
+    <!-- 表格 --> 
+      <CustomerListTable :table-data="tableTree" :columns="tableColumnsOptions" row-key="userId"
+        :default-sort="{ prop: 'createTime', order: 'descending' }" @expand-change="handleGetSubList">
+        <template #marginRatio="{ row }">
+          <el-button v-if="row.role_id === 5" type="primary" size="small" v-auth="'agent_getSelfVarietyPointDiffConfig'"
+            @click="handleMarginRatio(row)">
+            修改
+          </el-button>
+        </template>
+        <template #commissionRatio="{ row }">
+          {{ row.commissionRatio }}
+          <el-button v-if="row.role_id === 5" type="primary" size="small" @click="handleCommissionRatio(row)"
+            v-auth="'agent_editAgent'">
+            修改
+          </el-button>
+        </template>
+        <template #action="{ row }">
+          <!-- <el-button link type="primary" size="small" @click="handleDetail(row)" v-if="row.userId">
           查看详情
         </el-button> -->
-        <!-- <el-divider direction="vertical" /> -->
-        <el-button link type="primary" size="small" @click="handleEditCustomer(row)">
-          编辑
-        </el-button>
-        <el-divider direction="vertical" />
-        <el-button link type="warning" size="small" @click="handleAdjustAmount(row)">
-          调整金额
-        </el-button>
-      </template>
-    </CustomerListTable>
+          <!-- <el-divider direction="vertical" /> -->
+          <el-button link type="primary" size="small" @click="handleEditCustomer(row)">
+            编辑
+          </el-button>
+          <el-divider direction="vertical" />
+          <el-button link type="warning" size="small" @click="handleAdjustAmount(row)">
+            调整金额
+          </el-button>
+        </template>
+      </CustomerListTable> 
     <!-- 分页 -->
     <CustomerListPagination v-model="currentPage" v-model:pageSizeValue="pageSize" :total="total"
       @pagination-change="handlePaginationChange" />
diff --git a/src/views/profile/business/index.vue b/src/views/profile/business/index.vue
index 2457b70..f8a4a9e 100644
--- a/src/views/profile/business/index.vue
+++ b/src/views/profile/business/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="market">
+  <div class="market table_form-container">
     <!-- 搜索 -->
     <MarketSearch :search-form="marketSearchForm" :search-options="marketSearchOptions" @search="handleSearch"
       @reset="handleReset">
@@ -316,7 +316,7 @@ const mapMarketTree = (data: any) => {
     closeProfitLoss: item.wallet_capital.closing_profit, //平仓盈亏
     riskMargin: item.wallet_capital.risk, //风险保证金
     serviceFee: item.wallet_capital.service, //服务费
-    flag: item.role_id * 1 === 5 ? (item.type! === 1 ? 1 : 2) : null,
+    flag: item.role_id * 1 === 5 ? item.type * 1 : null,
     //使用这个字段来判断是否是做市商
     mobile: item.mobile || '--',
     email: item.email || '--',
@@ -342,18 +342,10 @@ const handleMarketFormLinkage = async (type: 'level' | 'parentAccountName', valu
 
       // 调用获取上级账户列表接口
       let flag = null
-      if (
-        (selectedRow.value?.role_id * 1 === 5 || marketForm.value?.level * 1 === 5) &&
-        selectedRow.value?.type * 1 === 1
-      )
-        flag = 1
-      if (
-        (selectedRow.value?.role_id * 1 === 6 || marketForm.value?.level * 1 === 6) &&
-        selectedRow.value?.type * 1 === 2
-      )
-        flag = 2
-      const data = await getParAgentListApi({ role_id: value, flag: flag })
-      console.log('datasssssssssssss', data)
+      if (marketForm.value?.level * 1 === 5) flag = 1
+      if (marketForm.value?.level * 1 === 6) flag = 2
+      console.log('datasssssssssssss', marketForm.value)
+      const data = await getParAgentListApi({ role_id: +value === 6 ? 5 : value, flag: flag })
       // 格式化下拉选项
       marketFormOptionsMap.value.parentAccountName = data.map((item: any) => ({
         label: item.username,
@@ -380,7 +372,7 @@ const handleMarketFormLinkage = async (type: 'level' | 'parentAccountName', valu
       marketForm.value.maxCommissionRatio = rulesData.row.wallet_capital.fee_handling_percent
 
       // 调用获取点差列表接口
-      const data = await getPointDiffConfigListApi({ user_id: value })
+      const data = await getPointDiffConfigListApi({ user_id: value, flag: flag })
       // 格式化点差表格数据（按实际需求调整）
       marketPointTree.value = data.map((item: any) => ({
         ...item,
@@ -533,7 +525,7 @@ const handleEditMarket = async () => {
   try {
     // 先设置编辑模式，避免 watch 触发获取点差接口
     dialogType.value = 'edit'
-    
+
     // 先加载上级选项
     await handleMarketFormLinkage('level', marketForm.value.level)
     if (parentId) {
@@ -741,6 +733,7 @@ const handleCancel = async () => {
 
 .table-container {
   max-width: 100%;
+  height: 100%;
 }
 
 // 抽屉样式
diff --git a/src/views/profile/user/index.vue b/src/views/profile/user/index.vue
index 4fe9eec..4ca5bb0 100644
--- a/src/views/profile/user/index.vue
+++ b/src/views/profile/user/index.vue
@@ -522,6 +522,11 @@ const handleAdjustAmountClose = () => {
 </script>
 
 <style scoped lang="scss">
+.client{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
 :deep(.el-form-item__content) {
   margin-left: 0 !important;
 }
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index e8c1f9b..e40d192 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="system">
+  <div class="system table_form-container">
     <!-- 菜单列表头 -->
     <div class="header">
       <h4>菜单列表</h4>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3329642..1626030 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="system">
+  <div class="system table_form-container">
     <!-- 角色列表头 -->
     <div class="header">
       <h4>角色列表</h4>
diff --git a/src/views/system/setting/index.vue b/src/views/system/setting/index.vue
index 5bae996..63f1241 100644
--- a/src/views/system/setting/index.vue
+++ b/src/views/system/setting/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="system">
+  <div class="system table_form-container">
     <!-- 菜单列表头 -->
     <MenuHeader :title="menuTitle" :buttons="menuHeaderButtons" @click="handleAddMenu" />
     <!-- 菜单列表表格 -->
diff --git a/src/views/trade/variety/index.vue b/src/views/trade/variety/index.vue
index 1c85755..e4ff52f 100644
--- a/src/views/trade/variety/index.vue
+++ b/src/views/trade/variety/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="variety">
+  <div class="variety table_form-container">
     <!-- 搜索 -->
     <VarietySearch
       :search-form="searchForm"