From 87a302b799e49f899874afb3fb4ce9955a104ac0 Mon Sep 17 00:00:00 2001
From: zoujing <kidevelop@163.com>
Date: Tue, 29 Jul 2025 20:21:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=20=E6=9D=A5=E5=AF=B9=E8=AF=9D=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/chat/ChatMainList.vue    | 30 ++++++++++++++++++++++++------
 pages/chat/ChatQuickAccess.vue | 10 +++++++---
 pages/chat/ChatTopWelcome.vue  |  6 +++---
 request/api/AgentChatStream.js | 12 +++++++++++-
 4 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/pages/chat/ChatMainList.vue b/pages/chat/ChatMainList.vue
index 028d055..0ba2415 100644
--- a/pages/chat/ChatMainList.vue
+++ b/pages/chat/ChatMainList.vue
@@ -116,6 +116,8 @@
 
 	// 会话进行中标志
 	let isSessionActive = false; 
+	/// 指令
+	let commonType = ''
 	
 	
 	// 打开抽屉
@@ -167,8 +169,13 @@
 	};
 
 	/// 是发送指令
-	const handleReplyInstruct = (text) => {
-		sendMessage(text, true)
+	const handleReplyInstruct = (item) => {
+		if(item.type === 'MyOrder') {
+			/// 订单
+			return
+		}
+		commonType = item.type
+		sendMessage(item.title, true)
 		setTimeoutScrollToBottom()
 	}
 
@@ -271,7 +278,7 @@
 		    conversationId: conversationId.value,
 		    agentId: agentId.value,
 		    messageType: isInstruct ? 1 : 0,
-		    messageContent: message
+		    messageContent: isInstruct ? commonType : message
 		}
 		
 		// 插入AI消息
@@ -305,9 +312,10 @@
 		// 流式接收内容
 		agentChatStream(args, (chunk) => {
 			console.log('分段内容:', chunk)
-			if (chunk.error) {
+			if (chunk && chunk.error) {
 				chatMsgList.value[aiMsgIndex].msg = '请求错误,请重试';
-				clearInterval(finishInterval);
+				clearInterval(loadingTimer);
+				loadingTimer = null;
 				isTyping = false;
 				typeWriterTimer = null;
 				isSessionActive = false; // 出错也允许再次发送
@@ -334,10 +342,20 @@
 		    if (chunk && chunk.finish) {
 		        // 结尾处理：确保剩余内容全部输出
 		        const finishInterval = setInterval(() => {
+					console.log('aiMsgBuffer.length:', aiMsgBuffer.length)
 		            if (aiMsgBuffer.length === 0) {
 		                clearInterval(finishInterval);
+						clearInterval(loadingTimer);
+						loadingTimer = null;
 		                isTyping = false;
-		                isSessionActive = false; // 会话结束，允许再次发送
+						typeWriterTimer = null;
+		                // 补全：如果消息内容还停留在'加载中.'或为空，则给出友好提示
+		                const msg = chatMsgList.value[aiMsgIndex].msg;
+						console.log('msg:', msg)
+		                if (!msg || msg === '加载中.' || msg.startsWith('加载中')) {
+		                    chatMsgList.value[aiMsgIndex].msg = '未获取到内容，请重试';
+		                }
+		                isSessionActive = false;
 		                scrollToBottom();
 		            }
 		        }, 50);
diff --git a/pages/chat/ChatQuickAccess.vue b/pages/chat/ChatQuickAccess.vue
index dda0f3f..76e09d3 100644
--- a/pages/chat/ChatQuickAccess.vue
+++ b/pages/chat/ChatQuickAccess.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="quick-access">
 		<view class="quick-access-scroll">
-			<view class="quick-access-item" v-for="(item, index) in itemList" :key="index" @click="sendReply(item.title)">
+			<view class="quick-access-item" v-for="(item, index) in itemList" :key="index" @click="sendReply(item)">
 				<image class="quick-access-item-bg" src="/static/quick/quick_icon_bg.png" mode="aspectFill"></image>
 				<view class="quick-access-item-title">
 					<image :src="item.icon"></image>
@@ -19,8 +19,8 @@
 	
 	const emits = defineEmits(['replySent']);
 	
-	const sendReply = (text) => {
-		emits('replySent', text); // 向父组件传递数据
+	const sendReply = (item) => {
+		emits('replySent', item); // 向父组件传递数据
 	}
 	
 	onMounted(() => {
@@ -33,21 +33,25 @@
 				icon: '/static/quick/quick_icon_yuding.png',
 				title: '预定门票',
 				content: '快速预定天沐温泉门票',
+				type: 'Command.quickBooking'
 			},
 			{
 				icon: '/static/quick/quick_icon_find.png',
 				title: '探索发现',
 				content: '亲子、团建等更多玩法',
+				type: 'Command.discovery'
 			},
 			{
 				icon: '/static/quick/quick_icon_call.png',
 				title: '呼叫服务',
 				content: '加床、订麻将机...',
+				type: 'Command.createWorkOrder'
 			},
 			{
 				icon: '/static/quick/quick_icon_order.png',
 				title: '我的订单',
 				content: '快速查看订单',
+				type: 'MyOrder'
 			}
 		] 
 	}
diff --git a/pages/chat/ChatTopWelcome.vue b/pages/chat/ChatTopWelcome.vue
index ab32f11..f940814 100644
--- a/pages/chat/ChatTopWelcome.vue
+++ b/pages/chat/ChatTopWelcome.vue
@@ -4,7 +4,7 @@
 			<!-- :style="backgroundStyle" -->
 			<view class="top-item1-left">
 				<image :src="initPageImages.welcomeImageUrl"></image>
-				<text>{{ currentDate }} 多云 -3～6℃ gg </text>						  
+				<text>{{ currentDate }} 多云 -3～6℃ ff </text>						  
 			</view>
 			<view class="top-item1-right">
 				<image :src="initPageImages.logoImageUrl"></image>
@@ -23,8 +23,8 @@
 	    type: Object,
 	    default: {
 			backgroundImageUrl: '',
-			logoImageUrl: '/static/hello_banner_icon@2x.png',
-			welcomeImageUrl: '/static/hello_banner_bg@2x.png'
+			logoImageUrl: '',
+			welcomeImageUrl: ''
 		}
 	  },
 	  welcomeContent: {
diff --git a/request/api/AgentChatStream.js b/request/api/AgentChatStream.js
index ef24b3e..7f56b6a 100644
--- a/request/api/AgentChatStream.js
+++ b/request/api/AgentChatStream.js
@@ -12,6 +12,7 @@ const API = '/agent/assistant/chat';
 function agentChatStream(params, onChunk) {
     return new Promise((resolve, reject) => {
         const token = uni.getStorageSync('token');
+        let hasError = false;
 
         console.log("发送请求内容: ", params)
         // #ifdef MP-WEIXIN
@@ -34,7 +35,7 @@ function agentChatStream(params, onChunk) {
                 reject(err);
             },
 			complete(res) {
-				if(res.statusCode === 500) {
+				if(res.statusCode !== 200) {
                     console.log("====> ", JSON.stringify(res))
 
                     if (onChunk) {
@@ -47,9 +48,18 @@ function agentChatStream(params, onChunk) {
 
         requestTask.onHeadersReceived(res => {
             console.log('onHeadersReceived', res);
+            const status = res.statusCode || (res.header && res.header.statusCode);
+            if (status && status !== 200) {
+                hasError = true;
+                if (onChunk) {
+                    onChunk({ error: true, message: `服务器错误(${status})`, detail: res });
+                }
+                requestTask.abort && requestTask.abort();
+            }
         });
 
         requestTask.onChunkReceived(res => {
+            if (hasError) return;
             const base64 = uni.arrayBufferToBase64(res.data);
             let data = '';
             try {