diff --git a/api/setting/share.js b/api/setting/share.js
new file mode 100644
index 0000000..e7806cc
--- /dev/null
+++ b/api/setting/share.js
@@ -0,0 +1,15 @@
+import { http } from '../../utils/http'
+
+
+/**
+ * 分享接口获取dccode
+ * @param data
+ * @returns {*}
+ */
+export const Share = (data) => {
+    return http({
+        method: 'POST',
+        url: '/api/my/share',
+        data: data,
+    })
+}
diff --git a/api/tcpConnection.js b/api/tcpConnection.js
index c701ca3..1f55776 100644
--- a/api/tcpConnection.js
+++ b/api/tcpConnection.js
@@ -21,33 +21,33 @@ const TCP_CONFIG = {
  * TCP连接管理类
  */
 class TCPConnection {
-    constructor() {
-        this.channelConnections = new Map(); // 存储每个channel的连接状态
-        this.connectionCallbacks = [];
-        this.messageCallbacks = [];
-    }
+  constructor() {
+    this.channelConnections = new Map(); // 存储每个channel的连接状态
+    this.connectionCallbacks = [];
+    this.messageCallbacks = [];
+  }
 
-    /**
-     * TCP初始化连接
-     * @param {Object} config - 连接配置 {ip, port, channel, charsetname}
-     * @param {Function} callback - 连接状态回调函数
-     */
-    connect(config = {}, callback = null) {
-        const channel = config.channel || TCP_CONFIG.channel;
-        
-        // 如果该channel已经连接，先断开现有连接
-        if (this.channelConnections.get(channel)) {
-            console.log(`检测到channel ${channel}现有TCP连接，先断开...`);
-            this.disconnect(config);
-            // 等待断开完成后再连接
-            setTimeout(() => {
-                this._performConnect(config, callback);
-            }, 300);
-        } else {
-            // 直接连接
-            this._performConnect(config, callback);
-        }
+  /**
+   * TCP初始化连接
+   * @param {Object} config - 连接配置 {ip, port, channel, charsetname}
+   * @param {Function} callback - 连接状态回调函数
+   */
+  connect(config = {}, callback = null) {
+    const channel = config.channel || TCP_CONFIG.channel;
+
+    // 如果该channel已经连接，先断开现有连接
+    if (this.channelConnections.get(channel)) {
+      console.log(`检测到channel ${channel}现有TCP连接，先断开...`);
+      this.disconnect(config);
+      // 等待断开完成后再连接
+      setTimeout(() => {
+        this._performConnect(config, callback);
+      }, 300);
+    } else {
+      // 直接连接
+      this._performConnect(config, callback);
     }
+  }
 
   /**
    * 执行TCP连接
@@ -66,33 +66,31 @@ class TCPConnection {
       connectionConfig.charsetname = config.charsetname || TCP_CONFIG.charsetname;
     }
 
-        console.log('开始建立TCP连接:', connectionConfig);
-        TCPSocket.connect(
-            connectionConfig,
-            result => {
-                /**
-                 * status : 0 连接成功
-                 * status : 1 断开连接
-                 * receivedMsg : 服务器返回字符串(普通的字符串交互)
-                 * receivedHexMsg : 服务器返回字节数组(单片机、智能家居等硬件数据交互)
-                 */
-                if (result.status == '0') {
-                    // TCP连接成功
-                    this.channelConnections.set(connectionConfig.channel, true);
-                    console.log(`TCP连接成功 - Channel ${connectionConfig.channel}`);
-                    this._notifyConnectionCallbacks('connected', result, connectionConfig.channel);
-                } else if (result.status == '1') {
-                    // TCP断开连接
-                    this.channelConnections.set(connectionConfig.channel, false);
-                    console.log(`TCP断开连接 - Channel ${connectionConfig.channel}`);
-                    this._notifyConnectionCallbacks('disconnected', result, connectionConfig.channel);
-                }
+    console.log("开始建立TCP连接:", connectionConfig);
+    TCPSocket.connect(connectionConfig, (result) => {
+      /**
+       * status : 0 连接成功
+       * status : 1 断开连接
+       * receivedMsg : 服务器返回字符串(普通的字符串交互)
+       * receivedHexMsg : 服务器返回字节数组(单片机、智能家居等硬件数据交互)
+       */
+      if (result.status == "0") {
+        // TCP连接成功
+        this.channelConnections.set(connectionConfig.channel, true);
+        console.log(`TCP连接成功 - Channel ${connectionConfig.channel}`);
+        this._notifyConnectionCallbacks("connected", result, connectionConfig.channel);
+      } else if (result.status == "1") {
+        // TCP断开连接
+        this.channelConnections.set(connectionConfig.channel, false);
+        console.log(`TCP断开连接 - Channel ${connectionConfig.channel}`);
+        this._notifyConnectionCallbacks("disconnected", result, connectionConfig.channel);
+      }
 
-                if (result.receivedMsg) {
-                    // 服务器返回字符串
-                    console.log('收到字符串消息:', result.receivedMsg);
-                    this._notifyMessageCallbacks('string', result.receivedMsg, null, connectionConfig.channel);
-                }
+      if (result.receivedMsg) {
+        // 服务器返回字符串
+        console.log("收到字符串消息:", result.receivedMsg);
+        this._notifyMessageCallbacks("string", result.receivedMsg, null, connectionConfig.channel);
+      }
 
       // if (result.receivedHexMsg) {
       //     // 硬件服务器返回16进制数据
@@ -115,18 +113,18 @@ class TCPConnection {
     });
   }
 
-    /**
-     * TCP发送消息(普通的字符串交互)
-     * @param {String|Object} message - 要发送的消息，如果是对象会自动转换为JSON字符串
-     * @param {Object} config - 发送配置 {channel, charsetname}
-     */
-    send(message, config = {}) {
-        const channel = config.channel || '1';
-        
-        if (!this.channelConnections.get(channel)) {
-            console.warn(`TCP Channel ${channel}未连接，无法发送消息`);
-            return false;
-        }
+  /**
+   * TCP发送消息(普通的字符串交互)
+   * @param {String|Object} message - 要发送的消息，如果是对象会自动转换为JSON字符串
+   * @param {Object} config - 发送配置 {channel, charsetname}
+   */
+  send(message, config = {}) {
+    const channel = config.channel || "1";
+
+    if (!this.channelConnections.get(channel)) {
+      console.warn(`TCP Channel ${channel}未连接，无法发送消息`);
+      return false;
+    }
 
     // 如果message是对象，转换为JSON字符串
     let messageStr = message;
@@ -149,20 +147,20 @@ class TCPConnection {
     return true;
   }
 
-    /**
-     * TCP断开连接
-     * @param {Object} config - 断开配置 {channel}
-     */
-    disconnect(config = {}) {
-        const channel = config.channel || TCP_CONFIG.channel;
-        const disconnectConfig = {
-            channel: channel
-        };
+  /**
+   * TCP断开连接
+   * @param {Object} config - 断开配置 {channel}
+   */
+  disconnect(config = {}) {
+    const channel = config.channel || TCP_CONFIG.channel;
+    const disconnectConfig = {
+      channel: channel,
+    };
 
-        TCPSocket.disconnect(disconnectConfig);
-        this.channelConnections.set(channel, false);
-        console.log(`TCP连接已断开 - Channel ${channel}`, disconnectConfig);
-    }
+    TCPSocket.disconnect(disconnectConfig);
+    this.channelConnections.set(channel, false);
+    console.log(`TCP连接已断开 - Channel ${channel}`, disconnectConfig);
+  }
 
   /**
    * 添加连接状态监听器
@@ -206,50 +204,50 @@ class TCPConnection {
     }
   }
 
-    /**
-     * 获取连接状态
-     * @param {String} channel - 要检查的channel，如果不指定则返回所有channel的连接状态
-     * @returns {Boolean|Object} 连接状态
-     */
-    getConnectionStatus(channel = null) {
-        if (channel) {
-            return this.channelConnections.get(channel) || false;
-        }
-        // 返回所有channel的连接状态
-        const allConnections = {};
-        for (const [ch, status] of this.channelConnections) {
-            allConnections[ch] = status;
-        }
-        return allConnections;
+  /**
+   * 获取连接状态
+   * @param {String} channel - 要检查的channel，如果不指定则返回所有channel的连接状态
+   * @returns {Boolean|Object} 连接状态
+   */
+  getConnectionStatus(channel = null) {
+    if (channel) {
+      return this.channelConnections.get(channel) || false;
     }
-
-    /**
-     * 通知连接状态回调
-     * @private
-     */
-    _notifyConnectionCallbacks(status, result, channel) {
-        this.connectionCallbacks.forEach(callback => {
-            try {
-                callback(status, result, channel);
-            } catch (error) {
-                console.error('连接状态回调执行错误:', error);
-            }
-        });
+    // 返回所有channel的连接状态
+    const allConnections = {};
+    for (const [ch, status] of this.channelConnections) {
+      allConnections[ch] = status;
     }
+    return allConnections;
+  }
 
-    /**
-     * 通知消息回调
-     * @private
-     */
-    _notifyMessageCallbacks(type, message, parsedArray = null, channel = null) {
-        this.messageCallbacks.forEach(callback => {
-            try {
-                callback(type, message, parsedArray, channel);
-            } catch (error) {
-                console.error('消息回调执行错误:', error);
-            }
-        });
-    }
+  /**
+   * 通知连接状态回调
+   * @private
+   */
+  _notifyConnectionCallbacks(status, result, channel) {
+    this.connectionCallbacks.forEach((callback) => {
+      try {
+        callback(status, result, channel);
+      } catch (error) {
+        console.error("连接状态回调执行错误:", error);
+      }
+    });
+  }
+
+  /**
+   * 通知消息回调
+   * @private
+   */
+  _notifyMessageCallbacks(type, message, parsedArray = null, channel = null) {
+    this.messageCallbacks.forEach((callback) => {
+      try {
+        callback(type, message, parsedArray, channel);
+      } catch (error) {
+        console.error("消息回调执行错误:", error);
+      }
+    });
+  }
 }
 
 // 创建TCP连接实例
diff --git a/components/IndexCard.vue b/components/IndexCard.vue
index ad1ae69..69a3de3 100644
--- a/components/IndexCard.vue
+++ b/components/IndexCard.vue
@@ -64,7 +64,6 @@ const props = defineProps({
 });
 
 const getMarketFlag = (market) => {
-  console.log("market", market);
   let imagePath;
 
   if (market === "cn") {
@@ -86,8 +85,6 @@ const getMarketFlag = (market) => {
   } else {
     imagePath = "/static/marketSituation-image/country-flag/global.png";
   }
-
-  console.log("返回的图片路径:", imagePath);
   return imagePath;
 };
 
diff --git a/components/MarketOverview.vue b/components/MarketOverview.vue
index c5f56a1..31c04df 100644
--- a/components/MarketOverview.vue
+++ b/components/MarketOverview.vue
@@ -47,7 +47,7 @@
                 <text class="analysis-dot blue"></text>
                 <text class="analysis-text">市场风险评级: 需警惕潜在风险</text>
               </view>
-              <view class="analysis-item">
+              <view class="analysis-item" @click="goToMorningAnalysis">
                 <text class="analysis-dot green"></text>
                 <text class="analysis-text">早盘解析: 今日高开, 芯片、稀土、公共</text>
               </view>
@@ -142,6 +142,12 @@ export default {
     }
   },
   methods: {
+    // 跳转到早盘解析页面
+    goToMorningAnalysis() {
+      uni.navigateTo({
+        url: '/pages/morningMarketAnalysis/morningMarketAnalysis'
+      })
+    },
     showMarketSelector() {
       // 切换显示外汇市场内容
       this.showForexMarket = !this.showForexMarket;
diff --git a/components/SharePopup.vue b/components/SharePopup.vue
new file mode 100644
index 0000000..f335949
--- /dev/null
+++ b/components/SharePopup.vue
@@ -0,0 +1,190 @@
+<!--自定义分享弹窗 使用uni的更改-->
+<template>
+  <view class="uni-popup-share">
+<!--    <view class="uni-share-title">-->
+<!--      <text class="uni-share-title-text">{{ shareTitleText }}</text>-->
+<!--    </view>-->
+    <view class="uni-share-content">
+      <view class="uni-share-content-box">
+        <view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index"
+              @click.stop="select(item,index)">
+          <image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+          <text class="uni-share-text">{{ item.text }}</text>
+        </view>
+
+      </view>
+    </view>
+    <view class="uni-share-button-box">
+      <button class="uni-share-button" @click="close">{{ cancelText }}</button>
+    </view>
+  </view>
+</template>
+
+<script>
+import popup from '../uni_modules/uni-popup/components/uni-popup/popup.js'
+// import popup from '../uni-popup/popup.js'
+import {initVueI18n} from '@dcloudio/uni-i18n'
+import messages from '../uni_modules/uni-popup/components/uni-popup/i18n/index.js'
+
+const {t} = initVueI18n(messages)
+export default {
+  name: 'SharePopup',
+  mixins: [popup],
+  emits: ['select'],
+  props: {
+    title: {
+      type: String,
+      default: ''
+    },
+    beforeClose: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      bottomData: [{
+        text: 'WhatsApp',
+        icon: '/static/my/share/WhatsApp.png',
+        name: 'WhatsApp'
+      },
+        {
+          text: 'Line',
+          icon: '/static/my/share/Line.png',
+          name: 'Line'
+        },
+        {
+          text: 'KakaoTalk',
+          icon: '/static/my/share/KakaoTalk.png',
+          name: 'KakaoTalk'
+        },
+        {
+          text: 'WeChat',
+          icon: '/static/my/share/WeChat.png',
+          name: 'WeChat'
+        },
+        {
+        	text: '复制链接',
+        	icon: '/static/my/share/share.png',
+        	name: '复制链接'
+        },
+      ]
+    }
+  },
+  created() {
+  },
+  computed: {
+    cancelText() {
+      return t("uni-popup.cancel")
+    },
+    shareTitleText() {
+      return this.title || t("uni-popup.shareTitle")
+    }
+  },
+  methods: {
+    /**
+     * 选择内容
+     */
+    select(item, index) {
+      this.$emit('select', {
+        item,
+        index
+      })
+      // this.close()
+
+    },
+    /**
+     * 关闭窗口
+     */
+    close() {
+      if (this.beforeClose) return
+      this.popup.close()
+    }
+  }
+}
+</script>
+<style lang="scss">
+.uni-popup-share {
+  background-color: #fff;
+  border-top-left-radius: 11px;
+  border-top-right-radius: 11px;
+}
+
+.uni-share-title {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  height: 40px;
+}
+
+.uni-share-title-text {
+  font-size: 14px;
+  color: #666;
+}
+
+.uni-share-content {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  justify-content: center;
+  padding-top: 10px;
+}
+
+.uni-share-content-box {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  flex-wrap: wrap;
+  width: 360px;
+}
+
+.uni-share-content-item {
+  width: 72px;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+  justify-content: center;
+  padding: 10px 0;
+  align-items: center;
+}
+
+.uni-share-content-item:active {
+  background-color: #f5f5f5;
+}
+
+.uni-share-image {
+  width: 42px;
+  height: 42px;
+}
+
+.uni-share-text {
+  margin-top: 10px;
+  font-size: 14px;
+  color: #3B4144;
+}
+
+.uni-share-button-box {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  padding: 10px 15px;
+}
+
+.uni-share-button {
+  flex: 1;
+  border-radius: 50px;
+  color: #666;
+  font-size: 16px;
+}
+
+.uni-share-button::after {
+  border-radius: 50px;
+}
+</style>
diff --git a/manifest.json b/manifest.json
index ee97510..83f218b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,7 +17,8 @@
             "delay" : 0
         },
         "modules" : {
-            "OAuth" : {}
+            "OAuth" : {},
+            "Share" : {}
         },
         /* 模块配置 */
         "distribute" : {
@@ -53,6 +54,12 @@
                     "google" : {
                         "clientid" : "135"
                     }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx6143d111fc5c9ba3",
+                        "UniversalLinks" : ""
+                    }
                 }
             }
         },
diff --git a/pages.json b/pages.json
index 8549911..bcb036c 100644
--- a/pages.json
+++ b/pages.json
@@ -88,6 +88,13 @@
 			}
 		},
 		{
+			"path" : "pages/morningMarketAnalysis/morningMarketAnalysis",
+			"style" : 
+			{
+				"navigationBarTitleText" : "早盘解析"
+			}
+		},
+		{
 			"path": "pages/marketSituation/marketSituation",
 			"style": {
 				"navigationStyle": "custom",
@@ -331,6 +338,29 @@
 				"titleNView": false,
 				"bounce": false
 			}
+		},
+		{
+			"path" : "pages/analysisInstitutionalTrends/analysisInstitutionalTrends",
+			"style" : 
+			{
+				"navigationBarTitleText" : "机构动向解析 "
+			}
+		},
+		{
+			"path" : "pages/customStockList/customStockList",
+			"style" : 
+			{
+				"navigationBarTitleText" : "我的自选",
+				"app-plus": {
+					"titleNView": false
+				},
+				"h5": {
+					"titleNView": false
+				},
+				"mp-weixin": {
+					"navigationStyle": "custom"
+				}
+			}
 		}
 		
 	],
diff --git a/pages/analysisInstitutionalTrends/analysisInstitutionalTrends.vue b/pages/analysisInstitutionalTrends/analysisInstitutionalTrends.vue
new file mode 100644
index 0000000..bd8dc48
--- /dev/null
+++ b/pages/analysisInstitutionalTrends/analysisInstitutionalTrends.vue
@@ -0,0 +1,55 @@
+<template>
+	<view class="container">
+		<view class="content">
+			<image 
+				class="no-data-image" 
+				src="https://d31zlh4on95l9h.cloudfront.net/images/f5a9bd32c81bc7cca47252b51357c12f.png" 
+				mode="aspectFit"
+			></image>
+			<text class="no-data-text">暂无数据~</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+.container {
+	width: 100%;
+	height: 100vh;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: #f5f5f5;
+}
+
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+
+.no-data-image {
+	width: 200px;
+	height: 200px;
+	margin-bottom: 20px;
+}
+
+.no-data-text {
+	font-size: 16px;
+	color: #999999;
+	text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/pages/customStockList/customStockList.vue b/pages/customStockList/customStockList.vue
new file mode 100644
index 0000000..33cb034
--- /dev/null
+++ b/pages/customStockList/customStockList.vue
@@ -0,0 +1,147 @@
+
+<!-- 自选股页面 -->
+<template>
+	<view class="container">
+		<!-- 自定义导航栏 -->
+		<view class="custom-navbar">
+			<view class="navbar-content">
+				<view class="navbar-left">
+					<view class="back-btn" @click="goBack">
+						<text class="back-icon">‹</text>
+					</view>
+				</view>
+				<view class="navbar-center">
+					<text class="navbar-title">我的自选</text>
+				</view>
+				<view class="navbar-right">
+					<image 
+						class="navbar-btn" 
+						src="https://d31zlh4on95l9h.cloudfront.net/images/ba5c8a2eda065274e868bcd9b2d7d914.png"
+						@click="onFirstButtonClick"
+						mode="aspectFit"
+					></image>
+					<image 
+						class="navbar-btn" 
+						src="https://d31zlh4on95l9h.cloudfront.net/images/a4ae8952aeae90dac6d2b4c221c65fa9.png"
+						@click="onSecondButtonClick"
+						mode="aspectFit"
+					></image>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 页面内容 -->
+		<view class="page-content">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			// 返回上一页
+			goBack() {
+				uni.navigateBack()
+			},
+			
+			// 第一个按钮点击事件
+			onFirstButtonClick() {
+				console.log('第一个按钮被点击')
+				// 这里可以添加具体的功能逻辑
+			},
+			
+			// 第二个按钮点击事件
+			onSecondButtonClick() {
+				console.log('第二个按钮被点击')
+				// 这里可以添加具体的功能逻辑
+			}
+		}
+	}
+</script>
+
+<style>
+.container {
+	width: 100%;
+	height: 100vh;
+	background-color: #f5f5f5;
+}
+
+/* 自定义导航栏 */
+.custom-navbar {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 999;
+	background-color: #ffffff;
+	border-bottom: 1px solid #e5e5e5;
+}
+
+.navbar-content {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 44px;
+	padding: 0 15px;
+	/* 适配状态栏高度 */
+	padding-top: var(--status-bar-height, 20px);
+	min-height: calc(44px + var(--status-bar-height, 20px));
+}
+
+.navbar-left {
+	flex: 0 0 auto;
+	display: flex;
+	align-items: center;
+}
+
+.back-btn {
+	width: 40px;
+	height: 40px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.back-icon {
+	font-size: 24px;
+	color: #333333;
+	font-weight: bold;
+}
+
+.navbar-center {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.navbar-title {
+	font-size: 18px;
+	font-weight: 500;
+	color: #333333;
+}
+
+.navbar-right {
+	flex: 0 0 auto;
+	display: flex;
+	align-items: center;
+	gap: 10px;
+}
+
+.navbar-btn {
+	width: 24px;
+	height: 24px;
+}
+
+/* 页面内容 */
+.page-content {
+	padding-top: calc(44px + var(--status-bar-height, 20px) + 1px);
+	min-height: calc(100vh - 44px - var(--status-bar-height, 20px) - 1px);
+}
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 3abff99..8ffaa85 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -81,7 +81,7 @@
 				<view class="section-header-container">
 					<view class="section-header">
 						<text class="section-title">我的自选</text>
-						<text class="more-btn">添加自选股</text>
+						<text class="more-btn" @click="goToMarketSituation">添加自选股</text>
 					</view>
 					<!-- 我的自选TCP连接状态和控制 -->
 					<!-- <view class="my-stocks-tcp-control">
@@ -128,7 +128,7 @@
 							<view class="report-stock">{{report.stock}}</view>
 							<view class="report-status">{{report.status}}</view>
 						</view>
-						<view class="view-more">
+						<view class="view-more" @click="goToCustomStockList">
 							<text>查看更多 >></text>
 						</view>
 					</view>
@@ -175,7 +175,7 @@
 			<view class="section-header highlights-title-container">
 				<text class="section-title">今日市场核心看点</text>
 			</view>
-			<view class="highlights-image-container">
+			<view class="highlights-image-container" @click="goToAnalysisInstitutionalTrends">
 				<image src="https://d31zlh4on95l9h.cloudfront.net/images/8d5365af968402a18cedb120c09460b0.png" mode="aspectFit" class="highlights-image"></image>
 			</view>
 			
@@ -373,21 +373,21 @@ export default {
 		uni.$on('visitorLoginSuccess', this.handleVisitorLoginSuccess)
 		
 		// 页面渲染完成后自动连接两个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)
+		// })
 	},
 
 	// 页面销毁前的清理工作
@@ -430,6 +430,27 @@ export default {
 	},
 	
 	methods: {
+		// 跳转到自定义股票列表页面
+		goToCustomStockList() {
+			uni.navigateTo({
+				url: '/pages/customStockList/customStockList'
+			})
+		},
+		
+		// 跳转到行情页面
+		goToMarketSituation() {
+			uni.navigateTo({
+				url: '/pages/marketSituation/marketSituation'
+			})
+		},
+		
+		// 跳转到机构动向解析页面
+		goToAnalysisInstitutionalTrends() {
+			uni.navigateTo({
+				url: '/pages/analysisInstitutionalTrends/analysisInstitutionalTrends'
+			})
+		},
+		
 		// 跳转到深度探索页面
 		goToDeepExploration() {
 			uni.navigateTo({
diff --git a/pages/marketSituation/globalIndex.vue b/pages/marketSituation/globalIndex.vue
index 662c11d..e80ce2d 100644
--- a/pages/marketSituation/globalIndex.vue
+++ b/pages/marketSituation/globalIndex.vue
@@ -32,7 +32,7 @@
     <!-- 内容区域 -->
     <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-section" v-for="(item, parentIndex) in marketSituationStore.gloablCardData" :key="item">
         <view class="market-header">
           <text class="market-title">{{ item.ac }}</text>
           <view class="market-more" @click="viewMore(item.ac)">
@@ -41,7 +41,7 @@
           </view>
         </view>
         <view class="cards-grid-three">
-          <view v-for="iitem in item.list" :key="iitem" class="card-item">
+          <view v-for="(iitem, index) in item.list" :key="iitem" class="card-item">
             <IndexCard
               :market="iitem.market"
               :stockName="iitem.name"
@@ -49,7 +49,7 @@
               :changeAmount="iitem.changeAmount"
               :changePercent="iitem.changePercent"
               :isRising="iitem.isRising"
-              @click="viewIndexDetail(iitem)"
+              @click="viewIndexDetail(iitem, parentIndex, index)"
             />
           </view>
         </view>
@@ -65,11 +65,12 @@
 </template>
 
 <script setup>
-import { ref, onMounted, computed, nextTick, watch } from "vue";
+import { ref, onMounted, onUnmounted, computed, nextTick, watch } from "vue";
 import footerBar from "../../components/footerBar.vue";
 import IndexCard from "../../components/IndexCard.vue";
 import { getRegionalGroupAPI } from "../../api/marketSituation/marketSituation.js";
-
+import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
+const marketSituationStore = useMarketSituationStore();
 // 响应式数据
 const iSMT = ref(0); // 状态栏高度
 const contentHeight = ref(0);
@@ -259,7 +260,7 @@ const viewMore = (market) => {
 };
 
 // 方法：查看指数详情
-const viewIndexDetail = (item) => {
+const viewIndexDetail = (item, parentIndex, index) => {
   console.log("查看指数详情:", item.stockName);
   // uni.showToast({
   //     title: `查看 ${item.stockName} 详情`,
@@ -268,7 +269,7 @@ const viewIndexDetail = (item) => {
   // })
   // 这里可以跳转到具体的指数详情页面
   uni.navigateTo({
-    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}`,
+    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}&parentIndex=${parentIndex}&index=${index}&from=globalIndex`,
   });
 };
 
@@ -276,14 +277,306 @@ const getRegionalGroup = async () => {
   try {
     const result = await getRegionalGroupAPI();
     globalIndexArray.value = result.data;
+    marketSituationStore.gloablCardData = result.data;
   } catch (e) {
     console.log("获取区域指数失败", e);
   }
 };
 
+// TCP相关响应式变量
+import tcpConnection, { TCPConnection, TCP_CONFIG } from "@/api/tcpConnection.js";
+const tcpConnected = ref(false);
+const connectionListener = ref(null);
+const messageListener = ref(null);
+// 初始化TCP监听器
+const initTcpListeners = () => {
+  // 创建连接状态监听器并保存引用
+  connectionListener.value = (status, result) => {
+    tcpConnected.value = status === "connected";
+    console.log("TCP连接状态变化:", status, tcpConnected.value);
+
+    // 显示连接状态提示
+
+    // 如果连接，发送获取批量数据
+    if (status === "connected") {
+      sendTcpMessage("batch_real_time");
+    }
+  };
+
+  // 创建消息监听器并保存引用
+  messageListener.value = (type, message, parsedArray) => {
+    const messageObj = {
+      type: type,
+      content: message,
+      parsedArray: parsedArray,
+      timestamp: new Date().toLocaleTimeString(),
+      direction: "received",
+    };
+
+    // 解析股票数据
+    parseStockData(message);
+  };
+
+  // 注册监听器
+  tcpConnection.onConnectionChange(connectionListener.value);
+  tcpConnection.onMessage(messageListener.value);
+};
+
+// 连接TCP服务器
+const connectTcp = () => {
+  console.log("开始连接TCP服务器...");
+  tcpConnection.connect();
+};
+
+// 断开TCP连接
+const disconnectTcp = () => {
+  console.log("断开TCP连接...");
+  tcpConnection.disconnect();
+  tcpConnected.value = false;
+};
+
+// 发送TCP消息
+const sendTcpMessage = (command) => {
+  let messageData;
+  let messageDataArray = [];
+  if (command == "batch_real_time") {
+    for (let i = 0; i < globalIndexArray.value.length; ++i) {
+      for (let j = 0; j < globalIndexArray.value[i].list.length; ++j) {
+        messageDataArray.push(globalIndexArray.value[i].list[j].code);
+      }
+    }
+  }
+  console.log(messageDataArray);
+
+  switch (command) {
+    // 实时行情推送
+    case "real_time":
+      messageData = {
+        command: "real_time",
+        stock_code: "SH.000001",
+      };
+      break;
+    // 初始化获取行情历史数据
+    case "init_real_time":
+      messageData = {
+        command: "init_real_time",
+        stock_code: "SH.000001",
+      };
+      break;
+    case "stop_real_time":
+      messageData = {
+        command: "stop_real_time",
+      };
+      break;
+    // 股票列表
+    case "stock_list":
+      messageData = {
+        command: "stock_list",
+      };
+      break;
+    case "batch_real_time":
+      messageData = {
+        command: "batch_real_time",
+        stock_codes: messageDataArray,
+      };
+      break;
+    case "help":
+      messageData = {
+        command: "help",
+      };
+      break;
+  }
+  if (!messageData) {
+    return;
+  } else {
+    try {
+      // 发送消息
+      const success = tcpConnection.send(messageData);
+      if (success) {
+        console.log("home发送TCP消息:", messageData);
+      }
+    } catch (error) {
+      console.error("发送TCP消息时出错:", error);
+    }
+  }
+};
+
+// 获取TCP连接状态
+const getTcpStatus = () => {
+  const status = tcpConnection.getConnectionStatus();
+  uni.showModal({
+    title: "TCP连接状态",
+    content: `当前状态: ${status ? "已连接" : "未连接"}`,
+    showCancel: false,
+  });
+};
+
+let isMorePacket = {
+  init_batch_real_time: false,
+  batch_real_time: false,
+};
+let receivedMessage;
+
+// 解析TCP股票数据
+const parseStockData = (message) => {
+  try {
+    console.log("进入parseStockData, message类型:", typeof message);
+
+    let parsedMessage;
+    // 如果isMorePacket是true，说明正在接受分包数据，无条件接收
+    // 如果message是字符串且以{开头，说明是JSON字符串，需要解析
+    // 如果不属于以上两种情况，说明是普通字符串，不预解析
+    if (message.includes("欢迎连接到股票数据服务器")) {
+      console.log("服务器命令列表，不予处理");
+      return;
+    }
+    if ((typeof message === "string" && message.includes("batch_data_start")) || isMorePacket.init_batch_real_time) {
+      if (typeof message === "string" && message.includes("batch_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.init_batch_real_time = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("batch_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.init_batch_real_time = false;
+
+        console.log("展示数据", receivedMessage);
+        let startIndex = 0;
+        let startCount = 0;
+        let endIndex = receivedMessage.indexOf("batch_data_complete");
+        for (let i = 0; i < receivedMessage.length; ++i) {
+          if (receivedMessage[i] == "{") {
+            startCount++;
+            if (startCount == 2) {
+              startIndex = i;
+              break;
+            }
+          }
+        }
+        for (let i = receivedMessage.indexOf("batch_data_complete"); i >= 0; --i) {
+          if (receivedMessage[i] == "}" || startIndex == endIndex) {
+            endIndex = i;
+            break;
+          }
+        }
+        if (startIndex >= endIndex) {
+          throw new Error("JSON字符串格式错误");
+        }
+        console.log("message", startIndex, endIndex, receivedMessage[endIndex], receivedMessage[startIndex]);
+        parsedMessage = JSON.parse(receivedMessage.substring(startIndex, endIndex + 1));
+
+        console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+
+        const stockDataArray = parsedMessage.data;
+        for (let i = 0; i < globalIndexArray.value.length; ++i) {
+          for (let j = 0; j < globalIndexArray.value[i].list.length; ++j) {
+            const stockCode = globalIndexArray.value[i].list[j].code;
+            marketSituationStore.gloablCardData[i].list[j].currentPrice = stockDataArray[stockCode][0].current_price.toFixed(2);
+            marketSituationStore.gloablCardData[i].list[j].changeAmount = (stockDataArray[stockCode][0].current_price - stockDataArray[stockCode][0].pre_close).toFixed(2);
+            marketSituationStore.gloablCardData[i].list[j].changePercent = ((100 * (stockDataArray[stockCode][0].current_price - stockDataArray[stockCode][0].pre_close)) / stockDataArray[stockCode][0].pre_close).toFixed(2) + "%";
+            marketSituationStore.gloablCardData[i].list[j].isRising = stockDataArray[stockCode][0].current_price - stockDataArray[stockCode][0].pre_close >= 0;
+          }
+        }
+      }
+    } else if ((typeof message === "string" && message.includes('{"count')) || isMorePacket.batch_real_time) {
+      if (typeof message === "string" && message.includes('{"count')) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.batch_real_time = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("batch_realtime_data")) {
+        console.log("接受分包数据结束");
+        isMorePacket.batch_real_time = false;
+
+        console.log("展示数据", receivedMessage);
+        let startIndex = 0;
+        let endIndex = receivedMessage.length - 1;
+        for (let i = 0; i < receivedMessage.length; ++i) {
+          if (receivedMessage[i] == "{") {
+            startIndex = i;
+            break;
+          }
+        }
+        for (let i = receivedMessage.length - 1; i >= 0; --i) {
+          if (receivedMessage[i] == "}" || startIndex == endIndex) {
+            endIndex = i;
+            break;
+          }
+        }
+        if (startIndex >= endIndex) {
+          throw new Error("JSON字符串格式错误");
+        }
+        parsedMessage = JSON.parse(receivedMessage.substring(startIndex, endIndex + 1));
+
+        console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+        const stockDataArray = parsedMessage.data;
+        for (let i = 0; i < globalIndexArray.value.length; ++i) {
+          for (let j = 0; j < globalIndexArray.value[i].list.length; ++j) {
+            const stockCode = globalIndexArray.value[i].list[j].code;
+            marketSituationStore.gloablCardData[i].list[j].currentPrice = stockDataArray[stockCode][0].current_price.toFixed(2);
+            marketSituationStore.gloablCardData[i].list[j].changeAmount = (stockDataArray[stockCode][0].current_price - stockDataArray[stockCode][0].pre_close).toFixed(2);
+            marketSituationStore.gloablCardData[i].list[j].changePercent = ((100 * (stockDataArray[stockCode][0].current_price - stockDataArray[stockCode][0].pre_close)) / stockDataArray[stockCode][0].pre_close).toFixed(2) + "%";
+            marketSituationStore.gloablCardData[i].list[j].isRising = stockDataArray[stockCode][0].current_price - stockDataArray[stockCode][0].pre_close >= 0;
+          }
+        }
+      }
+    } else {
+      // 没有通过JSON解析判断，说明不是需要的数据
+      console.log("不是需要的数据，不做处理");
+    }
+  } catch (error) {
+    console.error("解析TCP股票数据失败:", error.message);
+    console.error("错误详情:", error);
+  }
+};
+
+// 移除TCP监听器
+const removeTcpListeners = () => {
+  if (connectionListener.value) {
+    tcpConnection.removeConnectionListener(connectionListener.value);
+    connectionListener.value = null;
+    console.log("已移除TCP连接状态监听器");
+  }
+
+  if (messageListener.value) {
+    tcpConnection.removeMessageListener(messageListener.value);
+    messageListener.value = null;
+    console.log("已移除TCP消息监听器");
+  }
+};
+
+const startTcp = () => {
+  try {
+    removeTcpListeners();
+    disconnectTcp();
+    initTcpListeners();
+    connectTcp();
+  } catch (error) {
+    console.error("建立连接并设置监听出错:", error);
+  }
+};
+
+onUnmounted(() => {
+  sendTcpMessage("stop_real_time");
+  removeTcpListeners();
+  disconnectTcp();
+});
+
 // 生命周期：页面挂载
 onMounted(async () => {
   await getRegionalGroup();
+  initTcpListeners();
+  await nextTick();
+  // 开始连接
+  startTcp();
   // 获取系统信息
   const systemInfo = uni.getSystemInfoSync();
   iSMT.value = systemInfo.statusBarHeight || 0;
diff --git a/pages/marketSituation/marketCondition.vue b/pages/marketSituation/marketCondition.vue
index 5c29c5e..227b97e 100644
--- a/pages/marketSituation/marketCondition.vue
+++ b/pages/marketSituation/marketCondition.vue
@@ -210,15 +210,15 @@
     </view>
 
     <view class="bottomTool">
-      <view class="index">
+      <view class="index" @click="goToIndexRepository">
         <image class="icon" src="/static/marketSituation-image/marketCondition-image/index.png" mode="指标仓库图标"> </image>
         指标仓库
       </view>
-      <view class="function">
+      <view class="function" @click="goToFunction">
         <image class="icon" src="/static/marketSituation-image/marketCondition-image/function.png" mode="功能图标"> </image>
         功能
       </view>
-      <view class="favorites">
+      <view class="favorites" @click="goToFavorites">
         <image class="icon" src="/static/marketSituation-image/marketCondition-image/favorites.png" mode="加自选图标"></image>
         加自选
       </view>
@@ -233,8 +233,9 @@ const instance = getCurrentInstance();
 import { prevClosePrice, timeData as testTimeData, klineData as testKlineData } from "@/common/stockTimeInformation.js";
 import { throttle } from "@/common/util.js";
 import { HCharts } from "@/common/canvasMethod.js";
-import tcpConnection, { TCPConnection, TCP_CONFIG } from "@/api/tcpConnection.js";
-
+import tcpConnection, { TCPConnection, TCP_CONFIG } from "../../api/tcpConnection";
+import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
+const marketSituationStore = useMarketSituationStore();
 // TCP相关响应式变量
 const tcpConnected = ref(false);
 const connectionListener = ref(null);
@@ -244,6 +245,7 @@ const messageListener = ref(null);
 const currentStockFrom = ref();
 // 当前股票位置
 const currentStockIndex = ref(-1);
+const currentStockParentIndex = ref(-1);
 // 股票信息栏变量
 const stockInformation = ref({
   stockName: "----", //股票名称
@@ -413,12 +415,7 @@ const startTcp = () => {
     initTcpListeners();
     connectTcp();
   } catch (error) {
-    console.error("建立连接并设置监听:", error);
-    uni.showToast({
-      title: "建立连接并设置监听",
-      icon: "none",
-      duration: 1500,
-    });
+    console.error("建立连接并设置监听出错:", error);
   }
 };
 
@@ -516,25 +513,75 @@ const backToHomepage = () => {
 };
 
 const toLeftPage = () => {
-	if(currentStockFrom.value == "marketOverview"){
-		return;
-	}
-  if (currentStockIndex.value > 0) {
-    currentStockIndex.value--;
-    // updateStockInformation();
-  } else {
+  if (currentStockIndex.value == 0) {
     uni.showToast({
       title: "没有更多股票了",
       icon: "none",
       duration: 1000,
     });
+    return;
+  } else {
+    currentStockIndex.value--;
+    let nextStockInformation;
+    if (currentStockFrom.value == "marketOverview") {
+      nextStockInformation = marketSituationStore.cardData[currentStockIndex.value];
+    } else if (currentStockFrom.value == "marketDetail") {
+      nextStockInformation = marketSituationStore.marketDetailCardData[currentStockIndex.value];
+    } else if (currentStockFrom.value == "globalIndex") {
+      nextStockInformation = marketSituationStore.gloablCardData[currentStockParentIndex.value].list[currentStockIndex.value];
+    } else {
+      uni.showToast({
+        title: "没有更多股票了",
+        icon: "none",
+        duration: 1000,
+      });
+      return;
+    }
+    updateStockInformation(nextStockInformation);
   }
 };
 
 const toRightPage = () => {
-  if (currentStockIndex.value < stockList.length - 1) {
-    currentStockIndex.value++;
-    // updateStockInformation();
+  let nextStockInformation;
+  if (currentStockFrom.value == "marketOverview") {
+    if (currentStockIndex.value == marketSituationStore.cardData.length) {
+      uni.showToast({
+        title: "没有更多股票了",
+        icon: "none",
+        duration: 1000,
+      });
+      return;
+    } else {
+      currentStockIndex.value++;
+      nextStockInformation = marketSituationStore.cardData[currentStockIndex.value];
+      updateStockInformation(nextStockInformation);
+    }
+  } else if (currentStockFrom.value == "marketDetail") {
+    if (currentStockIndex.value == marketSituationStore.marketDetailCardData.length) {
+      uni.showToast({
+        title: "没有更多股票了",
+        icon: "none",
+        duration: 1000,
+      });
+      return;
+    } else {
+      currentStockIndex.value++;
+      nextStockInformation = marketSituationStore.marketDetailCardData[currentStockIndex.value];
+      updateStockInformation(nextStockInformation);
+    }
+  } else if (currentStockFrom.value == "globalIndex") {
+    if (currentStockIndex.value == marketSituationStore.gloablCardData[currentStockParentIndex.value].list.length) {
+      uni.showToast({
+        title: "没有更多股票了",
+        icon: "none",
+        duration: 1000,
+      });
+      return;
+    } else {
+      currentStockIndex.value++;
+      nextStockInformation = marketSituationStore.gloablCardData[currentStockParentIndex.value].list[currentStockIndex.value];
+      updateStockInformation(nextStockInformation);
+    }
   } else {
     uni.showToast({
       title: "没有更多股票了",
@@ -544,6 +591,38 @@ const toRightPage = () => {
   }
 };
 
+const updateStockInformation = (stock) => {
+  klineTab.value = 1;
+  stockInformation.value.stockName = stock.stockName||stock.name;
+  stockInformation.value.stockCode = stock.stockCode||stock.code;
+  sendTcpMessage("stop_real_time");
+  sendTcpMessage("init_real_time");
+};
+
+const goToIndexRepository = () => {
+  uni.showToast({
+    title: "指标仓库",
+    icon: "none",
+    duration: 1000,
+  });
+};
+
+const goToFunction = () => {
+  uni.showToast({
+    title: "功能",
+    icon: "none",
+    duration: 1000,
+  });
+};
+
+const goToFavorites = () => {
+  uni.showToast({
+    title: "加自选",
+    icon: "none",
+    duration: 1000,
+  });
+};
+
 const openStockDetail = () => {
   isStockDetail.value = true;
 };
@@ -1451,11 +1530,6 @@ const initTcpListeners = () => {
     console.log("TCP连接状态变化:", status, tcpConnected.value);
 
     // 显示连接状态提示
-    uni.showToast({
-      title: status === "connected" ? "TCP连接成功" : "TCP连接断开",
-      icon: status === "connected" ? "success" : "none",
-      duration: 2000,
-    });
 
     if (status === "connected") {
       if (klineTab.value == 1) {
@@ -1600,11 +1674,6 @@ const sendTcpMessage = (command) => {
       break;
   }
   if (!messageData) {
-    uni.showToast({
-      title: "命令不存在",
-      icon: "none",
-      duration: 1000,
-    });
     return;
   } else {
     try {
@@ -1612,19 +1681,9 @@ const sendTcpMessage = (command) => {
       const success = tcpConnection.send(messageData);
       if (success) {
         console.log("home发送TCP消息:", messageData);
-        uni.showToast({
-          title: "消息发送成功",
-          icon: "success",
-          duration: 1000,
-        });
       }
     } catch (error) {
       console.error("发送TCP消息时出错:", error);
-      uni.showToast({
-        title: "消息发送失败",
-        icon: "none",
-        duration: 1000,
-      });
     }
   }
 };
@@ -2177,8 +2236,8 @@ onLoad((options) => {
 
       // 更新stockInformation
       if (stockData) {
-        stockInformation.value.stockName = stockData.stockName;
-        stockInformation.value.stockCode = stockData.stockCode;
+        stockInformation.value.stockName = stockData.stockName||stockData.name;
+        stockInformation.value.stockCode = stockData.stockCode||stockData.code;
       }
     } catch (error) {
       console.error("解析股票数据失败：", error);
@@ -2193,16 +2252,24 @@ onLoad((options) => {
     currentStockIndex.value = stockIndex;
   }
 
+  // 处理index参数（股票在列表中的位置）
+  if (options.parentIndex) {
+    const stockParentIndex = parseInt(options.parentIndex);
+    console.log("股票在列表中的父索引：", stockParentIndex);
+    // 将index保存到响应式变量中，用于后续的左右切换功能
+    currentStockParentIndex.value = stockParentIndex;
+  }
+
   // 处理stockFrom参数（股票来源）
-  if (options.stockFrom) {
-    currentStockFrom.value = options.stockFrom;
+  if (options.from) {
+    currentStockFrom.value = options.from;
   }
 });
 
 // 保存定时器，用于页面卸载时清理
 onUnmounted(() => {
   removeTcpListeners();
-  disconnect();
+  disconnectTcp();
   if (timer) {
     console.log("卸载定时器");
     clearInterval(timer);
diff --git a/pages/marketSituation/marketDetail.vue b/pages/marketSituation/marketDetail.vue
index 945d194..98e52a3 100644
--- a/pages/marketSituation/marketDetail.vue
+++ b/pages/marketSituation/marketDetail.vue
@@ -36,19 +36,19 @@
     <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-row" v-for="(item,index) in sortedStockList" :key="item" @click="viewIndexDetail(item,index)">
           <view class="stock-cell name-column">
-            <view class="stock-name">{{ stock.stockName }}</view>
-            <view class="stock-code">{{ stock.stockCode }}</view>
+            <view class="stock-name">{{ item.stockName }}</view>
+            <view class="stock-code">{{ item.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 class="stock-price" :class="item.isRising ? 'rising' : 'falling'">
+              {{ typeof item.currentPrice === "number" ? item.currentPrice.toFixed(2) : item.currentPrice }}
             </text>
           </view>
           <view class="stock-cell change-column">
-            <text class="stock-change" :class="stock.isRising ? 'rising' : 'falling'">
-              {{ stock.change || stock.changePercent }}
+            <text class="stock-change" :class="item.isRising ? 'rising' : 'falling'">
+              {{ item.changePercent }}
             </text>
           </view>
         </view>
@@ -64,10 +64,12 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, watch } from "vue";
+import { ref, computed, onMounted, onUnmounted, nextTick, watch } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import footerBar from "@/components/footerBar.vue";
 import { getRegionalGroupListAPI } from "../../api/marketSituation/marketSituation.js";
+import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
+const marketSituationStore = useMarketSituationStore();
 // 响应式数据
 const iSMT = ref(0);
 const contentHeight = ref(0);
@@ -185,8 +187,8 @@ const contentTopPosition = computed(() => {
 });
 
 const sortedStockList = computed(() => {
-  console.log("计算sortedStockList，原始数据长度:", stockList.value.length);
-  let list = [...stockList.value];
+  console.log("计算sortedStockList，原始数据长度:", marketSituationStore.marketDetailCardData.length);
+  let list = [...marketSituationStore.marketDetailCardData];
 
   if (sortType.value === "price") {
     list.sort((a, b) => {
@@ -194,8 +196,8 @@ const sortedStockList = computed(() => {
     });
   } else if (sortType.value === "change") {
     list.sort((a, b) => {
-      const aChange = parseFloat(a.change.replace(/[+%-]/g, ""));
-      const bChange = parseFloat(b.change.replace(/[+%-]/g, ""));
+      const aChange = parseFloat(a.changePercent.replace(/[+%-]/g, ""));
+      const bChange = parseFloat(b.changePercent.replace(/[+%-]/g, ""));
       return sortOrder.value === "asc" ? aChange - bChange : bChange - aChange;
     });
   }
@@ -210,35 +212,23 @@ const getRegionalGroupList = async () => {
       name: marketTitle.value,
     });
     regionalGroupArray.value = result.data;
+    marketSituationStore.marketDetailCardData = result.data;
   } catch (e) {
     console.error("获取区域分组列表失败:", e);
   }
 };
 
-// 页面加载时接收参数
-onLoad(async (options) => {
-  if (options && options.market) {
-    marketTitle.value = options.market;
-    await getRegionalGroupList();
-  }
-});
-
 // 方法
 const goBack = () => {
   uni.navigateBack();
 };
 
 // 方法：查看指数详情
-const viewIndexDetail = (item) => {
+const viewIndexDetail = (item,index) => {
   console.log("查看指数详情:", item.stockName);
-  // uni.showToast({
-  //     title: `查看 ${item.stockName} 详情`,
-  //     icon: 'none',
-  //     duration: 2000
-  // })
   // 这里可以跳转到具体的指数详情页面
   uni.navigateTo({
-    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}`,
+    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}&index=${index}&from=marketDetail`,
   });
 };
 
@@ -260,6 +250,302 @@ const sortByChange = () => {
   }
 };
 
+// TCP相关响应式变量
+import tcpConnection, { TCPConnection, TCP_CONFIG } from "@/api/tcpConnection.js";
+const tcpConnected = ref(false);
+const connectionListener = ref(null);
+const messageListener = ref(null);
+// 初始化TCP监听器
+const initTcpListeners = () => {
+  // 创建连接状态监听器并保存引用
+  connectionListener.value = (status, result) => {
+    tcpConnected.value = status === "connected";
+    console.log("TCP连接状态变化:", status, tcpConnected.value);
+
+    // 如果连接，发送获取批量数据
+    if (status === "connected") {
+      sendTcpMessage("batch_real_time");
+    }
+  };
+
+  // 创建消息监听器并保存引用
+  messageListener.value = (type, message, parsedArray) => {
+    const messageObj = {
+      type: type,
+      content: message,
+      parsedArray: parsedArray,
+      timestamp: new Date().toLocaleTimeString(),
+      direction: "received",
+    };
+
+    // 解析股票数据
+    parseStockData(message);
+  };
+
+  // 注册监听器
+  tcpConnection.onConnectionChange(connectionListener.value);
+  tcpConnection.onMessage(messageListener.value);
+};
+
+// 连接TCP服务器
+const connectTcp = () => {
+  console.log("开始连接TCP服务器...");
+  tcpConnection.connect();
+};
+
+// 断开TCP连接
+const disconnectTcp = () => {
+  console.log("断开TCP连接...");
+  tcpConnection.disconnect();
+  tcpConnected.value = false;
+};
+
+// 发送TCP消息
+const sendTcpMessage = (command) => {
+  let messageData;
+  let messageDataArray = [];
+  if (command == "batch_real_time") {
+    messageDataArray = regionalGroupArray.value.map((item) => item.code);
+  }
+  console.log(messageDataArray);
+
+  switch (command) {
+    // 实时行情推送
+    case "real_time":
+      messageData = {
+        command: "real_time",
+        stock_code: "SH.000001",
+      };
+      break;
+    // 初始化获取行情历史数据
+    case "init_real_time":
+      messageData = {
+        command: "init_real_time",
+        stock_code: "SH.000001",
+      };
+      break;
+    case "stop_real_time":
+      messageData = {
+        command: "stop_real_time",
+      };
+      break;
+    // 股票列表
+    case "stock_list":
+      messageData = {
+        command: "stock_list",
+      };
+      break;
+    case "batch_real_time":
+      messageData = {
+        command: "batch_real_time",
+        stock_codes: messageDataArray,
+      };
+      break;
+    case "help":
+      messageData = {
+        command: "help",
+      };
+      break;
+  }
+  if (!messageData) {
+
+    return;
+  } else {
+    try {
+      // 发送消息
+      const success = tcpConnection.send(messageData);
+      if (success) {
+        console.log("home发送TCP消息:", messageData);
+      }
+    } catch (error) {
+      console.error("发送TCP消息时出错:", error);
+    }
+  }
+};
+
+// 获取TCP连接状态
+const getTcpStatus = () => {
+  const status = tcpConnection.getConnectionStatus();
+  uni.showModal({
+    title: "TCP连接状态",
+    content: `当前状态: ${status ? "已连接" : "未连接"}`,
+    showCancel: false,
+  });
+};
+
+let isMorePacket = {
+  init_batch_real_time: false,
+  batch_real_time: false,
+};
+let receivedMessage;
+
+// 解析TCP股票数据
+const parseStockData = (message) => {
+  try {
+    console.log("进入parseStockData, message类型:", typeof message);
+
+    let parsedMessage;
+    // 如果isMorePacket是true，说明正在接受分包数据，无条件接收
+    // 如果message是字符串且以{开头，说明是JSON字符串，需要解析
+    // 如果不属于以上两种情况，说明是普通字符串，不预解析
+    if (message.includes("欢迎连接到股票数据服务器")) {
+      console.log("服务器命令列表，不予处理");
+      return;
+    }
+    if ((typeof message === "string" && message.includes("batch_data_start")) || isMorePacket.init_batch_real_time) {
+      if (typeof message === "string" && message.includes("batch_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.init_batch_real_time = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("batch_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.init_batch_real_time = false;
+
+        console.log("展示数据", receivedMessage);
+        let startIndex = 0;
+        let startCount = 0;
+        let endIndex = receivedMessage.indexOf("batch_data_complete");
+        for (let i = 0; i < receivedMessage.length; ++i) {
+          if (receivedMessage[i] == "{") {
+            startCount++;
+            if (startCount == 2) {
+              startIndex = i;
+              break;
+            }
+          }
+        }
+        for (let i = receivedMessage.indexOf("batch_data_complete"); i >= 0; --i) {
+          if (receivedMessage[i] == "}" || startIndex == endIndex) {
+            endIndex = i;
+            break;
+          }
+        }
+        if (startIndex >= endIndex) {
+          throw new Error("JSON字符串格式错误");
+        }
+        console.log("message", startIndex, endIndex, receivedMessage[endIndex], receivedMessage[startIndex]);
+        parsedMessage = JSON.parse(receivedMessage.substring(startIndex, endIndex + 1));
+
+        console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+
+        const stockDataArray = parsedMessage.data;
+        marketSituationStore.marketDetailCardData = regionalGroupArray.value.map((item) => ({
+          market: item.market,
+          stockCode: item.code,
+          stockName: item.name,
+          id: item.id,
+          currentPrice: stockDataArray[item.code][0].current_price.toFixed(2),
+          changeAmount: (stockDataArray[item.code][0].current_price - stockDataArray[item.code][0].pre_close).toFixed(2),
+          changePercent: ((100 * (stockDataArray[item.code][0].current_price - stockDataArray[item.code][0].pre_close)) / stockDataArray[item.code][0].pre_close).toFixed(2) + "%",
+          isRising: stockDataArray[item.code][0].current_price - stockDataArray[item.code][0].pre_close >= 0,
+        }));
+      }
+    } else if ((typeof message === "string" && message.includes('{"count')) || isMorePacket.batch_real_time) {
+      if (typeof message === "string" && message.includes('{"count')) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.batch_real_time = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("batch_realtime_data")) {
+        console.log("接受分包数据结束");
+        isMorePacket.batch_real_time = false;
+
+        console.log("展示数据", receivedMessage);
+        let startIndex = 0;
+        let endIndex = receivedMessage.length - 1;
+        for (let i = 0; i < receivedMessage.length; ++i) {
+          if (receivedMessage[i] == "{") {
+            startIndex = i;
+            break;
+          }
+        }
+        for (let i = receivedMessage.length - 1; i >= 0; --i) {
+          if (receivedMessage[i] == "}" || startIndex == endIndex) {
+            endIndex = i;
+            break;
+          }
+        }
+        if (startIndex >= endIndex) {
+          throw new Error("JSON字符串格式错误");
+        }
+        parsedMessage = JSON.parse(receivedMessage.substring(startIndex, endIndex + 1));
+
+        console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+        const stockDataArray = parsedMessage.data;
+        marketSituationStore.marketDetailCardData = regionalGroupArray.value.map((item) => ({
+          market: item.market,
+          stockCode: item.code,
+          stockName: item.name,
+          id: item.id,
+          currentPrice: stockDataArray[item.code][0].current_price.toFixed(2),
+          changeAmount: (stockDataArray[item.code][0].current_price - stockDataArray[item.code][0].pre_close).toFixed(2),
+          changePercent: ((100 * (stockDataArray[item.code][0].current_price - stockDataArray[item.code][0].pre_close)) / stockDataArray[item.code][0].pre_close).toFixed(2) + "%",
+          isRising: stockDataArray[item.code][0].current_price - stockDataArray[item.code][0].pre_close >= 0,
+        }));
+      }
+    } else {
+      // 没有通过JSON解析判断，说明不是需要的数据
+      console.log("不是需要的数据，不做处理");
+    }
+  } catch (error) {
+    console.error("解析TCP股票数据失败:", error.message);
+    console.error("错误详情:", error);
+  }
+};
+
+// 移除TCP监听器
+const removeTcpListeners = () => {
+  if (connectionListener.value) {
+    tcpConnection.removeConnectionListener(connectionListener.value);
+    connectionListener.value = null;
+    console.log("已移除TCP连接状态监听器");
+  }
+
+  if (messageListener.value) {
+    tcpConnection.removeMessageListener(messageListener.value);
+    messageListener.value = null;
+    console.log("已移除TCP消息监听器");
+  }
+};
+
+const startTcp = () => {
+  try {
+    removeTcpListeners();
+    disconnectTcp();
+    initTcpListeners();
+    connectTcp();
+  } catch (error) {
+    console.error("建立连接并设置监听出错:", error);
+  }
+};
+
+// 页面加载时接收参数
+onLoad(async (options) => {
+  if (options && options.market) {
+    marketTitle.value = options.market;
+    await getRegionalGroupList();
+    initTcpListeners();
+    await nextTick();
+    // 开始连接
+    startTcp();
+  }
+});
+
+onUnmounted(() => {
+  sendTcpMessage("stop_real_time");
+  removeTcpListeners();
+  disconnectTcp();
+});
+
 onMounted(() => {
   // 获取状态栏高度
   iSMT.value = uni.getSystemInfoSync().statusBarHeight;
diff --git a/pages/marketSituation/marketOverview.vue b/pages/marketSituation/marketOverview.vue
index fa68843..1a10a48 100644
--- a/pages/marketSituation/marketOverview.vue
+++ b/pages/marketSituation/marketOverview.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch, nextTick, computed } from "vue";
+import { ref, onMounted, onUnmounted, watch, nextTick, computed } from "vue";
 import util from "../../common/util.js";
 import IndexCard from "../../components/IndexCard.vue";
 import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
@@ -168,8 +168,296 @@ const getGlobalIndex = async () => {
   }
 };
 
+// TCP相关响应式变量
+import tcpConnection, { TCPConnection, TCP_CONFIG } from "@/api/tcpConnection.js";
+const tcpConnected = ref(false);
+const connectionListener = ref(null);
+const messageListener = ref(null);
+// 初始化TCP监听器
+const initTcpListeners = () => {
+  // 创建连接状态监听器并保存引用
+  connectionListener.value = (status, result) => {
+    tcpConnected.value = status === "connected";
+    console.log("TCP连接状态变化:", status, tcpConnected.value);
+
+    // 如果连接，发送获取批量数据
+    if (status === "connected") {
+      sendTcpMessage("batch_real_time");
+    }
+  };
+
+  // 创建消息监听器并保存引用
+  messageListener.value = (type, message, parsedArray) => {
+    const messageObj = {
+      type: type,
+      content: message,
+      parsedArray: parsedArray,
+      timestamp: new Date().toLocaleTimeString(),
+      direction: "received",
+    };
+
+    // 解析股票数据
+    parseStockData(message);
+  };
+
+  // 注册监听器
+  tcpConnection.onConnectionChange(connectionListener.value);
+  tcpConnection.onMessage(messageListener.value);
+};
+
+// 连接TCP服务器
+const connectTcp = () => {
+  console.log("开始连接TCP服务器...");
+  tcpConnection.connect();
+};
+
+// 断开TCP连接
+const disconnectTcp = () => {
+  console.log("断开TCP连接...");
+  tcpConnection.disconnect();
+  tcpConnected.value = false;
+};
+
+// 发送TCP消息
+const sendTcpMessage = (command) => {
+  let messageData;
+  let messageDataArray = [];
+  if (command == "batch_real_time") {
+    messageDataArray = globalIndexArray.value.map((item) => item.stockCode);
+  }
+  console.log(messageDataArray);
+
+  switch (command) {
+    // 实时行情推送
+    case "real_time":
+      messageData = {
+        command: "real_time",
+        stock_code: "SH.000001",
+      };
+      break;
+    // 初始化获取行情历史数据
+    case "init_real_time":
+      messageData = {
+        command: "init_real_time",
+        stock_code: "SH.000001",
+      };
+      break;
+    case "stop_real_time":
+      messageData = {
+        command: "stop_real_time",
+      };
+      break;
+    // 股票列表
+    case "stock_list":
+      messageData = {
+        command: "stock_list",
+      };
+      break;
+    case "batch_real_time":
+      messageData = {
+        command: "batch_real_time",
+        stock_codes: messageDataArray,
+      };
+      break;
+    case "help":
+      messageData = {
+        command: "help",
+      };
+      break;
+  }
+  if (!messageData) {
+    return;
+  } else {
+    try {
+      // 发送消息
+      const success = tcpConnection.send(messageData);
+      if (success) {
+        console.log("home发送TCP消息:", messageData);
+
+      }
+    } catch (error) {
+      console.error("发送TCP消息时出错:", error);
+
+    }
+  }
+};
+
+// 获取TCP连接状态
+const getTcpStatus = () => {
+  const status = tcpConnection.getConnectionStatus();
+  uni.showModal({
+    title: "TCP连接状态",
+    content: `当前状态: ${status ? "已连接" : "未连接"}`,
+    showCancel: false,
+  });
+};
+
+let isMorePacket = {
+  init_batch_real_time: false,
+  batch_real_time: false,
+};
+let receivedMessage;
+
+// 解析TCP股票数据
+const parseStockData = (message) => {
+  try {
+    console.log("进入parseStockData, message类型:", typeof message);
+
+    let parsedMessage;
+    // 如果isMorePacket是true，说明正在接受分包数据，无条件接收
+    // 如果message是字符串且以{开头，说明是JSON字符串，需要解析
+    // 如果不属于以上两种情况，说明是普通字符串，不预解析
+    if (message.includes("欢迎连接到股票数据服务器")) {
+      console.log("服务器命令列表，不予处理");
+      return;
+    }
+    if ((typeof message === "string" && message.includes("batch_data_start")) || isMorePacket.init_batch_real_time) {
+      if (typeof message === "string" && message.includes("batch_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.init_batch_real_time = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("batch_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.init_batch_real_time = false;
+
+        console.log("展示数据", receivedMessage);
+        let startIndex = 0;
+        let startCount = 0;
+        let endIndex = receivedMessage.indexOf("batch_data_complete");
+        for (let i = 0; i < receivedMessage.length; ++i) {
+          if (receivedMessage[i] == "{") {
+            startCount++;
+            if (startCount == 2) {
+              startIndex = i;
+              break;
+            }
+          }
+        }
+        for (let i = receivedMessage.indexOf("batch_data_complete"); i >= 0; --i) {
+          if (receivedMessage[i] == "}" || startIndex == endIndex) {
+            endIndex = i;
+            break;
+          }
+        }
+        if (startIndex >= endIndex) {
+          throw new Error("JSON字符串格式错误");
+        }
+        console.log("message", startIndex, endIndex, receivedMessage[endIndex], receivedMessage[startIndex]);
+        parsedMessage = JSON.parse(receivedMessage.substring(startIndex, endIndex + 1));
+
+        console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+
+        const stockDataArray = parsedMessage.data;
+        marketSituationStore.cardData = globalIndexArray.value.map((item) => ({
+          market: item.market,
+          stockCode: item.stockCode,
+          stockName: item.stockName,
+          currentPrice: stockDataArray[item.stockCode][0].current_price.toFixed(2),
+          changeAmount: (stockDataArray[item.stockCode][0].current_price - stockDataArray[item.stockCode][0].pre_close).toFixed(2),
+          changePercent: ((100 * (stockDataArray[item.stockCode][0].current_price - stockDataArray[item.stockCode][0].pre_close)) / stockDataArray[item.stockCode][0].pre_close).toFixed(2) + "%",
+          isRising: stockDataArray[item.stockCode][0].current_price - stockDataArray[item.stockCode][0].pre_close >= 0,
+        }));
+      }
+    } else if ((typeof message === "string" && message.includes('{"count')) || isMorePacket.batch_real_time) {
+      if (typeof message === "string" && message.includes('{"count')) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.batch_real_time = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("batch_realtime_data")) {
+        console.log("接受分包数据结束");
+        isMorePacket.batch_real_time = false;
+
+        console.log("展示数据", receivedMessage);
+        let startIndex = 0;
+        let endIndex = receivedMessage.length - 1;
+        for (let i = 0; i < receivedMessage.length; ++i) {
+          if (receivedMessage[i] == "{") {
+            startIndex = i;
+            break;
+          }
+        }
+        for (let i = receivedMessage.length - 1; i >= 0; --i) {
+          if (receivedMessage[i] == "}" || startIndex == endIndex) {
+            endIndex = i;
+            break;
+          }
+        }
+        if (startIndex >= endIndex) {
+          throw new Error("JSON字符串格式错误");
+        }
+        parsedMessage = JSON.parse(receivedMessage.substring(startIndex, endIndex + 1));
+
+        console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+        const stockDataArray = parsedMessage.data;
+        marketSituationStore.cardData = globalIndexArray.value.map((item) => ({
+          market: item.market,
+          stockCode: item.stockCode,
+          stockName: item.stockName,
+          currentPrice: stockDataArray[item.stockCode][0].current_price.toFixed(2),
+          changeAmount: (stockDataArray[item.stockCode][0].current_price - stockDataArray[item.stockCode][0].pre_close).toFixed(2),
+          changePercent: ((100 * (stockDataArray[item.stockCode][0].current_price - stockDataArray[item.stockCode][0].pre_close)) / stockDataArray[item.stockCode][0].pre_close).toFixed(2) + "%",
+          isRising: stockDataArray[item.stockCode][0].current_price - stockDataArray[item.stockCode][0].pre_close >= 0,
+        }));
+      }
+    } else {
+      // 没有通过JSON解析判断，说明不是需要的数据
+      console.log("不是需要的数据，不做处理");
+    }
+  } catch (error) {
+    console.error("解析TCP股票数据失败:", error.message);
+    console.error("错误详情:", error);
+  }
+};
+
+// 移除TCP监听器
+const removeTcpListeners = () => {
+  if (connectionListener.value) {
+    tcpConnection.removeConnectionListener(connectionListener.value);
+    connectionListener.value = null;
+    console.log("已移除TCP连接状态监听器");
+  }
+
+  if (messageListener.value) {
+    tcpConnection.removeMessageListener(messageListener.value);
+    messageListener.value = null;
+    console.log("已移除TCP消息监听器");
+  }
+};
+
+const startTcp = () => {
+  try {
+    removeTcpListeners();
+    disconnectTcp();
+    initTcpListeners();
+    connectTcp();
+  } catch (error) {
+    console.error("建立连接并设置监听出错:", error);
+
+  }
+};
+
+onUnmounted(() => {
+  sendTcpMessage("stop_real_time");
+  removeTcpListeners();
+  disconnectTcp();
+});
+
 onMounted(async () => {
   await getGlobalIndex();
+  initTcpListeners();
+  await nextTick();
+  // 开始连接
+  startTcp();
   // 状态栏高度
   iSMT.value = uni.getSystemInfoSync().statusBarHeight;
 
diff --git a/pages/morningMarketAnalysis/morningMarketAnalysis.vue b/pages/morningMarketAnalysis/morningMarketAnalysis.vue
index d6e5f63..bd8dc48 100644
--- a/pages/morningMarketAnalysis/morningMarketAnalysis.vue
+++ b/pages/morningMarketAnalysis/morningMarketAnalysis.vue
@@ -1,6 +1,13 @@
 <template>
-	<view>
-		早盘解析页面
+	<view class="container">
+		<view class="content">
+			<image 
+				class="no-data-image" 
+				src="https://d31zlh4on95l9h.cloudfront.net/images/f5a9bd32c81bc7cca47252b51357c12f.png" 
+				mode="aspectFit"
+			></image>
+			<text class="no-data-text">暂无数据~</text>
+		</view>
 	</view>
 </template>
 
@@ -18,5 +25,31 @@
 </script>
 
 <style>
+.container {
+	width: 100%;
+	height: 100vh;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: #f5f5f5;
+}
 
-</style>
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+
+.no-data-image {
+	width: 200px;
+	height: 200px;
+	margin-bottom: 20px;
+}
+
+.no-data-text {
+	font-size: 16px;
+	color: #999999;
+	text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/pages/setting/share.vue b/pages/setting/share.vue
index 78bf6f8..4fc7447 100644
--- a/pages/setting/share.vue
+++ b/pages/setting/share.vue
@@ -1,111 +1,299 @@
 <template>
-	<view class="all">
-		<img class="img-share" src="/static/my/shareBackground.png" />
-		<img class="img-greenBack" src="/static/my/greenBackground.png" />
-		<img class="img-QRcode" src="/static/my/QRcode.png" />
-		<img class="img-award" src="/static/my/award.png" />
-		<img class="img-myFriends" src="/static/my/myFriends.png" />
-		<img class="img-friends" src="/static/my/shareFriends.png" />
-		<text class="jwcode">{{ jwcode }}</text>
-		<button class="invite">立即邀请</button>
-	</view>
+  <view class="all">
+    <!-- 背景图部分 -->
+    <image class="img-share" src="/static/my/shareBackground.png"/>
+    <image class="img-greenBack" src="/static/my/greenBackground.png"/>
+    <!--   todo 这里给我个码-->
+    <image class="img-QRcode" src="/static/my/QRcode.png"/>
+    <image class="img-award" src="/static/my/award.png"/>
+    <image class="img-myFriends" src="/static/my/myFriends.png"/>
+    <image class="img-friends" src="/static/my/shareFriends.png"/>
+
+    <!-- dccode -->
+    <text class="jwcode">{{ dccode }}</text>
+
+    <!-- 邀请按钮 -->
+    <button class="invite" @click="openShare">立即邀请</button>
+
+    <!-- 分享弹窗 -->
+    <uni-popup ref="shareRef" type="share" safeArea>
+      <SharePopup @select="onShareSelect" @close="closeShare" title=" "/>
+    </uni-popup>
+
+    <!-- 二次弹窗 -->
+    <uni-popup ref="secondPopup" type="share">
+      <view class="second-popup">
+        <view style=" display: flex;justify-content: center;align-items: center; font-size: 17px">
+          <image style="width: 16px; height: 16px; margin-right: 8rpx" src="/static/my/share/success.png"/>
+          <text>已复制</text>
+        </view>
+
+        <view class="popup-msg-box">
+          <text>{{ popupMsg }}</text>
+        </view>
+        <view style="justify-content: center; align-items: center;">
+          <!-- 二次弹窗中的按钮图标 -->
+          <button
+              style="border-radius: 40rpx; background-color: black; color: white; display: flex; align-items: center; justify-content: center; padding: 12rpx 24rpx;"
+              @click="closeSecondPopup">
+            <image style="width: 25px; height: 25px; margin-right: 8rpx;"
+                   :src="platformIconMap[selectedPlatform]"/>
+            去粘贴给好友
+          </button>
+        </view>
+
+
+      </view>
+    </uni-popup>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref
-	} from 'vue'
+import {ref} from 'vue'
+import SharePopup from '@/components/SharePopup.vue'
+import {getUserInfo} from "@/api/member";
+import {Share} from "@/api/setting/share";
+
+/* =============== 数据与引用 =============== */
+const shareRef = ref(null)
+const secondPopup = ref(null)
+const popupMsg = ref('')
+// const jwcode = ref('90047681')
+// 选中的平台
+const selectedPlatform = ref('')
+
+// dccode
+const dccode = ref('')
+//  token
+const token = ref('1ab8f83f391ca866191385d0e5048938')
+// 设备码
+const deviceId = ref(100)
+// 版本
+const version = ref(100)
+// 获取设备类型
+const client = ref('android')
+
+// 平台图标
+const platformIconMap = ref({
+  'WeChat': '/static/my/share/WeChat.png',
+  'WhatsApp': '/static/my/share/WhatsApp.png',
+  'Line': '/static/my/share/Line.png',
+  'KakaoTalk': '/static/my/share/KakaoTalk.png',
+  '复制链接': '/static/my/share/share.png'
+})
+
+// 用户信息
+const userInfoRes = ref()
+
+// 分享人的dccode
+const shareLink = ref('')
+
+/* =============== 方法 =============== */
+
+userInfoRes.value = getUserInfo()
+userInfoRes.value.then(res => {
+  dccode.value = res.data.dccode
+  console.log('用户信息', res.data)
+})
+
+const ShareRes = ref()
+ShareRes.value = Share()
+ShareRes.value.then(res => {
+  if (res.code === 200){
+    shareLink.value = res.message
+    console.log('分享接口返回', res.data)
+  }else {
+    console.log('分享接口返回失败', res.data)
+  }
+})
+
+
+
+// 打开分享弹窗
+function openShare() {
+  Share()
+  shareRef.value.open()
+}
+
+// 关闭分享弹窗
+function closeShare() {
+  shareRef.value.close()
+}
+
+//
+
+// 点击分享选项
+function onShareSelect({item}) {
+  console.log('选择了：', item.name)
+  selectedPlatform.value = item.name // 记录选中的平台
+
+  // // 生成动态助力链接
+  // const baseUrl = 'https:'
+  // // const shareLink = `${baseUrl}?token=${encodeURIComponent(token.value)}&deviceId=${encodeURIComponent(deviceId.value)}&version=${encodeURIComponent(version.value)}&client=${encodeURIComponent(client.value)}`
+  // const shareLink = `$ `
+
+  // 关闭第一个弹窗
+  shareRef.value.close()
+  popupMsg.value = `【DeepChart】邀请你加入，点击链接帮我助力: ${shareLink.value}`
+
+
+  uni.setClipboardData({
+    data: popupMsg.value,
+    showToast: false
+  });
+  /*  // 根据分享选项显示不同提示
+    if (item.name === '复制链接') {
+      popupMsg.value = '链接已复制，快去分享给好友吧～'
+    } else if (item.name === 'WeChat') {
+      popupMsg.value = '请在微信中分享～'
+    } else {
+      popupMsg.value = `你选择了 ${item.name}`
+    }*/
+
+  // 打开第二个弹窗
+  secondPopup.value.open()
+}
+
+
+// 关闭第二个弹窗
+function closeSecondPopup() {
+  if (selectedPlatform.value === 'WeChat') {
+    uni.share({
+      provider: "weixin",
+      scene: "WXSceneSession",
+      type: 1,
+      summary: popupMsg.value,
+      success: function (res) {
+        console.log("success:" + JSON.stringify(res));
+      },
+      fail: function (err) {
+        console.log("fail:" + JSON.stringify(err));
+      }
+    });
+    secondPopup.value.close()
+  }
+  // 其他的几种情况 需要适配
+  else if (selectedPlatform.value === 'WhatsApp' || selectedPlatform.value === 'Line' || selectedPlatform.value === 'KakaoTalk') {
+    secondPopup.value.close()
+    uni.showToast({title: '开发中……', icon: 'none'})
+  } else if (selectedPlatform.value === '复制链接') {
+    uni.showToast({title: '已复制', icon: 'success'})
+
+    secondPopup.value.close()
+  }
+}
+
 
-	const jwcode = ref('90047681')
 </script>
 
-<style>
-	.all {
-		position: relative;
-		width: 750rpx;
-		height: auto;
-	}
-
-	.img-share {
-		width: 750rpx;
-		height: 2118rpx;
-		position: absolute;
-		top: 0;
-		left: 0;
-		z-index: 1;
-	}
-	
-	.img-QRcode{
-		width:320rpx;
-		height:320rpx;
-		position:absolute;
-		top:26vh;
-		left:215rpx;
-		z-index: 3;
-	}
-
-	.img-greenBack {
-		width: 670rpx;
-		height: 1740rpx;
-		position: absolute;
-		top: 16vh;
-		/* 为什么要用这个替代 margin-top */
-		left: 40rpx;
-		/* 还有 padding-left */
-		z-index: 2;
-	}
-
-	.img-friends {
-		width: 602rpx;
-		height: 840rpx;
-		position: absolute;
-		top: 68vh;
-		left: 74rpx;
-		z-index: 3;
-	}
-
-	.img-award {
-		width: 300rpx;
-		height: 120rpx;
-		position: absolute;
-		top: 61vh;
-		left: 75rpx;
-		z-index: 3;
-	}
-
-	.img-myFriends {
-		width: 300rpx;
-		height: 88rpx;
-		position: absolute;
-		top: 61vh;
-		right: 75rpx;
-		z-index: 3;
-	}
-
-	.jwcode {
-		width: 320rpx;
-		height: 38rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		top: 19vh;
-		left: 212rpx;
-		z-index: 999;
-	}
-
-	.invite {
-		width: 320rpx;
-		height: 80rpx;
-		border-radius: 40rpx;
-		background-color: black;
-		color:white;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		top: 50.7vh;
-		left: 212rpx;
-		z-index: 999;
-	}
-</style>
\ No newline at end of file
+<style scoped>
+.all {
+  position: relative;
+  width: 750rpx;
+  height: auto;
+}
+
+/* 背景图片部分 */
+.img-share {
+  width: 750rpx;
+  height: 2118rpx;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1;
+}
+
+.img-greenBack {
+  width: 670rpx;
+  height: 1740rpx;
+  position: absolute;
+  top: 16vh;
+  left: 40rpx;
+  z-index: 2;
+}
+
+.img-QRcode {
+  width: 320rpx;
+  height: 320rpx;
+  position: absolute;
+  top: 26vh;
+  left: 215rpx;
+  z-index: 3;
+}
+
+.img-award {
+  width: 300rpx;
+  height: 120rpx;
+  position: absolute;
+  top: 61vh;
+  left: 75rpx;
+  z-index: 3;
+}
+
+.img-myFriends {
+  width: 300rpx;
+  height: 88rpx;
+  position: absolute;
+  top: 61vh;
+  right: 75rpx;
+  z-index: 3;
+}
+
+.img-friends {
+  width: 602rpx;
+  height: 840rpx;
+  position: absolute;
+  top: 68vh;
+  left: 74rpx;
+  z-index: 3;
+}
+
+/* 邀请码与按钮 */
+.jwcode {
+  width: 320rpx;
+  height: 38rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  top: 19vh;
+  left: 212rpx;
+  z-index: 999;
+}
+
+.invite {
+  width: 320rpx;
+  height: 80rpx;
+  border-radius: 40rpx;
+  background-color: black;
+  color: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  top: 50.7vh;
+  left: 212rpx;
+  z-index: 999;
+}
+
+/* 第二个弹窗样式 */
+.second-popup {
+  background-color: #fff;
+  border-radius: 12px;
+  padding: 30rpx;
+  text-align: center;
+}
+
+.popup-msg-box {
+  background-color: #F3F3F3;
+  border-radius: 8px;
+  padding: 12px 16px;
+  margin: 10px;
+
+  align-items: center;
+  justify-content: center;
+
+  overflow: hidden; /* 隐藏溢出内容 */
+  text-overflow: ellipsis; /* 溢出部分显示... */
+}
+</style>
diff --git a/static/my/share/KakaoTalk.png b/static/my/share/KakaoTalk.png
new file mode 100644
index 0000000..91f9f8f
Binary files /dev/null and b/static/my/share/KakaoTalk.png differ
diff --git a/static/my/share/Line.png b/static/my/share/Line.png
new file mode 100644
index 0000000..e899f1f
Binary files /dev/null and b/static/my/share/Line.png differ
diff --git a/static/my/share/WeChat.png b/static/my/share/WeChat.png
new file mode 100644
index 0000000..27069da
Binary files /dev/null and b/static/my/share/WeChat.png differ
diff --git a/static/my/share/WhatsApp.png b/static/my/share/WhatsApp.png
new file mode 100644
index 0000000..3133f75
Binary files /dev/null and b/static/my/share/WhatsApp.png differ
diff --git a/static/my/share/share.png b/static/my/share/share.png
new file mode 100644
index 0000000..c947750
Binary files /dev/null and b/static/my/share/share.png differ
diff --git a/static/my/share/success.png b/static/my/share/success.png
new file mode 100644
index 0000000..aa4754c
Binary files /dev/null and b/static/my/share/success.png differ
diff --git a/stores/modules/marketSituation.js b/stores/modules/marketSituation.js
index 1f85660..2ae69fe 100644
--- a/stores/modules/marketSituation.js
+++ b/stores/modules/marketSituation.js
@@ -6,57 +6,14 @@ import { ref } from "vue";
 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,
-      },
-    ]);
-
+    const cardData = ref([]);
+    const gloablCardData = ref([]);
+    const marketDetailCardData = ref([]);
     // 记得 return
     return {
-        cardData
+      cardData,
+      gloablCardData,
+      marketDetailCardData,
     };
   },
   // TODO: 持久化
diff --git a/utils/http.js b/utils/http.js
index e2928d3..dcae7e5 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -3,7 +3,7 @@ import { useDeviceStore } from "../stores/modules/deviceInfo"
 import { useLoginStore } from "../stores/modules/login"
 
 const baseURL = "https://dbqb.nfdxy.net/testApi"
-// const baseURL = "http://192.168.40.8:9000"
+
 
 const httpInterceptor = {
     // 拦截前触发
@@ -44,7 +44,8 @@ const httpInterceptor = {
         //4 添加token，优先用store，没有则回退到body中的token，保持与Apifox一致
         const memberStore = useUserStore()
         const token = memberStore.userInfo?.token || options.data?.token
-        // const token = 'a72cf584af42525f214670cb47443820'
+        // const token = '2d0b5654409646713cdd40ec0d0bb56c'
+        // const token = '1b3a58424c5324e40d4bf4d085e18047'
         if (token) {
             options.header.token = token
         }