Merge branch 'songjie/feature-20251023161635-首页' into milestone-20251031-简版功能开发

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "customPlaygroundType" : "local",
+            "customPlaygroundType" : "device",
             "packageName" : "io.dcloud.HBuilder",
             "playground" : "standard",
             "type" : "uni-app:app-android"

api/customerServicePlatform/customerServicePlatform.js

@@ -14,7 +14,7 @@ export const uploadImageApi = (data) => {
 export const getAnswerApi = (data) => {
   return http({
     method: 'POST',
-    url: 'http://pbb6edde.natappfree.cc' +'/api/customer/askQuestion',
+    url: '/api/customer/askQuestion',
 	data
   })
 }
@@ -23,7 +23,7 @@ export const getAnswerApi = (data) => {
 export const getQuestionApi = (data) => {
   return http({
     method: 'GET',
-    url: 'http://pbb6edde.natappfree.cc' +'/api/customer/getQuestion',
+    url: '/api/customer/getQuestion',
   })
 }
 

api/deepExploration/deepExploration.js

@@ -101,6 +101,15 @@ export const RecordListApi = (data) => {
     data:data
   })
 }
+
+//历史记录删除
+export const RecordListDeleteApi = (data) => {
+  return http({
+    method: 'POST',
+    url: '/api/coze/deleteRecord',
+    data:data
+  })
+}
 // 选股策略
 export const stocSelectApi = (data) => {
   return http({

api/deepMate/deepMate.js

@@ -54,6 +54,19 @@ export const postHistory = (data) => {
 
 
 /**
+ * 删除历史记录
+ */
+
+export const postDeleteHistory = (data) => {
+  return http({
+    method: 'POST',
+    url: '/api/deepMate/deleteRecord',
+    data
+  })
+}
+
+
+/**
  * 历史记录详情
  */
 

components/IndexCard.vue

@@ -12,8 +12,8 @@
     <view class="price-info">
       <text class="current-price" :style="{ color: priceColor }">{{ currentPrice }}</text>
       <view class="change-info">
-        <text class="change-amount" :style="{ color: priceColor }">{{ changeAmount }}</text>
-        <text class="change-percent" :style="{ color: priceColor }">{{ changePercent }}</text>
+        <text class="change-amount" :style="{ color: priceColor }">{{ judgeSymbol(changeAmount) }}</text>
+        <text class="change-percent" :style="{ color: priceColor }">{{ judgeSymbol(changePercent) }}</text>
       </view>
     </view>
 
@@ -63,6 +63,10 @@ const props = defineProps({
   },
 });
 
+const judgeSymbol = (num) => {
+  return num[0] === "-" ? num : "+" + num;
+};
+
 const getMarketFlag = (market) => {
   let imagePath;
 

components/deepExploration_header.vue

@@ -65,8 +65,16 @@
             class="history-item"
           >
             <view class="history-left">
-              <view class="flag-circle"
-                ><image
+              <view class="flag-circle">
+                <image
+                  class="icon-stock-model"
+                  :src="modelImage(item.model)"
+                  mode="scaleToFill"
+              /></view>
+            </view>
+            <view class="history-left">
+              <view class="flag-circle">
+                <image
                   class="icon-stock"
                   :src="stockImage(item.stockMarket)"
                   mode="scaleToFill"
@@ -75,7 +83,6 @@
             <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">{{ modelType(item.model) }} </text>
             </view>
             <text class="history-time">{{
               formatTimeForHistory(item.createdTime)
@@ -91,6 +98,7 @@
 import {
   RecordListApi,
   RecordInfoApi,
+  RecordListDeleteApi
 } from "../api/deepExploration/deepExploration";
 import { ref, onMounted, computed } from "vue";
 import { useDeepExplorationStore } from "../stores/modules/deepExploration";
@@ -140,8 +148,9 @@ const openHistoryDrawer = async () => {
 };
 
 const clearAllHistory = () => {
-  searchHistory.value = [];
-
+  historyList.value = [];
+	RecordListDeleteApi({
+	})
   //   uni.setStorageSync("search_history", []);
 };
 
@@ -163,6 +172,20 @@ const onDrawerBackClick = () => {
 };
 
 // 历史记录国家图像
+function modelImage(model) {
+  switch (model) {
+    case 1:
+      return "../../static/icons/tracking.png";
+    case 2:
+      return "../../static/icons/radar.png";
+    case 3:
+      return "../../static/icons/decoding.png";
+    case 4:
+      return "../../static/icons/funds.png";
+  }
+}
+
+// 历史记录国家图像
 function stockImage(Market) {
   switch (Market) {
     case "usa":
@@ -184,7 +207,6 @@ function stockImage(Market) {
   }
 }
 
-
 // 历史记录详情
 async function itemClick(item) {
   const res = await RecordInfoApi({
@@ -488,6 +510,10 @@ onMounted(() => {});
   height: 50rpx;
 }
 
+.icon-stock-model {
+  width: 45rpx;
+  height: 45rpx;
+}
 
 .icon-stock {
   width: 36rpx;
@@ -503,11 +529,11 @@ onMounted(() => {});
   display: flex;
   align-items: center;
   justify-content: center;
-  image {
-    width: 50rpx;
-    height: 50rpx;
-    border-radius: 50%;
-  }
+  // image {
+  //   width: 50rpx;
+  //   height: 50rpx;
+  //   border-radius: 50%;
+  // }
 }
 
 .history-main {

pages.json

@@ -295,7 +295,8 @@
 				"navigationStyle": "custom",
 				"disableSwipeBack": true,
 				"titleNView": false,
-				"bounce": false
+				"bounce": false,
+				"pageOrientation": "auto"
 			}
 		},
 		{

pages/blank/institutionalTrendsBriefing.vue

@@ -24,9 +24,7 @@
 <script setup>
 // 返回到 deepMate 页面
 const goBack = () => {
-  uni.navigateTo({
-    url: '/pages/deepMate/deepMate'
-  });
+ uni.navigateBack({ delta: 1 })
 };
 </script>
 

pages/blank/notice.vue

@@ -24,9 +24,8 @@
 <script setup>
 // 返回到 deepMate 页面
 const goBack = () => {
-  uni.navigateTo({
-    url: '/pages/deepMate/deepMate'
-  });
+  // 返回上一页，避免新开页面造成堆叠
+  uni.navigateBack({ delta: 1 })
 };
 </script>
 

pages/customerServicePlatform/csPlatformIndex.vue

@@ -1,4 +1,5 @@
 <template>
+	  <LoginPrompt ref="loginPrompt"></LoginPrompt>
 	<view class="main">
 		<view class="top" :style="{height:iSMT+'px'}"></view>
 

pages/customerServicePlatform/questionDetail.vue

@@ -45,9 +45,12 @@
 						mode="aspectFit"></image>
 
 					<view class="card-text">
-						<text class="card-paragraph">
+
+						<rich-text :nodes="renderMarkdown(answerContent)"></rich-text>
+
+						<!-- 		<text class="card-paragraph">
 							{{answerContent}}
-						</text>
+						</text> -->
 					</view>
 				</view>
 
@@ -65,6 +68,8 @@
 	import {
 		getAnswerApi
 	} from "../../api/customerServicePlatform/customerServicePlatform";
+	import marked from "marked"; // 引入 marked 库
+
 	export default {
 		data() {
 			return {
@@ -90,6 +95,29 @@
 			}
 		},
 		methods: {
+			renderMarkdown(content) {
+				const renderer = new marked.Renderer();
+				// renderer.heading = function (text, level) {
+				//   return `<p>${text}</p>`;
+				// };
+				// 设置 marked 选项
+				marked.setOptions({
+					renderer: renderer,
+					highlight: null, // 如果需要代码高亮，可以设置适当的函数
+					langPrefix: "language-",
+					pedantic: false,
+					gfm: true,
+					breaks: false,
+					sanitize: false,
+					smartLists: true,
+					smartypants: false,
+					xhtml: false,
+				});
+				if (!content) return "";
+				let renderedContent = marked.parse(content);
+				renderedContent = renderedContent.replace(/\*/g, '');
+				return renderedContent;
+			},
 			async getAnswerContent() {
 				let conversationId = '';
 				try {
@@ -98,7 +126,7 @@
 				} catch (e) {
 					conversationId = '';
 				}
-				
+				try {
 					const res = await getAnswerApi({
 						question: this.questionTitle,
 						conversationId: conversationId,
@@ -108,18 +136,29 @@
 					if (res.code == 200) {
 						uni.setStorageSync('conversationId', res.data.conversationId);
 						const answer = res.data.answer
-					this.answerContent = '';
-					for (let i = 0; i < answer.length; i++) {
-						this.answerContent += answer[i];
-						await this.sleepTime();
+						// 流式输出逻辑
+						let currentIndex = 0;
+						const answerLength = answer.length;
+
+						// 每隔一定时间显示一部分内容
+						this.interval = setInterval(() => {
+							this.answerContent = answer.slice(0, currentIndex);
+							currentIndex++;
+
+							if (currentIndex > answerLength) {
+								clearInterval(this.interval);
 							}
+						}, Math.floor(Math.random() * (150 - 30 + 1)) + 30);
 					} else {
 						this.answerContent = '获取回答失败，请重试';
 					}
+				} catch {
+					this.answerContent = '获取回答失败，请重试';
+				}
 			},
-			  async sleepTime() {
+			sleepTime() {
 				const ms = Math.floor(Math.random() * (300 - 30 + 1)) + 30;
-			      return new Promise(resolve => setTimeout(resolve, ms));
+				return ms;
 			},
 
 			toRegistration() {

pages/deepExploration/MainForceActions.vue

@@ -7,7 +7,7 @@
 
 		<view class="search">
 			<input v-model="searchName" class="searchInput" type="text" placeholder="请输入股票名称、股票代码"
-				placeholder-style="color: #A6A6A6; font-size: 22rpx;" />
+				placeholder-style="color: #A6A6A6; font-size: 28rpx;" />
 			<image @click="searchStock" class="seachIcon" src="/static/deepExploration-images/search.png"
 				mode="aspectFill"></image>
 		</view>
@@ -41,6 +41,7 @@
 							<qiun-data-charts type="candle" :opts="opts" :chartData="chartData" :disableScroll="true"
 								:ontouch="true" :onzoom="true" :key="chartKey" />
 						</view>
+						<image src="/static/deepExploration-images/kLineAll.png" mode="aspectFill"></image>
 					</view>
 				</view>
 				<view class="txt">
@@ -93,11 +94,19 @@
 	import {
 		getUserInfo
 	} from "@/api/member"
+	import {
+		useUserStore
+	} from '@/stores/modules/userInfo.js'
 
 	const deepExplorationStore = useDeepExplorationStore()
+	const userInfo = getUserInfo()
 
+	//历史数据
 	const historyData = ref({})
 
+	//登录弹窗提示ref
+	const loginPrompt = ref(null)
+
 	// 响应式变量定义
 	const type = ref('deepExploration')
 	const iSMT = ref(0)
@@ -182,6 +191,13 @@
 	//获取模型数据
 	const handleModels = async () => {
 		try {
+
+			if (userInfo.isVisitor) {
+				console.log('是游客');
+				loginPrompt.value.show()
+				return
+			}
+			console.log('搜了吗');
 			// 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;
@@ -221,12 +237,9 @@
 							markdownContent.value = adaptedMarkdown;
 							// markdownContent.value = res.data.markdown
 							htmlContent.value = marked.parse(markdownContent.value);
+							await getServerData()
 						}
 						console.log('res', res);
-				
-					await getServerData()
-				
-				
 					} else if (result.code == 400) {
 						markdownContent.value = result.message;
 						htmlContent.value = marked.parse(markdownContent.value);
@@ -244,14 +257,11 @@
 					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
-				
-				
 						const res = await getModel2Second({
 							language: language.value,
 							recordId: recordId.value,
@@ -265,12 +275,9 @@
 							markdownContent.value = adaptedMarkdown;
 							// markdownContent.value = res.data.markdown
 							htmlContent.value = marked.parse(markdownContent.value);
+							await getServerData()
 						}
 						console.log('res', res);
-				
-					await getServerData()
-				
-				
 					} else if (result.code == 400) {
 						markdownContent.value = result.message;
 						htmlContent.value = marked.parse(markdownContent.value);
@@ -309,12 +316,9 @@
 							markdownContent.value = adaptedMarkdown;
 							// markdownContent.value = res.data.markdown
 							htmlContent.value = marked.parse(markdownContent.value);
+							await getServerData()
 						}
 						console.log('res', res);
-					
-						await getServerData()
-					
-					
 					} else if (result.code == 400) {
 						markdownContent.value = result.message;
 						htmlContent.value = marked.parse(markdownContent.value);
@@ -338,8 +342,6 @@
 						stockId.value = result.data.stockId
 						language.value = result.data.language
 						market.value = result.data.market
-					
-					
 						const res = await getModel4Second({
 							language: language.value,
 							recordId: recordId.value,
@@ -353,12 +355,9 @@
 							markdownContent.value = adaptedMarkdown;
 							// markdownContent.value = res.data.markdown
 							htmlContent.value = marked.parse(markdownContent.value);
+							await getServerData()
 						}
 						console.log('res', res);
-					
-						await getServerData()
-					
-					
 					} else if (result.code == 400) {
 						markdownContent.value = result.message;
 						htmlContent.value = marked.parse(markdownContent.value);
@@ -368,12 +367,7 @@
 				} else {
 					return
 				}
-				
-
-
 			}
-
-
 		} catch (e) {
 			error.value = e.message || '加载失败，请重试';
 		} finally {
@@ -406,7 +400,7 @@
 	const getServerData = async () => {
 		const result = await getData({
 			market: market.value || '',
-			code: searchName.value || '',
+			code: stockCode.value || '',
 			language: "cn",
 			brainPrivilegeState: 1,
 			marketList: "usa.sg.my.hk.cn.can.vi.th.in.gb"
@@ -422,9 +416,13 @@
 		stockPrice.value = result.data.StockInformation.Price || '435.900'
 
 		if (result.data.chartData) {
-
+			const rawData = JSON.parse(JSON.stringify(result.data.chartData));
+			if (rawData.categories.length > 1) { // 确保至少保留一个日期
+				rawData.categories[rawData.categories.length - 1] = ''; // 删除最后一个日期
+				console.log('删了;');
+			}
 			chartData.value = {
-				...JSON.parse(JSON.stringify(result.data.chartData))
+				...rawData
 			}
 			chartKey.value++;
 			console.log('chartData', chartData.value);
@@ -437,24 +435,25 @@
 		rotate: false,
 		rotateLock: false,
 		color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
-		padding: [15, 15, 0, 15],
+		padding: [15, 30, 0, 15],
 		dataLabel: false,
 		enableScroll: true,
 		enableMarkLine: false,
 		legend: {},
 		xAxis: {
 			labelCount: 4,
-			itemCount: 30,
+			itemCount: 20,
 			disableGrid: true,
 			gridColor: "#CCCCCC",
 			gridType: "solid",
 			dashLength: 4,
 			scrollShow: false,
+			rotate: 45,
 			scrollAlign: "left",
 			scrollColor: "#A6A6A6",
 			scrollBackgroundColor: "#EFEBEF",
 			labelColor: "#8C8C8C",
-			fontSize: 9
+			fontSize: 9,
 		},
 		yAxis: {
 			labelColor: "#8C8C8C",
@@ -551,7 +550,6 @@
 	onMounted(async () => {
 		iSMT.value = uni.getSystemInfoSync().statusBarHeight
 		getUserInfo()
-		await getServerData() // 调用数据获取函数
 		await handleModels()
 
 		unwatch = watch(
@@ -572,6 +570,9 @@
 				htmlContent.value = marked.parse(markdownContent.value);
 
 				//k线
+				if (historyData.value.stockData.chartData.categories.length > 1) { // 确保至少保留一个日期
+					historyData.value.stockData.chartData.categories[historyData.value.stockData.chartData.categories.length - 1] = ''; // 删除最后一个日期
+				}
 				chartData.value = {
 					...JSON.parse(JSON.stringify(historyData.value.stockData.chartData))
 				}
@@ -584,6 +585,7 @@
 				stockChange.value = historyData.value.stockData.StockInformation.Zhang || '5.120%'
 				stockAdd.value = historyData.value.stockData.StockInformation.ZhangFu || '22.410'
 				stockPrice.value = historyData.value.stockData.StockInformation.Price || '435.900'
+				currentIndex.value = historyData.value.model-1 
 			}, {
 				deep: true,
 				immediate: true
@@ -595,7 +597,7 @@
 	// 页面加载时执行
 	onLoad((e) => {
 		if (e.index) {
-			currentIndex.value = e.index - 1
+			// currentIndex.value = e.index - 1
 			console.log('模块：', currentIndex.value)
 		}
 		if (e.stockName) {
@@ -633,6 +635,7 @@
 
 			.searchInput {
 				color: #111;
+				width: 100%;
 			}
 		}
 
@@ -732,13 +735,14 @@
 						}
 
 						.right {
-							margin-left: 60rpx;
+							margin-left: 50rpx;
 							color: #6a6a6a;
 							font-family: "PingFang SC";
 							font-size: 13px;
 							font-style: normal;
 							font-weight: 400;
 							line-height: 15px;
+							white-space: nowrap;
 						}
 					}
 
@@ -764,11 +768,21 @@
 					}
 
 					.graph_content {
+						position: relative;
 						min-height: 500rpx;
 						
+						image{
+							position: absolute;
+							bottom: 20rpx;
+							right: 30rpx;
+							width: 48rpx;
+							height: 48rpx;
+						}
+
 						.charts-box {
 							width: 100%;
 							height: 100%;
+							overflow: visible;
 						}
 					}
 				}
@@ -787,9 +801,10 @@
 						}
 
 						text {
+							margin-left: 5rpx;
 							background-color: #FFFFFF;
 							color: #000000;
-							padding: 0 22rpx;
+							padding: 5rpx 22rpx;
 							border-radius: 22rpx;
 							font-size: 28rpx;
 							font-weight: 400;
@@ -798,7 +813,7 @@
 					}
 
 					.txtContent {
-						min-height: 200rpx;
+						min-height: 300rpx;
 						padding: 20rpx 30rpx;
 						margin-bottom: 100rpx;
 

pages/deepExploration/deepExploration.vue

@@ -7,7 +7,7 @@
 		<deepExploration_header></deepExploration_header>
 		<view class="search">
 			<input v-model="stockName" class="searchInput" type="text" placeholder="请输入股票名称、股票代码"
-				placeholder-style="color: #A6A6A6; font-size: 22rpx;" />
+				placeholder-style="color: #A6A6A6; font-size: 28rpx; " />
 			<image @click="searchStock" class="seachIcon" src="/static/deepExploration-images/search.png"
 				mode="aspectFill"></image>
 		</view>
@@ -15,7 +15,7 @@
 		<!-- 四大功能模块 -->
 		<view class="select">
 			<view class="selectItem" @click="toMain('主力追踪')">
-				<image class="img" src="/static/deepExploration-images/icon3.png" mode="aspectFill"></image>
+				<image class="img" src="/static/deepExploration-images/icon1.png" mode="aspectFill"></image>
 				<view class="txt">主力追踪</view>
 			</view>
 			<view class="selectItem" @click="toMain('主力雷达')">
@@ -23,7 +23,7 @@
 				<view class="txt">主力雷达</view>
 			</view>
 			<view class="selectItem" @click="toMain('主力解码')">
-				<image class="img" src="/static/deepExploration-images/icon1.png" mode="aspectFill"></image>
+				<image class="img" src="/static/deepExploration-images/icon3.png" mode="aspectFill"></image>
 				<view class="txt">主力解码</view>
 			</view>
 			<view class="selectItem" @click="toMain('主力资金流')">
@@ -49,11 +49,17 @@
         <view class="selectionItem">
           <view class="header">
             <view class="left">
-							<image src="/static/deepExploration-images/plus.png" mode="aspectFill"></image>
+              <image
+                src="/static/deepExploration-images/plus.png"
+                mode="aspectFill"
+              ></image>
               <text>抄底卖顶</text>
             </view>
             <view class="right">
-							<image src="/static/deepExploration-images/Americle.png" mode="aspectFill"></image>
+              <image
+                src="/static/deepExploration-images/Americle.png"
+                mode="aspectFill"
+              ></image>
               <text>美股</text>
             </view>
           </view>
@@ -65,7 +71,7 @@
             </view>
             <view class="contentItem">
               <view class="row" v-for="(item, index) in stockData" :key="index">
-								<view class="nameItem">{{ item.tscode }}</view>
+                <view class="nameItem">（{{ item.tscode }}）{{ item.stockName }}</view>
                 <view class="closeItem">{{ item.close }}</view>
                 <view class="priceItem">{{ item.preClose }}</view>
               </view>
@@ -78,11 +84,17 @@
         <view class="selectionItem">
           <view class="header">
             <view class="left">
-							<image src="/static/deepExploration-images/plus.png" mode="aspectFill"></image>
+              <image
+                src="/static/deepExploration-images/plus.png"
+                mode="aspectFill"
+              ></image>
               <text>波段行情</text>
             </view>
             <view class="right">
-							<image src="/static/deepExploration-images/Americle.png" mode="aspectFill"></image>
+              <image
+                src="/static/deepExploration-images/Americle.png"
+                mode="aspectFill"
+              ></image>
               <text>美股</text>
             </view>
           </view>
@@ -94,7 +106,7 @@
             </view>
             <view class="contentItem">
               <view class="row" v-for="(item, index) in stockDataByName" :key="index">
-								<view class="nameItem">{{ item.tscode }}</view>
+                <view class="nameItem">（{{ item.tscode }}）{{ item.stockName }}</view>
                 <view class="closeItem">{{ item.close }}</view>
                 <view class="priceItem">{{ item.preClose }}</view>
               </view>
@@ -207,6 +219,7 @@
 			if (Array.isArray(list) && list.length) {
 				const mapped = list.map(item => ({
 					tscode: item.tsCode ?? item.tscode ?? item.code ?? '',
+					stockName: item.stockName ?? item.name ?? '',
 					close: item.close ?? item.lastClose ?? '',
 					preClose: item.preClose ?? item.preclose ?? item.prevClose ?? ''
 				}))
@@ -248,6 +261,7 @@
 			if (Array.isArray(list) && list.length) {
 				const mapped = list.map(item => ({
 					tscode: item.tsCode ?? item.tscode ?? item.code ?? '',
+					stockName: item.stockName ?? item.name ?? '',
 					close: item.close ?? item.lastClose ?? '',
 					preClose: item.preClose ?? item.preclose ?? item.prevClose ?? ''
 				}))
@@ -307,6 +321,7 @@
 
 			.searchInput {
 				color: #111;
+				width: 100%;
 			}
 		}
 
@@ -362,16 +377,18 @@
 				}
 
 				.viewAll {
+					display: flex;
+					align-items: center;
+					justify-content: center;
 					background-color: #000000;
 					border-radius: 10rpx;
-					padding: 6rpx 20rpx;
+					padding: 10rpx 20rpx;
 					color: #ffffff;
 					font-family: "PingFang SC";
-					font-size: 10rpx;
+					font-size: 24rpx;
 					font-style: normal;
-					font-weight: 100;
+					font-weight: 500;
 					line-height: 29rpx;
-					height: 40rpx;
 				}
 			}
 

pages/deepExploration/stockSelectDetail.vue

@@ -156,19 +156,22 @@
 			if (Array.isArray(list)) list = sortByPctDesc(list)
 			if (Array.isArray(list) && list.length) {
 				strategyData.value = list.map(item => ({
-					name: item.tsCode ?? item.tscode ?? '',
-					stockCode: item.tsCode ?? item.tscode ?? '',
-					latest: item.close ?? '',
+					name: item.stockName ?? item.name ?? item.tsName ?? item.tsname ?? item.secName ?? '',
+					stockCode: item.tsCode ?? item.tscode ?? item.code ?? item.symbol ?? '',
+					latest: item.close ?? item.lastClose ?? '',
 					increase: formatPctChg(item.pctChg),
-					decrease: item.change ?? '',
-					previousClose: item.preClose ?? item.preclose ?? '',
-					volume: item.vol ?? '',
-					turnover: item.amount ?? '',
-					openingPrice: item.open ?? '',
-					highestPrice: item.high ?? '',
-					lowestPrice: item.low ?? ''
+					decrease: item.change ?? item.chg ?? '',
+					previousClose: item.preClose ?? item.preclose ?? item.prevClose ?? '',
+					volume: item.vol ?? item.volume ?? '',
+					turnover: item.amount ?? item.turnover ?? '',
+					openingPrice: item.open ?? item.openPrice ?? '',
+					highestPrice: item.high ?? item.highPrice ?? '',
+					lowestPrice: item.low ?? item.lowPrice ?? ''
 				}))
 				console.log(`按名称(${apiName})加载成功，条数:`, strategyData.value.length, '首项:', strategyData.value[0])
+				if (!strategyData.value[0]?.name) {
+					console.warn('名称字段未命中，原始keys示例：', Object.keys(list[0] || {}))
+				}
 			} else {
 				console.warn('getStrategyByName 返回空列表或结构不匹配', raw)
 			}
@@ -203,19 +206,22 @@
 			if (Array.isArray(list)) list = sortByPctDesc(list)
 			if (Array.isArray(list) && list.length) {
 				strategyData.value = list.map(item => ({
-					name: item.tsCode ?? item.tscode ?? '',
-					stockCode: item.tsCode ?? item.tscode ?? '',
-					latest: item.close ?? '',
+					name: item.stockName ?? item.name ?? item.tsName ?? item.tsname ?? item.secName ?? '',
+					stockCode: item.tsCode ?? item.tscode ?? item.code ?? item.symbol ?? '',
+					latest: item.close ?? item.lastClose ?? '',
 					increase: formatPctChg(item.pctChg),
-					decrease: item.change ?? '',
-					previousClose: item.preClose ?? item.preclose ?? '',
-					volume: item.vol ?? '',
-					turnover: item.amount ?? '',
-					openingPrice: item.open ?? '',
-					highestPrice: item.high ?? '',
-					lowestPrice: item.low ?? ''
+					decrease: item.change ?? item.chg ?? '',
+					previousClose: item.preClose ?? item.preclose ?? item.prevClose ?? '',
+					volume: item.vol ?? item.volume ?? '',
+					turnover: item.amount ?? item.turnover ?? '',
+					openingPrice: item.open ?? item.openPrice ?? '',
+					highestPrice: item.high ?? item.highPrice ?? '',
+					lowestPrice: item.low ?? item.lowPrice ?? ''
 				}))
 				console.log('stockSelectDetail 加载成功(已按涨幅降序)，条数:', strategyData.value.length, '首项:', strategyData.value[0])
+				if (!strategyData.value[0]?.name) {
+					console.warn('名称字段未命中，原始keys示例：', Object.keys(list[0] || {}))
+				}
 			} else {
 				console.warn('stockSelectDetail 接口返回空列表或结构不匹配', raw)
 			}

pages/deepMate/deepMate.vue

@@ -232,6 +232,7 @@
       @touchmove="onBackTopTouchMove"
       @touchend="onBackTopTouchEnd"
       @click="onBackTopClick"
+      v-if="messages.length > 0"
     ></image>
 
     <!-- 搜索历史侧拉框 -->
@@ -250,6 +251,7 @@
             <image
               class="delete-icon"
               src="/static/icons/Group_48095481.svg"
+              @click="clearAllHistory"
             ></image>
             <text class="delete-all" @click="clearAllHistory">删除全部</text>
           </view>
@@ -311,6 +313,7 @@ import {
   postIntent,
   postHistory,
   postHistoryDetail,
+  postDeleteHistory,
 } from "../../api/deepMate/deepMate";
 
 import { useUserStore } from "../../stores/modules/userInfo";
@@ -595,10 +598,37 @@ const groupedHistory = computed(() => {
 });
 
 const clearAllHistory = () => {
-  searchHistory.value = [];
-  // uni.setStorageSync("search_history", []);
+  uni.showModal({
+    title: "确认删除",
+    content: "确定要删除全部历史记录吗？该操作不可撤销。",
+    confirmText: "删除",
+    cancelText: "取消",
+    success: (res) => {
+      if (res.confirm) {
+        deleteHistory();
+      }
+    },
+  });
 };
 
+// 删除历史记录
+async function deleteHistory(historyId) {
+  // 当前历史面板依赖 historyList，而非 searchHistory
+  // 同步清空本地旧缓存（如果曾使用）
+  const res = await postDeleteHistory({
+    model: 5,
+  });
+  if (res.code === 200) {
+    historyList.value = [];
+
+    // uni.setStorageSync("search_history", []);
+    uni.showToast({ title: "历史已清空", icon: "none" });
+  }
+  else {
+    uni.showToast({ title: res.message, icon: "none" });
+  }
+}
+
 // 发送消息
 const sendMessage = () => {
   if (inputMessage.value.trim() === "" || isSending.value) return;
@@ -669,7 +699,7 @@ const simulateBotResponse = async (userMessage) => {
 
     // 更新机器人的消息内容
     const errorMessage = res.message || "请求失败，请稍后重试";
-    let responseText = `我已经收到您的消息: "${userMessage}"。错误信息: "${errorMessage}"`;
+    let responseText = `我已经收到您的消息: "${userMessage}"。"${errorMessage}"`;
 
     // 开始打字机效果显示错误信息
     let index = 0;
@@ -677,26 +707,48 @@ const simulateBotResponse = async (userMessage) => {
 
     const typeWriter = () => {
       if (index < responseText.length) {
-        const ch = responseText.charAt(index);
+        let ch = responseText.charAt(index);
+        let charsToAdd = ch;
+        let newIndex = index + 1;
+
+        // 检查是否遇到HTML标签开始
+        if (ch === "<") {
+          // 寻找标签结束位置
+          let tagEndIndex = responseText.indexOf(">", index);
+          if (tagEndIndex !== -1) {
+            // 完整获取标签内容
+            charsToAdd = responseText.substring(index, tagEndIndex + 1);
+            newIndex = tagEndIndex + 1;
+          }
+        }
+
         const current = messages.value[botIndex];
         // 通过数组替换触发渲染，避免部分平台对子项属性变更不响应
         messages.value.splice(botIndex, 1, {
           ...current,
-          content: current.content + ch,
+          content: current.content + charsToAdd,
           isTyping: true,
         });
-        index++;
+        index = newIndex;
         scrollToBottom();
 
         // 字符间延迟，模拟打字效果
         const baseDelay = 5; // 普通字符基础延迟（毫秒）
         const slowPunct = /[。！？!?；;]/; // 句号、感叹号、分号等较长停顿
         const midPunct = /[，、,:：]/; // 逗号、顿号、冒号等中等停顿
-        const delay = slowPunct.test(ch)
+
+        // 如果是标签，使用更短的延迟或者立即显示
+        let delay;
+        if (charsToAdd.startsWith("<")) {
+          delay = 1; // 标签快速显示
+        } else {
+          delay = slowPunct.test(ch)
             ? 220
             : midPunct.test(ch)
             ? 120
             : baseDelay;
+        }
+
         setTimeout(typeWriter, delay);
       } else {
         // 打字完成，更新状态
@@ -786,22 +838,33 @@ const simulateBotResponse = async (userMessage) => {
 
   const typeWriter = () => {
     if (index < responseText.length) {
-      const ch = responseText.charAt(index);
+      let ch = responseText.charAt(index);
+      let charsToAdd = ch;
+      let newIndex = index + 1;
+      let delay = baseDelay;
+
+      // 检查是否遇到HTML标签开始
+      if (ch === "<") {
+        // 寻找标签结束位置
+        let tagEndIndex = responseText.indexOf(">", index);
+        if (tagEndIndex !== -1) {
+          // 完整获取标签内容
+          charsToAdd = responseText.substring(index, tagEndIndex + 1);
+          newIndex = tagEndIndex + 1;
+          delay = 1; // 标签快速显示
+        }
+      }
+
       const current = messages.value[botIndex];
       // 通过数组替换触发渲染，避免部分平台对子项属性变更不响应
       messages.value.splice(botIndex, 1, {
         ...current,
-        content: current.content + ch,
+        content: current.content + charsToAdd,
         isTyping: true,
       });
-      index++;
+      index = newIndex;
       scrollToBottom();
 
-      const delay = slowPunct.test(ch)
-        ? 220
-        : midPunct.test(ch)
-        ? 120
-        : baseDelay;
       setTimeout(typeWriter, delay);
     } else {
       const current = messages.value[botIndex];
@@ -842,7 +905,17 @@ const scrollToBottom = () => {
   });
 };
 const scrollToTop = () => {
+  // 聊天区存在：控制 scroll-view 回到顶部
+  if (messages.value.length > 0) {
     chatScrollTop.value = 0;
+    return;
+  }
+  // 未发起对话：页面级滚动回到顶部
+  try {
+    uni.pageScrollTo({ scrollTop: 0, duration: 200 });
+  } catch (e) {
+    // 兜底，无需处理
+  }
 };
 // 自动滚动控制：用户向上滚动时暂停自动滚到底部
 const shouldAutoScroll = ref(true);
@@ -856,6 +929,9 @@ const onChatScroll = (e) => {
   const delta = st - lastScrollTop.value;
   lastScrollTop.value = st;
 
+  // 同步当前滚动位置，确保点击回顶能产生数值变化
+  chatScrollTop.value = st;
+
   if (delta < 0) {
     shouldAutoScroll.value = false;
     return;
@@ -1150,23 +1226,23 @@ async function itemClick(item) {
   /* min-height: 20rpx; */
   /* border-radius: 20rpx; */
   padding: 40rpx;
-  margin-top: 20rpx;
+  margin-top: 10rpx;
   margin-bottom: 10rpx;
   /* box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05); */
 }
 
 .welcome-section {
   /* 灰色卡片（recommend-card）之后展示背景图 */
-  margin-top: 10rpx;
+  margin-top: 40rpx;
   display: flex;
   align-items: center;
   justify-content: center;
-  background: url("https://d31zlh4on95l9h.cloudfront.net/images/eca84d9fb54712cb3bc6c6174773b83b.svg");
+  background: url("/static/images/welcomeRobot.svg");
   background-repeat: no-repeat;
-  background-position: center top;
-  /* 放在容器顶部，正好在灰色卡片下方 */
-  background-size: 80% auto;
-  /* 缩放以适配宽度 */
+  background-position: center center;
+  /* 居中显示，避免顶部被裁剪 */
+  background-size: contain;
+  /* 保证整张图片完整展示 */
   height: 460rpx;
   /* 提供可视高度，让背景图可见 */
 }
@@ -1482,7 +1558,7 @@ async function itemClick(item) {
   inset: 0;
   /* 顶部、底部、左、右都贴合容器 */
   width: 100%;
-  height: 81%;
+  height: 83%;
   border-radius: 15rpx;
   z-index: 1;
   /* 在灰底之上、内容之下 */
@@ -1769,9 +1845,20 @@ async function itemClick(item) {
 }
 
 .thinking-content {
+  transition: transform 1s ease; /* 添加过渡效果 */
+  transform-origin: top center; /* 设置变换原点 */
   padding: 20rpx 30rpx;
 }
 
+@keyframes transform {
+  from {
+    transform: scaleY(0);
+  }
+  to {
+    transform: scaleY(1);
+  }
+}
+
 .thinking-item {
   display: flex;
   align-items: center;

pages/home/member.vue

@@ -1,5 +1,5 @@
 <template>
-	 <LoginPrompt ref="loginPrompt"></LoginPrompt>
+	 <LoginPrompt ref="loginwPrompt"></LoginPrompt>
   <view class="main">
     <view class="top">
       <view class="bell">
@@ -129,6 +129,14 @@ const goToAbout = () => {
 }
 
 const goToShare = () => {
+  console.log('用户信息==========',userStore.userInfo.isVisitor)
+  if (userStore.userInfo.isVisitor) {
+    uni.showToast({
+      title: '请先登录',
+      icon: 'none'
+    })
+    return
+  }
   uni.navigateTo({
     url: '../setting/share'
   })

pages/marketSituation/globalIndex.vue

@@ -30,7 +30,7 @@
     </view>
 
     <!-- 内容区域 -->
-    <scroll-view class="content" :style="{ top: contentTopPosition + 'px' }" scroll-y="true">
+    <scroll-view class="content" :style="{ top: contentTopPosition + 'px' }" scroll-y="true" v-if="isDataLoaded">
       <!-- 亚太-中华 -->
       <view class="market-section" v-for="(item, parentIndex) in marketSituationStore.gloablCardData" :key="item">
         <view class="market-header">
@@ -66,6 +66,7 @@
 
 <script setup>
 import { ref, onMounted, onUnmounted, computed, nextTick, watch } from "vue";
+import { onShow, onHide } from "@dcloudio/uni-app";
 import footerBar from "../../components/footerBar.vue";
 import IndexCard from "../../components/IndexCard.vue";
 import { getRegionalGroupAPI } from "../../api/marketSituation/marketSituation.js";
@@ -78,6 +79,9 @@ const headerHeight = ref(0); // 头部高度
 const searchValue = ref(""); // 搜索值
 const isWarnTextOverflow = ref(false); // warn文字是否溢出
 
+// 数据状态加载
+const isDataLoaded = ref(false);
+
 // warn文字的class计算属性
 const warnTextClass = computed(() => {
   return isWarnTextOverflow.value ? "warn_text scroll-active" : "warn_text";
@@ -109,125 +113,6 @@ const checkWarnTextOverflow = () => {
   });
 };
 const globalIndexArray = ref([]);
-// 亚太-中华指数数据
-const asiachinaIndexes = ref([
-  {
-    flagIcon: "/static/c1.png",
-    stockName: "上证指数",
-    stockCode: "noCode",
-    currentPrice: "3933.96",
-    changeAmount: "+24.32",
-    changePercent: "+0.62%",
-    isRising: true,
-  },
-  {
-    flagIcon: "/static/c2.png",
-    stockName: "深证成指",
-    stockCode: "noCode",
-    currentPrice: "45757.90",
-    changeAmount: "-123.45",
-    changePercent: "-0.27%",
-    isRising: false,
-  },
-  {
-    flagIcon: "/static/c3.png",
-    stockName: "创业板指",
-    stockCode: "noCode",
-    currentPrice: "6606.08",
-    changeAmount: "+89.76",
-    changePercent: "+1.38%",
-    isRising: true,
-  },
-  {
-    flagIcon: "/static/c4.png",
-    stockName: "HSI50",
-    stockCode: "noCode",
-    currentPrice: "22333.96",
-    changeAmount: "+156.78",
-    changePercent: "+0.71%",
-    isRising: true,
-  },
-  {
-    flagIcon: "/static/c5.png",
-    stockName: "沪深300",
-    stockCode: "noCode",
-    currentPrice: "45757.90",
-    changeAmount: "-89.12",
-    changePercent: "-0.19%",
-    isRising: false,
-  },
-  {
-    flagIcon: "/static/c6.png",
-    stockName: "上证50",
-    stockCode: "noCode",
-    currentPrice: "45757.90",
-    changeAmount: "+234.56",
-    changePercent: "+0.52%",
-    isRising: true,
-  },
-]);
-
-// 亚太指数数据
-const asiaIndexes = ref([
-  {
-    flagIcon: "/static/c7.png",
-    stockName: "日经225",
-    stockCode: "noCode",
-    currentPrice: "28456.78",
-    changeAmount: "+234.56",
-    changePercent: "+0.83%",
-    isRising: true,
-  },
-  {
-    flagIcon: "/static/c8.png",
-    stockName: "韩国KOSPI",
-    stockCode: "noCode",
-    currentPrice: "2567.89",
-    changeAmount: "-12.34",
-    changePercent: "-0.48%",
-    isRising: false,
-  },
-  {
-    flagIcon: "/static/c9.png",
-    stockName: "印度孟买",
-    stockCode: "noCode",
-    currentPrice: "65432.10",
-    changeAmount: "+456.78",
-    changePercent: "+0.70%",
-    isRising: true,
-  },
-]);
-
-// 美洲指数数据
-const americaIndexes = ref([
-  {
-    flagIcon: "/static/c7.png",
-    stockName: "道琼斯指数",
-    stockCode: "noCode",
-    currentPrice: "34567.89",
-    changeAmount: "+123.45",
-    changePercent: "+0.36%",
-    isRising: true,
-  },
-  {
-    flagIcon: "/static/c8.png",
-    stockName: "纳斯达克",
-    stockCode: "noCode",
-    currentPrice: "13456.78",
-    changeAmount: "-67.89",
-    changePercent: "-0.50%",
-    isRising: false,
-  },
-  {
-    flagIcon: "/static/c9.png",
-    stockName: "标普500",
-    stockCode: "noCode",
-    currentPrice: "4234.56",
-    changeAmount: "+23.45",
-    changePercent: "+0.56%",
-    isRising: true,
-  },
-]);
 
 // 计算属性：内容区域顶部位置
 const contentTopPosition = computed(() => {
@@ -482,6 +367,8 @@ const parseStockData = (message) => {
           }
         }
       }
+      // 数据状态加载完成
+      isDataLoaded.value = true;
     } else if ((typeof message === "string" && message.includes('{"count')) || isMorePacket.batch_real_time) {
       if (typeof message === "string" && message.includes('{"count')) {
         console.log("开始接受分包数据");
@@ -564,6 +451,22 @@ const startTcp = () => {
   }
 };
 
+onShow(async () => {
+  console.log("显示页面");
+  await getRegionalGroup();
+  initTcpListeners();
+  await nextTick();
+  // 开始连接
+  startTcp();
+});
+
+onHide(() => {
+  console.log("隐藏页面");
+  sendTcpMessage("stop_real_time");
+  removeTcpListeners();
+  disconnectTcp();
+});
+
 onUnmounted(() => {
   sendTcpMessage("stop_real_time");
   removeTcpListeners();
@@ -572,11 +475,6 @@ onUnmounted(() => {
 
 // 生命周期：页面挂载
 onMounted(async () => {
-  await getRegionalGroup();
-  initTcpListeners();
-  await nextTick();
-  // 开始连接
-  startTcp();
   // 获取系统信息
   const systemInfo = uni.getSystemInfoSync();
   iSMT.value = systemInfo.statusBarHeight || 0;

pages/marketSituation/marketCondition.vue

@@ -211,7 +211,7 @@
               <button class="mini-btn" type="default" size="mini" @click="ChangeKLinePeriod(4)">1M</button>
               <button class="mini-btn" type="default" size="mini" @click="ChangeKLinePeriod(5)">15M</button>
             </view>
-        <view style='background-color:#ffffff;'>
+            <view style="background-color: #ffffff">
               <HQChartControl ref="HQChartCtrl" DefaultChart="{Type:'KLine'}" :DefaultSymbol="Symbol"> </HQChartControl>
             </view>
           </view>
@@ -249,45 +249,43 @@ import { HCharts } from "@/common/canvasMethod.js";
 import tcpConnection, { TCPConnection, TCP_CONFIG } from "../../api/tcpConnection";
 import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
 const marketSituationStore = useMarketSituationStore();
-import HQChartControl from '@/uni_modules/jones-hqchart2/js_sdk/HQChartControl.vue'
+import HQChartControl from "@/uni_modules/jones-hqchart2/js_sdk/HQChartControl.vue";
 
 //测试数据
-import HQData from "@/uni_modules/jones-hqchart2/js_sdk/umychart.NetworkFilterTest.vue.js"
-import { dailyDataPackets } from '@/common/dailyData.js'
-
+import HQData from "@/uni_modules/jones-hqchart2/js_sdk/umychart.NetworkFilterTest.vue.js";
+import { dailyDataPackets } from "@/common/dailyData.js";
 
 // 响应式数据
-const Symbol = ref('GBPAUD.FXCM')
-const ChartWidth = ref(350)
-const ChartHeight = ref(500)
-const HQChartCtrl = ref(null)
+const Symbol = ref("GBPAUD.FXCM");
+const HQChartCtrl = ref(null);
 
 // 方法定义
 const CreateHQChart = () => {
-    const chartHeight = ChartHeight.value
-    const hqchartCtrl = HQChartCtrl.value
+  const width = canvasWidth.value;
+  const height = canvasHeight.value;
+  const hqchartCtrl = HQChartCtrl.value;
 
-    if (!hqchartCtrl) return
+  if (!hqchartCtrl) return;
 
   //修改option
   //hqchartCtrl.KLine.Option.
-    hqchartCtrl.NetworkFilter = NetworkFilter
-    hqchartCtrl.SetSize(ChartWidth.value, chartHeight)
-    hqchartCtrl.OnSize()
+  hqchartCtrl.NetworkFilter = NetworkFilter;
+  hqchartCtrl.SetSize(width, height);
+  hqchartCtrl.OnSize();
 
-    hqchartCtrl.KLine.Option.IsAutoUpdate = false
-    hqchartCtrl.KLine.Option.KLine.Period = 4
+  hqchartCtrl.KLine.Option.IsAutoUpdate = false;
+  hqchartCtrl.KLine.Option.KLine.Period = 4;
 
   nextTick(() => {
-        hqchartCtrl.CreateHQChart()
-    })
-}
+    hqchartCtrl.CreateHQChart();
+  });
+};
 
 const transformDailyDataToHQChart = (dailyDataPackets) => {
-    const symbol = dailyDataPackets.stock_code || Symbol.value
-    const rows = Array.isArray(dailyDataPackets.data) ? dailyDataPackets.data : []
+  const symbol = dailyDataPackets.stock_code || Symbol.value;
+  const rows = Array.isArray(dailyDataPackets.data) ? dailyDataPackets.data : [];
   // HQChart日线数据格式: [Date, Open, High, Low, Close, Volume]
-    const data = rows.map((r, idx) => ([
+  const data = rows.map((r, idx) => [
     parseInt(r.trade_date, 10), // Date: YYYYMMDD
     Number(idx > 0 ? rows[idx - 1].bid_close : r.bid_close), // YClose: 昨收
     Number(r.bid_open), // Open
@@ -295,100 +293,76 @@ const transformDailyDataToHQChart = (dailyDataPackets) => {
     Number(r.bid_low), // Low
     Number(r.bid_close), // Close
     Number(r.tick_qty || 0), // Volume
-        Number(r.amount || 0)                                  // Amount（如无则填0）
-    ]))
-    return { name: symbol, symbol, ver: 2.0, data }
-}
+    Number(r.amount || 0), // Amount（如无则填0）
+  ]);
+  return { name: symbol, symbol, ver: 2.0, data };
+};
 
 const ClearHQChart = () => {
-    const hqchartCtrl = HQChartCtrl.value
-    if (hqchartCtrl) hqchartCtrl.ClearChart()
-}
+  const hqchartCtrl = HQChartCtrl.value;
+  if (hqchartCtrl) hqchartCtrl.ClearChart();
+};
 
 const ChangeMinutePeriod = (days) => {
-    const hqchartCtrl = HQChartCtrl.value
-    if (hqchartCtrl) hqchartCtrl.ChangeMinutePeriod(days)
-}
+  const hqchartCtrl = HQChartCtrl.value;
+  if (hqchartCtrl) hqchartCtrl.ChangeMinutePeriod(days);
+};
 
 const ChangeKLinePeriod = (period) => {
-    const hqchartCtrl = HQChartCtrl.value
-    if (hqchartCtrl) hqchartCtrl.ChangeKLinePeriod(period)
-}
+  const hqchartCtrl = HQChartCtrl.value;
+  if (hqchartCtrl) hqchartCtrl.ChangeKLinePeriod(period);
+};
 
 const NetworkFilter = (data, callback) => {
-    console.log(`[App:NetworkFilter] Name=${data.Name} Explain=${data.Explain}`)
+  console.log(`[App:NetworkFilter] Name=${data.Name} Explain=${data.Explain}`);
   // 阻止默认行为（默认会走HQData的CDN）
-    data.PreventDefault = true
+  data.PreventDefault = true;
 
-    const reqSymbol = (data?.Request?.Data?.symbol) || Symbol.value || 'GBPAUD.FXCM'
+  const reqSymbol = data?.Request?.Data?.symbol || Symbol.value || "GBPAUD.FXCM";
 
   switch (data.Name) {
     // 日K历史数据
-        case 'KLineChartContainer::RequestHistoryData': {
-            const packet = dailyDataPackets[reqSymbol]
+    case "KLineChartContainer::RequestHistoryData": {
+      const packet = dailyDataPackets[reqSymbol];
       if (packet) {
-                const mock = transformDailyDataToHQChart(packet)
-                callback({ data: mock })
+        const mock = transformDailyDataToHQChart(packet);
+        callback({ data: mock });
       } else {
         // 没有该代码的本地包时，返回空结构
-                callback({ data: { name: reqSymbol, symbol: reqSymbol, ver: 2.0, data: [] } })
+        callback({ data: { name: reqSymbol, symbol: reqSymbol, ver: 2.0, data: [] } });
       }
-            break
+      break;
     }
     // 日K实时数据（我们已关闭自动更新；如触发则回空）
-        case 'KLineChartContainer::RequestRealtimeData': {
-            callback({ data: { name: reqSymbol, symbol: reqSymbol, ver: 2.0, data: [] } })
-            break
+    case "KLineChartContainer::RequestRealtimeData": {
+      callback({ data: { name: reqSymbol, symbol: reqSymbol, ver: 2.0, data: [] } });
+      break;
     }
     // 分时/分钟数据（如暂不支持，统一回空；后续可加分钟数据转换）
-        case 'KLineChartContainer::ReqeustHistoryMinuteData':
-        case 'KLineChartContainer::RequestMinuteRealtimeData':
-        case 'MinuteChartContainer::RequestMinuteData':
-        case 'MinuteChartContainer::RequestHistoryMinuteData': {
-            callback({ data: { name: reqSymbol, symbol: reqSymbol, ver: 2.0, data: [] } })
-            break
+    case "KLineChartContainer::ReqeustHistoryMinuteData":
+    case "KLineChartContainer::RequestMinuteRealtimeData":
+    case "MinuteChartContainer::RequestMinuteData":
+    case "MinuteChartContainer::RequestHistoryMinuteData": {
+      callback({ data: { name: reqSymbol, symbol: reqSymbol, ver: 2.0, data: [] } });
+      break;
     }
     default: {
       // 未覆盖的请求返回空，保持引擎稳定
-            callback({ data: { name: reqSymbol, symbol: reqSymbol, ver: 2.0, data: [] } })
-            break
-        }
-    }
-}
-
-// 页面显示时的处理
-const handleShow = () => {
-    uni.getSystemInfo({
-        success: (res) => {
-            const width = res.windowWidth
-            const height = res.windowHeight
-            ChartWidth.value = width
-            ChartHeight.value = height - 65
-            nextTick(() => {
-                CreateHQChart()
-            })
+      callback({ data: { name: reqSymbol, symbol: reqSymbol, ver: 2.0, data: [] } });
+      break;
     }
-    })
   }
+};
 
 // 页面隐藏时的处理
 const handleHide = () => {
-    ClearHQChart()
-}
+  ClearHQChart();
+};
 
 // 页面卸载时的处理
 const handleUnload = () => {
-    ClearHQChart()
-}
-
-// 生命周期钩子
-onMounted(() => {
-    handleShow()
-})
-
-onUnmounted(() => {
-    handleUnload()
-})
+  ClearHQChart();
+};
 
 // TCP相关响应式变量
 const tcpConnected = ref(false);
@@ -2425,6 +2399,7 @@ onLoad((options) => {
 
 // 保存定时器，用于页面卸载时清理
 onUnmounted(() => {
+  handleUnload();
   removeTcpListeners();
   disconnectTcp();
   if (timer) {
@@ -2468,6 +2443,7 @@ onMounted(async () => {
     await nextTick();
     setTimeout(() => {
       initCanvas();
+      CreateHQChart();
     }, 100);
     console.log("所有初始化步骤完成");
   } catch (error) {

pages/marketSituation/marketDetail.vue

@@ -48,7 +48,7 @@
           </view>
           <view class="stock-cell change-column">
             <text class="stock-change" :class="item.isRising ? 'rising' : 'falling'">
-              {{ item.changePercent }}
+              {{ judgeSymbol(item.changePercent) }}
             </text>
           </view>
         </view>
@@ -79,107 +79,6 @@ const sortType = ref(""); // 排序类型：'price' 或 'change'
 const sortOrder = ref("desc"); // 排序顺序：'asc' 或 'desc'
 
 const regionalGroupArray = ref([]);
-// 股票数据
-const stockList = ref([
-  {
-    stockName: "Telecommunication",
-    stockCode: "888607",
-    price: 1349.47,
-    change: "+7.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Other",
-    stockCode: "888607",
-    price: 1349.47,
-    change: "+6.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1349.47,
-    change: "+5.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Telecommunication",
-    stockCode: "888607",
-    price: 1349.47,
-    change: "+4.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Other",
-    stockCode: "888611",
-    price: 1359.47,
-    change: "+3.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1349.47,
-    change: "+2.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Telecommunication",
-    stockCode: "888607",
-    price: 1349.47,
-    change: "+1.67%",
-    isRising: true,
-  },
-  {
-    stockName: "Other",
-    stockCode: "888611",
-    price: 1009.98,
-    change: "-1.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1009.98,
-    change: "-0.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Telecommunication",
-    stockCode: "888607",
-    price: 1009.98,
-    change: "-0.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Other",
-    stockCode: "888611",
-    price: 1009.98,
-    change: "-1.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1009.98,
-    change: "-4.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1009.98,
-    change: "-3.67%",
-    isRising: false,
-  },
-  {
-    stockName: "Consumer Discretio...",
-    stockCode: "888610",
-    price: 1009.98,
-    change: "-3.67%",
-    isRising: false,
-  },
-]);
 
 // 计算属性
 const contentTopPosition = computed(() => {
@@ -206,6 +105,10 @@ const sortedStockList = computed(() => {
   return list;
 });
 
+const judgeSymbol = (num) => {
+  return num[0] === "-" ? num : "+" + num;
+};
+
 const getRegionalGroupList = async () => {
   try {
     const result = await getRegionalGroupListAPI({
@@ -348,7 +251,6 @@ const sendTcpMessage = (command) => {
       break;
   }
   if (!messageData) {
-
     return;
   } else {
     try {

pages/marketSituation/marketOverview.vue

@@ -6,6 +6,10 @@
     <scroll-view class="content_scroll" scroll-y="true" :style="{ top: contentTopPosition + 'px' }">
       <view class="content">
         <view class="map">
+          <view class="INDU">道琼斯<view :class="getSignClass(INDU.value)">{{ judgeSymbol(INDU.value) }}</view></view>
+          <view class="NDX">纳斯达克<view :class="getSignClass(NDX.value)">{{ judgeSymbol(NDX.value) }}</view></view>
+          <view class="HSI">恒生指数<view :class="getSignClass(HSI.value)">{{ judgeSymbol(HSI.value) }}</view></view>
+          <view class="CN">上证指数<view :class="getSignClass(CN.value)">{{ judgeSymbol(CN.value) }}</view></view>
           <image src="/static/marketSituation-image/map.png" mode="widthFix"></image>
         </view>
         <view class="global_index">
@@ -47,6 +51,7 @@
 
 <script setup>
 import { ref, onMounted, onUnmounted, watch, nextTick, computed } from "vue";
+import { onShow, onHide } from "@dcloudio/uni-app";
 import util from "../../common/util.js";
 import IndexCard from "../../components/IndexCard.vue";
 import { useMarketSituationStore } from "../../stores/modules/marketSituation.js";
@@ -59,6 +64,11 @@ const contentHeight = ref(0);
 const headerHeight = ref(0); // 动态计算的header高度
 const isWarnTextOverflow = ref(false); // warn文字是否溢出
 
+const INDU = ref({ stockName: "道琼斯", stockCode: "INDU", value: "" });
+const NDX = ref({ stockName: "纳斯达克", stockCode: "513300", value: "" });
+const HSI = ref({ stockName: "恒生指数", stockCode: "HSI", value: "" });
+const CN = ref({ stockName: "上证指数", stockCode: "1A0001", value: "" });
+
 const pageIndex = ref(0);
 const scrollToView = ref("");
 
@@ -76,6 +86,20 @@ const warnTextClass = computed(() => {
 
 const globalIndexArray = ref([]);
 
+const judgeSymbol = (num) => {
+  return num[0] === "-" ? num : "+" + num;
+};
+
+function getSignClass(value) {
+  const s = typeof value === 'string' ? value : String(value ?? '');
+  const trimmed = s.trim();
+  if (trimmed.startsWith('-')) return 'index-down';
+  if (trimmed.startsWith('+')) return 'index-up';
+  const n = parseFloat(trimmed);
+  if (!isNaN(n)) return n >= 0 ? 'index-up' : 'index-down';
+  return '';
+}
+
 // 搜索输入事件
 const onSearchInput = (e) => {
   searchValue.value = e.detail.value;
@@ -169,7 +193,7 @@ const getGlobalIndex = async () => {
 };
 
 // TCP相关响应式变量
-import tcpConnection, { TCPConnection, TCP_CONFIG } from "@/api/tcpConnection.js";
+import tcpConnection from "@/api/tcpConnection.js";
 const tcpConnected = ref(false);
 const connectionListener = ref(null);
 const messageListener = ref(null);
@@ -225,7 +249,6 @@ const sendTcpMessage = (command) => {
   if (command == "batch_real_time") {
     messageDataArray = globalIndexArray.value.map((item) => item.stockCode);
   }
-  console.log(messageDataArray);
 
   switch (command) {
     // 实时行情推送
@@ -273,11 +296,9 @@ const sendTcpMessage = (command) => {
       const success = tcpConnection.send(messageData);
       if (success) {
         console.log("home发送TCP消息:", messageData);
-
       }
     } catch (error) {
       console.error("发送TCP消息时出错:", error);
-
     }
   }
 };
@@ -362,6 +383,27 @@ const parseStockData = (message) => {
           changePercent: ((100 * (stockDataArray[item.stockCode][0].current_price - stockDataArray[item.stockCode][0].pre_close)) / stockDataArray[item.stockCode][0].pre_close).toFixed(2) + "%",
           isRising: stockDataArray[item.stockCode][0].current_price - stockDataArray[item.stockCode][0].pre_close >= 0,
         }));
+
+        if (stockDataArray[INDU.value.stockCode][0]) {
+          INDU.value.value = ((100 * (stockDataArray[INDU.value.stockCode][0].current_price - stockDataArray[INDU.value.stockCode][0].pre_close)) / stockDataArray[INDU.value.stockCode][0].pre_close).toFixed(2) + "%";
+        } else {
+          console.log("INDU不存在");
+        }
+        if (stockDataArray[NDX.value.stockCode][0]) {
+          NDX.value.value = ((100 * (stockDataArray[NDX.value.stockCode][0].current_price - stockDataArray[NDX.value.stockCode][0].pre_close)) / stockDataArray[NDX.value.stockCode][0].pre_close).toFixed(2) + "%";
+        } else {
+          console.log("NDX不存在");
+        }
+        if (stockDataArray[HSI.value.stockCode][0]) {
+          HSI.value.value = ((100 * (stockDataArray[HSI.value.stockCode][0].current_price - stockDataArray[HSI.value.stockCode][0].pre_close)) / stockDataArray[HSI.value.stockCode][0].pre_close).toFixed(2) + "%";
+        } else {
+          console.log("HSI不存在");
+        }
+        if (stockDataArray[CN.value.stockCode][0]) {
+          CN.value.value = ((100 * (stockDataArray[CN.value.stockCode][0].current_price - stockDataArray[CN.value.stockCode][0].pre_close)) / stockDataArray[CN.value.stockCode][0].pre_close).toFixed(2) + "%";
+        } else {
+          console.log("CN不存在");
+        }
       }
     } else if ((typeof message === "string" && message.includes('{"count')) || isMorePacket.batch_real_time) {
       if (typeof message === "string" && message.includes('{"count')) {
@@ -408,6 +450,27 @@ const parseStockData = (message) => {
           changePercent: ((100 * (stockDataArray[item.stockCode][0].current_price - stockDataArray[item.stockCode][0].pre_close)) / stockDataArray[item.stockCode][0].pre_close).toFixed(2) + "%",
           isRising: stockDataArray[item.stockCode][0].current_price - stockDataArray[item.stockCode][0].pre_close >= 0,
         }));
+
+        if (stockDataArray[INDU.value.stockCode][0]) {
+          INDU.value.value = ((100 * (stockDataArray[INDU.value.stockCode][0].current_price - stockDataArray[INDU.value.stockCode][0].pre_close)) / stockDataArray[INDU.value.stockCode][0].pre_close).toFixed(2) + "%";
+        } else {
+          console.log("INDU不存在");
+        }
+        if (stockDataArray[NDX.value.stockCode][0]) {
+          NDX.value.value = ((100 * (stockDataArray[NDX.value.stockCode][0].current_price - stockDataArray[NDX.value.stockCode][0].pre_close)) / stockDataArray[NDX.value.stockCode][0].pre_close).toFixed(2) + "%";
+        } else {
+          console.log("NDX不存在");
+        }
+        if (stockDataArray[HSI.value.stockCode][0]) {
+          HSI.value.value = ((100 * (stockDataArray[HSI.value.stockCode][0].current_price - stockDataArray[HSI.value.stockCode][0].pre_close)) / stockDataArray[HSI.value.stockCode][0].pre_close).toFixed(2) + "%";
+        } else {
+          console.log("HSI不存在");
+        }
+        if (stockDataArray[CN.value.stockCode][0]) {
+          CN.value.value = ((100 * (stockDataArray[CN.value.stockCode][0].current_price - stockDataArray[CN.value.stockCode][0].pre_close)) / stockDataArray[CN.value.stockCode][0].pre_close).toFixed(2) + "%";
+        } else {
+          console.log("CN不存在");
+        }
       }
     } else {
       // 没有通过JSON解析判断，说明不是需要的数据
@@ -439,25 +502,38 @@ const startTcp = () => {
     removeTcpListeners();
     disconnectTcp();
     initTcpListeners();
+    console.log("初始化完成，，，，，，，，，，，，，，，");
     connectTcp();
   } catch (error) {
     console.error("建立连接并设置监听出错:", error);
-
   }
 };
 
+onShow(async () => {
+  console.log("显示页面");
+  await getGlobalIndex();
+  initTcpListeners();
+  await nextTick();
+  // 开始连接
+  startTcp();
+});
+
+onHide(() => {
+  console.log("隐藏页面");
+  sendTcpMessage("stop_real_time");
+  removeTcpListeners();
+  disconnectTcp();
+});
+
 onUnmounted(() => {
+  console.log("卸载页面");
   sendTcpMessage("stop_real_time");
   removeTcpListeners();
   disconnectTcp();
 });
 
 onMounted(async () => {
-  await getGlobalIndex();
-  initTcpListeners();
-  await nextTick();
-  // 开始连接
-  startTcp();
+  console.log("挂载页面");
   // 状态栏高度
   iSMT.value = uni.getSystemInfoSync().statusBarHeight;
 
@@ -708,6 +784,67 @@ watch(headerHeight, (newHeight) => {
   min-height: 200rpx;
 }
 
+.NDX {
+  position: absolute;
+  top: 30%;
+  left: 17%;
+  transform: translate(-50%, -50%);
+  font-size: 11rpx;
+  color: #000000;
+  padding: 5rpx 10rpx;
+  border-radius: 10rpx;
+  background-color: #ffffff;
+  z-index: 10;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.INDU {
+  position: absolute;
+  top: 22%;
+  left: 35%;
+  transform: translate(-50%, -50%);
+  font-size: 11rpx;
+  color: #000000;
+  padding: 5rpx 10rpx;
+  border-radius: 10rpx;
+  background-color: #ffffff;
+  z-index: 10;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.HSI {
+  position: absolute;
+  top: 30%;
+  right: 4%;
+  transform: translate(-50%, -50%);
+  font-size: 11rpx;
+  color: #000000;
+  padding: 5rpx 10rpx;
+  border-radius: 10rpx;
+  background-color: #ffffff;
+  z-index: 10;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.CN {
+  position: absolute;
+  top: 23%;
+  right: 8%;
+  transform: translate(-50%, -50%);
+  font-size: 11rpx;
+  color: #000000;
+  padding: 5rpx 10rpx;
+  border-radius: 10rpx;
+  background-color: #ffffff;
+  z-index: 10;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .map image {
   width: 100%;
   height: auto;
@@ -837,8 +974,8 @@ watch(headerHeight, (newHeight) => {
 .global_index_title {
   margin-left: 20rpx;
   font-size: 40rpx;
-  font-weight: 100;
-  color: #333333;
+  font-weight: bold;
+  color: black;
   align-items: center;
 }
 
@@ -966,4 +1103,12 @@ watch(headerHeight, (newHeight) => {
   overflow: hidden;
   background-color: white;
 }
+
+.index-up {
+  color: #2fc25b !important;
+}
+
+.index-down {
+  color: #f04864 !important;
+}
 </style>

pages/marketSituation/marketSituation.vue

@@ -496,8 +496,8 @@ watch(headerHeight, (newHeight) => {
 }
 
 .scroll_indicator image {
-  width: 20rpx;
-  height: 20rpx;
+  width: 30rpx;
+  height: 30rpx;
   opacity: 0.5;
 }
 

pages/start/Registration/Registration.vue

@@ -326,7 +326,7 @@ function changeAccount() {
   }
 
   if (switchType.value === "Phone") {
-    account.value = `${country.value}${phone.value}`;
+    account.value = `${country.value}-${phone.value}`;
   }
   if (switchType.value === "Email") {
     account.value = email.value;
@@ -511,7 +511,7 @@ async function sendCode() {
   if (switchType.value === "Phone") {
     // 发送验证码
 
-    const phoneAll = `${country.value}${phone.value}`;
+    const phoneAll = `${country.value}-${phone.value}`;
     const res = await SendPhoneCodeApi({
       phone: phoneAll,
     });

pages/start/login/login.vue

@@ -209,7 +209,11 @@
 
     <!-- 第三方登录 -->
     <view class="third-party-login">
-      <view class="third-party-btn" @click="loginWithApple">
+      <view
+        v-if="isAppleDevice"
+        class="third-party-btn"
+        @click="loginWithApple"
+      >
         <image
           class="apple-icon"
           src="../../../static/icons/appleIcons.png"
@@ -253,7 +257,7 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { computed, ref } from "vue";
 // 导入完整的国家列表
 import countryList from "./list.js";
 import footerBar from "../../../components/footerBar";
@@ -285,6 +289,19 @@ const verifyCode = ref("");
 const account = ref("");
 const isLoading = ref(false);
 
+const deviceStore = useDeviceStore();
+
+const isAppleDevice = computed(() => {
+  if (deviceStore.deviceInfo.brand) {
+    return deviceStore.deviceInfo.brand.toLowerCase() === "apple";
+  }
+
+  if (deviceStore.deviceInfo.system) {
+    return deviceStore.deviceInfo.system.includes("ios");
+  }
+  return false;
+});
+
 // 使用从list.js导入的完整国家列表数据
 const countries = ref(
   countryList.list.map((item) => ({
@@ -355,8 +372,6 @@ async function Login() {
     return;
   }
 
-  const deviceStore = useDeviceStore();
-
   const account = changeAccount();
   const loginType = changeLoginType();
   isLoading.value = true;
@@ -536,7 +551,7 @@ function changeAccount() {
   }
 
   if (switchType.value === "Phone") {
-    account.value = `${country.value}${phone.value}`;
+    account.value = `${country.value}-${phone.value}`;
   }
   if (switchType.value === "Email") {
     account.value = email.value;
@@ -652,7 +667,7 @@ async function sendCode() {
   if (switchType.value === "Phone") {
     // 发送验证码
 
-    const phoneAll = `${country.value}${phone.value}`;
+    const phoneAll = `${country.value}-${phone.value}`;
     const res = await SendPhoneCodeApi({
       phone: phoneAll,
     });

pages/start/recoverPassword/recoverPassword.vue

@@ -451,7 +451,7 @@ function changeAccount() {
   }
 
   if (switchType.value === "Phone") {
-    account.value = `${country.value}${phone.value}`;
+    account.value = `${country.value}-${phone.value}`;
   }
   if (switchType.value === "Email") {
     account.value = email.value;
@@ -570,7 +570,7 @@ function sendCode() {
     }
   }
   if (switchType.value === "Phone") {
-    const phoneAll = `${country.value}${phone.value}`;
+    const phoneAll = `${country.value}-${phone.value}`;
 
     const res = SendPhoneCodeApi({
       phone: phoneAll,

pages/start/select/select.vue

@@ -110,6 +110,7 @@ function toLogin() {
   border-radius: 60rpx;
   font-size: 32rpx;
   padding: 20rpx;
+  border: 1rpx solid #00000022;
 }
 
 .register-button {

pages/start/startup/startup.vue

@@ -1,11 +1,13 @@
 <template>
   <view class="background">
-    <image
+   <!-- <image
       class="logo"
       src="../../../static/icons/start-logo.png"
       mode="scaleToFill"
     />
-    <view class="logo-text"> DeepChart </view>
+    <view class="logo-text"> DeepChart </view> -->
+
+    <image class="start" src="../../../static/start.webp" mode="scaleToFill" />
   </view>
 </template>
 
@@ -19,7 +21,7 @@ onShow(() => {
   // 获取设备ID
   uni.getSystemInfo({
     success: (res) => {
-      deviceInfo.setDeviceInfo(res)
+      deviceInfo.setDeviceInfo(res);
     },
   });
 
@@ -38,7 +40,7 @@ onShow(() => {
         animationDuration: 1000,
       });
     }
-  }, 1500);
+  }, 3000);
 });
 </script>
 
@@ -49,6 +51,11 @@ onShow(() => {
   height: 100vh;
 }
 
+.start{
+  width: 100vw;
+  height: 100vh;
+}
+
 .logo-text {
   display: flex;
   justify-content: center;

utils/http.js

@@ -23,7 +23,7 @@ const httpInterceptor = {
         // 打印最终请求地址
         console.log('HTTP(finalUrl)=', options.url)
         // 2.请求超时，默认60s
-        options.timeout = 10000
+        options.timeout = 30000
         console.log(options)
         //3 添加小程序端请求头
         const sys = uni.getSystemInfoSync();