fix conflict

web/src/components/AITradersPage.tsx

@@ -8,7 +8,7 @@ import { useAuth } from '../contexts/AuthContext';
 import { getExchangeIcon } from './ExchangeIcons';
 import { getModelIcon } from './ModelIcons';
 import { TraderConfigModal } from './TraderConfigModal';
-import { Bot, Brain, Landmark, BarChart3, Trash2, Plus, Users, AlertTriangle } from 'lucide-react';
+import { Bot, Brain, Landmark, BarChart3, Trash2, Plus, Users, AlertTriangle, BookOpen } from 'lucide-react';
 
 // 获取友好的AI模型名称
 function getModelDisplayName(modelId: string): string {
@@ -1094,7 +1094,7 @@ function ModelConfigModal({
                   type="text"
                   value={modelName}
                   onChange={(e) => setModelName(e.target.value)}
-                  placeholder="例如: deepseek-chat, qwen-max, gpt-5"
+                  placeholder="例如: deepseek-chat, qwen3-max, gpt-5"
                   className="w-full px-3 py-2 rounded"
                   style={{ background: '#0B0E11', border: '1px solid #2B3139', color: '#EAECEF' }}
                 />
@@ -1161,7 +1161,9 @@ function ExchangeConfigModal({
   const [secretKey, setSecretKey] = useState('');
   const [passphrase, setPassphrase] = useState('');
   const [testnet, setTestnet] = useState(false);
-  
+  const [showGuide, setShowGuide] = useState(false);
+
+
   // Aster 特定字段
   const [asterUser, setAsterUser] = useState('');
   const [asterSigner, setAsterSigner] = useState('');
@@ -1219,21 +1221,34 @@ function ExchangeConfigModal({
           <h3 className="text-xl font-bold" style={{ color: '#EAECEF' }}>
             {editingExchangeId ? t('editExchange', language) : t('addExchange', language)}
           </h3>
-          {editingExchangeId && (
-            <button
-              type="button"
-              onClick={() => {
-                if (confirm(t('confirmDeleteExchange', language))) {
-                  onDelete(editingExchangeId);
-                }
-              }}
-              className="p-2 rounded hover:bg-red-100 transition-colors"
-              style={{ background: 'rgba(246, 70, 93, 0.1)', color: '#F6465D' }}
-              title={t('deleteConfigFailed', language)}
-            >
-              <Trash2 className="w-4 h-4" />
-            </button>
-          )}
+          <div className="flex items-center gap-2">
+            {selectedExchange?.id === 'binance' && (
+              <button
+                type="button"
+                onClick={() => setShowGuide(true)}
+                className="px-3 py-2 rounded text-sm font-semibold transition-all hover:scale-105 flex items-center gap-2"
+                style={{ background: 'rgba(240, 185, 11, 0.1)', color: '#F0B90B' }}
+              >
+                <BookOpen className="w-4 h-4" />
+                {t('viewGuide', language)}
+              </button>
+            )}
+            {editingExchangeId && (
+              <button
+                type="button"
+                onClick={() => {
+                  if (confirm(t('confirmDeleteExchange', language))) {
+                    onDelete(editingExchangeId);
+                  }
+                }}
+                className="p-2 rounded hover:bg-red-100 transition-colors"
+                style={{ background: 'rgba(246, 70, 93, 0.1)', color: '#F6465D' }}
+                title={t('deleteConfigFailed', language)}
+              >
+                <Trash2 className="w-4 h-4" />
+              </button>
+            )}
+          </div>
         </div>
 
         <form onSubmit={handleSubmit} className="space-y-4">
@@ -1458,6 +1473,34 @@ function ExchangeConfigModal({
           </div>
         </form>
       </div>
+
+      {/* Binance Setup Guide Modal */}
+      {showGuide && (
+        <div className="fixed inset-0 bg-black bg-opacity-75 flex items-center justify-center z-50 p-4" onClick={() => setShowGuide(false)}>
+          <div className="bg-gray-800 rounded-lg p-6 w-full max-w-4xl relative" style={{ background: '#1E2329' }} onClick={(e) => e.stopPropagation()}>
+            <div className="flex items-center justify-between mb-4">
+              <h3 className="text-xl font-bold flex items-center gap-2" style={{ color: '#EAECEF' }}>
+                <BookOpen className="w-6 h-6" style={{ color: '#F0B90B' }} />
+                {t('binanceSetupGuide', language)}
+              </h3>
+              <button
+                onClick={() => setShowGuide(false)}
+                className="px-4 py-2 rounded text-sm font-semibold transition-all hover:scale-105"
+                style={{ background: '#2B3139', color: '#848E9C' }}
+              >
+                {t('closeGuide', language)}
+              </button>
+            </div>
+            <div className="overflow-y-auto max-h-[80vh]">
+              <img
+                src="/images/guide.png"
+                alt={t('binanceSetupGuide', language)}
+                className="w-full h-auto rounded"
+              />
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   );
 }

web/src/i18n/translations.ts

@@ -257,6 +257,9 @@ export const translations = {
     exchangeConfigWarning2: '• Do not grant withdrawal permissions to ensure fund security',
     exchangeConfigWarning3: '• After deleting configuration, related traders will not be able to trade',
     edit: 'Edit',
+    viewGuide: 'View Guide',
+    binanceSetupGuide: 'Binance Setup Guide',
+    closeGuide: 'Close',
 
     // Error Messages
     createTraderFailed: 'Failed to create trader',
@@ -671,6 +674,9 @@ export const translations = {
     exchangeConfigWarning2: '• 不要授予提现权限，确保资金安全',
     exchangeConfigWarning3: '• 删除配置后，相关交易员将无法正常交易',
     edit: '编辑',
+    viewGuide: '查看教程',
+    binanceSetupGuide: '币安配置教程',
+    closeGuide: '关闭',
 
     // Error Messages
     createTraderFailed: '创建交易员失败',