替换启动页动画0

api/customerServicePlatform/customerServicePlatform.js

@@ -9,9 +9,24 @@ export const uploadImageApi = (data) => {
 	data
   })
 }
-
-//问题回答
-export const getAnswerApi = (data) => {
+//问题回答最终内容
+export const getAnswerContentApi = (data) => {
+  return http({
+    method: 'POST',
+    url: '/api/customer/getAnswer',
+	data
+  })
+}
+//问题回答轮询
+export const getAnswerStatusApi = (data) => {
+  return http({
+    method: 'POST',
+    url: '/api/customer/getState',
+	data
+  })
+}
+//问题回答获取Id
+export const getAnswerIdApi = (data) => {
   return http({
     method: 'POST',
     url: '/api/customer/askQuestion',

pages/customerServicePlatform/questionDetail.vue

@@ -14,7 +14,7 @@
 			</view>
 		</view>
 
-		<scroll-view scroll-y class="content-container">
+		<scroll-view scroll-y class="content-container" :scroll-into-view="scrollIntoView">
 
 			<view class="content-header">
 				<view class="content-header-area">
@@ -47,7 +47,7 @@
 					<view class="card-text">
 
 						<rich-text :nodes="renderMarkdown(answerContent)"></rich-text>
-
+						<view id="answer-end" style="width:1px;height:1px;"></view>
 						<!-- 		<text class="card-paragraph">
 							{{answerContent}}
 						</text> -->
@@ -66,7 +66,9 @@
 
 <script>
 	import {
-		getAnswerApi
+		getAnswerIdApi,
+		getAnswerStatusApi,
+		getAnswerContentApi
 	} from "../../api/customerServicePlatform/customerServicePlatform";
 	import marked from "marked"; // 引入 marked 库
 
@@ -78,12 +80,21 @@
 				questionTitle: '',
 				answerContent: '正在思考...',
 				showLoginRegister: false,
+				// 轮询句柄
+				pollInterval: null,
+				pollTimeout: null,
+				scrollIntoView: ''
 			};
 		},
 		mounted() {
 			this.iSMT = uni.getSystemInfoSync().statusBarHeight || 0;
 			this.getAnswerContent()
 		},
+		onUnload() {
+			clearInterval(this.pollInterval);
+			clearTimeout(this.pollTimeout);
+			clearInterval(this.interval);
+		},
 		onLoad(options) {
 			if (options.question) {
 				this.questionTitle = decodeURIComponent(options.question);
@@ -95,6 +106,18 @@
 			}
 		},
 		methods: {
+			scrollToBottom() {
+			    // 使用 $nextTick 保证 rich-text 的渲染/DOM 更新完成
+			    this.$nextTick(() => {
+			      // 先设置目标 id，scroll-view 会滚动使其可见
+			      this.scrollIntoView = 'answer-end';
+			
+			      // 清空值以便下次再次触发
+			      setTimeout(() => {
+			        this.scrollIntoView = '';
+			      }, 100);
+			    });
+			  },
 			renderMarkdown(content) {
 				const renderer = new marked.Renderer();
 				// renderer.heading = function (text, level) {
@@ -120,39 +143,102 @@
 			},
 			async getAnswerContent() {
 				let conversationId = '';
+				let chatId = '';
+				//尝试获取本地缓存
 				try {
 					const cache = uni.getStorageSync('conversationId');
+					const chatIdCache = uni.getStorageSync('chatId');
 					if (cache) conversationId = cache;
+					if (chatIdCache) chatId = chatIdCache
 				} catch (e) {
 					conversationId = '';
 				}
 				try {
-					const res = await getAnswerApi({
+					const res = await getAnswerIdApi({
 						question: this.questionTitle,
 						conversationId: conversationId,
+						chatId: chatId
 					})
 					console.log(res)
 
-					if (res.code == 200) {
-						uni.setStorageSync('conversationId', res.data.conversationId);
-						const answer = res.data.answer
-						// 流式输出逻辑
-						let currentIndex = 0;
-						const answerLength = answer.length;
+					if (res.code == 200 && res.data.chatId) {
+						const resConversationId = res.data.conversationId;
+						const resChatId = res.data.chatId;
+						uni.setStorageSync('conversationId', resConversationId);
+						uni.setStorageSync('chatId', resChatId);
+						let pollCount = 0;
+						const maxPoll = 10;
+						this.pollInterval && clearInterval(this.pollInterval);
+						this.pollTimeout && clearTimeout(this.pollTimeout);
+						// === 轮询函数 ===
+						const checkStatus = async () => {
+							pollCount++;
+							const pollRes = await getAnswerStatusApi({
+								conversationId: resConversationId,
+								chatId: resChatId
+							});
+
+							console.log("pollRes =>", pollRes);
+
+							const status = pollRes?.data;
+							//轮询结束，获取回答
+							if (status === "completed") {
+								clearInterval(this.pollInterval);
+								clearTimeout(this.pollTimeout);
+								//获取最终答案
+								const answerRes = await getAnswerContentApi({
+									conversationId: resConversationId,
+									chatId: resChatId
+								});
+
+								console.log("answerRes =>", answerRes);
+								const answer = answerRes?.data;
+								//打印机效果
+								if (answer) {
+									// 逐字输出
+									let currentIndex = 0;
+									const answerLength = answer.length;
+
+									this.interval && clearInterval(this.interval);
+									this.interval = setInterval(() => {
+										this.answerContent = answer.slice(0, currentIndex);
+										currentIndex++;
+										this.scrollToBottom();
+										if (currentIndex > answerLength) {
+											clearInterval(this.interval);
+											 this.scrollToBottom();
+										}
+									}, Math.floor(Math.random() * (150 - 30 + 1)) + 30);
+
+								} else {
+									this.answerContent = "获取回答失败，请重试";
+								}
+								return;
+							}
+							//超过10秒就回答失败
+							if (pollCount >= maxPoll) {
+								clearInterval(this.pollInterval);
+								clearTimeout(this.pollTimeout);
+								this.answerContent = "获取回答失败，请重试";
+								return;
+							}
 
-						// 每隔一定时间显示一部分内容
-						this.interval = setInterval(() => {
-							this.answerContent = answer.slice(0, currentIndex);
-							currentIndex++;
+						};
 
-							if (currentIndex > answerLength) {
-								clearInterval(this.interval);
-							}
-						}, Math.floor(Math.random() * (150 - 30 + 1)) + 30);
+						// 每 2 秒轮询
+						this.pollInterval = setInterval(checkStatus, 2000);
+						// 超时兜底 10s
+						this.pollTimeout = setTimeout(() => {
+							clearInterval(this.pollInterval);
+							this.answerContent = "获取回答失败，请重试";
+						}, 20000);
 					} else {
 						this.answerContent = '获取回答失败，请重试';
 					}
 				} catch {
+					this.pollInterval && clearInterval(this.pollInterval);
+					this.pollTimeout && clearTimeout(this.pollTimeout);
+					this.interval && clearInterval(this.interval);
 					this.answerContent = '获取回答失败，请重试';
 				}
 			},

pages/deepExploration/MainForceActions.vue

@@ -36,13 +36,14 @@
 						<text>{{stockAdd}}</text>
 					</view>
 					<view class="graph_content">
-						<view class="charts-box">
+						<view class="loadingGraph" v-show="graphLoading">加载中...</view>
+						<view class="charts-box" v-show="!graphLoading">
 							<!-- uCharts 蜡烛图组件 -->
 							<qiun-data-charts type="candle" :opts="opts" :chartData="chartData" :disableScroll="true"
 								:ontouch="true" :onzoom="true" :key="chartKey" />
 						</view>
-						<image @click.stop="showFullscreenKline" src="/static/deepExploration-images/kLineAll.png"
-							mode="aspectFill"></image>
+						<!-- <image @click.stop="showFullscreenKline" src="/static/deepExploration-images/kLineAll.png"
+							mode="aspectFill"></image> -->
 					</view>
 				</view>
 
@@ -135,6 +136,8 @@
 	const isLandscape = ref(true); // 是否横屏模式
 	const fullscreenChartKey = ref(0); // 全屏图表重绘标识
 
+	const graphLoading = ref(true)
+
 
 
 	// 显示全屏K线
@@ -245,7 +248,7 @@
 	//获取模型数据
 	const handleModels = async () => {
 		try {
-
+			graphLoading.value = true
 			if (userInfo.isVisitor) {
 				console.log('是游客');
 				loginPrompt.value.show()
@@ -479,6 +482,7 @@
 			chartData.value = {
 				...rawData
 			}
+			graphLoading.value = false
 			chartKey.value++;
 			console.log('chartData', chartData.value);
 		}
@@ -549,7 +553,7 @@
 			}
 		}
 	})
-	
+
 	// 全屏图表配置（继承原有配置并优化）
 	const fullscreenOpts = ref({
 		...opts.value, // 复用原有配置
@@ -842,13 +846,22 @@
 						}
 
 						text:nth-child(3) {
-							margin-left: 150rpx;
+							margin-left: 110rpx;
 						}
 					}
 
 					.graph_content {
 						position: relative;
 						min-height: 500rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+
+						.loadingGraph {
+
+							font-size: 35rpx;
+							color: #6a6a6a;
+						}
 
 						image {
 							position: absolute;
@@ -865,20 +878,20 @@
 						}
 					}
 				}
-				
+
 				/* 横屏按钮样式 */
 				.rotate-btn {
 					background: transparent;
 					padding: 0 10rpx;
 					margin-left: 15rpx;
-					
+
 					.btn-icon {
 						width: 36rpx;
 						height: 36rpx;
 						vertical-align: middle;
 					}
 				}
-				
+
 				/* 全屏遮罩 */
 				.fullscreen-mask {
 					position: fixed;
@@ -892,47 +905,49 @@
 					justify-content: center;
 					align-items: center;
 				}
-				
+
 				/* 全屏容器 */
 				.fullscreen-container {
-					width: 100vh;  /* 横屏时宽度等于屏幕高度 */
-					height: 100vw; /* 横屏时高度等于屏幕宽度 */
+					width: 100vh;
+					/* 横屏时宽度等于屏幕高度 */
+					height: 100vw;
+					/* 横屏时高度等于屏幕宽度 */
 					transition: transform 0.3s ease;
 					position: relative;
 				}
-				
+
 				/* 关闭按钮 */
 				.fullscreen-close {
 					position: absolute;
 					top: 20rpx;
 					right: 20rpx;
 					z-index: 10;
-					
+
 					image {
 						width: 48rpx;
 						height: 48rpx;
 					}
 				}
-				
+
 				/* 旋转按钮 */
 				.fullscreen-rotate {
 					position: absolute;
 					top: 20rpx;
 					left: 20rpx;
 					z-index: 10;
-					
+
 					image {
 						width: 48rpx;
 						height: 48rpx;
 					}
 				}
-				
+
 				/* 全屏图表容器 */
 				.fullscreen-chart {
 					width: 100%;
 					height: 100%;
 				}
-				
+
 				/* 竖屏模式适配 */
 				:deep(.fullscreen-container:not([style*="rotate(90deg)"])) {
 					width: 100vw;

pages/deepExploration/deepExploration.vue

@@ -45,8 +45,8 @@
 				</view>
 			</view>
 
-      <view class="stockSelection_content">
-        <view class="selectionItem">
+      <view class="stockSelection_content" >
+        <view class="selectionItem" @click="viewAll">
           <view class="header">
             <view class="left">
               <image
@@ -81,7 +81,7 @@
       </view>
 
       <view class="stockSelection_content">
-        <view class="selectionItem">
+        <view class="selectionItem" @click="viewAll">
           <view class="header">
             <view class="left">
               <image

pages/marketSituation/marketOverview.vue

@@ -8,16 +8,16 @@
       <view class="content">
         <view class="map">
           <view class="INDU"
-            >道琼斯<view :class="getSignClass(INDU.value)">{{ judgeSymbol(INDU.value) }}</view></view
+            >道琼斯<view :class="getSignClass(INDU.value)" @click="viewDetail(INDU)">{{ judgeSymbol(INDU.value) }}</view></view
           >
           <view class="NDX"
-            >纳斯达克<view :class="getSignClass(NDX.value)">{{ judgeSymbol(NDX.value) }}</view></view
+            >纳斯达克<view :class="getSignClass(NDX.value)" @click="viewDetail(NDX)">{{ judgeSymbol(NDX.value) }}</view></view
           >
           <view class="HSI"
-            >恒生指数<view :class="getSignClass(HSI.value)">{{ judgeSymbol(HSI.value) }}</view></view
+            >恒生指数<view :class="getSignClass(HSI.value)" @click="viewDetail(HSI)">{{ judgeSymbol(HSI.value) }}</view></view
           >
           <view class="CN"
-            >上证指数<view :class="getSignClass(CN.value)">{{ judgeSymbol(CN.value) }}</view></view
+            >上证指数<view :class="getSignClass(CN.value)" @click="viewDetail(CN)">{{ judgeSymbol(CN.value) }}</view></view
           >
           <image src="/static/marketSituation-image/map.png" mode="widthFix"></image>
         </view>
@@ -83,6 +83,12 @@ const CN = ref({ stockName: "上证指数", stockCode: "1A0001", value: "" });
 const pageIndex = ref(0);
 const scrollToView = ref("");
 
+const viewDetail = (item) => {
+  uni.navigateTo({
+    url: `/pages/marketSituation/marketCondition?stockInformation=${encodeURIComponent(JSON.stringify(item))}&from=map`,
+  });
+};
+
 // 计算属性：精准计算content区域的top值
 const contentTopPosition = computed(() => {
   const statusBarHeight = iSMT.value || 0;

pages/start/startup/startup.vue

@@ -40,7 +40,7 @@ onShow(() => {
         animationDuration: 1000,
       });
     }
-  }, 2000);
+  }, 3500);
 });
 </script>