From 1cdcbc9abeb74a4c594a2d791cda9bb328a71309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8?= <frankyang0820@outlook.com>
Date: Mon, 15 Jun 2026 12:01:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pnpm-lock.yaml                            | 10 +++----
 src/components/layout/Layout.vue          |  2 +-
 src/views/capital/rechange/index.vue      | 34 +++++++++++++++--------
 src/views/capital/rechange/options.ts     |  2 +-
 src/views/capital/transfer/index.vue      | 13 ++++-----
 src/views/capital/transfer/options.ts     |  2 +-
 src/views/capital/withdrawCheck/index.vue |  6 ++--
 src/views/profile/agent/options.ts        | 26 +++++++++--------
 src/views/profile/user/options.ts         | 10 ++++---
 9 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ab2851a..9387682 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,8 +39,8 @@ importers:
         specifier: ^1.11.20
         version: 1.11.20
       element-plus:
-        specifier: ^2.14.0
-        version: 2.14.1(vue@3.5.29(typescript@5.9.3))
+        specifier: 2.14.0
+        version: 2.14.0(vue@3.5.29(typescript@5.9.3))
       face-api.js:
         specifier: ^0.22.2
         version: 0.22.2
@@ -1567,8 +1567,8 @@ packages:
   electron-to-chromium@1.5.302:
     resolution: {integrity: sha512-sM6HAN2LyK82IyPBpznDRqlTQAtuSaO+ShzFiWTvoMJLHyZ+Y39r8VMfHzwbU8MVBzQ4Wdn85+wlZl2TLGIlwg==}
 
-  element-plus@2.14.1:
-    resolution: {integrity: sha512-UFnm1+BckNi+azkKJ7L32q1uXs9ekr99Z9pWTQPeDR05jqEWUwQq51ro4kZMVrANbjknX3Z7ukCZwTi2T6Tr9A==}
+  element-plus@2.14.0:
+    resolution: {integrity: sha512-POgH+TtoreaEKWqYYAVQyE6i8rQMEFqAEublyF29dBA5yASWPLKY6EzfeqBTr2Uv26mPss4vSrMrNPyaK7LX5w==}
     peerDependencies:
       vue: ^3.3.7
 
@@ -4111,7 +4111,7 @@ snapshots:
 
   electron-to-chromium@1.5.302: {}
 
-  element-plus@2.14.1(vue@3.5.29(typescript@5.9.3)):
+  element-plus@2.14.0(vue@3.5.29(typescript@5.9.3)):
     dependencies:
       '@ctrl/tinycolor': 4.2.0
       '@element-plus/icons-vue': 2.3.2(vue@3.5.29(typescript@5.9.3))
diff --git a/src/components/layout/Layout.vue b/src/components/layout/Layout.vue
index e224a51..22df770 100644
--- a/src/components/layout/Layout.vue
+++ b/src/components/layout/Layout.vue
@@ -74,7 +74,7 @@ const handleResize = () => {
   if (screenWidth.value < COLLAPSE_BREAKPOINT) {
     sidebarCollapsed.value = true
   }else {
-    sidebarCollapsed.value = false
+    // sidebarCollapsed.value = false
   }
 }
 
diff --git a/src/views/capital/rechange/index.vue b/src/views/capital/rechange/index.vue
index a66c31e..7034bf6 100644
--- a/src/views/capital/rechange/index.vue
+++ b/src/views/capital/rechange/index.vue
@@ -56,7 +56,8 @@
                     <div class="section-title">选择支付方式</div>
                     <div class="method-list">
                         <div v-for="method in paymentMethods" :key="method.code" class="method-item"
-                            :class="{ active: selectedMethod === method.code }" @click="handleSelectMethod(method.code)">
+                            :class="{ active: selectedMethod === method.code }"
+                            @click="handleSelectMethod(method.code)">
                             <div class="method-icon">
                                 <img :src="method.icon" :alt="method.name" />
                             </div>
@@ -115,7 +116,7 @@
         </template>
 
         <template v-else-if="rechangeForm.channelCode === 'TRC' || rechangeForm.channelCode === 'ERC'">
-        
+
             <div class="crypto-section">
                 <div class="crypto-left">
                     <div class="crypto-title">请向以下地址转账</div>
@@ -135,7 +136,9 @@
                         <el-input v-model="rechangeForm.address" readonly size="large" class="wallet-address-input">
                             <template #append>
                                 <el-button @click="handleCopyAddress" class="copy-btn">
-                                    <el-icon><DocumentCopy /></el-icon>
+                                    <el-icon>
+                                        <DocumentCopy />
+                                    </el-icon>
                                     <span>复制</span>
                                 </el-button>
                             </template>
@@ -143,13 +146,15 @@
                     </div>
                     <div class="wallet-type">
                         <span class="type-label">钱包类型:</span>
-                        <span class="type-value">{{ rechangeForm.channelCode === 'TRC' ? 'USDT-TRC20' : 'USDT-ERC20' }}</span>
+                        <span class="type-value">{{ rechangeForm.channelCode === 'TRC' ? 'USDT-TRC20' : 'USDT-ERC20'
+                            }}</span>
                     </div>
                 </div>
             </div>
             <!-- 充值金额 -->
             <el-form-item label="充值金额" size="large" prop="depositAmount">
-                <el-input v-model="rechangeForm.depositAmount" placeholder="请输入充值金额生成二维码和钱包地址" size="large" @input="handleAmountInput">
+                <el-input v-model="rechangeForm.depositAmount" placeholder="请输入充值金额生成二维码和钱包地址" size="large"
+                    @input="handleAmountInput">
                     <template #suffix>
                         <span class="currency-suffix">USDT</span>
                     </template>
@@ -219,7 +224,8 @@
 
                 <!-- 充值金额 -->
                 <el-form-item label="充值金额" prop="depositAmount">
-                    <el-input v-model="rechangeForm.depositAmount" placeholder="请输入充值金额" size="large" @input="handleAmountInput">
+                    <el-input v-model="rechangeForm.depositAmount" placeholder="请输入充值金额" size="large"
+                        @input="handleAmountInput">
                         <template #suffix>
                             <span class="currency-suffix">{{ rechangeForm.currencySymbol }}</span>
                         </template>
@@ -228,8 +234,8 @@
 
                 <!-- 上传凭证 -->
                 <el-form-item label="上传凭证" prop="voucherUrl">
-                    <el-upload class="voucher-uploader" action="" :show-file-list="false"
-                        :http-request="handleUpload" :before-upload="beforeAvatarUpload" :loading="uploadLoading">
+                    <el-upload class="voucher-uploader" action="" :show-file-list="false" :http-request="handleUpload"
+                        :before-upload="beforeAvatarUpload" :loading="uploadLoading">
                         <img v-if="voucherUrl" :src="voucherUrl" class="voucher-image" />
                         <div v-else class="upload-placeholder">
                             <el-icon class="upload-icon">
@@ -458,7 +464,13 @@ const fetchChannelList = async () => {
     try {
         const res = await getRechargeChannelList() as ChannelRow[]
         stopLoading()
-        channelList.value = res || []
+        channelList.value = (res || []).map((item) => {
+            return {
+                ...item,
+                symbol: item.currency.symbol
+            }
+        }) 
+        console.log('channelList.value:', channelList.value);
     } catch (error) {
         stopLoading()
         console.error('获取充值渠道列表失败', error)
@@ -570,7 +582,7 @@ const handleCreateOrder = async () => {
             paymentUrls.value = payUrls
             if (isMobileDevice.value) {
                 // 移动端：优先跳 safe.paylinktrust.com 域名，没有则跳第一个
-                const safeUrl = payUrls.find((url:string)=> url.includes('safe.paylinktrust.com'))
+                const safeUrl = payUrls.find((url: string) => url.includes('safe.paylinktrust.com'))
                 const payUrl = safeUrl || payUrls[0]
                 ElMessage.success('正在跳转支付页面...')
                 setTimeout(() => {
@@ -630,7 +642,7 @@ const handleUpload = async (options: any) => {
 // 生成二维码
 const handleGenerateQrcode = async () => {
     let pay = ERCPay
-    if(rechangeForm.value.channelCode === 'TRC'){
+    if (rechangeForm.value.channelCode === 'TRC') {
         pay = TRCPay
     }
     const res: any = await pay({
diff --git a/src/views/capital/rechange/options.ts b/src/views/capital/rechange/options.ts
index adc1747..f71cf97 100644
--- a/src/views/capital/rechange/options.ts
+++ b/src/views/capital/rechange/options.ts
@@ -2,7 +2,7 @@
 export const rechangeTableColumns = [
     { prop: 'name', label: '渠道名称', align: 'center' as const },
     {
-        prop: 'currency.symbol',
+        prop: 'symbol',
         label: '支持货币',
         align: 'center' as const
     },
diff --git a/src/views/capital/transfer/index.vue b/src/views/capital/transfer/index.vue
index 7c994cc..ff0abb0 100644
--- a/src/views/capital/transfer/index.vue
+++ b/src/views/capital/transfer/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="transfer table_form-container">
     <div class="title">转账</div>
-    <el-card class="transfer-card">
+    <div class="transfer-card">
       <div class="transfer-item">
         1.佣金钱包转出时,需要管理员审核通过后才能转账成功。其余内部转账操作无需通过管理员审核，如发现对应账号没有收到转账资金，请于客服人员联系。
       </div>
@@ -14,7 +14,7 @@
       <div class="transfer-item">
         4.第三方转账只支持钱包之间转账，且会转到对方主钱包(佣金钱包不允许转入)，需要管理员审核通过后才能转账成功
       </div>
-    </el-card>
+    </div>
     <div class="transfer-type">
       <div class="type-title">转账类型</div>
       <div class="tab">
@@ -452,19 +452,16 @@ const handleSubmit = async () => {
 
 <style scoped lang="scss">
 .transfer {
-  height: 100%;
-  overflow-y: scroll;
   .title {
     margin-bottom: 10px;
+    font-size: 38px;
+    font-weight: 900;
   }
 
   .transfer-card {
     background: rgb(160, 207, 255, 0.5);
     margin-bottom: 10px;
-
-    :deep(.el-card__body) {
-      padding: 10px 20px;
-    }
+    padding: 10px 20px;
 
     .transfer-item {
       line-height: 35px;
diff --git a/src/views/capital/transfer/options.ts b/src/views/capital/transfer/options.ts
index 20578d3..6a79483 100644
--- a/src/views/capital/transfer/options.ts
+++ b/src/views/capital/transfer/options.ts
@@ -6,7 +6,7 @@ export const internalFormItem = [
     // 转出账号
     { prop: 'transferOutAccount', label: '转出账号', type: 'select' as const, placeholder: '请选择转出账号', width: '150px', labelPosition: 'top' as const },
     // 转入账号
-    { prop: 'transferInAccount', label: '转入账号', type: 'select' as const, placeholder: '请选择转入账号', width: '150px', labelPosition: 'top' as const },
+    { prop: 'transferInAccount', label: '转入账号', type: 'input' as const, placeholder: '请输入转入账号', width: '150px', labelPosition: 'top' as const },
     // 转账金额
     { prop: 'transferAmount', label: '转账金额', type: 'input' as const, placeholder: '请输入转账金额', width: '150px', labelPosition: 'top' as const },
     // 备注
diff --git a/src/views/capital/withdrawCheck/index.vue b/src/views/capital/withdrawCheck/index.vue
index 31bcb66..948b75d 100644
--- a/src/views/capital/withdrawCheck/index.vue
+++ b/src/views/capital/withdrawCheck/index.vue
@@ -15,11 +15,11 @@
         >
             <!-- 操作列：驳回/通过按钮 -->
             <template #action="{ row }">
-                <el-button type="success" text size="small" @click="handleApprove(row)" v-auth="'user_reviewRechargeOrder'">
+                <el-button type="success" text size="small" @click="handleApprove(row)" v-auth="'withdraw_withdrawReviewOrder'">
                     通过
                 </el-button>
-                <span style="color: #dcdfe6; margin: 0 2px;" v-auth="'user_reviewRechargeOrder'">|</span>
-                <el-button type="danger" text size="small" @click="handleReject(row)" v-auth="'user_reviewRechargeOrder'">
+                <span style="color: #dcdfe6; margin: 0 2px;" v-auth="'withdraw_withdrawReviewOrder'">|</span>
+                <el-button type="danger" text size="small" @click="handleReject(row)" v-auth="'withdraw_withdrawReviewOrder'">
                     驳回
                 </el-button>
             </template>
diff --git a/src/views/profile/agent/options.ts b/src/views/profile/agent/options.ts
index 8d18204..640589a 100644
--- a/src/views/profile/agent/options.ts
+++ b/src/views/profile/agent/options.ts
@@ -5,48 +5,52 @@ export const search = [
     label: '账号名称',
     type: 'input' as const,
     placeholder: '请输入账号名称',
-    width: '200px',
+    width: '220px',
   },
   // 开始时间
   {
     prop: 'startTime',
     label: '注册开始时间',
+    placeholder: '请选择注册开始时间',
     type: 'date' as const,
     dateType: 'date' as const, // 时间范围选择器
     valueFormat: 'YYYY-MM-DD',
-    width: '240px',
+    width: '280px',
   },
   // 结束时间
   {
     prop: 'endTime',
     label: '注册结束时间',
+    placeholder: '请选择注册结束时间',
     type: 'date' as const,
     dateType: 'date' as const, // 时间范围选择器
     valueFormat: 'YYYY-MM-DD',
-    width: '240px',
+    width: '280px',
   },
 ]
 
 export const tableColumns = [
   // 账号名称
-  { label: '账号名称', prop: 'accountName' },
+  { label: '账号名称', prop: 'accountName' , width: '160' },
+  { label: '邮箱', prop: 'email', align: 'center' as const, width: '160px' },
+  { label: '手机号', prop: 'mobile', align: 'center' as const, width: '180' },
   // 账号id
-  { prop: 'userId', label: '账号id' },
+  { prop: 'userId', label: '账号id', width: '220'  },
   // 状态
   { prop: 'status', label: '状态' },
   // 账号角色
-  { prop: 'role', label: '账号角色' },
+  { prop: 'role', label: '账号角色' , width: '100' },
   // 账号数量
-  { prop: 'accountQty', label: '账号数量' },
+  { prop: 'accountQty', label: '账号数量' , width: '120' },
   { prop: 'amount', label: '资金', align: 'center' as const, isNumber: true },
   // 点差分配比例
-  { prop: 'marginRatio', label: '点差分配比例', slotName: 'marginRatio' },
+  { prop: 'marginRatio', label: '点差分配比例', slotName: 'marginRatio' , width: '140' },
   // 手续费分成比例
-  { prop: 'commissionRatio', label: '手续费分成比例', slotName: 'commissionRatio' },
+  { prop: 'commissionRatio', label: '手续费分成比例', slotName: 'commissionRatio' , width: '140' },
   // 注册时间
-  { prop: 'createTime', label: '注册时间', sortable: true },
+  { prop: 'createTime', label: '注册时间', sortable: false, width: '240'  },
   // 操作
-  { label: '操作', slotName: 'action', width: '150px'}
+  { label: '操作', slotName: 'action', width: '150px', fixed: 'right' as const}
 ]
 
 // 点差表格配置
diff --git a/src/views/profile/user/options.ts b/src/views/profile/user/options.ts
index 801f85b..16b6045 100644
--- a/src/views/profile/user/options.ts
+++ b/src/views/profile/user/options.ts
@@ -51,12 +51,14 @@ export const clientSearch = [
 //定义客户table列配置
 export const clientTableColumns = [
   { prop: 'id', label: 'ID', align: 'center' as const },
-  { prop: 'username', label: '用户名', align: 'center' as const },
-  { prop: 'createdTime', label: '注册时间', align: 'center' as const },
-  { prop: 'agentUsername', label: '所属代理', align: 'center' as const },
+  { label: '邮箱', prop: 'email', align: 'center' as const, width: '160px' },
+  { label: '手机号', prop: 'mobile', align: 'center' as const, width: '180' },
+  { prop: 'username', label: '用户名', align: 'center' as const , width: '220' },
+  { prop: 'createdTime', label: '注册时间', align: 'center' as const, width: '220'  },
+  { prop: 'agentUsername', label: '所属代理', align: 'center' as const , width: '160' },
   { prop: 'amount', label: '资金', align: 'center' as const, isNumber: true },
   { label: '状态', slotName: 'status', align: 'center' as const },
-  { label: '操作', slotName: 'action', align: 'center' as const },
+  { label: '操作', slotName: 'action', align: 'center' as const , width: '220', fixed: 'right' as const },
 ]
 
 //定义添加客户form配置