From e8bd11a2b39c04f6c22f5bc3e692ca0905ef97b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 10:24:04 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E6=88=91=E7=9A=84=E8=87=AA=E9=80=89=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3js=E6=96=87=E4=BB=B6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/home/mySelections.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 api/home/mySelections.js

diff --git a/api/home/mySelections.js b/api/home/mySelections.js
new file mode 100644
index 0000000..e69de29

From 3f05e3926ed32b84c9a66deea2dbe37c3a8f3827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 11:39:30 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=B0=81=E8=A3=85=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E9=80=89=E6=8E=A5=E5=8F=A3=E6=96=87=E4=BB=B6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/home/mySelections.js | 142 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)

diff --git a/api/home/mySelections.js b/api/home/mySelections.js
index e69de29..21cabd3 100644
--- a/api/home/mySelections.js
+++ b/api/home/mySelections.js
@@ -0,0 +1,142 @@
+/**
+ * 我的自选股相关API接口封装
+ * 使用common/util.js中的请求方法
+ */
+
+import util from '../../common/util.js'
+
+/**
+ * 我的自选股API接口类
+ */
+class MySelectionsAPI {
+    
+    /**
+     * 判断用户是否存在自选股分组
+     * @param {Function} successCallback - 成功回调函数
+     * @param {Function} failCallback - 失败回调函数
+     * @param {Object} data - 请求参数
+     * @returns {void}
+     */
+    static checkExist(successCallback, failCallback = null, data = {}) {
+        const url = '/api/homePage/userStock/checkExist'
+        
+        util.request(
+            url,
+            (response) => {
+                console.log('检查用户自选股分组存在性 - 响应:', response)
+                if (successCallback && typeof successCallback === 'function') {
+                    successCallback(response)
+                }
+            },
+            data,
+            (error) => {
+                console.error('检查用户自选股分组存在性 - 失败:', error)
+                if (failCallback && typeof failCallback === 'function') {
+                    failCallback(error)
+                }
+            }
+        )
+    }
+
+    /**
+     * 查询用户所有自选股分组
+     * @param {Function} successCallback - 成功回调函数
+     * @param {Function} failCallback - 失败回调函数
+     * @param {Object} data - 请求参数
+     * @returns {void}
+     */
+    static getUserStockGroupList(successCallback, failCallback = null, data = {}) {
+        const url = '/api/homePage/userStockGroup/list'
+        
+        util.request(
+            url,
+            (response) => {
+                console.log('查询用户自选股分组列表 - 响应:', response)
+                if (successCallback && typeof successCallback === 'function') {
+                    successCallback(response)
+                }
+            },
+            data,
+            (error) => {
+                console.error('查询用户自选股分组列表 - 失败:', error)
+                if (failCallback && typeof failCallback === 'function') {
+                    failCallback(error)
+                }
+            }
+        )
+    }
+
+    /**
+     * 分页查询某一个分组下的所有自选股
+     * @param {Function} successCallback - 成功回调函数
+     * @param {Function} failCallback - 失败回调函数
+     * @param {Object} data - 请求参数 {groupId, pageNum, pageSize, ...}
+     * @returns {void}
+     */
+    static getUserStockList(successCallback, failCallback = null, data = {}) {
+        const url = '/api/homePage/userStock/list'
+        
+        // 设置默认分页参数
+        const requestData = {
+            pageNum: 1,
+            pageSize: 20,
+            ...data
+        }
+        
+        util.request(
+            url,
+            (response) => {
+                console.log('分页查询分组自选股 - 响应:', response)
+                if (successCallback && typeof successCallback === 'function') {
+                    successCallback(response)
+                }
+            },
+            requestData,
+            (error) => {
+                console.error('分页查询分组自选股 - 失败:', error)
+                if (failCallback && typeof failCallback === 'function') {
+                    failCallback(error)
+                }
+            }
+        )
+    }
+
+    /**
+     * 查询默认自选股
+     * @param {Function} successCallback - 成功回调函数
+     * @param {Function} failCallback - 失败回调函数
+     * @param {Object} data - 请求参数
+     * @returns {void}
+     */
+    static getUserOrDefault(successCallback, failCallback = null, data = {}) {
+        const url = '/api/homePage/userStock/getUserOrDefault'
+        
+        util.request(
+            url,
+            (response) => {
+                console.log('查询默认自选股 - 响应:', response)
+                if (successCallback && typeof successCallback === 'function') {
+                    successCallback(response)
+                }
+            },
+            data,
+            (error) => {
+                console.error('查询默认自选股 - 失败:', error)
+                if (failCallback && typeof failCallback === 'function') {
+                    failCallback(error)
+                }
+            }
+        )
+    }
+}
+
+// 导出API类
+export default MySelectionsAPI
+
+// 也可以导出单个方法供直接使用
+export const {
+    checkExist,
+    getUserStockGroupList,
+    getUserStockList,
+    getUserOrDefault
+} = MySelectionsAPI
\ No newline at end of file

From 1c26940540b4074f86feaecd9cc27d6d4ef4d3d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 11:45:33 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84tcp=E8=BF=9E=E6=8E=A5=EF=BC=88=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=97=B6=E5=90=AF=E7=94=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 92f54cf..92c129c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -193,7 +193,7 @@ import MarketOverview from '../../components/MarketOverview.vue'
 import DeepMate from '../../components/DeepMate.vue'
 import tcpConnection from '../../api/tcpConnection.js'
 import th from '../../static/language/th'
-
+import MySelectionsAPI from '../../api/home/mySelections.js'
 export default {
 	components: {
 		footerBar,
@@ -338,21 +338,21 @@ export default {
 		this.initTcpListeners()
 		
 		// 页面渲染完成后自动连接两个TCP连接
-		this.$nextTick(() => {
-			console.log('页面渲染完成，开始自动连接TCP服务器...')
-			// 延迟一小段时间确保页面完全加载后再连接
-			setTimeout(() => {
-				// 连接今日市场概览TCP（channel 1）
-				console.log('连接今日市场概览TCP（channel 1）...')
-				this.connectTcp()
+		// this.$nextTick(() => {
+		// 	console.log('页面渲染完成，开始自动连接TCP服务器...')
+		// 	// 延迟一小段时间确保页面完全加载后再连接
+		// 	setTimeout(() => {
+		// 		// 连接今日市场概览TCP（channel 1）
+		// 		console.log('连接今日市场概览TCP（channel 1）...')
+		// 		this.connectTcp()
 				
-				// 稍微延迟后连接我的自选TCP（channel 2）
-				setTimeout(() => {
-					console.log('连接我的自选TCP（channel 2）...')
-					this.connectMyStocksTcp()
-				}, 500)
-			}, 1000)
-		})
+		// 		// 稍微延迟后连接我的自选TCP（channel 2）
+		// 		setTimeout(() => {
+		// 			console.log('连接我的自选TCP（channel 2）...')
+		// 			this.connectMyStocksTcp()
+		// 		}, 500)
+		// 	}, 1000)
+		// })
 	},
 
 	// 页面销毁前的清理工作

From be05468cea4261d6bda090b0202eefec4720a04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 14:55:53 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E9=80=89=E6=96=B9=E6=B3=95=E6=96=87=E4=BB=B6=EF=BC=9B?=
 =?UTF-8?q?http=E4=B8=AD=E5=8A=A0=E5=85=A5=E6=89=93=E5=8D=B0=E6=9C=80?=
 =?UTF-8?q?=E7=BB=88=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=EF=BC=9B=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=BC=B9=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA=EF=BC=9B?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=E6=89=8D=E4=BC=9A=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/home/mySelections.js | 152 +++++++++++++++++++++++---------------------
 pages/home/home.vue      | 159 ++++++++++++++++++++++++++++++++++++++++++++++-
 utils/http.js            |   2 +
 3 files changed, 242 insertions(+), 71 deletions(-)

diff --git a/api/home/mySelections.js b/api/home/mySelections.js
index 21cabd3..4a99366 100644
--- a/api/home/mySelections.js
+++ b/api/home/mySelections.js
@@ -1,9 +1,9 @@
 /**
  * 我的自选股相关API接口封装
- * 使用common/util.js中的请求方法
+ * 使用utils/http.js中的拦截器封装请求方法
  */
 
-import util from '../../common/util.js'
+import { http } from '../../utils/http.js'
 
 /**
  * 我的自选股API接口类
@@ -15,27 +15,30 @@ class MySelectionsAPI {
      * @param {Function} successCallback - 成功回调函数
      * @param {Function} failCallback - 失败回调函数
      * @param {Object} data - 请求参数
-     * @returns {void}
+     * @returns {Promise}
      */
-    static checkExist(successCallback, failCallback = null, data = {}) {
+    static async checkExist(successCallback, failCallback = null, data = {}) {
         const url = '/api/homePage/userStock/checkExist'
         
-        util.request(
-            url,
-            (response) => {
-                console.log('检查用户自选股分组存在性 - 响应:', response)
-                if (successCallback && typeof successCallback === 'function') {
-                    successCallback(response)
-                }
-            },
-            data,
-            (error) => {
-                console.error('检查用户自选股分组存在性 - 失败:', error)
-                if (failCallback && typeof failCallback === 'function') {
-                    failCallback(error)
-                }
+        try {
+            const response = await http({
+                url: url,
+                method: 'POST',
+                data: data
+            })
+            
+            console.log('检查用户自选股分组存在性 - 响应:', response)
+            if (successCallback && typeof successCallback === 'function') {
+                successCallback(response)
             }
-        )
+            return response
+        } catch (error) {
+            console.error('检查用户自选股分组存在性 - 失败:', error)
+            if (failCallback && typeof failCallback === 'function') {
+                failCallback(error)
+            }
+            throw error
+        }
     }
 
     /**
@@ -43,27 +46,30 @@ class MySelectionsAPI {
      * @param {Function} successCallback - 成功回调函数
      * @param {Function} failCallback - 失败回调函数
      * @param {Object} data - 请求参数
-     * @returns {void}
+     * @returns {Promise}
      */
-    static getUserStockGroupList(successCallback, failCallback = null, data = {}) {
+    static async getUserStockGroupList(successCallback, failCallback = null, data = {}) {
         const url = '/api/homePage/userStockGroup/list'
         
-        util.request(
-            url,
-            (response) => {
-                console.log('查询用户自选股分组列表 - 响应:', response)
-                if (successCallback && typeof successCallback === 'function') {
-                    successCallback(response)
-                }
-            },
-            data,
-            (error) => {
-                console.error('查询用户自选股分组列表 - 失败:', error)
-                if (failCallback && typeof failCallback === 'function') {
-                    failCallback(error)
-                }
+        try {
+            const response = await http({
+                url: url,
+                method: 'POST',
+                data: data
+            })
+            
+            console.log('查询用户自选股分组列表 - 响应:', response)
+            if (successCallback && typeof successCallback === 'function') {
+                successCallback(response)
             }
-        )
+            return response
+        } catch (error) {
+            console.error('查询用户自选股分组列表 - 失败:', error)
+            if (failCallback && typeof failCallback === 'function') {
+                failCallback(error)
+            }
+            throw error
+        }
     }
 
     /**
@@ -71,9 +77,9 @@ class MySelectionsAPI {
      * @param {Function} successCallback - 成功回调函数
      * @param {Function} failCallback - 失败回调函数
      * @param {Object} data - 请求参数 {groupId, pageNum, pageSize, ...}
-     * @returns {void}
+     * @returns {Promise}
      */
-    static getUserStockList(successCallback, failCallback = null, data = {}) {
+    static async getUserStockList(successCallback, failCallback = null, data = {}) {
         const url = '/api/homePage/userStock/list'
         
         // 设置默认分页参数
@@ -83,22 +89,25 @@ class MySelectionsAPI {
             ...data
         }
         
-        util.request(
-            url,
-            (response) => {
-                console.log('分页查询分组自选股 - 响应:', response)
-                if (successCallback && typeof successCallback === 'function') {
-                    successCallback(response)
-                }
-            },
-            requestData,
-            (error) => {
-                console.error('分页查询分组自选股 - 失败:', error)
-                if (failCallback && typeof failCallback === 'function') {
-                    failCallback(error)
-                }
+        try {
+            const response = await http({
+                url: url,
+                method: 'POST',
+                data: requestData
+            })
+            
+            console.log('分页查询分组自选股 - 响应:', response)
+            if (successCallback && typeof successCallback === 'function') {
+                successCallback(response)
             }
-        )
+            return response
+        } catch (error) {
+            console.error('分页查询分组自选股 - 失败:', error)
+            if (failCallback && typeof failCallback === 'function') {
+                failCallback(error)
+            }
+            throw error
+        }
     }
 
     /**
@@ -106,27 +115,30 @@ class MySelectionsAPI {
      * @param {Function} successCallback - 成功回调函数
      * @param {Function} failCallback - 失败回调函数
      * @param {Object} data - 请求参数
-     * @returns {void}
+     * @returns {Promise}
      */
-    static getUserOrDefault(successCallback, failCallback = null, data = {}) {
+    static async getUserOrDefault(successCallback, failCallback = null, data = {}) {
         const url = '/api/homePage/userStock/getUserOrDefault'
         
-        util.request(
-            url,
-            (response) => {
-                console.log('查询默认自选股 - 响应:', response)
-                if (successCallback && typeof successCallback === 'function') {
-                    successCallback(response)
-                }
-            },
-            data,
-            (error) => {
-                console.error('查询默认自选股 - 失败:', error)
-                if (failCallback && typeof failCallback === 'function') {
-                    failCallback(error)
-                }
+        try {
+            const response = await http({
+                url: url,
+                method: 'POST',
+                data: data
+            })
+            
+            console.log('查询默认自选股 - 响应:', response)
+            if (successCallback && typeof successCallback === 'function') {
+                successCallback(response)
             }
-        )
+            return response
+        } catch (error) {
+            console.error('查询默认自选股 - 失败:', error)
+            if (failCallback && typeof failCallback === 'function') {
+                failCallback(error)
+            }
+            throw error
+        }
     }
 }
 
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 92c129c..62b45e9 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -2,7 +2,8 @@
 	<view class="main">
 		<!-- 顶部状态栏占位 -->
 		<view class="top" :style="{height:iSMT+'px'}"></view>
-		
+		<!-- 登录的提示 -->
+		<LoginPrompt ref="loginPrompt"></LoginPrompt>
 		<!-- 头部导航 -->
 		<view class="header">
 			<view class="headphone-icon">
@@ -194,6 +195,7 @@ import DeepMate from '../../components/DeepMate.vue'
 import tcpConnection from '../../api/tcpConnection.js'
 import th from '../../static/language/th'
 import MySelectionsAPI from '../../api/home/mySelections.js'
+import { useUserStore } from '../../stores/modules/userInfo'
 export default {
 	components: {
 		footerBar,
@@ -205,6 +207,9 @@ export default {
 			type: 'home',
 			iSMT: 0,
 			
+			// 用户信息 store
+			userStore: null,
+			
 			// 深度探索数据
 			explorationItems: [
 				{ title: '主力追踪', icon: '/static/c1.png' },
@@ -319,6 +324,9 @@ export default {
 		// 状态栏高度
 		this.iSMT = uni.getSystemInfoSync().statusBarHeight;
 		
+		// 初始化用户信息 store
+		this.userStore = useUserStore();
+		
 		// 预加载图片资源
 		this.myStocks.forEach(stock => {
 			// 使用uni.getImageInfo替代Image对象
@@ -337,6 +345,14 @@ export default {
 		// 初始化TCP连接监听器
 		this.initTcpListeners()
 		
+		// 检查用户登录状态，只有已登录才加载自选股数据
+		if (this.userStore.userInfo) {
+			console.log('用户已登录，加载自选股数据')
+			this.loadMySelectionsData()
+		} else {
+			console.log('用户未登录，跳过自选股数据加载')
+		}
+		
 		// 页面渲染完成后自动连接两个TCP连接
 		// this.$nextTick(() => {
 		// 	console.log('页面渲染完成，开始自动连接TCP服务器...')
@@ -401,6 +417,147 @@ export default {
 			}, delay)
 		},
 		
+		// 自选股数据加载相关方法
+		
+		// 加载自选股数据的主方法
+		async loadMySelectionsData() {
+			try {
+				console.log('开始加载自选股数据...')
+				
+				// 调用checkExist判断用户是否存在自选股
+				const checkResult = await MySelectionsAPI.checkExist()
+				console.log('检查用户自选股存在性结果:', checkResult)
+				
+				if (checkResult.code === 200) {
+					const isHave = checkResult.data.is_have
+					
+					if (isHave === 1) {
+						// 用户有自选股，查询所有分组
+						console.log('用户存在自选股，查询所有分组...')
+						await this.loadUserStockGroups()
+					} else {
+						// 用户没有自选股，查询默认自选股
+						console.log('用户不存在自选股，查询默认自选股...')
+						await this.loadDefaultStocks()
+					}
+				} else {
+					console.error('检查用户自选股存在性失败:', checkResult.message)
+					// 失败时也尝试加载默认自选股
+					await this.loadDefaultStocks()
+				}
+			} catch (error) {
+				console.error('加载自选股数据失败:', error)
+				// 出错时尝试加载默认自选股
+				await this.loadDefaultStocks()
+			}
+		},
+		
+		// 加载用户自选股分组
+		async loadUserStockGroups() {
+			try {
+				const groupResult = await MySelectionsAPI.getUserStockGroupList()
+				console.log('查询用户自选股分组结果:', groupResult)
+				
+				if (groupResult.code === 200 && groupResult.data && groupResult.data.length > 0) {
+					// 找到id最小的分组
+					const minIdGroup = groupResult.data.reduce((min, current) => {
+						return current.id < min.id ? current : min
+					})
+					
+					console.log('找到最小id分组:', minIdGroup)
+					
+					// 查询该分组下的股票
+					await this.loadGroupStocks(minIdGroup.id)
+				} else {
+					console.log('没有找到用户自选股分组，加载默认自选股')
+					await this.loadDefaultStocks()
+				}
+			} catch (error) {
+				console.error('加载用户自选股分组失败:', error)
+				await this.loadDefaultStocks()
+			}
+		},
+		
+		// 加载指定分组下的股票
+		async loadGroupStocks(groupId) {
+			try {
+				const stockResult = await MySelectionsAPI.getUserStockList(null, null, {
+					groupId: groupId,
+					pageNum: 1,
+					pageSize: 20
+				})
+				
+				console.log('查询分组自选股结果:', stockResult)
+				
+				if (stockResult.code === 200 && stockResult.data) {
+					this.processStockData(stockResult.data)
+				} else {
+					console.log('分组下没有股票数据，加载默认自选股')
+					await this.loadDefaultStocks()
+				}
+			} catch (error) {
+				console.error('加载分组股票失败:', error)
+				await this.loadDefaultStocks()
+			}
+		},
+		
+		// 加载默认自选股
+		async loadDefaultStocks() {
+			try {
+				const defaultResult = await MySelectionsAPI.getUserOrDefault()
+				console.log('查询默认自选股结果:', defaultResult)
+				
+				if (defaultResult.code === 200 && defaultResult.data) {
+					this.processStockData(defaultResult.data)
+				} else {
+					console.log('没有默认自选股数据')
+				}
+			} catch (error) {
+				console.error('加载默认自选股失败:', error)
+			}
+		},
+		
+		// 处理股票数据
+		processStockData(stockData) {
+			console.log('处理股票数据:', stockData)
+			
+			// 根据返回的数据结构更新myStocks数组
+			// 这里需要根据实际API返回的数据结构进行调整
+			if (Array.isArray(stockData)) {
+				// 如果是数组格式
+				this.myStocks = stockData.map(stock => ({
+					name: stock.name || stock.stock_name || '',
+					code: stock.code || stock.stock_code || '',
+					// price: stock.price || stock.current_price || '0.00',
+					// change: stock.change || stock.change_percent || 0,
+					chartImg: stock.chartImg || '/static/c5.png' // 默认图片
+				}))
+				//重新赋值机构动向简报
+				this.institutionalReports = stockData.map(stock => ({
+					stock: stock.name || stock.stock_name || '',
+					status: stock.code || stock.stock_code || '',
+
+				}))
+			} else if (stockData.list && Array.isArray(stockData.list)) {
+				// 如果是分页格式
+				this.myStocks = stockData.list.map(stock => ({
+					name: stock.name || stock.stock_name || '',
+					code: stock.code || stock.stock_code || '',
+					// price: stock.price || stock.current_price || '0.00',
+					// change: stock.change || stock.change_percent || 0,
+					chartImg: stock.chartImg || '/static/c5.png' // 默认图片
+				}))
+				//重新赋值机构动向简报
+				//重新赋值机构动向简报
+				this.institutionalReports = stockData.map(stock => ({
+					stock: stock.name || stock.stock_name || '',
+					status: stock.code || stock.stock_code || '',
+				}))
+			}
+			
+			console.log('更新后的自选股数据:', this.myStocks)
+		},
+		
 		// TCP连接相关方法
 		
 		// 初始化TCP监听器
diff --git a/utils/http.js b/utils/http.js
index b4a2740..2aff8f6 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -43,10 +43,12 @@ const httpInterceptor = {
         //4 添加token，优先用store，没有则回退到body中的token，保持与Apifox一致
         const memberStore = useUserStore()
         const token = memberStore.userInfo?.token || options.data?.token
+        // const token = '2d0b5654409646713cdd40ec0d0bb56c'
         // const token = '1b3a58424c5324e40d4bf4d085e18047'
         if (token) {
             options.header.token = token
         }
+        console.log("最终请求参数：",options)
         // 避免误用 Authorization 头，后端要求的是 token 头
         // if (options.header.Authorization) delete options.header.Authorization
         return options

From 65e9c59ba9906c0196641f9b95032ca5a8b78898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 15:48:09 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E8=AF=B7=E6=B1=82checkExist=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E6=97=B6=E4=B8=8D=E8=B0=83=E7=94=A8=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=87=AA=E9=80=89=E8=82=A1=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 62b45e9..b103c20 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -443,7 +443,7 @@ export default {
 				} else {
 					console.error('检查用户自选股存在性失败:', checkResult.message)
 					// 失败时也尝试加载默认自选股
-					await this.loadDefaultStocks()
+					// await this.loadDefaultStocks()
 				}
 			} catch (error) {
 				console.error('加载自选股数据失败:', error)

From f1fbedfcfde97f53cd025af824375eac800306a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 16:57:07 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=E6=89=8D=E4=BC=9A=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?;home353=E8=A1=8C=E7=94=A8=E6=9D=A5=E5=86=99=E6=B8=B8=E5=AE=A2?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=87=AA=E9=80=89=E8=82=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index b103c20..c089e3d 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -345,12 +345,18 @@ export default {
 		// 初始化TCP连接监听器
 		this.initTcpListeners()
 		
-		// 检查用户登录状态，只有已登录才加载自选股数据
-		if (this.userStore.userInfo) {
-			console.log('用户已登录，加载自选股数据')
+		// 检查用户登录状态，只有已登录并且不是游客才加载自选股数据
+		if (this.userStore.userInfo && !this.userStore.userInfo.isVisitor) {
+			console.log('是用户登录，加载自选股数据', this.userStore.userInfo)
 			this.loadMySelectionsData()
-		} else {
-			console.log('用户未登录，跳过自选股数据加载')
+		} else if (this.userStore.userInfo && this.userStore.userInfo.isVisitor){
+			console.log('是游客登录，加载默认自选股',this.userStore.userInfo)
+
+			
+
+
+		}else {	
+			console.log('用户未登录',this.userStore.userInfo)
 		}
 		
 		// 页面渲染完成后自动连接两个TCP连接

From ccf5b14ec7d01359c825053c523f06258b47c33c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 17:07:59 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=B8=E5=AE=A2?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=BB=98=E8=AE=A4=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/home/mySelections.js | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/api/home/mySelections.js b/api/home/mySelections.js
index 4a99366..6801ebc 100644
--- a/api/home/mySelections.js
+++ b/api/home/mySelections.js
@@ -140,6 +140,36 @@ class MySelectionsAPI {
             throw error
         }
     }
+
+    /**
+     * 游客查询默认自选股
+     * @param {Function} successCallback - 成功回调函数
+     * @param {Function} failCallback - 失败回调函数
+     * @returns {Promise}
+     */
+    static async getDefaultStocks(successCallback, failCallback = null) {
+        const url = '/api/homePage/userStock/getDefaultStocks'
+        
+        try {
+            const response = await http({
+                url: url,
+                method: 'POST',
+                data: {}
+            })
+            
+            console.log('游客查询默认自选股 - 响应:', response)
+            if (successCallback && typeof successCallback === 'function') {
+                successCallback(response)
+            }
+            return response
+        } catch (error) {
+            console.error('游客查询默认自选股 - 失败:', error)
+            if (failCallback && typeof failCallback === 'function') {
+                failCallback(error)
+            }
+            throw error
+        }
+    }
 }
 
 // 导出API类
@@ -150,5 +180,6 @@ export const {
     checkExist,
     getUserStockGroupList,
     getUserStockList,
-    getUserOrDefault
+    getUserOrDefault,
+    getDefaultStocks
 } = MySelectionsAPI
\ No newline at end of file

From bd24b3706691357681601fa41bb40804068bd12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 17:26:38 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=B8=E5=AE=A2?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=BB=98=E8=AE=A4=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index c089e3d..3193d4e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -351,10 +351,7 @@ export default {
 			this.loadMySelectionsData()
 		} else if (this.userStore.userInfo && this.userStore.userInfo.isVisitor){
 			console.log('是游客登录，加载默认自选股',this.userStore.userInfo)
-
-			
-
-
+			this.loadGuestDefaultStocks()
 		}else {	
 			console.log('用户未登录',this.userStore.userInfo)
 		}
@@ -523,6 +520,23 @@ export default {
 			}
 		},
 		
+		// 游客加载默认自选股
+		async loadGuestDefaultStocks() {
+			try {
+				console.log('游客开始加载默认自选股...')
+				const guestResult = await MySelectionsAPI.getDefaultStocks()
+				console.log('游客查询默认自选股结果:', guestResult)
+				
+				if (guestResult.code === 200 && guestResult.data) {
+					this.processStockData(guestResult.data)
+				} else {
+					console.log('游客没有默认自选股数据')
+				}
+			} catch (error) {
+				console.error('游客加载默认自选股失败:', error)
+			}
+		},
+		
 		// 处理股票数据
 		processStockData(stockData) {
 			console.log('处理股票数据:', stockData)

From 98a016d957645189cebc11340bef59c5da2ed841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 18:34:04 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9B=B4=E6=96=B0tcp?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 66 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 3193d4e..5f75c8c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -256,6 +256,9 @@ export default {
 				type: ''
 			},
 			
+			// 当前TCP使用的股票代码
+			currentStockCodes: ['SH.000001', 'SH.000002', 'SH.000003'],
+			
 			// 我的自选TCP股票数据存储
 			myStocksTcpData: {
 				count: 0,
@@ -341,10 +344,8 @@ export default {
 				}
 			})
 		})
-		
-		// 初始化TCP连接监听器
-		this.initTcpListeners()
-		
+
+
 		// 检查用户登录状态，只有已登录并且不是游客才加载自选股数据
 		if (this.userStore.userInfo && !this.userStore.userInfo.isVisitor) {
 			console.log('是用户登录，加载自选股数据', this.userStore.userInfo)
@@ -355,23 +356,26 @@ export default {
 		}else {	
 			console.log('用户未登录',this.userStore.userInfo)
 		}
+
+		// 初始化TCP连接监听器
+		this.initTcpListeners()
 		
 		// 页面渲染完成后自动连接两个TCP连接
-		// this.$nextTick(() => {
-		// 	console.log('页面渲染完成，开始自动连接TCP服务器...')
-		// 	// 延迟一小段时间确保页面完全加载后再连接
-		// 	setTimeout(() => {
-		// 		// 连接今日市场概览TCP（channel 1）
-		// 		console.log('连接今日市场概览TCP（channel 1）...')
-		// 		this.connectTcp()
+		this.$nextTick(() => {
+			console.log('页面渲染完成，开始自动连接TCP服务器...')
+			// 延迟一小段时间确保页面完全加载后再连接
+			setTimeout(() => {
+				// 连接今日市场概览TCP（channel 1）
+				console.log('连接今日市场概览TCP（channel 1）...')
+				this.connectTcp()
 				
-		// 		// 稍微延迟后连接我的自选TCP（channel 2）
-		// 		setTimeout(() => {
-		// 			console.log('连接我的自选TCP（channel 2）...')
-		// 			this.connectMyStocksTcp()
-		// 		}, 500)
-		// 	}, 1000)
-		// })
+				// 稍微延迟后连接我的自选TCP（channel 2）
+				setTimeout(() => {
+					console.log('连接我的自选TCP（channel 2）...')
+					this.connectMyStocksTcp()
+				}, 500)
+			}, 1000)
+		})
 	},
 
 	// 页面销毁前的清理工作
@@ -576,6 +580,28 @@ export default {
 			}
 			
 			console.log('更新后的自选股数据:', this.myStocks)
+			
+			// 更新TCP消息中的股票代码
+			this.updateTcpStockCodes()
+		},
+		
+		// 更新TCP消息中的股票代码
+		updateTcpStockCodes() {
+			// 从myStocks中提取前3个股票代码
+			const stockCodes = this.myStocks.slice(0, 3).map(stock => stock.code).filter(code => code)
+			console.log('更新TCP消息股票代码:', stockCodes)
+			
+			// 如果有股票代码，更新TCP消息
+			if (stockCodes.length > 0) {
+				// 补充到3个代码（如果不足3个，用默认代码补充）
+				while (stockCodes.length < 3) {
+					stockCodes.push('SH.000001') // 默认代码
+				}
+				
+				// 保存到组件数据中，供TCP方法使用
+				this.currentStockCodes = stockCodes
+				console.log('当前TCP使用的股票代码:', this.currentStockCodes)
+			}
 		},
 		
 		// TCP连接相关方法
@@ -1033,7 +1059,7 @@ export default {
 			// }
 			// {"command": "stock_list"}
 			// {"command": "batch_real_time", "stock_codes": ["SH.000001"]}
-			 {"command": "batch_real_time", "stock_codes": ["SH.000001","SH.000002","SH.000003"]}
+			 {"command": "batch_real_time", "stock_codes": this.currentStockCodes}
 			
 			// 发送消息
 			const success = tcpConnection.send(messageData)
@@ -1050,7 +1076,7 @@ export default {
 		// 发送我的自选TCP消息
 		sendMyStocksTcpMessage() {
 			// 构造要发送的消息对象 - 我的自选股票数据请求
-			const messageData = {"command": "batch_real_time", "stock_codes": ["SH.000001","SH.000002","SH.000003"]}
+			const messageData = {"command": "batch_real_time", "stock_codes": this.currentStockCodes}
 			
 			// 发送消息到channel 2（我的自选TCP连接）
 			const success = tcpConnection.send(messageData, { channel: '2' })

From 96e176897cff177bd880ab08cfda3b767c585ef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 20:17:12 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E9=87=8D=E6=96=B0=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5f75c8c..a095310 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -27,8 +27,8 @@
 			<view class="section welcome-section">
 				<!-- 轮播图 -->
 				<swiper class="welcome-swiper" circular autoplay interval="3000" duration="500" indicator-dots indicator-active-color="#4080ff">
-					<swiper-item v-for="(item, index) in 5" :key="index">
-						<image class="swiper-image" src="https://d31zlh4on95l9h.cloudfront.net/images/e4272cc034fa2a3d1ca588ef84e51ab0.png" mode="aspectFill"></image>
+					<swiper-item v-for="(imageUrl, index) in swiperImages" :key="index">
+						<image class="swiper-image" :src="imageUrl" mode="aspectFill"></image>
 					</swiper-item>
 				</swiper>
 			</view>
@@ -218,6 +218,15 @@ export default {
 				{ title: '主力资金流', icon: '/static/c4.png' }
 			],
 			
+			// 轮播图片数据
+			swiperImages: [
+				'https://d31zlh4on95l9h.cloudfront.net/images/44ec37501cf3ecf5438d401c3d66fcd3.png',
+				'https://d31zlh4on95l9h.cloudfront.net/images/80274b6626bb403d717469b3672333c9.png',
+				'https://d31zlh4on95l9h.cloudfront.net/images/14481c76b09509977d3879ba3141ebc7.png',
+				'https://d31zlh4on95l9h.cloudfront.net/images/19e4c5542e5f974e1c6938897aa20ef9.png',
+				'https://d31zlh4on95l9h.cloudfront.net/images/d0bc1c1bb71917132865b82dab99831b.png'
+			],
+			
 			// 我的自选股票数据
 			myStocks: [
 				{ name: '特斯拉', code: 'TSLA', price: '482.00', change: 2.80, chartImg: '/static/c5.png' },
@@ -1627,7 +1636,7 @@ export default {
 
 .welcome-swiper {
 	width: 100%;
-	height: 150px;
+	height: 110px;
 	border-radius: 0;
 	overflow: hidden;
 }

From 1922787df71340589dd1d47b41d7ce7f755d6191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=9D=B0?= <better_sj@126.com>
Date: Wed, 29 Oct 2025 20:30:57 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8A=A0=E5=85=A5=E5=AF=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E7=99=BB=E5=BD=95=E7=9A=84=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC=EF=BC=9B=E9=A6=96=E9=A1=B5=E6=B8=B8=E5=AE=A2?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=8A=A0=E8=BD=BD=E9=A1=B5=E9=9D=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/login-prompt.vue |  5 +++++
 pages/home/home.vue         | 30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/components/login-prompt.vue b/components/login-prompt.vue
index 4d302be..0b9af30 100644
--- a/components/login-prompt.vue
+++ b/components/login-prompt.vue
@@ -85,6 +85,11 @@ const continueAsVisitor = async () => {
   if (res.code === 200) {
     userStore.setUserInfo(res.data);
     hide();
+    
+    // 发送游客登录成功事件，通知首页重新加载
+    uni.$emit('visitorLoginSuccess', {
+      userInfo: res.data
+    });
   }
 };
 
diff --git a/pages/home/home.vue b/pages/home/home.vue
index a095310..466b9b0 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -369,6 +369,9 @@ export default {
 		// 初始化TCP连接监听器
 		this.initTcpListeners()
 		
+		// 监听游客登录成功事件
+		uni.$on('visitorLoginSuccess', this.handleVisitorLoginSuccess)
+		
 		// 页面渲染完成后自动连接两个TCP连接
 		this.$nextTick(() => {
 			console.log('页面渲染完成，开始自动连接TCP服务器...')
@@ -421,9 +424,36 @@ export default {
 		
 		// 移除TCP监听器，防止内存泄漏
 		this.removeTcpListeners()
+		
+		// 移除游客登录成功事件监听器
+		uni.$off('visitorLoginSuccess', this.handleVisitorLoginSuccess)
 	},
 	
 	methods: {
+		// 处理游客登录成功事件
+		handleVisitorLoginSuccess(data) {
+			console.log('收到游客登录成功事件:', data)
+			// 重新加载页面数据
+			this.reloadPageData()
+		},
+		
+		// 重新加载页面数据
+		reloadPageData() {
+			console.log('重新加载页面数据...')
+			
+			// 更新用户信息store
+			this.userStore = useUserStore()
+			
+			// 根据新的用户状态加载相应的数据
+			if (this.userStore.userInfo && this.userStore.userInfo.isVisitor) {
+				console.log('游客登录成功，加载默认自选股')
+				this.loadGuestDefaultStocks()
+			} else if (this.userStore.userInfo && !this.userStore.userInfo.isVisitor) {
+				console.log('用户登录，加载自选股数据')
+				this.loadMySelectionsData()
+			}
+		},
+		
 		// 防抖函数
 		debounce(fn, delay = 300) {
 			if (this.debounceTimer) clearTimeout(this.debounceTimer)

From f24fd1d1ee8c426f21d40092c424f3fa45133edc Mon Sep 17 00:00:00 2001
From: hongxilin <17663930442@163.com>
Date: Wed, 29 Oct 2025 20:36:48 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E5=BC=95=E5=85=A5=E5=90=84=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E5=9B=BD=E6=97=97=EF=BC=8C=E6=8E=A5=E5=85=A5=E5=85=A8?=
 =?UTF-8?q?=E7=90=83=E5=B8=82=E5=9C=BA=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E7=BB=84=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=B0=E5=8C=BA=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=80=E6=AC=A1=E6=80=A7=E6=9F=A5=E8=AF=A2=E6=89=80?=
 =?UTF-8?q?=E6=9C=89Tabs=E6=A0=8F=E7=88=B6=E5=AD=90=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9IndexCards?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/marketSituation/marketSituation.js             |  70 ++
 components/IndexCard.vue                           | 288 +++----
 pages/marketSituation/countryMarket.vue            | 589 +++++++-------
 pages/marketSituation/globalIndex.vue              | 842 ++++++++++----------
 pages/marketSituation/marketCondition.vue          |  74 +-
 pages/marketSituation/marketDetail.vue             | 697 +++++++++--------
 pages/marketSituation/marketOverview.vue           | 121 +--
 pages/marketSituation/marketSituation.vue          | 844 ++++++++++-----------
 static/marketSituation-image/country-flag/can.png  | Bin 0 -> 1149 bytes
 static/marketSituation-image/country-flag/cn.png   | Bin 0 -> 1131 bytes
 .../marketSituation-image/country-flag/global.png  | Bin 0 -> 2557 bytes
 static/marketSituation-image/country-flag/hk.png   | Bin 0 -> 1722 bytes
 static/marketSituation-image/country-flag/my.png   | Bin 0 -> 1783 bytes
 static/marketSituation-image/country-flag/sg.png   | Bin 0 -> 1165 bytes
 static/marketSituation-image/country-flag/th.png   | Bin 0 -> 703 bytes
 static/marketSituation-image/country-flag/us.png   | Bin 0 -> 1430 bytes
 static/marketSituation-image/country-flag/vi.png   | Bin 0 -> 1132 bytes
 stores/modules/marketSituation.js                  |  78 ++
 18 files changed, 1856 insertions(+), 1747 deletions(-)
 create mode 100644 api/marketSituation/marketSituation.js
 create mode 100644 static/marketSituation-image/country-flag/can.png
 create mode 100644 static/marketSituation-image/country-flag/cn.png
 create mode 100644 static/marketSituation-image/country-flag/global.png
 create mode 100644 static/marketSituation-image/country-flag/hk.png
 create mode 100644 static/marketSituation-image/country-flag/my.png
 create mode 100644 static/marketSituation-image/country-flag/sg.png
 create mode 100644 static/marketSituation-image/country-flag/th.png
 create mode 100644 static/marketSituation-image/country-flag/us.png
 create mode 100644 static/marketSituation-image/country-flag/vi.png
 create mode 100644 stores/modules/marketSituation.js

diff --git a/api/marketSituation/marketSituation.js b/api/marketSituation/marketSituation.js
new file mode 100644
index 0000000..9452062
--- /dev/null
+++ b/api/marketSituation/marketSituation.js
@@ -0,0 +1,70 @@
+/** @format */
+
+import { http } from "../../utils/http";
+
+export const getData = () => {
+  return http({
+    method: "GET",
+    url: "/ka",
+  });
+};
+
+/**
+ * 获取全球指数
+ * POST /api/global/getGlobalIndex
+ */
+export const getGlobalIndexAPI = (data) => {
+  return http({
+    method: "POST",
+    url: "/api/global/getGlobalIndex",
+    data,
+  });
+};
+
+/**
+ * 获取地区分组列表
+ * POST /api/global/regionalGroup
+ */
+export const getRegionalGroupAPI = (data) => {
+  return http({
+    method: "POST",
+    url: "/api/global/regionalGroup",
+    data,
+  });
+};
+
+/**
+ * 获取地区详情
+ * POST /api/global/regionalGroupList
+ */
+export const getRegionalGroupListAPI = (data) => {
+  return http({
+    method: "POST",
+    url: "/api/global/regionalGroupList",
+    data,
+  });
+};
+
+/**
+ * 一次性查询所有Tab栏父子结构
+ * POST /api/homework/tab/getAll
+ */
+export const getAllTabsAPI = (data) => {
+  return http({
+    method: "POST",
+    url: "/api/homework/tab/getAll",
+    data,
+  });
+};
+
+/**
+ * 通用市场数据分页查询接口（默认1页20条）
+ * POST /api/market/data/page/query
+ */
+export const queryStockDataAPI = (data) => {
+  return http({
+    method: "POST",
+    url: "/api/market/data/page/query",
+    data,
+  });
+};
diff --git a/components/IndexCard.vue b/components/IndexCard.vue
index 24d0e7e..ad1ae69 100644
--- a/components/IndexCard.vue
+++ b/components/IndexCard.vue
@@ -1,190 +1,220 @@
+<!-- @format -->
+
 <template>
-	<view class="index-card">
-		<view class="card-header">
-			<view class="flag-container">
-				<image :src="flagIcon" class="flag-icon" mode="aspectFit"></image>
-			</view>
-			<text class="index-name">{{ stockName }}</text>
-		</view>
-		
-		<view class="price-info">
-			<text class="current-price" :style="{ color: priceColor }">{{ currentPrice }}</text>
-			<view class="change-info">
-				<text class="change-amount" :style="{ color: priceColor }">{{ changeAmount }}</text>
-				<text class="change-percent" :style="{ color: priceColor }">{{ changePercent }}</text>
-			</view>
-		</view>
-		
-		<view class="chart-container">
-			<view class="mini-chart" :style="{ backgroundColor: chartBgColor }">
-				<!-- 这里可以放置实际的图表组件，目前用简单的波浪线表示 -->
-				<view class="chart-line" :style="{ borderColor: priceColor }"></view>
-			</view>
-		</view>
-	</view>
+  <view class="index-card">
+    <view class="card-header">
+      <view class="flag-container">
+        <image :src="getMarketFlag(market)" class="flag-icon" mode="aspectFit"></image>
+      </view>
+      <text class="index-name">{{ stockName }}</text>
+    </view>
+
+    <view class="price-info">
+      <text class="current-price" :style="{ color: priceColor }">{{ currentPrice }}</text>
+      <view class="change-info">
+        <text class="change-amount" :style="{ color: priceColor }">{{ changeAmount }}</text>
+        <text class="change-percent" :style="{ color: priceColor }">{{ changePercent }}</text>
+      </view>
+    </view>
+
+    <view class="chart-container">
+      <view class="mini-chart" :style="{ backgroundColor: chartBgColor }">
+        <!-- 这里可以放置实际的图表组件，目前用简单的波浪线表示 -->
+        <view class="chart-line" :style="{ borderColor: priceColor }"></view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-import { computed } from 'vue'
+import { computed } from "vue";
 
 // 定义组件属性
 const props = defineProps({
-	// 国旗图标路径
-	flagIcon: {
-		type: String,
-		required: true
-	},
-	// 指数名称
-	stockName: {
-		type: String,
-		required: true
-	},
-	// 当前价格
-	currentPrice: {
-		type: [String, Number],
-		required: true
-	},
-	// 涨跌金额
-	changeAmount: {
-		type: [String, Number],
-		required: true
-	},
-	// 涨跌幅
-	changePercent: {
-		type: [String, Number],
-		required: true
-	},
-	// 是否上涨
-	isRising: {
-		type: Boolean,
-		default: true
-	}
-})
+  // 国旗图标路径
+  market: {
+    type: String,
+    required: true,
+  },
+  // 指数名称
+  stockName: {
+    type: String,
+    required: true,
+  },
+  // 当前价格
+  currentPrice: {
+    type: [String, Number],
+    required: true,
+  },
+  // 涨跌金额
+  changeAmount: {
+    type: [String, Number],
+    required: true,
+  },
+  // 涨跌幅
+  changePercent: {
+    type: [String, Number],
+    required: true,
+  },
+  // 是否上涨
+  isRising: {
+    type: Boolean,
+    default: true,
+  },
+});
+
+const getMarketFlag = (market) => {
+  console.log("market", market);
+  let imagePath;
+
+  if (market === "cn") {
+    imagePath = "/static/marketSituation-image/country-flag/cn.png";
+  } else if (market === "hk") {
+    imagePath = "/static/marketSituation-image/country-flag/hk.png";
+  } else if (market === "can") {
+    imagePath = "/static/marketSituation-image/country-flag/can.png";
+  } else if (market === "my") {
+    imagePath = "/static/marketSituation-image/country-flag/my.png";
+  } else if (market === "sg") {
+    imagePath = "/static/marketSituation-image/country-flag/sg.png";
+  } else if (market === "th") {
+    imagePath = "/static/marketSituation-image/country-flag/th.png";
+  } else if (market === "vi") {
+    imagePath = "/static/marketSituation-image/country-flag/vi.png";
+  } else if (market === "us" || market === "usa") {
+    imagePath = "/static/marketSituation-image/country-flag/us.png";
+  } else {
+    imagePath = "/static/marketSituation-image/country-flag/global.png";
+  }
+
+  console.log("返回的图片路径:", imagePath);
+  return imagePath;
+};
 
 // 计算价格颜色
 const priceColor = computed(() => {
-	return props.isRising ? '#00C853' : '#FF1744'
-})
+  return props.isRising ? "#00C853" : "#FF1744";
+});
 
 // 计算图表背景色
 const chartBgColor = computed(() => {
-	return props.isRising ? '#E8F5E8' : '#FFEBEE'
-})
+  return props.isRising ? "#E8F5E8" : "#FFEBEE";
+});
 </script>
 
 <style scoped>
 .index-card {
-	background-color: #ffffff;
-	border-radius: 12rpx;
-	padding: 20rpx;
-	margin: 16rpx;
-	box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
-	border: 1rpx solid #f0f0f0;
+  background-color: #ffffff;
+  border-radius: 12rpx;
+  padding: 20rpx;
+  margin: 16rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+  border: 1rpx solid #f0f0f0;
 }
 
 .card-header {
-	display: flex;
-	align-items: center;
-	margin-bottom: 16rpx;
+  display: flex;
+  align-items: center;
+  margin-bottom: 16rpx;
 }
 
 .flag-container {
-	width: 48rpx;
-	height: 32rpx;
-	margin-right: 12rpx;
-	border-radius: 4rpx;
-	overflow: hidden;
+  width: 48rpx;
+  height: 32rpx;
+  margin-right: 12rpx;
+  border-radius: 4rpx;
+  overflow: hidden;
 }
 
 .flag-icon {
-	width: 100%;
-	height: 100%;
+  width: 100%;
+  height: 100%;
 }
 
 .index-name {
-	font-size: 28rpx;
-	font-weight: 500;
-	color: #333333;
-	flex: 1;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
+  font-size: 28rpx;
+  font-weight: 500;
+  color: #333333;
+  flex: 1;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .price-info {
-	margin-bottom: 20rpx;
+  margin-bottom: 20rpx;
 }
 
 .current-price {
-	font-size: 36rpx;
-	font-weight: bold;
-	display: block;
-	margin-bottom: 8rpx;
+  font-size: 36rpx;
+  font-weight: bold;
+  display: block;
+  margin-bottom: 8rpx;
 }
 
 .change-info {
-	display: flex;
-	align-items: center;
-	gap: 16rpx;
+  display: flex;
+  align-items: center;
+  gap: 16rpx;
 }
 
 .change-amount {
-	font-size: 24rpx;
-	font-weight: 500;
+  font-size: 24rpx;
+  font-weight: 500;
 }
 
 .change-percent {
-	font-size: 24rpx;
-	font-weight: 500;
+  font-size: 24rpx;
+  font-weight: 500;
 }
 
 .chart-container {
-	height: 80rpx;
-	border-radius: 8rpx;
-	overflow: hidden;
+  height: 80rpx;
+  border-radius: 8rpx;
+  overflow: hidden;
 }
 
 .mini-chart {
-	width: 100%;
-	height: 100%;
-	position: relative;
-	border-radius: 8rpx;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  border-radius: 8rpx;
 }
 
 .chart-line {
-	position: absolute;
-	bottom: 20rpx;
-	left: 10rpx;
-	right: 10rpx;
-	height: 2rpx;
-	border-top: 2rpx solid;
-	border-style: solid;
+  position: absolute;
+  bottom: 20rpx;
+  left: 10rpx;
+  right: 10rpx;
+  height: 2rpx;
+  border-top: 2rpx solid;
+  border-style: solid;
 }
 
 /* 添加一些波浪效果 */
 .chart-line::before {
-	content: '';
-	position: absolute;
-	top: -10rpx;
-	left: 20%;
-	width: 20rpx;
-	height: 20rpx;
-	border: 2rpx solid;
-	border-color: inherit;
-	border-radius: 50%;
-	background: transparent;
+  content: "";
+  position: absolute;
+  top: -10rpx;
+  left: 20%;
+  width: 20rpx;
+  height: 20rpx;
+  border: 2rpx solid;
+  border-color: inherit;
+  border-radius: 50%;
+  background: transparent;
 }
 
 .chart-line::after {
-	content: '';
-	position: absolute;
-	top: -6rpx;
-	right: 30%;
-	width: 12rpx;
-	height: 12rpx;
-	border: 2rpx solid;
-	border-color: inherit;
-	border-radius: 50%;
-	background: transparent;
+  content: "";
+  position: absolute;
+  top: -6rpx;
+  right: 30%;
+  width: 12rpx;
+  height: 12rpx;
+  border: 2rpx solid;
+  border-color: inherit;
+  border-radius: 50%;
+  background: transparent;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/marketSituation/countryMarket.vue b/pages/marketSituation/countryMarket.vue
index 9bb0a30..465e8e7 100644
--- a/pages/marketSituation/countryMarket.vue
+++ b/pages/marketSituation/countryMarket.vue
@@ -1,493 +1,498 @@
+<!-- @format -->
+
 <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>
+  <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 :market="countryInfo.market" :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'
+import { ref, computed, onMounted } from "vue";
+import IndexCard from "../../components/IndexCard.vue";
 
 // 子Tab与操作
-const marketTabs = ['全部', '美股', '纽交所', '纳斯达克']
-const activeTabIndex = ref(0)
+// const marketTabs = ["全部", "美股", "纽交所", "纳斯达克"];
+const activeTabIndex = ref(0);
 const switchTab = (i) => {
-	activeTabIndex.value = i
-}
+  activeTabIndex.value = i;
+};
 
 // 今日情绪温度示例数据
 const sentimentMeters = [
-	{ value: 90, label: '道琼斯', theme: 'hot' },
-	{ value: 60, label: '纳斯达克', theme: 'warm' },
-	{ value: 20, label: '标普500', theme: 'cool' }
-]
+  { 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'
-}
+  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
-	}
-})
+  countryId: {
+    type: Number,
+    required: true,
+  },
+  marketTabs: {
+    type: Array,
+  },
+});
 
 // 国家/地区信息映射
 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 }
-		]
-	}
-}
+  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: []
-	}
-})
+  return (
+    countryInfoMap[props.countryId] || {
+      name: "未知地区",
+      flag: "🌍",
+      isMarketOpen: false,
+      mainIndices: [],
+      hotStocks: [],
+    }
+  );
+});
 
 // 计算当前国家的板块与股票
 const sectors = computed(() => {
-	return countryInfoMap[props.countryId]?.sectors || []
-})
+  return countryInfoMap[props.countryId]?.sectors || [];
+});
 const stocks = computed(() => {
-	return countryInfoMap[props.countryId]?.stocks || []
-})
+  return countryInfoMap[props.countryId]?.stocks || [];
+});
 
 // 查看更多占位
 const viewMore = (type) => {
-	// 可根据 type 跳转到相应页面或加载更多
-	// 例如：indices/sectors/stocks
-	// uni.navigateTo({ url: `/pages/marketSituation/${type}List` })
-}
+  // 可根据 type 跳转到相应页面或加载更多
+  // 例如：indices/sectors/stocks
+  // uni.navigateTo({ url: `/pages/marketSituation/${type}List` })
+};
 </script>
 
 <style scoped>
 .content {
-	padding: 0 20rpx 20rpx 20rpx;
+  padding: 0 20rpx 20rpx 20rpx;
 }
 
 /* 子Tab */
 .sub_tabs {
-	display: flex;
-	gap: 16rpx;
-	padding: 0 20rpx 20rpx 20rpx;
+  display: flex;
+  gap: 16rpx;
+  padding: 0 20rpx 20rpx 20rpx;
 }
 
 .tab_item {
-	padding: 6rpx 20rpx;
-	border-radius: 5rpx;
-	background: #f5f5f5;
-	color: #666;
-	font-size: 24rpx;
+  padding: 6rpx 20rpx;
+  border-radius: 5rpx;
+  background: #f5f5f5;
+  color: #666;
+  font-size: 24rpx;
 }
 
 .tab_item.active {
-	background: #ff4444;
-	color: #fff;
+  background: #ff4444;
+  color: #fff;
 }
 
 .section {
-	padding: 20rpx;
-	border-radius: 16rpx;
+  padding: 20rpx;
+  border-radius: 16rpx;
 }
 
 .section_header {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	margin-bottom: 16rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 16rpx;
 }
 
 .section_title {
-	font-size: 28rpx;
-	font-weight: bold;
-	color: #333;
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
 }
 
 .section_action {
-	font-size: 24rpx;
-	color: #999;
+  font-size: 24rpx;
+  color: #999;
 }
 
 .indices_grid {
-	padding: 20rpx;
-	display: grid;
-	grid-template-columns: repeat(3, 1fr);
-	gap: 20rpx;
-	background-color: #F6F6F6;
+  padding: 20rpx;
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 20rpx;
+  background-color: #f6f6f6;
 }
 
 /* 情绪温度 */
 .sentiment {
-	background-color: #F6F6F6;
-	padding: 0 20rpx 20rpx 20rpx;
+  background-color: #f6f6f6;
+  padding: 0 20rpx 20rpx 20rpx;
 }
 
 .section_subtitle {
-	font-size: 24rpx;
-	color: #000000;
-	padding: 20rpx 0;
+  font-size: 24rpx;
+  color: #000000;
+  padding: 20rpx 0;
 }
 
 .meters {
-	display: grid;
-	grid-template-columns: repeat(3, 1fr);
-	gap: 16rpx;
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 16rpx;
 }
 
 .meter_item {
-	display: flex;
-	align-items: center;
-	/* padding: 10rpx; */
-	background: #ffffff;
-	border-radius: 12rpx;
+  display: flex;
+  align-items: center;
+  /* padding: 10rpx; */
+  background: #ffffff;
+  border-radius: 12rpx;
 }
 
 .meter_item image {
-	width: 100rpx;
-	height: 100rpx;
+  width: 100rpx;
+  height: 100rpx;
 }
 
 .meter_info {
-	display: flex;
-	flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
 .meter_value {
-	font-size: 36rpx;
+  font-size: 36rpx;
 }
 
 .meter_value.hot {
-	color: #ff6b6b;
+  color: #ff6b6b;
 }
 
 .meter_value.warm {
-	color: #ffd166;
+  color: #ffd166;
 }
 
 .meter_value.cool {
-	color: #60a5fa;
+  color: #60a5fa;
 }
 
 .meter_label {
-	font-size: 22rpx;
+  font-size: 22rpx;
 }
 
 .meter_label.hot {
-	color: #ff6b6b;
+  color: #ff6b6b;
 }
 
 .meter_label.warm {
-	color: #ffd166;
+  color: #ffd166;
 }
 
 .meter_label.cool {
-	color: #60a5fa;
+  color: #60a5fa;
 }
 
 /* 板块 */
 .sectors_grid {
-	display: grid;
-	grid-template-columns: repeat(3, 1fr);
-	gap: 16rpx;
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 16rpx;
 }
 
 .sector_item {
-	background: #fafafa;
-	border-radius: 12rpx;
-	padding: 16rpx;
+  background: #fafafa;
+  border-radius: 12rpx;
+  padding: 16rpx;
 }
 
 .sector_header {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	margin-bottom: 12rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 12rpx;
 }
 
 .sector_name {
-	font-size: 24rpx;
-	color: #333;
+  font-size: 24rpx;
+  color: #333;
 }
 
 .sector_change {
-	font-size: 22rpx;
+  font-size: 22rpx;
 }
 
 .sector_change.rising {
-	color: #e74c3c;
+  color: #e74c3c;
 }
 
 .sector_change.falling {
-	color: #27ae60;
+  color: #27ae60;
 }
 
 .sector_price {
-	font-size: 24rpx;
-	color: #666;
+  font-size: 24rpx;
+  color: #666;
 }
 
 /* 股票表 */
 .table {
-	background: #fff;
-	border-radius: 12rpx;
-	overflow: hidden;
+  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;
+  display: grid;
+  grid-template-columns: 2fr 1fr 1fr;
+  padding: 18rpx 20rpx;
+  border-bottom: 1rpx solid #f0f0f0;
 }
 
 .table_header {
-	background: #fafafa;
+  background: #fafafa;
 }
 
 .cell.name {
-	display: flex;
-	flex-direction: column;
+  display: flex;
+  flex-direction: column;
 }
 
 .stk_name {
-	font-size: 26rpx;
-	color: #333;
+  font-size: 26rpx;
+  color: #333;
 }
 
 .stk_code {
-	font-size: 22rpx;
-	color: #999;
+  font-size: 22rpx;
+  color: #999;
 }
 
 .stk_price {
-	font-size: 26rpx;
-	color: #333;
+  font-size: 26rpx;
+  color: #333;
 }
 
 .stk_change {
-	font-size: 24rpx;
+  font-size: 24rpx;
 }
 
 .stk_change.rising {
-	color: #e74c3c;
+  color: #e74c3c;
 }
 
 .stk_change.falling {
-	color: #27ae60;
+  color: #27ae60;
 }
 
 .index_item {
-	background: #fff;
-	border-radius: 12rpx;
-	overflow: hidden;
+  background: #fff;
+  border-radius: 12rpx;
+  overflow: hidden;
 }
 
 .hot_stocks {
-	margin-bottom: 30rpx;
+  margin-bottom: 30rpx;
 }
 
 .stocks_list {
-	background: #fff;
-	border-radius: 12rpx;
-	overflow: hidden;
+  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;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 24rpx 20rpx;
+  border-bottom: 1rpx solid #f0f0f0;
 }
 
 .stock_item:last-child {
-	border-bottom: none;
+  border-bottom: none;
 }
 
 .stock_info {
-	flex: 1;
+  flex: 1;
 }
 
 .stock_name {
-	font-size: 28rpx;
-	color: #333;
-	display: block;
-	margin-bottom: 8rpx;
+  font-size: 28rpx;
+  color: #333;
+  display: block;
+  margin-bottom: 8rpx;
 }
 
 .stock_code {
-	font-size: 24rpx;
-	color: #999;
+  font-size: 24rpx;
+  color: #999;
 }
 
 .stock_price {
-	text-align: right;
+  text-align: right;
 }
 
 .price {
-	font-size: 28rpx;
-	color: #333;
-	display: block;
-	margin-bottom: 8rpx;
+  font-size: 28rpx;
+  color: #333;
+  display: block;
+  margin-bottom: 8rpx;
 }
 
 .change {
-	font-size: 24rpx;
+  font-size: 24rpx;
 }
 
 .change.rising {
-	color: #e74c3c;
+  color: #e74c3c;
 }
 
 .change.falling {
-	color: #27ae60;
+  color: #27ae60;
 }
 
 .bottom_safe_area {
-	height: 120rpx;
+  height: 120rpx;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/marketSituation/globalIndex.vue b/pages/marketSituation/globalIndex.vue
index beb2fc4..662c11d 100644
--- a/pages/marketSituation/globalIndex.vue
+++ b/pages/marketSituation/globalIndex.vue
@@ -1,586 +1,566 @@
+<!-- @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 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>
-
-        <!-- 内容区域 -->
-        <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" :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 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>
 
-    <!-- 底部导航栏 -->
-    <footerBar class="static-footer" :type="'marketSituation'"></footerBar>
+    <!-- 内容区域 -->
+    <scroll-view class="content" :style="{ top: contentTopPosition + 'px' }" scroll-y="true">
+      <!-- 亚太-中华 -->
+      <view class="market-section" v-for="item in globalIndexArray" :key="item">
+        <view class="market-header">
+          <text class="market-title">{{ item.ac }}</text>
+          <view class="market-more" @click="viewMore(item.ac)">
+            <text class="more-text">查看更多</text>
+            <text class="more-arrow">></text>
+          </view>
+        </view>
+        <view class="cards-grid-three">
+          <view v-for="iitem in item.list" :key="iitem" class="card-item">
+            <IndexCard
+              :market="iitem.market"
+              :stockName="iitem.name"
+              :currentPrice="iitem.currentPrice"
+              :changeAmount="iitem.changeAmount"
+              :changePercent="iitem.changePercent"
+              :isRising="iitem.isRising"
+              @click="viewIndexDetail(iitem)"
+            />
+          </view>
+        </view>
+      </view>
+
+      <!-- 底部安全区域 -->
+      <view class="bottom-safe-area"></view>
+    </scroll-view>
+  </view>
+
+  <!-- 底部导航栏 -->
+  <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 "../../components/footerBar.vue";
+import IndexCard from "../../components/IndexCard.vue";
+import { getRegionalGroupAPI } from "../../api/marketSituation/marketSituation.js";
 
 // 响应式数据
-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 globalIndexArray = ref([]);
 // 亚太-中华指数数据
 const asiachinaIndexes = ref([
-    {
-        flagIcon: '/static/c1.png',
-        stockName: '上证指数',
-        stockCode:'noCode',
-        currentPrice: '3933.96',
-        changeAmount: '+24.32',
-        changePercent: '+0.62%',
-        isRising: true
-    },
-    {
-        flagIcon: '/static/c2.png',
-        stockName: '深证成指',
-        stockCode:'noCode',
-        currentPrice: '45757.90',
-        changeAmount: '-123.45',
-        changePercent: '-0.27%',
-        isRising: false
-    },
-    {
-        flagIcon: '/static/c3.png',
-        stockName: '创业板指',
-        stockCode:'noCode',
-        currentPrice: '6606.08',
-        changeAmount: '+89.76',
-        changePercent: '+1.38%',
-        isRising: true
-    },
-    {
-        flagIcon: '/static/c4.png',
-        stockName: 'HSI50',
-        stockCode:'noCode',
-        currentPrice: '22333.96',
-        changeAmount: '+156.78',
-        changePercent: '+0.71%',
-        isRising: true
-    },
-    {
-        flagIcon: '/static/c5.png',
-        stockName: '沪深300',
-        stockCode:'noCode',
-        currentPrice: '45757.90',
-        changeAmount: '-89.12',
-        changePercent: '-0.19%',
-        isRising: false
-    },
-    {
-        flagIcon: '/static/c6.png',
-        stockName: '上证50',
-        stockCode:'noCode',
-        currentPrice: '45757.90',
-        changeAmount: '+234.56',
-        changePercent: '+0.52%',
-        isRising: true
-    }
-])
+  {
+    flagIcon: "/static/c1.png",
+    stockName: "上证指数",
+    stockCode: "noCode",
+    currentPrice: "3933.96",
+    changeAmount: "+24.32",
+    changePercent: "+0.62%",
+    isRising: true,
+  },
+  {
+    flagIcon: "/static/c2.png",
+    stockName: "深证成指",
+    stockCode: "noCode",
+    currentPrice: "45757.90",
+    changeAmount: "-123.45",
+    changePercent: "-0.27%",
+    isRising: false,
+  },
+  {
+    flagIcon: "/static/c3.png",
+    stockName: "创业板指",
+    stockCode: "noCode",
+    currentPrice: "6606.08",
+    changeAmount: "+89.76",
+    changePercent: "+1.38%",
+    isRising: true,
+  },
+  {
+    flagIcon: "/static/c4.png",
+    stockName: "HSI50",
+    stockCode: "noCode",
+    currentPrice: "22333.96",
+    changeAmount: "+156.78",
+    changePercent: "+0.71%",
+    isRising: true,
+  },
+  {
+    flagIcon: "/static/c5.png",
+    stockName: "沪深300",
+    stockCode: "noCode",
+    currentPrice: "45757.90",
+    changeAmount: "-89.12",
+    changePercent: "-0.19%",
+    isRising: false,
+  },
+  {
+    flagIcon: "/static/c6.png",
+    stockName: "上证50",
+    stockCode: "noCode",
+    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",
+    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,
+  },
+]);
 
 // 美洲指数数据
 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",
+    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,
+  },
+]);
 
 // 计算属性：内容区域顶部位置
 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/marketSituation/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/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}`
-    })
-}
+  console.log("查看指数详情:", item.stockName);
+  // uni.showToast({
+  //     title: `查看 ${item.stockName} 详情`,
+  //     icon: 'none',
+  //     duration: 2000
+  // })
+  // 这里可以跳转到具体的指数详情页面
+  uni.navigateTo({
+    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}`,
+  });
+};
+
+const getRegionalGroup = async () => {
+  try {
+    const result = await getRegionalGroupAPI();
+    globalIndexArray.value = result.data;
+  } catch (e) {
+    console.log("获取区域指数失败", e);
+  }
+};
 
 // 生命周期：页面挂载
-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()
-})
+onMounted(async () => {
+  await getRegionalGroup();
+  // 获取系统信息
+  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>
\ No newline at end of file
+</style>
diff --git a/pages/marketSituation/marketCondition.vue b/pages/marketSituation/marketCondition.vue
index b244d26..5c29c5e 100644
--- a/pages/marketSituation/marketCondition.vue
+++ b/pages/marketSituation/marketCondition.vue
@@ -8,12 +8,12 @@
       <view class="title">
         <image class="back-homepage-btn" src="/static/marketSituation-image/back.png" mode="返回按钮" @click="backToHomepage()"> </image>
         <view class="mid-title">
-          <view class="arrow-left"> </view>
+          <view class="arrow-left" @click="toLeftPage()"> </view>
           <view class="stock-id">
             <view class="stock-name"> {{ stockInformation.stockName }} </view>
             <view class="stock-code"> {{ stockInformation.stockCode }} </view>
           </view>
-          <view class="arrow-right"> </view>
+          <view class="arrow-right" @click="toRightPage()"> </view>
         </view>
         <image class="search" src="/static/marketSituation-image/search.png" mode="搜索" @click="search()"> </image>
         <view class="more" @click="getMore()">···</view>
@@ -240,6 +240,10 @@ const tcpConnected = ref(false);
 const connectionListener = ref(null);
 const messageListener = ref(null);
 
+// 股票来源
+const currentStockFrom = ref();
+// 当前股票位置
+const currentStockIndex = ref(-1);
 // 股票信息栏变量
 const stockInformation = ref({
   stockName: "----", //股票名称
@@ -511,6 +515,35 @@ const backToHomepage = () => {
   }
 };
 
+const toLeftPage = () => {
+	if(currentStockFrom.value == "marketOverview"){
+		return;
+	}
+  if (currentStockIndex.value > 0) {
+    currentStockIndex.value--;
+    // updateStockInformation();
+  } else {
+    uni.showToast({
+      title: "没有更多股票了",
+      icon: "none",
+      duration: 1000,
+    });
+  }
+};
+
+const toRightPage = () => {
+  if (currentStockIndex.value < stockList.length - 1) {
+    currentStockIndex.value++;
+    // updateStockInformation();
+  } else {
+    uni.showToast({
+      title: "没有更多股票了",
+      icon: "none",
+      duration: 1000,
+    });
+  }
+};
+
 const openStockDetail = () => {
   isStockDetail.value = true;
 };
@@ -2136,10 +2169,10 @@ const startAddDataTimer = () => {
 onLoad((options) => {
   console.log("页面接收到的参数：", options);
 
-  // 处理通过data参数传递的复杂对象
-  if (options.data) {
+  // 处理通过stockInformation参数传递的复杂对象
+  if (options.stockInformation) {
     try {
-      const stockData = JSON.parse(decodeURIComponent(options.data));
+      const stockData = JSON.parse(decodeURIComponent(options.stockInformation));
       console.log("解析的股票数据：", stockData);
 
       // 更新stockInformation
@@ -2152,30 +2185,17 @@ onLoad((options) => {
     }
   }
 
-  // 处理通过stockInformation参数传递的数据（兼容globalIndex.vue的传参方式）
-  if (options.stockInformation) {
-    try {
-      const stockData = JSON.parse(decodeURIComponent(options.stockInformation));
-      console.log("解析的股票信息：", stockData);
-
-      // 更新stockInformation
-      if (stockData) {
-        stockInformation.value = {
-          ...stockInformation.value,
-          ...stockData,
-        };
-      }
-    } catch (error) {
-      console.error("解析股票信息失败：", error);
-    }
+  // 处理index参数（股票在列表中的位置）
+  if (options.index !== undefined) {
+    const stockIndex = parseInt(options.index);
+    console.log("股票在列表中的索引：", stockIndex);
+    // 将index保存到响应式变量中，用于后续的左右切换功能
+    currentStockIndex.value = stockIndex;
   }
 
-  // 处理简单参数
-  if (options.stockCode) {
-    stockInformation.value.stockCode = options.stockCode;
-  }
-  if (options.stockName) {
-    stockInformation.value.stockName = decodeURIComponent(options.stockName);
+  // 处理stockFrom参数（股票来源）
+  if (options.stockFrom) {
+    currentStockFrom.value = options.stockFrom;
   }
 });
 
diff --git a/pages/marketSituation/marketDetail.vue b/pages/marketSituation/marketDetail.vue
index 0252547..1c559b2 100644
--- a/pages/marketSituation/marketDetail.vue
+++ b/pages/marketSituation/marketDetail.vue
@@ -1,481 +1,478 @@
+<!-- @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="viewIndexDetail(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="viewIndexDetail(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> -->
 </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";
+import { getRegionalGroupListAPI } from "../../api/marketSituation/marketSituation.js";
 // 响应式数据
-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 iSMT = ref(0);
+const contentHeight = ref(0);
+const headerHeight = ref(80);
+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
-	}
-])
+  {
+    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,
+  },
+]);
 
 // 计算属性
 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;
+});
+
+const getRegionalGroupList = async () => {
+  try {
+    const result = await getRegionalGroupListAPI({
+      market: marketTitle.value,
+    });
+  } catch (e) {
+    console.error("获取区域分组列表失败:", e);
+  }
+};
 
 // 页面加载时接收参数
 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) {
+    marketTitle.value = options.market;
+  }
+});
 
 // 方法
 const goBack = () => {
-	uni.navigateBack()
-}
+  uni.navigateBack();
+};
 
 // 方法：查看指数详情
 const viewIndexDetail = (item) => {
-    console.log('查看指数详情:', item.stockName)
-    // uni.showToast({
-    //     title: `查看 ${item.stockName} 详情`,
-    //     icon: 'none',
-    //     duration: 2000
-    // })
-    // 这里可以跳转到具体的指数详情页面
-    uni.navigateTo({
-        url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}`
-    })
-}
+  console.log("查看指数详情:", item.stockName);
+  // uni.showToast({
+  //     title: `查看 ${item.stockName} 详情`,
+  //     icon: 'none',
+  //     duration: 2000
+  // })
+  // 这里可以跳转到具体的指数详情页面
+  uni.navigateTo({
+    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}`,
+  });
+};
 
 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";
+  }
+};
 
 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;
 }
 
 /* 底部安全区域 */
@@ -491,4 +488,4 @@ watch(headerHeight, (newHeight) => {
 	right: 0;
 	z-index: 1000;
 } */
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/marketSituation/marketOverview.vue b/pages/marketSituation/marketOverview.vue
index b9da06d..fa68843 100644
--- a/pages/marketSituation/marketOverview.vue
+++ b/pages/marketSituation/marketOverview.vue
@@ -20,8 +20,16 @@
 
         <!-- 卡片网格 -->
         <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 v-for="(card, index) in marketSituationStore.cardData" :key="index" class="card_item">
+            <IndexCard
+              :market="card.market"
+              :stockName="card.stockName"
+              :currentPrice="card.currentPrice"
+              :changeAmount="card.changeAmount"
+              :changePercent="card.changePercent"
+              :isRising="card.isRising"
+              @click="viewIndexDetail(card, index)"
+            />
           </view>
         </view>
         <view class="warn">
@@ -41,6 +49,9 @@
 import { ref, onMounted, watch, nextTick, computed } from "vue";
 import util from "../../common/util.js";
 import IndexCard from "../../components/IndexCard.vue";
+import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
+const marketSituationStore = useMarketSituationStore();
+import { getGlobalIndexAPI } from "../../api/marketSituation/marketSituation.js";
 
 const iSMT = ref(0);
 const searchValue = ref("");
@@ -63,95 +74,7 @@ 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: "🇺🇸",
-    stockName: "道琼斯",
-    stockCode: "noCode",
-    currentPrice: "45757.90",
-    changeAmount: "-125.22",
-    changePercent: "-0.27%",
-    isRising: false,
-  },
-  {
-    flagIcon: "🇺🇸",
-    stockName: "纳斯达克",
-    stockCode: "noCode",
-    currentPrice: "22333.96",
-    changeAmount: "+125.22",
-    changePercent: "+0.47%",
-    isRising: true,
-  },
-  {
-    flagIcon: "🇺🇸",
-    stockName: "标普500",
-    stockCode: "noCode",
-    currentPrice: "6606.08",
-    changeAmount: "+125.22",
-    changePercent: "+0.27%",
-    isRising: true,
-  },
-  {
-    flagIcon: "🇨🇳",
-    stockName: "上证指数",
-    stockCode: "noCode",
-    currentPrice: "3333.96",
-    changeAmount: "+125.22",
-    changePercent: "+0.27%",
-    isRising: true,
-  },
-  {
-    flagIcon: "🇨🇳",
-    stockName: "科创50",
-    stockCode: "noCode",
-    currentPrice: "757.90",
-    changeAmount: "-25.22",
-    changePercent: "-0.27%",
-    isRising: false,
-  },
-  {
-    flagIcon: "🇭🇰",
-    stockName: "恒生指数",
-    stockCode: "noCode",
-    currentPrice: "19757.90",
-    changeAmount: "-125.22",
-    changePercent: "-0.63%",
-    isRising: false,
-  },
-  {
-    flagIcon: "🇸🇬",
-    stockName: "道琼斯",
-    stockCode: "noCode",
-    currentPrice: "3757.90",
-    changeAmount: "+85.22",
-    changePercent: "+2.31%",
-    isRising: true,
-  },
-  {
-    flagIcon: "🇲🇾",
-    stockName: "纳斯达克",
-    stockCode: "noCode",
-    currentPrice: "1657.90",
-    changeAmount: "-15.22",
-    changePercent: "-0.91%",
-    isRising: false,
-  },
-  {
-    flagIcon: "🇹🇭",
-    stockName: "标普500",
-    stockCode: "noCode",
-    currentPrice: "1457.90",
-    changeAmount: "+35.22",
-    changePercent: "+2.48%",
-    isRising: true,
-  },
-]);
+const globalIndexArray = ref([]);
 
 // 搜索输入事件
 const onSearchInput = (e) => {
@@ -216,7 +139,7 @@ const checkWarnTextOverflow = () => {
 };
 
 // 方法：查看指数详情
-const viewIndexDetail = (item) => {
+const viewIndexDetail = (item, index) => {
   console.log("查看指数详情:", item.stockName);
   // uni.showToast({
   //     title: `查看 ${item.stockName} 详情`,
@@ -225,7 +148,7 @@ const viewIndexDetail = (item) => {
   // })
   // 这里可以跳转到具体的指数详情页面
   uni.navigateTo({
-    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}`,
+    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}&index=${index}&from=marketOverview`,
   });
 };
 
@@ -236,7 +159,17 @@ const goToGlobalIndex = () => {
   });
 };
 
-onMounted(() => {
+const getGlobalIndex = async () => {
+  try {
+    const result = await getGlobalIndexAPI();
+    globalIndexArray.value = result.data;
+  } catch (e) {
+    console.log("获取全球指数失败", e);
+  }
+};
+
+onMounted(async () => {
+  await getGlobalIndex();
   // 状态栏高度
   iSMT.value = uni.getSystemInfoSync().statusBarHeight;
 
diff --git a/pages/marketSituation/marketSituation.vue b/pages/marketSituation/marketSituation.vue
index e76aa2d..af09fdf 100644
--- a/pages/marketSituation/marketSituation.vue
+++ b/pages/marketSituation/marketSituation.vue
@@ -1,593 +1,589 @@
+<!-- @format -->
+
 <template>
-	<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>
+  <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" :marketTabs="getChildMarketTabs(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="(item, index) in channelData" :key="index" :class="['country_item', selectedCountry === item.title ? 'selected' : '']" @click="selectCountry(item.title)">
+              <text class="country_text">{{ item.title }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-import { ref, onMounted, watch, nextTick, computed } from 'vue'
-import footerBar from '../../components/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高度
+import { ref, onMounted, watch, nextTick, computed } from "vue";
+import footerBar from "../../components/footerBar.vue";
+import forexMetals from "./forexMetals.vue";
+import marketOverview from "./marketOverview.vue";
+import countryMarket from "./countryMarket.vue";
+import { getAllTabsAPI } from "../../api/marketSituation/marketSituation.js";
+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('')
+const channelData = ref([{ id: 1, title: "概况" }]);
+const pageIndex = ref(0);
+const scrollToView = ref("");
 
 // 动态组件相关
 const currentChannelId = computed(() => {
-	return channelData.value[pageIndex.value]?.id || 1
-})
+  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
-	}
-})
+  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
-})
+  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 showCountryModal = ref(false);
+const selectedCountry = ref("概况");
+
+const getAllTabs = async () => {
+  try {
+    const result = await getAllTabsAPI();
+    channelData.value = result.data.map((item) => ({ ...item, id: item.id, title: item.tradeName }));
+  } catch (e) {
+    console.error("获取地区分组列表失败", e);
+  }
+};
+
+const getChildMarketTabs = (id) => {
+  return channelData.value.filter((item) => item.id === id)[0]?.children?.map((child) => child.tradeName);
+};
 
 // 搜索输入事件
 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
-}
-
-onMounted(() => {
-	// 状态栏高度
-	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()
-	})
-})
+  showCountryModal.value = false;
+};
+
+onMounted(async () => {
+  await getAllTabs();
+  // 状态栏高度
+  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;
+  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;
+  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;
+  color: #fff;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/static/marketSituation-image/country-flag/can.png b/static/marketSituation-image/country-flag/can.png
new file mode 100644
index 0000000000000000000000000000000000000000..35fd6ca6dd984bc447d4f65afc3e71abbd1dd9eb
GIT binary patch
literal 1149
zcmV-@1cLjCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px(H%UZ6R9Hu?mtRPhXBftRx29#nSYl!kX4^s9Vz7a(f{Ho_57u^4v^FB95D^U7
zY8|wsVht+XWO!0wNm1ZI2eFJ+(fR|OOv(u4E66npOPaGa60xSwxO_f8zkl!dzFS`K
zp1kk<JkRysf3L@g2<O}zz=yzU;60!ccr(6y5O@f51HS;BX7+cKtu4&RIadvQ4SWhr
z53`Sd9|k&r@64<>*P1{A&bcDsTc8n`7V+S8vwwhApvlaJvh9(TfOGC`;3r^F&VwI4
zf^+9!>((%SJ-|n1_FKAP1_9?>4e&Ei61FQ14RGcR+`kXAW`&t6PwLF9E7>rGfOGCG
zKnCH5cXvZg4UCS$&Yf`ZU>E^?7m3>Byhspm&J_c{=5+g&D^OevwY9KzEp&GJL-p?7
zJt!=MvuB~cJ{K8<qsGjXs3a5k0r)cKZ(O?ut5!jEHN;}z+@$&Z`7k)>iJdwX=8f;o
zY)67XJn8O+X8XVZl$U$A2cfwcwr>w3pz3(n%wppnaLyeAJ`Y@_Kef2C^rsKia{_Sv
zIxJuAKPIosG;cSvdW(0sen54fiT-}rzaLs#J&EMlr(5Ue!_%iwQUb~sg=yQiAgUuk
znFy%EO$JRRrSe*`1Xiqot}fWO5BBVVy?ddl$rH+k%1U_f0B+y*URb;s4juA)+_(Wt
zm%@(m&`;nq5oiM%60hX8dGp}$<J2Sc_eYLEQ4ws~l$}6b9UMLk%a&!X*NV%RVYNm{
z0!Pige0h_Cg7;H)+`Ji1oX9*RFAqvfy_>UP#tfJ_(^o?}MEuz^n4U6DZkc=X<PXZr
zOH=H1xJXPT)~taG7t(heG#87FQdO0g_#)Tu+6BjtPv!BjaG?*+%9WE91!I{6E?t5R
z8@#)w8jX#hJ~1sZT*u7y_5I1*xv9Osrw7)pgS+ZYQvkJSmGPD>>6;Ch8yUGtVPR?#
z%Ix`b*tikSpMO0DWo3RoXnthkR%RI{8@+nv>;J%k)V?2;k`C?YfCUSJRvgW2MA=L=
zT-2OK)Vv~M{d%9sD!*WiHzJ8m6?SgDr@v80iwfn@qMU+C<G4K9Fj7S*mTEL}=J-xo
zQ31olUI(c2NuKHH>+=;Pfs%VF9y7Cs2?A2ScLK-p&=Ba6>?$aj^ufi8aPnko*Bl#z
z7cYFcX3q}tm&S3Glu@!EX$C?EdCHEbPkRE=h5rpLX7-hqBok1!D9G<b-m9(66S#Uc
z@)AIj?1KrJo-Rry$E6FyMX8Q#X@T~3xTEMrf~J)8U_ze1o-CJ6kQbDE;Ru)I6MMwv
zxh^KT!?Am}4?%A)NDT!;ZvQyjH7(cGOfp?pvo8XxL*hk`bV7D0+kcE-&BkSTI-*=o
zl^5Rtp9Jd0%zf1|CG(o4d~>-blt5Bg(yr&D6}VBKtd{>5<p2JEuIK*(b)|rS|KH<e
P00000NkvXXu0mjfI20&$

literal 0
HcmV?d00001

diff --git a/static/marketSituation-image/country-flag/cn.png b/static/marketSituation-image/country-flag/cn.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9337f61c19a3a84847863da9945e6c459452895
GIT binary patch
literal 1131
zcmV-x1eE)UP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px(B}qg<R9Hu~mrZC~RTRg6=e|kiBj1zK*2G3J25N<B#I&Hhf>@>KR_aF0!h)!z
zRyVaEh!&(OA-EAuaS?P?BnHt6(S-}C*nkjpqeyCEs?8&xlbOtW@5r5G#!2SQM@;e-
zv$%84|NQSgANPNS8oxP`%_;O0Mox%oucCJbXsdNMh%3mHicApbcp4e&!CkBcTB;e%
z(0-2^eHE3{pwSY00|X_js|cU@f&W$)3%^y0QI^0BZjU=A^`<H>1CgyDY82-YL*%f}
z+Ms0-`gtM@nV{~%L2j;uS%eapqNUprXH*YyL~fLU7A5|+PwZrt`Ilno_X1jWualno
zPu#)6?^`WO2>eBRUm*GwLbCCbEKASVBdevz8c|G_!5mloPc4kiL&c1`M&;yf%>7tQ
zVw1;BTJG}1u?9)$QTAV5V(v^M-c?h6cNRe*h$`l8&}C!G5!FySuCM;F;<_jhm_2%+
zAv>GBW|Sj1O6(br)-x+Ce;s4xjTq_$1im0CK{A^U(w>iVpVB&#X63^unV|}VVKUG}
z-y!~7wI~GwQw^=}H4ZS))Sto_A4M?gqhd`As>1SE1Iy<fWHBV!oe+P`W9>VGKWe})
zU;84w+Yz|u3IsNa?pK6J<ne&ki)rec*0*Ux`D+p8-${@eHi%ZpbF)Agxl%5ks2uHJ
z?w1_ev`G%5Je#+RpYv#YVW~i1;qwHkv(ZXbUTvI|{x4ka4BY3$PPnu%3&itQEmu;+
zdOcFtqa^On;4d0(9czMY`94#7R$c1_SlcI=nCgC+q3yJaj1-*qLEATJmR_&N`_do}
z`m_wLu{aPT_`!gL2at!MaUjF$w{>JMJ4mWJ5m9|wrcLrAl>Qt6QKZ{I3Up>2Aots>
zm~KHQ%I_^`Qd+Ngq`z>;4%wou;T(jIWm?*P0(oGQ`9^Q&*DO|O>E#!#LChvWAOYgm
z5PW@m*JWCg{{Z`Hbt%{hIFAaZ$7k&WL4vCHT386z60jXx_BJU;%ywh^VwQ%-vbX~Y
zbbQ-eunxihCr}TjQ;>(0;J*^yE{hz2IXnBe>sg$N3b$Z2*jwR6Sj}zM{<lR~+=jab
zTqBTe!;(Q%qwj8*<p$CED3-rN_1<noDUY$5QVxb*Mtd7~16>&I4BY-4ft>Oc{W(m0
z?hzT!SO2h8MuqV;W0IFtd1a3RZl3hQ`yGLM)-DzZSQ&04W%b~_drV@|(YoV#nZ9X&
zZz!W{I~q)t*}I<leZ}&;ye!|zbPOj^U6$wlHstx}E~aDBSO3YdXIj}ibe01RfyvsZ
z*^4{q4*N74^n=8OybRxZI8`t4TwNIFJjzqWy0LPqC4=aQ1aiqL-%7Ss3FMva#LS?l
x)W```dqKL2igh0J4@4#;(D5iT)?VZD{9k(TqCPvMaNPg^002ovPDHLkV1iH)ASwU=

literal 0
HcmV?d00001

diff --git a/static/marketSituation-image/country-flag/global.png b/static/marketSituation-image/country-flag/global.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9a008ae7e64f237bc2e4d07f8409234f430dbbf
GIT binary patch
literal 2557
zcmV<Z2?F+sP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px;w@E}nR9HuiR|{-g)fxWIz1OcevE$gztFg1@-Sh$JBXofxNEyx43h2gbg$^hx
zY!X#k1{2a$KtpWOpmb1e8qflY286EC$|#JE(J{!QFWR)!ZId=l(j-lsI8L00U-xmQ
zbFQzOLSbCVw(NWEIp6>N-~au;3BKpG>EK6>=&-t`<AlB5nPFaBo@*`s<&Rz24vPp;
zkiw!S_V4^Gd~D|@;|HQd+85rjeDeEjP5$4a=C0;>eWT_lO;&Xs)nExtnlTkqaHcyG
zHr0t&H<myU2o9Z(;+?ipOvDoy51V2w&n#{>i{kTyknZm~<68mj?%!=AapgHp(;7jE
zL_zRHAPa}jIFOe=4FMWXp3cT2^<I?aXW)sZJ_v+h^|d)zUE{&3MIHzQiUzVn0JaiB
zX08V0ssNhLHJ1vS`aXd9>>-V6pb*d-7SIx~A(<4g_?i%6GR5(Zd<<T6LRJ9+g8x2U
z1Han>wz0lB0i_5`CX=^iTdfzq4&oaCnmhlxjDUPhfE;5nr4(_M;=)uE3Z>9k{F;WO
zN-#L&L@4CIxlShp0L5N2yjdnt0Cz0$;Qkv5IEbjMgyS)}!Q-?anGNC!02}sgFInz)
zAIY|e>BHG#2H>mE40<PLU={^rS<R4Tf>^?iu5%vbxDz;WB$qQ_FeVTICJDHGi5qc+
zAf8ZA>2rmhW>@W_E3Ii=qyeno-(+`~Cl9SCbj=q)8Eqg$za3RH9Oxf~%6?;^5dncO
z%Mc#R2GJ-qO-QfRqhpIw^b@K-!{8CXBq9)_ST?Y|E~fvQx{4b=e`$GL|CZ}3RSZOC
zQ0%n8YqLPrfc>XcTpX34suCt6HhA)<F*=X~MKfb^%mhLh`RrIGReeiJG!QzQV4}lf
zAOy0ld;1TcNCWU~YApr9*-U3bT2U8-EQF9D0m}<r=oz+P*WNr(D)K0^y)js93FH+<
zFg<NW?^!ogS-KoaDj-f2KXUfFexxKqd2pp?(bhE;XE?;-#@07(ta3iIrp5!O9q5;P
z&^B@igiwS++2}Z2$!R1ag~_78J0}8xMMwxHBN>R#SRe`%GZE9Q<5MX}L11L)j8L$T
zhMMd*Uwd%=22!@^pyQz*<qbcz+HYfqqKgQ4{p5bM4W9ut2}j$jVYABcmrUTxHXq-B
zEiGR-jNm{H=2nejY&Z*vgbh;@BH}TT<shAwS(#4BgQB+Fk@$T>VJ>NE>0Ni*;)1uG
zHuEg;0Mp4BUTkT@`DiyRk_M9r=<3YJxz2oUIE)>8W*mwv02+`?N-$YeNG1xWCyDW3
z21H4L)vh8Ov_PXmN{l*5Y`<skF1e3Ts_q2H!<W@-2#2Dnbp+4sK92(51pITu$jVAU
zQ%tzf?M8RETQ?g@K$*OG*)YWuSnV?08CKjn-;J4shJDAzF_TcZK=u0IB?iC8yo*q(
z9Ro;>&JBApMeED9eRL5!_FvM|0uANmA<UaUgyScC80vT7hU+dN6pv$i+6=2T3CWVc
zP~RNbsT+GXEr8cyfj|j5E=KUehl8-22wJ+P5lwR2WPpy7y+?x~M~39SsmjG^H2|=H
z?)}qOICyS`M^~I{MNM%ghLj<gEeaOod!acx@Ktb(7oV<ofNCuL0x~2MEP@H^7py>C
zVTB$vC_0Cuxa;KrCSwc)2^0V3Hq~wxgqEjkkZG0BI~s-AMBsDT5V$mhr{3*BU{LQP
z)kT?Dwa9_#go-B{itu4yJKj6{WlC@?6^5(mj=(Mv0&ezI<3`^+ROJ-%G;H0|ji#0n
zmNAX^H@B(`vO80PRU)`FE@SO-FSgxN0wM?)k1E*mb{{?qjPMxUnI>#qTZFYsa&c<B
z2hX+aO|h1;B2I%2h7qcR(w+6*$~xRxQH$q4=*4TF2Ep=A{EaPRfN+KP+pQuVxFHXc
zK+rQ1MSFJ?p~(d2cyq%XY+hA_xE9BWi2!ySY-K%{yC4%5J5)<CVF2JB0$^=LEgJkw
zvHB0EFfg8A$i|4jv6YLE`#xpcq+lBnq*<lB_zSX4xc~Y*xV;gWofok?a8{?A>L$z@
zx6Xd58FO5^`E00Ijn_Yn<7jWx5c+ZAYi!#|fQO9|;ziAQyX@meZcU;9nKcJWu)aPM
z{<2Pd(%T23vC7dn1BMV75EhhR#6t)gifU2gs>Cb*3gXjK6AbDuQry_Kj)K0;F%vdC
zXsL!`Bv7x6xw#hXeS9G<jKnZHEn`JhCieAyiuccTLRO3-W+`C#W)U++2zX~D6c)*X
z^`*DKm*Iu15^UUc0l`S}K5oTHK^tLfjQZDGG5copHo)h#VB5M9SR{hV!YnANhA##?
zaD4m}E=|P{oQ(5>^oaSxoD8!lVX3DI^@Z2K3MpMFe?Ab3eSBm*Kh=!d-vG3S^kQZd
zi$><tpIjXr88F9X<tDRoK?ZJKqM~iE3;*ux)EidH6L=L6;Af@vnCI|aVZ-d+*&+GO
zpDfGYpaa<4K95p*l29t~6FCT72OLwnp7eBNSOo0*^+L>bTlpz5Sw<k-k5@ZBK}3$F
z#H_QoWx<_rneAx+shL1gHL+@;Kf8O@K+^sq1^tyiy%-aXLBQ;~Vs{1j-DbS<Kq+d9
zvr<+~@b|7mc(<!P{WzN)?=M@0>a5($OzK;0uP$;wez{fv6m4m<RpvR4PE04NLsJR8
zxfmsNm8#geu^hKl=cGn4z0WsywqsA%p;Wses4HBApB67gJR$2$GF^b2mQ8Z)HTn76
zUT4otn25(qqj7ThjnBt&-umn!WQF;4+RkR_g5a@R3vkC$Z#qRb`vhJ%vL6Fe5x%Y6
z?7?4F-p$RpFF2`-5(rD0xU8Z$J3XFX0f3WF>9Ub2`QzvRF_g3S@WADg)PpqU8$Hjd
zp|xy|hF{z@hCQdcp;7^H&5M_BT8$E?6Ele<2FF-KLs+G>VS(TC?PIwSVw}>Fza5_X
z;Mw;A)rz8m2m}lLc9eK+I3J85&>!WFX*8T$mdPlt=)sBM2}~vnaL?RpQ9s8Ei&;W6
zCNrx(ZKC3B<^Jq%{7w4?0|tnu6V(3fTL+&L1-j{vKQEIS7U}~CyZ(7{42@0QNGiHv
zJaT&s{q!s@jJxpYyz4OE;WXN_q7mWc2%X+q=kxI~{Oi}Z0x%Z7)fy~azufa1K_K@6
zu%*(3-+j=Bo&O2)`SG_Kr|^Ey5LOl}MSWgAE8YYMc}G;}3l%@`oVnV;U#qY0TB6^h
zlsW*c0knERSR73%{<y5Vx`v_{6FMWWogVIetfKaqFT;F5iVOS7%iZ7W@A>}#_}Dc{
TvyEq&00000NkvXXu0mjf{VBdT

literal 0
HcmV?d00001

diff --git a/static/marketSituation-image/country-flag/hk.png b/static/marketSituation-image/country-flag/hk.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc6c3521d2018fc0733cc42b5494fe0b4bd3f7ef
GIT binary patch
literal 1722
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
Q+yDRo07*qoM6N<$f-nd^MF0Q*

literal 0
HcmV?d00001

diff --git a/static/marketSituation-image/country-flag/my.png b/static/marketSituation-image/country-flag/my.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f1907f7f52ca38f34767f26139a57a605d052ae
GIT binary patch
literal 1783
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
Z{|{H=c}cs>V%z`#002ovPDHLkV1ir{U+w?^

literal 0
HcmV?d00001

diff --git a/static/marketSituation-image/country-flag/sg.png b/static/marketSituation-image/country-flag/sg.png
new file mode 100644
index 0000000000000000000000000000000000000000..18f5dbab3803878c97ab548b3cd68664c1293897
GIT binary patch
literal 1165
zcmV;81akX{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px(M@d9MR9HvFmtRa%R~*N`ze`&!?TG7eFrCbZBrOWMWfiECWW*(q5VuSd32ttT
zJ?urCIwBK&*y>D{v6*GBlRYfU<`!clE^&MCZGy02BvhE-vOma_0%a|XYVW<j<s4{j
zDaa)hc3#?h@9)p&{Lb(E&hHQmj**Q;8M;ZS1fdMT(*V{3ST&_iqX7R2;2Id06;;3Z
zSpU_a5z{oE&~RR{3yN0HW^*+n+6pMjd@ADmBr$)ZnUoK*y06@Nn8KU@e?3`ZeY9b}
z*Ro~nK~q7#>3(ZF!rxs$r2QJ8=|&)gj0)g0%{*};yQ^zrHl<ks?s_V6SDkEVu{>Xz
zuMPf<U|j>W8#hI$0oIYW*$J(?7a&8?5Pp5Ss_x3_>-cRZL=wR8CXYM)Xx%02t9u<B
z3?Z=RHRuC(VtVH7Ze%oh@z0wFp!)iZMncGql1Am3H?MTWD<uGo<+(R#Icqx{Kb~`l
zwI26=gz(qrr_$^Z8#pupC3`hY&W(s%_kjaJkUbqd{;yGxQ9VN2vicw7MGW9hVWBN8
zVr#e7ROQ?1>i|{7$o2~9)bc_pR_>~hK>E;V%$c(83D_GCWAe+hi2U@kQ3zi+1oygu
z)=4?BsFvSV@(F-L_EX2O@}){>1A_?cd>JAV=F%cqb`)dc<mtq9C%}HHQ6{I_*=-a6
zApUsujkb4U0CzWgautnx0hk^D+(uyMZV7-i1z-UBjO-WhRc%U!g@ECqlFEgdeQiB5
z0>jSYW+ti;|E)DukV~Lx81a<LC5Vo+r`AII<M#9;Ls^preQ?OI*M#I_{vxxt?G2I@
z&a8+uw+aDa)bYbPIqUKFK1BHJ1*vCxwgC3y^$5NDKD3^Gn73_#?daPGHF}}-ChaaG
zQ1_IG{y6!aCDkB&6|a$g<SnGv?gs~h2<&-XZbLD9OW6*D&wmdd3n49M4J_ql2!GoG
z9y3&Rlc5;<$nPro96)WtS0dPsAA+@NH$)){9Xtlr_bWhgyH>2Zc#i%WnRBwt83FJM
zfM=4vF~j_v8`f9$!o0Nr_gk+{m*VR(KT<S0$?x*`0nVJ$U^Kf;3J{sj_!N1U)p01#
zEv93*sHe`iw4@VjGM@h<0P_d{M~Y`=)Z8#J^Xy4z)WqWCIt4)THe8(1g=n7<0M$TZ
zAzFxqMau3I02u&8L0_>*V+&Om$8okSZOq&ZKpsZRIGTy5HVWVZ&?U~CWdab*s*{Lr
z#fm#KHvu@ZOaP~e=&<k=4<L?X(J*dWVhA6AA|jHFMnY4{%((#Cm#{F2hSE($u?8Zk
zEoWvofJ;jNA)J>J(cEo$H1y280YFO%mqUd8MUiwfmv_#q88h1ecmW((#O@H;{waVH
zL?qjA!vJy75P8uEpeouo8c5Q6)77<!h<Y9-Kkw~04n$PUN+5PU&xy;EF#x~I>p5^4
fz(pc5)F}Q3{?(98rWlRC00000NkvXXu0mjfAC@5X

literal 0
HcmV?d00001

diff --git a/static/marketSituation-image/country-flag/th.png b/static/marketSituation-image/country-flag/th.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad615360dbe6c663706360925de23ba9fbccd893
GIT binary patch
literal 703
zcmV;w0zmzVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%c}YY;R9HvNS3zqNVHBL%CX^USB}x;aN@*Ig3W7rI#gkG{P<xen(wsbqwAzcB
zQ}JX~)QbnLcqn)^dhj6q0WDS(O2twsTCk~hu_ZBtB>QAT6VjMucbl&!d)=9N!~4G7
zH;=IS%=`U5P26WG+DU;NCC~|A*9Kh|;2XgYLSxck=1o}F*X>Bt3beR;Z;#|;M1Vm6
ztycJr_bCD|vtrx{udOW9;#4*8y`#gENn}R>Tm#^;S-2dQCFHTE713Zko~)!%(ZGCL
zdq|@eBXDSog*VX%%w|N+A6ScjE!X?Uz=AK>OAT)U_*E1y(a^=f>CpP}bgAwp10vG(
z=iTJABoeBN=WEjI)pzutI!>~9FNy|4#0y{wirQYId$Ry~Nv86q3P2IL4`4`f+pEdl
zBYC4}Ktw_SKG$*Eo%+rKI6`tR-vJRB2XM)$N}c%UBrmh?%p>2G$cbfF3q5rTI-=)t
zk{-GnYbV0dK?o)su~mVIi$wSBrvM|WG@a?lGt<C(fXAE>RiR~u=#Ksbut$}oLmk~T
zkOQDOB&vcNO<`bl8wQWv4*hC|OW5eou+cvv^H+RxxPL{{XgBZKJ>Qx*BWI+ZyqF0#
zau|)1j1&y?0QmHu$MHck8I=Z-F#y+<^w(PC0m<R=L}ZR*GcX>u=GTQVBUvBGd`vG7
zrJ>}j*He;AZd)kz4xBUdU@@LIS1d0y_Dfr!%T2~a(Q%lINmh)3N^4rx)$C&+;Ps_3
zD&W;Rz78{dK6LMNMfWW&<zsmHW4WA~YnqGNEdee7u$vpx1SZ(RvCh>WbG5FlrGWyu
l!g{{HWQzV4U~wz!`Co8h<nF8hwE6%5002ovPDHLkV1o01MWO%z

literal 0
HcmV?d00001

diff --git a/static/marketSituation-image/country-flag/us.png b/static/marketSituation-image/country-flag/us.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c20fee1d7c589cc9d2010095e080ef1974855a2
GIT binary patch
literal 1430
zcmV;H1!?+;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px)P)S5VR9Hu?muqZPRS?I2bMM}J_t9=)mu>+8+ilAV5&;zmA_$d;lB$W1STTlR
z{o(@<l_(+V2SlUth>-|UsX#<X{GcIf#DL-}fnp0m>Z$~+D54Y!qP36Rdycsat)R4B
z+MZ9Fz4M>>pP4!H5VAZaC3C|q$9&~9wUqs!*N*k6bRp31EW8mo4D8X!CpPZ;0;jW4
zE!_!4d1Qn()WW;&OUw!eO=r{Uy?n3MVX3yRpv@w(Su1y`9}adU*eQV_EC{qYZA-*p
zekd67<@8seq4DV7)GUl)nW{VPU>Iq0#tpB8ub%jnh%{XYa6tm2N){F$txs=3GxDxE
z3F4(uo?rB3hJX`v`LS^&w&m-dK)Zxc2izhehyDxtAAu+jj&pMS9|dxW6c$DJcHc>$
zh5T5U+_1&rL&r((UxZ_s*%JV?QjMtt-`yCRI(_%K!1D-{4tpSe;)t_bv>Tar^Q8<=
zM0jmQE!q`sxx18TB*dmQ)$C_Ie${$W1lp6;uk?61Coeh(6!3T`Ww_NN#so%QJ2k=D
zS8C9%X8e@F#D_=O^!h#o!EdyZG}dFgT_#~y<mw!y#|bohLLCGm#{3nIUlt4+W;3j)
zAD?gi6~Eu1FcBu)-{R{pj^gu~_;A^?v>40R?E~tRgb|M~50~Hkcn5))Gq-s3gvfWd
zSB&*N^XLxJDb2K*1DP<Xh!>vTiAuxm_m&bX2(fO>*BokCfo)qo2|+t14O}52$;>qp
zmn^7K+MJV<<D>r22?_?~0SeO;j{V+3US1HNqY?3Os^K)r9hKO<@PKDi|JC$nX!7Ly
z<iLRw;o3cWew#P@{Xn`EZn~|IX*a}q;=yfbEzG+AatcdwdG5)tK$`@lnL62k)AJn2
zctN1m)+#0ifhT5Z-Mlf}UomR*P<DNB6y++S1wv7AJ~ca!qqSyeJV0L9Cb|0<2Xz&;
z>v^$v$3X6ph%x^S5h_QIk21Mz2&-P$=RH~`PajHQX_yUbz5!)1^Nu0phHbXI{VjV}
zU4vuv&bWs*a&p$nbrYYhnLeZN%2hA!BHd;(>gq64%M!f0d?#*Nm~?$U#fg00TAj><
z#0sXUZ&-$Pk%g!ey0tQ<ba6xJh<*dMeee^Zpr6=an}I`o?Aq}M{-DXwqFi$G4EFA9
zz-JkVC~Dum70c}TGwdLvRig|H%yUz%${0Io0C&&6iYFi1j!G$}mJjCIDJ3jj^cgCp
zxwA4sEEc5drD_i7bvSOS_b~t^5%Xc!Yg^Hnjpb;5`=uol^XMQOpOxnKpVOc<`GYOQ
z^wD(WFOqtFrXBZz50t$3PW1`Hl!#|Ud&O2VP4BGoe}8%3z1o1ZFhw<BqcFU`dUKR}
zT(nj-z?IqRIYX%r?taE#t(@Mv^$p$hXJxho`ch6pfwj_VnzKM}>`TSj>ymp!L%7Yf
zj{#2hz&?>|w%xXYnP4`3_+gci7oO86YO_?LPM)d?m6um$2xzTG0Q-Q881%BVbYU^C
zkz6Js2RqWa<<srU+@I<n>y_Fp!DhT@rGHA<qi4I~8I*=V%3!y^<yq?Kk(h=$OEEzp
zGp3*Spj)8W5VIPH^hkU6phl(Laen9+&;M6Zj&I&P&c15QM;J!ml2EF#t!D3y11c&y
zAIsY>ptX)GrMGBQpM*n@I>Rt-^^)$tPU^I#YOO=9$#0gpTR)zQQayVe-fA}Urk9=J
zBfZruGlpkPpu-zD#ftP|paKYVALfjNx3z3EFqa8!$*wS2cNMQ<x==0{Wx!Zq*g461
k3aCG`o~utx$a+2h2dbmY>`l}VQ~&?~07*qoM6N<$f(O&S>;M1&

literal 0
HcmV?d00001

diff --git a/static/marketSituation-image/country-flag/vi.png b/static/marketSituation-image/country-flag/vi.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c52706f969a04b0977f3cdb495511b390eef43f
GIT binary patch
literal 1132
zcmV-y1e5!TP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px(CP_p=R9HvNS4(UgRTMpU#&P^fT*r!?G{hllY&WGM2v7<_-L!02pmqg?h7Ckr
zBGjLtLPbJV7oZk|SfEO@U7(0aED%u_2=S3vfRu`sRsuV*Q?+pvrwN%jspIc>9(ohU
zotUxxrtN~avgh4<-kJN(eRCc`aKu9)k4pKMiD*9<o(9klz*|XI0L+4LoiX;ajXAD_
z6NxnuXlfQT9e#Y52JIw(!vI>F#aHHY0LEp8v*AQ?rcq8^0?FQ9XVyVy7~vfNHo=8!
z!&FB2yyz&Ne(L7kbu$c80`X9AKqX8N@WcZyyd{l*zX)_75}&<Qi}xP_Q<2~>WB49`
z?@=snz)*<r($4ARRU_^e0@LBX9U2%95L%pMfR!!LRAh!dMqN}1+!*R|+jI6w(X!k8
zWw>6*W9>V)B?f#uTsbxzoSWl9MU_A_68wZ1j*6mrM>1&JpTpd!Uo@o}M-1n8CXy$r
z1i0wRgqRhz_l+;YF;v9N-X4?{$tnr81Zn8W_?@U;fmk?r3Ba48C@qhv*zscukb%1&
zbRa$6CYoxDyF3_AzD4|mD^p<sfKwF3cVrFzldF1ocCr=8Hv*!m#<+sa)&mp`_Z}wD
zm=%Qni3PL{mNrr}U}j$r)Rb%mLXTx&BNU4SzXZdmF`Jjzb1-X==>1vAslj*T-j=z{
z4^HHxc2fem>vm*+bC{DOT%=ey_y>SzY9m~G3h4fL87)258hsOo6$ne`w_)Y0cA!4Q
zHBMj&K&Kf+$*m!9DvfQgteaM&Ud{72>`0yRp_piCwk--L!1*=oqqY}w==yL4wm{=*
zuo7YU3lEeF?cl!!h9*RS1Ib<u!OM$i-CYr14LUFR?4bbif17Ke4jG-mve4O2z`!r_
zu+`H918yJaMq#RH*^ONOsVl--#?EI8==*xHVO5n29$k1A#x>J6Gy~uo@V=hem}0=n
zSQ`p4I|A>fA+>Az<I=nhxAtw<=Y<AuLy?1sYzzaxrXY8gQA){Jc+ZFI?;E|{vRy^@
zM+#ie7xe$LuXZ8#r<e}(gQ#*8^V-(+d+xn?^j=)T>bGtzp7lbzSJN~Ebc|%sc_NL~
zZ+J|HNC9#(TkjV782OK{>Ti|#sqyE+-mk)cERFf2ogzl%(qKF}suQR<-<$P5$C8sl
z%L(;0xJ!b}z={pyRheOsJELmUR490k5sr)0?qOpX;nQ8y$zvR+N<g>aPP)o~-4DA!
zqkL}3^3LLOn>Kw*ohr^~Qs`iMFqVo08aCSV|CcS_d?{|v8Q8?5+74cJiQ%BxHLb2x
zb(@~IpCN{~t(euCol%M5GgqFS-n8MhJJ+<gD!O<dz-tzKBR>|$BuM8X@jKBbq7+k8
yJmmAJ<T75*`wU`D1Gs(vdY-)!PAEdx^M3*3cZbN)we*+(0000<MNUMnLSTXqjTk5Z

literal 0
HcmV?d00001

diff --git a/stores/modules/marketSituation.js b/stores/modules/marketSituation.js
new file mode 100644
index 0000000..1f85660
--- /dev/null
+++ b/stores/modules/marketSituation.js
@@ -0,0 +1,78 @@
+/** @format */
+
+import { defineStore } from "pinia";
+import { ref } from "vue";
+// 定义 Store
+export const useMarketSituationStore = defineStore(
+  "marketSituation",
+  () => {
+    const cardData = ref([
+      {
+        market: "usa",
+        stockName: "道琼斯",
+        stockCode: "noCode",
+        currentPrice: "45757.90",
+        changeAmount: "-125.22",
+        changePercent: "-0.27%",
+        isRising: false,
+      },
+      {
+        market: "usa",
+        stockName: "纳斯达克",
+        stockCode: "noCode",
+        currentPrice: "22333.96",
+        changeAmount: "+125.22",
+        changePercent: "+0.47%",
+        isRising: true,
+      },
+      {
+        market: "usa",
+        stockName: "标普500",
+        stockCode: "noCode",
+        currentPrice: "6606.08",
+        changeAmount: "+125.22",
+        changePercent: "+0.27%",
+        isRising: true,
+      },
+      {
+        market: "cn",
+        stockName: "上证指数",
+        stockCode: "noCode",
+        currentPrice: "3333.96",
+        changeAmount: "+125.22",
+        changePercent: "+0.27%",
+        isRising: true,
+      },
+      {
+        market: "cn",
+        stockName: "科创50",
+        stockCode: "noCode",
+        currentPrice: "757.90",
+        changeAmount: "-25.22",
+        changePercent: "-0.27%",
+        isRising: false,
+      },
+    ]);
+
+    // 记得 return
+    return {
+        cardData
+    };
+  },
+  // TODO: 持久化
+  {
+    // 网页端持久化
+    // persist: true,
+    // 小程序端持久化
+    persist: {
+      storage: {
+        getItem(key) {
+          return uni.getStorageSync(key);
+        },
+        setItem(key, value) {
+          uni.setStorageSync(key, value);
+        },
+      },
+    },
+  }
+);