Merge branch 'milestone-20251031-简版功能开发' of http://39.101.133.168:8807/qimaohong/deepChartVueApp into milestone-20251031-简版功能开发

api/deepExploration/deepExploration.js

@@ -74,7 +74,24 @@ export const getModel4Second = (data) => {
   })
 }
 
+//不搜索时走这个
+export const getModeldefault = (data) => {
+  return http({
+    method: 'POST',
+    url: '/api/coze/default',
+	data
+  })
+}
+
 
+//k线数据
+export const getData = (data) => {
+  return http({
+    method: 'POST',
+    url: '/api/coze/WorkFlowData',
+	data
+  })
+}
 
 //历史记录列表
 export const RecordListApi = (data) => {

api/member.js

@@ -0,0 +1,37 @@
+import util from '../common/util.js'
+
+/*export const getUserInfo = (data = {}) => {
+    return util.request(
+        '/api/my/userInfo',
+        (res) => {
+            console.log('用户信息请求成功：', res);
+        },
+        {data},
+
+        (err) => {
+            console.log('用户信息请求失败：', err);
+        }
+    );
+};
+*/
+
+import {
+	http
+} from '../utils/http'
+
+
+/**
+ * 用户信息获取接口
+ * @param data
+ * @returns {Promise<unknown>}
+ */
+export const getUserInfo = (data) => {
+	return http({
+		method: 'POST',
+		url: '/api/my/userInfo',
+		data: data,
+		header:{
+			token:'014de5283d2930af6481ede591afd087'
+		}
+	})
+}

api/setting/general.js

@@ -0,0 +1,11 @@
+import { http } from '../../utils/http'
+
+
+
+export const getSetting = (data) => {
+    return http({
+        method: 'POST',
+        url: '/api/my/getSetting',
+        data: data,
+    })
+}

api/setting/nextPwd.js

@@ -0,0 +1,16 @@
+import {http} from '../../utils/http'
+
+/**
+ * 修改密码
+ * @param data
+ * @returns {*}
+ */
+export const updatePassword = (data) => {
+    return http({
+        method: 'POST',
+        url: '/api/my/updatePassword',
+        data:
+        data
+        ,
+    })
+}

api/setting/password.js

@@ -0,0 +1,45 @@
+import {
+	http
+} from '../../utils/http'
+
+/**
+ * 验证码发送
+ * @param data
+ * @returns {*}
+ */
+export const sendEmail = (data) => {
+	return http({
+		method: 'POST',
+		url: '/UserLogin/sendEmail',
+		data: data,
+	})
+}
+
+/**
+ * 验证码验证
+ * @param data
+ * @returns {*}
+ */
+export const validateCode = (data) => {
+	return http({
+		method: 'POST',
+		url: '/api/my/validateCode',
+		data: data,
+	})
+}
+
+export const sendPhone = (data) => {
+	return http({
+		method: 'POST',
+		url: '/UserLogin/sendPhone',
+		data: data,
+	})
+}
+
+export const changeBind = (data) => {
+	return http({
+		method: 'POST',
+		url: '/api/my/bindEmailOrPhone',
+		data: data,
+	})
+}

api/start/login.js

@@ -67,6 +67,36 @@ export const registerApi = (data) => {
   })
 }
 
+
+
+/**
+ * 忘记密码校验验证码
+ */
+
+export const verifyCodeApi = (data) => {
+  return http({
+    method: 'POST',
+    url: '/UserLogin/verifyCode',
+    data: data,
+  })
+}
+
+
+
+/**
+ * 忘记密码输入新的密码
+ */
+
+export const forgetApi = (data) => {
+  return http({
+    method: 'POST',
+    url: '/UserLogin/forget',
+    data: data,
+  })
+}
+
+
+
 /**
  * 修改密码
  * 

components/deepExploration_header.vue

@@ -72,6 +72,7 @@
             <view class="history-main" @click="itemClick(item)">
               <text class="history-query">{{ item.stockName }}</text>
               <text class="history-query">（{{ item.stockCode }}）</text>
+              <text class="history-query">（{{ item.stockCode }}）</text>
             </view>
             <text class="history-time">{{
               formatTimeForHistory(item.createdTime)
@@ -98,6 +99,7 @@ const props = defineProps({
   },
 });
 const showHistoryDrawer = ref(false);
+const modelType = ref('');
 const drawerOffsetY = ref(0);
 // const handleHistory = () => {
 //   showHistoryDrawer.value = true;

components/login-prompt.vue

@@ -15,20 +15,40 @@
 </template>
 
 <script setup>
-import { ref, nextTick, onMounted } from "vue";
+import { ref, nextTick, onMounted, watch } from "vue";
 import { useUserStore } from "../stores/modules/userInfo";
 import { useDeviceStore } from "../stores/modules/deviceInfo";
+import { useLoginStore } from "../stores/modules/login";
 import { LoginApi } from "../api/start/login";
 const deviceId = ref("");
 
 const userStore = useUserStore();
 const deviceStore = useDeviceStore();
+const loginStore = useLoginStore();
 // 初始化
 onMounted(() => {
   if (!userStore.userInfo) {
     show();
   }
-});
+}),
+  // watch(
+  //   () => loginStore.loginInfo,
+  //   (newVal, oldVal) => {
+  //     console.log("登录状态改变");
+  //     if (newVal === "false") {
+  //       console.log("登录失败");
+  //       show();
+  //       loginStore.setLoginInfo("true");
+  //     }
+  //   }
+  // );
+
+  loginStore.$subscribe(() => {
+    if (loginStore.loginInfo === "false") {
+      console.log("登录失败");
+      show();
+    }
+  });
 
 // 定义响应式数据
 const showPrompt = ref(false);
@@ -84,6 +104,7 @@ const continueAsVisitor = async () => {
 
   if (res.code === 200) {
     userStore.setUserInfo(res.data);
+    console.log("0loginStore.loginInfo", loginStore.loginInfo);
     hide();
     
     // 发送游客登录成功事件，通知首页重新加载

package-lock.json

@@ -8,6 +8,7 @@
         "@dcloudio/uni-ui": "^1.5.11",
         "@element-plus/icons-vue": "^2.3.2",
         "element-plus": "^2.11.5",
+        "highlight.js": "^11.11.1",
         "marked": "^2.0.1",
         "pinia": "^3.0.3",
         "pinia-plugin-persistedstate": "^4.5.0",
@@ -480,6 +481,15 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/highlight.js": {
+      "version": "11.11.1",
+      "resolved": "https://registry.npmmirror.com/highlight.js/-/highlight.js-11.11.1.tgz",
+      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/hookable": {
       "version": "5.5.3",
       "license": "MIT"
@@ -598,6 +608,8 @@
     },
     "node_modules/pinia-plugin-persistedstate": {
       "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-4.5.0.tgz",
+      "integrity": "sha512-QTkP1xJVyCdr2I2p3AKUZM84/e+IS+HktRxKGAIuDzkyaKKV48mQcYkJFVVDuvTxlI5j6X3oZObpqoVB8JnWpw==",
       "license": "MIT",
       "dependencies": {
         "deep-pick-omit": "^1.2.1",

package.json

@@ -3,11 +3,10 @@
     "@dcloudio/uni-ui": "^1.5.11",
     "@element-plus/icons-vue": "^2.3.2",
     "element-plus": "^2.11.5",
-    "vue-i18n": "^9.14.5",
+    "highlight.js": "^11.11.1",
     "marked": "^2.0.1",
     "pinia": "^3.0.3",
-    "pinia-plugin-persistedstate": "^4.5.0"
+    "pinia-plugin-persistedstate": "^4.5.0",
+    "vue-i18n": "^9.14.5"
   }
-
-
 }

pages.json

@@ -29,16 +29,6 @@
 			}
 		},
 		{
-			"path": "pages/start/index/index",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "uni-app",
-				"disableSwipeBack": true,
-				"titleNView": false,
-				"bounce": false
-			}
-		},
-		{
 			"path": "pages/start/Registration/Registration",
 			"style": {
 				"navigationBarTitleText": "",
@@ -107,14 +97,6 @@
 			}
 		},
 		{
-			"path": "pages/marketSituation/chartExample",
-			"style": {
-				"navigationBarTitleText": "图表示例",
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
-		},
-		{
 			"path": "pages/marketSituation/globalIndex",
 			"style": {
 				"navigationStyle": "custom",
@@ -316,6 +298,13 @@
 			"style" : 
 			{
 				"navigationBarTitleText": "选股策略"
+		}
+	},
+		{
+			"path" : "pages/setting/createPwd",
+			"style" : 
+			{
+				"navigationBarTitleText" : "创建密码"
 			}
 		}
 	],

pages/deepExploration/MainForceActions.vue

@@ -47,9 +47,12 @@
 				<view class="txt">
 					<view class="txtHeader">
 						<image src="/static/deepExploration-images/plus.png" mode="aspectFill"></image>
-						<text>主力追踪</text>
+						<text>{{navItems[currentIndex].name}}</text>
+					</view>
+					<view class="txtContent">
+						<view v-if="loading" class="loading">加载中...</view>
+						<rich-text :nodes="htmlContent"></rich-text>
 					</view>
-					<view class="txtContent"></view>
 				</view>
 			</view>
 		</view>
@@ -78,7 +81,12 @@
 		getModel3Second,
 		getModel4First,
 		getModel4Second,
+		getModeldefault,
+		getData
 	} from '/api/deepExploration/deepExploration.js'
+	import marked from 'marked'; // 引入 marked 库
+	import hljs from 'highlight.js';
+	import 'highlight.js/styles/atom-one-dark.css'; // 可替换为其他主题
 
 	// 响应式变量定义
 	const type = ref('deepExploration')
@@ -104,43 +112,25 @@
 
 	//搜索股票
 	const searchStock = () => {
+		htmlContent.value = ''
 		console.log('搜索参数：', stockName.value);
-		if (currentIndex.value == 0) {
-			handleModel(0)
-		} else if (currentIndex.value == 1) {
-			console.log(index);
-			handleModel(1)
-		} else if (currentIndex.value == 2) {
-			console.log(index);
-			handleModel(2)
-		} else if (currentIndex.value == 3) {
-			console.log(index);
-			handleModel(3)
-		}else{
+		if (currentIndex.value ) {
+		handleModels()
+		getServerData()
+		} else {
 			uni.showToast({
-						title: '请选择模块',
-						icon: 'none',
-						duration: 2000
-					})
+				title: '请选择模块',
+				icon: 'none',
+				duration: 2000
+			})
 		}
 
 	}
 	//点击四大模块
-	const handleModel = (index) => {
+	const handleModel = async(index) => {
+		htmlContent.value = ''
 		currentIndex.value = index
-		if (currentIndex.value == 0) {
-			console.log(index);
-			handleTrack()
-		} else if (currentIndex.value == 1) {
-			console.log(index);
-			handleRadar()
-		} else if (currentIndex.value == 2) {
-			console.log(index);
-			handleDecode()
-		} else if (currentIndex.value == 3) {
-			console.log(index);
-			handleCapitalFlow()
-		}
+		await handleModels()
 	}
 
 	const stockName = ref('')
@@ -150,52 +140,116 @@
 	const recordId = ref('')
 	const parentId = ref('')
 	const stockId = ref('')
-	//点击主力追踪
-	const handleTrack = async () => {
+	const market = ref('')
+
+	const loading = ref(true);
+	const error = ref('');
+	const htmlContent = ref('');
+	const markdownContent = ref('');
+
+
+	const renderer = new marked.Renderer();
+	renderer.heading = function(text, level) {
+		return `<p>${text}</p>`;
+	};
+	// 初始化 marked 配置（支持代码高亮）
+	marked.setOptions({
+		highlight: (code, lang) => {
+			if (lang && hljs.getLanguage(lang)) {
+				return hljs.highlight(code, {
+					language: lang
+				}).value;
+			}
+			return hljs.highlightAuto(code).value;
+		},
+		renderer,
+		breaks: true, // 换行转<br>
+		gfm: true, // 支持GitHub flavored Markdown
+		sanitize: false, // 保留HTML标签（如<span style>）
+	});
+
+	//获取模型数据
+	const handleModels = async () => {
 		try {
-			const result = await getModel1First({
-				content: searchName.value,
-				language: "cn",
-				marketList: "hk,cn,usa,my,sg,vi,in,gb",
-				model: 1
-			})
-			console.log('result', result);
-			if (result.code == 200) {
-				stockCode.value = result.data.code
-				stockName.value = result.data.name
-				recordId.value = result.data.recordId
-				parentId.value = result.data.parentId
-				stockId.value = result.data.stockId
-				language.value = result.data.language
+			// markdownContent.value = '\n## 📊 主力追踪分析：\n\n### 🕵️ 主力行为\n\t1. 📊 该股庄家中长期筹码成本价格为 360.249，短期资金成本价格为 412.577。该股筹码分散，当日筹码成本价格为 444.330。\n\t2. 🔍 近日没有出现主力集中吸筹。\n\t3. 📈 近期主力持仓比例大于散户持仓比例。 当日主力持仓增加。 当日散户持仓减少。\n\n### 📊 空间维度:\n\t- 📉 预测低一值: <font color=\"#13c2c2\">443.092</font>  \n    - 📈 预测高一值: <font color=\"#ff4d4f\">466.458</font>\n\t- 📉 预测低二值: <font color=\"#13c2c2\">447.354</font>\n\t- 📈 预测高二值: <font color=\"#ff4d4f\">462.514</font>\n\t<font color=\"#722ed1\">AI智能均线空头排列，当前卖盘小于买盘</font>\n\n### 综合作战\n\t\t\t<font color=\"#fa8c16\">当前股票处于安全区，牵牛绳为红色，出现蓝色推进K线。</font>\n\t\t\t<font color=\"#eb2f96\">该股整体趋势相对较强，个股正处于推进上涨的关键阶段。若当前持有该股票，建议继续持有，进行持续跟踪。若当前无该股票，建议持续跟踪，等待适当时机再进行介入。</font>\n\n---\n<font color=\"#8c8c8c\">*该内容由AI生成，仅供参考，投资有风险，请注意甄别。*</font>\n    '
+			// htmlContent.value = marked.parse(markdownContent.value);
+			loading.value = true;
+			if (searchName.value == '') {
+				console.log('没有搜索',searchName.value);
+			const rresult = await handleDefault()
+			
+			// markdownContent.value = res.data.markdown
+			htmlContent.value = marked.parse(markdownContent.value);
+			}else{
+					console.log('搜索',searchName.value);
+				const result = await getModel1First({
+					content: searchName.value,
+					language: "cn",
+					marketList: "hk,cn,usa,my,sg,vi,in,gb",
+					model: currentIndex.value+1
+				})
+				console.log('result', result);
+				if (result.code == 200) {
+					stockCode.value = result.data.code
+					stockName.value = result.data.name
+					recordId.value = result.data.recordId
+					parentId.value = result.data.parentId
+					stockId.value = result.data.stockId
+					language.value = result.data.language
+					market.value = result.data.market 
+				} else {
+					return
+				}
+				
+				
 				const res = await getModel1Second({
 					language: language.value,
 					recordId: recordId.value,
 					parentId: parentId.value,
-					stockId: stockId.value
+					stockId: stockId.value,
+					token: 'pCtw6AYK0EHAaIexoFHsbZjtsfEAIhcmwkCFm6uKko8VPfMvyDiODL9v9c0veic9fIpQbvT8zN4sH/Si6Q'
 				})
+				if (res.code == 200) {
+					const rawMarkdown = res.data.markdown;
+					const adaptedMarkdown = rawMarkdown.replace(/^### /gm, ''); // 全局替换行首的###
+					markdownContent.value = adaptedMarkdown;
+					// markdownContent.value = res.data.markdown
+					htmlContent.value = marked.parse(markdownContent.value);
+				}
 				console.log('res', res);
 			}
 			
-		} catch {
 
+		} catch {
+			error.value = e.message || '加载失败，请重试';
+		} finally {
+			loading.value = false;
 		}
 	}
 
-	//点击主力雷达
-	const handleRadar = () => {
+	const handleDefault = async () => {
+		 const result = await getModeldefault({
+			token: "pCtw6AYK0EHAaIexoFHsbZjtsfEAIhcmwkCFm6uKko8VPfMvyDiODL9v9c0veic9fIpQbvT8zN4sH/Si6Q",
+			model: currentIndex.value+1
+		})
 		
+		const rawMarkdown = result.data.markdown;
+		const adaptedMarkdown = rawMarkdown.replace(/^### /gm, ''); // 全局替换行首的###
+		markdownContent.value = adaptedMarkdown;
+		htmlContent.value = marked.parse(markdownContent.value);
 	}
 	
-	//点击主力解码
-	const handleDecode = () => {
-
-	}
-
-	//点击主力资金流
-	const handleCapitalFlow = () => {
-
-	}
+	 const getServerData = async() =>{
+		 const result = await getData({
+			  market: market.value || '',
+			   code: searchName || '',
+			   language: "cn",
+			   brainPrivilegeState: 1,
+			   marketList: "usa.sg.my.hk.cn.can.vi.th.in.gb"
+		 })
 		 
+		 console.log('k线数据',result);
+	 }
 
 	// 1. K线图配置
 	const opts = ref({
@@ -265,302 +319,302 @@
 	const chartData = ref({})
 
 	// 获取K线数据函数（直接定义，无需methods）
-	const getServerData = () => {
-		// 模拟服务器请求延时
-		setTimeout(() => {
-			const res = {
-				"categories": [
-					"2025/08/25",
-					"2025/08/26",
-					"2025/08/27",
-					"2025/08/28",
-					"2025/08/29",
-					"2025/09/01",
-					"2025/09/02",
-					"2025/09/03",
-					"2025/09/04",
-					"2025/09/05",
-					"2025/09/08",
-					"2025/09/09",
-					"2025/09/10",
-					"2025/09/11",
-					"2025/09/12",
-					"2025/09/15",
-					"2025/09/16",
-					"2025/09/17",
-					"2025/09/18",
-					"2025/09/19",
-					"2025/09/22",
-					"2025/09/23",
-					"2025/09/24",
-					"2025/09/25",
-					"2025/09/26",
-					"2025/09/29",
-					"2025/09/30",
-					"2025/10/09",
-					"2025/10/10",
-					"2025/10/13",
-					"2025/10/14",
-					"2025/10/15",
-					"2025/10/16",
-					"2025/10/17",
-					"2025/10/20",
-					"2025/10/21",
-					"2025/10/22",
-					"2025/10/23",
-					"2025/10/24",
-					"2025/10/27"
-				],
-				series: [{
-					"name": "贵州茅台",
-					"data": [
-						[
-							1470.01,
-							1496.0,
-							1466.0,
-							1499.33
-						],
-						[
-							1490.32,
-							1474.23,
-							1480.01,
-							1481.61
-						],
-						[
-							1481.88,
-							1484.93,
-							1448.0,
-							1448.0
-						],
-						[
-							1447.97,
-							1456.1,
-							1438.77,
-							1446.1
-						],
-						[
-							1453.0,
-							1482.58,
-							1452.0,
-							1480.0
-						],
-						[
-							1482.2,
-							1488.0,
-							1465.7,
-							1476.1
-						],
-						[
-							1478.66,
-							1509.0,
-							1478.0,
-							1491.3
-						],
-						[
-							1491.0,
-							1503.5,
-							1466.0,
-							1480.55
-						],
-						[
-							1472.0,
-							1479.3,
-							1460.47,
-							1480.66
-						],
-						[
-							1471.0,
-							1486.97,
-							1464.0,
-							1483.0
-						],
-						[
-							1483.0,
-							1506.44,
-							1477.5,
-							1501.23
-						],
-						[
-							1505.0,
-							1509.95,
-							1493.42,
-							1505.0
-						],
-						[
-							1506.66,
-							1529.95,
-							1496.0,
-							1522.01
-						],
-						[
-							1522.01,
-							1526.02,
-							1508.5,
-							1523.5
-						],
-						[
-							1526.0,
-							1538.02,
-							1510.53,
-							1516.0
-						],
-						[
-							1515.87,
-							1517.48,
-							1501.5,
-							1515.1
-						],
-						[
-							1515.1,
-							1520.99,
-							1496.21,
-							1499.98
-						],
-						[
-							1499.99,
-							1510.28,
-							1490.01,
-							1493.0
-						],
-						[
-							1492.0,
-							1497.8,
-							1463.5,
-							1467.96
-						],
-						[
-							1467.99,
-							1475.5,
-							1457.01,
-							1467.97
-						],
-						[
-							1465.09,
-							1467.97,
-							1450.01,
-							1453.35
-						],
-						[
-							1450.5,
-							1457.5,
-							1440.0,
-							1447.42
-						],
-						[
-							1434.07,
-							1456.78,
-							1434.07,
-							1442.0
-						],
-						[
-							1442.83,
-							1445.21,
-							1436.0,
-							1439.0
-						],
-						[
-							1441.18,
-							1447.11,
-							1428.01,
-							1435.0
-						],
-						[
-							1439.38,
-							1469.99,
-							1435.0,
-							1460.86
-						],
-						[
-							1460.0,
-							1460.76,
-							1440.0,
-							1443.99
-						],
-						[
-							1436.0,
-							1439.38,
-							1420.0,
-							1436.78
-						],
-						[
-							1437.6,
-							1439.94,
-							1427.5,
-							1430.0
-						],
-						[
-							1415.7,
-							1422.85,
-							1415.12,
-							1419.2
-						],
-						[
-							1429.99,
-							1464.0,
-							1429.99,
-							1451.02
-						],
-						[
-							1450.98,
-							1463.0,
-							1445.08,
-							1462.0
-						],
-						[
-							1461.92,
-							1484.95,
-							1458.88,
-							1484.91
-						],
-						[
-							1483.1,
-							1488.0,
-							1454.03,
-							1455.0
-						],
-						[
-							1455.0,
-							1469.5,
-							1454.88,
-							1457.93
-						],
-						[
-							1459.0,
-							1469.94,
-							1455.5,
-							1462.26
-						],
-						[
-							1462.08,
-							1465.73,
-							1456.0,
-							1458.7
-						],
-						[
-							1455.0,
-							1468.8,
-							1447.2,
-							1467.98
-						],
-						[
-							1467.95,
-							1478.88,
-							1449.34,
-							1450.0
-						],
-						[
-							1440.0,
-							1452.49,
-							1435.99,
-							1440.41
-						]
-					],
-				}]
-			}
-			// 给响应式变量赋值（需修改.value）
-			chartData.value = JSON.parse(JSON.stringify(res))
-		}, 500)
-	}
+	// const getServerData = () => {
+	// 	// 模拟服务器请求延时
+	// 	setTimeout(() => {
+	// 		const res = {
+	// 			"categories": [
+	// 				"2025/08/25",
+	// 				"2025/08/26",
+	// 				"2025/08/27",
+	// 				"2025/08/28",
+	// 				"2025/08/29",
+	// 				"2025/09/01",
+	// 				"2025/09/02",
+	// 				"2025/09/03",
+	// 				"2025/09/04",
+	// 				"2025/09/05",
+	// 				"2025/09/08",
+	// 				"2025/09/09",
+	// 				"2025/09/10",
+	// 				"2025/09/11",
+	// 				"2025/09/12",
+	// 				"2025/09/15",
+	// 				"2025/09/16",
+	// 				"2025/09/17",
+	// 				"2025/09/18",
+	// 				"2025/09/19",
+	// 				"2025/09/22",
+	// 				"2025/09/23",
+	// 				"2025/09/24",
+	// 				"2025/09/25",
+	// 				"2025/09/26",
+	// 				"2025/09/29",
+	// 				"2025/09/30",
+	// 				"2025/10/09",
+	// 				"2025/10/10",
+	// 				"2025/10/13",
+	// 				"2025/10/14",
+	// 				"2025/10/15",
+	// 				"2025/10/16",
+	// 				"2025/10/17",
+	// 				"2025/10/20",
+	// 				"2025/10/21",
+	// 				"2025/10/22",
+	// 				"2025/10/23",
+	// 				"2025/10/24",
+	// 				"2025/10/27"
+	// 			],
+	// 			series: [{
+	// 				"name": "贵州茅台",
+	// 				"data": [
+	// 					[
+	// 						1470.01,
+	// 						1496.0,
+	// 						1466.0,
+	// 						1499.33
+	// 					],
+	// 					[
+	// 						1490.32,
+	// 						1474.23,
+	// 						1480.01,
+	// 						1481.61
+	// 					],
+	// 					[
+	// 						1481.88,
+	// 						1484.93,
+	// 						1448.0,
+	// 						1448.0
+	// 					],
+	// 					[
+	// 						1447.97,
+	// 						1456.1,
+	// 						1438.77,
+	// 						1446.1
+	// 					],
+	// 					[
+	// 						1453.0,
+	// 						1482.58,
+	// 						1452.0,
+	// 						1480.0
+	// 					],
+	// 					[
+	// 						1482.2,
+	// 						1488.0,
+	// 						1465.7,
+	// 						1476.1
+	// 					],
+	// 					[
+	// 						1478.66,
+	// 						1509.0,
+	// 						1478.0,
+	// 						1491.3
+	// 					],
+	// 					[
+	// 						1491.0,
+	// 						1503.5,
+	// 						1466.0,
+	// 						1480.55
+	// 					],
+	// 					[
+	// 						1472.0,
+	// 						1479.3,
+	// 						1460.47,
+	// 						1480.66
+	// 					],
+	// 					[
+	// 						1471.0,
+	// 						1486.97,
+	// 						1464.0,
+	// 						1483.0
+	// 					],
+	// 					[
+	// 						1483.0,
+	// 						1506.44,
+	// 						1477.5,
+	// 						1501.23
+	// 					],
+	// 					[
+	// 						1505.0,
+	// 						1509.95,
+	// 						1493.42,
+	// 						1505.0
+	// 					],
+	// 					[
+	// 						1506.66,
+	// 						1529.95,
+	// 						1496.0,
+	// 						1522.01
+	// 					],
+	// 					[
+	// 						1522.01,
+	// 						1526.02,
+	// 						1508.5,
+	// 						1523.5
+	// 					],
+	// 					[
+	// 						1526.0,
+	// 						1538.02,
+	// 						1510.53,
+	// 						1516.0
+	// 					],
+	// 					[
+	// 						1515.87,
+	// 						1517.48,
+	// 						1501.5,
+	// 						1515.1
+	// 					],
+	// 					[
+	// 						1515.1,
+	// 						1520.99,
+	// 						1496.21,
+	// 						1499.98
+	// 					],
+	// 					[
+	// 						1499.99,
+	// 						1510.28,
+	// 						1490.01,
+	// 						1493.0
+	// 					],
+	// 					[
+	// 						1492.0,
+	// 						1497.8,
+	// 						1463.5,
+	// 						1467.96
+	// 					],
+	// 					[
+	// 						1467.99,
+	// 						1475.5,
+	// 						1457.01,
+	// 						1467.97
+	// 					],
+	// 					[
+	// 						1465.09,
+	// 						1467.97,
+	// 						1450.01,
+	// 						1453.35
+	// 					],
+	// 					[
+	// 						1450.5,
+	// 						1457.5,
+	// 						1440.0,
+	// 						1447.42
+	// 					],
+	// 					[
+	// 						1434.07,
+	// 						1456.78,
+	// 						1434.07,
+	// 						1442.0
+	// 					],
+	// 					[
+	// 						1442.83,
+	// 						1445.21,
+	// 						1436.0,
+	// 						1439.0
+	// 					],
+	// 					[
+	// 						1441.18,
+	// 						1447.11,
+	// 						1428.01,
+	// 						1435.0
+	// 					],
+	// 					[
+	// 						1439.38,
+	// 						1469.99,
+	// 						1435.0,
+	// 						1460.86
+	// 					],
+	// 					[
+	// 						1460.0,
+	// 						1460.76,
+	// 						1440.0,
+	// 						1443.99
+	// 					],
+	// 					[
+	// 						1436.0,
+	// 						1439.38,
+	// 						1420.0,
+	// 						1436.78
+	// 					],
+	// 					[
+	// 						1437.6,
+	// 						1439.94,
+	// 						1427.5,
+	// 						1430.0
+	// 					],
+	// 					[
+	// 						1415.7,
+	// 						1422.85,
+	// 						1415.12,
+	// 						1419.2
+	// 					],
+	// 					[
+	// 						1429.99,
+	// 						1464.0,
+	// 						1429.99,
+	// 						1451.02
+	// 					],
+	// 					[
+	// 						1450.98,
+	// 						1463.0,
+	// 						1445.08,
+	// 						1462.0
+	// 					],
+	// 					[
+	// 						1461.92,
+	// 						1484.95,
+	// 						1458.88,
+	// 						1484.91
+	// 					],
+	// 					[
+	// 						1483.1,
+	// 						1488.0,
+	// 						1454.03,
+	// 						1455.0
+	// 					],
+	// 					[
+	// 						1455.0,
+	// 						1469.5,
+	// 						1454.88,
+	// 						1457.93
+	// 					],
+	// 					[
+	// 						1459.0,
+	// 						1469.94,
+	// 						1455.5,
+	// 						1462.26
+	// 					],
+	// 					[
+	// 						1462.08,
+	// 						1465.73,
+	// 						1456.0,
+	// 						1458.7
+	// 					],
+	// 					[
+	// 						1455.0,
+	// 						1468.8,
+	// 						1447.2,
+	// 						1467.98
+	// 					],
+	// 					[
+	// 						1467.95,
+	// 						1478.88,
+	// 						1449.34,
+	// 						1450.0
+	// 					],
+	// 					[
+	// 						1440.0,
+	// 						1452.49,
+	// 						1435.99,
+	// 						1440.41
+	// 					]
+	// 				],
+	// 			}]
+	// 		}
+	// 		// 给响应式变量赋值（需修改.value）
+	// 		chartData.value = JSON.parse(JSON.stringify(res))
+	// 	}, 500)
+	// }
 
 	// 生命周期钩子：组件挂载后执行（替代onReady）
 	onMounted(() => {
@@ -584,8 +638,9 @@
 <style scoped lang="scss">
 	.main {
 		width: 100%;
-		height: 100vh;
+		min-height: 100vh;
 		background-color: #fff;
+		padding-bottom: 120rpx;
 
 		.search {
 			position: relative;
@@ -660,7 +715,6 @@
 			}
 
 			.graphAndTxt {
-				height: 300rpx;
 				background-color: #fff;
 				border-radius: 50rpx 50rpx 0 0;
 				padding: 68.6rpx 36.5rpx 0 36.5rpx;
@@ -783,6 +837,51 @@
 
 					.txtContent {
 						min-height: 200rpx;
+						padding: 20rpx 30rpx;
+						margin-bottom: 100rpx;
+
+						::v-deep * {
+							box-sizing: border-box;
+							width: 100% !important; // 强制所有解析后的标签占满容器宽度
+							white-space: normal !important; // 取消强制不换行
+							word-wrap: break-word !important; // 长词/长数字自动换行
+						}
+
+						// 标题样式（确保换行）
+						::v-deep h2 {
+							font-size: 32rpx;
+							color: #333;
+							margin: 25rpx 0 15rpx;
+							line-height: 1.5;
+						}
+
+						// 段落样式（核心换行控制）
+						::v-deep p {
+							font-size: 26rpx;
+							color: #666;
+							margin: 15rpx 0;
+							line-height: 1.8; // 增加行高，提升可读性
+							text-align: justify; // 两端对齐，避免单侧参差不齐
+						}
+
+						// 列表样式（纵向排列）
+						::v-deep ul,
+						::v-deep ol {
+							margin: 15rpx 0 15rpx 30rpx;
+						}
+
+						::v-deep li {
+							margin: 10rpx 0;
+							line-height: 1.6;
+						}
+
+						// 加载状态样式
+						.loading {
+							text-align: center;
+							padding: 50rpx 0;
+							color: #666;
+							font-size: 26rpx;
+						}
 					}
 				}
 			}

pages/deepMate/deepMate.vue

@@ -19,7 +19,8 @@
         <image
           src="https://d31zlh4on95l9h.cloudfront.net/images/d7c4e74201213a25dd9574e908233928.svg"
           class="icon"
-          @click="goToNotice" @tap="goToNotice"
+          @click="goToNotice"
+          @tap="goToNotice"
         >
         </image>
         <image
@@ -297,6 +298,11 @@ import {
   postHistory,
   postHistoryDetail,
 } from "../../api/deepMate/deepMate";
+
+const renderer = new marked.Renderer();
+renderer.heading = function (text, level) {
+  return `<p>${text}</p>`;
+};
 // 设置 marked 选项
 marked.setOptions({
   renderer: new marked.Renderer(),
@@ -621,13 +627,20 @@ const simulateBotResponse = async (userMessage) => {
   isSending.value = true;
 
   // 首先进行意图识别
-  const res = await postIntent({
-    content: userMessage,
-    language: "cn",
-    marketList: "hk,cn,usa,my,sg,vi,in,gb",
-    token:
-      "pCtw6AYK0EHAaIexoFHsbZjtsfEAIhcmwkCFm6uKko8VPfMvyDiODL9v9c0veic9fIpQbvT8zN4sH/Si6Q",
-  });
+  let res;
+  try {
+    res = await postIntent({
+      content: userMessage,
+      language: "cn",
+      marketList: "hk,cn,usa,my,sg,vi,in,gb",
+      token:
+        "pCtw6AYK0EHAaIexoFHsbZjtsfEAIhcmwkCFm6uKko8VPfMvyDiODL9v9c0veic9fIpQbvT8zN4sH/Si6Q",
+    });
+  } catch (error) {
+
+  } finally {
+    isSending.value = false;
+  }
 
   console.log("res" + res);
 
@@ -694,31 +707,39 @@ const simulateBotResponse = async (userMessage) => {
 
   // 获取股票信息
   const StockInfo = await postStock({
-    language: 'cn',
-    token: 'pCtw6AYK0EHAaIexoFHsbZjtsfEAIhcmwkCFm6uKko8VPfMvyDiODL9v9c0veic9fIpQbvT8zN4sH/Si6Q',
+    language: "cn",
+    token:
+      "pCtw6AYK0EHAaIexoFHsbZjtsfEAIhcmwkCFm6uKko8VPfMvyDiODL9v9c0veic9fIpQbvT8zN4sH/Si6Q",
     recordId: Number(recordId),
     parentId: Number(parentId),
     stockId: Number(stockId),
   });
-  console.log('postStock payload', { language: 'cn', token: '790750702588f1ea79f24dc56ccd5d8a', recordId, parentId, stockId });
-  console.log('StockInfo', StockInfo);
+  console.log("postStock payload", {
+    language: "cn",
+    token: "790750702588f1ea79f24dc56ccd5d8a",
+    recordId,
+    parentId,
+    stockId,
+  });
+  console.log("StockInfo", StockInfo);
 
   const cftl = StockInfo?.cftl || {};
-  const date = StockInfo?.date || '';
-  
+  const date = StockInfo?.date || "";
 
   if (StockInfo && StockInfo.code !== 200) {
-    const errMsg = `postStock失败(${StockInfo.code}): ${StockInfo.message || '未知错误'}`
-    console.warn(errMsg, StockInfo)
-    messages.value[messages.value.length - 1].isThinking = false
-    messages.value[messages.value.length - 1].isTyping = false
-    messages.value[messages.value.length - 1].content = errMsg
-    isSending.value = false
-    return
+    const errMsg = `postStock失败(${StockInfo.code}): ${
+      StockInfo.message || "未知错误"
+    }`;
+    console.warn(errMsg, StockInfo);
+    messages.value[messages.value.length - 1].isThinking = false;
+    messages.value[messages.value.length - 1].isTyping = false;
+    messages.value[messages.value.length - 1].content = errMsg;
+    isSending.value = false;
+    return;
   }
 
-  const markdown = StockInfo?.data?.markdown || '抱歉，未找到该股票';
-  console.log('StockInfo', StockInfo);
+  const markdown = StockInfo?.data?.markdown || "抱歉，未找到该股票";
+  console.log("StockInfo", StockInfo);
 
   // 添加请求延迟
   // const toDataInfo = await getData();
@@ -926,6 +947,8 @@ async function itemClick(item) {
       isTyping: false,
       isThinking: false,
     };
+
+    onDrawerBackClick();
     messages.value.push(botMsg);
   }
 }

pages/home/member.vue

@@ -1,294 +1,305 @@
 <template>
-	<view class="main">
-		<view class="top">
-			<view class="bell">
-				<image class="image-bell" src="/static/my/bell.png"></image>
-			</view>
-			<view class="msg">
-				<view class="msg-left">
-					<view class="avatar"></view>
-				</view>
-				<view class="msg-center">
-					<view style="display: flex;">
-						<view class="userInfo">{{ username }}</view>
-						<image class="image-editName" src="/static/my/editName.png"></image>
-					</view>
-					<view class="userId">ID:{{ dccode }}</view>
-				</view>
-				<view class="msg-right">
-					<image class="image-attendance" src="/static/my/Check-in.png" />
-					<span style="font-size:10px;">签到</span>
-				</view>
-			</view>
-
-			<view class="settings-buttons">
-				<view class="setting-btn" @click="goToMarket">
-					<image src="/static/my/MarketSettings.png" class="setting-icon" />
-					<text>行情设置</text>
-				</view>
-				<view class="setting-btn" @click="goToGeneral">
-					<image src="/static/my/Settings.png" class="setting-icon" />
-					<text>通用设置</text>
-				</view>
-			</view>
-
-			<view class="share" @click="goToShare">
-				<image class="img-share" src="/static/my/share.png" mode="widthFix" />
-			</view>
-		</view>
-		<view class="bottom">
-			<view class="list-item" @click="goToAccount">
-				<image src="/static/my/security.png" class="list-icon" />
-				<text>账号与安全</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-			<view class="list-item">
-				<image src="/static/my/connection.png" class="list-icon" />
-				<text>联系我们</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-			<view class="list-item" @click="goToNewVersion">
-				<image src="/static/my/update.png" class="list-icon" />
-				<text>新版本更新</text>
-				<view class="update-tip">有新版本可更新
-					<view class="circle"></view>
-				</view>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-			<view class="list-item">
-				<image src="/static/my/opinion.png" class="list-icon" />
-				<text>意见反馈</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-			<view class="list-item" @click="goToAbout">
-				<image src="/static/my/about.png" class="list-icon" />
-				<text>关于DeepChart</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-		</view>
-		<footerBar class="static-footer" :type="type"></footerBar>
-	</view>
+  <view class="main">
+    <view class="top">
+      <view class="bell">
+        <image class="image-bell" src="/static/my/bell.png"></image>
+      </view>
+      <view class="msg">
+        <view class="msg-left">
+          <view class="avatar"></view>
+        </view>
+        <view class="msg-center">
+          <view style="display: flex;">
+            <view class="userInfo">{{ username }}</view>
+            <image class="image-editName" src="/static/my/editName.png"></image>
+          </view>
+          <view class="userId">ID:{{ dccode }}</view>
+        </view>
+        <view class="msg-right">
+          <image class="image-attendance" src="/static/my/Check-in.png"/>
+          <span style="font-size:10px;">签到</span>
+        </view>
+      </view>
+
+      <view class="settings-buttons">
+        <view class="setting-btn" @click="goToMarket">
+          <image src="/static/my/MarketSettings.png" class="setting-icon"/>
+          <text>行情设置</text>
+        </view>
+        <view class="setting-btn" @click="goToGeneral">
+          <image src="/static/my/Settings.png" class="setting-icon"/>
+          <text>通用设置</text>
+        </view>
+      </view>
+
+      <view class="share" @click="goToShare">
+        <image class="img-share" src="/static/my/share.png" mode="widthFix"/>
+      </view>
+    </view>
+    <view class="bottom">
+      <view class="list-item" @click="goToAccount">
+        <image src="/static/my/security.png" class="list-icon"/>
+        <text>账号与安全</text>
+        <uni-icons type="arrowright" size="16" class="arrow"/>
+      </view>
+      <view class="list-item">
+        <image src="/static/my/connection.png" class="list-icon"/>
+        <text>联系我们</text>
+        <uni-icons type="arrowright" size="16" class="arrow"/>
+      </view>
+      <view class="list-item" @click="goToNewVersion">
+        <image src="/static/my/update.png" class="list-icon"/>
+        <text>新版本更新</text>
+        <view class="update-tip">有新版本可更新
+          <view class="circle"></view>
+        </view>
+        <uni-icons type="arrowright" size="16" class="arrow"/>
+      </view>
+      <view class="list-item">
+        <image src="/static/my/opinion.png" class="list-icon"/>
+        <text>意见反馈</text>
+        <uni-icons type="arrowright" size="16" class="arrow"/>
+      </view>
+      <view class="list-item" @click="goToAbout">
+        <image src="/static/my/about.png" class="list-icon"/>
+        <text>关于DeepChart</text>
+        <uni-icons type="arrowright" size="16" class="arrow"/>
+      </view>
+    </view>
+    <footerBar class="static-footer" :type="type"></footerBar>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		onMounted
-	} from 'vue'
-	import {
-		ArrowRight
-	} from '@element-plus/icons-vue'
-	import footerBar from '../../components/footerBar.vue'
-
-	const type = ref('member')
-	const iSMT = ref(0)
-	const username = ref('演示机EVA')
-	const dccode = ref('90047681')
-	const goToGeneral = () => {
-		uni.navigateTo({
-			url: '/pages/setting/general'
-		})
-	}
-	
-	const goToMarket = () => {
-		uni.navigateTo({
-			url: '../setting/market'
-		})
-	}
-	
-	const goToAccount = () => {
-		uni.navigateTo({
-			url:'../setting/account'
-		})
-	}
-	
-	const goToNewVersion = () =>{
-		uni.navigateTo({
-			url:'../setting/newVersion'
-		})
-	}
-	
-	const goToAbout = () =>{
-		uni.navigateTo({
-			url:'../setting/about'
-		})
-	}
-	
-	const goToShare = () =>{
-		uni.navigateTo({
-			url:'../setting/share'
-		})
-	}
-
-	onMounted(() => {
-		// 状态栏高度
-		iSMT.value = uni.getSystemInfoSync().statusBarHeight
-		console.log('??????????????', iSMT.value)
-	})
+import {
+  ref,
+  onMounted
+} from 'vue'
+import {
+  ArrowRight
+} from '@element-plus/icons-vue'
+import footerBar from '../../components/footerBar.vue'
+import {getUserInfo} from "@/api/member"
+
+const type = ref('member')
+const iSMT = ref(0)
+const username = ref('')
+const dccode = ref('')
+
+const userInfoRes = ref()// 用户身份信息
+userInfoRes.value = getUserInfo()
+userInfoRes.value.then(res => {
+  username.value = res.data.username
+  dccode.value = res.data.dccode
+  console.log('用户信息', userInfoRes.value)
+})
+
+
+const goToGeneral = () => {
+  uni.navigateTo({
+    url: '/pages/setting/general'
+  })
+}
+
+const goToMarket = () => {
+  uni.navigateTo({
+    url: '../setting/market'
+  })
+}
+
+const goToAccount = () => {
+  uni.navigateTo({
+    url: '../setting/account'
+  })
+}
+
+const goToNewVersion = () => {
+  uni.navigateTo({
+    url: '../setting/newVersion'
+  })
+}
+
+const goToAbout = () => {
+  uni.navigateTo({
+    url: '../setting/about'
+  })
+}
+
+const goToShare = () => {
+  uni.navigateTo({
+    url: '../setting/share'
+  })
+}
+
+onMounted(() => {
+  // 状态栏高度
+  iSMT.value = uni.getSystemInfoSync().statusBarHeight
+  console.log('??????????????', iSMT.value)
+})
 </script>
 
 <style scoped>
-	.static-footer {
-		position: fixed;
-		bottom: 0;
-	}
-
-	.top {
-		height: 47vh;
-		background-color: white;
-	}
-
-	.bell {
-		height: 9.6vh;
-		display: flex;
-		align-items: flex-end;
-		justify-content: flex-end;
-		padding-right: 50rpx;
-	}
-
-	.image-bell {
-		width: 13px;
-		height: 16px;
-	}
-
-	.msg {
-		height: 10.7vh;
-		display: flex;
-		margin-top: 3vh;
-		margin-bottom: 3vh;
-	}
-
-	.msg-left {
-		width: 33.6vw;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.avatar {
-		width: 175rpx;
-		height: 175rpx;
-		border-radius: 50%;
-		background-color: black;
-	}
-
-	.msg-center {
-		width: 51.7vw;
-		padding-left: 2.5vh;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-	}
-
-	.userInfo {
-		font-size: 20px;
-	}
-
-	.userId {
-		font-size: 14px;
-		margin-top: 1vh;
-	}
-
-	.image-editName {
-		width: 40rpx;
-		height: 40rpx;
-		margin-left: 2vw;
-	}
-
-	.msg-right {
-		width: 14.7vw;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-	}
-
-	.image-attendance {
-		width: 43rpx;
-		height: 43rpx;
-	}
-
-	.settings-buttons {
-		display: flex;
-		justify-content: space-around;
-	}
-
-	.setting-btn {
-		width: 349rpx;
-		height: 135rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		background-color: rgb(243, 243, 243);
-		border-radius: 8%;
-	}
-
-	.setting-icon {
-		width: 64.7rpx;
-		height: 64.7rpx;
-		margin-right: 25rpx;
-	}
-
-	.setting-btn text {
-		font-size: 28rpx;
-		font-weight: bold;
-		color: #333;
-	}
-
-	.share {
-		height: 12.6vh;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.img-share {
-		width: 720rpx;
-		height: 160rpx;
-	}
-
-	.bottom {
-		height: 44.5vh;
-		margin-top: 1vh;
-		background-color: rgb(255, 255, 255);
-	}
-
-	.list-item {
-		width: 670rpx;
-		height: 7vh;
-		display: flex;
-		align-items: center;
-		margin: 0rpx 40rpx;
-		border-bottom: 1rpx solid #eee;
-	}
-	
-	.list-item:last-child{
-		border-bottom: none;
-	}
-
-	.list-icon {
-		width: 42rpx;
-		height: 42rpx;
-		margin-right: 18rpx;
-	}
-
-	.arrow {
-		margin-left: auto;
-	}
-
-	.update-tip {
-		display: flex;
-		color: #999;
-		font-size: 24rpx;
-		align-items: center;
-		margin-left: 200rpx;
-		justify-content: center;
-	}
-
-	.circle {
-		width: 10rpx;
-		height: 10rpx;
-		border-radius: 50%;
-		background-color: red;
-		margin-left: 10rpx;
-	}
+.static-footer {
+  position: fixed;
+  bottom: 0;
+}
+
+.top {
+  height: 47vh;
+  background-color: white;
+}
+
+.bell {
+  height: 9.6vh;
+  display: flex;
+  align-items: flex-end;
+  justify-content: flex-end;
+  padding-right: 50rpx;
+}
+
+.image-bell {
+  width: 13px;
+  height: 16px;
+}
+
+.msg {
+  height: 10.7vh;
+  display: flex;
+  margin-top: 3vh;
+  margin-bottom: 3vh;
+}
+
+.msg-left {
+  width: 33.6vw;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.avatar {
+  width: 175rpx;
+  height: 175rpx;
+  border-radius: 50%;
+  background-color: black;
+}
+
+.msg-center {
+  width: 51.7vw;
+  padding-left: 2.5vh;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.userInfo {
+  font-size: 20px;
+}
+
+.userId {
+  font-size: 14px;
+  margin-top: 1vh;
+}
+
+.image-editName {
+  width: 40rpx;
+  height: 40rpx;
+  margin-left: 2vw;
+}
+
+.msg-right {
+  width: 14.7vw;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.image-attendance {
+  width: 43rpx;
+  height: 43rpx;
+}
+
+.settings-buttons {
+  display: flex;
+  justify-content: space-around;
+}
+
+.setting-btn {
+  width: 349rpx;
+  height: 135rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: rgb(243, 243, 243);
+  border-radius: 8%;
+}
+
+.setting-icon {
+  width: 64.7rpx;
+  height: 64.7rpx;
+  margin-right: 25rpx;
+}
+
+.setting-btn text {
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.share {
+  height: 12.6vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.img-share {
+  width: 720rpx;
+  height: 160rpx;
+}
+
+.bottom {
+  height: 44.5vh;
+  margin-top: 1vh;
+  background-color: rgb(255, 255, 255);
+}
+
+.list-item {
+  width: 670rpx;
+  height: 7vh;
+  display: flex;
+  align-items: center;
+  margin: 0rpx 40rpx;
+  border-bottom: 1rpx solid #eee;
+}
+
+.list-item:last-child {
+  border-bottom: none;
+}
+
+.list-icon {
+  width: 42rpx;
+  height: 42rpx;
+  margin-right: 18rpx;
+}
+
+.arrow {
+  margin-left: auto;
+}
+
+.update-tip {
+  display: flex;
+  color: #999;
+  font-size: 24rpx;
+  align-items: center;
+  margin-left: 200rpx;
+  justify-content: center;
+}
+
+.circle {
+  width: 10rpx;
+  height: 10rpx;
+  border-radius: 50%;
+  background-color: red;
+  margin-left: 10rpx;
+}
 </style>

pages/marketSituation/chartExample.vue

@@ -1,655 +0,0 @@
-<template>
-    <view style="width: 750rpx; height: 750rpx;">
-        <l-echart ref="chartRef" @finished="initChart"></l-echart>
-    </view>
-</template>
-<script setup>
-import { ref, computed, onMounted } from 'vue';
-
-const chartRef = ref(null)
-// 获取系统信息，替代 window.innerWidth
-const systemInfo = uni.getSystemInfoSync()
-const screenWidth = ref(systemInfo.screenWidth || 375) // 默认值 375px
-
-// 生成30天的交易信号数据
-const generateAIGoldBullData = () => {
-    const data = []
-    
-    for (let i = 0; i < 30; i++) {
-        // 模拟交易信号 [索引, 买入信号, 卖出信号, 持有信号, 强度, 成交量]
-        const buySignal = Math.random() > 0.7 ? 1 : 0      // 30%概率买入信号
-        const sellSignal = Math.random() > 0.8 ? 1 : 0     // 20%概率卖出信号
-        const holdSignal = Math.random() > 0.5 ? 1 : 0     // 50%概率持有信号
-        const strength = Math.floor(Math.random() * 3) + 1  // 信号强度1-3
-        const volume = Math.floor(Math.random() * 2000) + 500 // 成交量500-2500
-        
-        data.push([i, buySignal, sellSignal, holdSignal, strength, volume])
-    }
-    return data
-}
-
-// 添加缺失的变量定义
-var option
-const AIGoldBull = ref({
-    JN: generateAIGoldBullData()
-})
-
-// 模拟多语言数据
-const t = ref({
-    suoxie: 'zh',
-    tianxian: '天线',
-    feixian: '飞线',
-    zhoongxian: '中线',
-    liuxian: '流线',
-    Klinetext_5: 'K线5',
-    Klinetext_6: 'K线6',
-    maipan: '买盘',
-    maipan1: '卖盘'
-})
-
-// 生成30天的模拟K线数据 [日期, 开盘, 最高, 最低, 收盘]
-const generateKLineData = () => {
-    const data = []
-    let basePrice = 2450 // 黄金基础价格
-    
-    for (let i = 0; i < 30; i++) {
-        const date = new Date(2024, 0, i + 1).toISOString().split('T')[0]
-        
-        // 模拟价格波动
-        const volatility = (Math.random() - 0.5) * 50 // ±25的波动
-        const open = basePrice + volatility
-        
-        const highVolatility = Math.random() * 30 + 10 // 10-40的向上波动
-        const lowVolatility = Math.random() * 30 + 10  // 10-40的向下波动
-        
-        const high = Math.max(open, open + highVolatility)
-        const low = Math.min(open, open - lowVolatility)
-        
-        const closeVolatility = (Math.random() - 0.5) * 20
-        const close = Math.max(low, Math.min(high, open + closeVolatility))
-        
-        data.push([date, 
-            Math.round(open * 100) / 100, 
-            Math.round(high * 100) / 100, 
-            Math.round(low * 100) / 100, 
-            Math.round(close * 100) / 100
-        ])
-        
-        basePrice = close // 下一天的基础价格
-    }
-    return data
-}
-
-// 生成30天的成交量和技术指标数据 [日期, 成交量1, 成交量2, 指标1, 指标2, 指标3]
-const generateWaveVolData = () => {
-    const data = []
-    
-    for (let i = 0; i < 30; i++) {
-        const date = new Date(2024, 0, i + 1).toISOString().split('T')[0]
-        
-        // 模拟成交量数据
-        const vol1 = Math.floor(Math.random() * 2000) + 800  // 800-2800
-        const vol2 = Math.floor(Math.random() * 1500) + 600  // 600-2100
-        
-        // 模拟技术指标
-        const indicator1 = Math.floor(Math.random() * 30) + 40  // 40-70
-        const indicator2 = Math.floor(Math.random() * 40) + 50  // 50-90
-        const indicator3 = Math.floor(Math.random() * 35) + 60  // 60-95
-        
-        data.push([date, vol1, vol2, indicator1, indicator2, indicator3])
-    }
-    return data
-}
-
-// 生成30天的移动平均线数据 [MA5, MA10, MA20, MA30]
-const generateFTLineData = () => {
-    const data = []
-    let ma5Base = 2450
-    let ma10Base = 2445
-    let ma20Base = 2440
-    let ma30Base = 2435
-    
-    for (let i = 0; i < 30; i++) {
-        // 模拟移动平均线的平滑变化
-        ma5Base += (Math.random() - 0.5) * 10
-        ma10Base += (Math.random() - 0.5) * 8
-        ma20Base += (Math.random() - 0.5) * 6
-        ma30Base += (Math.random() - 0.5) * 4
-        
-        data.push([
-            Math.round(ma5Base * 100) / 100,
-            Math.round(ma10Base * 100) / 100,
-            Math.round(ma20Base * 100) / 100,
-            Math.round(ma30Base * 100) / 100
-        ])
-    }
-    return data
-}
-
-// 生成模拟数据
-const mockKLineData = generateKLineData()
-const mockWaveVolData = generateWaveVolData()
-const mockFTLineData = generateFTLineData()
-
-// 生成RSI指标数据 (相对强弱指数)
-const generateRSIData = () => {
-    const data = []
-    for (let i = 0; i < 30; i++) {
-        const rsi = Math.random() * 60 + 20 // RSI值在20-80之间
-        data.push(Math.round(rsi * 100) / 100)
-    }
-    return data
-}
-
-// 生成MACD指标数据
-const generateMACDData = () => {
-    const data = []
-    for (let i = 0; i < 30; i++) {
-        const macd = (Math.random() - 0.5) * 20 // MACD值在-10到10之间
-        const signal = (Math.random() - 0.5) * 15 // 信号线
-        const histogram = macd - signal // 柱状图
-        
-        data.push([
-            Math.round(macd * 100) / 100,
-            Math.round(signal * 100) / 100,
-            Math.round(histogram * 100) / 100
-        ])
-    }
-    return data
-}
-
-// 生成布林带数据
-const generateBollingerData = () => {
-    const data = []
-    let middleLine = 2450
-    
-    for (let i = 0; i < 30; i++) {
-        middleLine += (Math.random() - 0.5) * 10
-        const upperBand = middleLine + Math.random() * 30 + 20 // 上轨
-        const lowerBand = middleLine - Math.random() * 30 - 20 // 下轨
-        
-        data.push([
-            Math.round(upperBand * 100) / 100,
-            Math.round(middleLine * 100) / 100,
-            Math.round(lowerBand * 100) / 100
-        ])
-    }
-    return data
-}
-
-// 生成成交量分析数据
-const generateVolumeAnalysisData = () => {
-    const data = []
-    for (let i = 0; i < 30; i++) {
-        const buyVolume = Math.floor(Math.random() * 1500) + 500  // 买入量
-        const sellVolume = Math.floor(Math.random() * 1500) + 500 // 卖出量
-        const netVolume = buyVolume - sellVolume // 净买入量
-        
-        data.push([buyVolume, sellVolume, netVolume])
-    }
-    return data
-}
-
-// 生成市场情绪数据
-const generateMarketSentimentData = () => {
-    const sentiments = ['极度恐慌', '恐慌', '中性', '贪婪', '极度贪婪']
-    const data = []
-    
-    for (let i = 0; i < 30; i++) {
-        const sentimentIndex = Math.floor(Math.random() * 100) // 0-100的情绪指数
-        const sentimentLabel = sentiments[Math.floor(sentimentIndex / 20)]
-        
-        data.push({
-            date: new Date(2024, 0, i + 1).toISOString().split('T')[0],
-            index: sentimentIndex,
-            label: sentimentLabel,
-            fearGreedRatio: Math.random() * 100
-        })
-    }
-    return data
-}
-
-// 生成重要新闻事件数据
-const generateNewsEventsData = () => {
-    const events = [
-        '美联储利率决议',
-        '非农就业数据发布',
-        '通胀数据公布',
-        '地缘政治紧张',
-        '央行政策变化',
-        '经济数据超预期',
-        '市场技术突破',
-        '大宗商品价格波动'
-    ]
-    
-    const data = []
-    for (let i = 0; i < 10; i++) { // 生成10个随机事件
-        const randomDay = Math.floor(Math.random() * 30) + 1
-        const event = events[Math.floor(Math.random() * events.length)]
-        const impact = Math.floor(Math.random() * 5) + 1 // 影响力1-5
-        
-        data.push({
-            date: new Date(2024, 0, randomDay).toISOString().split('T')[0],
-            event: event,
-            impact: impact,
-            type: Math.random() > 0.5 ? 'positive' : 'negative'
-        })
-    }
-    return data.sort((a, b) => new Date(a.date) - new Date(b.date))
-}
-
-// 生成价格预测数据
-const generatePricePredictionData = () => {
-    const data = []
-    let currentPrice = 2450
-    
-    for (let i = 0; i < 7; i++) { // 未来7天预测
-        const date = new Date(2024, 1, i + 1).toISOString().split('T')[0] // 2月份
-        
-        // 模拟AI预测的价格区间
-        const prediction = currentPrice + (Math.random() - 0.5) * 100
-        const confidence = Math.random() * 40 + 60 // 60-100%的置信度
-        const upperBound = prediction + Math.random() * 50
-        const lowerBound = prediction - Math.random() * 50
-        
-        data.push({
-            date: date,
-            predicted_price: Math.round(prediction * 100) / 100,
-            confidence: Math.round(confidence),
-            upper_bound: Math.round(upperBound * 100) / 100,
-            lower_bound: Math.round(lowerBound * 100) / 100
-        })
-        
-        currentPrice = prediction
-    }
-    return data
-}
-
-// 模拟提取的绘图数据
-const extractedDrawData = {
-    KLine20: mockKLineData,
-    WAVEVOL: mockWaveVolData,
-    FTLINE: mockFTLineData,
-    RSI: generateRSIData(),
-    MACD: generateMACDData(),
-    BOLLINGER: generateBollingerData(),
-    VOLUME_ANALYSIS: generateVolumeAnalysisData(),
-    MARKET_SENTIMENT: generateMarketSentimentData(),
-    NEWS_EVENTS: generateNewsEventsData(),
-    PRICE_PREDICTION: generatePricePredictionData()
-}
-
-const fnShowEcharts4 = (extractedDrawData) => {
-    const splitData = (b) => {
-        const a = JSON.parse(JSON.stringify(b))
-        let categoryData = []
-        let values = []
-        for (let i = 0; i < a.length; i++) {
-            categoryData.push(a[i].splice(0, 1)[0])
-            values.push(a[i])
-        }
-        return {
-            categoryData,
-            values
-        }
-    }
-    var bodongliang = splitData(extractedDrawData.WAVEVOL)
-    function bodongliangData(values, i) {
-        return values.map((subArray) => subArray[i])
-    }
-    function calculateMA(index, data) {
-        let result = []
-        if (data.FTLINE) {
-            data.FTLINE.forEach((item) => {
-                result.push(item[index])
-            })
-        }
-        return result
-    }
-    function vwToPx(vw) {
-        return (screenWidth.value * vw) / 100
-    }
-    var dealData = splitData(extractedDrawData.KLine20)
-    var dealGnBullData = AIGoldBull.value.JN
-    const textEcharts = t.value
-    const firstLegend = computed(() => {
-        if (screenWidth.value < 768) {
-            if (textEcharts.suoxie === 'en' || textEcharts.suoxie === 'th') {
-                return '2%'
-            } else if (textEcharts.suoxie === 'kr') {
-                return '2%'
-            } else {
-                return '2%'
-            }
-        } else {
-            return textEcharts.suoxie === 'en' ||
-                textEcharts.suoxie === 'th' ||
-                textEcharts.suoxie === 'kr'
-                ? '9%'
-                : '9%'
-        }
-    })
-    const processBarData = (data) => {
-        const barData = []
-        data.forEach((item) => {
-            let color
-            switch (item[4]) {
-                case 1:
-                    color = '#13E113'
-                    break
-                case 2:
-                    color = '#FF0E00'
-                    break
-                case 3:
-                    color = '#0000FE'
-                    break
-                case 4:
-                    color = '#1397FF'
-                    break
-            }
-            barData.push({
-                value: item[5],
-                itemStyle: {
-                    normal: {
-                        color: color
-                    }
-                }
-            })
-        })
-        return { barData }
-    }
-    const { barData } = processBarData(dealGnBullData)
-    option = {
-        tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-                type: 'cross'
-            },
-            backgroundColor: 'rgba(119, 120, 125, 0.6)',
-            borderWidth: 1,
-            borderColor: '#77787D',
-            padding: 10,
-            textStyle: {
-                color: '#fff'
-            }
-        },
-        axisPointer: {
-            link: [
-                {
-                    xAxisIndex: 'all'
-                }
-            ],
-            label: {
-                backgroundColor: '#77787D'
-            }
-        },
-        toolbox: {
-            show: false
-        },
-        grid: [
-            {
-                left: screenWidth.value > 768 ? '10%' : '12%',
-                right: screenWidth.value > 768 ? '4%' : '6%',
-                top: screenWidth.value > 768 ? '10%' : '12%',
-                height: screenWidth.value > 768 ? '35%' : '34%',
-                containLabel: false
-            },
-            {
-                left: screenWidth.value > 768 ? '10%' : '12%',
-                right: screenWidth.value > 768 ? '4%' : '6%',
-                top: screenWidth.value > 768 ? '48%' : '48%',
-                height: screenWidth.value > 768 ? '19%' : '21%',
-                containLabel: false
-            },
-            {
-                left: screenWidth.value > 768 ? '10%' : '12%',
-                right: screenWidth.value > 768 ? '4%' : '6%',
-                top: screenWidth.value > 768 ? '70%' : '71%',
-                height: screenWidth.value > 768 ? '19%' : '21%',
-                containLabel: false
-            }
-        ],
-        xAxis: [
-            {
-                type: 'category',
-                data: dealData.categoryData,
-                boundaryGap: true,
-                axisLine: { onZero: false },
-                splitLine: { show: false },
-                min: 'dataMin',
-                max: 'dataMax',
-                axisPointer: {
-                    z: 100,
-                    label: {
-                        show: false // 不显示标签
-                    }
-                },
-                axisLine: {
-                    lineStyle: {
-                        color: 'black'
-                    }
-                }, //
-                axisLabel: { show: false },
-                axisTick: { show: false }
-            },
-            {
-                type: 'category',
-                gridIndex: 1,
-                data: dealData.categoryData,
-                boundaryGap: true,
-                axisPointer: {
-                    z: 100,
-                    label: {
-                        show: false // 不显示标签
-                    }
-                },
-                axisLine: { lineStyle: { color: 'black' } },
-                axisLabel: {
-                    show: false,
-                    interval: 'auto'
-                },
-                axisTick: { show: false }
-            },
-            {
-                type: 'category',
-                gridIndex: 2,
-                data: dealData.categoryData,
-                boundaryGap: true,
-                axisLine: { lineStyle: { color: 'black' } },
-                axisLabel: {
-                    show: true,
-                    interval: 'auto',
-                    fontSize: screenWidth.value > 768 ? 15 : 9
-                },
-                axisTick: { show: false }
-            }
-        ],
-        yAxis: [
-            {
-                scale: true,
-                gridIndex: 0,
-                position: 'left',
-                axisLabel: {
-                    inside: false,
-                    align: 'right',
-                    fontSize: screenWidth.value > 768 ? 15 : 9
-                },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        fontSize: '',
-                        color: 'black'
-                    }
-                },
-                axisTick: { show: false },
-                splitLine: { show: false }
-            },
-            {
-                scale: true,
-                gridIndex: 1,
-                splitNumber: 4,
-                min: 0,
-                minInterval: 1,
-                axisLabel: {
-                    show: true,
-                    fontSize: screenWidth.value > 768 ? 15 : 9,
-                    margin: 8,
-                },
-                axisLine: { show: true, lineStyle: { color: 'black' } },
-                axisTick: { show: false },
-                splitLine: { show: true, lineStyle: { type: 'dashed' } },
-                boundaryGap: ['20%', '20%']
-            },
-            {
-                scale: true,
-                gridIndex: 2,
-                splitNumber: 2,
-                axisLabel: {
-                    show: true,
-                    fontSize: screenWidth.value > 768 ? 15 : 9
-                },
-                axisLine: { show: true, lineStyle: { color: 'black' } },
-                axisTick: { show: false },
-                splitLine: { show: false }
-            }
-        ],
-        dataZoom: [
-            {
-                type: 'inside',
-                xAxisIndex: [0, 1, 2],
-                start: 50,
-                end: 100
-            },
-            {
-                show: true,
-                xAxisIndex: [0, 1, 2],
-                type: 'slider',
-                start: 50,
-                end: 100
-            }
-        ],
-        series: [
-            {
-                type: 'candlestick',
-                name: '日K',
-                xAxisIndex: 0,
-                yAxisIndex: 0,
-                data: dealData.values,
-                itemStyle: {
-                    normal: {
-                        color0: 'red',
-                        color: 'green',
-                        borderColor0: 'red',
-                        borderColor: 'green'
-                    }
-                },
-                gridIndex: 1
-            },
-            {
-                name: '成交量',
-                type: 'bar',
-                barWidth: '70%',
-                xAxisIndex: 1,
-                yAxisIndex: 1,
-                data: barData,
-            },
-            // {
-            //     name: textEcharts.feixian,
-            //     type: 'line',
-            //     data: calculateMA(1, extractedDrawData),
-            //     smooth: true,
-            //     symbol: 'none',
-            //     xAxisIndex: 2,
-            //     yAxisIndex: 2,
-            //     itemStyle: {
-            //         normal: {
-            //             color: '#00a32e',
-            //             lineStyle: {
-            //                 color: '#00a32e',
-            //                 width: 2,
-            //                 type: 'solid'
-            //             }
-            //         }
-            //     }
-            // },
-            // {
-            //     name: textEcharts.zhoongxian,
-            //     type: 'line',
-            //     data: calculateMA(2, extractedDrawData),
-            //     smooth: true,
-            //     symbol: 'none',
-            //     xAxisIndex: 2,
-            //     yAxisIndex: 2,
-            //     itemStyle: {
-            //         normal: {
-            //             color: '#de0000',
-            //             lineStyle: {
-            //                 color: '#de0000',
-            //                 width: 2,
-            //                 type: 'solid'
-            //             }
-            //         }
-            //     }
-            // },
-            // {
-            //     name: textEcharts.tianxian,
-            //     type: 'line',
-            //     data: calculateMA(3, extractedDrawData),
-            //     smooth: true,
-            //     symbol: 'none',
-            //     xAxisIndex: 2,
-            //     yAxisIndex: 2,
-            //     itemStyle: {
-            //         normal: {
-            //             color: '#ffb300',
-            //             lineStyle: {
-            //                 color: '#ffb300',
-            //                 width: 2,
-            //                 type: 'solid'
-            //             }
-            //         }
-            //     }
-            // },
-            // {
-            //     name: textEcharts.liuxian,
-            //     type: 'line',
-            //     data: calculateMA(4, extractedDrawData),
-            //     smooth: true,
-            //     symbol: 'none',
-            //     xAxisIndex: 2,
-            //     yAxisIndex: 2,
-            //     itemStyle: {
-            //         normal: {
-            //             color: '#00c8ff',
-            //             lineStyle: {
-            //                 color: '#00c8ff',
-            //                 width: 2,
-            //                 type: 'solid'
-            //             }
-            //         }
-            //     }
-            // },
-        ]
-    }
-    initChart()
-}
-
-// 组件挂载时初始化图表
-onMounted(() => {
-    // 调用图表初始化函数
-    fnShowEcharts4(extractedDrawData)
-})
-
-
-// 初始化图表
-const initChart = async () => {
-    if (!chartRef.value) return
-
-    try {
-        const chart = await chartRef.value.init(echarts)
-        chart.setOption(option)
-    } catch (error) {
-        console.error('图表初始化失败:', error)
-    }
-}
-</script>

pages/marketSituation/marketCondition.vue

@@ -145,7 +145,7 @@
           </view>
         </view>
         <view class="stock-kline">
-          <view v-if="klineTab === 1 || klineTab === 2" class="time-chart-container" style="position: relative">
+          <view v-if="klineTab === 1 || klineTab === 2 || klineTab === 3 || klineTab === 4 || klineTab === 5 || klineTab === 6 || klineTab === 7 || klineTab === 8 || klineTab === 9" class="time-chart-container" style="position: relative">
             <!-- 主图Canvas -->
             <canvas
               canvas-id="stockChart"
@@ -195,15 +195,12 @@
             ></canvas>
           </view>
           <!-- K线图区域 -->
-          <view class="test" v-else-if="klineTab === 3">
+          <view class="test" v-else-if="klineTab === 10">
             <button @click="startTcp()">接收消息</button>
             <button @click="sendStopTimeData()">停止消息</button>
             <button @click="sendTcpMessage('real_time')">实时行情推送</button>
             <button @click="sendTcpMessage('init_real_time')">初始化获取行情历史数据</button>
             <button @click="sendTcpMessage('stop_real_time')">停止实时推送</button>
-            <view class="tcpMsg" v-for="item in tcpMessages" :key="item">
-              {{ item }}
-            </view>
           </view>
           <view v-else class="kline-chart-container">
             <text>K线图开发中...</text>
@@ -240,21 +237,6 @@ import tcpConnection, { TCPConnection, TCP_CONFIG } from "@/api/tcpConnection.js
 
 // TCP相关响应式变量
 const tcpConnected = ref(false);
-const tcpMessages = ref([]);
-const tcpStockData = ref({
-  count: 0,
-  data: {},
-  stock_count: 0,
-  timestamp: "",
-  type: "",
-});
-const currentStockInfo = ref({
-  stock_name: "未知股票",
-  current_price: "0.00",
-  change: "0.00%",
-  change_value: 0,
-  change_percent: 0,
-});
 const connectionListener = ref(null);
 const messageListener = ref(null);
 
@@ -465,11 +447,54 @@ const confirmStockColor = (price, lastDayStockClosePrice) => {
 // 股票K线类型方法
 const selectKlineTab = (tabId) => {
   klineTab.value = tabId;
-
-  if (klineTab.value == 1) {
-    sendTcpMessage("init_real_time");
+  if (klineTab.value) {
+    sendTcpMessage("stop_real_time");
+  }
+  switch (klineTab.value) {
+    case 1:
+      sendTcpMessage("init_real_time");
+      break;
+    case 2:
+      sendTcpMessage("daily_data");
+      break;
+    case 3:
+      sendTcpMessage("weekly_data");
+      break;
+    case 4:
+      sendTcpMessage("monthly_data");
+      break;
+    case 5:
+      sendTcpMessage("daily_one_minutes_data");
+      break;
+    case 6:
+      sendTcpMessage("daily_five_minutes_data");
+      break;
+    case 7:
+      sendTcpMessage("daily_fifteen_minutes_data");
+      break;
+    case 8:
+      sendTcpMessage("daily_thirty_minutes_data");
+      break;
+    case 9:
+      sendTcpMessage("daily_sixty_minutes_data");
+      break;
+    case 10:
+      uni.showToast({
+        title: "暂无季K数据",
+        icon: "none",
+        duration: 2000,
+      });
+      break;
+    case 11:
+      uni.showToast({
+        title: "暂无年K数据",
+        icon: "none",
+        duration: 2000,
+      });
+      break;
+    default:
+      break;
   }
-
   initCanvas();
   //   startAddDataTimer();
 };
@@ -938,6 +963,7 @@ const drawChart = () => {
     return;
   }
   const data = klineTab.value == 1 ? timeData.value : klineData.value;
+  console.log("data", data);
   chartRange.value = [];
   // 清除画布
   // HCharts.setCanvasColor(ctx.value, width, height, CANVAS_BACKGROUND_COLOR);
@@ -1246,6 +1272,7 @@ const touchMove = (e) => {
       }
     }
   } else {
+    return;
     if (klineTab.value === 2) {
       // if(currentY)
       if (currentX < touchState.startX) {
@@ -1413,10 +1440,6 @@ const initTcpListeners = () => {
       timestamp: new Date().toLocaleTimeString(),
       direction: "received",
     };
-    console.log("0000");
-    tcpMessages.value.push(messageObj);
-    // console.log('收到TCP消息:', messageObj)
-    console.log("home开始调用parseStockData", messageObj);
 
     // 解析股票数据
     parseStockData(message);
@@ -1469,46 +1492,62 @@ const sendTcpMessage = (command) => {
         command: "stock_list",
       };
       break;
+    // 日线数据
     case "daily_data":
       messageData = {
         command: "daily_data",
         stock_code: "GBPAUD.FXCM",
-        start_date: "20251001",
-        end_date: "20251023",
+        start_date: "20250801",
+        end_date: "20251029",
       };
       break;
+    // 周线数据
     case "weekly_data":
       messageData = {
         command: "weekly_data",
         stock_code: "000001.SZ",
-        start_date: "20251001",
-        end_date: "20251023",
+        start_date: "2024912",
+        end_date: "20251029",
       };
       break;
+    // 周线数据
+    case "monthly_data":
+      messageData = {
+        command: "monthly_data",
+        stock_code: "000001.SZ",
+        start_date: "20201130",
+        end_date: "20251029",
+      };
+      break;
+    // 1分钟线数据
     case "daily_one_minutes_data":
       messageData = {
         command: "daily_one_minutes_data",
         stock_code: "000001.SZ",
       };
       break;
+    // 5分钟线数据
     case "daily_five_minutes_data":
       messageData = {
         command: "daily_five_minutes_data",
         stock_code: "000001.SZ",
       };
       break;
+    // 15分钟线数据
     case "daily_fifteen_minutes_data":
       messageData = {
         command: "daily_fifteen_minutes_data",
         stock_code: "000001.SZ",
       };
       break;
+    // 30分钟线数据
     case "daily_thirty_minutes_data":
       messageData = {
         command: "daily_thirty_minutes_data",
         stock_code: "000001.SZ",
       };
       break;
+    // 60分钟线数据
     case "daily_sixty_minutes_data":
       messageData = {
         command: "daily_sixty_minutes_data",
@@ -1531,7 +1570,7 @@ const sendTcpMessage = (command) => {
     uni.showToast({
       title: "命令不存在",
       icon: "none",
-      duration: 1500,
+      duration: 1000,
     });
     return;
   } else {
@@ -1543,7 +1582,7 @@ const sendTcpMessage = (command) => {
         uni.showToast({
           title: "消息发送成功",
           icon: "success",
-          duration: 1500,
+          duration: 1000,
         });
       }
     } catch (error) {
@@ -1551,34 +1590,102 @@ const sendTcpMessage = (command) => {
       uni.showToast({
         title: "消息发送失败",
         icon: "none",
-        duration: 1500,
+        duration: 1000,
       });
     }
   }
 };
 
-// 清空消息记录
-const clearTcpMessages = () => {
-  tcpMessages.value = [];
-  uni.showToast({
-    title: "消息记录已清空",
-    icon: "success",
-    duration: 1500,
-  });
-};
-
 // 获取TCP连接状态
 const getTcpStatus = () => {
   const status = tcpConnection.getConnectionStatus();
   uni.showModal({
     title: "TCP连接状态",
-    content: `当前状态: ${status ? "已连接" : "未连接"}\n消息数量: ${tcpMessages.value.length}`,
+    content: `当前状态: ${status ? "已连接" : "未连接"}`,
     showCancel: false,
   });
 };
 
-let isMorePacket = false;
+let isMorePacket = {
+  init_real_time: false,
+  daily_data: false,
+  weekly_data: false,
+  monthly_data: false,
+  daily_one_minutes_data: false,
+  daily_five_minutes_data: false,
+  daily_fifteen_minutes_data: false,
+  daily_thirty_minutes_data: false,
+  daily_sixty_minutes_data: false,
+};
 let receivedMessage;
+const findJsonPacket = (message, command) => {
+  let jsonStartIndex = 0;
+  let jsonEndIndex = message.indexOf(command);
+  let jsonStartCount = 0;
+  let jsonEndCount = 0;
+
+  for (let i = 0; i < message.length - 1; ++i) {
+    if (message[i] == "{") {
+      jsonStartCount++;
+      if (jsonStartCount == 2) {
+        jsonStartIndex = i;
+        break;
+      }
+    }
+  }
+  for (let i = message.indexOf(command); i >= 0; --i) {
+    if (message[i] == "}" || i == jsonStartIndex) {
+      jsonEndCount++;
+      if (jsonEndCount == 1) {
+        jsonEndIndex = i;
+        break;
+      }
+    }
+  }
+
+  // 检查JSON字符串是否有效
+  if (jsonStartIndex >= jsonEndIndex) {
+    return { error: true };
+  }
+
+  return { json: JSON.parse(message.substring(jsonStartIndex, jsonEndIndex + 1)) };
+};
+
+// 根据timeData中最后一个时间生成下一个时间
+const generateNextTime = () => {
+  if (timeData.value.length === 0) {
+    return "09:30"; // 如果没有数据，返回开盘时间
+  }
+
+  const lastTime = timeData.value[timeData.value.length - 1].time;
+  if (!lastTime) {
+    return "09:30";
+  }
+
+  // 解析时间字符串，格式为 "HH:MM"
+  const [hours, minutes] = lastTime.split(":").map(Number);
+
+  // 计算下一分钟
+  let nextMinutes = minutes + 1;
+  let nextHours = hours;
+
+  // 处理分钟进位
+  if (nextMinutes >= 60) {
+    nextMinutes = 0;
+    nextHours += 1;
+  }
+
+  // 处理小时进位（24小时制）
+  if (nextHours >= 24) {
+    nextHours = 0;
+  }
+
+  // 格式化为 "HH:MM" 格式
+  const formattedHours = nextHours.toString().padStart(2, "0");
+  const formattedMinutes = nextMinutes.toString().padStart(2, "0");
+
+  return `${formattedHours}:${formattedMinutes}`;
+};
 // 解析TCP股票数据
 const parseStockData = (message) => {
   try {
@@ -1592,105 +1699,390 @@ const parseStockData = (message) => {
       console.log("服务器命令列表，不予处理");
       return;
     }
-    if ((typeof message === "string" && message.includes("init_real_data_start")) || isMorePacket) {
+    if (message.includes("real_time")) {
+      let startIndex = 0;
+      let endIndex = message.length;
+      for (let i = 0; i < message.length - 1; ++i) {
+        if (message[i] == "{") {
+          startIndex = i;
+          break;
+        }
+      }
+      for (let i = message.length - 1; i >= 0; --i) {
+        if (message[i] == "}") {
+          endIndex = i;
+          break;
+        }
+      }
+      parsedMessage = JSON.parse(message.substring(startIndex, endIndex + 1));
+      console.log("实时数据解析", parsedMessage);
+      // 处理实时数据
+      timeData.value.push({
+        time: generateNextTime(),
+        price: parsedMessage.current_price,
+        volume: parsedMessage.volume,
+        amount: parsedMessage.amount,
+      });
+      // 实时更新股票信息
+      stockInformation.value.currentPrice = parsedMessage.current_price;
+      stockInformation.value.openPrice = parsedMessage.open_price;
+      stockInformation.value.closePrice = parsedMessage.close_price;
+      stockInformation.value.highPrice = parsedMessage.high_price;
+      stockInformation.value.lowPrice = parsedMessage.low_price;
+      stockInformation.value.volume = parsedMessage.volume;
+      stockInformation.value.amount = parsedMessage.amount;
+      stockInformation.value.turnoverRatio = parsedMessage.turnover_ratio;
+      stockInformation.value.marketValue = parsedMessage.total_market_value;
+      stockInformation.value.currentValue = stockInformation.value.currentPrice - stockInformation.value.lastDayStockClosePrice;
+      stockInformation.value.currentRatio = ((stockInformation.value.currentPrice - stockInformation.value.lastDayStockClosePrice) / stockInformation.value.lastDayStockClosePrice) * 100;
+      console.log("重绘画面");
+      drawChart();
+      if (timeData.value.length >= 240) {
+        sendTcpMessage("stop_real_time");
+      }
+      return;
+    } else if ((typeof message === "string" && message.includes("init_real_data_start")) || isMorePacket.init_real_time) {
       if (typeof message === "string" && message.includes("init_real_data_start")) {
         console.log("开始接受分包数据");
         receivedMessage = "";
       } else {
         console.log("接收分包数据过程中");
       }
-      isMorePacket = true;
+      isMorePacket.init_real_time = true;
       receivedMessage += message;
       // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
       if (receivedMessage.includes("init_real_data_complete")) {
         console.log("接受分包数据结束");
-        isMorePacket = false;
+        isMorePacket.init_real_time = false;
+
+        console.log("展示数据", receivedMessage);
+
+        const result = findJsonPacket(receivedMessage, "init_real_data_complete");
+        if (result.error) {
+          throw new Error("解析JSON字符串失败");
+        } else {
+          parsedMessage = result.json;
+          console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+          if (parsedMessage.type === "daily_data") {
+            timeData.value = parsedMessage.data;
+            stockInformation.value.lastDayStockClosePrice = parsedMessage.pre_close;
+            console.log("lastDayStockClosePrice", stockInformation.value.lastDayStockClosePrice);
+            drawChart();
+            sendTcpMessage("stop_real_time");
+            sendTcpMessage("real_time");
+          }
+        }
+      }
+    } else if ((typeof message === "string" && message.includes("daily_data_start")) || isMorePacket.daily_data) {
+      if (typeof message === "string" && message.includes("daily_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.daily_data = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("daily_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.daily_data = false;
+
+        console.log("展示数据", receivedMessage);
+
+        const result = findJsonPacket(receivedMessage, "daily_data_complete");
+        if (result.error) {
+          throw new Error("解析JSON字符串失败");
+        } else {
+          parsedMessage = result.json;
+          console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+          if (parsedMessage.type === "daily_data") {
+            klineData.value = parsedMessage.data.map((item) => ({
+              open: item.ask_open,
+              close: item.ask_close,
+              high: item.ask_high,
+              low: item.ask_low,
+              volume: item.tick_qty,
+              date: item.trade_date ? `${item.trade_date.slice(0, 4)}-${item.trade_date.slice(4, 6)}-${item.trade_date.slice(6, 8)}` : item.trade_date,
+            }));
+            stockInformation.value.lastDayStockClosePrice = klineData.value[klineData.value.length - 2].close;
+            touchState.offset = canvasWidth.value / klineData.value.length / 2;
+            console.log("lastDayStockClosePrice", stockInformation.value.lastDayStockClosePrice);
+            drawChart();
+          }
+        }
+      }
+    } else if ((typeof message === "string" && message.includes("weekly_data_start")) || isMorePacket.weekly_data) {
+      if (typeof message === "string" && message.includes("weekly_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.weekly_data = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("weekly_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.weekly_data = false;
 
         console.log("展示数据", receivedMessage);
-        // 获取JSON字符串的开头和结尾的坐标
-        let jsonStartIndex = 0;
-        let jsonEndIndex = receivedMessage.indexOf("init_real_data_complete");
-        let jsonStartCount = 0;
-        let jsonEndCount = 0;
-        for (let i = 0; i < receivedMessage.length - 1; ++i) {
-          if (receivedMessage[i] == "{") {
-            jsonStartCount++;
-            if (jsonStartCount == 2) {
-              jsonStartIndex = i;
-              break;
-            }
+
+        const result = findJsonPacket(receivedMessage, "weekly_data_complete");
+        if (result.error) {
+          throw new Error("解析JSON字符串失败");
+        } else {
+          parsedMessage = result.json;
+          console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+          if (parsedMessage.type === "weekly_data") {
+            klineData.value = parsedMessage.data.map((item) => ({
+              open: item.bid_open,
+              close: item.bid_close,
+              high: item.bid_high,
+              low: item.bid_low,
+              volume: item.vol,
+              amount: item.amount,
+              date: item.trade_date ? `${item.trade_date.slice(0, 4)}-${item.trade_date.slice(4, 6)}-${item.trade_date.slice(6, 8)}` : item.trade_date,
+            }));
+            stockInformation.value.lastDayStockClosePrice = klineData.value[klineData.value.length - 2].close;
+            touchState.offset = canvasWidth.value / klineData.value.length / 2;
+            console.log("lastDayStockClosePrice", stockInformation.value.lastDayStockClosePrice);
+            drawChart();
           }
         }
+      }
+    } else if ((typeof message === "string" && message.includes("monthly_data_start")) || isMorePacket.monthly_data) {
+      if (typeof message === "string" && message.includes("monthly_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.monthly_data = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("monthly_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.monthly_data = false;
+
+        console.log("展示数据", receivedMessage);
 
-        for (let i = receivedMessage.indexOf("init_real_data_complete"); i >= 0; --i) {
-          if (receivedMessage[i] == "}" || i == jsonStartIndex) {
-            jsonEndCount++;
-            if (jsonEndCount == 1) {
-              jsonEndIndex = i;
-              break;
-            }
+        const result = findJsonPacket(receivedMessage, "monthly_data_complete");
+        if (result.error) {
+          throw new Error("解析JSON字符串失败");
+        } else {
+          parsedMessage = result.json;
+          console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+          if (parsedMessage.type === "monthly_data") {
+            klineData.value = parsedMessage.data.map((item) => ({
+              open: item.bid_open,
+              close: item.bid_close,
+              high: item.bid_high,
+              low: item.bid_low,
+              volume: item.vol,
+              amount: item.amount,
+              date: item.trade_date ? `${item.trade_date.slice(0, 4)}-${item.trade_date.slice(4, 6)}-${item.trade_date.slice(6, 8)}` : item.trade_date,
+            }));
+            stockInformation.value.lastDayStockClosePrice = klineData.value[klineData.value.length - 2].close;
+            touchState.offset = canvasWidth.value / klineData.value.length / 2;
+            console.log("lastDayStockClosePrice", stockInformation.value.lastDayStockClosePrice);
+            drawChart();
           }
         }
-        // 检查JSON字符串是否有效
-        if (jsonStartIndex >= jsonEndIndex) {
-          throw new Error("JSON字符串格式错误");
+      }
+    } else if ((typeof message === "string" && message.includes("daily_one_minutes_data_start")) || isMorePacket.daily_one_minutes_data) {
+      if (typeof message === "string" && message.includes("daily_one_minutes_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.daily_one_minutes_data = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("daily_one_minutes_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.daily_one_minutes_data = false;
+
+        console.log("展示数据", receivedMessage);
+
+        const result = findJsonPacket(receivedMessage, "daily_one_minutes_data_complete");
+        if (result.error) {
+          throw new Error("解析JSON字符串失败");
+        } else {
+          parsedMessage = result.json;
+          console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+          if (parsedMessage.type === "daily_one_minutes_data") {
+            klineData.value = parsedMessage.data.map((item) => ({
+              open: item.open,
+              close: item.close,
+              high: Math.max(item.low, item.high),
+              low: Math.min(item.low, item.high),
+              volume: item.volume,
+              amount: item.amount,
+              date: item.timestamp,
+            }));
+            stockInformation.value.lastDayStockClosePrice = klineData.value[klineData.value.length - 2].close;
+            touchState.offset = canvasWidth.value / klineData.value.length / 2;
+            console.log("lastDayStockClosePrice", stockInformation.value.lastDayStockClosePrice);
+            drawChart();
+          }
         }
+      }
+    } else if ((typeof message === "string" && message.includes("daily_five_minutes_data_start")) || isMorePacket.daily_five_minutes_data) {
+      if (typeof message === "string" && message.includes("daily_five_minutes_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.daily_five_minutes_data = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("daily_five_minutes_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.daily_five_minutes_data = false;
+
+        console.log("展示数据", receivedMessage);
 
-        console.log("检测到JSON字符串，开始解析");
-        parsedMessage = JSON.parse(receivedMessage.substring(jsonStartIndex, jsonEndIndex + 1));
-        console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
-        if (parsedMessage.type === "daily_data") {
-          timeData.value = parsedMessage.data;
-          stockInformation.value.lastDayStockClosePrice = parsedMessage.pre_close;
-          console.log("lastDayStockClosePrice", stockInformation.value.lastDayStockClosePrice);
-          drawChart();
+        const result = findJsonPacket(receivedMessage, "daily_five_minutes_data_complete");
+        if (result.error) {
+          throw new Error("解析JSON字符串失败");
+        } else {
+          parsedMessage = result.json;
+          console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+          if (parsedMessage.type === "daily_five_minutes_data") {
+            klineData.value = parsedMessage.data.map((item) => ({
+              open: item.open,
+              close: item.close,
+              high: Math.max(item.low, item.high),
+              low: Math.min(item.low, item.high),
+              volume: item.volume,
+              amount: item.amount,
+              date: item.timestamp,
+            }));
+            stockInformation.value.lastDayStockClosePrice = klineData.value[klineData.value.length - 2].close;
+            touchState.offset = canvasWidth.value / klineData.value.length / 2;
+            console.log("lastDayStockClosePrice", stockInformation.value.lastDayStockClosePrice);
+            drawChart();
+          }
         }
       }
-      // 通过了JSON解析判断，说明返回的数据是需要的正确数据，进行股票实时数据检查
-      console.log("开始处理解析后的数据");
-
-      // 检查是否是股票数据（支持batch_data_chunk和batch_realtime_data两种类型）
-      if ((parsedMessage.type === "batch_data_chunk" || parsedMessage.type === "batch_realtime_data") && parsedMessage.data) {
-        console.log("开始更新TCP股票数据存储");
-        // 更新TCP股票数据存储
-        tcpStockData.value = {
-          count: parsedMessage.count || 0,
-          data: parsedMessage.data || {},
-          stock_count: parsedMessage.stock_count || 0,
-          timestamp: parsedMessage.timestamp || "",
-          type: parsedMessage.type || "",
-        };
+    } else if ((typeof message === "string" && message.includes("daily_fifteen_minutes_data_start")) || isMorePacket.daily_fifteen_minutes_data) {
+      if (typeof message === "string" && message.includes("daily_fifteen_minutes_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.daily_fifteen_minutes_data = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("daily_fifteen_minutes_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.daily_fifteen_minutes_data = false;
+
+        console.log("展示数据", receivedMessage);
 
-        // 获取第一个股票的数据用于显示
-        const stockCodes = Object.keys(parsedMessage.data);
-        if (stockCodes.length > 0) {
-          const firstStockCode = stockCodes[0];
-
-          // 检查数据结构
-          if (parsedMessage.data[firstStockCode] && Array.isArray(parsedMessage.data[firstStockCode]) && parsedMessage.data[firstStockCode].length > 0) {
-            const stockData = parsedMessage.data[firstStockCode][0]; // 取第一条数据
-
-            if (stockData && stockData.current_price !== undefined && stockData.pre_close !== undefined) {
-              // 计算涨跌幅
-              const changeValue = stockData.current_price - stockData.pre_close;
-              const changePercent = ((changeValue / stockData.pre_close) * 100).toFixed(2);
-              const changeSign = changeValue >= 0 ? "+" : "";
-
-              // 更新当前显示的股票信息
-              currentStockInfo.value = {
-                stock_name: stockData.stock_name || "未知股票",
-                current_price: stockData.current_price ? stockData.current_price.toFixed(2) : "0.00",
-                change: `${changeSign}${changePercent}%`,
-                change_value: changeValue,
-                change_percent: parseFloat(changePercent),
-              };
-
-              console.log("股票数据更新成功:", currentStockInfo.value);
-            }
+        const result = findJsonPacket(receivedMessage, "daily_fifteen_minutes_data_complete");
+        if (result.error) {
+          throw new Error("解析JSON字符串失败");
+        } else {
+          parsedMessage = result.json;
+          console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+          if (parsedMessage.type === "daily_fifteen_minutes_data") {
+            klineData.value = parsedMessage.data.map((item) => ({
+              open: item.open,
+              close: item.close,
+              high: Math.max(item.low, item.high),
+              low: Math.min(item.low, item.high),
+              volume: item.volume,
+              amount: item.amount,
+              date: item.timestamp,
+            }));
+            stockInformation.value.lastDayStockClosePrice = klineData.value[klineData.value.length - 2].close;
+            touchState.offset = canvasWidth.value / klineData.value.length / 2;
+            console.log("lastDayStockClosePrice", stockInformation.value.lastDayStockClosePrice);
+            drawChart();
           }
         }
+      }
+    } else if ((typeof message === "string" && message.includes("daily_thirty_minutes_data_start")) || isMorePacket.daily_thirty_minutes_data) {
+      if (typeof message === "string" && message.includes("daily_thirty_minutes_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
       } else {
-        console.log("不是batch_data_chunk或batch_realtime_data类型的消息，跳过处理");
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.daily_thirty_minutes_data = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("daily_thirty_minutes_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.daily_thirty_minutes_data = false;
+
+        console.log("展示数据", receivedMessage);
+
+        const result = findJsonPacket(receivedMessage, "daily_thirty_minutes_data_complete");
+        if (result.error) {
+          throw new Error("解析JSON字符串失败");
+        } else {
+          parsedMessage = result.json;
+          console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+          if (parsedMessage.type === "daily_thirty_minutes_data") {
+            klineData.value = parsedMessage.data.map((item) => ({
+              open: item.open,
+              close: item.close,
+              high: Math.max(item.low, item.high),
+              low: Math.min(item.low, item.high),
+              volume: item.volume,
+              amount: item.amount,
+              date: item.timestamp,
+            }));
+            stockInformation.value.lastDayStockClosePrice = klineData.value[klineData.value.length - 2].close;
+            touchState.offset = canvasWidth.value / klineData.value.length / 2;
+            console.log("lastDayStockClosePrice", stockInformation.value.lastDayStockClosePrice);
+            drawChart();
+          }
+        }
+      }
+    } else if ((typeof message === "string" && message.includes("daily_sixty_minutes_data_start")) || isMorePacket.daily_sixty_minutes_data) {
+      if (typeof message === "string" && message.includes("daily_sixty_minutes_data_start")) {
+        console.log("开始接受分包数据");
+        receivedMessage = "";
+      } else {
+        console.log("接收分包数据过程中");
+      }
+      isMorePacket.daily_sixty_minutes_data = true;
+      receivedMessage += message;
+      // 如果当前消息包含}，说明收到JSON字符串结尾，结束接收，开始解析
+      if (receivedMessage.includes("daily_sixty_minutes_data_complete")) {
+        console.log("接受分包数据结束");
+        isMorePacket.daily_sixty_minutes_data = false;
+
+        console.log("展示数据", receivedMessage);
+
+        const result = findJsonPacket(receivedMessage, "daily_sixty_minutes_data_complete");
+        if (result.error) {
+          throw new Error("解析JSON字符串失败");
+        } else {
+          parsedMessage = result.json;
+          console.log("JSON解析成功，解析后类型:", typeof parsedMessage, parsedMessage);
+          if (parsedMessage.type === "daily_sixty_minutes_data") {
+            klineData.value = parsedMessage.data.map((item) => ({
+              open: item.open,
+              close: item.close,
+              high: Math.max(item.low, item.high),
+              low: Math.min(item.low, item.high),
+              volume: item.volume,
+              amount: item.amount,
+              date: item.timestamp,
+            }));
+            stockInformation.value.lastDayStockClosePrice = klineData.value[klineData.value.length - 2].close;
+            touchState.offset = canvasWidth.value / klineData.value.length / 2;
+            console.log("lastDayStockClosePrice", stockInformation.value.lastDayStockClosePrice);
+            drawChart();
+          }
+        }
       }
     } else {
       // 没有通过JSON解析判断，说明不是需要的数据
@@ -1789,7 +2181,8 @@ onLoad((options) => {
 
 // 保存定时器，用于页面卸载时清理
 onUnmounted(() => {
-  // disconnect();
+  removeTcpListeners();
+  disconnect();
   if (timer) {
     console.log("卸载定时器");
     clearInterval(timer);
@@ -1829,7 +2222,9 @@ onMounted(async () => {
       console.warn("没有时间数据，跳过股票信息计算");
     }
     await nextTick();
-    initCanvas();
+    setTimeout(() => {
+      initCanvas();
+    }, 100);
     console.log("所有初始化步骤完成");
   } catch (error) {
     console.error("初始化过程中出现错误:", error);

pages/marketSituation/marketOverview.vue

@@ -5,7 +5,6 @@
     <!-- 可滚动内容区域 -->
     <scroll-view class="content_scroll" scroll-y="true" :style="{ top: contentTopPosition + 'px' }">
       <view class="content">
-        <button @click="goToChartExample">图表</button>
         <view class="map">
           <image src="/static/marketSituation-image/map.png" mode="widthFix"></image>
         </view>
@@ -52,13 +51,6 @@ const isWarnTextOverflow = ref(false); // warn文字是否溢出
 const pageIndex = ref(0);
 const scrollToView = ref("");
 
-// 跳转图表示例页面
-const goToChartExample = () => {
-  uni.navigateTo({
-    url: "/pages/marketSituation/chartExample",
-  });
-};
-
 // 计算属性：精准计算content区域的top值
 const contentTopPosition = computed(() => {
   const statusBarHeight = iSMT.value || 0;
@@ -650,8 +642,7 @@ watch(headerHeight, (newHeight) => {
   margin: 0;
   box-sizing: border-box;
   width: 100%;
-  padding: 30rpx 20rpx;
-  gap: 20rpx;
+  padding: 30rpx 0;
 }
 
 .card_item {
@@ -665,7 +656,7 @@ watch(headerHeight, (newHeight) => {
 @media (max-width: 600rpx) {
   .cards_grid {
     grid-template-columns: repeat(2, 1fr);
-    padding: 30rpx 20rpx;
+    padding: 30rpx 0;
   }
 }
 
@@ -673,7 +664,7 @@ watch(headerHeight, (newHeight) => {
 @media (max-width: 400rpx) {
   .cards_grid {
     grid-template-columns: 1fr;
-    padding: 30rpx 20rpx;
+    padding: 30rpx 0;
   }
 }
 

pages/setting/account.vue

@@ -9,41 +9,37 @@
 				<text class="item-label">头像</text>
 				<view class="item-right">
 					<image src="/static/avatar.png" class="avatar" mode="aspectFill"></image>
-					<uni-icons type="arrowright" size="16" class="arrow"></uni-icons>
+					<uni-icons type="arrowright" size="16"></uni-icons>
 				</view>
 			</view>
 			<view class="setting-item">
 				<text class="item-label">昵称</text>
 				<view class="item-right">
-					<text class="item-text">DeepChart</text>
-					<uni-icons type="arrowright" size="16" class="arrow"></uni-icons>
+					<text class="item-text">{{userInfoRes.dcname}}</text>
+					<uni-icons type="arrowright" size="16"></uni-icons>
 				</view>
 			</view>
 			<view class="setting-item">
 				<text class="item-label">ID</text>
 				<view class="item-right">
-					<text class="item-text">{{ jwcode }}</text>
-					<uni-icons type="arrowright" size="16" class="arrow"></uni-icons>
-				</view>
-			</view>
-			<view class="setting-item">
-				<text class="item-label">密码</text>
-				<view class="item-right">
-					<text class="item-text">qwertyuiop</text>
-					<uni-icons type="eye" size="16" class="eye-icon"></uni-icons>
+					<text class="item-text">{{ userInfoRes.dccode }}</text>
 				</view>
 			</view>
 			<view class="setting-item" @click="goToPassword">
-				<text class="item-label">修改密码</text>
-				<uni-icons type="arrowright" size="16" class="arrow"></uni-icons>
+				<text class="item-label">
+					<template #default>
+						{{ userInfoRes.hasPwd === 0 ? '创建密码' : '修改密码' }}
+					</template>
+				</text>
+				<uni-icons type="arrowright" size="16"></uni-icons>
 			</view>
 			<view class="setting-item">
 				<text class="item-label">注销账号</text>
-				<uni-icons type="arrowright" size="16" class="arrow"></uni-icons>
+				<uni-icons type="arrowright" size="16"></uni-icons>
 			</view>
 			<view class="setting-item" @click="goToBind">
 				<text class="item-label">绑定账号</text>
-				<uni-icons type="arrowright" size="16" class="arrow"></uni-icons>
+				<uni-icons type="arrowright" size="16"></uni-icons>
 			</view>
 		</view>
 
@@ -73,8 +69,12 @@
 	} from 'vue'
 
 	import {useUserStore} from "../../stores/modules/userInfo"
+	import {
+		getUserInfo
+	} from "@/api/member";
 	const iSMT = ref(0)
-	const jwcode = ref('90047681')
+	// const dccode = ref('')
+	const userInfoRes = ref({})
 	const showLogout = ref(false)
 	const userStore = useUserStore()
 	
@@ -86,20 +86,30 @@
 			title: '退出登录成功',
 			icon: 'none',
 		})
-	}
 
-	const goToBind = () =>{
 		uni.navigateTo({
-			url:'../setting/bind'
+			url: '/pages/start/login/login'
 		})
 	}
 
-	const goToPassword = () =>{
+	const goToBind = () => {
 		uni.navigateTo({
-			url:'../setting/password'
+			url: '../setting/bind'
 		})
 	}
 
+	const goToPassword = () => {
+		if (userInfoRes.value.hasPwd === 0) {
+			uni.navigateTo({
+				url: '../setting/createPwd'
+			})
+		} else {
+			uni.navigateTo({
+				url: '../setting/password'
+			})
+		}
+	}
+
 	onMounted(() => {
 		iSMT.value = uni.getSystemInfoSync().statusBarHeight;
 	})
@@ -107,7 +117,7 @@
 
 <style scoped>
 	.setting-list {
-		height: 49vh;
+		height: 42vh;
 		background-color: #fff;
 	}
 

pages/setting/createPwd.vue

@@ -0,0 +1,245 @@
+<template>
+	<view class="main">
+		<view :style="{height:iSMT+'px'}"></view>
+
+		<view class="tab">
+			<view class="tab-item" :class="{active: activeTab === 'email'}" @click="activeTab = 'email'">邮箱</view>
+			<view class="tab-item" :class="{active: activeTab === 'phone'}" @click="activeTab = 'phone'">手机号</view>
+		</view>
+
+		<view class="switch-tab">
+			<view class="input-list" v-if="activeTab === 'email'">
+				<image src="/static/my/changeEmail.png" mode="aspectFit"></image>
+				<input type="text" placeholder="请输入邮箱" class="input" v-model="userEmail" />
+				<button class="code-btn" :class="{disabled: gettingCode}" @click="getCode" :disabled="gettingCode">
+					{{ gettingCode ? `重新发送 ${time}s` : '获取验证码' }}
+				</button>
+			</view>
+
+			<view class="input-list" v-else>
+				<image src="/static/my/changeBindPhone.png" mode="aspectFit"></image>
+				<input type="number" placeholder="请输入手机号" class="input" v-model="userPhone" />
+				<button class="code-btn" :class="{disabled: gettingCode}" @click="getCode" :disabled="gettingCode">
+					{{ gettingCode ? `重新发送 ${time}s` : '获取验证码' }}
+				</button>
+			</view>
+
+			<view class="input-list">
+				<image src="/static/my/verification.png" mode="aspectFit"></image>
+				<input type="text" placeholder="请输入验证码" class="input" v-model="verifyCode" />
+			</view>
+		</view>
+
+		<view class="btn-area">
+			<button class="next-btn" @click="goToPwdNext">下一步</button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted
+	} from 'vue'
+	import {
+		sendEmail,
+		validateCode,
+		sendPhone
+	} from "@/api/setting/password";
+
+	const iSMT = ref(0)
+	const activeTab = ref('email')
+	const gettingCode = ref(false)
+	const time = ref(60)
+
+	const userEmail = ref('')
+	const userPhone = ref('')
+	const verifyCode = ref('')
+
+
+	const getCode = () => {
+		if (gettingCode.value) return
+		gettingCode.value = true
+
+		time.value = 2
+
+		const timer = setInterval(() => {
+			time.value--
+			if (time.value <= 0) {
+				clearInterval(timer)
+				gettingCode.value = false
+				time.value = 2
+			}
+		}, 1000)
+		if (activeTab.value === 'email') {
+			sendEmail({
+				email: userEmail.value
+			})
+		} else {
+			sendPhone({
+				phone: userPhone.value
+			})
+		}
+
+	}
+
+const goToPwdNext = async () => {
+		if (!userEmail.value) {
+			uni.showToast({
+				title: '请输入邮箱',
+				icon: 'none'
+			})
+			return
+		}
+		if (!verifyCode.value) {
+			uni.showToast({
+				title: '请输入验证码',
+				icon: 'none'
+			})
+			return
+		}
+
+		try {
+			let param;
+			if (activeTab.value === 'email') {
+				param = {
+					loginType: 'EMAIL',
+					account: userEmail.value,
+					verifyCode: verifyCode.value
+				}
+			} else {
+				param = {
+					loginType: 'PHONE',
+					account: userPhone.value,
+					verifyCode: verifyCode.value
+				}
+			}
+			const res = await validateCode(param)
+			console.log('看看参数', param)
+			console.log('看看结果', res)
+			// 如果返回成功
+			if (res.code === 200) {
+				uni.showToast({
+					title: '验证成功',
+					icon: 'success'
+				})
+				uni.navigateTo({
+					url: '../setting/nextPwd'
+				})
+			} else {
+				uni.showToast({
+					title: res.msg || '验证失败',
+					icon: 'none'
+				})
+			}
+		} catch (err) {
+			console.error(err)
+			uni.showToast({
+				title: '请求出错',
+				icon: 'none'
+			})
+		}
+	}
+
+
+	onMounted(() => {
+		// 获取状态栏高度
+		iSMT.value = uni.getSystemInfoSync().statusBarHeight;
+	})
+</script>
+
+<style>
+	.tab {
+		display: flex;
+		height: 8vh;
+		background-color: #fff;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.tab-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		position: relative;
+	}
+
+	.tab-item.active {
+		color: #000;
+		font-weight: bold;
+	}
+
+	.tab-item.active::after {
+		content: '';
+		position: absolute;
+		bottom: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		width: 40rpx;
+		height: 6rpx;
+		background-color: #000;
+		/* ????? */
+	}
+
+	.switch-tab {
+		background-color: #fff;
+		padding: 0 60rpx;
+	}
+
+	.input-list {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 7vh;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.input-list image {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 20rpx;
+	}
+
+	.input {
+		flex: 1;
+		height: 14vh;
+		font-size: 28rpx;
+	}
+
+	.code-btn {
+		width: 200rpx;
+		height: 60rpx;
+		font-size: 24rpx;
+		border-radius: 10rpx;
+		background-color: #eee;
+		color: #666;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.code-btn.disabled {
+		background-color: #ccc;
+		color: #999;
+	}
+
+	.btn-area {
+		height: 8vh;
+		background-color: white;
+		padding-top: 120rpx;
+	}
+
+
+	.next-btn {
+		width: 610rpx;
+		height: 85rpx;
+		background-color: #000;
+		color: #fff;
+		font-size: 30rpx;
+		border-radius: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+</style>

pages/setting/email.vue

@@ -15,11 +15,10 @@
 			<view class="top-list">
 				<view class="left">
 					<img src="/static/my/changeEmail.png" />
-					<text class="label">+86</text>
-					<input type="number" placeholder="请输入您的换绑邮箱" class="input" />
+					<input v-model="userEmail" placeholder="请输入您的换绑邮箱" class="input" />
 				</view>
 				<view class="right">
-					<button class="verification" :class="{ 'disabled': gettingCode }" @click="getVerification"
+					<button class="verification" :class="{ 'disabled': gettingCode }" @click="getCode"
 						:disabled="gettingCode">
 						{{ gettingCode ? `重新发送 ${time}s` : '获取验证码' }}
 					</button>
@@ -35,7 +34,7 @@
 		</view>
 
 		<view class="bottom">
-			<button class="change-btn">换绑</button>
+			<button class="change-btn" @click="changeAccount">换绑</button>
 		</view>
 	</view>
 </template>
@@ -45,23 +44,67 @@
 		ref,
 		onMounted
 	} from 'vue'
+	import {
+		getUserInfo
+	} from "@/api/member"
+	import {
+		sendEmail,
+		changeBind
+	} from "@/api/setting/password"
 	const iSMT = ref(0)
-	const email = ref('analsak@16.com')
+	const email = ref('')
 	const gettingCode = ref(false)
 	const time = ref(60)
+	const userEmail = ref('')
+
+	const userInfoPromise = getUserInfo()
+	userInfoPromise.then(res => {
+		if (res.code === 200) {
+			console.log('个人信息', res.data)
+			email.value = res.data.email
+		} else {
+			uni.showToast({
+				title: '用户信息请求失败',
+				icon: 'none',
+			})
+		}
+	})
 
-	const getVerification = () => {
+	const changeAccount = () => {
+		const res = changeBind({
+			verificateType: 0,
+			account: userEmail.value
+		})
+		if(res.code === 200){
+			uni.showToast({
+				title: '绑定成功',
+				icon: 'none',
+			})
+		}else {
+			uni.showToast({
+				title: '用户绑定失败',
+				icon: 'none',
+			})
+		}
+	}
+
+	const getCode = () => {
 		if (gettingCode.value) return
 		gettingCode.value = true
 
-		time.value = 60
+		time.value = 2
+
 		const timer = setInterval(() => {
 			time.value--
 			if (time.value <= 0) {
 				clearInterval(timer)
 				gettingCode.value = false
+				time.value = 2
 			}
 		}, 1000)
+		sendEmail({
+			email: userEmail.value
+		})
 	}
 
 	onMounted(() => {
@@ -131,7 +174,7 @@
 	.change-btn {
 		height: 85rpx;
 		width: 610rpx;
-		padding:0 20rpx;
+		padding: 0 20rpx;
 		background-color: black;
 		color: white;
 		border-radius: 40rpx;

pages/setting/font.vue

@@ -4,18 +4,18 @@
 		<view class="top">
 			<view class="top-list">
 				<text>标准</text>
-				<radio value="0" class="radio-btn"  activeBackgroundColor="red"
-				 :checked="selectedIndex === 0"  @click="selectFont(0)" />
+				<radio value="0" class="radio-btn" activeBackgroundColor="red" :checked="selectedIndex === 0"
+					@click="selectFont(0)" />
 			</view>
 			<view class="top-list">
 				<text>中号</text>
-				<radio value="1" class="radio-btn" activeBackgroundColor="red"
-				 :checked="selectedIndex === 1"  @click="selectFont(1)" />
+				<radio value="1" class="radio-btn" activeBackgroundColor="red" :checked="selectedIndex === 1"
+					@click="selectFont(1)" />
 			</view>
 			<view class="top-list">
 				<text>大号</text>
-				<radio value="2" class="radio-btn"  activeBackgroundColor="red"
-				:checked="selectedIndex === 2"  @click="selectFont(2)" />
+				<radio value="2" class="radio-btn" activeBackgroundColor="red" :checked="selectedIndex === 2"
+					@click="selectFont(2)" />
 			</view>
 		</view>
 	</view>
@@ -26,17 +26,39 @@
 		ref,
 		onMounted
 	} from 'vue'
+	import {
+		getSetting
+	} from "@/api/setting/general"
 	const iSMT = ref(0)
 	const selectedIndex = ref(0)
 
+	const getFont = async () => {
+		try {
+			const res = await getSetting()
+			if (res.code === 200) {
+				const fontSize = res.data.fontSize
+				const sizeMap = {
+					small: 0,
+					medium: 1,
+					large: 2
+				}
+				console.log('看看字体', res.data.fontSize)
+				selectedIndex.value = sizeMap[fontSize] ?? 0;
+			}
+		} catch (err) {
+			console.error("获取字体设置失败：", err);
+		}
+	}
+
 	const selectFont = (index) => {
 		selectedIndex.value = index
-		console.log('看看选中状态',selectedIndex.value)
+		console.log('看看选中状态', selectedIndex.value)
 	}
 	onMounted(() => {
 		// 状态栏高度
 		iSMT.value = uni.getSystemInfoSync().statusBarHeight;
 		console.log('看看高度', iSMT.value)
+		getFont()
 	})
 </script>
 
@@ -53,7 +75,7 @@
 		display: flex;
 		align-items: center;
 		margin: 0 40rpx;
-		padding:0 10rpx;
+		padding: 0 10rpx;
 		border-bottom: 1rpx solid #eee;
 	}
 

pages/setting/general.vue

@@ -1,165 +1,186 @@
 <template>
-	<view class="main">
-		<view :style="{height:iSMT+'px'}"></view>
-		<view class="top">
-			<view class="top-list">
-				<text>语言</text>
-				<text class="language">中文（简体）</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-			<view class="top-list" @click="goToFont">
-				<text>字体大小</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-			<view class="top-list" @click="goToTheme">
-				<text>主题切换</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-		</view>
-
-
-		<view class="center">
-			<view class="center-list" @click="goToMessage">
-				<text>消息推送</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-		</view>
-
-		<view class="bottom">
-			<view class="bottom-list" @click="goToServer">
-				<text>切换服务器</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-			<view class="bottom-list" @click="clearCache">
-				<text>清理缓存</text>
-				<text class="cache">{{ cache }}M</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
-			</view>
-		</view>
-	</view>
+  <view class="main">
+    <view :style="{height:iSMT+'px'}"></view>
+    <view class="top">
+      <view class="top-list">
+        <text class="label">语言</text>
+        <text class="language">{{settingRes.language}}</text>
+        <uni-icons type="arrowright" size="16" />
+      </view>
+      <view class="top-list" @click="goToFont">
+        <text class="label">字体大小</text>
+        <uni-icons type="arrowright" size="16" />
+      </view>
+      <view class="top-list" @click="goToTheme">
+        <text class="label">主题切换</text>
+        <uni-icons type="arrowright" size="16" />
+      </view>
+    </view>
+
+
+    <view class="center">
+      <view class="center-list" @click="goToMessage">
+        <text class="label">消息推送</text>
+        <uni-icons type="arrowright" size="16" />
+      </view>
+    </view>
+
+    <view class="bottom">
+      <view class="bottom-list" @click="goToServer">
+        <text class="label">切换服务器</text>
+        <uni-icons type="arrowright" size="16" />
+      </view>
+      <view class="bottom-list" @click="clearCache">
+        <text class="label">清理缓存</text>
+        <text class="cache">{{ cache }}M</text>
+        <uni-icons type="arrowright" size="16" />
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		onMounted
-	} from 'vue'
-	const iSMT = ref(0)
-	const cache = ref('45.5')
-
-	const goToFont = () => {
-		uni.navigateTo({
-			url: '/pages/setting/font'
-		})
-	}
-
-	const goToTheme = () => {
-		uni.navigateTo({
-			url: '/pages/setting/theme'
-		})
-	}
-
-	const goToMessage = () => {
-		uni.navigateTo({
-			url: '/pages/setting/message'
-		})
-	}
-
-	const goToServer = () => {
-		uni.navigateTo({
-			url: '/pages/setting/server'
-		})
-	}
-
-	const clearCache = () => {
-		cache.value = 0
-		uni.showToast({
-			title: '清理成功',
-			icon: 'success',
-			duration: 1500
-		})
-	}
-
-	onMounted(() => {
-		// 状态栏高度
-		iSMT.value = uni.getSystemInfoSync().statusBarHeight;
-		console.log('看看高度', iSMT.value)
-	})
+import {
+  ref,
+  onMounted
+} from 'vue'
+import {getUserInfo} from "@/api/member";
+const iSMT = ref(0)
+const cache = ref('45.5')
+
+const  settingRes = ref({})
+
+const settingPromise = getUserInfo()
+settingPromise.then(res => {
+  if (res.code === 200){
+    settingRes.value.language = res.data.language;
+    settingRes.value.fontSize = res.data.fontSize;
+    settingRes.value.theme = res.data.theme;
+    settingRes.value.serverSelection = res.data.serverSelection;
+    console.log('用户信息', res.data)
+  }else {
+    console.log('用户信息请求失败：', res.message);
+  }
+
+})
+
+const goToFont = () => {
+  uni.navigateTo({
+    url: '/pages/setting/font'
+  })
+}
+
+const goToTheme = () => {
+  uni.navigateTo({
+    url: '/pages/setting/theme'
+  })
+}
+
+const goToMessage = () => {
+  uni.navigateTo({
+    url: '/pages/setting/message'
+  })
+}
+
+const goToServer = () => {
+  uni.navigateTo({
+    url: '/pages/setting/server'
+  })
+}
+
+const clearCache = () => {
+  cache.value = 0
+  uni.showToast({
+    title: '清理成功',
+    icon: 'success',
+    duration: 1500
+  })
+}
+
+onMounted(() => {
+  // 状态栏高度
+  iSMT.value = uni.getSystemInfoSync().statusBarHeight;
+  console.log('看看高度', iSMT.value)
+})
 </script>
 
 <style>
-	.top {
-		margin-top: 1.5vh;
-		height: 21vh;
-		background-color: white;
-	}
-
-	.top-list {
-		width: 630rpx;
-		height: 7vh;
-		display: flex;
-		align-items: center;
-		margin: 0 40rpx;
-		padding: 0 10rpx;
-		border-bottom: 1rpx solid #eee;
-	}
-
-	.top-list:last-child {
-		border-bottom: none;
-	}
-
-	.language {
-		margin-left: 55%;
-		font-size: 14px;
-		color: rgb(203, 203, 203);
-	}
-
-	.arrow {
-		margin-left: auto;
-	}
-
-	.center {
-		background-color: white;
-		height: 7vh;
-		display: flex;
-		align-items: center;
-		margin-top: 1vh;
-	}
-
-	.center-list {
-		width: 630rpx;
-		margin: 0rpx 40rpx;
-		display: flex;
-		padding: 0 10rpx;
-	}
-
-	.center-list>.arrow {
-		margin-right: 0;
-	}
-
-	.bottom {
-		height: 13.5vh;
-		background-color: white;
-		margin-top: 1vh;
-	}
-
-	.bottom-list {
-		width: 630rpx;
-		height: 7vh;
-		display: flex;
-		align-items: center;
-		margin: 0 40rpx;
-		padding: 0 10rpx;
-		border-bottom: 1rpx solid #eee;
-	}
-
-	.cache {
-		margin-left: 55%;
-		font-size: 14px;
-		color: rgb(203, 203, 203);
-	}
-
-	.bottom-list:last-child {
-		border-bottom: none;
-	}
+.top {
+  margin-top: 1.5vh;
+  height: 21vh;
+  background-color: white;
+}
+
+.top-list {
+  width: 630rpx;
+  height: 7vh;
+  display: flex;
+  align-items: center;
+  margin: 0 40rpx;
+  padding: 0 10rpx;
+  border-bottom: 1rpx solid #eee;
+}
+
+.top-list:last-child {
+  border-bottom: none;
+}
+
+.language {
+  margin-left: 70%;
+  font-size: 14px;
+  color: rgb(203, 203, 203);
+}
+
+.arrow {
+  margin-left: auto;
+}
+
+.center {
+  background-color: white;
+  height: 7vh;
+  display: flex;
+  align-items: center;
+  margin-top: 1vh;
+}
+
+.center-list {
+  width: 630rpx;
+  margin: 0rpx 40rpx;
+  display: flex;
+  padding: 0 10rpx;
+}
+
+.center-list > .arrow {
+  margin-right: 0;
+}
+
+.bottom {
+  height: 13.5vh;
+  background-color: white;
+  margin-top: 1vh;
+}
+
+.bottom-list {
+  width: 630rpx;
+  height: 7vh;
+  display: flex;
+  align-items: center;
+  margin: 0 40rpx;
+  padding: 0 10rpx;
+  border-bottom: 1rpx solid #eee;
+}
+
+.cache {
+  font-size: 14px;
+  color: rgb(203, 203, 203);
+}
+
+.bottom-list:last-child {
+  border-bottom: none;
+}
+
+.label{
+	flex:1;
+	font-size:28rpx;
+}
 </style>

pages/setting/introduce.vue

@@ -13,7 +13,7 @@
 				的品牌标签（DeepChart=全球最懂机构行为的AI），主打"深度解读机构行为"的APP。</view>
 
 			<view class="title">2.产品介绍</view>
-			<view class="main-text">DeepChart是一款以"Al智能体”为决策核心的智能投资分析平台，
+			<view class="main-text">DeepChart是一款以"Al智能体"为决策核心的智能投资分析平台，
 				专注于深度研究机构行为，专为全球散户投资者量身打造。它重新定义了人与投资工具之间的关系，
 				是一个真正懂投资、懂市场、更懂用户的AI投资伙伴。</view>
 

pages/setting/market.vue

@@ -206,6 +206,7 @@
 
 	.indicator-text {
 		font-size: 28rpx;
+		flex:1;
 	}
 
 	.indicator-icons {

pages/setting/message.vue

@@ -3,10 +3,10 @@
 		<view :style="{height:iSMT+'px'}"></view>
 		<view class="top">
 			<view class="top-list" @click="goToPush">
-				<text>语言</text>
+				<text class="text">消息推送</text>
 				<text class="message" v-if="isMessage">通知已开启</text>
 				<text class="message" v-if="!isMessage">通知未开启</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
+				<uni-icons type="arrowright" size="16" />
 			</view>
 		</view>
 	</view>
@@ -51,12 +51,11 @@
 	}
 
 	.message {
-		margin-left: 60%;
 		font-size: 14px;
 		color: rgb(203, 203, 203);
 	}
 	
-	.arrow {
-		margin-left: auto;
+	.text{
+		flex:1;
 	}
 </style>

pages/setting/nextPwd.vue

@@ -1,144 +1,175 @@
 <template>
-	<view class="main">
-		<view :style="{height:iSMT+'px'}"></view>
-
-		<view style="height:1.5vh;" />
-
-		<view class="title">
-			<text class="label">确认新密码</text>
-		</view>
-
-		<view class="top">
-			<view class="top-list">
-				<view class="left">
-					<img src="/static/my/unlock.png" />
-					<input type="password" :type="pwdType" placeholder="请输入新密码" class="input" />
-					<img :src="pwdType === 1 ? '/static/my/hideEye.png' : '/static/my/openEye.png'"
-						@click="changeEye(1)" />
-				</view>
-			</view>
-
-			<view class="top-list">
-				<view class="left">
-					<img src="/static/my/unlock.png" />
-					<input type="password" :type="pwdType2" placeholder="再次确认" class="input" />
-					<img :src="pwdType === 1 ? '/static/my/hideEye.png' : '/static/my/openEye.png'"
-						@click="changeEye(2)" />
-				</view>
-			</view>
-
-			<text class="tips">密码最少8位数</text>
-		</view>
-
-		<view class="bottom">
-			<button class="change-btn">确认</button>
-		</view>
-	</view>
+  <view class="main">
+    <view :style="{height:iSMT+'px'}"></view>
+
+    <view style="height:1.5vh;"/>
+
+    <view class="title">
+      <text class="label">确认新密码</text>
+    </view>
+
+    <view class="top">
+
+
+      <view class="top-list">
+        <view class="left">
+          <img src="/static/my/unlock.png"/>
+          <input type="password" :type="pwdType" placeholder="请输入新密码" class="input" v-model="oldPassword"
+          />
+          <img :src="pwdType === 1 ? '/static/my/hideEye.png' : '/static/my/openEye.png'"
+               @click="changeEye(1)"/>
+        </view>
+      </view>
+
+      <view class="top-list">
+        <view class="left">
+          <img src="/static/my/unlock.png"/>
+          <input type="password" :type="pwdType2" placeholder="再次确认" class="input" v-model="newPassword"/>
+          <img :src="pwdType === 1 ? '/static/my/hideEye.png' : '/static/my/openEye.png'"
+               @click="changeEye(2)"/>
+        </view>
+      </view>
+
+      <text class="tips">密码最少8位数</text>
+    </view>
+
+    <view class="bottom">
+      <button class="change-btn" @click="confirmChange">确认</button>
+    </view>
+  </view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		onMounted
-	} from 'vue'
-
-	const iSMT = ref(0)
-	const pwdType = ref('password')
-	const pwdType2 = ref('password')
-
-	const changeEye = (type) => {
-		if (type === 1) {
-			pwdType.value = pwdType.value === 'password' ? 'text' : 'password'
-		} else {
-			pwdType2.value = pwdType2.value === 'password' ? 'text' : 'password'
-		}
-	}
-
-	onMounted(() => {
-		// 状态栏高度
-		iSMT.value = uni.getSystemInfoSync().statusBarHeight;
-		console.log('看看高度', iSMT.value)
-	})
+import {onMounted, ref} from 'vue'
+import {updatePassword} from "@/api/setting/nextPwd";
+
+const iSMT = ref(0)
+const pwdType = ref('password')
+const pwdType2 = ref('password')
+
+// 绑定的数据 旧密码 新密码 确认密码
+const oldPassword = ref('')
+const newPassword = ref('')
+
+// 点击确认按钮
+const confirmChange = async () => {
+
+  if (newPassword.value !== oldPassword.value) {
+    uni.showToast({title: '两次输入的密码不一致', icon: 'none'})
+    return
+  }
+  const updatePasswordPromise = updatePassword({
+    oldPassword: oldPassword.value,
+    newPassword: newPassword.value
+  })
+  updatePasswordPromise
+      .then(res => {
+        if (res.code === 200) {
+          uni.showToast({ title: '修改成功', icon: 'success' });
+        } else {
+          uni.showToast({ title: res.message,icon: 'none' });
+        }
+      })
+      .catch(err => {
+        console.log('修改密码失败：', err);
+      });
+
+}
+
+
+const changeEye = (type) => {
+  if (type === 1) {
+    pwdType.value = pwdType.value === 'password' ? 'text' : 'password'
+  } else {
+    pwdType2.value = pwdType2.value === 'password' ? 'text' : 'password'
+  }
+}
+
+onMounted(() => {
+  // 状态栏高度
+  iSMT.value = uni.getSystemInfoSync().statusBarHeight;
+  console.log('看看高度', iSMT.value)
+})
 </script>
 
 <style>
-	.title {
-		height: 8.5vh;
-		background-color: white;
-	}
-
-	.label {
-		height: 8.5vh;
-		font-size: 40rpx;
-		font-weight: bold;
-		display: flex;
-		align-items: center;
-		padding: 0 60rpx;
-	}
-
-	.top {
-		height: auto;
-		background-color: white;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.top-list {
-		width: 630rpx;
-		height: 7vh;
-		margin: 0rpx 40rpx;
-		display: flex;
-		align-items: center;
-		border-bottom: 1rpx solid #eee;
-	}
-
-	.left {
-		flex: 1;
-		display: flex;
-		align-items: center;
-	}
-
-	.input {
-		flex: 1;
-		height: 70rpx;
-		font-size: 29rpx;
-		margin-left: 20rpx;
-	}
-
-	.bottom {
-		height: 22vh;
-		background-color: white;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.change-btn {
-		height: 85rpx;
-		width: 610rpx;
-		padding: 0 20rpx;
-		background-color: black;
-		color: white;
-		border-radius: 40rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.img {
-		position: absolute;
-		right: 0;
-		top: 50%;
-		transform: translateY(-50%);
-	}
-
-	.tips {
-		font-size: 24rpx;
-		color: #999;
-		margin-top: 20rpx;
-		margin-left: 60rpx;
-		align-self: flex-start;
-		/* 这是左对齐 */
-	}
+.title {
+  height: 8.5vh;
+  background-color: white;
+}
+
+.label {
+  height: 8.5vh;
+  font-size: 40rpx;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  padding: 0 60rpx;
+}
+
+.top {
+  height: auto;
+  background-color: white;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.top-list {
+  width: 630rpx;
+  height: 7vh;
+  margin: 0rpx 40rpx;
+  display: flex;
+  align-items: center;
+  border-bottom: 1rpx solid #eee;
+}
+
+.left {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
+
+.input {
+  flex: 1;
+  height: 70rpx;
+  font-size: 29rpx;
+  margin-left: 20rpx;
+}
+
+.bottom {
+  height: 22vh;
+  background-color: white;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.change-btn {
+  height: 85rpx;
+  width: 610rpx;
+  padding: 0 20rpx;
+  background-color: black;
+  color: white;
+  border-radius: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.img {
+  position: absolute;
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.tips {
+  font-size: 24rpx;
+  color: #999;
+  margin-top: 20rpx;
+  margin-left: 60rpx;
+  align-self: flex-start;
+  /* 这是左对齐 */
+}
 </style>

pages/setting/password.vue

@@ -10,7 +10,7 @@
 		<view class="switch-tab">
 			<view class="input-list" v-if="activeTab === 'email'">
 				<image src="/static/my/changeEmail.png" mode="aspectFit"></image>
-				<input type="text" placeholder="请输入邮箱" class="input" />
+				<input type="text" placeholder="请输入邮箱" class="input" v-model="userEmail" />
 				<button class="code-btn" :class="{disabled: gettingCode}" @click="getCode" :disabled="gettingCode">
 					{{ gettingCode ? `重新发送 ${time}s` : '获取验证码' }}
 				</button>
@@ -18,7 +18,7 @@
 
 			<view class="input-list" v-else>
 				<image src="/static/my/changeBindPhone.png" mode="aspectFit"></image>
-				<input type="number" placeholder="请输入手机号" class="input" />
+				<input type="number" placeholder="请输入手机号" class="input" v-model="userPhone" />
 				<button class="code-btn" :class="{disabled: gettingCode}" @click="getCode" :disabled="gettingCode">
 					{{ gettingCode ? `重新发送 ${time}s` : '获取验证码' }}
 				</button>
@@ -26,7 +26,7 @@
 
 			<view class="input-list">
 				<image src="/static/my/verification.png" mode="aspectFit"></image>
-				<input type="text" placeholder="请输入验证码" class="input" />
+				<input type="text" placeholder="请输入验证码" class="input" v-model="verifyCode" />
 			</view>
 		</view>
 
@@ -41,34 +41,107 @@
 		ref,
 		onMounted
 	} from 'vue'
+	import {
+		sendEmail,
+		validateCode,
+		sendPhone
+	} from "@/api/setting/password";
 
 	const iSMT = ref(0)
 	const activeTab = ref('email')
 	const gettingCode = ref(false)
 	const time = ref(60)
 
+	const userEmail = ref('')
+	const userPhone = ref('')
+	const verifyCode = ref('')
+
+
 	const getCode = () => {
 		if (gettingCode.value) return
 		gettingCode.value = true
 
-		time.value = 60
+		time.value = 2
 
 		const timer = setInterval(() => {
 			time.value--
 			if (time.value <= 0) {
 				clearInterval(timer)
 				gettingCode.value = false
-				time.value = 60
+				time.value = 2
 			}
 		}, 1000)
+		if (activeTab.value === 'email') {
+			sendEmail({
+				email: userEmail.value
+			})
+		} else {
+			sendPhone({
+				phone: userPhone.value
+			})
+		}
+
 	}
 
-	const goToPwdNext = () =>{
-		uni.navigateTo({
-			url:'../setting/nextPwd'
-		})
+const goToPwdNext = async () => {
+		if (!userEmail.value) {
+			uni.showToast({
+				title: '请输入邮箱',
+				icon: 'none'
+			})
+			return
+		}
+		if (!verifyCode.value) {
+			uni.showToast({
+				title: '请输入验证码',
+				icon: 'none'
+			})
+			return
+		}
+
+		try {
+			let param;
+			if (activeTab.value === 'email') {
+				param = {
+					loginType: 'EMAIL',
+					account: userEmail.value,
+					verifyCode: verifyCode.value
+				}
+			} else {
+				param = {
+					loginType: 'PHONE',
+					account: userPhone.value,
+					verifyCode: verifyCode.value
+				}
+			}
+			const res = await validateCode(param)
+			console.log('看看参数', param)
+			console.log('看看结果', res)
+			// 如果返回成功
+			if (res.code === 200) {
+				uni.showToast({
+					title: '验证成功',
+					icon: 'success'
+				})
+				uni.navigateTo({
+					url: '../setting/nextPwd'
+				})
+			} else {
+				uni.showToast({
+					title: res.msg || '验证失败',
+					icon: 'none'
+				})
+			}
+		} catch (err) {
+			console.error(err)
+			uni.showToast({
+				title: '请求出错',
+				icon: 'none'
+			})
+		}
 	}
 
+
 	onMounted(() => {
 		// 获取状态栏高度
 		iSMT.value = uni.getSystemInfoSync().statusBarHeight;
@@ -105,7 +178,8 @@
 		transform: translateX(-50%);
 		width: 40rpx;
 		height: 6rpx;
-		background-color: #000;/* ????? */
+		background-color: #000;
+		/* ????? */
 	}
 
 	.switch-tab {
@@ -150,8 +224,8 @@
 		color: #999;
 	}
 
-	.btn-area{
-		height:8vh;
+	.btn-area {
+		height: 8vh;
 		background-color: white;
 		padding-top: 120rpx;
 	}

pages/setting/phone.vue

@@ -11,15 +11,14 @@
 					<text class="label">已绑手机号：{{ phone }}</text>
 				</view>
 			</view>
-
 			<view class="top-list">
 				<view class="left">
 					<img src="/static/my/changeBindPhone.png" />
 					<text class="label">+86</text>
-					<input type="number" placeholder="请输入您的换绑手机号" class="input" />
+					<input type="number" v-model="userPhone" placeholder="请输入您的换绑手机号" class="input" />
 				</view>
 				<view class="right">
-					<button class="verification" :class="{ 'disabled': gettingCode }" @click="getVerification"
+					<button class="verification" :class="{ 'disabled': gettingCode }" @click="getCode"
 						:disabled="gettingCode">
 						{{ gettingCode ? `重新发送 ${time}s` : '获取验证码' }}
 					</button>
@@ -35,7 +34,7 @@
 		</view>
 
 		<view class="bottom">
-			<button class="change-btn">换绑</button>
+			<button class="change-btn" @click="changeAccount">换绑</button>
 		</view>
 	</view>
 </template>
@@ -45,12 +44,34 @@
 		ref,
 		onMounted
 	} from 'vue'
+	import {
+		sendPhone,
+		changeBind
+	} from "@/api/setting/password"
+	import {
+		getUserInfo
+	} from "@/api/member"
+	
 	const iSMT = ref(0)
-	const phone = ref('15105421566')
+	const phone = ref('')
 	const gettingCode = ref(false)
 	const time = ref(60)
+	const userPhone = ref('')
+	
+	const userInfoPromise = getUserInfo()
+	userInfoPromise.then(res => {
+		if (res.code === 200) {
+			console.log('个人信息', res.data)
+			phone.value = res.data.phone
+		} else {
+			uni.showToast({
+				title: '用户信息请求失败',
+				icon: 'none',
+			})
+		}
+	})
 
-	const getVerification = () => {
+	const getCode = () => {
 		if (gettingCode.value) return
 		gettingCode.value = true
 
@@ -63,6 +84,27 @@
 				gettingCode.value = false
 			}
 		}, 1000)
+		sendPhone({
+			phone: userPhone.value
+		})
+	}
+	
+	const changeAccount = () => {
+		const res = changeBind({
+			verificateType: 1,
+			account: userPhone.value
+		})
+		if(res.code === 200){
+			uni.showToast({
+				title: '绑定成功',
+				icon: 'none',
+			})
+		}else {
+			uni.showToast({
+				title: '用户绑定失败',
+				icon: 'none',
+			})
+		}
 	}
 
 	onMounted(() => {

pages/setting/push.vue

@@ -3,25 +3,35 @@
 		<view :style="{height:iSMT+'px'}"></view>
 		<view class="top">
 			<view class="top-list">
-				<text style="width:180rpx;">公共消息</text>
-				<text class="public">重大咨询、财经要闻等系统提醒</text>
-				<switch class="arrow switch-btn" />
+				<text class="label">公共消息</text>
+				<view class="right">
+					<text class="public">重大咨询、财经要闻等系统提醒</text>
+					<switch class="switch-btn" />
+				</view>
 			</view>
 			<view class="top-list">
-				<text>字体大小</text>
-				<switch class="arrow switch-btn"  />
+				<text class="label">指标消息提醒</text>
+				<view class="right">
+					<text class="public">所有指标消息的提醒</text>
+					<switch class="switch-btn" />
+				</view>
 			</view>
 		</view>
 
 		<view class="bottom">
 			<view class="bottom-list">
-				<text>盯盘预警</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
+				<text class="label">盯盘预警</text>
+				<view class="right">
+					<text class="public">自选股预警和个性化预警设置</text>
+					<uni-icons type="arrowright" size="16" />
+				</view>
 			</view>
 			<view class="bottom-list">
-				<text>订阅服务</text>
-				<text class="cache">45.5M</text>
-				<uni-icons type="arrowright" size="16" class="arrow" />
+				<text class="label">订阅服务</text>
+				<view class="right">
+					<text class="public">订阅你感兴趣的专题服务</text>
+					<uni-icons type="arrowright" size="16" />
+				</view>
 			</view>
 		</view>
 	</view>
@@ -53,7 +63,6 @@
 		height: 7vh;
 		display: flex;
 		align-items: center;
-		justify-content: center;
 		margin: 0 40rpx;
 		padding: 0 10rpx;
 		border-bottom: 1rpx solid #eee;
@@ -63,25 +72,24 @@
 		border-bottom: none;
 	}
 
+	.right {
+		display: flex;
+		align-items: center;
+		gap: 10rpx;
+	}
+
 	.switch-btn {
-		width: 100rpx;
 		transform: scale(0.6);
 		transform-origin: center right;
 	}
 
 	.public {
-		width: 450rpx;
-		margin-left: auto;
 		font-size: 10px;
 		color: rgb(203, 203, 203);
 	}
 
-	.arrow {
-		margin-left: auto;
-	}
-
 	.bottom {
-		height: 13.5vh;
+		height: 14vh;
 		background-color: white;
 		margin-top: 1vh;
 	}
@@ -105,4 +113,8 @@
 	.bottom-list:last-child {
 		border-bottom: none;
 	}
+
+	.label {
+		flex: 1;
+	}
 </style>

pages/setting/server.vue

@@ -26,9 +26,31 @@
 		ref,
 		onMounted
 	} from 'vue'
+	import {
+		getSetting
+	} from "@/api/setting/general"
+	
 	const iSMT = ref(0)
 	const selectedIndex = ref(0)
 	
+	const getServer = async () => {
+		try {
+			const res = await getSetting()
+			if (res.code === 200) {
+				const fontSize = res.data.fontSize
+				const sizeMap = {
+					'auto': 0,
+					'singapore': 1,
+					'hongkong': 2
+				}
+				console.log('看看服务器', res.data.fontSize)
+				selectedIndex.value = sizeMap[fontSize] ?? 0;
+			}
+		} catch (err) {
+			console.error("获取服务器设置失败：", err);
+		}
+	}
+	
 	const selectFont = (index) => {
 		selectedIndex.value = index
 		console.log('看看选中状态',selectedIndex.value)
@@ -38,6 +60,7 @@
 		// 状态栏高度
 		iSMT.value = uni.getSystemInfoSync().statusBarHeight;
 		console.log('看看高度', iSMT.value)
+		getServer()
 	})
 </script>
 

pages/setting/theme.vue

@@ -21,9 +21,29 @@
 		ref,
 		onMounted
 	} from 'vue'
+	import {
+		getSetting
+	} from "@/api/setting/general"
 	const iSMT = ref(0)
 	const selectedIndex = ref(0)
 	
+	const getTheme = async () => {
+		try {
+			const res = await getSetting()
+			if (res.code === 200) {
+				const theme = res.data.theme
+				const sizeMap = {
+					'light': 0,
+					'dark': 1
+				}
+				console.log('看看主题', res.data.theme)
+				selectedIndex.value = sizeMap[theme] ?? 0;
+			}
+		} catch (err) {
+			console.error("获取主题设置失败：", err);
+		}
+	}
+
 	const selectFont = (index) => {
 		selectedIndex.value = index
 		console.log('看看选中状态', selectedIndex.value)
@@ -32,6 +52,7 @@
 		// 状态栏高度
 		iSMT.value = uni.getSystemInfoSync().statusBarHeight;
 		console.log('看看高度', iSMT.value)
+		getTheme()
 	})
 </script>
 

pages/start/Registration/Registration.vue

@@ -198,6 +198,7 @@ import {
   SendPhoneCodeApi,
 } from "../../../api/start/login";
 import { useDeviceStore} from "../../../stores/modules/deviceInfo"
+import { useUserStore} from "../../../stores/modules/userInfo"
 
 const type = ref("");
 const email = ref("");
@@ -246,7 +247,7 @@ function showCountryPicker() {
 function goToIndex() {
   // 返回上一页
   uni.navigateTo({
-    url: "/pages/start/index/index",
+    url: "/pages/start/login/login",
   });
 }
 

pages/start/index/index.vue

@@ -1,56 +0,0 @@
-<template>
-  <view class="content">
-    <image class="logo" src="/static/logo.png"></image>
-    <view class="text-area">
-      <text class="title" @click="showLoginPrompt">{{ title }}</text>
-    </view>
-    <LoginPrompt ref="loginPrompt"></LoginPrompt>
-    <button @click="toDeepMate">deepMate</button>
-  </view>
-</template>
-
-<script setup>
-import { ref } from "vue";
-import { useUserStore } from "../../../stores/modules/userInfo";
-const title = ref("请先登录");
-const loginPrompt = ref(null);
-
-const userStore = useUserStore();
-function showLoginPrompt() {
-  userStore.clearUserInfo();
-}
-
-function toDeepMate() {
-  uni.navigateTo({
-    url: "/pages/deepMate/deepMate",
-  });
-}
-</script>
-
-<style>
-.content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.logo {
-  height: 200rpx;
-  width: 200rpx;
-  margin-top: 200rpx;
-  margin-left: auto;
-  margin-right: auto;
-  margin-bottom: 50rpx;
-}
-
-.text-area {
-  display: flex;
-  justify-content: center;
-}
-
-.title {
-  font-size: 36rpx;
-  color: #8f8f94;
-}
-</style>

pages/start/recoverPassword/recoverPassword.vue

@@ -209,10 +209,10 @@
     </text>
 
     <!-- 或者 -->
-    <text class="or-text" @click="goToLogin">已有账号？
-      <text class="link">登录 
-</text>
-      </text>
+    <text class="or-text" @click="goToLogin"
+      >已有账号？
+      <text class="link">登录 </text>
+    </text>
 
     <!-- 同意弹窗 -->
     <uniPopup ref="agreementPopup" type="dialog">
@@ -235,7 +235,12 @@ import countryList from "../login/list";
 import footerBar from "../../../components/footerBar";
 import uniPopup from "../../../uni_modules/uni-popup/components/uni-popup/uni-popup.vue";
 import { verificationPhone, verificationEmail } from "../login/verification";
-import { SendEmailCodeApi, SendPhoneCodeApi } from "../../../api/start/login";
+import {
+  SendEmailCodeApi,
+  SendPhoneCodeApi,
+  verifyCodeApi,
+  forgetApi,
+} from "../../../api/start/login";
 
 const type = ref("");
 const email = ref("");
@@ -254,6 +259,7 @@ const verifyCode = ref("");
 const isRecovering = ref(false);
 const newPasswordLookFirst = ref(false);
 const newPasswordLookSecond = ref(false);
+const account = ref("");
 
 // 使用从list.js导入的完整国家列表数据
 const countries = ref(
@@ -301,7 +307,7 @@ function switchPhone() {
   verifyCode.value = "";
 }
 
-function register() {
+async function register() {
   if (isRecovering.value) {
     if (!newPasswordFirst.value || !newPasswordSecond.value) {
       uni.showToast({
@@ -319,6 +325,32 @@ function register() {
       return;
     }
 
+    const account = changeAccount();
+
+    const res = await forgetApi({
+      account: account,
+      password: newPasswordSecond.value,
+    });
+
+    console.log("res", res);
+
+    if (res.code !== 200) {
+      uni.showToast({
+        title: res.message,
+        icon: "none",
+      });
+      return;
+    }
+
+    uni.showToast({
+      title: res.message,
+      icon: "none",
+    });
+
+    uni.navigateTo({
+      url: "/pages/start/login/login",
+    });
+
     // 密码逻辑
     return;
   }
@@ -384,13 +416,54 @@ function register() {
     console.log("登录:", email.value);
   }
 
+  const account = changeAccount();
+  const loginType = changeLoginType();
+
+  const res = await verifyCodeApi({
+    loginType: loginType, //登录方式EMAIL,PHONE
+    account: account, //登陆账号  手机号/邮箱
+    verifyCode: verifyCode.value,
+  });
+
+  if (res.code !== 200) {
+    uni.showToast({
+      title: res.message,
+      icon: "none",
+    });
+    return;
+  }
+
   isRecovering.value = !isRecovering.value;
+}
 
-  // 如果已经同意，则继续登录流程
-  // uni.showToast({
-  //   title: "登录成功",
-  //   icon: "success",
-  // });
+// 请求账户
+function changeAccount() {
+  if (switchType.value === "User") {
+    account.value = deepChartID.value;
+  }
+
+  if (switchType.value === "Phone") {
+    account.value = `${country.value}${phone.value}`;
+  }
+  if (switchType.value === "Email") {
+    account.value = email.value;
+  }
+
+  return account.value;
+}
+
+// 改变请求时的type
+function changeLoginType() {
+  if (switchType.value === "User") {
+    return "DCCODE";
+  }
+
+  if (switchType.value === "Phone") {
+    return "PHONE";
+  }
+  if (switchType.value === "Email") {
+    return "EMAIL";
+  }
 }
 
 function goToLogin() {

static/language/en.js

@@ -1,14 +1,21 @@
+/** @format */
+
 export default {
-	language: {
-		"name": "Simplified Chinese"
-	},
-	components: {
-		footerBar: {
-			homepage: '首页',
-			marketSituation: '行情',
-			deepMate: 'DeepMate',
-			deepExploration: '深度探索',
-			member: '我的',
-		},
-	}
-}
+  language: {
+    name: "Simplified Chinese",
+  },
+  components: {
+    footerBar: {
+      homepage: "首页",
+      marketSituation: "行情",
+      deepMate: "DeepMate",
+      deepExploration: "深度探索",
+      member: "我的",
+    },
+  },
+  marketSituation: {
+    globalIndex: "全球指数",
+	globalIndexMore:'查看更多',
+	warn:'全球指数为试运行，免费开放，有诸多不足请见谅'
+  },
+};

static/language/ms.js

@@ -10,5 +10,10 @@ export default {
 			deepExploration: '深度探索',
 			member: '我的',
 		},
-	}
+	},
+	marketSituation: {
+    globalIndex: "全球指数",
+	globalIndexMore:'查看更多',
+	warn:'全球指数为试运行，免费开放，有诸多不足请见谅'
+  },
 }

static/language/th.js

@@ -10,5 +10,10 @@ export default {
 			deepExploration: '深度探索',
 			member: '我的',
 		},
-	}
+	},
+	marketSituation: {
+    globalIndex: "全球指数",
+	globalIndexMore:'查看更多',
+	warn:'全球指数为试运行，免费开放，有诸多不足请见谅'
+  },
 }

static/language/vi.js

@@ -10,5 +10,10 @@ export default {
 			deepExploration: '深度探索',
 			member: '我的',
 		},
-	}
+	},
+	marketSituation: {
+    globalIndex: "全球指数",
+	globalIndexMore:'查看更多',
+	warn:'全球指数为试运行，免费开放，有诸多不足请见谅'
+  },
 }

static/language/zh_CN.js

@@ -1,15 +1,22 @@
+/** @format */
+
 // 中文简体
 export default {
-	language: {
-		name: '中文简体'
-	},
-	components: {
-		footerBar:{
-			homepage: '首页',
-			marketSituation: '行情',
-			deepMate: 'DeepMate',
-			deepExploration: '深度探索',
-			member: '我的',
-		},
-	},
-}
+  language: {
+    name: "中文简体",
+  },
+  components: {
+    footerBar: {
+      homepage: "首页",
+      marketSituation: "行情",
+      deepMate: "DeepMate",
+      deepExploration: "深度探索",
+      member: "我的",
+    },
+  },
+  marketSituation: {
+    globalIndex: "全球指数",
+	globalIndexMore:'查看更多',
+	warn:'全球指数为试运行，免费开放，有诸多不足请见谅'
+  },
+};

static/language/zh_HK.js

@@ -1,15 +1,22 @@
+/** @format */
+
 // 中文繁体
 export default {
-	language: {
-		name: "中文繁体"
-	},
-	components: {
-		footerBar: {
-			homepage: '首页',
-			marketSituation: '行情',
-			deepMate: 'DeepMate',
-			deepExploration: '深度探索',
-			member: '我的',
-		},
-	},
-}
+  language: {
+    name: "中文繁体",
+  },
+  components: {
+    footerBar: {
+      homepage: "首页",
+      marketSituation: "行情",
+      deepMate: "DeepMate",
+      deepExploration: "深度探索",
+      member: "我的",
+    },
+  },
+  marketSituation: {
+    globalIndex: "全球指数",
+	globalIndexMore:'查看更多',
+	warn:'全球指数为试运行，免费开放，有诸多不足请见谅'
+  },
+};

stores/index.js

@@ -10,5 +10,6 @@ pinia.use(persist)
 export * from './modules/userInfo'
 export * from './modules/deviceInfo'
 export * from './modules/deepExploration'
+export * from './modules/login'
 // 默认导出，给 main.js 使用
 export default pinia

stores/modules/login.js

@@ -0,0 +1,44 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+// 定义 Store
+export const useLoginStore = defineStore(
+  'login',
+  () => {
+    // 会员信息
+    const loginInfo = ref("true")
+
+    // 保存会员信息，登录时使用
+    const setLoginInfo = (val) => {
+      loginInfo.value = val
+    }
+
+    // 清理会员信息，退出时使用
+    const clearLoginInfo = () => {
+      loginInfo.value = undefined
+    }
+
+    // 记得 return
+    return {
+      loginInfo,
+      setLoginInfo,
+      clearLoginInfo,
+    }
+  },
+  // TODO: 持久化
+  {
+    // 网页端持久化
+    // persist: true,
+    // 小程序端持久化
+    persist: {
+      storage: {
+        getItem(key) {
+          return uni.getStorageSync(key)
+        },
+        setItem(key, value) {
+          uni.setStorageSync(key, value)
+        },
+      },
+    },
+  },
+)

utils/http.js

@@ -1,5 +1,6 @@
 import { useUserStore } from "../stores/modules/userInfo"
 import { useDeviceStore } from "../stores/modules/deviceInfo"
+import { useLoginStore } from "../stores/modules/login"
 
 const baseURL = "https://dbqb.nfdxy.net/testApi"
 
@@ -22,13 +23,13 @@ const httpInterceptor = {
         // 打印最终请求地址
         console.log('HTTP(finalUrl)=', options.url)
         // 2.请求超时，默认60s
-        options.timeout = 60000
+        options.timeout = 10000
         console.log(options)
         //3 添加小程序端请求头
         const sys = uni.getSystemInfoSync();
         // 为对齐后端文档示例，client 固定为 ios（如需按平台设置再改回）
 
-        const deviceInfo =useDeviceStore()
+        const deviceInfo = useDeviceStore()
 
 
         options.header = {
@@ -37,7 +38,7 @@ const httpInterceptor = {
             'content-type': 'application/json',
             'contentType': 'application/json',
             'version': uni.getSystemInfoSync().appVersion,
-            'client':  uni.getSystemInfoSync().platform == 'ios' ? 'ios' : 'android',
+            'client': uni.getSystemInfoSync().platform == 'ios' ? 'ios' : 'android',
             'deviceId': deviceInfo.deviceInfo.deviceId
         }
         //4 添加token，优先用store，没有则回退到body中的token，保持与Apifox一致
@@ -66,6 +67,14 @@ export const http = (options) => {
             success: (result) => {
                 if (result.statusCode >= 200 && result.statusCode < 300) {
                     if (result.data.code === 401) {
+
+                        const loginStore = useLoginStore()
+                        loginStore.setLoginInfo("true")
+                        console.log("1loginStore.loginInfo", loginStore.loginInfo);
+
+                        loginStore.setLoginInfo("false")
+                        console.log("2loginStore.loginInfo", loginStore.loginInfo);
+
                         uni.showToast({
                             title: '请先登录',
                             icon: 'none'
@@ -93,7 +102,7 @@ export const http = (options) => {
             fail: (err) => {
                 reject(err)
                 uni.showToast({
-                    title: '网络错误',
+                    title: '请求超时',
                     icon: 'none'
                 })
             }

vue.config.js

@@ -1,14 +1,24 @@
 module.exports = {
     devServer: {
-        proxy: {
+        /* proxy: {
             '/api': {  // 你的目标服务器的请求路径前缀
                 target: 'https://hwjb.homilychart.com',  // 目标服务器的地址
                 changeOrigin: true,  // 是否跨域
                 secure: false, // 如果是https接口，需要配置这个参数
                 pathRewrite: {
-                    '^/': '/testApi'  // 将 /api 替换为 /testApi，以便正确请求目标服务器的资源
+                    '^/api': ''  // 将 /api 替换为 /testApi，以便正确请求目标服务器的资源
                 }
             }
-        }
+        } */
+		proxy: {
+		    '/api': {  // 你的目标服务器的请求路径前缀
+		        target: 'http://192.168.40.8:9000',  // 目标服务器的地址
+		        changeOrigin: true,  // 是否跨域
+		        secure: false, // 如果是https接口，需要配置这个参数
+		        pathRewrite: {
+		            '^/api': ''  // 将 /api 替换为 /testApi，以便正确请求目标服务器的资源
+		        }
+		    }
+		}
     }
 }