From 4f021ab6940bd6c164f713ca1d6108b0e8c9268e Mon Sep 17 00:00:00 2001
From: wangyetao <2898314561@qq.com>
Date: Tue, 28 Oct 2025 16:48:46 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=BA=E7=9C=81?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E8=BF=94=E5=9B=9E=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/blank/blank.vue | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/pages/blank/blank.vue b/pages/blank/blank.vue
index 4a9eaad..c7e1491 100644
--- a/pages/blank/blank.vue
+++ b/pages/blank/blank.vue
@@ -1,21 +1,67 @@
 <template>
   <view class="blank-page">
+    <!-- 返回按钮 -->
+    <view class="back-button" @click="goBack">
+      <text class="back-icon">←</text>
+      <text class="back-text">返回</text>
+    </view>
+    
     <text class="tip">当前特斯拉该如何布局？</text>
   </view>
 </template>
 
 <script setup>
-// 空白页，无逻辑
+// 返回到 deepMate 页面
+const goBack = () => {
+  uni.navigateTo({
+    url: '/pages/deepMate/deepMate'
+  });
+};
 </script>
 
 <style scoped>
 .blank-page {
   display: flex;
+  flex-direction: column;
   align-items: center;
   justify-content: center;
   height: 100vh;
   background-color: #ffffff;
+  position: relative;
 }
+
+.back-button {
+  position: absolute;
+  top: 60rpx;
+  left: 30rpx;
+  display: flex;
+  align-items: center;
+  padding: 20rpx 30rpx;
+  background-color: #f5f5f5;
+  border-radius: 50rpx;
+  cursor: pointer;
+  transition: all 0.3s ease;
+}
+
+.back-button:hover {
+  background-color: #e0e0e0;
+}
+
+.back-button:active {
+  transform: scale(0.95);
+}
+
+.back-icon {
+  font-size: 32rpx;
+  color: #333333;
+  margin-right: 10rpx;
+}
+
+.back-text {
+  font-size: 28rpx;
+  color: #333333;
+}
+
 .tip {
   color: #999999;
   font-size: 28rpx;

From 376d8b559bf1ca2aa641213181cd763c3438e1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Tue, 28 Oct 2025 17:57:17 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E6=A6=82=E8=A7=88=E8=BF=9E=E6=8E=A5tcp=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=EF=BC=9B=E5=85=88=E6=96=AD=E5=BC=80=E5=86=8D=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/tcpConnection.js          |  21 ++
 components/MarketOverview.vue |  50 ++-
 pages/home/home.vue           | 705 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 759 insertions(+), 17 deletions(-)

diff --git a/api/tcpConnection.js b/api/tcpConnection.js
index 6dcc539..ffe9d88 100644
--- a/api/tcpConnection.js
+++ b/api/tcpConnection.js
@@ -30,6 +30,26 @@ class TCPConnection {
      * @param {Function} callback - 连接状态回调函数
      */
     connect(config = {}, callback = null) {
+        // 如果已经连接，先断开现有连接
+        if (this.isConnected) {
+            console.log('检测到现有TCP连接，先断开...');
+            this.disconnect(config);
+            // 等待断开完成后再连接
+            setTimeout(() => {
+                this._performConnect(config, callback);
+            }, 300);
+        } else {
+            // 直接连接
+            this._performConnect(config, callback);
+        }
+    }
+
+    /**
+     * 执行TCP连接
+     * @param {Object} config - 连接配置
+     * @param {Function} callback - 连接状态回调函数
+     */
+    _performConnect(config = {}, callback = null) {
         const connectionConfig = {
             channel: config.channel || TCP_CONFIG.channel,
             ip: config.ip || TCP_CONFIG.ip,
@@ -41,6 +61,7 @@ class TCPConnection {
             connectionConfig.charsetname = config.charsetname || TCP_CONFIG.charsetname;
         }
 
+        console.log('开始建立TCP连接:', connectionConfig);
         TCPSocket.connect(
             connectionConfig,
             result => {
diff --git a/components/MarketOverview.vue b/components/MarketOverview.vue
index d04fa4a..627abae 100644
--- a/components/MarketOverview.vue
+++ b/components/MarketOverview.vue
@@ -18,20 +18,13 @@
         <view class="forex-market">
           <!-- 上部分：三个汇率容器 -->
           <view class="forex-rates">
-            <view class="forex-rate-item up">
-              <text class="forex-pair">美元/日元</text>
-              <text class="forex-value">151.13</text>
-              <text class="forex-change">+1.62%</text>
-            </view>
-            <view class="forex-rate-item down">
-              <text class="forex-pair">美元/韩元</text>
-              <text class="forex-value">1424.900</text>
-              <text class="forex-change">-2.92%</text>
-            </view>
-            <view class="forex-rate-item up">
-              <text class="forex-pair">美元/英镑</text>
-              <text class="forex-value">0.730</text>
-              <text class="forex-change">+2.92%</text>
+            <view class="forex-rate-item" 
+                  v-for="(stock, index) in stockInfoList" 
+                  :key="index"
+                  :class="stock.change_percent >= 0 ? 'up' : 'down'">
+              <text class="forex-pair">{{ stock.stock_name }}</text>
+              <text class="forex-value">{{ stock.current_price }}</text>
+              <text class="forex-change">{{ stock.change }}</text>
             </view>
           </view>
           
@@ -94,6 +87,35 @@
 <script>
 export default {
   name: 'MarketOverview',
+  props: {
+    // 接收来自父组件的3个股票数据
+    stockInfoList: {
+      type: Array,
+      default: () => ([
+        {
+          stock_name: '美元/日元',
+          current_price: '151.13',
+          change: '+1.62%',
+          change_value: 0,
+          change_percent: 0
+        },
+        {
+          stock_name: '美元/韩元',
+          current_price: '1424.900',
+          change: '-2.92%',
+          change_value: 0,
+          change_percent: 0
+        },
+        {
+          stock_name: '美元/英镑',
+          current_price: '0.730',
+          change: '+2.92%',
+          change_value: 0,
+          change_percent: 0
+        }
+      ])
+    }
+  },
   data() {
     return {
       selectedMarket: 'forex',
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4124e11..a644625 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -17,7 +17,7 @@
 		<!-- 内容区域 - 使用滚动视图 -->
 		<scroll-view scroll-y class="content-container">
 			<!-- 1. 今日市场概览 -->
-			<market-overview></market-overview>
+			<market-overview :stock-info-list="currentStockInfoList"></market-overview>
 			
 			<!-- 间隔 -->
 			<view class="section-gap"></view>
@@ -122,7 +122,43 @@
 				</view>
 			</view>
 			
-			<!-- 5. 今日市场看点 -->
+			<!-- 5. TCP连接测试 -->
+			<!-- <view class="section tcp-test-section">
+				<view class="section-header">
+					<text class="section-title">TCP连接测试</text>
+					<view class="tcp-status" :class="{'connected': tcpConnected, 'disconnected': !tcpConnected}">
+						<text class="status-text">{{tcpConnected ? '已连接' : '未连接'}}</text>
+					</view>
+				</view> -->
+				
+				<!-- TCP控制按钮 -->
+				<!-- <view class="tcp-controls">
+					<button class="tcp-btn connect-btn" @click="connectTcp" :disabled="tcpConnected">连接</button>
+					<button class="tcp-btn disconnect-btn" @click="disconnectTcp" :disabled="!tcpConnected">断开</button>
+					<button class="tcp-btn send-btn" @click="sendTcpMessage" :disabled="!tcpConnected">发送测试消息</button>
+					<button class="tcp-btn status-btn" @click="getTcpStatus">查看状态</button>
+				</view> -->
+				
+				<!-- 消息记录 -->
+				<!-- <view class="tcp-messages" v-if="tcpMessages.length > 0">
+					<view class="messages-header">
+						<text class="messages-title">消息记录 ({{tcpMessages.length}})</text>
+						<button class="clear-btn" @click="clearTcpMessages">清空</button>
+					</view>
+					<scroll-view scroll-y class="messages-list" scroll-top="{{tcpMessages.length * 50}}">
+						<view class="message-item" v-for="(msg, index) in tcpMessages" :key="index" 
+							  :class="{'sent': msg.direction === 'sent', 'received': msg.direction === 'received'}">
+							<view class="message-info">
+								<text class="message-direction">{{msg.direction === 'sent' ? '发送' : '接收'}}</text>
+								<text class="message-time">{{msg.timestamp}}</text>
+							</view>
+							<text class="message-content">{{msg.content}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view> -->
+			
+			<!-- 6. 今日市场看点 -->
 			<view class="section-header highlights-title-container">
 				<text class="section-title">今日市场核心看点</text>
 			</view>
@@ -143,6 +179,8 @@
 import footerBar from '../../components/footerBar.vue'
 import MarketOverview from '../../components/MarketOverview.vue'
 import DeepMate from '../../components/DeepMate.vue'
+import tcpConnection from '../../api/tcpConnection.js'
+import th from '../../static/language/th'
 
 export default {
 	components: {
@@ -178,7 +216,62 @@ export default {
 			],
 			
 			// 防抖定时器
-			debounceTimer: null
+			debounceTimer: null,
+			
+			// TCP连接相关状态
+			tcpConnected: false,
+			tcpMessages: [],
+			lastSentMessage: '',
+			
+			// TCP监听器引用，用于移除监听器
+			connectionListener: null,
+			messageListener: null,
+			
+			// TCP股票数据存储
+			tcpStockData: {
+				count: 0,
+				data: {},
+				stock_count: 0,
+				timestamp: '',
+				type: ''
+			},
+			
+			// TCP数据缓存机制，用于处理分片数据
+			tcpDataCache: {
+				isCollecting: false,  // 是否正在收集数据片段
+				expectedCount: 0,     // 期望的数据总数
+				collectedData: {},    // 已收集的数据对象（用于对象级拼接）
+				timestamp: '',        // 数据时间戳
+				type: '',            // 数据类型
+				// 新增：字符串片段缓存
+				firstPartData: '',   // 前半部分数据字符串
+				isWaitingSecondPart: false  // 是否正在等待后半部分数据
+			},
+			
+			// 当前显示的3个股票数据（用于MarketOverview组件）
+			currentStockInfoList: [
+				{
+					stock_name: '美元/日元',
+					current_price: '151.13',
+					change: '+1.62%',
+					change_value: 0,
+					change_percent: 0
+				},
+				{
+					stock_name: '美元/韩元',
+					current_price: '1424.900',
+					change: '-2.92%',
+					change_value: 0,
+					change_percent: 0
+				},
+				{
+					stock_name: '美元/英镑',
+					current_price: '0.730',
+					change: '+2.92%',
+					change_value: 0,
+					change_percent: 0
+				}
+			]
 		}
 	},
 
@@ -201,6 +294,34 @@ export default {
 				}
 			})
 		})
+		
+		// 初始化TCP连接监听器
+		this.initTcpListeners()
+		
+		// 页面渲染完成后自动连接TCP
+		this.$nextTick(() => {
+			console.log('页面渲染完成，开始自动连接TCP服务器...')
+			this.connectTcp()
+		})
+	},
+
+	// 页面销毁前的清理工作
+	onUnload() {
+		// 自动关闭TCP连接
+		if (this.tcpConnected) {
+			console.log('页面销毁，自动关闭TCP连接')
+			tcpConnection.disconnect()
+			this.tcpConnected = false
+		}
+		
+		// 清理防抖定时器
+		if (this.debounceTimer) {
+			clearTimeout(this.debounceTimer)
+			this.debounceTimer = null
+		}
+		
+		// 移除TCP监听器，防止内存泄漏
+		this.removeTcpListeners()
 	},
 	
 	methods: {
@@ -223,6 +344,433 @@ export default {
 				fn()
 				this.debounceTimer = null
 			}, delay)
+		},
+		
+		// TCP连接相关方法
+		
+		// 初始化TCP监听器
+		initTcpListeners() {
+			// 创建连接状态监听器并保存引用
+			this.connectionListener = (status, result) => {
+				this.tcpConnected = (status === 'connected')
+				console.log('TCP连接状态变化:', status, this.tcpConnected)
+				
+				// 显示连接状态提示
+				uni.showToast({
+					title: status === 'connected' ? '连接服务器成功' : '服务器连接断开',
+					icon: status === 'connected' ? 'success' : 'none',
+					duration: 1000
+				})
+				
+				// 连接成功后自动发送股票数据请求命令
+				if (status === 'connected') {
+					console.log('TCP连接成功，自动发送股票数据请求...')
+					// 延迟一小段时间确保连接稳定后再发送命令
+					setTimeout(() => {
+						this.sendTcpMessage()
+					}, 500)
+				}
+			}
+			
+			// 创建消息监听器并保存引用
+			this.messageListener = (type, message, parsedArray) => {
+				const messageObj = {
+					type: type,
+					content: message,
+					parsedArray: parsedArray,
+					timestamp: new Date().toLocaleTimeString(),
+					direction: 'received'
+				}
+				console.log("0000")
+				this.tcpMessages.push(messageObj)
+				// console.log('收到TCP消息:', messageObj)
+				console.log('home开始调用parseStockData',messageObj)
+				
+				// 解析股票数据
+				this.parseStockData(message)
+			}
+			
+			// 注册监听器
+			tcpConnection.onConnectionChange(this.connectionListener)
+			tcpConnection.onMessage(this.messageListener)
+		},
+		
+		// 连接TCP服务器
+		connectTcp() {
+			console.log('开始连接TCP服务器...')
+			
+			// 先断开现有连接（如果存在）
+			if (this.tcpConnected) {
+				console.log('检测到现有连接，先断开...')
+				this.disconnectTcp()
+				// 等待断开完成后再连接
+				setTimeout(() => {
+					this.performTcpConnect()
+				}, 500)
+			} else {
+				// 直接连接
+				this.performTcpConnect()
+			}
+		},
+		
+		// 执行TCP连接
+		performTcpConnect() {
+			console.log('执行TCP连接...')
+			tcpConnection.connect(
+				{
+					ip: '192.168.1.9',
+					port: '8080',
+					channel: '1', // 可选 1~20
+					charsetname: 'UTF-8' // 默认UTF-8，可选GBK
+				}
+			)
+		},
+		
+		// 断开TCP连接
+		disconnectTcp() {
+			console.log('断开TCP连接...')
+			tcpConnection.disconnect(
+				{
+					ip: '192.168.1.9',
+					port: '8080',
+					channel: '1', // 可选 1~20
+					charsetname: 'UTF-8' // 默认UTF-8，可选GBK
+				}
+			)
+			this.tcpConnected = false
+		},
+		
+		// 发送TCP消息
+		sendTcpMessage() {
+			// 构造要发送的消息对象
+			const messageData = 
+			// {
+			// 	command: "real_time",
+			// 	stock_code: "SH.000001"
+			// }
+			// {"command": "stock_list"}
+			// {"command": "batch_real_time", "stock_codes": ["SH.000001"]}
+			 {"command": "batch_real_time", "stock_codes": ["SH.000001","SH.000002","SH.000003"]}
+			
+			// 发送消息
+			const success = tcpConnection.send(messageData)
+			if (success) {
+				console.log('home发送TCP消息:', messageData)
+				uni.showToast({
+					title: '服务器连接成功',
+					icon: 'success',
+					duration: 1500
+				})
+			}
+		},
+		
+		
+		// 清空消息记录
+		clearTcpMessages() {    
+			this.tcpMessages = []
+			uni.showToast({
+				title: '消息记录已清空',
+				icon: 'success',
+				duration: 1500
+			})
+		},
+		
+		// 获取TCP连接状态
+		getTcpStatus() {
+			const status = tcpConnection.getConnectionStatus()
+			uni.showModal({
+				title: 'TCP连接状态',
+				content: `当前状态: ${status ? '已连接' : '未连接'}\n消息数量: ${this.tcpMessages.length}`,
+				showCancel: false
+			})
+		},
+		
+		// 验证数据完整性（检查count值与data对象个数是否相等）
+		validateDataIntegrity(parsedMessage) {
+			if (!parsedMessage.count || !parsedMessage.data) {
+				return false
+			}
+			
+			const dataObjectCount = Object.keys(parsedMessage.data).length
+			const expectedCount = parsedMessage.count
+			
+			console.log(`数据完整性验证: 期望${expectedCount}个对象，实际${dataObjectCount}个对象`)
+			return dataObjectCount === expectedCount
+		},
+		
+		// 检查数据状态（完整数据、前半部分数据、后半部分数据）
+		getDataStatus(message) {
+			if (typeof message !== 'string') {
+				return 'invalid'
+			}
+			
+			const trimmedMessage = message.trim()
+			const startsWithBrace = trimmedMessage.startsWith('{')
+			const endsWithBrace = trimmedMessage.endsWith('}')
+			
+			if (startsWithBrace && endsWithBrace) {
+				// 以{开头，以}结尾 - 完整数据
+				console.log('检测到完整数据格式')
+				return 'complete'
+			} else if (startsWithBrace && !endsWithBrace) {
+				// 以{开头，不以}结尾 - 前半部分数据
+				console.log('检测到前半部分数据')
+				return 'first_part'
+			} else if (!startsWithBrace && endsWithBrace) {
+				// 不以{开头，以}结尾 - 后半部分数据
+				console.log('检测到后半部分数据')
+				return 'second_part'
+			} else {
+				// 其他情况 - 无效数据
+				console.log('检测到无效数据格式')
+				return 'invalid'
+				
+			}
+		},
+		
+		// 缓存前半部分数据
+		cacheFirstPartData(message) {
+			this.tcpDataCache.firstPartData = message.trim()
+			this.tcpDataCache.isWaitingSecondPart = true
+			console.log('已缓存前半部分数据，长度:', this.tcpDataCache.firstPartData.length)
+		},
+		
+		// 拼接前后两部分数据
+		concatenateDataParts(secondPartMessage) {
+			const completeMessage = this.tcpDataCache.firstPartData + secondPartMessage.trim()
+			console.log('数据拼接完成，完整数据长度:', completeMessage.length)
+			
+			// 清空缓存
+			this.clearStringFragmentCache()
+			
+			return completeMessage
+		},
+		
+		// 清空字符串片段缓存
+		clearStringFragmentCache() {
+			this.tcpDataCache.firstPartData = ''
+			this.tcpDataCache.isWaitingSecondPart = false
+			console.log('字符串片段缓存已清空')
+		},
+		
+		// 合并数据到缓存中
+		mergeDataToCache(parsedMessage) {
+			// 如果是第一次收集数据，初始化缓存
+			if (!this.tcpDataCache.isCollecting) {
+				this.tcpDataCache.isCollecting = true
+				this.tcpDataCache.expectedCount = parsedMessage.count
+				this.tcpDataCache.collectedData = {}
+				this.tcpDataCache.timestamp = parsedMessage.timestamp
+				this.tcpDataCache.type = parsedMessage.type
+				console.log('开始收集数据片段，期望总数:', parsedMessage.count)
+			}
+			
+			// 合并新数据到缓存中
+			if (parsedMessage.data) {
+				Object.assign(this.tcpDataCache.collectedData, parsedMessage.data)
+				console.log('数据片段已合并，当前已收集:', Object.keys(this.tcpDataCache.collectedData).length, '个对象')
+			}
+		},
+		
+		// 检查缓存数据是否完整
+		isCacheDataComplete() {
+			const collectedCount = Object.keys(this.tcpDataCache.collectedData).length
+			const expectedCount = this.tcpDataCache.expectedCount
+			
+			console.log(`缓存数据检查: 已收集${collectedCount}个，期望${expectedCount}个`)
+			return collectedCount === expectedCount && collectedCount > 0
+		},
+		
+		// 获取完整的缓存数据并清空缓存
+		getCompleteDataFromCache() {
+			const completeData = {
+				count: this.tcpDataCache.expectedCount,
+				data: { ...this.tcpDataCache.collectedData },
+				stock_count: this.tcpDataCache.expectedCount,
+				timestamp: this.tcpDataCache.timestamp,
+				type: this.tcpDataCache.type
+			}
+			
+			// 清空缓存
+			this.tcpDataCache.isCollecting = false
+			this.tcpDataCache.expectedCount = 0
+			this.tcpDataCache.collectedData = {}
+			this.tcpDataCache.timestamp = ''
+			this.tcpDataCache.type = ''
+			
+			console.log('获取完整数据并清空缓存，数据对象数:', Object.keys(completeData.data).length)
+			return completeData
+		},
+		
+		// 解析TCP股票数据
+		parseStockData(message) {
+			try {
+				console.log('进入parseStockData, message类型:', typeof message, '长度:', message.length)
+				
+				// 第一步：检查数据状态（完整、前半部分、后半部分）
+				const dataStatus = this.getDataStatus(message)
+				
+				let completeMessage = ''
+				
+				switch (dataStatus) {
+					case 'complete':
+						// 完整数据，直接处理
+						console.log('检测到完整数据，直接处理')
+						completeMessage = message
+						break
+						
+					case 'first_part':
+						// 前半部分数据，缓存并等待后半部分
+						console.log('检测到前半部分数据，开始缓存')
+						this.cacheFirstPartData(message)
+						return // 等待后半部分数据
+						
+					case 'second_part':
+						// 后半部分数据，检查是否有缓存的前半部分
+						if (this.tcpDataCache.isWaitingSecondPart) {
+							console.log('检测到后半部分数据，开始拼接')
+							completeMessage = this.concatenateDataParts(message)
+						} else {
+							console.log('收到后半部分数据，但没有缓存的前半部分，跳过处理')
+							return
+						}
+						break
+						
+					case 'invalid':
+					default:
+						console.log('数据格式无效，跳过处理')
+						return
+				}
+				
+				// 第二步：解析完整的JSON数据
+				let parsedMessage
+				try {
+					console.log('开始解析完整JSON数据，长度:', completeMessage.length)
+					parsedMessage = JSON.parse(completeMessage)
+					console.log('JSON解析成功，解析后类型:', typeof parsedMessage, parsedMessage)
+				} catch (parseError) {
+					console.error('JSON解析失败:', parseError.message)
+					// 清空字符串片段缓存
+					this.clearStringFragmentCache()
+					return
+				}
+				
+				// 第三步：检查是否是股票数据类型
+				if (!((parsedMessage.type === 'batch_data_chunk' || parsedMessage.type === 'batch_realtime_data') && parsedMessage.data)) {
+					console.log('不是batch_data_chunk或batch_realtime_data类型的消息，跳过处理')
+					return
+				}
+				
+				console.log('开始处理股票数据')
+				
+				// 第四步：验证数据完整性（对象级别的完整性检查）
+				// 注意：batch_data_chunk类型的数据不需要验证完整性，直接处理
+				if (parsedMessage.type === 'batch_data_chunk') {
+					console.log('batch_data_chunk类型数据，跳过完整性验证，直接处理')
+					this.processCompleteStockData(parsedMessage)
+				} else {
+					const isDataComplete = this.validateDataIntegrity(parsedMessage)
+					
+					if (isDataComplete) {
+						// 数据完整，直接处理
+						console.log('对象级数据完整，直接处理')
+						this.processCompleteStockData(parsedMessage)
+					} else {
+						// 数据不完整，需要拼接（对象级别的拼接）
+						console.log('对象级数据不完整，开始拼接处理')
+						
+						// 将当前数据合并到缓存中
+						this.mergeDataToCache(parsedMessage)
+					
+						// 检查缓存中的数据是否已经完整
+						if (this.isCacheDataComplete()) {
+							console.log('缓存数据已完整，开始处理')
+							const completeData = this.getCompleteDataFromCache()
+							this.processCompleteStockData(completeData)
+						} else {
+							console.log('缓存数据仍不完整，等待更多数据片段')
+						}
+					}
+				}
+			} catch (error) {
+				console.error('解析TCP股票数据失败:', error.message)
+				console.error('错误详情:', error)
+				// 发生错误时清空所有缓存
+				this.clearStringFragmentCache()
+				if (this.tcpDataCache.isCollecting) {
+					console.log('发生错误，清空对象级数据缓存')
+					this.tcpDataCache.isCollecting = false
+					this.tcpDataCache.expectedCount = 0
+					this.tcpDataCache.collectedData = {}
+					this.tcpDataCache.timestamp = ''
+					this.tcpDataCache.type = ''
+				}
+			}
+		},
+		
+		// 处理完整的股票数据
+		processCompleteStockData(completeData) {
+			console.log("开始更新TCP股票数据存储")
+			
+			// 更新TCP股票数据存储
+			this.tcpStockData = {
+				count: completeData.count || 0,
+				data: completeData.data || {},
+				stock_count: completeData.stock_count || 0,
+				timestamp: completeData.timestamp || '',
+				type: completeData.type || ''
+			}
+			
+			// 获取所有股票的数据用于显示（最多3个）
+			const stockCodes = Object.keys(completeData.data)
+			const newStockInfoList = []
+			
+			// 处理最多3个股票数据
+			for (let i = 0; i < Math.min(stockCodes.length, 3); i++) {
+				const stockCode = stockCodes[i]
+				
+				// 检查数据结构
+				if (completeData.data[stockCode] && Array.isArray(completeData.data[stockCode]) && completeData.data[stockCode].length > 0) {
+					const stockData = completeData.data[stockCode][0] // 取第一条数据
+					
+					if (stockData && stockData.current_price !== undefined && stockData.pre_close !== undefined) {
+						// 计算涨跌幅
+						const changeValue = stockData.current_price - stockData.pre_close
+						const changePercent = ((changeValue / stockData.pre_close) * 100).toFixed(2)
+						const changeSign = changeValue >= 0 ? '+' : ''
+						
+						// 添加到股票信息列表
+						newStockInfoList.push({
+							stock_name: stockData.stock_name || '未知股票',
+							current_price: stockData.current_price ? stockData.current_price.toFixed(2) : '0.00',
+							change: `${changeSign}${changePercent}%`,
+							change_value: changeValue,
+							change_percent: parseFloat(changePercent)
+						})
+					}
+				}
+			}
+			
+			// 更新当前显示的股票信息列表
+			if (newStockInfoList.length > 0) {
+				this.currentStockInfoList = newStockInfoList
+				console.log('股票数据更新成功，共', newStockInfoList.length, '个股票:', this.currentStockInfoList)
+			}
+		},
+		
+		// 移除TCP监听器
+		removeTcpListeners() {
+			if (this.connectionListener) {
+				tcpConnection.removeConnectionListener(this.connectionListener)
+				this.connectionListener = null
+				console.log('已移除TCP连接状态监听器')
+			}
+			
+			if (this.messageListener) {
+				tcpConnection.removeMessageListener(this.messageListener)
+				this.messageListener = null
+				console.log('已移除TCP消息监听器')
+			}
 		}
 	}
 }
@@ -726,4 +1274,155 @@ export default {
 	bottom: 0;
 	width: 100%;
 }
+
+/* TCP测试区域样式 */
+.tcp-test-section {
+	border: 1px solid #e0e0e0;
+	background-color: #f9f9f9;
+}
+
+.tcp-status {
+	padding: 4px 12px;
+	border-radius: 12px;
+	font-size: 12px;
+}
+
+.tcp-status.connected {
+	background-color: #e8f5e8;
+	color: #4caf50;
+	border: 1px solid #4caf50;
+}
+
+.tcp-status.disconnected {
+	background-color: #ffeaea;
+	color: #f44336;
+	border: 1px solid #f44336;
+}
+
+.status-text {
+	font-size: 12px;
+	font-weight: bold;
+}
+
+.tcp-controls {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 8px;
+	margin-bottom: 15px;
+}
+
+.tcp-btn {
+	flex: 1;
+	min-width: 80px;
+	height: 36px;
+	border-radius: 6px;
+	font-size: 12px;
+	border: none;
+	color: white;
+	font-weight: bold;
+}
+
+.connect-btn {
+	background-color: #4caf50;
+}
+
+.connect-btn:disabled {
+	background-color: #cccccc;
+}
+
+.disconnect-btn {
+	background-color: #f44336;
+}
+
+.disconnect-btn:disabled {
+	background-color: #cccccc;
+}
+
+.send-btn {
+	background-color: #2196f3;
+}
+
+.send-btn:disabled {
+	background-color: #cccccc;
+}
+
+.status-btn {
+	background-color: #ff9800;
+}
+
+.tcp-messages {
+	margin-top: 15px;
+	border-top: 1px solid #e0e0e0;
+	padding-top: 15px;
+}
+
+.messages-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 10px;
+}
+
+.messages-title {
+	font-size: 14px;
+	font-weight: bold;
+	color: #333;
+}
+
+.clear-btn {
+	padding: 4px 8px;
+	background-color: #f44336;
+	color: white;
+	border: none;
+	border-radius: 4px;
+	font-size: 10px;
+}
+
+.messages-list {
+	max-height: 200px;
+	border: 1px solid #e0e0e0;
+	border-radius: 6px;
+	padding: 8px;
+	background-color: white;
+}
+
+.message-item {
+	margin-bottom: 8px;
+	padding: 8px;
+	border-radius: 6px;
+	border-left: 3px solid #ccc;
+}
+
+.message-item.sent {
+	background-color: #e3f2fd;
+	border-left-color: #2196f3;
+}
+
+.message-item.received {
+	background-color: #f1f8e9;
+	border-left-color: #4caf50;
+}
+
+.message-info {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 4px;
+}
+
+.message-direction {
+	font-size: 10px;
+	font-weight: bold;
+	color: #666;
+}
+
+.message-time {
+	font-size: 10px;
+	color: #999;
+}
+
+.message-content {
+	font-size: 12px;
+	color: #333;
+	word-break: break-all;
+}
 </style>
\ No newline at end of file

From aa8f3ddc16c637001c48d0d5989b35978ca294fd Mon Sep 17 00:00:00 2001
From: zhaowenkang <z13306486998@126.com>
Date: Tue, 28 Oct 2025 18:48:58 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=8C=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/util.js                        |    5 +-
 pages.json                            |   28 +-
 pages/home/chartExample.vue           |  655 ++++++++++++++++++
 pages/home/countryMarket.vue          |  493 ++++++++++++++
 pages/home/forexMetals.vue            |  301 +++++++++
 pages/home/globalIndex.vue            |  841 ++++++++++++-----------
 pages/home/marketDetail.vue           |  685 ++++++++++---------
 pages/home/marketOverview.vue         |  733 ++++++++++++++++++++
 pages/home/marketSituation.vue        | 1187 ++++++++++++---------------------
 static/marketSituation-image/cool.png |  Bin 0 -> 11499 bytes
 static/marketSituation-image/hot.png  |  Bin 0 -> 11122 bytes
 static/marketSituation-image/warm.png |  Bin 0 -> 11904 bytes
 12 files changed, 3401 insertions(+), 1527 deletions(-)
 create mode 100644 pages/home/chartExample.vue
 create mode 100644 pages/home/countryMarket.vue
 create mode 100644 pages/home/forexMetals.vue
 create mode 100644 pages/home/marketOverview.vue
 create mode 100644 static/marketSituation-image/cool.png
 create mode 100644 static/marketSituation-image/hot.png
 create mode 100644 static/marketSituation-image/warm.png

diff --git a/common/util.js b/common/util.js
index 0058c56..3fbc198 100644
--- a/common/util.js
+++ b/common/util.js
@@ -1,6 +1,6 @@
 var util = {}
 util.data = {}
-util.data.base_url = 'https://dbqb.nfdxy.net/devApi'
+util.data.base_url = 'https://hwjb.homilychart.com/testApi'
 // util.data.base_url = 'https://dbqb.nfdxy.net/prodApi'
 
 // AJAX 请求方法
@@ -15,7 +15,8 @@ util.request = (url, callback, data = {}, failCallback) => {
 			'content-type': 'application/json',
 			'version': uni.getSystemInfoSync().appVersion,
 			'client': uni.getSystemInfoSync().platform == 'ios' ? 'ios' : 'android',
-			'token': uni.getStorageSync('token')
+			'token': uni.getStorageSync('token'),
+			'deviceId': uni.getSystemInfoSync().deviceId
 		},
 		sslVerify: false,
 		success: callback,
diff --git a/pages.json b/pages.json
index b341734..2b116d9 100644
--- a/pages.json
+++ b/pages.json
@@ -98,7 +98,33 @@
 			}
 		},
 		{
-			"path": "pages/home/marketSituation",
+			"path": "pages/marketSituation/marketSituation",
+			"style": {
+				"navigationStyle": "custom",
+				"disableSwipeBack": true,
+				"titleNView": false,
+				"bounce": false
+			}
+		},
+		{
+			"path": "pages/marketSituation/chartExample",
+			"style": {
+				"navigationBarTitleText": "图表示例",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/marketSituation/globalIndex",
+			"style": {
+				"navigationStyle": "custom",
+				"disableSwipeBack": true,
+				"titleNView": false,
+				"bounce": false
+			}
+		},
+		{
+			"path": "pages/marketSituation/marketDetail",
 			"style": {
 				"navigationStyle": "custom",
 				"disableSwipeBack": true,
diff --git a/pages/home/chartExample.vue b/pages/home/chartExample.vue
new file mode 100644
index 0000000..47ab2a3
--- /dev/null
+++ b/pages/home/chartExample.vue
@@ -0,0 +1,655 @@
+<template>
+    <view style="width: 750rpx; height: 750rpx;">
+        <l-echart ref="chartRef" @finished="initChart"></l-echart>
+    </view>
+</template>
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+
+const chartRef = ref(null)
+// 获取系统信息，替代 window.innerWidth
+const systemInfo = uni.getSystemInfoSync()
+const screenWidth = ref(systemInfo.screenWidth || 375) // 默认值 375px
+
+// 生成30天的交易信号数据
+const generateAIGoldBullData = () => {
+    const data = []
+    
+    for (let i = 0; i < 30; i++) {
+        // 模拟交易信号 [索引, 买入信号, 卖出信号, 持有信号, 强度, 成交量]
+        const buySignal = Math.random() > 0.7 ? 1 : 0      // 30%概率买入信号
+        const sellSignal = Math.random() > 0.8 ? 1 : 0     // 20%概率卖出信号
+        const holdSignal = Math.random() > 0.5 ? 1 : 0     // 50%概率持有信号
+        const strength = Math.floor(Math.random() * 3) + 1  // 信号强度1-3
+        const volume = Math.floor(Math.random() * 2000) + 500 // 成交量500-2500
+        
+        data.push([i, buySignal, sellSignal, holdSignal, strength, volume])
+    }
+    return data
+}
+
+// 添加缺失的变量定义
+var option
+const AIGoldBull = ref({
+    JN: generateAIGoldBullData()
+})
+
+// 模拟多语言数据
+const t = ref({
+    suoxie: 'zh',
+    tianxian: '天线',
+    feixian: '飞线',
+    zhoongxian: '中线',
+    liuxian: '流线',
+    Klinetext_5: 'K线5',
+    Klinetext_6: 'K线6',
+    maipan: '买盘',
+    maipan1: '卖盘'
+})
+
+// 生成30天的模拟K线数据 [日期, 开盘, 最高, 最低, 收盘]
+const generateKLineData = () => {
+    const data = []
+    let basePrice = 2450 // 黄金基础价格
+    
+    for (let i = 0; i < 30; i++) {
+        const date = new Date(2024, 0, i + 1).toISOString().split('T')[0]
+        
+        // 模拟价格波动
+        const volatility = (Math.random() - 0.5) * 50 // ±25的波动
+        const open = basePrice + volatility
+        
+        const highVolatility = Math.random() * 30 + 10 // 10-40的向上波动
+        const lowVolatility = Math.random() * 30 + 10  // 10-40的向下波动
+        
+        const high = Math.max(open, open + highVolatility)
+        const low = Math.min(open, open - lowVolatility)
+        
+        const closeVolatility = (Math.random() - 0.5) * 20
+        const close = Math.max(low, Math.min(high, open + closeVolatility))
+        
+        data.push([date, 
+            Math.round(open * 100) / 100, 
+            Math.round(high * 100) / 100, 
+            Math.round(low * 100) / 100, 
+            Math.round(close * 100) / 100
+        ])
+        
+        basePrice = close // 下一天的基础价格
+    }
+    return data
+}
+
+// 生成30天的成交量和技术指标数据 [日期, 成交量1, 成交量2, 指标1, 指标2, 指标3]
+const generateWaveVolData = () => {
+    const data = []
+    
+    for (let i = 0; i < 30; i++) {
+        const date = new Date(2024, 0, i + 1).toISOString().split('T')[0]
+        
+        // 模拟成交量数据
+        const vol1 = Math.floor(Math.random() * 2000) + 800  // 800-2800
+        const vol2 = Math.floor(Math.random() * 1500) + 600  // 600-2100
+        
+        // 模拟技术指标
+        const indicator1 = Math.floor(Math.random() * 30) + 40  // 40-70
+        const indicator2 = Math.floor(Math.random() * 40) + 50  // 50-90
+        const indicator3 = Math.floor(Math.random() * 35) + 60  // 60-95
+        
+        data.push([date, vol1, vol2, indicator1, indicator2, indicator3])
+    }
+    return data
+}
+
+// 生成30天的移动平均线数据 [MA5, MA10, MA20, MA30]
+const generateFTLineData = () => {
+    const data = []
+    let ma5Base = 2450
+    let ma10Base = 2445
+    let ma20Base = 2440
+    let ma30Base = 2435
+    
+    for (let i = 0; i < 30; i++) {
+        // 模拟移动平均线的平滑变化
+        ma5Base += (Math.random() - 0.5) * 10
+        ma10Base += (Math.random() - 0.5) * 8
+        ma20Base += (Math.random() - 0.5) * 6
+        ma30Base += (Math.random() - 0.5) * 4
+        
+        data.push([
+            Math.round(ma5Base * 100) / 100,
+            Math.round(ma10Base * 100) / 100,
+            Math.round(ma20Base * 100) / 100,
+            Math.round(ma30Base * 100) / 100
+        ])
+    }
+    return data
+}
+
+// 生成模拟数据
+const mockKLineData = generateKLineData()
+const mockWaveVolData = generateWaveVolData()
+const mockFTLineData = generateFTLineData()
+
+// 生成RSI指标数据 (相对强弱指数)
+const generateRSIData = () => {
+    const data = []
+    for (let i = 0; i < 30; i++) {
+        const rsi = Math.random() * 60 + 20 // RSI值在20-80之间
+        data.push(Math.round(rsi * 100) / 100)
+    }
+    return data
+}
+
+// 生成MACD指标数据
+const generateMACDData = () => {
+    const data = []
+    for (let i = 0; i < 30; i++) {
+        const macd = (Math.random() - 0.5) * 20 // MACD值在-10到10之间
+        const signal = (Math.random() - 0.5) * 15 // 信号线
+        const histogram = macd - signal // 柱状图
+        
+        data.push([
+            Math.round(macd * 100) / 100,
+            Math.round(signal * 100) / 100,
+            Math.round(histogram * 100) / 100
+        ])
+    }
+    return data
+}
+
+// 生成布林带数据
+const generateBollingerData = () => {
+    const data = []
+    let middleLine = 2450
+    
+    for (let i = 0; i < 30; i++) {
+        middleLine += (Math.random() - 0.5) * 10
+        const upperBand = middleLine + Math.random() * 30 + 20 // 上轨
+        const lowerBand = middleLine - Math.random() * 30 - 20 // 下轨
+        
+        data.push([
+            Math.round(upperBand * 100) / 100,
+            Math.round(middleLine * 100) / 100,
+            Math.round(lowerBand * 100) / 100
+        ])
+    }
+    return data
+}
+
+// 生成成交量分析数据
+const generateVolumeAnalysisData = () => {
+    const data = []
+    for (let i = 0; i < 30; i++) {
+        const buyVolume = Math.floor(Math.random() * 1500) + 500  // 买入量
+        const sellVolume = Math.floor(Math.random() * 1500) + 500 // 卖出量
+        const netVolume = buyVolume - sellVolume // 净买入量
+        
+        data.push([buyVolume, sellVolume, netVolume])
+    }
+    return data
+}
+
+// 生成市场情绪数据
+const generateMarketSentimentData = () => {
+    const sentiments = ['极度恐慌', '恐慌', '中性', '贪婪', '极度贪婪']
+    const data = []
+    
+    for (let i = 0; i < 30; i++) {
+        const sentimentIndex = Math.floor(Math.random() * 100) // 0-100的情绪指数
+        const sentimentLabel = sentiments[Math.floor(sentimentIndex / 20)]
+        
+        data.push({
+            date: new Date(2024, 0, i + 1).toISOString().split('T')[0],
+            index: sentimentIndex,
+            label: sentimentLabel,
+            fearGreedRatio: Math.random() * 100
+        })
+    }
+    return data
+}
+
+// 生成重要新闻事件数据
+const generateNewsEventsData = () => {
+    const events = [
+        '美联储利率决议',
+        '非农就业数据发布',
+        '通胀数据公布',
+        '地缘政治紧张',
+        '央行政策变化',
+        '经济数据超预期',
+        '市场技术突破',
+        '大宗商品价格波动'
+    ]
+    
+    const data = []
+    for (let i = 0; i < 10; i++) { // 生成10个随机事件
+        const randomDay = Math.floor(Math.random() * 30) + 1
+        const event = events[Math.floor(Math.random() * events.length)]
+        const impact = Math.floor(Math.random() * 5) + 1 // 影响力1-5
+        
+        data.push({
+            date: new Date(2024, 0, randomDay).toISOString().split('T')[0],
+            event: event,
+            impact: impact,
+            type: Math.random() > 0.5 ? 'positive' : 'negative'
+        })
+    }
+    return data.sort((a, b) => new Date(a.date) - new Date(b.date))
+}
+
+// 生成价格预测数据
+const generatePricePredictionData = () => {
+    const data = []
+    let currentPrice = 2450
+    
+    for (let i = 0; i < 7; i++) { // 未来7天预测
+        const date = new Date(2024, 1, i + 1).toISOString().split('T')[0] // 2月份
+        
+        // 模拟AI预测的价格区间
+        const prediction = currentPrice + (Math.random() - 0.5) * 100
+        const confidence = Math.random() * 40 + 60 // 60-100%的置信度
+        const upperBound = prediction + Math.random() * 50
+        const lowerBound = prediction - Math.random() * 50
+        
+        data.push({
+            date: date,
+            predicted_price: Math.round(prediction * 100) / 100,
+            confidence: Math.round(confidence),
+            upper_bound: Math.round(upperBound * 100) / 100,
+            lower_bound: Math.round(lowerBound * 100) / 100
+        })
+        
+        currentPrice = prediction
+    }
+    return data
+}
+
+// 模拟提取的绘图数据
+const extractedDrawData = {
+    KLine20: mockKLineData,
+    WAVEVOL: mockWaveVolData,
+    FTLINE: mockFTLineData,
+    RSI: generateRSIData(),
+    MACD: generateMACDData(),
+    BOLLINGER: generateBollingerData(),
+    VOLUME_ANALYSIS: generateVolumeAnalysisData(),
+    MARKET_SENTIMENT: generateMarketSentimentData(),
+    NEWS_EVENTS: generateNewsEventsData(),
+    PRICE_PREDICTION: generatePricePredictionData()
+}
+
+const fnShowEcharts4 = (extractedDrawData) => {
+    const splitData = (b) => {
+        const a = JSON.parse(JSON.stringify(b))
+        let categoryData = []
+        let values = []
+        for (let i = 0; i < a.length; i++) {
+            categoryData.push(a[i].splice(0, 1)[0])
+            values.push(a[i])
+        }
+        return {
+            categoryData,
+            values
+        }
+    }
+    var bodongliang = splitData(extractedDrawData.WAVEVOL)
+    function bodongliangData(values, i) {
+        return values.map((subArray) => subArray[i])
+    }
+    function calculateMA(index, data) {
+        let result = []
+        if (data.FTLINE) {
+            data.FTLINE.forEach((item) => {
+                result.push(item[index])
+            })
+        }
+        return result
+    }
+    function vwToPx(vw) {
+        return (screenWidth.value * vw) / 100
+    }
+    var dealData = splitData(extractedDrawData.KLine20)
+    var dealGnBullData = AIGoldBull.value.JN
+    const textEcharts = t.value
+    const firstLegend = computed(() => {
+        if (screenWidth.value < 768) {
+            if (textEcharts.suoxie === 'en' || textEcharts.suoxie === 'th') {
+                return '2%'
+            } else if (textEcharts.suoxie === 'kr') {
+                return '2%'
+            } else {
+                return '2%'
+            }
+        } else {
+            return textEcharts.suoxie === 'en' ||
+                textEcharts.suoxie === 'th' ||
+                textEcharts.suoxie === 'kr'
+                ? '9%'
+                : '9%'
+        }
+    })
+    const processBarData = (data) => {
+        const barData = []
+        data.forEach((item) => {
+            let color
+            switch (item[4]) {
+                case 1:
+                    color = '#13E113'
+                    break
+                case 2:
+                    color = '#FF0E00'
+                    break
+                case 3:
+                    color = '#0000FE'
+                    break
+                case 4:
+                    color = '#1397FF'
+                    break
+            }
+            barData.push({
+                value: item[5],
+                itemStyle: {
+                    normal: {
+                        color: color
+                    }
+                }
+            })
+        })
+        return { barData }
+    }
+    const { barData } = processBarData(dealGnBullData)
+    option = {
+        tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+                type: 'cross'
+            },
+            backgroundColor: 'rgba(119, 120, 125, 0.6)',
+            borderWidth: 1,
+            borderColor: '#77787D',
+            padding: 10,
+            textStyle: {
+                color: '#fff'
+            }
+        },
+        axisPointer: {
+            link: [
+                {
+                    xAxisIndex: 'all'
+                }
+            ],
+            label: {
+                backgroundColor: '#77787D'
+            }
+        },
+        toolbox: {
+            show: false
+        },
+        grid: [
+            {
+                left: screenWidth.value > 768 ? '10%' : '12%',
+                right: screenWidth.value > 768 ? '4%' : '6%',
+                top: screenWidth.value > 768 ? '10%' : '12%',
+                height: screenWidth.value > 768 ? '35%' : '34%',
+                containLabel: false
+            },
+            {
+                left: screenWidth.value > 768 ? '10%' : '12%',
+                right: screenWidth.value > 768 ? '4%' : '6%',
+                top: screenWidth.value > 768 ? '48%' : '48%',
+                height: screenWidth.value > 768 ? '19%' : '21%',
+                containLabel: false
+            },
+            {
+                left: screenWidth.value > 768 ? '10%' : '12%',
+                right: screenWidth.value > 768 ? '4%' : '6%',
+                top: screenWidth.value > 768 ? '70%' : '71%',
+                height: screenWidth.value > 768 ? '19%' : '21%',
+                containLabel: false
+            }
+        ],
+        xAxis: [
+            {
+                type: 'category',
+                data: dealData.categoryData,
+                boundaryGap: true,
+                axisLine: { onZero: false },
+                splitLine: { show: false },
+                min: 'dataMin',
+                max: 'dataMax',
+                axisPointer: {
+                    z: 100,
+                    label: {
+                        show: false // 不显示标签
+                    }
+                },
+                axisLine: {
+                    lineStyle: {
+                        color: 'black'
+                    }
+                }, //
+                axisLabel: { show: false },
+                axisTick: { show: false }
+            },
+            {
+                type: 'category',
+                gridIndex: 1,
+                data: dealData.categoryData,
+                boundaryGap: true,
+                axisPointer: {
+                    z: 100,
+                    label: {
+                        show: false // 不显示标签
+                    }
+                },
+                axisLine: { lineStyle: { color: 'black' } },
+                axisLabel: {
+                    show: false,
+                    interval: 'auto'
+                },
+                axisTick: { show: false }
+            },
+            {
+                type: 'category',
+                gridIndex: 2,
+                data: dealData.categoryData,
+                boundaryGap: true,
+                axisLine: { lineStyle: { color: 'black' } },
+                axisLabel: {
+                    show: true,
+                    interval: 'auto',
+                    fontSize: screenWidth.value > 768 ? 15 : 9
+                },
+                axisTick: { show: false }
+            }
+        ],
+        yAxis: [
+            {
+                scale: true,
+                gridIndex: 0,
+                position: 'left',
+                axisLabel: {
+                    inside: false,
+                    align: 'right',
+                    fontSize: screenWidth.value > 768 ? 15 : 9
+                },
+                axisLine: {
+                    show: true,
+                    lineStyle: {
+                        fontSize: '',
+                        color: 'black'
+                    }
+                },
+                axisTick: { show: false },
+                splitLine: { show: false }
+            },
+            {
+                scale: true,
+                gridIndex: 1,
+                splitNumber: 4,
+                min: 0,
+                minInterval: 1,
+                axisLabel: {
+                    show: true,
+                    fontSize: screenWidth.value > 768 ? 15 : 9,
+                    margin: 8,
+                },
+                axisLine: { show: true, lineStyle: { color: 'black' } },
+                axisTick: { show: false },
+                splitLine: { show: true, lineStyle: { type: 'dashed' } },
+                boundaryGap: ['20%', '20%']
+            },
+            {
+                scale: true,
+                gridIndex: 2,
+                splitNumber: 2,
+                axisLabel: {
+                    show: true,
+                    fontSize: screenWidth.value > 768 ? 15 : 9
+                },
+                axisLine: { show: true, lineStyle: { color: 'black' } },
+                axisTick: { show: false },
+                splitLine: { show: false }
+            }
+        ],
+        dataZoom: [
+            {
+                type: 'inside',
+                xAxisIndex: [0, 1, 2],
+                start: 50,
+                end: 100
+            },
+            {
+                show: true,
+                xAxisIndex: [0, 1, 2],
+                type: 'slider',
+                start: 50,
+                end: 100
+            }
+        ],
+        series: [
+            {
+                type: 'candlestick',
+                name: '日K',
+                xAxisIndex: 0,
+                yAxisIndex: 0,
+                data: dealData.values,
+                itemStyle: {
+                    normal: {
+                        color0: 'red',
+                        color: 'green',
+                        borderColor0: 'red',
+                        borderColor: 'green'
+                    }
+                },
+                gridIndex: 1
+            },
+            {
+                name: '成交量',
+                type: 'bar',
+                barWidth: '70%',
+                xAxisIndex: 1,
+                yAxisIndex: 1,
+                data: barData,
+            },
+            // {
+            //     name: textEcharts.feixian,
+            //     type: 'line',
+            //     data: calculateMA(1, extractedDrawData),
+            //     smooth: true,
+            //     symbol: 'none',
+            //     xAxisIndex: 2,
+            //     yAxisIndex: 2,
+            //     itemStyle: {
+            //         normal: {
+            //             color: '#00a32e',
+            //             lineStyle: {
+            //                 color: '#00a32e',
+            //                 width: 2,
+            //                 type: 'solid'
+            //             }
+            //         }
+            //     }
+            // },
+            // {
+            //     name: textEcharts.zhoongxian,
+            //     type: 'line',
+            //     data: calculateMA(2, extractedDrawData),
+            //     smooth: true,
+            //     symbol: 'none',
+            //     xAxisIndex: 2,
+            //     yAxisIndex: 2,
+            //     itemStyle: {
+            //         normal: {
+            //             color: '#de0000',
+            //             lineStyle: {
+            //                 color: '#de0000',
+            //                 width: 2,
+            //                 type: 'solid'
+            //             }
+            //         }
+            //     }
+            // },
+            // {
+            //     name: textEcharts.tianxian,
+            //     type: 'line',
+            //     data: calculateMA(3, extractedDrawData),
+            //     smooth: true,
+            //     symbol: 'none',
+            //     xAxisIndex: 2,
+            //     yAxisIndex: 2,
+            //     itemStyle: {
+            //         normal: {
+            //             color: '#ffb300',
+            //             lineStyle: {
+            //                 color: '#ffb300',
+            //                 width: 2,
+            //                 type: 'solid'
+            //             }
+            //         }
+            //     }
+            // },
+            // {
+            //     name: textEcharts.liuxian,
+            //     type: 'line',
+            //     data: calculateMA(4, extractedDrawData),
+            //     smooth: true,
+            //     symbol: 'none',
+            //     xAxisIndex: 2,
+            //     yAxisIndex: 2,
+            //     itemStyle: {
+            //         normal: {
+            //             color: '#00c8ff',
+            //             lineStyle: {
+            //                 color: '#00c8ff',
+            //                 width: 2,
+            //                 type: 'solid'
+            //             }
+            //         }
+            //     }
+            // },
+        ]
+    }
+    initChart()
+}
+
+// 组件挂载时初始化图表
+onMounted(() => {
+    // 调用图表初始化函数
+    fnShowEcharts4(extractedDrawData)
+})
+
+
+// 初始化图表
+const initChart = async () => {
+    if (!chartRef.value) return
+
+    try {
+        const chart = await chartRef.value.init(echarts)
+        chart.setOption(option)
+    } catch (error) {
+        console.error('图表初始化失败:', error)
+    }
+}
+</script>
diff --git a/pages/home/countryMarket.vue b/pages/home/countryMarket.vue
new file mode 100644
index 0000000..9bb0a30
--- /dev/null
+++ b/pages/home/countryMarket.vue
@@ -0,0 +1,493 @@
+<template>
+	<view class="content">
+		<!-- 市场子Tab -->
+		<view class="sub_tabs">
+			<view v-for="(tab, i) in marketTabs" :key="tab" :class="['tab_item', i === activeTabIndex ? 'active' : '']"
+				@click="switchTab(i)">
+				<text>{{ tab }}</text>
+			</view>
+		</view>
+
+		<!-- 大盘指数 -->
+		<view class="section">
+			<view class="section_header">
+				<text class="section_title">大盘指数</text>
+				<text class="section_action" @click="viewMore('indices')">查看更多 ></text>
+			</view>
+			<view class="indices_grid">
+				<view v-for="(index, i) in countryInfo.mainIndices" :key="i" class="index_item">
+					<IndexCard :flagIcon="countryInfo.flag" :indexName="index.name" :currentPrice="index.price"
+						:changeAmount="index.change" :changePercent="index.changePercent" :isRising="index.isRising" />
+				</view>
+			</view>
+
+			<!-- 今日市场情绪温度 -->
+			<view class="sentiment">
+				<view class="section_subtitle">
+					<text>今日市场情绪温度</text>
+				</view>
+				<view class="meters">
+					<view class="meter_item" v-for="(m, i) in sentimentMeters" :key="i">
+						<image class="meter_icon" :class="m.theme" :src="selectIcons[m.theme]" mode="aspectFit"></image>
+						<view class="meter_info">
+							<text class="meter_value" :class="m.theme">{{ m.value }}°C</text>
+							<text class="meter_label" :class="m.theme">{{ m.label }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 板块 -->
+		<view class="section">
+			<view class="section_header">
+				<text class="section_title">板块</text>
+				<text class="section_action" @click="viewMore('sectors')">查看更多 ></text>
+			</view>
+			<view class="sectors_grid">
+				<view v-for="(sec, i) in sectors" :key="i" class="sector_item">
+					<view class="sector_header">
+						<text class="sector_name">{{ sec.name }}</text>
+						<text :class="['sector_change', sec.isRising ? 'rising' : 'falling']">
+							{{ sec.change }}
+						</text>
+					</view>
+					<view class="sector_price">{{ sec.price }}</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 股票 -->
+		<view class="section">
+			<view class="section_header">
+				<text class="section_title">股票</text>
+				<text class="section_action" @click="viewMore('stocks')">查看更多 ></text>
+			</view>
+			<view class="table">
+				<view class="table_header">
+					<text class="cell name">名称</text>
+					<text class="cell price">最新</text>
+					<text class="cell change">涨幅</text>
+				</view>
+				<view class="table_row" v-for="(stk, i) in stocks" :key="i">
+					<view class="cell name">
+						<text class="stk_name">{{ stk.name }}</text>
+						<text class="stk_code">{{ stk.code }}</text>
+					</view>
+					<view class="cell price">
+						<text class="stk_price">{{ stk.price }}</text>
+					</view>
+					<view class="cell change">
+						<text :class="['stk_change', stk.isRising ? 'rising' : 'falling']">
+							{{ stk.change }}
+						</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部安全区域 -->
+		<view class="bottom_safe_area"></view>
+	</view>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue'
+import IndexCard from '../../components/IndexCard.vue'
+
+// 子Tab与操作
+const marketTabs = ['全部', '美股', '纽交所', '纳斯达克']
+const activeTabIndex = ref(0)
+const switchTab = (i) => {
+	activeTabIndex.value = i
+}
+
+// 今日情绪温度示例数据
+const sentimentMeters = [
+	{ value: 90, label: '道琼斯', theme: 'hot' },
+	{ value: 60, label: '纳斯达克', theme: 'warm' },
+	{ value: 20, label: '标普500', theme: 'cool' }
+]
+
+// 图标映射
+const selectIcons = {
+	hot: '/static/marketSituation-image/hot.png',
+	warm: '/static/marketSituation-image/warm.png',
+	cool: '/static/marketSituation-image/cool.png'
+}
+
+// Props
+const props = defineProps({
+	countryId: {
+		type: Number,
+		required: true
+	}
+})
+
+// 国家/地区信息映射
+const countryInfoMap = {
+	2: { // 新加坡
+		name: '新加坡',
+		flag: '🇸🇬',
+		isMarketOpen: true,
+		mainIndices: [
+			{ name: '海峡时报指数', price: '3,234.56', change: '+12.34', changePercent: '+0.38%', isRising: true },
+			{ name: 'FTSE ST Mid Cap', price: '1,234.56', change: '-5.67', changePercent: '-0.46%', isRising: false }
+		],
+		hotStocks: [
+			{ name: '星展银行', code: 'D05.SI', price: '35.20', change: '+0.15', isRising: true },
+			{ name: '华侨银行', code: 'O39.SI', price: '13.45', change: '-0.05', isRising: false }
+		]
+	},
+	3: { // 马来西亚
+		name: '马来西亚',
+		flag: '🇲🇾',
+		isMarketOpen: false,
+		mainIndices: [
+			{ name: '富时大马KLCI指数', price: '1,567.89', change: '+8.90', changePercent: '+0.57%', isRising: true }
+		],
+		hotStocks: [
+			{ name: '马来亚银行', code: '1155.KL', price: '9.85', change: '+0.10', isRising: true },
+			{ name: '大众银行', code: '1295.KL', price: '4.32', change: '-0.02', isRising: false }
+		]
+	},
+	4: { // 印度尼西亚
+		name: '印度尼西亚',
+		flag: '🇮🇩',
+		isMarketOpen: true,
+		mainIndices: [
+			{ name: '雅加达综合指数', price: '7,234.56', change: '+45.67', changePercent: '+0.63%', isRising: true }
+		],
+		hotStocks: []
+	},
+	5: { // 美国
+		name: '美国',
+		flag: '🇺🇸',
+		isMarketOpen: false,
+		mainIndices: [
+			{ name: '道琼斯', price: '45,757.90', change: '-125.22', changePercent: '-0.27%', isRising: false },
+			{ name: '纳斯达克', price: '22,333.96', change: '+125.22', changePercent: '+0.47%', isRising: true },
+			{ name: '标普500', price: '6,606.08', change: '+125.22', changePercent: '+0.27%', isRising: true }
+		],
+		hotStocks: [
+			{ name: '苹果', code: 'AAPL', price: '195.89', change: '+2.34', isRising: true },
+			{ name: '微软', code: 'MSFT', price: '378.85', change: '-1.23', isRising: false }
+		]
+	}
+}
+
+// 计算当前国家信息
+const countryInfo = computed(() => {
+	return countryInfoMap[props.countryId] || {
+		name: '未知地区',
+		flag: '🌍',
+		isMarketOpen: false,
+		mainIndices: [],
+		hotStocks: []
+	}
+})
+
+// 计算当前国家的板块与股票
+const sectors = computed(() => {
+	return countryInfoMap[props.countryId]?.sectors || []
+})
+const stocks = computed(() => {
+	return countryInfoMap[props.countryId]?.stocks || []
+})
+
+// 查看更多占位
+const viewMore = (type) => {
+	// 可根据 type 跳转到相应页面或加载更多
+	// 例如：indices/sectors/stocks
+	// uni.navigateTo({ url: `/pages/marketSituation/${type}List` })
+}
+</script>
+
+<style scoped>
+.content {
+	padding: 0 20rpx 20rpx 20rpx;
+}
+
+/* 子Tab */
+.sub_tabs {
+	display: flex;
+	gap: 16rpx;
+	padding: 0 20rpx 20rpx 20rpx;
+}
+
+.tab_item {
+	padding: 6rpx 20rpx;
+	border-radius: 5rpx;
+	background: #f5f5f5;
+	color: #666;
+	font-size: 24rpx;
+}
+
+.tab_item.active {
+	background: #ff4444;
+	color: #fff;
+}
+
+.section {
+	padding: 20rpx;
+	border-radius: 16rpx;
+}
+
+.section_header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 16rpx;
+}
+
+.section_title {
+	font-size: 28rpx;
+	font-weight: bold;
+	color: #333;
+}
+
+.section_action {
+	font-size: 24rpx;
+	color: #999;
+}
+
+.indices_grid {
+	padding: 20rpx;
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	gap: 20rpx;
+	background-color: #F6F6F6;
+}
+
+/* 情绪温度 */
+.sentiment {
+	background-color: #F6F6F6;
+	padding: 0 20rpx 20rpx 20rpx;
+}
+
+.section_subtitle {
+	font-size: 24rpx;
+	color: #000000;
+	padding: 20rpx 0;
+}
+
+.meters {
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	gap: 16rpx;
+}
+
+.meter_item {
+	display: flex;
+	align-items: center;
+	/* padding: 10rpx; */
+	background: #ffffff;
+	border-radius: 12rpx;
+}
+
+.meter_item image {
+	width: 100rpx;
+	height: 100rpx;
+}
+
+.meter_info {
+	display: flex;
+	flex-direction: column;
+}
+
+.meter_value {
+	font-size: 36rpx;
+}
+
+.meter_value.hot {
+	color: #ff6b6b;
+}
+
+.meter_value.warm {
+	color: #ffd166;
+}
+
+.meter_value.cool {
+	color: #60a5fa;
+}
+
+.meter_label {
+	font-size: 22rpx;
+}
+
+.meter_label.hot {
+	color: #ff6b6b;
+}
+
+.meter_label.warm {
+	color: #ffd166;
+}
+
+.meter_label.cool {
+	color: #60a5fa;
+}
+
+/* 板块 */
+.sectors_grid {
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	gap: 16rpx;
+}
+
+.sector_item {
+	background: #fafafa;
+	border-radius: 12rpx;
+	padding: 16rpx;
+}
+
+.sector_header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 12rpx;
+}
+
+.sector_name {
+	font-size: 24rpx;
+	color: #333;
+}
+
+.sector_change {
+	font-size: 22rpx;
+}
+
+.sector_change.rising {
+	color: #e74c3c;
+}
+
+.sector_change.falling {
+	color: #27ae60;
+}
+
+.sector_price {
+	font-size: 24rpx;
+	color: #666;
+}
+
+/* 股票表 */
+.table {
+	background: #fff;
+	border-radius: 12rpx;
+	overflow: hidden;
+}
+
+.table_header,
+.table_row {
+	display: grid;
+	grid-template-columns: 2fr 1fr 1fr;
+	padding: 18rpx 20rpx;
+	border-bottom: 1rpx solid #f0f0f0;
+}
+
+.table_header {
+	background: #fafafa;
+}
+
+.cell.name {
+	display: flex;
+	flex-direction: column;
+}
+
+.stk_name {
+	font-size: 26rpx;
+	color: #333;
+}
+
+.stk_code {
+	font-size: 22rpx;
+	color: #999;
+}
+
+.stk_price {
+	font-size: 26rpx;
+	color: #333;
+}
+
+.stk_change {
+	font-size: 24rpx;
+}
+
+.stk_change.rising {
+	color: #e74c3c;
+}
+
+.stk_change.falling {
+	color: #27ae60;
+}
+
+.index_item {
+	background: #fff;
+	border-radius: 12rpx;
+	overflow: hidden;
+}
+
+.hot_stocks {
+	margin-bottom: 30rpx;
+}
+
+.stocks_list {
+	background: #fff;
+	border-radius: 12rpx;
+	overflow: hidden;
+}
+
+.stock_item {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 24rpx 20rpx;
+	border-bottom: 1rpx solid #f0f0f0;
+}
+
+.stock_item:last-child {
+	border-bottom: none;
+}
+
+.stock_info {
+	flex: 1;
+}
+
+.stock_name {
+	font-size: 28rpx;
+	color: #333;
+	display: block;
+	margin-bottom: 8rpx;
+}
+
+.stock_code {
+	font-size: 24rpx;
+	color: #999;
+}
+
+.stock_price {
+	text-align: right;
+}
+
+.price {
+	font-size: 28rpx;
+	color: #333;
+	display: block;
+	margin-bottom: 8rpx;
+}
+
+.change {
+	font-size: 24rpx;
+}
+
+.change.rising {
+	color: #e74c3c;
+}
+
+.change.falling {
+	color: #27ae60;
+}
+
+.bottom_safe_area {
+	height: 120rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/home/forexMetals.vue b/pages/home/forexMetals.vue
new file mode 100644
index 0000000..c002ed7
--- /dev/null
+++ b/pages/home/forexMetals.vue
@@ -0,0 +1,301 @@
+<template>
+	<view class="content">
+		<view class="section" v-if="type === 'forex'">
+			<view class="section_title">
+				<text class="title_icon">💱</text>
+				<text>外汇市场</text>
+			</view>
+			<view class="forex_grid">
+				<view v-for="(item, index) in forexData" :key="index" class="forex_item">
+					<view class="forex_pair">
+						<text class="base_currency">{{ item.base }}</text>
+						<text class="separator">/</text>
+						<text class="quote_currency">{{ item.quote }}</text>
+					</view>
+					<view class="forex_price">
+						<text class="price">{{ item.price }}</text>
+						<text :class="['change', item.isRising ? 'rising' : 'falling']">
+							{{ item.change }}
+						</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="section" v-if="type === 'metals'">
+			<view class="section_title">
+				<text class="title_icon">🥇</text>
+				<text>贵金属</text>
+			</view>
+			<view class="metals_grid">
+				<view v-for="(item, index) in metalsData" :key="index" class="metal_item">
+					<view class="metal_info">
+						<text class="metal_icon">{{ item.icon }}</text>
+						<text class="metal_name">{{ item.name }}</text>
+					</view>
+					<view class="metal_price">
+						<text class="price">{{ item.price }}</text>
+						<text class="unit">{{ item.unit }}</text>
+						<text :class="['change', item.isRising ? 'rising' : 'falling']">
+							{{ item.change }}
+						</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 市场动态 -->
+		<view class="market_news">
+			<view class="section_title">
+				<text class="title_icon">📰</text>
+				<text>市场动态</text>
+			</view>
+			<view class="news_list">
+				<view v-for="(news, index) in newsData" :key="index" class="news_item">
+					<view class="news_content">
+						<text class="news_title">{{ news.title }}</text>
+						<text class="news_time">{{ news.time }}</text>
+					</view>
+					<view class="news_impact" :class="news.impact">
+						<text>{{ news.impactText }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部安全区域 -->
+		<view class="bottom_safe_area"></view>
+	</view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+
+// Props
+const props = defineProps({
+	countryId: {
+		type: Number,
+		required: true
+	}
+})
+
+// 判断类型
+const type = computed(() => {
+	return props.countryId === 11 ? 'forex' : 'metals'
+})
+
+// 外汇数据
+const forexData = ref([
+	{ base: 'USD', quote: 'CNY', price: '7.2456', change: '+0.0123', isRising: true },
+	{ base: 'EUR', quote: 'USD', price: '1.0876', change: '-0.0034', isRising: false },
+	{ base: 'GBP', quote: 'USD', price: '1.2654', change: '+0.0087', isRising: true },
+	{ base: 'USD', quote: 'JPY', price: '149.87', change: '+0.45', isRising: true },
+	{ base: 'AUD', quote: 'USD', price: '0.6543', change: '-0.0021', isRising: false },
+	{ base: 'USD', quote: 'SGD', price: '1.3456', change: '+0.0012', isRising: true }
+])
+
+// 贵金属数据
+const metalsData = ref([
+	{ icon: '🥇', name: '黄金', price: '2,034.56', unit: 'USD/盎司', change: '+12.34', isRising: true },
+	{ icon: '🥈', name: '白银', price: '24.87', unit: 'USD/盎司', change: '-0.23', isRising: false },
+	{ icon: '⚪', name: '铂金', price: '987.65', unit: 'USD/盎司', change: '+5.67', isRising: true },
+	{ icon: '⚫', name: '钯金', price: '1,234.56', unit: 'USD/盎司', change: '-8.90', isRising: false }
+])
+
+// 新闻数据
+const newsData = ref([
+	{
+		title: '美联储暗示可能暂停加息',
+		time: '2小时前',
+		impact: 'high',
+		impactText: '高影响'
+	},
+	{
+		title: '欧洲央行维持利率不变',
+		time: '4小时前',
+		impact: 'medium',
+		impactText: '中影响'
+	},
+	{
+		title: '黄金价格创新高',
+		time: '6小时前',
+		impact: 'medium',
+		impactText: '中影响'
+	},
+	{
+		title: '美元指数小幅下跌',
+		time: '8小时前',
+		impact: 'low',
+		impactText: '低影响'
+	}
+])
+</script>
+
+<style scoped>
+.content {
+	padding: 20rpx;
+}
+
+.section {
+	margin-bottom: 40rpx;
+}
+
+.section_title {
+	display: flex;
+	align-items: center;
+	font-size: 28rpx;
+	font-weight: bold;
+	color: #333;
+	margin-bottom: 20rpx;
+}
+
+.title_icon {
+	font-size: 32rpx;
+	margin-right: 12rpx;
+}
+
+.forex_grid, .metals_grid {
+	background: #fff;
+	border-radius: 12rpx;
+	overflow: hidden;
+}
+
+.forex_item, .metal_item {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 24rpx 20rpx;
+	border-bottom: 1rpx solid #f0f0f0;
+}
+
+.forex_item:last-child, .metal_item:last-child {
+	border-bottom: none;
+}
+
+.forex_pair {
+	display: flex;
+	align-items: center;
+}
+
+.base_currency {
+	font-size: 28rpx;
+	font-weight: bold;
+	color: #333;
+}
+
+.separator {
+	font-size: 24rpx;
+	color: #999;
+	margin: 0 8rpx;
+}
+
+.quote_currency {
+	font-size: 28rpx;
+	color: #666;
+}
+
+.forex_price, .metal_price {
+	text-align: right;
+}
+
+.price {
+	font-size: 28rpx;
+	color: #333;
+	display: block;
+	margin-bottom: 8rpx;
+}
+
+.unit {
+	font-size: 20rpx;
+	color: #999;
+	margin-left: 8rpx;
+}
+
+.change {
+	font-size: 24rpx;
+}
+
+.change.rising {
+	color: #e74c3c;
+}
+
+.change.falling {
+	color: #27ae60;
+}
+
+.metal_info {
+	display: flex;
+	align-items: center;
+}
+
+.metal_icon {
+	font-size: 32rpx;
+	margin-right: 16rpx;
+}
+
+.metal_name {
+	font-size: 28rpx;
+	color: #333;
+}
+
+.market_news {
+	margin-bottom: 30rpx;
+}
+
+.news_list {
+	background: #fff;
+	border-radius: 12rpx;
+	overflow: hidden;
+}
+
+.news_item {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 24rpx 20rpx;
+	border-bottom: 1rpx solid #f0f0f0;
+}
+
+.news_item:last-child {
+	border-bottom: none;
+}
+
+.news_content {
+	flex: 1;
+}
+
+.news_title {
+	font-size: 28rpx;
+	color: #333;
+	display: block;
+	margin-bottom: 8rpx;
+}
+
+.news_time {
+	font-size: 24rpx;
+	color: #999;
+}
+
+.news_impact {
+	padding: 6rpx 12rpx;
+	border-radius: 16rpx;
+	font-size: 20rpx;
+	color: #fff;
+}
+
+.news_impact.high {
+	background: #e74c3c;
+}
+
+.news_impact.medium {
+	background: #f39c12;
+}
+
+.news_impact.low {
+	background: #95a5a6;
+}
+
+.bottom_safe_area {
+	height: 120rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/home/globalIndex.vue b/pages/home/globalIndex.vue
index f624da9..22169a0 100644
--- a/pages/home/globalIndex.vue
+++ b/pages/home/globalIndex.vue
@@ -1,579 +1,574 @@
-<!-- @format -->
-
 <template>
-  <view class="main">
-    <!-- 固定头部 -->
-    <view class="header_fixed" :style="{ top: iSMT + 'px' }">
-      <view class="header_content">
-        <view class="header_back" @click="goBack">
-          <image src="/static/marketSituation-image/back.png" mode=""></image>
-        </view>
-        <view class="header_input_wrapper">
-          <image class="search_icon" src="/static/marketSituation-image/search.png" mode="" @click="onSearchClick"></image>
-          <input class="header_input" type="text" placeholder="搜索" placeholder-style="color: #A6A6A6; font-size: 22rpx;" v-model="searchValue" @input="onSearchInput" @confirm="onSearchConfirm" />
-        </view>
-        <view class="header_icons">
-          <view class="header_icon" @click="selected">
-            <image src="/static/marketSituation-image/mySeclected.png" mode=""></image>
-          </view>
-          <view class="header_icon" @click="history">
-            <image src="/static/marketSituation-image/history.png" mode=""></image>
-          </view>
-        </view>
-      </view>
-      <view class="warn">
-        <image src="/static/marketSituation-image/warn.png" mode="aspectFit"></image>
-        <view class="warn_text_container">
-          <text :class="warnTextClass">{{ $t("marketSituation.warn") }}</text>
-        </view>
-      </view>
-    </view>
-
-    <!-- 内容区域 -->
-    <scroll-view class="content" :style="{ top: contentTopPosition + 'px' }" scroll-y="true">
-      <!-- 亚太-中华 -->
-      <view class="market-section">
-        <view class="market-header">
-          <text class="market-title">亚太-中华</text>
-          <view class="market-more" @click="viewMore('asia-china')">
-            <text class="more-text">查看更多</text>
-            <text class="more-arrow">></text>
-          </view>
+    <view class="main">
+        <!-- 固定头部 -->
+        <view class="header_fixed" :style="{ top: iSMT + 'px' }">
+            <view class="header_content">
+                <view class="header_back" @click="goBack">
+                    <image src="/static/marketSituation-image/back.png" mode=""></image>
+                </view>
+                <view class="header_input_wrapper">
+                    <image class="search_icon" src="/static/marketSituation-image/search.png" mode=""
+                        @click="onSearchClick"></image>
+                    <input class="header_input" type="text" placeholder="搜索"
+                        placeholder-style="color: #A6A6A6; font-size: 22rpx;" v-model="searchValue"
+                        @input="onSearchInput" @confirm="onSearchConfirm" />
+                </view>
+                <view class="header_icons">
+                    <view class="header_icon" @click="selected">
+                        <image src="/static/marketSituation-image/mySeclected.png" mode=""></image>
+                    </view>
+                    <view class="header_icon" @click="history">
+                        <image src="/static/marketSituation-image/history.png" mode=""></image>
+                    </view>
+                </view>
+            </view>
+            <view class="warn">
+                <image src="/static/marketSituation-image/warn.png" mode="aspectFit"></image>
+                <view class="warn_text_container">
+                    <text :class="warnTextClass">{{ $t('marketSituation.warn') }}</text>
+                </view>
+            </view>
         </view>
-        <view class="cards-grid-three">
-          <view v-for="(item, index) in asiachinaIndexes" :key="index" class="card-item">
-            <IndexCard :flagIcon="item.flagIcon" :stockName="item.stockName" :currentPrice="item.currentPrice" :changeAmount="item.changeAmount" :changePercent="item.changePercent" :isRising="item.isRising" @click="viewIndexDetail(item)" />
-          </view>
-        </view>
-      </view>
-
-      <!-- 亚太 -->
-      <view class="market-section">
-        <view class="market-header">
-          <text class="market-title">亚太</text>
-          <view class="market-more" @click="viewMore('asia')">
-            <text class="more-text">查看更多</text>
-            <text class="more-arrow">></text>
-          </view>
-        </view>
-        <view class="cards-grid-three">
-          <view v-for="(item, index) in asiaIndexes" :key="index" class="card-item">
-            <IndexCard :flagIcon="item.flagIcon" :stockName="item.stockName" :currentPrice="item.currentPrice" :changeAmount="item.changeAmount" :changePercent="item.changePercent" :isRising="item.isRising" @click="viewIndexDetail(item)" />
-          </view>
-        </view>
-      </view>
-
-      <!-- 美洲 -->
-      <view class="market-section">
-        <view class="market-header">
-          <text class="market-title">美洲</text>
-          <view class="market-more" @click="viewMore('america')">
-            <text class="more-text">查看更多</text>
-            <text class="more-arrow">></text>
-          </view>
-        </view>
-        <view class="cards-grid-three">
-          <view v-for="(item, index) in americaIndexes" :key="index" class="card-item">
-            <IndexCard :flagIcon="item.flagIcon" :stockName="item.stockName" :currentPrice="item.currentPrice" :changeAmount="item.changeAmount" :changePercent="item.changePercent" :isRising="item.isRising" @click="viewIndexDetail(item)" />
-          </view>
-        </view>
-      </view>
 
-      <!-- 底部安全区域 -->
-      <view class="bottom-safe-area"></view>
-    </scroll-view>
-  </view>
+        <!-- 内容区域 -->
+        <scroll-view class="content" :style="{ top: contentTopPosition + 'px' }" scroll-y="true">
+            <!-- 亚太-中华 -->
+            <view class="market-section">
+                <view class="market-header">
+                    <text class="market-title">亚太-中华</text>
+                    <view class="market-more" @click="viewMore('asia-china')">
+                        <text class="more-text">查看更多</text>
+                        <text class="more-arrow">></text>
+                    </view>
+                </view>
+                <view class="cards-grid-three">
+                    <view v-for="(item, index) in asiachinaIndexes" :key="index" class="card-item">
+                        <IndexCard :flagIcon="item.flagIcon" :indexName="item.indexName"
+                            :currentPrice="item.currentPrice" :changeAmount="item.changeAmount"
+                            :changePercent="item.changePercent" :isRising="item.isRising"
+                            @click="viewIndexDetail(item)" />
+                    </view>
+                </view>
+            </view>
+
+            <!-- 亚太 -->
+            <view class="market-section">
+                <view class="market-header">
+                    <text class="market-title">亚太</text>
+                    <view class="market-more" @click="viewMore('asia')">
+                        <text class="more-text">查看更多</text>
+                        <text class="more-arrow">></text>
+                    </view>
+                </view>
+                <view class="cards-grid-three">
+                    <view v-for="(item, index) in asiaIndexes" :key="index" class="card-item">
+                        <IndexCard :flagIcon="item.flagIcon" :indexName="item.indexName"
+                            :currentPrice="item.currentPrice" :changeAmount="item.changeAmount"
+                            :changePercent="item.changePercent" :isRising="item.isRising"
+                            @click="viewIndexDetail(item)" />
+                    </view>
+                </view>
+            </view>
+
+            <!-- 美洲 -->
+            <view class="market-section">
+                <view class="market-header">
+                    <text class="market-title">美洲</text>
+                    <view class="market-more" @click="viewMore('america')">
+                        <text class="more-text">查看更多</text>
+                        <text class="more-arrow">></text>
+                    </view>
+                </view>
+                <view class="cards-grid-three">
+                    <view v-for="(item, index) in americaIndexes" :key="index" class="card-item">
+                        <IndexCard :flagIcon="item.flagIcon" :indexName="item.indexName"
+                            :currentPrice="item.currentPrice" :changeAmount="item.changeAmount"
+                            :changePercent="item.changePercent" :isRising="item.isRising"
+                            @click="viewIndexDetail(item)" />
+                    </view>
+                </view>
+            </view>
+
+            <!-- 底部安全区域 -->
+            <view class="bottom-safe-area"></view>
+        </scroll-view>
+    </view>
 
-  <!-- 底部导航栏 -->
-  <footerBar class="static-footer" :type="'marketSituation'"></footerBar>
+    <!-- 底部导航栏 -->
+    <footerBar class="static-footer" :type="'marketSituation'"></footerBar>
 </template>
 
 <script setup>
-import { ref, onMounted, computed, nextTick, watch } from "vue";
-import footerBar from "../../components/footerBar.vue";
-import IndexCard from "../../components/IndexCard.vue";
+import { ref, onMounted, computed, nextTick, watch } from 'vue'
+import footerBar from './footerBar.vue'
+import IndexCard from '../../components/IndexCard.vue'
 
 // 响应式数据
-const iSMT = ref(0); // 状态栏高度
-const contentHeight = ref(0);
-const headerHeight = ref(0); // 头部高度
-const searchValue = ref(""); // 搜索值
-const isWarnTextOverflow = ref(false); // warn文字是否溢出
+const iSMT = ref(0) // 状态栏高度
+const contentHeight = ref(0)
+const headerHeight = ref(0) // 头部高度
+const searchValue = ref('') // 搜索值
+const isWarnTextOverflow = ref(false) // warn文字是否溢出
 
 // warn文字的class计算属性
 const warnTextClass = computed(() => {
-  return isWarnTextOverflow.value ? "warn_text scroll-active" : "warn_text";
-});
+    return isWarnTextOverflow.value ? 'warn_text scroll-active' : 'warn_text'
+})
 
 // 检测warn文字是否溢出
 const checkWarnTextOverflow = () => {
-  nextTick(() => {
-    setTimeout(() => {
-      const query = uni.createSelectorQuery();
-
-      // 同时查询容器和文字元素
-      query.select(".warn_text_container").boundingClientRect();
-      query.select(".warn_text").boundingClientRect();
-      query.exec((res) => {
-        const containerRect = res[0];
-        const textRect = res[1];
-
-        if (!containerRect || !textRect) {
-          return;
-        }
-
-        // 判断文字是否超出容器（留一些余量）
-        const isOverflow = textRect.width > containerRect.width - 10;
-
-        isWarnTextOverflow.value = isOverflow;
-      });
-    }, 500);
-  });
-};
+    nextTick(() => {
+        setTimeout(() => {
+            const query = uni.createSelectorQuery()
+
+            // 同时查询容器和文字元素
+            query.select('.warn_text_container').boundingClientRect()
+            query.select('.warn_text').boundingClientRect()
+            query.exec((res) => {
+                const containerRect = res[0]
+                const textRect = res[1]
+
+                if (!containerRect || !textRect) {
+                    return
+                }
+
+                // 判断文字是否超出容器（留一些余量）
+                const isOverflow = textRect.width > (containerRect.width - 10)
+
+                isWarnTextOverflow.value = isOverflow
+            })
+        }, 500)
+    })
+}
 
 // 亚太-中华指数数据
 const asiachinaIndexes = ref([
-  {
-    flagIcon: "/static/c1.png",
-    stockName: "上证指数",
-    stockCode: "1A0001",
-    currentPrice: "3933.96",
-    changeAmount: "+24.32",
-    changePercent: "+0.62%",
-    isRising: true,
-  },
-  {
-    flagIcon: "/static/c2.png",
-    stockName: "深证成指",
-    stockCode: "2A01",
-    currentPrice: "45757.90",
-    changeAmount: "-123.45",
-    changePercent: "-0.27%",
-    isRising: false,
-  },
-  {
-    flagIcon: "/static/c3.png",
-    stockName: "创业板指",
-    stockCode: "399006",
-    currentPrice: "6606.08",
-    changeAmount: "+89.76",
-    changePercent: "+1.38%",
-    isRising: true,
-  },
-  {
-    flagIcon: "/static/c4.png",
-    stockName: "沪深300",
-    stockCode: "1B0300",
-    currentPrice: "45757.90",
-    changeAmount: "-89.12",
-    changePercent: "-0.19%",
-    isRising: false,
-  },
-  {
-    flagIcon: "/static/c5.png",
-    stockName: "上证50",
-    stockCode: "1B0011",
-    currentPrice: "45757.90",
-    changeAmount: "+234.56",
-    changePercent: "+0.52%",
-    isRising: true,
-  },
-  {
-    flagIcon: "/static/c6.png",
-    stockName: "科创50",
-    stockCode: "1B0688",
-    currentPrice: "22333.96",
-    changeAmount: "+156.78",
-    changePercent: "+0.71%",
-    isRising: true,
-  },
-]);
+    {
+        flagIcon: '/static/c1.png',
+        indexName: '上证指数',
+        currentPrice: '3933.96',
+        changeAmount: '+24.32',
+        changePercent: '+0.62%',
+        isRising: true
+    },
+    {
+        flagIcon: '/static/c2.png',
+        indexName: '深证成指',
+        currentPrice: '45757.90',
+        changeAmount: '-123.45',
+        changePercent: '-0.27%',
+        isRising: false
+    },
+    {
+        flagIcon: '/static/c3.png',
+        indexName: '创业板指',
+        currentPrice: '6606.08',
+        changeAmount: '+89.76',
+        changePercent: '+1.38%',
+        isRising: true
+    },
+    {
+        flagIcon: '/static/c4.png',
+        indexName: 'HSI50',
+        currentPrice: '22333.96',
+        changeAmount: '+156.78',
+        changePercent: '+0.71%',
+        isRising: true
+    },
+    {
+        flagIcon: '/static/c5.png',
+        indexName: '沪深300',
+        currentPrice: '45757.90',
+        changeAmount: '-89.12',
+        changePercent: '-0.19%',
+        isRising: false
+    },
+    {
+        flagIcon: '/static/c6.png',
+        indexName: '上证50',
+        currentPrice: '45757.90',
+        changeAmount: '+234.56',
+        changePercent: '+0.52%',
+        isRising: true
+    }
+])
 
 // 亚太指数数据
 const asiaIndexes = ref([
-  {
-    flagIcon: "/static/c7.png",
-    stockName: "日经225",
-    stockCode: "noCode",
-    currentPrice: "28456.78",
-    changeAmount: "+234.56",
-    changePercent: "+0.83%",
-    isRising: true,
-  },
-  {
-    flagIcon: "/static/c8.png",
-    stockName: "韩国KOSPI",
-    stockCode: "noCode",
-    currentPrice: "2567.89",
-    changeAmount: "-12.34",
-    changePercent: "-0.48%",
-    isRising: false,
-  },
-  {
-    flagIcon: "/static/c9.png",
-    stockName: "印度孟买",
-    stockCode: "noCode",
-    currentPrice: "65432.10",
-    changeAmount: "+456.78",
-    changePercent: "+0.70%",
-    isRising: true,
-  },
-]);
+    {
+        flagIcon: '/static/c7.png',
+        indexName: '日经225',
+        currentPrice: '28456.78',
+        changeAmount: '+234.56',
+        changePercent: '+0.83%',
+        isRising: true
+    },
+    {
+        flagIcon: '/static/c8.png',
+        indexName: '韩国KOSPI',
+        currentPrice: '2567.89',
+        changeAmount: '-12.34',
+        changePercent: '-0.48%',
+        isRising: false
+    },
+    {
+        flagIcon: '/static/c9.png',
+        indexName: '印度孟买',
+        currentPrice: '65432.10',
+        changeAmount: '+456.78',
+        changePercent: '+0.70%',
+        isRising: true
+    }
+])
 
 // 美洲指数数据
 const americaIndexes = ref([
-  {
-    flagIcon: "/static/c7.png",
-    stockName: "道琼斯指数",
-    stockCode: "noCode",
-    currentPrice: "34567.89",
-    changeAmount: "+123.45",
-    changePercent: "+0.36%",
-    isRising: true,
-  },
-  {
-    flagIcon: "/static/c8.png",
-    stockName: "纳斯达克",
-    stockCode: "noCode",
-    currentPrice: "13456.78",
-    changeAmount: "-67.89",
-    changePercent: "-0.50%",
-    isRising: false,
-  },
-  {
-    flagIcon: "/static/c9.png",
-    stockName: "标普500",
-    stockCode: "noCode",
-    currentPrice: "4234.56",
-    changeAmount: "+23.45",
-    changePercent: "+0.56%",
-    isRising: true,
-  },
-]);
+    {
+        flagIcon: '/static/c7.png',
+        indexName: '道琼斯指数',
+        currentPrice: '34567.89',
+        changeAmount: '+123.45',
+        changePercent: '+0.36%',
+        isRising: true
+    },
+    {
+        flagIcon: '/static/c8.png',
+        indexName: '纳斯达克',
+        currentPrice: '13456.78',
+        changeAmount: '-67.89',
+        changePercent: '-0.50%',
+        isRising: false
+    },
+    {
+        flagIcon: '/static/c9.png',
+        indexName: '标普500',
+        currentPrice: '4234.56',
+        changeAmount: '+23.45',
+        changePercent: '+0.56%',
+        isRising: true
+    }
+])
 
 // 计算属性：内容区域顶部位置
 const contentTopPosition = computed(() => {
-  const statusBarHeight = iSMT.value || 0;
-  const currentHeaderHeight = headerHeight.value > 0 ? headerHeight.value : 100;
-  return statusBarHeight + currentHeaderHeight;
-});
+    const statusBarHeight = iSMT.value || 0
+    const currentHeaderHeight = headerHeight.value > 0 ? headerHeight.value : 100
+    return statusBarHeight + currentHeaderHeight
+})
 
 // 方法：返回上一页
 const goBack = () => {
-  uni.navigateBack();
-};
+    uni.navigateBack()
+}
 
 // 方法：搜索输入
 const onSearchInput = (e) => {
-  searchValue.value = e.detail.value;
-};
+    searchValue.value = e.detail.value
+}
 
 // 方法：清除搜索
 const clearSearch = () => {
-  searchValue.value = "";
-};
+    searchValue.value = ''
+}
 
 // 方法：查看更多
 const viewMore = (market) => {
-  console.log("查看更多:", market);
-  uni.navigateTo({
-    url: `/pages/home/marketDetail?market=${market}`,
-  });
-};
+	console.log('查看更多:', market)
+	uni.navigateTo({
+		url: `/pages/marketSituation/marketDetail?market=${market}`
+	})
+}
 
 // 方法：查看指数详情
 const viewIndexDetail = (item) => {
-  console.log("查看指数详情:", item.stockName);
-  // uni.showToast({
-  //     title: `查看 ${item.stockName} 详情`,
-  //     icon: 'none',
-  //     duration: 2000
-  // })
-  // 这里可以跳转到具体的指数详情页面
-  uni.navigateTo({
-    url: `/pages/home/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}`,
-  });
-};
+    console.log('查看指数详情:', item.indexName)
+    uni.showToast({
+        title: `查看 ${item.indexName} 详情`,
+        icon: 'none',
+        duration: 2000
+    })
+    // 这里可以跳转到具体的指数详情页面
+    // uni.navigateTo({
+    //     url: `/pages/detail/indexDetail?id=${item.id}`
+    // })
+}
 
 // 生命周期：页面挂载
 onMounted(() => {
-  // 获取系统信息
-  const systemInfo = uni.getSystemInfoSync();
-  iSMT.value = systemInfo.statusBarHeight || 0;
-
-  console.log("全球指数页面加载完成");
-  // 动态计算header实际高度
-  uni
-    .createSelectorQuery()
-    .select(".header_fixed")
-    .boundingClientRect((rect) => {
-      if (rect) {
-        headerHeight.value = rect.height;
-        console.log("Header实际高度:", headerHeight.value, "px");
-      }
-    })
-    .exec();
-  // 检测warn文字是否溢出
-  checkWarnTextOverflow();
-});
+    // 获取系统信息
+    const systemInfo = uni.getSystemInfoSync()
+    iSMT.value = systemInfo.statusBarHeight || 0
+
+    console.log('全球指数页面加载完成')
+    // 动态计算header实际高度
+    uni.createSelectorQuery().select('.header_fixed').boundingClientRect((rect) => {
+        if (rect) {
+            headerHeight.value = rect.height
+            console.log('Header实际高度:', headerHeight.value, 'px')
+        }
+    }).exec()
+    // 检测warn文字是否溢出
+    checkWarnTextOverflow()
+})
 
 // 监听headerHeight变化，重新计算contentHeight
 watch(headerHeight, (newHeight) => {
-  if (newHeight > 0) {
-    const systemInfo = uni.getSystemInfoSync();
-    const windowHeight = systemInfo.windowHeight;
-    const statusBarHeight = systemInfo.statusBarHeight || 0;
-    const footerHeight = 100;
-
-    contentHeight.value = windowHeight - statusBarHeight - newHeight - footerHeight;
-    console.log("重新计算contentHeight:", contentHeight.value);
-  }
-});
+    if (newHeight > 0) {
+        const systemInfo = uni.getSystemInfoSync()
+        const windowHeight = systemInfo.windowHeight
+        const statusBarHeight = systemInfo.statusBarHeight || 0
+        const footerHeight = 100
+
+        contentHeight.value = windowHeight - statusBarHeight - newHeight - footerHeight
+        console.log('重新计算contentHeight:', contentHeight.value)
+    }
+})
 </script>
 
 <style lang="scss" scoped>
 .main {
-  position: relative;
-  height: 100vh;
-  overflow: hidden;
-  background-color: #f5f5f5;
+    position: relative;
+    height: 100vh;
+    overflow: hidden;
+    background-color: #f5f5f5;
 }
 
 /* 状态栏占位 */
 .top {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 1001;
-  background-color: #ffffff;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 1001;
+    background-color: #ffffff;
 }
 
 /* 固定头部样式 */
 .header_fixed {
-  position: fixed;
-  left: 0;
-  right: 0;
-  z-index: 1000;
-  background-color: #ffffff;
-  padding: 20rpx 0 0 0;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+    position: fixed;
+    left: 0;
+    right: 0;
+    z-index: 1000;
+    background-color: #ffffff;
+    padding: 20rpx 0 0 0;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
 }
 
 .header_content {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 80rpx;
-  padding: 0 20rpx;
-  margin-bottom: 10rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 80rpx;
+    padding: 0 20rpx;
+    margin-bottom: 10rpx;
 }
 
 .header_back {
-  margin-right: 20rpx;
-  width: 25rpx;
-  height: 30rpx;
+    margin-right: 20rpx;
+    width: 25rpx;
+    height: 30rpx;
 }
 
 .header_back image {
-  width: 25rpx;
-  height: 30rpx;
+    width: 25rpx;
+    height: 30rpx;
 }
 
 .header_input_wrapper {
-  display: flex;
-  align-items: center;
-  width: 100%;
-  margin: 0 20rpx 0 0;
-  height: 70rpx;
-  border-radius: 35rpx;
-  background-color: #ffffff;
-  border: 1rpx solid #e9ecef;
-  padding: 0 80rpx 0 30rpx;
-  font-size: 28rpx;
-  color: #5c5c5c;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+    display: flex;
+    align-items: center;
+    width: 100%;
+    margin: 0 20rpx 0 0;
+    height: 70rpx;
+    border-radius: 35rpx;
+    background-color: #ffffff;
+    border: 1rpx solid #e9ecef;
+    padding: 0 80rpx 0 30rpx;
+    font-size: 28rpx;
+    color: #5c5c5c;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
 }
 
 .search_icon {
-  width: 40rpx;
-  height: 40rpx;
-  opacity: 0.6;
+    width: 40rpx;
+    height: 40rpx;
+    opacity: 0.6;
 }
 
 .header_input {
-  margin-left: 10rpx;
+    margin-left: 10rpx;
 }
 
 .header_icons {
-  display: flex;
-  align-items: center;
-  gap: 15rpx;
+    display: flex;
+    align-items: center;
+    gap: 15rpx;
 }
 
 .header_icon {
-  width: 40rpx;
-  height: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+    width: 40rpx;
+    height: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .header_icon image {
-  width: 40rpx;
-  height: 40rpx;
+    width: 40rpx;
+    height: 40rpx;
 }
 
+
 .warn {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  gap: 10rpx;
-  font-size: 28rpx;
-  color: #666666;
-  padding: 20rpx;
-  max-width: 100%;
-  overflow: hidden;
-  position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 10rpx;
+    font-size: 28rpx;
+    color: #666666;
+    padding: 20rpx;
+    max-width: 100%;
+    overflow: hidden;
+    position: relative;
 }
 
 .warn image {
-  width: 40rpx;
-  height: 40rpx;
-  flex-shrink: 0;
-  /* 防止图片被压缩 */
-  position: relative;
-  z-index: 2;
-  /* 确保图片在最上层 */
+    width: 40rpx;
+    height: 40rpx;
+    flex-shrink: 0;
+    /* 防止图片被压缩 */
+    position: relative;
+    z-index: 2;
+    /* 确保图片在最上层 */
 }
 
 .warn_text_container {
-  flex: 1;
-  overflow: hidden;
-  position: relative;
-  min-width: 0;
-  /* 允许容器收缩 */
+    flex: 1;
+    overflow: hidden;
+    position: relative;
+    min-width: 0;
+    /* 允许容器收缩 */
 }
 
 .warn_text {
-  display: block;
-  white-space: nowrap;
-  will-change: transform;
-  /* 优化动画性能 */
+    display: block;
+    white-space: nowrap;
+    will-change: transform;
+    /* 优化动画性能 */
 }
 
 /* 文字滚动动画 */
 @keyframes scrollText {
-  0% {
-    transform: translateX(0);
-  }
+    0% {
+        transform: translateX(0);
+    }
 
-  20% {
-    transform: translateX(0);
-  }
+    20% {
+        transform: translateX(0);
+    }
 
-  80% {
-    transform: translateX(-85%);
-  }
+    80% {
+        transform: translateX(-85%);
+    }
 
-  100% {
-    transform: translateX(-85%);
-  }
+    100% {
+        transform: translateX(-85%);
+    }
 }
 
 /* 当文字超长时启用滚动动画 */
 .warn_text.scroll-active {
-  animation: scrollText 12s linear infinite;
-  animation-delay: 2s;
-  /* 延迟2秒开始滚动，让用户先看到开头 */
+    animation: scrollText 12s linear infinite;
+    animation-delay: 2s;
+    /* 延迟2秒开始滚动，让用户先看到开头 */
 }
 
 /* 内容区域 */
 .content {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 120rpx;
-  background-color: #f5f5f5;
-  padding: 0;
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 120rpx;
+    background-color: #f5f5f5;
+    padding: 0;
 }
 
 /* 市场分组 */
 .market-section {
-  background-color: white;
-  border-radius: 20rpx;
+    background-color: white;
+    border-radius: 20rpx;
 }
 
 .market-header {
-  margin: 20rpx 20rpx 0 20rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 10rpx;
-  padding-bottom: 10rpx;
-  border-bottom: 2rpx solid #f0f0f0;
+    margin: 20rpx 20rpx 0 20rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10rpx;
+    padding-bottom: 10rpx;
+    border-bottom: 2rpx solid #f0f0f0;
 }
 
 .market-title {
-  font-size: 32rpx;
-  font-weight: 600;
-  color: #333;
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #333;
 }
 
 .market-more {
-  display: flex;
-  align-items: center;
-  gap: 8rpx;
+    display: flex;
+    align-items: center;
+    gap: 8rpx;
 }
 
 .more-text {
-  font-size: 24rpx;
-  color: #666;
+    font-size: 24rpx;
+    color: #666;
 }
 
 .more-arrow {
-  font-size: 20rpx;
-  color: #666;
-  font-weight: bold;
+    font-size: 20rpx;
+    color: #666;
+    font-weight: bold;
 }
 
 /* 三列卡片网格 */
 .cards-grid-three {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
 }
 
 .card-item {
-  background-color: white;
-  border-radius: 16rpx;
-  overflow: hidden;
-  transition: transform 0.2s ease, box-shadow 0.2s ease;
+    background-color: white;
+    border-radius: 16rpx;
+    overflow: hidden;
+    transition: transform 0.2s ease, box-shadow 0.2s ease;
 }
 
 .card-item:active {
-  transform: scale(0.98);
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.12);
+    transform: scale(0.98);
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.12);
 }
 
 /* 底部安全区域 */
 .bottom-safe-area {
-  height: 40rpx;
-  background-color: transparent;
+    height: 40rpx;
+    background-color: transparent;
 }
 
 /* 底部导航栏 */
 .static-footer {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1000;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 1000;
 }
 
 /* 响应式设计 */
 @media (max-width: 400rpx) {
-  .cards-grid-three {
-    grid-template-columns: repeat(2, 1fr);
-  }
+    .cards-grid-three {
+        grid-template-columns: repeat(2, 1fr);
+    }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/home/marketDetail.vue b/pages/home/marketDetail.vue
index d3acf86..f349d6f 100644
--- a/pages/home/marketDetail.vue
+++ b/pages/home/marketDetail.vue
@@ -1,475 +1,472 @@
-<!-- @format -->
-
 <template>
-  <view class="main">
-    <!-- 自定义导航栏 -->
-    <view class="header_fixed" :style="{ top: iSMT + 'px' }">
-      <view class="header-content">
-        <view class="header-left" @click="goBack">
-          <text class="back-text">‹</text>
-        </view>
-        <view class="header-center">
-          <text class="header-title">{{ marketTitle }}</text>
-        </view>
-        <view class="header-right">
-          <image src="/static/marketSituation-image/search.png" class="header-icon" mode="aspectFit"></image>
-          <text class="more-text">···</text>
-        </view>
-      </view>
-      <!-- 表头 -->
-      <view class="table-header">
-        <view class="header-item name-column">
-          <text class="header-text">名称</text>
-        </view>
-        <view class="header-item price-column" @click="sortByPrice">
-          <text class="header-text">最新</text>
-          <text class="sort-icon">{{ sortType === "price" ? (sortOrder === "asc" ? "↑" : "↓") : "↕" }}</text>
-        </view>
-        <view class="header-item change-column" @click="sortByChange">
-          <text class="header-text">涨幅</text>
-          <text class="sort-icon">{{ sortType === "change" ? (sortOrder === "asc" ? "↑" : "↓") : "↕" }}</text>
-        </view>
-      </view>
-    </view>
-
-    <!-- 内容区域 -->
-    <scroll-view class="content" :style="{ top: contentTopPosition + 'px' }" scroll-y="true">
-      <!-- 股票列表 -->
-      <view class="stock-list">
-        <view class="stock-row" v-for="(stock, index) in sortedStockList" :key="index" @click="viewStockDetail(stock)">
-          <view class="stock-cell name-column">
-            <view class="stock-name">{{ stock.stockName }}</view>
-            <view class="stock-code">{{ stock.stockCode }}</view>
-          </view>
-          <view class="stock-cell price-column">
-            <text class="stock-price" :class="stock.isRising ? 'rising' : 'falling'">
-              {{ typeof stock.price === "number" ? stock.price.toFixed(2) : stock.price }}
-            </text>
-          </view>
-          <view class="stock-cell change-column">
-            <text class="stock-change" :class="stock.isRising ? 'rising' : 'falling'">
-              {{ stock.change || stock.changePercent }}
-            </text>
-          </view>
-        </view>
-      </view>
-
-      <!-- 底部安全区域 -->
-      <!-- <view class="bottom-safe-area"></view> -->
-    </scroll-view>
-  </view>
-
-  <!-- 底部导航栏 -->
-  <!-- <footerBar class="static-footer" :type="'marketSituation'"></footerBar> -->
+	<view class="main">
+		<!-- 自定义导航栏 -->
+		<view class="header_fixed" :style="{ top: iSMT + 'px' }">
+			<view class="header-content">
+				<view class="header-left" @click="goBack">
+					<text class="back-text">‹</text>
+				</view>
+				<view class="header-center">
+					<text class="header-title">{{ marketTitle }}</text>
+				</view>
+				<view class="header-right">
+					<image src="/static/marketSituation-image/search.png" class="header-icon" mode="aspectFit"></image>
+					<text class="more-text">···</text>
+				</view>
+			</view>
+			<!-- 表头 -->
+			<view class="table-header">
+				<view class="header-item name-column">
+					<text class="header-text">名称</text>
+				</view>
+				<view class="header-item price-column" @click="sortByPrice">
+					<text class="header-text">最新</text>
+					<text class="sort-icon">{{ sortType === 'price' ? (sortOrder === 'asc' ? '↑' : '↓') : '↕' }}</text>
+				</view>
+				<view class="header-item change-column" @click="sortByChange">
+					<text class="header-text">涨幅</text>
+					<text class="sort-icon">{{ sortType === 'change' ? (sortOrder === 'asc' ? '↑' : '↓') : '↕' }}</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 内容区域 -->
+		<scroll-view class="content" :style="{ top: contentTopPosition + 'px' }" scroll-y="true">
+			
+
+			<!-- 股票列表 -->
+			<view class="stock-list">
+				<view class="stock-row" v-for="(stock, index) in sortedStockList" :key="index"
+					@click="viewStockDetail(stock)">
+					<view class="stock-cell name-column">
+						<view class="stock-name">{{ stock.name }}</view>
+						<view class="stock-code">{{ stock.code }}</view>
+					</view>
+					<view class="stock-cell price-column">
+						<text class="stock-price"
+							:class="stock.isRising ? 'rising' : 'falling'">
+							{{ typeof stock.price === 'number' ? stock.price.toFixed(2) : stock.price }}
+						</text>
+					</view>
+					<view class="stock-cell change-column">
+						<text class="stock-change"
+							:class="stock.isRising ? 'rising' : 'falling'">
+							{{ stock.change || stock.changePercent }}
+						</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 底部安全区域 -->
+			<!-- <view class="bottom-safe-area"></view> -->
+		</scroll-view>
+	</view>
+
+	<!-- 底部导航栏 -->
+	<!-- <footerBar class="static-footer" :type="'marketSituation'"></footerBar> -->
 </template>
 
 <script setup>
-import { ref, computed, onMounted, watch } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
-import footerBar from "@/components/footerBar.vue";
+import { ref, computed, onMounted, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import footerBar from '@/components/footerBar.vue'
 
 // 响应式数据
-const iSMT = ref(0);
-const headerHeight = ref(80);
-const marketType = ref("america");
-const marketTitle = ref("美洲");
-const sortType = ref(""); // 排序类型：'price' 或 'change'
-const sortOrder = ref("desc"); // 排序顺序：'asc' 或 'desc'
+const iSMT = ref(0)
+const contentHeight = ref(0)
+const headerHeight = ref(80)
+const marketType = ref('america')
+const marketTitle = ref('美洲')
+const sortType = ref('') // 排序类型：'price' 或 'change'
+const sortOrder = ref('desc') // 排序顺序：'asc' 或 'desc'
 
 // 股票数据
 const stockList = ref([
-  {
-    stockName: "Telecommunication",
-    stockCode: "888607",
-    price: 1349.47,
-    change: "+7.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Other",
-    stockCode: "888607",
-    price: 1349.47,
-    change: "+6.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1349.47,
-    change: "+5.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Telecommunication",
-    stockCode: "888607",
-    price: 1349.47,
-    change: "+4.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Other",
-    stockCode: "888611",
-    price: 1359.47,
-    change: "+3.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1349.47,
-    change: "+2.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Telecommunication",
-    stockCode: "888607",
-    price: 1349.47,
-    change: "+1.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Other",
-    stockCode: "888611",
-    price: 1009.98,
-    change: "-1.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1009.98,
-    change: "-0.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Telecommunication",
-    stockCode: "888607",
-    price: 1009.98,
-    change: "-0.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Other",
-    stockCode: "888611",
-    price: 1009.98,
-    change: "-1.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1009.98,
-    change: "-4.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1009.98,
-    change: "-3.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1009.98,
-    change: "-3.67%",
-    isRising: false,
-  },
-]);
+	{
+		name: 'Telecommunication',
+		code: '888607',
+		price: 1349.47,
+		change: '+7.67%',
+		isRising: true
+	},
+	{
+		name: 'Other',
+		code: '888607',
+		price: 1349.47,
+		change: '+6.67%',
+		isRising: true
+	},
+	{
+		name: 'Consumer Discretio...',
+		code: '888610',
+		price: 1349.47,
+		change: '+5.67%',
+		isRising: true
+	},
+	{
+		name: 'Telecommunication',
+		code: '888607',
+		price: 1349.47,
+		change: '+4.67%',
+		isRising: true
+	},
+	{
+		name: 'Other',
+		code: '888611',
+		price: 1359.47,
+		change: '+3.67%',
+		isRising: true
+	},
+	{
+		name: 'Consumer Discretio...',
+		code: '888610',
+		price: 1349.47,
+		change: '+2.67%',
+		isRising: true
+	},
+	{
+		name: 'Telecommunication',
+		code: '888607',
+		price: 1349.47,
+		change: '+1.67%',
+		isRising: true
+	},
+	{
+		name: 'Other',
+		code: '888611',
+		price: 1009.98,
+		change: '-1.67%',
+		isRising: false
+	},
+	{
+		name: 'Consumer Discretio...',
+		code: '888610',
+		price: 1009.98,
+		change: '-0.67%',
+		isRising: false
+	},
+	{
+		name: 'Telecommunication',
+		code: '888607',
+		price: 1009.98,
+		change: '-0.67%',
+		isRising: false
+	},
+	{
+		name: 'Other',
+		code: '888611',
+		price: 1009.98,
+		change: '-1.67%',
+		isRising: false
+	},
+	{
+		name: 'Consumer Discretio...',
+		code: '888610',
+		price: 1009.98,
+		change: '-4.67%',
+		isRising: false
+	},
+	{
+		name: 'Consumer Discretio...',
+		code: '888610',
+		price: 1009.98,
+		change: '-3.67%',
+		isRising: false
+	},
+	{
+		name: 'Consumer Discretio...',
+		code: '888610',
+		price: 1009.98,
+		change: '-3.67%',
+		isRising: false
+	}
+])
 
 // 计算属性
 const contentTopPosition = computed(() => {
-  return iSMT.value + headerHeight.value;
-});
+	return iSMT.value + headerHeight.value
+})
 
 const sortedStockList = computed(() => {
-  console.log("计算sortedStockList，原始数据长度:", stockList.value.length);
-  let list = [...stockList.value];
-
-  if (sortType.value === "price") {
-    list.sort((a, b) => {
-      return sortOrder.value === "asc" ? a.price - b.price : b.price - a.price;
-    });
-  } else if (sortType.value === "change") {
-    list.sort((a, b) => {
-      const aChange = parseFloat(a.change.replace(/[+%-]/g, ""));
-      const bChange = parseFloat(b.change.replace(/[+%-]/g, ""));
-      return sortOrder.value === "asc" ? aChange - bChange : bChange - aChange;
-    });
-  }
-
-  console.log("排序后数据长度:", list.length);
-  return list;
-});
+	console.log('计算sortedStockList，原始数据长度:', stockList.value.length);
+	let list = [...stockList.value]
+	
+	if (sortType.value === 'price') {
+		list.sort((a, b) => {
+			return sortOrder.value === 'asc' ? a.price - b.price : b.price - a.price
+		})
+	} else if (sortType.value === 'change') {
+		list.sort((a, b) => {
+			const aChange = parseFloat(a.change.replace(/[+%-]/g, ''))
+			const bChange = parseFloat(b.change.replace(/[+%-]/g, ''))
+			return sortOrder.value === 'asc' ? aChange - bChange : bChange - aChange
+		})
+	}
+	
+	console.log('排序后数据长度:', list.length);
+	return list
+})
 
 // 页面加载时接收参数
 onLoad((options) => {
-  if (options && options.market) {
-    marketType.value = options.market;
-    switch (options.market) {
-      case "america":
-        marketTitle.value = "美洲";
-        break;
-      case "asia":
-        marketTitle.value = "亚太";
-        break;
-      case "asia-china":
-        marketTitle.value = "亚太-中华";
-        break;
-      default:
-        marketTitle.value = "全球指数";
-    }
-  }
-});
+	if (options && options.market) {
+		marketType.value = options.market
+		switch (options.market) {
+			case 'america':
+				marketTitle.value = '美洲'
+				break
+			case 'asia':
+				marketTitle.value = '亚太'
+				break
+			case 'asia-china':
+				marketTitle.value = '亚太-中华'
+				break
+			default:
+				marketTitle.value = '全球指数'
+		}
+	}
+})
 
 // 方法
 const goBack = () => {
-  uni.navigateBack();
-};
+	uni.navigateBack()
+}
 
 const sortByPrice = () => {
-  if (sortType.value === "price") {
-    sortOrder.value = sortOrder.value === "asc" ? "desc" : "asc";
-  } else {
-    sortType.value = "price";
-    sortOrder.value = "desc";
-  }
-};
+	if (sortType.value === 'price') {
+		sortOrder.value = sortOrder.value === 'asc' ? 'desc' : 'asc'
+	} else {
+		sortType.value = 'price'
+		sortOrder.value = 'desc'
+	}
+}
 
 const sortByChange = () => {
-  if (sortType.value === "change") {
-    sortOrder.value = sortOrder.value === "asc" ? "desc" : "asc";
-  } else {
-    sortType.value = "change";
-    sortOrder.value = "desc";
-  }
-};
+	if (sortType.value === 'change') {
+		sortOrder.value = sortOrder.value === 'asc' ? 'desc' : 'asc'
+	} else {
+		sortType.value = 'change'
+		sortOrder.value = 'desc'
+	}
+}
 
 const viewStockDetail = (stock) => {
-  console.log("查看股票详情:", stock);
-  // 这里可以跳转到股票详情页面
-  uni.navigateTo({
-    url: `/pages/home/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(stock))}`,
-  });
-};
+	console.log('查看股票详情:', stock)
+	// 这里可以跳转到股票详情页面
+}
 
 onMounted(() => {
-  // 获取状态栏高度
-  iSMT.value = uni.getSystemInfoSync().statusBarHeight;
-  // 动态计算header实际高度
-  uni
-    .createSelectorQuery()
-    .select(".header_fixed")
-    .boundingClientRect((rect) => {
-      if (rect) {
-        headerHeight.value = rect.height;
-        console.log("Header实际高度:", headerHeight.value, "px");
-      }
-    })
-    .exec();
-});
+	// 获取状态栏高度
+	iSMT.value = uni.getSystemInfoSync().statusBarHeight;
+	// 动态计算header实际高度
+    uni.createSelectorQuery().select('.header_fixed').boundingClientRect((rect) => {
+        if (rect) {
+            headerHeight.value = rect.height
+            console.log('Header实际高度:', headerHeight.value, 'px')
+        }
+    }).exec()
+})
 
 // 监听headerHeight变化，重新计算contentHeight
 watch(headerHeight, (newHeight) => {
-  if (newHeight > 0) {
-    const systemInfo = uni.getSystemInfoSync();
-    const windowHeight = systemInfo.windowHeight;
-    const statusBarHeight = systemInfo.statusBarHeight || 0;
-    const footerHeight = 100;
-
-    contentHeight.value = windowHeight - statusBarHeight - newHeight - footerHeight;
-    console.log("重新计算contentHeight:", contentHeight.value);
-  }
-});
+    if (newHeight > 0) {
+        const systemInfo = uni.getSystemInfoSync()
+        const windowHeight = systemInfo.windowHeight
+        const statusBarHeight = systemInfo.statusBarHeight || 0
+        const footerHeight = 100
+
+        contentHeight.value = windowHeight - statusBarHeight - newHeight - footerHeight
+        console.log('重新计算contentHeight:', contentHeight.value)
+    }
+})
 </script>
 
 <style scoped>
 .main {
-  width: 100%;
-  height: 100vh;
-  background-color: #f5f5f5;
-  position: relative;
+	width: 100%;
+	height: 100vh;
+	background-color: #f5f5f5;
+	position: relative;
 }
 
 /* 自定义导航栏 */
 .header_fixed {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 1000;
-  background-color: #ffffff;
-  border-bottom: 1px solid #f0f0f0;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 1000;
+	background-color: #ffffff;
+	border-bottom: 1px solid #f0f0f0;
 }
 
 .header-content {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 44px;
-  padding: 0 15px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 44px;
+	padding: 0 15px;
 }
 
 .header-left,
 .header-right {
-  width: 60px;
-  display: flex;
-  align-items: center;
+	width: 60px;
+	display: flex;
+	align-items: center;
 }
 
 .header-left {
-  justify-content: flex-start;
+	justify-content: flex-start;
 }
 
 .header-right {
-  justify-content: flex-end;
-  gap: 10px;
+	justify-content: flex-end;
+	gap: 10px;
 }
 
 .back-text {
-  font-size: 24px;
-  color: #333333;
-  font-weight: 500;
-  line-height: 1;
+	font-size: 24px;
+	color: #333333;
+	font-weight: 500;
+	line-height: 1;
 }
 
 .header-center {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 
 .header-title {
-  font-size: 18px;
-  font-weight: 600;
-  color: #333333;
+	font-size: 18px;
+	font-weight: 600;
+	color: #333333;
 }
 
 .header-icon {
-  width: 20px;
-  height: 20px;
+	width: 20px;
+	height: 20px;
 }
 
 .more-text {
-  font-size: 20px;
-  color: #666666;
-  font-weight: bold;
+	font-size: 20px;
+	color: #666666;
+	font-weight: bold;
 }
 
 /* 内容区域 */
 .content {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: #ffffff;
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: #ffffff;
 }
 
 /* 表头样式 */
 .table-header {
-  display: flex;
-  padding: 12px 15px;
-  background-color: #f8f9fa;
-  border-bottom: 1px solid #e9ecef;
+	display: flex;
+	padding: 12px 15px;
+	background-color: #f8f9fa;
+	border-bottom: 1px solid #e9ecef;
 }
 
 .header-item {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	cursor: pointer;
 }
 
 .header-item.name-column {
-  flex: 2;
-  justify-content: flex-start;
+	flex: 2;
+	justify-content: flex-start;
 }
 
 .header-item.price-column,
 .header-item.change-column {
-  flex: 1;
-  justify-content: center;
+	flex: 1;
+	justify-content: center;
 }
 
 .header-text {
-  font-size: 14px;
-  color: #666666;
-  font-weight: 500;
+	font-size: 14px;
+	color: #666666;
+	font-weight: 500;
 }
 
 .sort-icon {
-  margin-left: 4px;
-  font-size: 12px;
-  color: #999999;
+	margin-left: 4px;
+	font-size: 12px;
+	color: #999999;
 }
 
 /* 股票列表 */
 .stock-list {
-  background-color: #ffffff;
+	background-color: #ffffff;
 }
 
 .stock-row {
-  display: flex;
-  align-items: center;
-  padding: 12px 15px;
-  border-bottom: 1px solid #f5f5f5;
+	display: flex;
+	align-items: center;
+	padding: 12px 15px;
+	border-bottom: 1px solid #f5f5f5;
 }
 
 .stock-row:active {
-  background-color: #f8f8f8;
+	background-color: #f8f8f8;
 }
 
 .stock-cell {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
 }
 
 .stock-cell.name-column {
-  flex: 2;
-  align-items: flex-start;
+	flex: 2;
+	align-items: flex-start;
 }
 
 .stock-cell.price-column,
 .stock-cell.change-column {
-  flex: 1;
-  align-items: center;
+	flex: 1;
+	align-items: center;
 }
 
 .stock-name {
-  font-size: 15px;
-  color: #333333;
-  font-weight: 500;
-  line-height: 1.2;
-  margin-bottom: 2px;
+	font-size: 15px;
+	color: #333333;
+	font-weight: 500;
+	line-height: 1.2;
+	margin-bottom: 2px;
 }
 
 .stock-code {
-  font-size: 11px;
-  color: #999999;
-  line-height: 1.2;
+	font-size: 11px;
+	color: #999999;
+	line-height: 1.2;
 }
 
 .stock-price {
-  font-size: 15px;
-  font-weight: 600;
-  line-height: 1.2;
+	font-size: 15px;
+	font-weight: 600;
+	line-height: 1.2;
 }
 
 .stock-change {
-  font-size: 13px;
-  font-weight: 500;
-  line-height: 1.2;
+	font-size: 13px;
+	font-weight: 500;
+	line-height: 1.2;
 }
 
 .rising {
-  color: #00c851;
+	color: #00C851;
 }
 
 .falling {
-  color: #ff4444;
+	color: #FF4444;
 }
 
 /* 底部安全区域 */
@@ -485,4 +482,4 @@ watch(headerHeight, (newHeight) => {
 	right: 0;
 	z-index: 1000;
 } */
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/home/marketOverview.vue b/pages/home/marketOverview.vue
new file mode 100644
index 0000000..db1ad11
--- /dev/null
+++ b/pages/home/marketOverview.vue
@@ -0,0 +1,733 @@
+<template>
+	<view class="main">
+		<!-- 可滚动内容区域 -->
+		<scroll-view class="content_scroll" scroll-y="true" :style="{ top: contentTopPosition + 'px' }">
+			<view class="content">
+				<button @click="goToChartExample">图表</button>
+				<view class="map">
+					<image src="/static/marketSituation-image/map.png" mode="widthFix"></image>
+				</view>
+				<view class="global_index">
+					<view class="global_index_title">
+						{{ $t('marketSituation.globalIndex') }}
+					</view>
+					<view class="global_index_more" @click="goToGlobalIndex">
+						<text>{{ $t('marketSituation.globalIndexMore') }}</text>
+						<image src="/static/marketSituation-image/more.png" mode="aspectFit"></image>
+					</view>
+				</view>
+
+				<!-- 卡片网格 -->
+				<view class="cards_grid">
+					<view v-for="(card, index) in cardData" :key="index" class="card_item">
+						<IndexCard :flagIcon="card.flagIcon" :indexName="card.indexName"
+							:currentPrice="card.currentPrice" :changeAmount="card.changeAmount"
+							:changePercent="card.changePercent" :isRising="card.isRising" />
+					</view>
+				</view>
+				<view class="warn">
+					<image src="/static/marketSituation-image/warn.png" mode="aspectFit"></image>
+					<view class="warn_text_container">
+						<text :class="warnTextClass">{{ $t('marketSituation.warn') }}</text>
+					</view>
+				</view>
+				<!-- 底部安全区域，防止被导航栏遮挡 -->
+				<view class="bottom_safe_area"></view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup>
+import { ref, onMounted, watch, nextTick, computed } from 'vue'
+import util from '../../common/util.js'
+import IndexCard from '../../components/IndexCard.vue'
+
+const iSMT = ref(0)
+const searchValue = ref('')
+const contentHeight = ref(0)
+const headerHeight = ref(0) // 动态计算的header高度
+const isWarnTextOverflow = ref(false) // warn文字是否溢出
+
+const pageIndex = ref(0)
+const scrollToView = ref('')
+
+// 跳转图表示例页面
+const goToChartExample = () => {
+	uni.navigateTo({
+		url: '/pages/marketSituation/chartExample'
+	})
+}
+
+// 计算属性：精准计算content区域的top值
+const contentTopPosition = computed(() => {
+	const statusBarHeight = iSMT.value || 0
+	const currentHeaderHeight = headerHeight.value > 0 ? headerHeight.value : 140
+	return statusBarHeight + currentHeaderHeight
+})
+
+// warn文字的class计算属性
+const warnTextClass = computed(() => {
+	return isWarnTextOverflow.value ? 'warn_text scroll-active' : 'warn_text'
+})
+
+// 弹窗相关数据
+const showCountryModal = ref(false)
+const selectedCountry = ref('概况')
+const countryList = ref([
+	'概况', '新加坡', '马来西亚', '印度尼西亚', '美国', '中国香港',
+	'泰国', '中国', '加拿大', '越南', '外汇', '贵金属'
+])
+
+// 卡片数据
+const cardData = ref([
+	{
+		flagIcon: '🇺🇸',
+		indexName: '道琼斯',
+		currentPrice: '45757.90',
+		changeAmount: '-125.22',
+		changePercent: '-0.27%',
+		isRising: false
+	},
+	{
+		flagIcon: '🇺🇸',
+		indexName: '纳斯达克',
+		currentPrice: '22333.96',
+		changeAmount: '+125.22',
+		changePercent: '+0.47%',
+		isRising: true
+	},
+	{
+		flagIcon: '🇺🇸',
+		indexName: '标普500',
+		currentPrice: '6606.08',
+		changeAmount: '+125.22',
+		changePercent: '+0.27%',
+		isRising: true
+	},
+	{
+		flagIcon: '🇨🇳',
+		indexName: '上证指数',
+		currentPrice: '3333.96',
+		changeAmount: '+125.22',
+		changePercent: '+0.27%',
+		isRising: true
+	},
+	{
+		flagIcon: '🇨🇳',
+		indexName: '科创50',
+		currentPrice: '757.90',
+		changeAmount: '-25.22',
+		changePercent: '-0.27%',
+		isRising: false
+	},
+	{
+		flagIcon: '🇭🇰',
+		indexName: '恒生指数',
+		currentPrice: '19757.90',
+		changeAmount: '-125.22',
+		changePercent: '-0.63%',
+		isRising: false
+	},
+	{
+		flagIcon: '🇸🇬',
+		indexName: '道琼斯',
+		currentPrice: '3757.90',
+		changeAmount: '+85.22',
+		changePercent: '+2.31%',
+		isRising: true
+	},
+	{
+		flagIcon: '🇲🇾',
+		indexName: '纳斯达克',
+		currentPrice: '1657.90',
+		changeAmount: '-15.22',
+		changePercent: '-0.91%',
+		isRising: false
+	},
+	{
+		flagIcon: '🇹🇭',
+		indexName: '标普500',
+		currentPrice: '1457.90',
+		changeAmount: '+35.22',
+		changePercent: '+2.48%',
+		isRising: true
+	}
+])
+
+// 搜索输入事件
+const onSearchInput = (e) => {
+	searchValue.value = e.detail.value
+}
+
+// 搜索确认事件
+const onSearchConfirm = (e) => {
+	console.log('搜索内容:', e.detail.value)
+	// 这里可以添加搜索逻辑
+	performSearch(e.detail.value)
+}
+
+// 搜索图标点击事件
+const onSearchClick = () => {
+	if (searchValue.value.trim()) {
+		performSearch(searchValue.value)
+	}
+}
+
+// 执行搜索
+const performSearch = (keyword) => {
+	if (!keyword.trim()) {
+		uni.showToast({
+			title: '请输入搜索内容',
+			icon: 'none'
+		})
+		return
+	}
+
+	uni.showToast({
+		title: `搜索: ${keyword}`,
+		icon: 'none'
+	})
+	// 这里添加实际的搜索逻辑
+}
+
+// 检测warn文字是否溢出
+const checkWarnTextOverflow = () => {
+	nextTick(() => {
+		setTimeout(() => {
+			const query = uni.createSelectorQuery()
+
+			// 同时查询容器和文字元素
+			query.select('.warn_text_container').boundingClientRect()
+			query.select('.warn_text').boundingClientRect()
+			query.exec((res) => {
+				const containerRect = res[0]
+				const textRect = res[1]
+
+				if (!containerRect || !textRect) {
+					return
+				}
+
+				// 判断文字是否超出容器（留一些余量）
+				const isOverflow = textRect.width > (containerRect.width - 10)
+
+				isWarnTextOverflow.value = isOverflow
+			})
+		}, 500)
+	})
+}
+
+// 跳转到全球指数页面
+const goToGlobalIndex = () => {
+	uni.navigateTo({
+		url: '/pages/marketSituation/globalIndex'
+	})
+}
+
+onMounted(() => {
+	// 状态栏高度
+	iSMT.value = uni.getSystemInfoSync().statusBarHeight;
+
+	// 确保DOM渲染完成后再查询高度
+	nextTick(() => {
+		// 动态计算header实际高度
+		uni.createSelectorQuery().select('.header_fixed').boundingClientRect((rect) => {
+			if (rect) {
+				headerHeight.value = rect.height
+				console.log('Header实际高度:', headerHeight.value, 'px')
+			}
+		}).exec()
+
+		// 检测warn文字是否溢出
+		checkWarnTextOverflow()
+	})
+})
+
+// 监听headerHeight变化，重新计算contentHeight
+watch(headerHeight, (newHeight) => {
+	if (newHeight > 0) {
+		const systemInfo = uni.getSystemInfoSync()
+		const windowHeight = systemInfo.windowHeight
+		const statusBarHeight = systemInfo.statusBarHeight || 0
+		const footerHeight = 100
+
+		contentHeight.value = windowHeight - statusBarHeight - newHeight - footerHeight
+		console.log('重新计算contentHeight:', contentHeight.value)
+	}
+})
+</script>
+
+<style scoped>
+/* 状态栏占位 */
+.top {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 1001;
+	background-color: #ffffff;
+}
+
+/* 固定头部样式 */
+.header_fixed {
+	position: fixed;
+	left: 0;
+	right: 0;
+	z-index: 1000;
+	background-color: #ffffff;
+	padding: 20rpx 0 0 0;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+/* 可滚动内容区域 */
+.content_scroll {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 100rpx;
+	/* 底部导航栏高度 */
+	overflow-y: auto;
+}
+
+.header_content {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 80rpx;
+	padding: 0 20rpx;
+	margin-bottom: 10rpx;
+}
+
+.header_input_wrapper {
+	display: flex;
+	align-items: center;
+	width: 100%;
+	margin: 0 20rpx 0 0;
+	height: 70rpx;
+	border-radius: 35rpx;
+	background-color: #ffffff;
+	border: 1rpx solid #e9ecef;
+	padding: 0 80rpx 0 30rpx;
+	font-size: 28rpx;
+	color: #5c5c5c;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+}
+
+.search_icon {
+	width: 40rpx;
+	height: 40rpx;
+	opacity: 0.6;
+}
+
+.header_input {
+	margin-left: 10rpx;
+}
+
+.header_icons {
+	display: flex;
+	align-items: center;
+	gap: 15rpx;
+}
+
+.header_icon {
+	width: 40rpx;
+	height: 40rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.header_icon image {
+	width: 40rpx;
+	height: 40rpx;
+}
+
+/* Tab 栏样式 */
+.channel_li {
+	display: flex;
+	align-items: center;
+	height: 80rpx;
+	background-color: #ffffff;
+	border-bottom: 1rpx solid #f0f0f0;
+}
+
+.channel_wrap {
+	width: calc(100% - 60rpx);
+	height: 100%;
+	overflow: hidden;
+	flex-shrink: 0;
+}
+
+.channel_innerWrap {
+	display: flex;
+	align-items: center;
+	height: 100%;
+	padding: 0 20rpx;
+	white-space: nowrap;
+}
+
+.channel_item {
+	position: relative;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	height: 60rpx;
+	padding: 0 20rpx;
+	border-radius: 30rpx;
+	transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+	cursor: pointer;
+	white-space: nowrap;
+	flex-shrink: 0;
+}
+
+.channel_item:active {
+	transform: scale(0.98);
+}
+
+.channel_item.active {
+	color: #333;
+	font-weight: bold;
+}
+
+.channel_text {
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #666666;
+	transition: color 0.3s ease;
+	white-space: nowrap;
+}
+
+.channel_item.active .channel_text {
+	color: #333333;
+	font-weight: 400;
+	z-index: 2;
+}
+
+.active_indicator {
+	position: absolute;
+	left: 50%;
+	top: 60%;
+	transform: translateX(-45%);
+	width: calc(100% - 20rpx);
+	min-width: 40rpx;
+	max-width: 120rpx;
+	height: 8rpx;
+	background-image: url('/static/marketSituation-image/bg.png');
+	background-size: cover;
+	background-position: center;
+	background-repeat: no-repeat;
+	animation: slideIn 0.1s ease;
+	border-radius: 8rpx;
+	z-index: 1;
+}
+
+@keyframes slideIn {
+	from {
+		width: 0;
+		opacity: 0;
+	}
+
+	to {
+		width: 40rpx;
+		opacity: 1;
+	}
+}
+
+.scroll_indicator {
+	border-left: 1rpx solid #b6b6b6;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 60rpx;
+	height: 30rpx;
+	background-color: #ffffff;
+	flex-shrink: 0;
+}
+
+.scroll_indicator image {
+	width: 20rpx;
+	height: 20rpx;
+	opacity: 0.5;
+}
+
+.content {
+	margin-top: 20rpx;
+	background-color: white;
+}
+
+.map {
+	width: calc(100% - 60rpx);
+	margin: 0 30rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background-color: #F3F3F3;
+	border-radius: 30rpx;
+	border: 1rpx solid #E0E0E0;
+	padding: 30rpx 20rpx;
+	box-sizing: border-box;
+	/* 设置最小高度保护，但允许内容撑开 */
+	min-height: 200rpx;
+}
+
+.map image {
+	width: 100%;
+	height: auto;
+	max-width: 100%;
+	display: block;
+	/* widthFix模式下，高度会自动按比例调整 */
+	/* 设置最大高度避免图片过大 */
+	max-height: 60vh;
+	/* 添加平滑过渡效果 */
+	transition: all 0.3s ease;
+	max-height: 60vh;
+}
+
+/* 响应式优化 */
+@media screen and (max-width: 750rpx) {
+	.map {
+		margin: 0 20rpx;
+		width: calc(100% - 40rpx);
+		padding: 20rpx 15rpx;
+	}
+}
+
+@media screen and (max-width: 480rpx) {
+	.map {
+		margin: 0 15rpx;
+		width: calc(100% - 30rpx);
+		padding: 15rpx 10rpx;
+	}
+}
+
+.static-footer {
+	position: fixed;
+	bottom: 0;
+}
+
+/* 弹窗样式 */
+.modal_overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: flex-end;
+	z-index: 1000;
+}
+
+.modal_content {
+	width: 100%;
+	background-color: #fff;
+	border-radius: 20rpx 20rpx 0 0;
+	max-height: 80vh;
+	overflow: hidden;
+}
+
+.modal_header {
+	position: relative;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	padding: 30rpx 40rpx;
+	border-bottom: 1rpx solid #f0f0f0;
+}
+
+.modal_title {
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #333333;
+	text-align: center;
+}
+
+.modal_close {
+	position: absolute;
+	right: 40rpx;
+	top: 50%;
+	transform: translateY(-50%);
+	width: 60rpx;
+	height: 60rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 40rpx;
+	color: #999;
+}
+
+.modal_body {
+	padding: 40rpx;
+}
+
+.country_grid {
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+	gap: 20rpx;
+}
+
+.country_item {
+	padding: 24rpx 30rpx;
+	border-radius: 12rpx;
+	background-color: #f8f8f8;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	transition: all 0.3s ease;
+}
+
+.country_item.selected {
+	background-color: #ff4444;
+	color: #fff;
+}
+
+.country_text {
+	font-size: 28rpx;
+	color: #333;
+}
+
+.country_item.selected .country_text {
+	color: #fff;
+}
+
+.global_index {
+	margin: 30rpx 20rpx 0 20rpx;
+	display: flex;
+	justify-content: space-between;
+}
+
+.global_index_title {
+	margin-left: 20rpx;
+	font-size: 40rpx;
+	font-weight: 100;
+	color: #333333;
+	align-items: center;
+}
+
+.global_index_more {
+	display: flex;
+	gap: 10rpx;
+	font-size: 28rpx;
+	color: #333333;
+	align-items: center;
+}
+
+.global_index_more image {
+	width: 40rpx;
+	height: 40rpx;
+	align-items: center;
+}
+
+/* 卡片网格样式 */
+.cards_grid {
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	margin: 0;
+	box-sizing: border-box;
+	width: 100%;
+	padding: 30rpx 20rpx;
+	gap: 20rpx;
+}
+
+.card_item {
+	width: 100%;
+	box-sizing: border-box;
+	min-width: 0;
+	/* 防止内容溢出 */
+}
+
+/* 响应式布局 - 小屏幕时改为两列 */
+@media (max-width: 600rpx) {
+	.cards_grid {
+		grid-template-columns: repeat(2, 1fr);
+		padding: 30rpx 20rpx;
+	}
+}
+
+/* 超小屏幕时改为单列 */
+@media (max-width: 400rpx) {
+	.cards_grid {
+		grid-template-columns: 1fr;
+		padding: 30rpx 20rpx;
+	}
+}
+
+.warn {
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	gap: 10rpx;
+	font-size: 28rpx;
+	color: #666666;
+	padding: 20rpx;
+	max-width: 100%;
+	overflow: hidden;
+	position: relative;
+}
+
+.warn image {
+	width: 40rpx;
+	height: 40rpx;
+	flex-shrink: 0;
+	/* 防止图片被压缩 */
+	position: relative;
+	z-index: 2;
+	/* 确保图片在最上层 */
+}
+
+.warn_text_container {
+	flex: 1;
+	overflow: hidden;
+	position: relative;
+	min-width: 0;
+	/* 允许容器收缩 */
+}
+
+.warn_text {
+	display: block;
+	white-space: nowrap;
+	will-change: transform;
+	/* 优化动画性能 */
+}
+
+/* 文字滚动动画 */
+@keyframes scrollText {
+	0% {
+		transform: translateX(0);
+	}
+
+	20% {
+		transform: translateX(0);
+	}
+
+	80% {
+		transform: translateX(-85%);
+	}
+
+	100% {
+		transform: translateX(-85%);
+	}
+}
+
+/* 当文字超长时启用滚动动画 */
+.warn_text.scroll-active {
+	animation: scrollText 12s linear infinite;
+	animation-delay: 2s;
+	/* 延迟2秒开始滚动，让用户先看到开头 */
+}
+
+/* 底部安全区域 */
+.bottom_safe_area {
+	height: 40rpx;
+	background-color: transparent;
+}
+
+/* 主容器样式调整 */
+.main {
+	position: relative;
+	height: 100vh;
+	overflow: hidden;
+	background-color: white;
+}
+</style>
\ No newline at end of file
diff --git a/pages/home/marketSituation.vue b/pages/home/marketSituation.vue
index 14f8b75..bab6dc5 100644
--- a/pages/home/marketSituation.vue
+++ b/pages/home/marketSituation.vue
@@ -1,920 +1,593 @@
-<!-- @format -->
-
 <template>
-  <view class="main">
-    <!-- 固定头部 -->
-    <view class="header_fixed" :style="{ top: iSMT + 'px' }">
-      <view class="header_content">
-        <view class="header_input_wrapper">
-          <image class="search_icon" src="/static/marketSituation-image/search.png" mode="" @click="onSearchClick"></image>
-          <input class="header_input" type="text" placeholder="搜索" placeholder-style="color: #A6A6A6; font-size: 22rpx;" v-model="searchValue" @input="onSearchInput" @confirm="onSearchConfirm" />
-        </view>
-        <view class="header_icons">
-          <view class="header_icon" @click="selected">
-            <image src="/static/marketSituation-image/mySeclected.png" mode=""></image>
-          </view>
-          <view class="header_icon" @click="history">
-            <image src="/static/marketSituation-image/history.png" mode=""></image>
-          </view>
-        </view>
-      </view>
-      <view class="channel_li" v-if="channelData.length > 0">
-        <scroll-view class="channel_wrap" scroll-x="true" :scroll-into-view="scrollToView" :scroll-with-animation="true" show-scrollbar="false">
-          <view class="channel_innerWrap">
-            <view v-for="(item, index) in channelData" :key="item.id" :id="'nav' + item.id" :class="['channel_item', index === pageIndex ? 'active' : '']" @click="navClick(index)">
-              <text class="channel_text">{{ item.title }}</text>
-              <view v-if="index === pageIndex" class="active_indicator"></view>
-            </view>
-          </view>
-        </scroll-view>
-        <view class="scroll_indicator" @click="channel_more">
-          <image src="/static/marketSituation-image/menu.png" mode="aspectFit"></image>
-        </view>
-      </view>
-    </view>
-
-    <!-- 可滚动内容区域 -->
-    <scroll-view class="content_scroll" scroll-y="true" :style="{ top: contentTopPosition + 'px' }">
-      <view class="content">
-        <view class="map">
-          <image src="/static/marketSituation-image/map.png" mode="widthFix"></image>
-        </view>
-        <view class="global_index">
-          <view class="global_index_title">
-            {{ $t("marketSituation.globalIndex") }}
-          </view>
-          <view class="global_index_more" @click="goToGlobalIndex">
-            <text>{{ $t("marketSituation.globalIndexMore") }}</text>
-            <image src="/static/marketSituation-image/more.png" mode="aspectFit"></image>
-          </view>
-        </view>
-
-        <!-- 卡片网格 -->
-        <view class="cards_grid">
-          <view v-for="(card, index) in cardData" :key="index" class="card_item">
-            <IndexCard :flagIcon="card.flagIcon" :stockName="card.stockName" :currentPrice="card.currentPrice" :changeAmount="card.changeAmount" :changePercent="card.changePercent" :isRising="card.isRising" @click="viewIndexDetail(card)" />
-          </view>
-        </view>
-        <view class="warn">
-          <image src="/static/marketSituation-image/warn.png" mode="aspectFit"></image>
-          <view class="warn_text_container">
-            <text :class="warnTextClass">{{ $t("marketSituation.warn") }}</text>
-          </view>
-        </view>
-        <!-- 底部安全区域，防止被导航栏遮挡 -->
-        <view class="bottom_safe_area"></view>
-      </view>
-    </scroll-view>
-  </view>
-
-  <footerBar class="static-footer" :type="type"></footerBar>
-
-  <!-- 更多tab弹窗 -->
-  <view v-if="showCountryModal" class="modal_overlay" @click="closeModal">
-    <view class="modal_content" @click.stop>
-      <view class="modal_header">
-        <text class="modal_title">全部栏目</text>
-        <view class="modal_close" @click="closeModal">
-          <text>×</text>
-        </view>
-      </view>
-      <view class="modal_body">
-        <view class="country_grid">
-          <view v-for="(country, index) in countryList" :key="index" :class="['country_item', selectedCountry === country ? 'selected' : '']" @click="selectCountry(country)">
-            <text class="country_text">{{ country }}</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+	<view>
+		<view class="main">
+			<!-- 固定头部 -->
+			<view class="header_fixed" :style="{ top: iSMT + 'px' }">
+				<view class="header_content">
+					<view class="header_input_wrapper">
+						<image class="search_icon" src="/static/marketSituation-image/search.png" mode=""
+							@click="onSearchClick"></image>
+						<input class="header_input" type="text" placeholder="搜索"
+							placeholder-style="color: #A6A6A6; font-size: 22rpx;" v-model="searchValue"
+							@input="onSearchInput" @confirm="onSearchConfirm" />
+					</view>
+					<view class="header_icons">
+						<view class="header_icon" @click="selected">
+							<image src="/static/marketSituation-image/mySeclected.png" mode=""></image>
+						</view>
+						<view class="header_icon" @click="history">
+							<image src="/static/marketSituation-image/history.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+				<view class="channel_li" v-if="channelData.length > 0">
+					<scroll-view class="channel_wrap" scroll-x="true" :scroll-into-view="scrollToView"
+						:scroll-with-animation="true" show-scrollbar="false">
+						<view class="channel_innerWrap">
+							<view v-for="(item, index) in channelData" :key="item.id" :id="'nav' + item.id"
+								:class="['channel_item', index === pageIndex ? 'active' : '']" @click="navClick(index)">
+								<text class="channel_text">{{ item.title }}</text>
+								<view v-if="index === pageIndex" class="active_indicator"></view>
+							</view>
+						</view>
+					</scroll-view>
+					<view class="scroll_indicator" @click="channel_more">
+						<image src="/static/marketSituation-image/menu.png" mode="aspectFit"></image>
+					</view>
+				</view>
+			</view>
+
+			<!-- 可滚动内容区域 -->
+			<scroll-view class="content_scroll" scroll-y="true" :style="{ top: contentTopPosition + 'px' }">
+				<!-- 动态组件切换 -->
+				<component :is="currentComponent" :countryId="currentChannelId" />
+			</scroll-view>
+		</view>
+
+		<footerBar class="static-footer" :type="type"></footerBar>
+
+		<!-- 更多tab弹窗 -->
+		<view v-if="showCountryModal" class="modal_overlay" @click="closeModal">
+			<view class="modal_content" @click.stop>
+				<view class="modal_header">
+					<text class="modal_title">全部栏目</text>
+					<view class="modal_close" @click="closeModal">
+						<text>×</text>
+					</view>
+				</view>
+				<view class="modal_body">
+					<view class="country_grid">
+						<view v-for="(country, index) in countryList" :key="index"
+							:class="['country_item', selectedCountry === country ? 'selected' : '']"
+							@click="selectCountry(country)">
+							<text class="country_text">{{ country }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-import { ref, onMounted, watch, nextTick, computed } from "vue";
-import util from "../../common/util.js";
-import footerBar from "../../components/footerBar.vue";
-import IndexCard from "../../components/IndexCard.vue";
-
-const type = ref("marketSituation");
-const iSMT = ref(0);
-const searchValue = ref("");
-const contentHeight = ref(0);
-const headerHeight = ref(0); // 动态计算的header高度
-const isWarnTextOverflow = ref(false); // warn文字是否溢出
+import { ref, onMounted, watch, nextTick, computed } from 'vue'
+import footerBar from './footerBar.vue'
+import forexMetals from './forexMetals.vue'
+import marketOverview from './marketOverview.vue'
+import countryMarket from './countryMarket.vue'
+
+const type = ref('marketSituation')
+const iSMT = ref(0)
+const searchValue = ref('')
+const contentHeight = ref(0)
+const headerHeight = ref(0) // 动态计算的header高度
 
 // Tab 栏相关数据
 const channelData = ref([
-  { id: 1, title: "概况" },
-  { id: 2, title: "新加坡" },
-  { id: 3, title: "马来西亚" },
-  { id: 4, title: "印度尼西亚" },
-  { id: 5, title: "美国" },
-  { id: 6, title: "中国香港" },
-  { id: 7, title: "泰国" },
-  { id: 8, title: "中国" },
-  { id: 9, title: "加拿大" },
-  { id: 10, title: "越南" },
-  { id: 11, title: "外汇" },
-  { id: 12, title: "贵金属" },
-]);
-const pageIndex = ref(0);
-const scrollToView = ref("");
+	{ id: 1, title: '概况' },
+	{ id: 2, title: '新加坡' },
+	{ id: 3, title: '马来西亚' },
+	{ id: 4, title: '印度尼西亚' },
+	{ id: 5, title: '美国' },
+	{ id: 6, title: '中国香港' },
+	{ id: 7, title: '泰国' },
+	{ id: 8, title: '中国' },
+	{ id: 9, title: '加拿大' },
+	{ id: 10, title: '越南' },
+	{ id: 11, title: '外汇' },
+	{ id: 12, title: '贵金属' },
+])
+const pageIndex = ref(0)
+const scrollToView = ref('')
+
+// 动态组件相关
+const currentChannelId = computed(() => {
+	return channelData.value[pageIndex.value]?.id || 1
+})
+
+const currentComponent = computed(() => {
+	const channelId = currentChannelId.value
+
+	// 概况页面使用 MarketOverview 组件
+	if (pageIndex.value === 0) {
+		return marketOverview
+	}
+	// 外汇(id=11)和贵金属(id=12)使用 ForexMetals 组件
+	else if (channelId === 11 || channelId === 12) {
+		return forexMetals
+	}
+	// 其他国家/地区页面使用 CountryMarket 组件
+	else {
+		return countryMarket
+	}
+})
 
 // 计算属性：精准计算content区域的top值
 const contentTopPosition = computed(() => {
-  const statusBarHeight = iSMT.value || 0;
-  const currentHeaderHeight = headerHeight.value > 0 ? headerHeight.value : 140;
-  return statusBarHeight + currentHeaderHeight;
-});
-
-// warn文字的class计算属性
-const warnTextClass = computed(() => {
-  return isWarnTextOverflow.value ? "warn_text scroll-active" : "warn_text";
-});
+	const statusBarHeight = iSMT.value || 0
+	const currentHeaderHeight = headerHeight.value > 0 ? headerHeight.value : 140
+	return statusBarHeight + currentHeaderHeight
+})
 
 // 弹窗相关数据
-const showCountryModal = ref(false);
-const selectedCountry = ref("概况");
-const countryList = ref(["概况", "新加坡", "马来西亚", "印度尼西亚", "美国", "中国香港", "泰国", "中国", "加拿大", "越南", "外汇", "贵金属"]);
-
-// 卡片数据
-const cardData = ref([
-  {
-    flagIcon: "🇺🇸",
-    stockName: "道琼斯",
-    stockCode: "DJIA",
-    currentPrice: "45757.90",
-    changeAmount: "-125.22",
-    changePercent: "-0.27%",
-    isRising: false,
-  },
-  {
-    flagIcon: "🇺🇸",
-    stockName: "纳斯达克",
-    stockCode: "NDX",
-    currentPrice: "22333.96",
-    changeAmount: "+125.22",
-    changePercent: "+0.47%",
-    isRising: true,
-  },
-  {
-    flagIcon: "🇺🇸",
-    stockName: "标普500",
-    stockCode: "SPX",
-    currentPrice: "6606.08",
-    changeAmount: "+125.22",
-    changePercent: "+0.27%",
-    isRising: true,
-  },
-  {
-    flagIcon: "🇨🇳",
-    stockName: "上证指数",
-    stockCode: "1A0001",
-    currentPrice: "3333.96",
-    changeAmount: "+125.22",
-    changePercent: "+0.27%",
-    isRising: true,
-  },
-  {
-    flagIcon: "🇨🇳",
-    stockName: "科创50",
-    stockCode: "1B0688",
-    currentPrice: "757.90",
-    changeAmount: "-25.22",
-    changePercent: "-0.27%",
-    isRising: false,
-  },
-  {
-    flagIcon: "🇭🇰",
-    stockName: "恒生指数",
-    stockCode: "HSI",
-    currentPrice: "19757.90",
-    changeAmount: "-125.22",
-    changePercent: "-0.63%",
-    isRising: false,
-  },
-  {
-    flagIcon: "🇸🇬",
-    stockName: "道琼斯",
-    stockCode: "DJIA",
-    currentPrice: "3757.90",
-    changeAmount: "+85.22",
-    changePercent: "+2.31%",
-    isRising: true,
-  },
-  {
-    flagIcon: "🇲🇾",
-    stockName: "纳斯达克",
-    stockCode: "NDX",
-    currentPrice: "1657.90",
-    changeAmount: "-15.22",
-    changePercent: "-0.91%",
-    isRising: false,
-  },
-  {
-    flagIcon: "🇹🇭",
-    stockName: "标普500",
-    stockCode: "SPX",
-    currentPrice: "1457.90",
-    changeAmount: "+35.22",
-    changePercent: "+2.48%",
-    isRising: true,
-  },
-]);
+const showCountryModal = ref(false)
+const selectedCountry = ref('概况')
+const countryList = ref([
+	'概况', '新加坡', '马来西亚', '印度尼西亚', '美国', '中国香港',
+	'泰国', '中国', '加拿大', '越南', '外汇', '贵金属'
+])
 
 // 搜索输入事件
 const onSearchInput = (e) => {
-  searchValue.value = e.detail.value;
-};
+	searchValue.value = e.detail.value
+}
 
 // 搜索确认事件
 const onSearchConfirm = (e) => {
-  console.log("搜索内容:", e.detail.value);
-  // 这里可以添加搜索逻辑
-  performSearch(e.detail.value);
-};
+	console.log('搜索内容:', e.detail.value)
+	// 这里可以添加搜索逻辑
+	performSearch(e.detail.value)
+}
 
 // 搜索图标点击事件
 const onSearchClick = () => {
-  if (searchValue.value.trim()) {
-    performSearch(searchValue.value);
-  }
-};
+	if (searchValue.value.trim()) {
+		performSearch(searchValue.value)
+	}
+}
 
 // 执行搜索
 const performSearch = (keyword) => {
-  if (!keyword.trim()) {
-    uni.showToast({
-      title: "请输入搜索内容",
-      icon: "none",
-    });
-    return;
-  }
-
-  uni.showToast({
-    title: `搜索: ${keyword}`,
-    icon: "none",
-  });
-  // 这里添加实际的搜索逻辑
-};
+	if (!keyword.trim()) {
+		uni.showToast({
+			title: '请输入搜索内容',
+			icon: 'none'
+		})
+		return
+	}
+
+	uni.showToast({
+		title: `搜索: ${keyword}`,
+		icon: 'none'
+	})
+	// 这里添加实际的搜索逻辑
+}
 
 // 我的收藏点击事件
 const selected = () => {
-  uni.showToast({
-    title: "我的收藏",
-    icon: "none",
-  });
-  // 这里可以跳转到收藏页面
-};
+	uni.showToast({
+		title: '我的收藏',
+		icon: 'none'
+	})
+	// 这里可以跳转到收藏页面
+}
 
 // 历史记录点击事件
 const history = () => {
-  uni.showToast({
-    title: "历史记录",
-    icon: "none",
-  });
-  // 这里可以跳转到历史页面
-};
+	uni.showToast({
+		title: '历史记录',
+		icon: 'none'
+	})
+	// 这里可以跳转到历史页面
+}
 
 // Tab 栏点击事件
 const navClick = (index) => {
-  pageIndex.value = index;
-  const currentItem = channelData.value[index];
-  scrollToView.value = "nav" + currentItem.id;
+	pageIndex.value = index
+	const currentItem = channelData.value[index]
+	scrollToView.value = 'nav' + currentItem.id
 
-  // 同步更新弹窗中的选中状态
-  selectedCountry.value = currentItem.title;
+	// 同步更新弹窗中的选中状态
+	selectedCountry.value = currentItem.title
 
-  uni.showToast({
-    title: `切换到: ${currentItem.title}`,
-    icon: "none",
-  });
+	uni.showToast({
+		title: `切换到: ${currentItem.title}`,
+		icon: 'none'
+	})
 
-  // 这里可以添加切换 tab 后的数据加载逻辑
-  console.log("当前选中的 tab:", currentItem);
-};
+	// 这里可以添加切换 tab 后的数据加载逻辑
+	console.log('当前选中的 tab:', currentItem)
+}
 
 // 更多选项点击事件
 const channel_more = () => {
-  showCountryModal.value = true;
-};
+	showCountryModal.value = true
+}
 
 // 选择国家
 const selectCountry = (country) => {
-  selectedCountry.value = country;
-
-  // 查找对应的tab索引
-  const targetIndex = channelData.value.findIndex((item) => item.title === country);
-
-  if (targetIndex !== -1) {
-    // 同步更新页面tab
-    pageIndex.value = targetIndex;
-    const currentItem = channelData.value[targetIndex];
-    scrollToView.value = "nav" + currentItem.id;
-
-    console.log("选中了：" + country + "，同步到tab索引：" + targetIndex);
-    uni.showToast({
-      title: "已切换到：" + country,
-      icon: "none",
-      duration: 2000,
-    });
-  } else {
-    // 如果是"概况"或其他特殊选项，默认切换到第一个tab
-    if (country === "概况" || country === "全部") {
-      pageIndex.value = 0;
-      scrollToView.value = "nav" + channelData.value[0].id;
-    }
-
-    console.log("选中了：" + country);
-    uni.showToast({
-      title: "已选择：" + country,
-      icon: "none",
-      duration: 2000,
-    });
-  }
-
-  // 这里可以添加切换到对应国家/地区数据的逻辑
-  // 例如：loadMarketData(country)
-  closeModal();
-};
+	selectedCountry.value = country
+
+	// 查找对应的tab索引
+	const targetIndex = channelData.value.findIndex(item => item.title === country)
+
+	if (targetIndex !== -1) {
+		// 同步更新页面tab
+		pageIndex.value = targetIndex
+		const currentItem = channelData.value[targetIndex]
+		scrollToView.value = 'nav' + currentItem.id
+
+		console.log('选中了：' + country + '，同步到tab索引：' + targetIndex)
+		uni.showToast({
+			title: '已切换到：' + country,
+			icon: 'none',
+			duration: 2000
+		})
+	} else {
+		// 如果是"概况"或其他特殊选项，默认切换到第一个tab
+		if (country === '概况' || country === '全部') {
+			pageIndex.value = 0
+			scrollToView.value = 'nav' + channelData.value[0].id
+		}
+
+		console.log('选中了：' + country)
+		uni.showToast({
+			title: '已选择：' + country,
+			icon: 'none',
+			duration: 2000
+		})
+	}
+
+	// 这里可以添加切换到对应国家/地区数据的逻辑
+	// 例如：loadMarketData(country)
+	closeModal()
+}
 
 // 关闭弹窗
 const closeModal = () => {
-  showCountryModal.value = false;
-};
-
-// 检测warn文字是否溢出
-const checkWarnTextOverflow = () => {
-  nextTick(() => {
-    setTimeout(() => {
-      const query = uni.createSelectorQuery();
-
-      // 同时查询容器和文字元素
-      query.select(".warn_text_container").boundingClientRect();
-      query.select(".warn_text").boundingClientRect();
-      query.exec((res) => {
-        const containerRect = res[0];
-        const textRect = res[1];
-
-        if (!containerRect || !textRect) {
-          return;
-        }
-
-        // 判断文字是否超出容器（留一些余量）
-        const isOverflow = textRect.width > containerRect.width - 10;
-
-        isWarnTextOverflow.value = isOverflow;
-      });
-    }, 500);
-  });
-};
-
-// 跳转到全球指数页面
-const goToGlobalIndex = () => {
-  uni.navigateTo({
-    url: "/pages/home/globalIndex",
-  });
-};
-
-// 方法：查看指数详情
-const viewIndexDetail = (item) => {
-  console.log("查看指数详情:", item.stockName);
-  // uni.showToast({
-  //     title: `查看 ${item.stockName} 详情`,
-  //     icon: 'none',
-  //     duration: 2000
-  // })
-  // 这里可以跳转到具体的指数详情页面
-  uni.navigateTo({
-    url: `/pages/home/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}`,
-  });
-};
+	showCountryModal.value = false
+}
 
 onMounted(() => {
-  // 状态栏高度
-  iSMT.value = uni.getSystemInfoSync().statusBarHeight;
-
-  // 初始化 tab 栏
-  if (channelData.value.length > 0) {
-    pageIndex.value = 0;
-    scrollToView.value = "nav" + channelData.value[0].id;
-  }
-
-  util.request(
-    "link/api/brain/privilege",
-    (res) => {
-      console.log(res);
-    },
-    {
-      token: "9ior41AF0xTIbIG2pRnnbZi0+fEeMx8pywnIlrmTwo5FbqJ9lWrSWOxp9MkpKiNtedtUafqvzIwpFKrwuMs",
-    },
-    (err) => {
-      console.log(err);
-    }
-  );
-
-  // 确保DOM渲染完成后再查询高度
-  nextTick(() => {
-    // 动态计算header实际高度
-    uni
-      .createSelectorQuery()
-      .select(".header_fixed")
-      .boundingClientRect((rect) => {
-        if (rect) {
-          headerHeight.value = rect.height;
-          console.log("Header实际高度:", headerHeight.value, "px");
-        }
-      })
-      .exec();
-
-    // 检测warn文字是否溢出
-    checkWarnTextOverflow();
-  });
-});
+	// 状态栏高度
+	iSMT.value = uni.getSystemInfoSync().statusBarHeight;
+
+	// 初始化 tab 栏
+	if (channelData.value.length > 0) {
+		pageIndex.value = 0
+		scrollToView.value = 'nav' + channelData.value[0].id
+	}
+
+	// 确保DOM渲染完成后再查询高度
+	nextTick(() => {
+		// 动态计算header实际高度
+		uni.createSelectorQuery().select('.header_fixed').boundingClientRect((rect) => {
+			if (rect) {
+				headerHeight.value = rect.height
+				console.log('Header实际高度:', headerHeight.value, 'px')
+			}
+		}).exec()
+	})
+})
 
 // 监听headerHeight变化，重新计算contentHeight
 watch(headerHeight, (newHeight) => {
-  if (newHeight > 0) {
-    const systemInfo = uni.getSystemInfoSync();
-    const windowHeight = systemInfo.windowHeight;
-    const statusBarHeight = systemInfo.statusBarHeight || 0;
-    const footerHeight = 100;
-
-    contentHeight.value = windowHeight - statusBarHeight - newHeight - footerHeight;
-    console.log("重新计算contentHeight:", contentHeight.value);
-  }
-});
+	if (newHeight > 0) {
+		const systemInfo = uni.getSystemInfoSync()
+		const windowHeight = systemInfo.windowHeight
+		const statusBarHeight = systemInfo.statusBarHeight || 0
+		const footerHeight = 100
+
+		contentHeight.value = windowHeight - statusBarHeight - newHeight - footerHeight
+		console.log('重新计算contentHeight:', contentHeight.value)
+	}
+})
 </script>
 
 <style scoped>
+/* 主容器样式调整 */
+.main {
+	position: relative;
+	height: 100vh;
+	overflow: hidden;
+	background-color: white;
+}
+
 /* 状态栏占位 */
 .top {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 1001;
-  background-color: #ffffff;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 1001;
+	background-color: #ffffff;
 }
 
 /* 固定头部样式 */
 .header_fixed {
-  position: fixed;
-  left: 0;
-  right: 0;
-  z-index: 1000;
-  background-color: #ffffff;
-  padding: 20rpx 0 0 0;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+	position: fixed;
+	left: 0;
+	right: 0;
+	z-index: 1000;
+	background-color: #ffffff;
+	padding: 20rpx 0 0 0;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
 }
 
 /* 可滚动内容区域 */
 .content_scroll {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 100rpx;
-  /* 底部导航栏高度 */
-  overflow-y: auto;
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 100rpx;
+	/* 底部导航栏高度 */
+	overflow-y: auto;
 }
 
 .header_content {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 80rpx;
-  padding: 0 20rpx;
-  margin-bottom: 10rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 80rpx;
+	padding: 0 20rpx;
+	margin-bottom: 10rpx;
 }
 
 .header_input_wrapper {
-  display: flex;
-  align-items: center;
-  width: 100%;
-  margin: 0 20rpx 0 0;
-  height: 70rpx;
-  border-radius: 35rpx;
-  background-color: #ffffff;
-  border: 1rpx solid #e9ecef;
-  padding: 0 80rpx 0 30rpx;
-  font-size: 28rpx;
-  color: #5c5c5c;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+	display: flex;
+	align-items: center;
+	width: 100%;
+	margin: 0 20rpx 0 0;
+	height: 70rpx;
+	border-radius: 35rpx;
+	background-color: #ffffff;
+	border: 1rpx solid #e9ecef;
+	padding: 0 80rpx 0 30rpx;
+	font-size: 28rpx;
+	color: #5c5c5c;
+	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
 }
 
 .search_icon {
-  width: 40rpx;
-  height: 40rpx;
-  opacity: 0.6;
+	width: 40rpx;
+	height: 40rpx;
+	opacity: 0.6;
 }
 
 .header_input {
-  margin-left: 10rpx;
+	margin-left: 10rpx;
 }
 
 .header_icons {
-  display: flex;
-  align-items: center;
-  gap: 15rpx;
+	display: flex;
+	align-items: center;
+	gap: 15rpx;
 }
 
 .header_icon {
-  width: 40rpx;
-  height: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+	width: 40rpx;
+	height: 40rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 
 .header_icon image {
-  width: 40rpx;
-  height: 40rpx;
+	width: 40rpx;
+	height: 40rpx;
 }
 
 /* Tab 栏样式 */
 .channel_li {
-  display: flex;
-  align-items: center;
-  height: 80rpx;
-  background-color: #ffffff;
-  border-bottom: 1rpx solid #f0f0f0;
+	display: flex;
+	align-items: center;
+	height: 80rpx;
+	background-color: #ffffff;
+	border-bottom: 1rpx solid #f0f0f0;
 }
 
 .channel_wrap {
-  width: calc(100% - 60rpx);
-  height: 100%;
-  overflow: hidden;
-  flex-shrink: 0;
+	width: calc(100% - 60rpx);
+	height: 100%;
+	overflow: hidden;
+	flex-shrink: 0;
 }
 
 .channel_innerWrap {
-  display: flex;
-  align-items: center;
-  height: 100%;
-  padding: 0 20rpx;
-  white-space: nowrap;
+	display: flex;
+	align-items: center;
+	height: 100%;
+	padding: 0 20rpx;
+	white-space: nowrap;
 }
 
 .channel_item {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: 60rpx;
-  padding: 0 20rpx;
-  border-radius: 30rpx;
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  cursor: pointer;
-  white-space: nowrap;
-  flex-shrink: 0;
+	position: relative;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	height: 60rpx;
+	padding: 0 20rpx;
+	border-radius: 30rpx;
+	transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+	cursor: pointer;
+	white-space: nowrap;
+	flex-shrink: 0;
 }
 
 .channel_item:active {
-  transform: scale(0.98);
+	transform: scale(0.98);
 }
 
 .channel_item.active {
-  color: #333;
-  font-weight: bold;
+	color: #333;
+	font-weight: bold;
 }
 
 .channel_text {
-  font-size: 28rpx;
-  font-weight: 500;
-  color: #666666;
-  transition: color 0.3s ease;
-  white-space: nowrap;
+	font-size: 28rpx;
+	font-weight: 500;
+	color: #666666;
+	transition: color 0.3s ease;
+	white-space: nowrap;
 }
 
 .channel_item.active .channel_text {
-  color: #333333;
-  font-weight: 400;
-  z-index: 2;
+	color: #333333;
+	font-weight: 400;
+	z-index: 2;
 }
 
 .active_indicator {
-  position: absolute;
-  left: 50%;
-  top: 60%;
-  transform: translateX(-45%);
-  width: calc(100% - 20rpx);
-  min-width: 40rpx;
-  max-width: 120rpx;
-  height: 8rpx;
-  background-image: url("/static/marketSituation-image/bg.png");
-  background-size: cover;
-  background-position: center;
-  background-repeat: no-repeat;
-  animation: slideIn 0.1s ease;
-  border-radius: 8rpx;
-  z-index: 1;
+	position: absolute;
+	left: 50%;
+	top: 60%;
+	transform: translateX(-45%);
+	width: calc(100% - 20rpx);
+	min-width: 40rpx;
+	max-width: 120rpx;
+	height: 8rpx;
+	background-image: url('/static/marketSituation-image/bg.png');
+	background-size: cover;
+	background-position: center;
+	background-repeat: no-repeat;
+	animation: slideIn 0.1s ease;
+	border-radius: 8rpx;
+	z-index: 1;
 }
 
 @keyframes slideIn {
-  from {
-    width: 0;
-    opacity: 0;
-  }
+	from {
+		width: 0;
+		opacity: 0;
+	}
 
-  to {
-    width: 40rpx;
-    opacity: 1;
-  }
+	to {
+		width: 40rpx;
+		opacity: 1;
+	}
 }
 
 .scroll_indicator {
-  border-left: 1rpx solid #b6b6b6;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 60rpx;
-  height: 30rpx;
-  background-color: #ffffff;
-  flex-shrink: 0;
+	border-left: 1rpx solid #b6b6b6;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 60rpx;
+	height: 30rpx;
+	background-color: #ffffff;
+	flex-shrink: 0;
 }
 
 .scroll_indicator image {
-  width: 20rpx;
-  height: 20rpx;
-  opacity: 0.5;
+	width: 20rpx;
+	height: 20rpx;
+	opacity: 0.5;
 }
 
 .content {
-  margin-top: 20rpx;
-  background-color: white;
-}
-
-.map {
-  width: calc(100% - 60rpx);
-  margin: 0 30rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background-color: #f3f3f3;
-  border-radius: 30rpx;
-  border: 1rpx solid #e0e0e0;
-  padding: 30rpx 20rpx;
-  box-sizing: border-box;
-  /* 设置最小高度保护，但允许内容撑开 */
-  min-height: 200rpx;
-}
-
-.map image {
-  width: 100%;
-  height: auto;
-  max-width: 100%;
-  display: block;
-  /* widthFix模式下，高度会自动按比例调整 */
-  /* 设置最大高度避免图片过大 */
-  max-height: 60vh;
-  /* 添加平滑过渡效果 */
-  transition: all 0.3s ease;
-  max-height: 60vh;
-}
-
-/* 响应式优化 */
-@media screen and (max-width: 750rpx) {
-  .map {
-    margin: 0 20rpx;
-    width: calc(100% - 40rpx);
-    padding: 20rpx 15rpx;
-  }
-}
-
-@media screen and (max-width: 480rpx) {
-  .map {
-    margin: 0 15rpx;
-    width: calc(100% - 30rpx);
-    padding: 15rpx 10rpx;
-  }
+	margin-top: 20rpx;
+	background-color: white;
 }
 
 .static-footer {
-  position: fixed;
-  bottom: 0;
+	position: fixed;
+	bottom: 0;
 }
 
 /* 弹窗样式 */
 .modal_overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  align-items: flex-end;
-  z-index: 1000;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: flex-end;
+	z-index: 1000;
 }
 
 .modal_content {
-  width: 100%;
-  background-color: #fff;
-  border-radius: 20rpx 20rpx 0 0;
-  max-height: 80vh;
-  overflow: hidden;
+	width: 100%;
+	background-color: #fff;
+	border-radius: 20rpx 20rpx 0 0;
+	max-height: 80vh;
+	overflow: hidden;
 }
 
 .modal_header {
-  position: relative;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 30rpx 40rpx;
-  border-bottom: 1rpx solid #f0f0f0;
+	position: relative;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	padding: 30rpx 40rpx;
+	border-bottom: 1rpx solid #f0f0f0;
 }
 
 .modal_title {
-  font-size: 32rpx;
-  font-weight: bold;
-  color: #333333;
-  text-align: center;
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #333333;
+	text-align: center;
 }
 
 .modal_close {
-  position: absolute;
-  right: 40rpx;
-  top: 50%;
-  transform: translateY(-50%);
-  width: 60rpx;
-  height: 60rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 40rpx;
-  color: #999;
+	position: absolute;
+	right: 40rpx;
+	top: 50%;
+	transform: translateY(-50%);
+	width: 60rpx;
+	height: 60rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 40rpx;
+	color: #999;
 }
 
 .modal_body {
-  padding: 40rpx;
+	padding: 40rpx;
 }
 
 .country_grid {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 20rpx;
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+	gap: 20rpx;
 }
 
 .country_item {
-  padding: 24rpx 30rpx;
-  border-radius: 12rpx;
-  background-color: #f8f8f8;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transition: all 0.3s ease;
+	padding: 24rpx 30rpx;
+	border-radius: 12rpx;
+	background-color: #f8f8f8;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	transition: all 0.3s ease;
 }
 
 .country_item.selected {
-  background-color: #ff4444;
-  color: #fff;
+	background-color: #ff4444;
+	color: #fff;
 }
 
 .country_text {
-  font-size: 28rpx;
-  color: #333;
+	font-size: 28rpx;
+	color: #333;
 }
 
 .country_item.selected .country_text {
-  color: #fff;
-}
-
-.global_index {
-  margin: 30rpx 20rpx 0 20rpx;
-  display: flex;
-  justify-content: space-between;
-}
-
-.global_index_title {
-  margin-left: 20rpx;
-  font-size: 40rpx;
-  font-weight: 100;
-  color: #333333;
-  align-items: center;
-}
-
-.global_index_more {
-  display: flex;
-  gap: 10rpx;
-  font-size: 28rpx;
-  color: #333333;
-  align-items: center;
-}
-
-.global_index_more image {
-  width: 40rpx;
-  height: 40rpx;
-  align-items: center;
-}
-
-/* 卡片网格样式 */
-.cards_grid {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  margin: 0;
-  box-sizing: border-box;
-  width: 100%;
-}
-
-.card_item {
-  width: 100%;
-  box-sizing: border-box;
-  min-width: 0;
-  /* 防止内容溢出 */
-}
-
-/* 响应式布局 - 小屏幕时改为两列 */
-@media (max-width: 600rpx) {
-  .cards_grid {
-    grid-template-columns: repeat(2, 1fr);
-    padding: 30rpx 20rpx;
-  }
-}
-
-/* 超小屏幕时改为单列 */
-@media (max-width: 400rpx) {
-  .cards_grid {
-    grid-template-columns: 1fr;
-    padding: 30rpx 20rpx;
-  }
-}
-
-.warn {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  gap: 10rpx;
-  font-size: 28rpx;
-  color: #666666;
-  padding: 20rpx;
-  max-width: 100%;
-  overflow: hidden;
-  position: relative;
-}
-
-.warn image {
-  width: 40rpx;
-  height: 40rpx;
-  flex-shrink: 0;
-  /* 防止图片被压缩 */
-  position: relative;
-  z-index: 2;
-  /* 确保图片在最上层 */
-}
-
-.warn_text_container {
-  flex: 1;
-  overflow: hidden;
-  position: relative;
-  min-width: 0;
-  /* 允许容器收缩 */
-}
-
-.warn_text {
-  display: block;
-  white-space: nowrap;
-  will-change: transform;
-  /* 优化动画性能 */
-}
-
-/* 文字滚动动画 */
-@keyframes scrollText {
-  0% {
-    transform: translateX(0);
-  }
-
-  20% {
-    transform: translateX(0);
-  }
-
-  80% {
-    transform: translateX(-85%);
-  }
-
-  100% {
-    transform: translateX(-85%);
-  }
-}
-
-/* 当文字超长时启用滚动动画 */
-.warn_text.scroll-active {
-  animation: scrollText 12s linear infinite;
-  animation-delay: 2s;
-  /* 延迟2秒开始滚动，让用户先看到开头 */
-}
-
-/* 底部安全区域 */
-.bottom_safe_area {
-  height: 40rpx;
-  background-color: transparent;
-}
-
-/* 主容器样式调整 */
-.main {
-  position: relative;
-  height: 100vh;
-  overflow: hidden;
-  background-color: white;
+	color: #fff;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/static/marketSituation-image/cool.png b/static/marketSituation-image/cool.png
new file mode 100644
index 0000000000000000000000000000000000000000..16ba272c1ab7a5668ae9fb39d8606e5a2357c12d
GIT binary patch
literal 11499
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
R+AjbA002ovPDHLkV1hE8XQBWA

literal 0
HcmV?d00001

diff --git a/static/marketSituation-image/hot.png b/static/marketSituation-image/hot.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8f73601919fc1f83c010bb78a610153a9738cf6
GIT binary patch
literal 11122
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
Eg4+VM;Q#;t

literal 0
HcmV?d00001

diff --git a/static/marketSituation-image/warm.png b/static/marketSituation-image/warm.png
new file mode 100644
index 0000000000000000000000000000000000000000..1338a2a1585e9186ae00a5f836bacf95022ca3ad
GIT binary patch
literal 11904
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%0D!9uUzy@(
z3Mmq|1OByC@>D#}`prik1ltk-E2)s@!LqF2@FST@mhHIRuAToz&hs9+>B=jE6{$b;
z@s?)eFTBaEyY5y!b9A#0@kT{e-Vu*P67}hFF&Pg-SCl|9lEnAgas%gSd&%2fICk>F
zd5xUJ^ZBWPHj0H}03;B>^*wLIw5<DVID48>sbhag3V+aR{ULg;3Ge%_U#)~Abod0f
z$g<j0nTl7YVqqg0i;$42K$a;4emv#{PsCWTGUYf<0N~h;ugFSXSLO2svv6)cpZlTj
z+0TFcz3=^<LjnI!Hu8I+7$diR_M34_E7prdS?@aD8cMN(`ChB%`$_KERG9`g6VjEE
z7Zd4_uBm6i&?N}|Vb5~*gL)%#eSPz9+&2Ce9_VX7@_zv%ht7NbL-B+F0000<MNUMn
GLSTYJ|GrNE

literal 0
HcmV?d00001


From e7b05cd22d4487f0a47e142f463f344a5dc43d11 Mon Sep 17 00:00:00 2001
From: zhaowenkang <z13306486998@126.com>
Date: Tue, 28 Oct 2025 18:57:29 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/{home => marketSituation}/chartExample.vue    | 0
 pages/{home => marketSituation}/countryMarket.vue   | 0
 pages/{home => marketSituation}/forexMetals.vue     | 0
 pages/{home => marketSituation}/globalIndex.vue     | 0
 pages/{home => marketSituation}/marketCondition.vue | 0
 pages/{home => marketSituation}/marketDetail.vue    | 0
 pages/{home => marketSituation}/marketOverview.vue  | 0
 pages/{home => marketSituation}/marketSituation.vue | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename pages/{home => marketSituation}/chartExample.vue (100%)
 rename pages/{home => marketSituation}/countryMarket.vue (100%)
 rename pages/{home => marketSituation}/forexMetals.vue (100%)
 rename pages/{home => marketSituation}/globalIndex.vue (100%)
 rename pages/{home => marketSituation}/marketCondition.vue (100%)
 rename pages/{home => marketSituation}/marketDetail.vue (100%)
 rename pages/{home => marketSituation}/marketOverview.vue (100%)
 rename pages/{home => marketSituation}/marketSituation.vue (100%)

diff --git a/pages/home/chartExample.vue b/pages/marketSituation/chartExample.vue
similarity index 100%
rename from pages/home/chartExample.vue
rename to pages/marketSituation/chartExample.vue
diff --git a/pages/home/countryMarket.vue b/pages/marketSituation/countryMarket.vue
similarity index 100%
rename from pages/home/countryMarket.vue
rename to pages/marketSituation/countryMarket.vue
diff --git a/pages/home/forexMetals.vue b/pages/marketSituation/forexMetals.vue
similarity index 100%
rename from pages/home/forexMetals.vue
rename to pages/marketSituation/forexMetals.vue
diff --git a/pages/home/globalIndex.vue b/pages/marketSituation/globalIndex.vue
similarity index 100%
rename from pages/home/globalIndex.vue
rename to pages/marketSituation/globalIndex.vue
diff --git a/pages/home/marketCondition.vue b/pages/marketSituation/marketCondition.vue
similarity index 100%
rename from pages/home/marketCondition.vue
rename to pages/marketSituation/marketCondition.vue
diff --git a/pages/home/marketDetail.vue b/pages/marketSituation/marketDetail.vue
similarity index 100%
rename from pages/home/marketDetail.vue
rename to pages/marketSituation/marketDetail.vue
diff --git a/pages/home/marketOverview.vue b/pages/marketSituation/marketOverview.vue
similarity index 100%
rename from pages/home/marketOverview.vue
rename to pages/marketSituation/marketOverview.vue
diff --git a/pages/home/marketSituation.vue b/pages/marketSituation/marketSituation.vue
similarity index 100%
rename from pages/home/marketSituation.vue
rename to pages/marketSituation/marketSituation.vue

From 4a52b310d7f6245041326dfd7970b41dbc149fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Tue, 28 Oct 2025 18:58:15 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=8B=B9=E6=9E=9C?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E5=86=B2=E7=AA=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index dd52cfc..edfbc45 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "DeepChartApp",
-    "appid" : "__UNI__D8DF433",
+    "appid" : "__UNI__2646D0B",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -40,9 +40,12 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "minSdkVersion" : 21
+            },
+            "ios" : {
+                "dSYMs" : false
             },
-            "ios" : {},
             /* ios打包配置 */
             "sdkConfigs" : {
                 "oauth" : {
@@ -52,6 +55,22 @@
                     }
                 }
             }
+        },
+        "nativePlugins" : {
+            "Aimer-TCPPlugin" : {
+                "__plugin_info__" : {
+                    "name" : "TCP-Socket原生插件(支持Android和IOS)  - [试用版，仅用于自定义调试基座]",
+                    "description" : "Uniapp实现基于TCP的数据通信,支持单片机、智能家居等硬件交互,联系QQ: 462108858",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=2029",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 0,
+                    "pid" : "2029",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* SDK配置 */

From 738c34c3c2634524f1980ec98d83312ffd26b1bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Tue, 28 Oct 2025 18:59:57 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4launch.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index c4f1072..2a3f43d 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,8 +2,8 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "customPlaygroundType" : "device",
-            "playground" : "standard",
+            "customPlaygroundType" : "local",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
             // "playground" : "standard",
             // "type" : "uni-app:app-ios"

From b19e866781dc0dabf8031173b80a93f3571fede3 Mon Sep 17 00:00:00 2001
From: zhaowenkang <z13306486998@126.com>
Date: Tue, 28 Oct 2025 19:05:57 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/footerBar.vue                  | 2 +-
 pages.json                                | 2 +-
 pages/marketSituation/globalIndex.vue     | 2 +-
 pages/marketSituation/marketSituation.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/footerBar.vue b/components/footerBar.vue
index 80cc030..ac96c57 100644
--- a/components/footerBar.vue
+++ b/components/footerBar.vue
@@ -111,7 +111,7 @@ const tabChange = (value) => {
 		})
 	} else if (value == 2) { //行情
 		uni.redirectTo({
-			url: '/pages/home/marketSituation',
+			url: '/pages/marketSituation/marketSituation',
 			animationType: 'fade-in'
 		})
 	} else if (value == 3) { //DeepMate
diff --git a/pages.json b/pages.json
index 2b116d9..6076073 100644
--- a/pages.json
+++ b/pages.json
@@ -286,7 +286,7 @@
 			}
 		},
 		{
-			"path" : "pages/home/marketCondition",
+			"path" : "pages/marketSituation/marketCondition",
 			"style" : 
 			{
 				"navigationBarTitleText" : "行情",
diff --git a/pages/marketSituation/globalIndex.vue b/pages/marketSituation/globalIndex.vue
index 22169a0..2a2ed7d 100644
--- a/pages/marketSituation/globalIndex.vue
+++ b/pages/marketSituation/globalIndex.vue
@@ -100,7 +100,7 @@
 
 <script setup>
 import { ref, onMounted, computed, nextTick, watch } from 'vue'
-import footerBar from './footerBar.vue'
+import footerBar from '../../components/footerBar.vue'
 import IndexCard from '../../components/IndexCard.vue'
 
 // 响应式数据
diff --git a/pages/marketSituation/marketSituation.vue b/pages/marketSituation/marketSituation.vue
index bab6dc5..e76aa2d 100644
--- a/pages/marketSituation/marketSituation.vue
+++ b/pages/marketSituation/marketSituation.vue
@@ -71,7 +71,7 @@
 
 <script setup>
 import { ref, onMounted, watch, nextTick, computed } from 'vue'
-import footerBar from './footerBar.vue'
+import footerBar from '../../components/footerBar.vue'
 import forexMetals from './forexMetals.vue'
 import marketOverview from './marketOverview.vue'
 import countryMarket from './countryMarket.vue'

From 300d06ba4c5ae4eba61c57ee1d0c0e78fd1ae0ae Mon Sep 17 00:00:00 2001
From: wangyetao <2898314561@qq.com>
Date: Tue, 28 Oct 2025 19:16:45 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=BA=E7=9C=81?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                  |  12 +++-
 pages/blank/blank.vue                       |  69 -------------------
 pages/blank/institutionalTrendsBriefing.vue | 100 ++++++++++++++++++++++++++++
 pages/blank/notice.vue                      | 100 ++++++++++++++++++++++++++++
 pages/deepMate/deepMate.vue                 |  27 ++++++--
 static/icons/Left_(左).png                 | Bin 0 -> 247 bytes
 static/images/缺省.png                    | Bin 0 -> 15968 bytes
 7 files changed, 234 insertions(+), 74 deletions(-)
 delete mode 100644 pages/blank/blank.vue
 create mode 100644 pages/blank/institutionalTrendsBriefing.vue
 create mode 100644 pages/blank/notice.vue
 create mode 100644 static/icons/Left_(左).png
 create mode 100644 static/images/缺省.png

diff --git a/pages.json b/pages.json
index b341734..29588fe 100644
--- a/pages.json
+++ b/pages.json
@@ -134,7 +134,17 @@
 			}
 		},
 				{
-			"path": "pages/blank/blank",
+			"path": "pages/blank/institutionalTrendsBriefing",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"disableSwipeBack": true,
+				"titleNView": false,
+				"bounce": false
+			}
+		},
+		{
+			"path": "pages/blank/notice",
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
diff --git a/pages/blank/blank.vue b/pages/blank/blank.vue
deleted file mode 100644
index c7e1491..0000000
--- a/pages/blank/blank.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <view class="blank-page">
-    <!-- 返回按钮 -->
-    <view class="back-button" @click="goBack">
-      <text class="back-icon">←</text>
-      <text class="back-text">返回</text>
-    </view>
-    
-    <text class="tip">当前特斯拉该如何布局？</text>
-  </view>
-</template>
-
-<script setup>
-// 返回到 deepMate 页面
-const goBack = () => {
-  uni.navigateTo({
-    url: '/pages/deepMate/deepMate'
-  });
-};
-</script>
-
-<style scoped>
-.blank-page {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: 100vh;
-  background-color: #ffffff;
-  position: relative;
-}
-
-.back-button {
-  position: absolute;
-  top: 60rpx;
-  left: 30rpx;
-  display: flex;
-  align-items: center;
-  padding: 20rpx 30rpx;
-  background-color: #f5f5f5;
-  border-radius: 50rpx;
-  cursor: pointer;
-  transition: all 0.3s ease;
-}
-
-.back-button:hover {
-  background-color: #e0e0e0;
-}
-
-.back-button:active {
-  transform: scale(0.95);
-}
-
-.back-icon {
-  font-size: 32rpx;
-  color: #333333;
-  margin-right: 10rpx;
-}
-
-.back-text {
-  font-size: 28rpx;
-  color: #333333;
-}
-
-.tip {
-  color: #999999;
-  font-size: 28rpx;
-}
-</style>
\ No newline at end of file
diff --git a/pages/blank/institutionalTrendsBriefing.vue b/pages/blank/institutionalTrendsBriefing.vue
new file mode 100644
index 0000000..d78c5b0
--- /dev/null
+++ b/pages/blank/institutionalTrendsBriefing.vue
@@ -0,0 +1,100 @@
+<template>
+
+  <view class="blank-page">
+      <view class="header" :style="{ paddingTop: safeAreaInsets?.top + 'px' }">
+    <!-- 返回按钮 -->
+      <view class="head-left">
+    <image class="back-button" @click="goBack" src="/static/icons/Left_(左).png">
+
+   
+    <!-- <text class="tip">当前特斯拉该如何布局？</text> -->
+  </image>
+    </view>  
+       <view class="header-center">
+        <text class="title" :style="{ paddingTop: safeAreaInsets?.top + 'px' }"
+          >机构动向解析</text
+        >
+      </view>   
+</view>
+<image class="picture" src="/static/images/缺省.png" />
+<text class="tip">暂无内容~</text>
+  </view>
+</template>
+
+<script setup>
+// 返回到 deepMate 页面
+const goBack = () => {
+  uni.navigateTo({
+    url: '/pages/deepMate/deepMate'
+  });
+};
+</script>
+
+<style scoped>
+.blank-page {
+  display: flex;
+  flex-direction: column;
+  position: fixed;
+  /* 充满视口，彻底禁用页面滚动 */
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  height: 100vh;
+  overflow: hidden;
+  /* 锁定页面滚动 */
+  background-color: #ffffff;
+  padding: 20rpx 0rpx;
+}
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx 30rpx;
+  background-color: #ffffff;
+  box-shadow: 0 2rpx rgba(0, 0, 0, 0.1);
+}
+.head-left {
+  display: flex;
+  align-items: center;
+}
+.back-button {
+  width: 40rpx;
+  height: 40rpx;
+}
+.header-center .title {
+  position: fixed;
+  top: 25rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333333;
+}
+.back-button:hover {
+  background-color: #e0e0e0;
+}
+
+.back-button:active {
+  transform: scale(0.95);
+}
+
+.back-icon {
+  font-size: 32rpx;
+  color: #333333;
+  margin-right: 10rpx;
+}
+
+.picture {
+  display: block;
+  margin: 200rpx auto 0;  /* 图片水平居中 */
+  width: 60%;
+  height: 600rpx;
+}
+.tip {
+  color: #999999;
+  font-size: 28rpx;
+  text-align: center;
+  margin-top: 20rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/blank/notice.vue b/pages/blank/notice.vue
new file mode 100644
index 0000000..713de07
--- /dev/null
+++ b/pages/blank/notice.vue
@@ -0,0 +1,100 @@
+<template>
+
+  <view class="blank-page">
+      <view class="header" :style="{ paddingTop: safeAreaInsets?.top + 'px' }">
+    <!-- 返回按钮 -->
+      <view class="head-left">
+    <image class="back-button" @click="goBack" src="/static/icons/Left_(左).png">
+
+   
+    <!-- <text class="tip">当前特斯拉该如何布局？</text> -->
+  </image>
+    </view>  
+       <view class="header-center">
+        <text class="title" :style="{ paddingTop: safeAreaInsets?.top + 'px' }"
+          >消息推送通知</text
+        >
+      </view>   
+</view>
+<image class="picture" src="/static/images/缺省.png" />
+<text class="tip">暂无内容~</text>
+  </view>
+</template>
+
+<script setup>
+// 返回到 deepMate 页面
+const goBack = () => {
+  uni.navigateTo({
+    url: '/pages/deepMate/deepMate'
+  });
+};
+</script>
+
+<style scoped>
+.blank-page {
+  display: flex;
+  flex-direction: column;
+  position: fixed;
+  /* 充满视口，彻底禁用页面滚动 */
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  height: 100vh;
+  overflow: hidden;
+  /* 锁定页面滚动 */
+  background-color: #ffffff;
+  padding: 20rpx 0rpx;
+}
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx 30rpx;
+  background-color: #ffffff;
+  box-shadow: 0 2rpx rgba(0, 0, 0, 0.1);
+}
+.head-left {
+  display: flex;
+  align-items: center;
+}
+.back-button {
+  width: 40rpx;
+  height: 40rpx;
+}
+.header-center .title {
+  position: fixed;
+  top: 25rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  font-size: 36rpx;
+  font-weight: bold;
+  color: #333333;
+}
+.back-button:hover {
+  background-color: #e0e0e0;
+}
+
+.back-button:active {
+  transform: scale(0.95);
+}
+
+.back-icon {
+  font-size: 32rpx;
+  color: #333333;
+  margin-right: 10rpx;
+}
+
+.picture {
+  display: block;
+  margin: 200rpx auto 0;  /* 图片水平居中 */
+  width: 60%;
+  height: 600rpx;
+}
+.tip {
+  color: #999999;
+  font-size: 28rpx;
+  text-align: center;
+  margin-top: 20rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/deepMate/deepMate.vue b/pages/deepMate/deepMate.vue
index 5497d58..685758b 100644
--- a/pages/deepMate/deepMate.vue
+++ b/pages/deepMate/deepMate.vue
@@ -6,6 +6,7 @@
         <image
           src="https://d31zlh4on95l9h.cloudfront.net/images/f91e09b5987802185e7679055dafd272.svg"
           class="icon"
+          @click="goToCustomerService"
         >
         </image>
       </view>
@@ -18,6 +19,7 @@
         <image
           src="https://d31zlh4on95l9h.cloudfront.net/images/d7c4e74201213a25dd9574e908233928.svg"
           class="icon"
+          @click="goToNotice" @tap="goToNotice"
         >
         </image>
         <image
@@ -63,7 +65,7 @@
           <view
             class="recommend-card"
             v-if="messages.length === 0"
-            @click="goBlank"
+            @click="goinstitutionalTrendsBriefing"
           >
             <view class="arrow" v-if="messages.length === 0"></view>
             <view class="card-content">
@@ -78,7 +80,7 @@
               <image
                 src="https://d31zlh4on95l9h.cloudfront.net/images/40d94054644f6e3f1c366751f07f0010.svg"
                 class="arrow-icon"
-                @click="goBlank"
+                @click="goinstitutionalTrendsBriefing"
               ></image>
             </view>
           </view>
@@ -418,12 +420,29 @@ const newChat = () => {
 };
 
 // 跳转到空白页
-const goBlank = () => {
+const goinstitutionalTrendsBriefing = () => {
   uni.navigateTo({
-    url: "/pages/blank/blank",
+    url: "/pages/blank/institutionalTrendsBriefing",
   });
 };
 
+// 跳转到客户服务平台首页
+const goToCustomerService = () => {
+  uni.navigateTo({
+    url: "/pages/customerServicePlatform/csPlatformIndex",
+  });
+};
+// 跳转到通知页
+function goToNotice() {
+  try {
+    console.log("goToNotice: navigating to /pages/blank/notice");
+    uni.navigateTo({ url: "/pages/blank/notice" });
+  } catch (e) {
+    console.error("goToNotice navigateTo failed, fallback to redirect:", e);
+    uni.redirectTo({ url: "/pages/blank/notice" });
+  }
+}
+
 // 历史记录
 const openHistoryDrawer = async () => {
   const res = await postHistory({
diff --git a/static/icons/Left_(左).png b/static/icons/Left_(左).png
new file mode 100644
index 0000000000000000000000000000000000000000..4af54c563de720fb0a3e4911f58b9ebacf3145bc
GIT binary patch
literal 247
zcmV<T00{qyP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#u}MThR5(w?)G-bMArJ-7*-#Ke=V{FL>q!X1X(*^Uz<LK;<87>s0W=gQ8=^bR
zN+LBp<_{SL=)8u`9{e8+A?#y}lePBrDIKfAf~Azs0PsM>!%yG>dkP^Yt@Uj)*ou`4
z$jBUw1i9EM=$zXrr7i%l+OxWkUn6_(rIhm84J<czjr@+nMafs@R@ww|&}Ohg?}#{V
xo|NUm($k#t(HJv#0jd9!6`8`w(Q5(fJuelraur>&dTamy002ovPDHLkV1i8ZWZ(b*

literal 0
HcmV?d00001

diff --git a/static/images/缺省.png b/static/images/缺省.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4f9ac4dcf358a1d918810ec1507d938e25606c2
GIT binary patch
literal 15968
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

literal 0
HcmV?d00001