fix: 修复未匹配订单更新逻辑和前端API类型定义

- 修复 PositionCheckService 中未匹配订单更新逻辑，当仓位数量大于等于订单数量总和时也能正确处理 - 修复前端 API 类型定义，添加 remark 和 website 字段支持 - 添加 Leader 备注和网站字段支持
2025-12-07 05:07:58 +08:00
parent cb167d442f
commit 5c136ab0f4
22 changed files with 1639 additions and 939 deletions
@@ -31,11 +31,7 @@ import CopyTradingSellOrders from './pages/CopyTradingSellOrders'
 import CopyTradingMatchedOrders from './pages/CopyTradingMatchedOrders'
 import FilteredOrdersList from './pages/FilteredOrdersList'
 import SystemSettings from './pages/SystemSettings'
-import LanguageSettings from './pages/LanguageSettings'
 import ApiHealthStatus from './pages/ApiHealthStatus'
-import ProxySettings from './pages/ProxySettings'
-import NotificationSettings from './pages/NotificationSettings'
-import BuilderApiKeySettings from './pages/BuilderApiKeySettings'
 import { wsManager } from './services/websocket'
 import type { OrderPushMessage } from './types'
 import { apiService } from './services/api'
@@ -264,11 +260,7 @@ function App() {
          <Route path="/statistics" element={<ProtectedRoute><Statistics /></ProtectedRoute>} />
          <Route path="/users" element={<ProtectedRoute><UserList /></ProtectedRoute>} />
          <Route path="/system-settings" element={<ProtectedRoute><SystemSettings /></ProtectedRoute>} />
-          <Route path="/system-settings/language" element={<ProtectedRoute><LanguageSettings /></ProtectedRoute>} />
          <Route path="/system-settings/api-health" element={<ProtectedRoute><ApiHealthStatus /></ProtectedRoute>} />
-          <Route path="/system-settings/proxy" element={<ProtectedRoute><ProxySettings /></ProtectedRoute>} />
-          <Route path="/system-settings/notifications" element={<ProtectedRoute><NotificationSettings /></ProtectedRoute>} />
-          <Route path="/system-settings/builder-api-key" element={<ProtectedRoute><BuilderApiKeySettings /></ProtectedRoute>} />
          
          {/* 默认重定向到登录页 */}
          <Route path="*" element={<Navigate to="/login" replace />} />
@@ -17,10 +17,7 @@ import {
  SettingOutlined,
  GithubOutlined,
  TwitterOutlined,
-  GlobalOutlined,
-  CheckCircleOutlined,
-  NotificationOutlined,
-  KeyOutlined
+  CheckCircleOutlined
 } from '@ant-design/icons'
 import type { MenuProps } from 'antd'
 import type { ReactNode } from 'react'
@@ -120,37 +117,17 @@ const Layout: React.FC<LayoutProps> = ({ children }) => {
    {
      key: '/system-settings',
      icon: <SettingOutlined />,
-      label: t('menu.systemSettings'),
+      label: t('menu.systemSettings') || '系统管理',
      children: [
        {
          key: '/system-settings',
          icon: <SettingOutlined />,
-          label: t('menu.systemOverview') || '概览'
-        },
-        {
-          key: '/system-settings/language',
-          icon: <GlobalOutlined />,
-          label: t('menu.language')
+          label: t('menu.systemOverview') || '通用设置'
        },
        {
          key: '/system-settings/api-health',
          icon: <CheckCircleOutlined />,
-          label: t('menu.apiHealth')
-        },
-        {
-          key: '/system-settings/proxy',
-          icon: <LinkOutlined />,
-          label: t('menu.proxy')
-        },
-        {
-          key: '/system-settings/builder-api-key',
-          icon: <KeyOutlined />,
-          label: t('menu.builderApiKey') || 'Builder API Key'
-        },
-        {
-          key: '/system-settings/notifications',
-          icon: <NotificationOutlined />,
-          label: t('menu.notifications')
+          label: t('menu.apiHealth') || 'API健康'
        }
      ]
    },
@@ -305,15 +305,30 @@
    "footer": "Please use the above pages for configuration management."
  },
  "systemSettings": {
+    "title": "General Settings",
+    "language": {
+      "title": "Language Settings",
+      "currentLanguage": "Current Language",
+      "languageRequired": "Please select a language"
+    },
+    "notification": {
+      "title": "Notification Settings"
+    },
+    "relayer": {
+      "title": "Relayer Configuration"
+    },
+    "proxy": {
+      "title": "Proxy Settings"
+    },
    "autoRedeem": {
      "title": "Auto Redeem Configuration",
-      "label": "Auto Redeem",
-      "tooltip": "When enabled, the system will automatically redeem redeemable positions. Requires Builder API Key configuration to take effect",
+      "label": "Enable Auto Redeem",
+      "tooltip": "When enabled, the system will automatically redeem all redeemable positions in all accounts. Requires Builder API Key configuration to take effect.",
      "builderApiKeyNotConfigured": "Builder API Key Not Configured",
      "builderApiKeyNotConfiguredDesc": "Auto redeem feature requires Builder API Key configuration to take effect.",
      "goToConfigure": "Go to Configure",
-      "saveSuccess": "Auto redeem configuration updated",
-      "saveFailed": "Failed to update auto redeem configuration"
+      "saveSuccess": "Auto redeem configuration saved",
+      "saveFailed": "Failed to save auto redeem configuration"
    }
  },
  "builderApiKey": {
@@ -394,6 +409,9 @@
    "leaderName": "Leader Name",
    "walletAddress": "Wallet Address",
    "category": "Category",
+    "remark": "Remark",
+    "website": "Website",
+    "openWebsite": "Open Website",
    "all": "All",
    "copyTradingCount": "Copy Trading Count",
    "copyTradingRelations": "{{count}} copy trading relations",
@@ -405,6 +423,52 @@
    "deleteConfirm": "Are you sure you want to delete this Leader?",
    "deleteConfirmDesc": "This Leader has {{count}} copy trading relations, please delete them first"
  },
+  "leaderAdd": {
+    "title": "Add Leader",
+    "leaderAddress": "Leader Wallet Address",
+    "leaderAddressRequired": "Please enter Leader wallet address",
+    "leaderAddressInvalid": "Invalid wallet address format (must be a 42-character address starting with 0x)",
+    "leaderAddressTooltip": "The wallet address of the leader to be copied. The system will monitor transactions from this address and automatically copy trade",
+    "leaderName": "Leader Name",
+    "leaderNameTooltip": "Optional, used to identify the Leader for easier management",
+    "leaderNamePlaceholder": "Optional, used to identify the Leader",
+    "remark": "Leader Remark",
+    "remarkTooltip": "Optional, used to record remarks about the Leader",
+    "remarkPlaceholder": "Optional, used to record remarks about the Leader",
+    "website": "Leader Website",
+    "websiteTooltip": "Optional, Leader's website link",
+    "websitePlaceholder": "Optional, e.g.: https://example.com",
+    "websiteInvalid": "Please enter a valid URL address",
+    "category": "Category Filter",
+    "categoryTooltip": "Only copy trades of this category. Leave empty to copy all categories (sports or crypto)",
+    "categoryPlaceholder": "Select category (optional)",
+    "add": "Add Leader",
+    "cancel": "Cancel",
+    "addSuccess": "Leader added successfully",
+    "addFailed": "Failed to add Leader"
+  },
+  "leaderEdit": {
+    "title": "Edit Leader",
+    "leaderName": "Leader Name",
+    "leaderNameTooltip": "Optional, used to identify the Leader for easier management",
+    "leaderNamePlaceholder": "Optional, used to identify the Leader",
+    "remark": "Leader Remark",
+    "remarkTooltip": "Optional, used to record remarks about the Leader",
+    "remarkPlaceholder": "Optional, used to record remarks about the Leader",
+    "website": "Leader Website",
+    "websiteTooltip": "Optional, Leader's website link",
+    "websitePlaceholder": "Optional, e.g.: https://example.com",
+    "websiteInvalid": "Please enter a valid URL address",
+    "category": "Category Filter",
+    "categoryTooltip": "Only copy trades of this category. Leave empty to copy all categories (sports or crypto)",
+    "categoryPlaceholder": "Select category (optional)",
+    "save": "Save",
+    "cancel": "Cancel",
+    "saveSuccess": "Leader updated successfully",
+    "saveFailed": "Failed to update Leader",
+    "fetchFailed": "Failed to get Leader details",
+    "invalidId": "Invalid Leader ID"
+  },
  "userList": {
    "title": "User Management",
    "username": "Username",
@@ -169,7 +169,10 @@
    "lastCheck": "最后检查",
    "healthy": "健康",
    "unhealthy": "不健康",
-    "unknown": "未知"
+    "unknown": "未知",
+    "normal": "正常",
+    "notConfigured": "未配置",
+    "abnormal": "异常"
  },
  "proxySettings": {
    "title": "代理设置",
@@ -217,15 +220,30 @@
    "footer": "请使用上述页面进行配置管理。"
  },
  "systemSettings": {
+    "title": "通用设置",
+    "language": {
+      "title": "多语言设置",
+      "currentLanguage": "当前语言",
+      "languageRequired": "请选择语言"
+    },
+    "notification": {
+      "title": "消息推送设置"
+    },
+    "relayer": {
+      "title": "Relayer 配置"
+    },
+    "proxy": {
+      "title": "代理设置"
+    },
    "autoRedeem": {
      "title": "自动赎回配置",
-      "label": "自动赎回",
-      "tooltip": "开启后，系统会自动赎回可赎回的仓位。需要配置 Builder API Key 才能生效",
+      "label": "启用自动赎回",
+      "tooltip": "开启后，系统将自动赎回所有账户中可赎回的仓位。需要配置 Builder API Key 才能生效。",
      "builderApiKeyNotConfigured": "Builder API Key 未配置",
      "builderApiKeyNotConfiguredDesc": "自动赎回功能需要配置 Builder API Key 才能生效。",
      "goToConfigure": "前往配置",
-      "saveSuccess": "自动赎回配置已更新",
-      "saveFailed": "更新自动赎回配置失败"
+      "saveSuccess": "自动赎回配置已保存",
+      "saveFailed": "保存自动赎回配置失败"
    }
  },
  "builderApiKey": {
@@ -306,6 +324,9 @@
    "leaderName": "Leader 名称",
    "walletAddress": "钱包地址",
    "category": "分类",
+    "remark": "备注",
+    "website": "网站",
+    "openWebsite": "打开网页",
    "all": "全部",
    "copyTradingCount": "跟单关系数",
    "copyTradingRelations": "{{count}} 个跟单关系",
@@ -317,6 +338,52 @@
    "deleteConfirm": "确定要删除这个 Leader 吗？",
    "deleteConfirmDesc": "该 Leader 还有 {{count}} 个跟单关系，请先删除跟单关系"
  },
+  "leaderAdd": {
+    "title": "添加 Leader",
+    "leaderAddress": "Leader 钱包地址",
+    "leaderAddressRequired": "请输入 Leader 钱包地址",
+    "leaderAddressInvalid": "钱包地址格式不正确（必须是 0x 开头的 42 位地址）",
+    "leaderAddressTooltip": "被跟单者的钱包地址，系统将监控该地址的交易并自动跟单",
+    "leaderName": "Leader 名称",
+    "leaderNameTooltip": "可选，用于标识 Leader，方便管理",
+    "leaderNamePlaceholder": "可选，用于标识 Leader",
+    "remark": "Leader 备注",
+    "remarkTooltip": "可选，用于记录 Leader 的备注信息",
+    "remarkPlaceholder": "可选，用于记录 Leader 的备注信息",
+    "website": "Leader 网站",
+    "websiteTooltip": "可选，Leader 的网站链接",
+    "websitePlaceholder": "可选，例如：https://example.com",
+    "websiteInvalid": "请输入有效的 URL 地址",
+    "category": "分类筛选",
+    "categoryTooltip": "仅跟单该分类的交易，不选择则跟单所有分类（sports 或 crypto）",
+    "categoryPlaceholder": "选择分类（可选）",
+    "add": "添加 Leader",
+    "cancel": "取消",
+    "addSuccess": "添加 Leader 成功",
+    "addFailed": "添加 Leader 失败"
+  },
+  "leaderEdit": {
+    "title": "编辑 Leader",
+    "leaderName": "Leader 名称",
+    "leaderNameTooltip": "可选，用于标识 Leader，方便管理",
+    "leaderNamePlaceholder": "可选，用于标识 Leader",
+    "remark": "Leader 备注",
+    "remarkTooltip": "可选，用于记录 Leader 的备注信息",
+    "remarkPlaceholder": "可选，用于记录 Leader 的备注信息",
+    "website": "Leader 网站",
+    "websiteTooltip": "可选，Leader 的网站链接",
+    "websitePlaceholder": "可选，例如：https://example.com",
+    "websiteInvalid": "请输入有效的 URL 地址",
+    "category": "分类筛选",
+    "categoryTooltip": "仅跟单该分类的交易，不选择则跟单所有分类（sports 或 crypto）",
+    "categoryPlaceholder": "选择分类（可选）",
+    "save": "保存",
+    "cancel": "取消",
+    "saveSuccess": "更新 Leader 成功",
+    "saveFailed": "更新 Leader 失败",
+    "fetchFailed": "获取 Leader 详情失败",
+    "invalidId": "Leader ID 无效"
+  },
  "userList": {
    "title": "用户管理",
    "username": "用户名",
@@ -305,15 +305,30 @@
    "footer": "請使用上述頁面進行配置管理。"
  },
  "systemSettings": {
+    "title": "通用設置",
+    "language": {
+      "title": "多語言設置",
+      "currentLanguage": "當前語言",
+      "languageRequired": "請選擇語言"
+    },
+    "notification": {
+      "title": "消息推送設置"
+    },
+    "relayer": {
+      "title": "Relayer 配置"
+    },
+    "proxy": {
+      "title": "代理設置"
+    },
    "autoRedeem": {
      "title": "自動贖回配置",
-      "label": "自動贖回",
-      "tooltip": "開啟後，系統會自動贖回可贖回的倉位。需要配置 Builder API Key 才能生效",
+      "label": "啟用自動贖回",
+      "tooltip": "開啟後，系統將自動贖回所有賬戶中可贖回的倉位。需要配置 Builder API Key 才能生效。",
      "builderApiKeyNotConfigured": "Builder API Key 未配置",
      "builderApiKeyNotConfiguredDesc": "自動贖回功能需要配置 Builder API Key 才能生效。",
      "goToConfigure": "前往配置",
-      "saveSuccess": "自動贖回配置已更新",
-      "saveFailed": "更新自動贖回配置失敗"
+      "saveSuccess": "自動贖回配置已保存",
+      "saveFailed": "保存自動贖回配置失敗"
    }
  },
  "builderApiKey": {
@@ -394,6 +409,9 @@
    "leaderName": "Leader 名稱",
    "walletAddress": "錢包地址",
    "category": "分類",
+    "remark": "備註",
+    "website": "網站",
+    "openWebsite": "打開網頁",
    "all": "全部",
    "copyTradingCount": "跟單關係數",
    "copyTradingRelations": "{{count}} 個跟單關係",
@@ -405,6 +423,52 @@
    "deleteConfirm": "確定要刪除這個 Leader 嗎？",
    "deleteConfirmDesc": "該 Leader 還有 {{count}} 個跟單關係，請先刪除跟單關係"
  },
+  "leaderAdd": {
+    "title": "添加 Leader",
+    "leaderAddress": "Leader 錢包地址",
+    "leaderAddressRequired": "請輸入 Leader 錢包地址",
+    "leaderAddressInvalid": "錢包地址格式不正確（必須是 0x 開頭的 42 位地址）",
+    "leaderAddressTooltip": "被跟單者的錢包地址，系統將監控該地址的交易並自動跟單",
+    "leaderName": "Leader 名稱",
+    "leaderNameTooltip": "可選，用於標識 Leader，方便管理",
+    "leaderNamePlaceholder": "可選，用於標識 Leader",
+    "remark": "Leader 備註",
+    "remarkTooltip": "可選，用於記錄 Leader 的備註信息",
+    "remarkPlaceholder": "可選，用於記錄 Leader 的備註信息",
+    "website": "Leader 網站",
+    "websiteTooltip": "可選，Leader 的網站鏈接",
+    "websitePlaceholder": "可選，例如：https://example.com",
+    "websiteInvalid": "請輸入有效的 URL 地址",
+    "category": "分類篩選",
+    "categoryTooltip": "僅跟單該分類的交易，不選擇則跟單所有分類（sports 或 crypto）",
+    "categoryPlaceholder": "選擇分類（可選）",
+    "add": "添加 Leader",
+    "cancel": "取消",
+    "addSuccess": "添加 Leader 成功",
+    "addFailed": "添加 Leader 失敗"
+  },
+  "leaderEdit": {
+    "title": "編輯 Leader",
+    "leaderName": "Leader 名稱",
+    "leaderNameTooltip": "可選，用於標識 Leader，方便管理",
+    "leaderNamePlaceholder": "可選，用於標識 Leader",
+    "remark": "Leader 備註",
+    "remarkTooltip": "可選，用於記錄 Leader 的備註信息",
+    "remarkPlaceholder": "可選，用於記錄 Leader 的備註信息",
+    "website": "Leader 網站",
+    "websiteTooltip": "可選，Leader 的網站鏈接",
+    "websitePlaceholder": "可選，例如：https://example.com",
+    "websiteInvalid": "請輸入有效的 URL 地址",
+    "category": "分類篩選",
+    "categoryTooltip": "僅跟單該分類的交易，不選擇則跟單所有分類（sports 或 crypto）",
+    "categoryPlaceholder": "選擇分類（可選）",
+    "save": "保存",
+    "cancel": "取消",
+    "saveSuccess": "更新 Leader 成功",
+    "saveFailed": "更新 Leader 失敗",
+    "fetchFailed": "獲取 Leader 詳情失敗",
+    "invalidId": "Leader ID 無效"
+  },
  "userList": {
    "title": "用戶管理",
    "username": "用戶名",
@@ -4,12 +4,14 @@ import { Card, Form, Input, Button, Select, message, Typography, Space } from 'a
 import { ArrowLeftOutlined } from '@ant-design/icons'
 import { apiService } from '../services/api'
 import { useMediaQuery } from 'react-responsive'
+import { useTranslation } from 'react-i18next'
 import { isValidWalletAddress } from '../utils'

 const { Title } = Typography
 const { Option } = Select

 const LeaderAdd: React.FC = () => {
+  const { t } = useTranslation()
  const navigate = useNavigate()
  const isMobile = useMediaQuery({ maxWidth: 768 })
  const [form] = Form.useForm()
@@ -21,17 +23,19 @@ const LeaderAdd: React.FC = () => {
      const response = await apiService.leaders.add({
        leaderAddress: values.leaderAddress.trim(),
        leaderName: values.leaderName?.trim() || undefined,
+        remark: values.remark?.trim() || undefined,
+        website: values.website?.trim() || undefined,
        category: values.category || undefined
      })
      
      if (response.data.code === 0) {
-        message.success('添加 Leader 成功')
+        message.success(t('leaderAdd.addSuccess') || '添加 Leader 成功')
        navigate('/leaders')
      } else {
-        message.error(response.data.msg || '添加 Leader 失败')
+        message.error(response.data.msg || t('leaderAdd.addFailed') || '添加 Leader 失败')
      }
    } catch (error: any) {
-      message.error(error.message || '添加 Leader 失败')
+      message.error(error.message || t('leaderAdd.addFailed') || '添加 Leader 失败')
    } finally {
      setLoading(false)
    }
@@ -47,7 +51,7 @@ const LeaderAdd: React.FC = () => {
        >
          返回
        </Button>
-        <Title level={2} style={{ margin: 0 }}>添加 Leader</Title>
+        <Title level={2} style={{ margin: 0 }}>{t('leaderAdd.title') || '添加 Leader'}</Title>
      </div>
      
      <Card>
@@ -61,41 +65,68 @@ const LeaderAdd: React.FC = () => {
          }}
        >
          <Form.Item
-            label="Leader 钱包地址"
+            label={t('leaderAdd.leaderAddress') || 'Leader 钱包地址'}
            name="leaderAddress"
            rules={[
-              { required: true, message: '请输入 Leader 钱包地址' },
+              { required: true, message: t('leaderAdd.leaderAddressRequired') || '请输入 Leader 钱包地址' },
              {
                validator: (_, value) => {
                  if (!value) {
-                    return Promise.reject(new Error('请输入 Leader 钱包地址'))
+                    return Promise.reject(new Error(t('leaderAdd.leaderAddressRequired') || '请输入 Leader 钱包地址'))
                  }
                  if (!isValidWalletAddress(value.trim())) {
-                    return Promise.reject(new Error('钱包地址格式不正确（必须是 0x 开头的 42 位地址）'))
+                    return Promise.reject(new Error(t('leaderAdd.leaderAddressInvalid') || '钱包地址格式不正确（必须是 0x 开头的 42 位地址）'))
                  }
                  return Promise.resolve()
                }
              }
            ]}
-            tooltip="被跟单者的钱包地址，系统将监控该地址的交易并自动跟单"
+            tooltip={t('leaderAdd.leaderAddressTooltip') || '被跟单者的钱包地址，系统将监控该地址的交易并自动跟单'}
          >
            <Input placeholder="0x..." style={{ fontFamily: 'monospace' }} />
          </Form.Item>
          
          <Form.Item
-            label="Leader 名称"
+            label={t('leaderAdd.leaderName') || 'Leader 名称'}
            name="leaderName"
-            tooltip="可选，用于标识 Leader，方便管理"
+            tooltip={t('leaderAdd.leaderNameTooltip') || '可选，用于标识 Leader，方便管理'}
          >
-            <Input placeholder="可选，用于标识 Leader" />
+            <Input placeholder={t('leaderAdd.leaderNamePlaceholder') || '可选，用于标识 Leader'} />
          </Form.Item>
          
          <Form.Item
-            label="分类筛选"
-            name="category"
-            tooltip="仅跟单该分类的交易，不选择则跟单所有分类（sports 或 crypto）"
+            label={t('leaderAdd.remark') || 'Leader 备注'}
+            name="remark"
+            tooltip={t('leaderAdd.remarkTooltip') || '可选，用于记录 Leader 的备注信息'}
          >
-            <Select placeholder="选择分类（可选）" allowClear>
+            <Input.TextArea 
+              placeholder={t('leaderAdd.remarkPlaceholder') || '可选，用于记录 Leader 的备注信息'} 
+              rows={3}
+              maxLength={500}
+              showCount
+            />
+          </Form.Item>
+          
+          <Form.Item
+            label={t('leaderAdd.website') || 'Leader 网站'}
+            name="website"
+            tooltip={t('leaderAdd.websiteTooltip') || '可选，Leader 的网站链接'}
+            rules={[
+              {
+                type: 'url',
+                message: t('leaderAdd.websiteInvalid') || '请输入有效的 URL 地址'
+              }
+            ]}
+          >
+            <Input placeholder={t('leaderAdd.websitePlaceholder') || '可选，例如：https://example.com'} />
+          </Form.Item>
+          
+          <Form.Item
+            label={t('leaderAdd.category') || '分类筛选'}
+            name="category"
+            tooltip={t('leaderAdd.categoryTooltip') || '仅跟单该分类的交易，不选择则跟单所有分类（sports 或 crypto）'}
+          >
+            <Select placeholder={t('leaderAdd.categoryPlaceholder') || '选择分类（可选）'} allowClear>
              <Option value="sports">Sports</Option>
              <Option value="crypto">Crypto</Option>
            </Select>
@@ -109,10 +140,10 @@ const LeaderAdd: React.FC = () => {
                loading={loading}
                size={isMobile ? 'middle' : 'large'}
              >
-                添加 Leader
+                {t('leaderAdd.add') || '添加 Leader'}
              </Button>
              <Button onClick={() => navigate('/leaders')}>
-                取消
+                {t('leaderAdd.cancel') || '取消'}
              </Button>
            </Space>
          </Form.Item>
@@ -4,12 +4,14 @@ import { Card, Form, Input, Button, Select, message, Typography, Space, Spin } f
 import { ArrowLeftOutlined } from '@ant-design/icons'
 import { apiService } from '../services/api'
 import { useMediaQuery } from 'react-responsive'
+import { useTranslation } from 'react-i18next'
 import type { Leader } from '../types'

 const { Title } = Typography
 const { Option } = Select

 const LeaderEdit: React.FC = () => {
+  const { t } = useTranslation()
  const navigate = useNavigate()
  const [searchParams] = useSearchParams()
  const isMobile = useMediaQuery({ maxWidth: 768 })
@@ -22,7 +24,7 @@ const LeaderEdit: React.FC = () => {
    if (leaderId) {
      fetchLeaderDetail(parseInt(leaderId))
    } else {
-      message.error('Leader ID 无效')
+      message.error(t('leaderEdit.invalidId') || 'Leader ID 无效')
      navigate('/leaders')
    }
  }, [leaderId, navigate])
@@ -35,14 +37,16 @@ const LeaderEdit: React.FC = () => {
        const leader: Leader = response.data.data
        form.setFieldsValue({
          leaderName: leader.leaderName || '',
+          remark: leader.remark || '',
+          website: leader.website || '',
          category: leader.category || undefined
        })
      } else {
-        message.error(response.data.msg || '获取 Leader 详情失败')
+        message.error(response.data.msg || t('leaderEdit.fetchFailed') || '获取 Leader 详情失败')
        navigate('/leaders')
      }
    } catch (error: any) {
-      message.error(error.message || '获取 Leader 详情失败')
+      message.error(error.message || t('leaderEdit.fetchFailed') || '获取 Leader 详情失败')
      navigate('/leaders')
    } finally {
      setFetching(false)
@@ -51,7 +55,7 @@ const LeaderEdit: React.FC = () => {
  
  const handleSubmit = async (values: any) => {
    if (!leaderId) {
-      message.error('Leader ID 无效')
+      message.error(t('leaderEdit.invalidId') || 'Leader ID 无效')
      return
    }
    
@@ -60,17 +64,19 @@ const LeaderEdit: React.FC = () => {
      const response = await apiService.leaders.update({
        leaderId: parseInt(leaderId),
        leaderName: values.leaderName?.trim() || undefined,
+        remark: values.remark?.trim() || undefined,
+        website: values.website?.trim() || undefined,
        category: values.category || undefined
      })
      
      if (response.data.code === 0) {
-        message.success('更新 Leader 成功')
+        message.success(t('leaderEdit.saveSuccess') || '更新 Leader 成功')
        navigate('/leaders')
      } else {
-        message.error(response.data.msg || '更新 Leader 失败')
+        message.error(response.data.msg || t('leaderEdit.saveFailed') || '更新 Leader 失败')
      }
    } catch (error: any) {
-      message.error(error.message || '更新 Leader 失败')
+      message.error(error.message || t('leaderEdit.saveFailed') || '更新 Leader 失败')
    } finally {
      setLoading(false)
    }
@@ -94,7 +100,7 @@ const LeaderEdit: React.FC = () => {
        >
          返回
        </Button>
-        <Title level={2} style={{ margin: 0 }}>编辑 Leader</Title>
+        <Title level={2} style={{ margin: 0 }}>{t('leaderEdit.title') || '编辑 Leader'}</Title>
      </div>
      
      <Card>
@@ -105,19 +111,46 @@ const LeaderEdit: React.FC = () => {
          size={isMobile ? 'middle' : 'large'}
        >
          <Form.Item
-            label="Leader 名称"
+            label={t('leaderEdit.leaderName') || 'Leader 名称'}
            name="leaderName"
-            tooltip="可选，用于标识 Leader，方便管理"
+            tooltip={t('leaderEdit.leaderNameTooltip') || '可选，用于标识 Leader，方便管理'}
          >
-            <Input placeholder="可选，用于标识 Leader" />
+            <Input placeholder={t('leaderEdit.leaderNamePlaceholder') || '可选，用于标识 Leader'} />
          </Form.Item>
          
          <Form.Item
-            label="分类筛选"
-            name="category"
-            tooltip="仅跟单该分类的交易，不选择则跟单所有分类（sports 或 crypto）"
+            label={t('leaderEdit.remark') || 'Leader 备注'}
+            name="remark"
+            tooltip={t('leaderEdit.remarkTooltip') || '可选，用于记录 Leader 的备注信息'}
          >
-            <Select placeholder="选择分类（可选）" allowClear>
+            <Input.TextArea 
+              placeholder={t('leaderEdit.remarkPlaceholder') || '可选，用于记录 Leader 的备注信息'} 
+              rows={3}
+              maxLength={500}
+              showCount
+            />
+          </Form.Item>
+          
+          <Form.Item
+            label={t('leaderEdit.website') || 'Leader 网站'}
+            name="website"
+            tooltip={t('leaderEdit.websiteTooltip') || '可选，Leader 的网站链接'}
+            rules={[
+              {
+                type: 'url',
+                message: t('leaderEdit.websiteInvalid') || '请输入有效的 URL 地址'
+              }
+            ]}
+          >
+            <Input placeholder={t('leaderEdit.websitePlaceholder') || '可选，例如：https://example.com'} />
+          </Form.Item>
+          
+          <Form.Item
+            label={t('leaderEdit.category') || '分类筛选'}
+            name="category"
+            tooltip={t('leaderEdit.categoryTooltip') || '仅跟单该分类的交易，不选择则跟单所有分类（sports 或 crypto）'}
+          >
+            <Select placeholder={t('leaderEdit.categoryPlaceholder') || '选择分类（可选）'} allowClear>
              <Option value="sports">Sports</Option>
              <Option value="crypto">Crypto</Option>
            </Select>
@@ -131,10 +164,10 @@ const LeaderEdit: React.FC = () => {
                loading={loading}
                size={isMobile ? 'middle' : 'large'}
              >
-                保存
+                {t('leaderEdit.save') || '保存'}
              </Button>
              <Button onClick={() => navigate('/leaders')}>
-                取消
+                {t('leaderEdit.cancel') || '取消'}
              </Button>
            </Space>
          </Form.Item>
@@ -1,12 +1,14 @@
 import { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
-import { Card, Table, Button, Space, Tag, Popconfirm, message, List, Empty, Spin, Divider } from 'antd'
-import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons'
+import { Card, Table, Button, Space, Tag, Popconfirm, message, List, Empty, Spin, Divider, Typography } from 'antd'
+import { PlusOutlined, EditOutlined, DeleteOutlined, LinkOutlined, GlobalOutlined } from '@ant-design/icons'
 import { useTranslation } from 'react-i18next'
 import { apiService } from '../services/api'
 import type { Leader } from '../types'
 import { useMediaQuery } from 'react-responsive'

+const { Text } = Typography
+
 const LeaderList: React.FC = () => {
  const { t, i18n } = useTranslation()
  const navigate = useNavigate()
@@ -73,6 +75,16 @@ const LeaderList: React.FC = () => {
        <Tag color={category === 'sports' ? 'blue' : 'green'}>{category}</Tag>
      ) : <Tag>{t('leaderList.all') || '全部'}</Tag>
    },
+    {
+      title: t('leaderList.remark') || '备注',
+      dataIndex: 'remark',
+      key: 'remark',
+      render: (remark: string | undefined) => remark ? (
+        <Text ellipsis={{ tooltip: remark }} style={{ maxWidth: isMobile ? 100 : 200 }}>
+          {remark}
+        </Text>
+      ) : <Text type="secondary">-</Text>
+    },
    {
      title: t('leaderList.copyTradingCount') || '跟单关系数',
      dataIndex: 'copyTradingCount',
@@ -97,9 +109,19 @@ const LeaderList: React.FC = () => {
    {
      title: t('common.actions') || '操作',
      key: 'action',
-      width: isMobile ? 120 : 150,
+      width: isMobile ? 150 : 200,
      render: (_: any, record: Leader) => (
-        <Space size="small">
+        <Space size="small" wrap>
+          {record.website && (
+            <Button
+              type="link"
+              size="small"
+              icon={<GlobalOutlined />}
+              onClick={() => window.open(record.website, '_blank', 'noopener,noreferrer')}
+            >
+              {t('leaderList.openWebsite') || '打开网页'}
+            </Button>
+          )}
          <Button
            type="link"
            size="small"
@@ -199,6 +221,35 @@ const LeaderList: React.FC = () => {
                        </div>
                      </div>
                      
+                      {/* 备注 */}
+                      {leader.remark && (
+                        <div style={{ marginBottom: '12px' }}>
+                          <Text type="secondary" style={{ fontSize: '12px' }}>
+                            {t('leaderList.remark') || '备注'}：
+                          </Text>
+                          <Text style={{ fontSize: '12px', marginLeft: '4px' }}>
+                            {leader.remark}
+                          </Text>
+                        </div>
+                      )}
+                      
+                      {/* 网站 */}
+                      {leader.website && (
+                        <div style={{ marginBottom: '12px' }}>
+                          <Text type="secondary" style={{ fontSize: '12px' }}>
+                            {t('leaderList.website') || '网站'}：
+                          </Text>
+                          <a 
+                            href={leader.website} 
+                            target="_blank" 
+                            rel="noopener noreferrer"
+                            style={{ fontSize: '12px', marginLeft: '4px' }}
+                          >
+                            <LinkOutlined /> {leader.website}
+                          </a>
+                        </div>
+                      )}
+                      
                      <Divider style={{ margin: '12px 0' }} />
                      
                      {/* 分类和跟单关系数 */}
@@ -221,13 +272,24 @@ const LeaderList: React.FC = () => {
                      </div>
                      
                      {/* 操作按钮 */}
-                      <div style={{ display: 'flex', gap: '8px' }}>
+                      <div style={{ display: 'flex', gap: '8px', flexWrap: 'wrap' }}>
+                        {leader.website && (
+                          <Button
+                            type="link"
+                            size="small"
+                            icon={<GlobalOutlined />}
+                            onClick={() => window.open(leader.website, '_blank', 'noopener,noreferrer')}
+                            style={{ flex: 1, minWidth: '80px' }}
+                          >
+                            {t('leaderList.openWebsite') || '打开网页'}
+                          </Button>
+                        )}
                        <Button
                          type="link"
                          size="small"
                          icon={<EditOutlined />}
                          onClick={() => navigate(`/leaders/edit?id=${leader.id}`)}
-                          style={{ flex: 1 }}
+                          style={{ flex: 1, minWidth: '80px' }}
                        >
                          {t('common.edit') || '编辑'}
                        </Button>
@@ -243,7 +305,7 @@ const LeaderList: React.FC = () => {
                            size="small" 
                            danger 
                            icon={<DeleteOutlined />}
-                            style={{ flex: 1 }}
+                            style={{ flex: 1, minWidth: '80px' }}
                          >
                            {t('common.delete') || '删除'}
                          </Button>
@@ -285,13 +285,13 @@ export const apiService = {
    /**
     * 添加 Leader
     */
-    add: (data: { leaderAddress: string; leaderName?: string; category?: string }) => 
+    add: (data: { leaderAddress: string; leaderName?: string; remark?: string; website?: string; category?: string }) => 
      apiClient.post<ApiResponse<any>>('/copy-trading/leaders/add', data),
    
    /**
     * 更新 Leader
     */
-    update: (data: { leaderId: number; leaderName?: string; category?: string }) => 
+    update: (data: { leaderId: number; leaderName?: string; remark?: string; website?: string; category?: string }) => 
      apiClient.post<ApiResponse<any>>('/copy-trading/leaders/update', data),
    
    /**
@@ -60,6 +60,8 @@ export interface Leader {
  leaderAddress: string
  leaderName?: string
  category?: string
+  remark?: string  // Leader 备注（可选）
+  website?: string  // Leader 网站（可选）
  copyTradingCount: number
  totalOrders?: number
  totalPnl?: string
@@ -772,7 +774,7 @@ export interface SystemConfig {
  builderApiKeyConfigured: boolean
  builderSecretConfigured: boolean
  builderPassphraseConfigured: boolean
-  autoRedeem: boolean  // 自动赎回（系统级别配置，默认开启）
+  autoRedeemEnabled: boolean  // 自动赎回（系统级别配置，默认开启）
 }

 /**