diff --git a/frontend/src/components/search-stock.tsx b/frontend/src/components/search-stock.tsx
index f2b6aa7..e2bb15d 100644
--- a/frontend/src/components/search-stock.tsx
+++ b/frontend/src/components/search-stock.tsx
@@ -32,9 +32,10 @@ function SearchResultItem({ result, onSelect }: { result: SearchResult, onSelect
     const defaultSource = "Bloomberg"
     const [source, setSource] = useState(defaultSource)
     const [symbol, setSymbol] = useState(result.symbol) // Editable symbol state
+    const [market, setMarket] = useState(result.market) // Editable market state
 
     // 根据市场获取可用数据源列表
-    const availableSources = result.market === "CN" ? DATA_SOURCES.CN : DATA_SOURCES.GLOBAL
+    const availableSources = market === "CN" ? DATA_SOURCES.CN : DATA_SOURCES.GLOBAL
 
     return (
         <Card className="hover:bg-accent/50 transition-colors h-full flex flex-col">
@@ -54,9 +55,13 @@ function SearchResultItem({ result, onSelect }: { result: SearchResult, onSelect
                                 />
                             </div>
                         </div>
-                        <Badge variant="secondary" className="shrink-0 text-xs font-mono h-6">
-                            {result.market}
-                        </Badge>
+                        <div className="shrink-0 w-12">
+                            <Input
+                                value={market}
+                                onChange={(e) => setMarket(e.target.value)}
+                                className="h-6 text-xs font-mono px-1 text-center bg-secondary/50 border-transparent hover:border-input focus:border-input transition-colors"
+                            />
+                        </div>
                     </div>
                 </div>
 
@@ -78,7 +83,7 @@ function SearchResultItem({ result, onSelect }: { result: SearchResult, onSelect
                         </Select>
                     </div>
                     <Button
-                        onClick={() => onSelect({ ...result, symbol }, source)}
+                        onClick={() => onSelect({ ...result, symbol, market }, source)}
                         size="sm"
                         className="h-8 px-3 shrink-0"
                     >
diff --git a/frontend/src/components/stock-chart.tsx b/frontend/src/components/stock-chart.tsx
index b6e6d05..dde77cb 100644
--- a/frontend/src/components/stock-chart.tsx
+++ b/frontend/src/components/stock-chart.tsx
@@ -12,28 +12,25 @@ interface StockChartProps {
 export function StockChart({ symbol, market }: StockChartProps) {
 
     const getTradingViewUrl = () => {
-        let exchange = "NASDAQ"
-        let tvSymbol = symbol
-
+        // 对于特定亚洲市场，需要显式指定交易所前缀
         if (market === "CH" || market === "CN") {
-            if (symbol.startsWith("6")) exchange = "SSE"
-            else if (symbol.startsWith("0") || symbol.startsWith("3")) exchange = "SZSE"
+            let exchange = "SSE" // Default Shanghai
+            if (symbol.startsWith("0") || symbol.startsWith("3")) exchange = "SZSE"
             else if (symbol.startsWith("4") || symbol.startsWith("8")) exchange = "BSE"
+            return `https://cn.tradingview.com/chart/?symbol=${exchange}:${symbol}`
         } else if (market === "HK") {
-            exchange = "HKEX"
-            // Ensure no leading zeros for int conversion check
-            tvSymbol = parseInt(symbol).toString()
+            // 港股去重前面的0
+            const tvSymbol = parseInt(symbol).toString()
+            return `https://cn.tradingview.com/chart/?symbol=HKEX:${tvSymbol}`
         } else if (market === "JP") {
-            exchange = "TSE"
+            return `https://cn.tradingview.com/chart/?symbol=TSE:${symbol}`
         } else if (market === "VN") {
-            exchange = "HOSE"
-        } else {
-            // US
-            exchange = "NASDAQ" // Default fallback
+            return `https://cn.tradingview.com/chart/?symbol=HOSE:${symbol}`
         }
 
-        const fullSymbol = `${exchange}:${tvSymbol}`
-        return `https://cn.tradingview.com/chart/?symbol=${fullSymbol}`
+        // 对于其他市场 (US, BZ, UK 等)，直接传递 Symbol 让 TradingView 自动匹配
+        // 例如 "PETR4" -> Bovespa, "C" -> NYSE, "AAPL" -> NASDAQ
+        return `https://cn.tradingview.com/chart/?symbol=${symbol}`
     }
 
     useEffect(() => {