diff --git a/.local.config.js b/.local.config.js
index 1902e69..4d86284 100644
--- a/.local.config.js
+++ b/.local.config.js
@@ -62,5 +62,5 @@ const localDevConfig = ({
        uniacid: 2075,
        domain: 'https://xcx.aigc-quickapp.com/',
     },   
-})['2811']; // 选择要使用的环境配置
+})['1']; // 选择要使用的环境配置
 export default localDevConfig;
\ No newline at end of file
diff --git a/common/js/ai-service.js b/common/js/ai-service.js
index 9bda135..14923fe 100644
--- a/common/js/ai-service.js
+++ b/common/js/ai-service.js
@@ -68,7 +68,7 @@ export default {
       }
       return result;
     } catch (error) {
-      console.error('[AI Service] Dify API请求失败，详细错误:', error);
+      console.error('[AI Service] AiChat API请求失败，详细错误:', error);
       console.error('[AI Service] 错误堆栈:', error.stack);
       // 打印更多信息帮助调试
       console.error('[AI Service] store 状态:', {
@@ -88,6 +88,16 @@ export default {
    return new Promise((resolve, reject) => {
     const match = Config.baseUrl.match(/^(?:https?:\/\/|wss?:\/\/)([^\/\s:]+)/);
 	const domain = match ? match[1] : '';
+
+	// 修复 5：Domain 提取失败时提前拒绝
+	if (!domain) {
+	  const errorMsg = 'WebSocket 域名配置无效';
+	  console.error(errorMsg);
+	  reject(new Error(errorMsg));
+	  if (onComplete) onComplete({ error: errorMsg });
+	  return;
+	}
+
 	const wssUrl = `wss://${domain}/ws/aikefu`;
 	const socketTask = wx.connectSocket({
 	   url: wssUrl,
@@ -97,6 +107,29 @@ export default {
      let content = '';
      let conversationId = '';
      let isAuthenticated = false;
+     let closedNormally = false;
+     let settled = false;
+
+     // 安全地拒绝（防止重复调用）
+     function safeReject(error) {
+       if (settled) return;
+       settled = true;
+       clearTimeout(timeout);
+       reject(error);
+     }
+
+     // 安全地完成
+     function safeResolve(result) {
+       if (settled) return;
+       settled = true;
+       clearTimeout(timeout);
+       resolve(result);
+     }
+
+     // 安全地触发 onComplete
+     function safeComplete(result) {
+       if (onComplete) onComplete(result);
+     }
  
      socketTask.onOpen(() => {
        socketTask.send({
@@ -128,8 +161,8 @@ export default {
          } else if (data.type === 'auth_failed') {
            const errorMsg = '认证失败，请重新登录';
            console.error(errorMsg, data);
-           reject(new Error(errorMsg));
-           if (onComplete) onComplete({ error: errorMsg });
+           safeComplete({ error: errorMsg });
+           safeReject(new Error(errorMsg));
            socketTask.close();
          }
  
@@ -146,10 +179,9 @@ export default {
            if (conversationId) {
              this.setConversationId(conversationId);
            }
-           if (onComplete) {
-            onComplete({ content, conversation_id: conversationId });
-           }
-           resolve({ content, conversation_id: conversationId });
+           closedNormally = true;
+           safeComplete({ content, conversation_id: conversationId });
+           safeResolve({ content, conversation_id: conversationId });
            socketTask.close();
          }
  
@@ -165,21 +197,19 @@ export default {
      socketTask.onError((err) => {
        const errorMsg = 'WebSocket 连接失败';
        console.error(errorMsg, err);
-       reject(new Error(errorMsg));
-       if (onComplete) onComplete({ error: errorMsg });
+       safeComplete({ error: errorMsg });
+       safeReject(new Error(errorMsg));
      });
  
      socketTask.onClose(() => {
+       if (!closedNormally && !settled) {
+         const errorMsg = 'WebSocket 连接意外关闭';
+         console.error(errorMsg);
+         safeComplete({ error: errorMsg });
+         safeReject(new Error(errorMsg));
+       }
      });
  
-     const timeout = setTimeout(() => {
-       if (!isAuthenticated || content === '') {
-         console.warn('WebSocket 超时，强制关闭');
-         socketTask.close();
-         reject(new Error('AI服务响应超时'));
-         if (onComplete) onComplete({ error: 'AI服务响应超时' });
-       }
-     }, 10000);
    });
     // #endif
 },
diff --git a/common/js/config.js b/common/js/config.js
index 2c7e3e1..89ec42c 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -21,9 +21,9 @@ try {
 let defaultDomain = '';
 
 // #ifdef H5
-// 域名由 package.json 中对应脚本的 env.UNI_APP_DOMAIN 传入
+// 域名由 vue.config.js 中 DefinePlugin 注入的 process.env.UNI_APP_DOMAIN 传入
 try {
-  if (process?.env?.UNI_APP_DOMAIN) {
+  if (process.env.UNI_APP_DOMAIN) {
     defaultDomain = process.env.UNI_APP_DOMAIN;
   }
 } catch (e) {}
diff --git a/common/js/customer-service.js b/common/js/customer-service.js
index 288770f..5edbbd1 100644
--- a/common/js/customer-service.js
+++ b/common/js/customer-service.js
@@ -119,9 +119,9 @@ export class CustomerService {
     }
 
     /**
-     * 跳转到 AI 客服页面（Dify）
+     * 跳转到 AI智能客服页面（AiChat）
      */
-    openDifyService() {
+    openAiChatService() {
         try {
             // 清除未读数（如果存在）
             if (typeof this.vm.setAiUnreadCount === 'function') {
@@ -135,7 +135,7 @@ export class CustomerService {
             uni.navigateTo({
                 url: aiChatUrl,
                 fail: (err) => {
-                    console.error('跳转 AI 客服失败:', err);
+                    console.error('跳转 AI智能客服失败:', err);
                     // H5 兜底
                     // #ifdef H5
                     window.location.href = aiChatUrl;
@@ -144,7 +144,7 @@ export class CustomerService {
                 }
             });
         } catch (e) {
-            console.error('跳转 AI 客服异常:', e);
+            console.error('跳转 AI智能客服异常:', e);
             uni.showToast({ title: '打开客服失败', icon: 'none' });
         }
     }
@@ -177,7 +177,7 @@ export class CustomerService {
         // 核心路由：根据 type 决定行为
         switch (config.type) {
             case 'aikefu':
-                this.openDifyService();
+                this.openAiChatService();
                 break;
             case 'wxwork':
                 this.openWxworkService(false, config, options);
@@ -364,7 +364,7 @@ export class CustomerService {
 
     openAliappService(config) {
         if (config.type === 'aikefu') {
-            this.openDifyService();
+            this.openAiChatService();
         } else if (config.type === 'third') {
             this.openThirdService(config);
         } else {
@@ -565,7 +565,7 @@ export class CustomerService {
             uni.navigateTo({
                 url: aiChatUrl,
                 fail: (err) => {
-                    console.error('跳转 AI 客服失败:', err);
+                    console.error('跳转 AI智能客服失败:', err);
                     // #ifdef H5
                     window.location.href = aiChatUrl;
                     // #endif
@@ -573,7 +573,7 @@ export class CustomerService {
                 }
             });
         } catch (e) {
-            console.error('跳转 AI 客服异常:', e);
+            console.error('跳转 AI智能客服异常:', e);
             uni.showToast({ title: '打开客服失败', icon: 'none' });
         }
     }
diff --git a/components-diy/diy-fenxiao-goods-list.vue b/components-diy/diy-fenxiao-goods-list.vue
index aab5fd8..08ecc1b 100644
--- a/components-diy/diy-fenxiao-goods-list.vue
+++ b/components-diy/diy-fenxiao-goods-list.vue
@@ -337,7 +337,7 @@ export default {
 		width: calc(50% - 10rpx);
 
 		&:nth-child(2n + 2) {
-			width: calc(50% - 11rpx);
+			width: calc(50% - 10rpx);
 			margin-right: 0;
 		}
 
diff --git a/components-diy/diy-goods-list.vue b/components-diy/diy-goods-list.vue
index 140a28c..61ea2d1 100644
--- a/components-diy/diy-goods-list.vue
+++ b/components-diy/diy-goods-list.vue
@@ -1018,10 +1018,6 @@ export default {
 		width: calc(33.3333333% - 14rpx);
 		box-sizing: border-box;
 
-		&:nth-child(3n + 3) {
-			width: calc(33.33% - 15rpx);
-		}
-
 		&:nth-of-type(1),
 		&:nth-of-type(2),
 		&:nth-of-type(3) {
diff --git a/components-diy/diy-rubik-cube.vue b/components-diy/diy-rubik-cube.vue
index 77646ac..923f8b6 100644
--- a/components-diy/diy-rubik-cube.vue
+++ b/components-diy/diy-rubik-cube.vue
@@ -19,7 +19,7 @@
 					<template v-for="(item, index) in list">
 						<template v-if="index > 0">
 							<view :key="index" :class="['item', value.mode]" @tap.stop="handlerClick(item.link, item.imageUrl)"
-							:style="{ marginBottom: value.imageGap * 2 + 'rpx', width: item.imgWidth, height: item.imgHeight + 'px' }">
+							:style="{ marginBottom: index < list.length - 1 ? value.imageGap * 2 + 'rpx' : 0, width: item.imgWidth, height: item.imgHeight + 'px' }">
 								<image :src="$util.img(item.imageUrl)" :mode="item.imageMode || 'scaleToFill'"
 									:style="item.pageItemStyle" show-menu-by-longpress />
 							</view>
@@ -235,8 +235,6 @@ export default {
 		 */
 		calcRowOneLeftOfTwoRight() {
 			let rightHeight = 0; // 右侧两图平分高度
-			let divide = 'left'; // 划分规则，left：左，right：右
-			if (this.list[1].imgWidth === this.list[2].imgWidth) divide = 'right';
 			uni.getSystemInfo({
 				success: res => {
 					this.list.forEach((item, index) => {
@@ -246,12 +244,14 @@ export default {
 							item.imgWidth = item.imgWidth / 2;
 							item.imgHeight = item.imgWidth * ratio;
 							rightHeight = (item.imgHeight - uni.upx2px(this.value.imageGap * 2)) / 2;
-							item.imgWidth += 'px';
 						} else {
-							item.imgWidth = this.list[0].imgWidth;
 							item.imgHeight = rightHeight;
 						}
 					});
+					// 统一追加 px 单位
+					this.list.forEach((item) => {
+						item.imgWidth += 'px';
+					});
 				}
 			});
 		},
@@ -311,7 +311,6 @@ export default {
 
 					this.list.forEach((item, index) => {
 						item.imgWidth += 'px';
-						item.imgHeight;
 					});
 				}
 			});
@@ -482,7 +481,7 @@ export default {
 // 一左两右
 .rubik-cube .template-left,
 .rubik-cube .template-right {
-	// width: 50%;
+	width: 50%;
 	box-sizing: border-box;
 }
 
diff --git a/components-diy/diy-video-list.vue b/components-diy/diy-video-list.vue
index 7c00905..53a8f06 100644
--- a/components-diy/diy-video-list.vue
+++ b/components-diy/diy-video-list.vue
@@ -230,10 +230,6 @@ export default {
 			width: calc(33.3333333% - 14rpx);
 			box-sizing: border-box;
 
-			&:nth-child(3n + 3) {
-				width: calc(33.33% - 15rpx);
-			}
-
 			&:nth-of-type(1),
 			&:nth-of-type(2),
 			&:nth-of-type(3) {
diff --git a/pages.json b/pages.json
index 0c468d2..a2ea398 100644
--- a/pages.json
+++ b/pages.json
@@ -318,7 +318,7 @@
 				{
 					"path": "ai-chat/index",
 					 "style": {
-					 "navigationBarTitleText": "AI 客服"
+					 "navigationBarTitleText": "AI智能客服"
 					}
 				},
 				{
diff --git a/pages_tool/ai-chat/ai-chat-message.vue b/pages_tool/ai-chat/ai-chat-message.vue
index ac1e8df..55ae522 100644
--- a/pages_tool/ai-chat/ai-chat-message.vue
+++ b/pages_tool/ai-chat/ai-chat-message.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="ai-chat-container">
+  <view class="ai-chat-container" :style="aiChatContainerStyle">
     <!-- 聊天消息列表 - 统一使用 scroll-into-view -->
     <scroll-view 
       class="chat-messages" 
@@ -17,7 +17,7 @@
       
       <!-- 消息列表 -->
       <view 
-        v-for="(message, index) in messages.filter(msg => msg.content && msg.content.trim() !== '')" 
+        v-for="(message, index) in messages.filter(msg => msg.type === 'loading' || (msg.content && msg.content.trim() !== ''))" 
         :key="getMessageKey(message, index)"  
         :id="getMessageKey(message, index)"
         class="message-item"
@@ -159,14 +159,23 @@
               </view>
               
 
-              <!-- 加载中状态 -->
+              <!-- 加载/处理中状态 -->
               <view v-else-if="message.type === 'loading'" class="loading-content">
-                <view class="loading-dots">
-                  <text class="dot"></text>
-                  <text class="dot"></text>
-                  <text class="dot"></text>
+                <view class="loading-typing">
+                  <view class="typing-dots">
+                    <text class="dot"></text>
+                    <text class="dot"></text>
+                    <text class="dot"></text>
+                  </view>
+                  <text class="loading-text">
+                    <text class="loading-status">{{ message.loadingText || 'AI正在思考' }}</text>
+                    <text class="loading-ellipsis">
+                      <text class="ellipsis-dot">.</text>
+                      <text class="ellipsis-dot">.</text>
+                      <text class="ellipsis-dot">.</text>
+                    </text>
+                  </text>
                 </view>
-                <text class="loading-text">AI正在思考中...</text>
               </view>
               
               <!-- 操作按钮 -->
@@ -188,7 +197,7 @@
     </scroll-view>
     
     <!-- 输入区域 -->
-    <view class="input-area" :style="inputAreaStyle" >
+    <view class="input-area" :style="inputAreaStyle">
       <view class="input-tools">
         <button class="tool-btn" @click="showMoreTools" style="display: none;">
           <text class="iconfont icon-plus">...</text>
@@ -206,7 +215,7 @@
           :maxlength="500"
           :auto-height="true"
           :show-confirm-bar="false"
-          :adjust-position="true"
+          :adjust-position="false"
           :cursor-spacing="150"
           @confirm="sendMessage"
           @input="onInput"
@@ -320,6 +329,9 @@
       </view>
     </view>
     
+    <!-- 键盘垫高层：键盘弹出时平滑撑开空间将输入框上推 -->
+    <view class="keyboard-spacer" :style="{ height: keyboardHeight + 'px' }"></view>
+    
     <!-- 语音输入面板 -->
     <view v-if="enalbeVoicePanelShow" class="voice-popup">
       <view class="voice-mask" @click="hideVoicePanel"></view>
@@ -349,7 +361,7 @@
     </view>
     
     <!-- 头像选择弹窗 -->
-    <view v-if="showAvatarSelector" class="avatar-selector-popup" style="pointer-events: auto;">
+    <view v-if="showAvatarSelector" class="avatar-selector-popup">
       <view class="avatar-selector-mask" @click="closeAvatarSelector"></view>
       <view class="avatar-selector-panel">
         <view class="avatar-selector-header">
@@ -490,7 +502,7 @@ export default {
     // AI头像错误状态
     avatarError: false,
 
-    // Dify API相关
+    // AiChat API相关
     currentConversationId: null,
     isAIServiceAvailable: true,
     aiServiceError: null,
@@ -514,18 +526,18 @@ export default {
       return this.$util.img(IMAGE_CONFIG.aiAvatar);
     },
     chatMessagesStyle() {
-      // 键盘高度是像素值，我们需要为聊天区域添加足够的底部padding
-      // 确保最后一条消息在键盘上方可见
-      const extraPadding = 200; // 额外的padding(px)
-      const totalPadding = this.keyboardHeight > 0 ? this.keyboardHeight + extraPadding : 150; // 默认150px
+      // 键盘弹出时增加底部padding，避免消息内容被键盘遮挡
       return {
-        paddingBottom: totalPadding + 'px'
+        'padding-bottom': this.keyboardHeight > 0 ? this.keyboardHeight + 'px' : '0px'
       };
     },
+    aiChatContainerStyle() {
+      // 键盘高度由末尾垫高 view 处理，容器无需额外样式
+      return {};
+    },
     inputAreaStyle() {
-      return {
-        bottom: this.keyboardHeight > 0 ? this.keyboardHeight + 'px' : '0px'
-      };
+      // 输入框在 flex 流中自然定位，无需额外样式
+      return {};
     },
     canSendMessage() {
       const hasContent = this.inputText && this.inputText.trim() !== ''
@@ -534,31 +546,39 @@ export default {
     }
   },
    onShow() {
-  	  // 如果不是 AI 客服，立即退出并跳转
-  	    if (customerServiceType !== 'ai') {
-  	      uni.showToast({ title: '当前客服类型不支持此页面', icon: 'none' });
-  	      setTimeout(() => {
-  	        uni.navigateBack({ delta: 1 }); // 或 redirectTo 首页
-  	      }, 1000);
-  	      return; // 关键：阻止后续初始化
-  	    }
-             // 优先读取本地缓存的会话 ID
-             const localConvId = this.getConversationIdFromLocal();
-             if (localConvId) {
-               this.currentConversationId = localConvId;
-               aiService.setConversationId(localConvId);
-             } else {
-               this.currentConversationId = aiService.getConversationId();
-             }
-             // 加载初始历史后，同步historyOffset
-                 this.loadChatHistoryIfExist().then(() => {
-                   // 初始历史条数作为偏移量
-                   this.historyOffset = this.messages.length;
-                 });
-               },
-               // 新增：组件销毁时清除防抖定时器
+     // 如果不是 AI智能客服，立即退出并跳转
+     if (customerServiceType !== 'ai') {
+       uni.showToast({ title: '当前客服类型不支持此页面', icon: 'none' });
+       setTimeout(() => {
+         uni.navigateBack({ delta: 1 });
+       }, 1000);
+       return;
+     }
+     // 只在初次渲染或会话ID发生变化时才加载历史
+     const localConvId = this.getConversationIdFromLocal();
+     const shouldReload = this.currentConversationId !== localConvId;
+
+     if (localConvId && shouldReload) {
+       // 切换到已有的历史会话 → 重新加载历史
+       this.currentConversationId = localConvId;
+       aiService.setConversationId(localConvId);
+       this.loadChatHistoryIfExist();
+       // 注意: historyOffset 和 hasMoreHistory 在 loadChatHistoryIfExist() 内部设置
+     } else if (!localConvId && !this.currentConversationId) {
+       // 全新会话，初始化偏移量
+       this.historyOffset = this.messages.length;
+     }
+     // 会话未变化且已有消息 → 跳过加载，保留当前消息
+   },
+               // 新增：组件销毁时清除所有定时器
                beforeDestroy() {
                  if (this.scrollTimer) clearTimeout(this.scrollTimer);
+                 // 清理所有加载状态定时器
+                 this.messages.forEach(msg => {
+                   if (msg._rotationTimer) {
+                     clearInterval(msg._rotationTimer);
+                   }
+                 });
                },
     created() {
       this.messages = [...this.initialMessages]
@@ -605,7 +625,8 @@ export default {
         });
       }
     },
-	  // 【新增：会话 ID 本地缓存方法】
+
+    // 【新增：会话 ID 本地缓存方法】
 	   saveConversationIdToLocal(convId) {
 	      if (convId) {
 	        uni.setStorageSync('dify_conversation_id', convId);
@@ -631,8 +652,8 @@ export default {
           // 防抖处理：50ms内只执行一次，避免频繁触发
           if (this.scrollTimer) clearTimeout(this.scrollTimer);
           this.scrollTimer = setTimeout(() => {
-            // 滚动到顶部附近（<20px）、不在加载中、显示加载更多时，触发加载
-            if (currentScrollTop < 20 && !this.isLoadingHistory && this.showLoadMore) {
+            // 滚动到顶部附近（<20px）、不在加载中、还有更多历史时，触发加载
+            if (currentScrollTop < 20 && !this.isLoadingHistory && this.hasMoreHistory) {
               this.loadMoreHistory();
             }
           }, 50);
@@ -682,7 +703,7 @@ async loadChatHistoryIfExist() {
         const realTimestamp = msg.created_at || msg.create_time || msg.time;
         return {
           id: msg.message_id || (Date.now() + Math.random() * 10000),
-          role: msg.role === 'user' ? 'user' : 'assistant',
+          role: msg.role === 'user' ? 'user' : 'ai',
           content: content,
           timestamp: realTimestamp,
           actions: msg.role !== 'user' ? [
@@ -691,6 +712,10 @@ async loadChatHistoryIfExist() {
           ] : []
         };
       }).filter(msg => msg.content.trim() !== ''); // 过滤掉内容为空的消息
+      // 根据服务端 total 判断是否还有更多历史可加载
+      const msgCount = this.messages.length;
+      this.hasMoreHistory = response.total > msgCount;
+      this.historyOffset = msgCount;
     } catch (error) {
       console.error('加载历史记录失败:', error);
       // 只需调用服务层的清除方法，它会处理本地存储
@@ -894,27 +919,28 @@ async loadChatHistoryIfExist() {
       this.messages.push(userMessage)
       this.inputText = ''
       
-      // 显示AI正在输入
+        // 显示AI正在处理 - 带状态轮换提示
       const loadingMessage = {
         id: ++this.messageId,
         role: 'ai',
         type: 'loading',
         content: '',
-        timestamp: Date.now()
+        timestamp: Date.now(),
+        loadingText: 'AI正在思考',
+        _loadingIndex: 0
       }
       this.shouldScrollToBottom = true
       this.messages.push(loadingMessage)
       
+      // 启动处理状态文字轮换
+      this._startLoadingTextRotation(loadingMessage)
+      
+      // 等待 Vue 先渲染 loading 动画，再发起请求
+      await this.$nextTick()
+      
       try {
-        // 检查AI服务状态
-        const status = await aiService.getServiceStatus()
-        this.isAIServiceAvailable = status.available
-        
-        if (!this.isAIServiceAvailable) {
-          throw new Error('AI服务暂不可用')
-        }
-        
-        // 使用AI服务获取回复
+        // 直接发送消息（跳过健康检查，避免健康检查接口格式不匹配导致误判）
+        // 如果服务不可用，实际发送时会抛出异常，由 catch 块处理
         const enhancedMessage = this.enhanceEmojiMessage(userMessage.content)
         if (this.enableStreaming) {
           await this.sendStreamMessage(enhancedMessage)
@@ -926,7 +952,7 @@ async loadChatHistoryIfExist() {
         console.error('AI服务调用失败:', error)
         
         // 移除加载状态
-        this.messages = this.messages.filter(msg => msg.type !== 'loading')
+        this._removeLoadingMessages()
         
         // 显示错误消息
         const errorMessage = {
@@ -956,7 +982,7 @@ async loadChatHistoryIfExist() {
       })
       
       // 移除加载状态
-      this.messages = this.messages.filter(msg => msg.type !== 'loading')
+      this._removeLoadingMessages()
       
       // 更新会话ID
       if (response.conversationId) {
@@ -983,130 +1009,193 @@ async loadChatHistoryIfExist() {
       this.$emit('ai-response', aiMessage)
     },
  // 发送流式消息（自动适配 H5 / 微信小程序）
- async sendStreamMessage(userMessage) {
-   // 创建流式消息对象
-   const streamMessage = {
-     id: ++this.messageId,
-     role: 'ai',
-     type: 'text',
-     content: '',
-     timestamp: Date.now(),
-     isStreaming: true
-   };
-   // 标记正在流式响应
-   this.isStreaming = true;
-   // 移除加载状态，添加流式消息
-   this.messages = this.messages.filter(msg => msg.type !== 'loading');
-   this.shouldScrollToBottom = true;
-   this.messages.push(streamMessage);
-   
-   // 添加消息后立即滚动一次
-   this.$nextTick(() => {
-     this.scrollToBottom();
-   });
- 
-   try {
-     // #ifdef H5
-     await aiService.sendHttpStream(
-       userMessage,
-       (chunk) => {
-        // 实时更新内容（不频繁滚动）
-        streamMessage.content += chunk;
+async sendStreamMessage(userMessage) {
+  // 找到已有的 loading 消息，复用它在 DOM 中的位置，实现无缝过渡
+  const loadingIdx = this.messages.findIndex(msg => msg.type === 'loading')
+  if (loadingIdx === -1) {
+    // 安全回退：没有 loading 消息时创建新消息
+    const fallback = {
+      id: ++this.messageId,
+      role: 'ai',
+      type: 'text',
+      content: '',
+      timestamp: Date.now(),
+      isStreaming: true
+    }
+    this.isStreaming = true
+    this.messages.push(fallback)
+    this.scrollToBottom()
+
+    try {
+      // #ifdef H5
+      await aiService.sendHttpStream(userMessage,
+        (chunk) => { fallback.content += chunk; this.scrollToBottom() },
+        (result) => this._finishStream(fallback, result))
+      // #endif
+      // #ifdef MP-WEIXIN
+      await aiService.sendStreamMessage(userMessage,
+        (chunk) => { fallback.content += chunk; this.scrollToBottom() },
+        (result) => this._finishStream(fallback, result))
+      // #endif
+    } catch (error) {
+      this._handleStreamError(fallback)
+    }
+    return
+  }
+
+  this.isStreaming = true
+  const loadingMsg = this.messages[loadingIdx]
+  this._stopLoadingTextRotation(loadingMsg)
+  loadingMsg.loadingText = '正在接收回复'
+
+  let transformed = false
+
+  const transformOnFirstChunk = () => {
+    if (transformed) return this.messages[loadingIdx]
+    transformed = true
+    const msg = this.messages[loadingIdx]
+    msg.type = 'text'
+    msg.content = ''
+    this.$set(msg, 'isStreaming', true)
+    this.$set(msg, 'actions', [])
+    delete msg.loadingText
+    delete msg._loadingIndex
+    return msg
+  }
+
+  try {
+    // #ifdef H5
+    await aiService.sendHttpStream(
+      userMessage,
+      (chunk) => {
+        const msg = transformOnFirstChunk()
+        msg.content += chunk
+        this.scrollToBottom()
       },
-       (completeResult) => {
-         // 流结束回调
-         let convId = '';
-
-         if (typeof completeResult !== 'string') {
-           convId = completeResult.conversation_id || '';
-         }
-
-         // 标记流式结束
-         streamMessage.isStreaming = false;
-         this.isStreaming = false;
-
-         // 检查内容是否为空，如果为空则移除该消息
-         if (!streamMessage.content || streamMessage.content.trim() === '') {
-           this.messages = this.messages.filter(msg => msg.id !== streamMessage.id);
-           return;
-         }
-
-         // 保存会话 ID
-         if (convId) {
-           this.currentConversationId = convId;
-           aiService.setConversationId(convId);
-           this.saveConversationIdToLocal(convId);
-         }
-         
-         // 流结束后再滚动到底部
-         this.$nextTick(() => {
-           this.scrollToBottom();
-         });
-
-         // 触发事件
-         this.$emit('ai-response', streamMessage);
-       }
-     );
-     // #endif
-
-     // #ifdef MP-WEIXIN
-     // ===== 微信小程序: 使用 WebSocket =====
-     await aiService.sendStreamMessage(
-       userMessage,
-       (chunk) => {
-        // 实时更新内容（不频繁滚动）
-        streamMessage.content += chunk;
-      },
-       (completeResult) => {
-        // 流结束回调
-        let convId = completeResult?.conversation_id || '';
-
-        // 标记流式结束
-        streamMessage.isStreaming = false;
-        this.isStreaming = false;
-
-        // 检查内容是否为空，如果为空则移除该消息
-        if (!streamMessage.content || streamMessage.content.trim() === '') {
-          this.messages = this.messages.filter(msg => msg.id !== streamMessage.id);
-          return;
-        }
-
-        // 保存会话 ID
-        if (convId) {
-          this.currentConversationId = convId;
-          aiService.setConversationId(convId);
-          this.saveConversationIdToLocal(convId);
-        }
-        
-        // 流结束后再滚动到底部
-        this.$nextTick(() => {
-          this.scrollToBottom();
-        });
-
-        // 触发事件
-        this.$emit('ai-response', streamMessage);
+      (completeResult) => {
+        const msg = this.messages[loadingIdx]
+        if (!this._finishStream(msg, completeResult)) return
       }
-     );
-     // #endif
-   } catch (error) {
-     console.error('流式请求失败:', error);
-     // 标记流式结束
-     this.isStreaming = false;
-     // 移除流式消息
-     this.messages = this.messages.filter(msg => msg.id !== streamMessage.id);
-     // 显示错误
-     const errorMsg = {
-       id: ++this.messageId,
-       role: 'ai',
-       type: 'text',
-       content: '抱歉，服务暂时不可用，请稍后重试。',
-       timestamp: Date.now(),
-       actions: [{ id: 1, text: '重试', type: 'retry' }]
-     };
-     this.messages.push(errorMsg);
-     this.$emit('ai-response', errorMsg);
-   }
- },
+    )
+    // #endif
+
+    // #ifdef MP-WEIXIN
+    await aiService.sendStreamMessage(
+      userMessage,
+      (chunk) => {
+        const msg = transformOnFirstChunk()
+        msg.content += chunk
+        this.scrollToBottom()
+      },
+      (completeResult) => {
+        const msg = this.messages[loadingIdx]
+        if (!this._finishStream(msg, completeResult)) return
+      }
+    )
+    // #endif
+  } catch (error) {
+    console.error('流式请求失败:', error)
+    this.isStreaming = false
+
+    if (!transformed) {
+      // 在第一个 chunk 到达前出错 → 移除 loading 消息
+      this._removeLoadingMessages()
+    } else {
+      // 流传输中出错 → 移除空的流式消息
+      const msg = this.messages[loadingIdx]
+      if (msg && (!msg.content || msg.content.trim() === '')) {
+        this.messages.splice(loadingIdx, 1)
+      }
+    }
+
+    const errorMsg = {
+      id: ++this.messageId,
+      role: 'ai',
+      type: 'text',
+      content: '抱歉，服务暂时不可用，请稍后重试。',
+      timestamp: Date.now(),
+      actions: [{ id: 1, text: '重试', type: 'retry' }]
+    }
+    this.messages.push(errorMsg)
+    this.$emit('ai-response', errorMsg)
+  }
+},
+
+// 完成流式消息处理（共用逻辑）
+_finishStream(msg, result) {
+  msg.isStreaming = false
+  this.isStreaming = false
+
+  if (!msg.content || msg.content.trim() === '') {
+    this._removeLoadingMessages()
+    return false
+  }
+
+  if (result) {
+    const convId = typeof result === 'string' ? '' : (result.conversation_id || '')
+    if (convId) {
+      this.currentConversationId = convId
+      aiService.setConversationId(convId)
+      this.saveConversationIdToLocal(convId)
+    }
+  }
+
+  msg.actions = [
+    { id: 1, text: '有帮助', type: 'like' },
+    { id: 2, text: '没帮助', type: 'dislike' }
+  ]
+
+  this.$nextTick(() => this.scrollToBottom())
+  this.$emit('ai-response', msg)
+  return true
+},
+
+// 流式请求出错处理
+_handleStreamError(msg) {
+  console.error('流式请求失败')
+  this.isStreaming = false
+  this.messages = this.messages.filter(m => m.id !== msg.id)
+
+  const errorMsg = {
+    id: ++this.messageId,
+    role: 'ai',
+    type: 'text',
+    content: '抱歉，服务暂时不可用，请稍后重试。',
+    timestamp: Date.now(),
+    actions: [{ id: 1, text: '重试', type: 'retry' }]
+  }
+  this.messages.push(errorMsg)
+  this.$emit('ai-response', errorMsg)
+},
+    // 加载状态文字轮换 - 让AI看起来在处理不同阶段
+    _startLoadingTextRotation(loadingMsg) {
+      const statusTexts = [
+        'AI正在思考',
+        'AI正在分析',
+        'AI正在检索',
+        'AI正在生成'
+      ]
+      loadingMsg._rotationTimer = setInterval(() => {
+        loadingMsg._loadingIndex = (loadingMsg._loadingIndex + 1) % statusTexts.length
+        loadingMsg.loadingText = statusTexts[loadingMsg._loadingIndex]
+      }, 2000)
+    },
+
+    // 停止加载状态文字轮换
+    _stopLoadingTextRotation(loadingMsg) {
+      if (loadingMsg && loadingMsg._rotationTimer) {
+        clearInterval(loadingMsg._rotationTimer)
+        loadingMsg._rotationTimer = null
+      }
+    },
+
+    // 移除加载消息并清理定时器
+    _removeLoadingMessages() {
+      const loadingMsgs = this.messages.filter(msg => msg.type === 'loading');
+      loadingMsgs.forEach(msg => this._stopLoadingTextRotation(msg));
+      this.messages = this.messages.filter(msg => msg.type !== 'loading');
+    },
+
     generateAIResponse(userMessage) {
       const responses = {
         '你好': '您好！我是AI智能客服，很高兴为您服务！有什么可以帮助您的吗？',
@@ -1122,20 +1211,190 @@ async loadChatHistoryIfExist() {
       }
       return `感谢您的咨询！关于"${userMessage}"的问题，我们的专业客服会尽快为您解答。您也可以查看我们的帮助文档获取更多信息。`;
     },
-  
-    
-    // 解析Markdown
+
+
+    // 增强版Markdown解析（无第三方依赖）
     parseMarkdown(content) {
       if (!content) return ''
-      
-      // 简单的Markdown解析
+
+      // 辅助：内联格式处理
+      const parseInline = (text) => {
+        return text
+          // 行内图片
+          .replace(/!\[([^\]]*)\]\(([^)]+)\)/g, '<img src="$2" alt="$1" style="max-width:100%;border-radius:8rpx;margin:8rpx 0;display:block;" />')
+          // 链接
+          .replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2" style="color:#4a90d9;text-decoration:none;">$1</a>')
+          // 行内代码
+          .replace(/`([^`]+)`/g, '<code style="background:#f0f4f8;padding:2rpx 10rpx;border-radius:6rpx;font-size:24rpx;font-family:monospace;color:#d63384;">$1</code>')
+          // 粗体（优先匹配**）
+          .replace(/\*\*(.+?)\*\*/g, '<strong style="font-weight:700;">$1</strong>')
+          // 斜体
+          .replace(/\*(.+?)\*/g, '<em style="font-style:italic;">$1</em>')
+          // 删除线
+          .replace(/~~(.+?)~~/g, '<del style="text-decoration:line-through;color:#999;">$1</del>')
+          // 手机号
+          .replace(/\b(1[3-9]\d{9})\b/g, '<a href="tel:$1" style="color:#4a90d9;text-decoration:none;">$1</a>')
+          // 400电话
+          .replace(/\b(400[\d-]{7,10})\b/g, '<a href="tel:$1" style="color:#4a90d9;text-decoration:none;">$1</a>')
+      }
+
+      // 1. 转义HTML特殊字符
       let html = content
-        .replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>') // 粗体
-        .replace(/\*(.*?)\*/g, '<em>$1</em>') // 斜体
-        .replace(/`(.*?)`/g, '<code>$1</code>') // 代码
-        .replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2">$1</a>') // 链接
-        .replace(/\n/g, '<br>') // 换行
-      
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+
+      // 2. 提取代码块（保护其内容不被后续处理污染）
+      const codeBlocks = []
+      html = html.replace(/```(\w*)\n?([\s\S]*?)```/g, (m, lang, code) => {
+        const idx = codeBlocks.length
+        const safe = code.replace(/</g, '&lt;').replace(/>/g, '&gt;')
+        codeBlocks.push(
+          `<pre style="background:#f5f5f5;padding:24rpx;border-radius:8rpx;overflow-x:auto;font-size:24rpx;line-height:1.6;margin:16rpx 0;white-space:pre-wrap;">` +
+          `<code style="background:transparent;padding:0;font-family:monospace;color:#333;font-size:24rpx;">${safe}</code></pre>`
+        )
+        return `%%CODEBLOCK_${idx}%%`
+      })
+
+      // 3. 按行处理，用 <br> 连接单换行，双换行分割段落块
+      const lines = html.split('\n')
+      const out = []
+      let inList = false
+      let buf = []        // 普通文本行缓冲区
+      let inTable = false
+      let tableRows = []  // 表格行缓冲区
+
+      const closeList = () => {
+        if (inList === 'ul') { inList = false; return '</ul>' }
+        if (inList === 'ol') { inList = false; return '</ol>' }
+        return ''
+      }
+      const flushBuf = () => {
+        if (buf.length === 0) return
+        // 去掉首尾的空串，避免产生尾随 <br>
+        while (buf.length > 0 && buf[0] === '') buf.shift()
+        while (buf.length > 0 && buf[buf.length - 1] === '') buf.pop()
+        if (buf.length === 0) return
+        const content = buf.map(l => parseInline(l)).join('<br>')
+        out.push(`<div style="line-height:1.8;font-size:26rpx;">${content}</div>`)
+        buf = []
+      }
+      const flushTable = () => {
+        if (!inTable || tableRows.length === 0) return
+        const thead = tableRows[0].map(c =>
+          `<th style="padding:8rpx 12rpx;border:1rpx solid #ddd;font-weight:600;background:#f5f5f5;text-align:left;font-size:24rpx;">${parseInline(c)}</th>`
+        ).join('')
+        const tbody = tableRows.slice(1).map(row =>
+          '<tr>' + row.map(c =>
+            `<td style="padding:8rpx 12rpx;border:1rpx solid #ddd;line-height:1.6;font-size:24rpx;">${parseInline(c)}</td>`
+          ).join('') + '</tr>'
+        ).join('')
+        out.push(
+          `<table style="border-collapse:collapse;margin:8rpx 0;width:100%;font-size:24rpx;">` +
+          `<thead><tr>${thead}</tr></thead><tbody>${tbody}</tbody></table>`
+        )
+        tableRows = []
+        inTable = false
+      }
+
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i]
+        const trimmed = line.trim()
+
+        // 代码块占位符
+        if (/^%%CODEBLOCK_\d+%%$/.test(trimmed)) {
+          flushBuf(); flushTable(); out.push(closeList())
+          out.push(line)
+          continue
+        }
+
+        // 表格行（以 | 开头）
+        if (trimmed.charAt(0) === '|') {
+          flushBuf(); out.push(closeList())
+          // 去除首尾空 cell
+          const rawCells = trimmed.split('|').filter((c, j, a) => j > 0 && j < a.length - 1)
+          if (rawCells.length === 0) continue
+          // 跳过分隔行 | --- | :--- | :---: | ---: |
+          const isSep = rawCells.every(c => /^[\s:\-|]+$/.test(c.trim()))
+          if (isSep) continue
+          if (!inTable) { inTable = true; tableRows = [] }
+          tableRows.push(rawCells.map(c => c.trim()))
+          continue
+        }
+        // 非表格行 → 刷新已积累的表格
+        if (inTable) flushTable()
+
+        // 标题
+        const hMatch = line.match(/^(#{1,6})\s+(.+)$/)
+        if (hMatch) {
+          flushBuf(); out.push(closeList())
+          const lv = hMatch[1].length
+          const size = ['', '40rpx', '36rpx', '32rpx', '28rpx', '26rpx', '24rpx'][lv]
+          const wgt = ['', '700', '700', '600', '600', '500', '500'][lv]
+          const mg = ['', '20rpx 0 10rpx', '16rpx 0 8rpx', '14rpx 0 6rpx', '12rpx 0 6rpx', '10rpx 0 4rpx', '8rpx 0 4rpx'][lv]
+          out.push(`<h${lv} style="font-size:${size};font-weight:${wgt};margin:${mg};line-height:1.5;">${parseInline(hMatch[2])}</h${lv}>`)
+          continue
+        }
+
+        // 分隔线
+        if (/^(-{3,}|\*{3,}|_{3,})\s*$/.test(trimmed)) {
+          flushBuf(); out.push(closeList())
+          out.push('<hr style="border:none;border-top:2rpx solid #e8e8e8;margin:20rpx 0;">')
+          continue
+        }
+
+        // 引用
+        const bqMatch = line.match(/^>\s?(.+)$/)
+        if (bqMatch) {
+          flushBuf(); out.push(closeList())
+          out.push(`<blockquote style="border-left:4rpx solid #4a90d9;padding:10rpx 20rpx;margin:8rpx 0;background:#f8f9fa;color:#666;line-height:1.8;border-radius:0 6rpx 6rpx 0;">${parseInline(bqMatch[1])}</blockquote>`)
+          continue
+        }
+
+        // 无序列表
+        const ulMatch = line.match(/^[-*+]\s+(.+)$/)
+        if (ulMatch) {
+          flushBuf()
+          if (!inList) { out.push('<ul style="padding-left:36rpx;margin:6rpx 0;">'); inList = 'ul' }
+          out.push(`<li style="margin:3rpx 0;line-height:1.8;">${parseInline(ulMatch[1])}</li>`)
+          continue
+        }
+
+        // 有序列表
+        const olMatch = line.match(/^\d+\.\s+(.+)$/)
+        if (olMatch) {
+          flushBuf()
+          if (!inList) { out.push('<ol style="padding-left:36rpx;margin:6rpx 0;">'); inList = 'ol' }
+          out.push(`<li style="margin:3rpx 0;line-height:1.8;">${parseInline(olMatch[1])}</li>`)
+          continue
+        }
+
+        // 空行 → 加入缓冲区作段落分隔（<br><br>），同时关闭列表
+        if (trimmed === '') {
+          // 关闭列表（标准Markdown行为）
+          if (inList) {
+            flushBuf()
+            out.push(closeList())
+          }
+          // 避免连续空行推入多个空串
+          if (buf.length > 0 && buf[buf.length - 1] !== '') {
+            buf.push('')
+          }
+          continue
+        }
+
+        // 普通文本行 => 加入缓冲区
+        buf.push(line)
+      }
+
+      // 扫尾
+      flushBuf(); flushTable(); out.push(closeList())
+
+      html = out.join('')
+
+      // 4. 还原代码块
+      html = html.replace(/%%CODEBLOCK_(\d+)%%/g, (m, idx) => codeBlocks[parseInt(idx)])
+
       return html
     },
     
@@ -1206,100 +1465,87 @@ async loadChatHistoryIfExist() {
     
     // 滚动到底部 - 统一使用 scroll-into-view
     scrollToBottom() {
-      if (this.scrollTimer) {
-        clearTimeout(this.scrollTimer);
-      }
-      this.scrollTimer = setTimeout(() => {
-        if (this.messages.length > 0) {
-          const filteredMessages = this.messages.filter(msg => msg.content && msg.content.trim() !== '');
-          if (filteredMessages.length > 0) {
-            const lastMessage = filteredMessages[filteredMessages.length - 1];
-            const lastIndex = this.messages.indexOf(lastMessage);
-            // 先设为空，再设置新值，确保能触发滚动
-            this.scrollIntoViewId = null;
-            this.$nextTick(() => {
-              this.scrollIntoViewId = `msg-${lastMessage.id || lastMessage.timestamp}-${lastIndex}`;
-            });
-          }
-        }
-      }, 100);
+      if (this.messages.length === 0) return
+      // 取真实最后一条消息（包括空内容的流式消息）
+      const lastMsg = this.messages[this.messages.length - 1]
+      const lastIndex = this.messages.length - 1
+      const key = lastMsg.id || lastMsg.timestamp || lastIndex
+      // 先清空再设置，确保 scroll-into-view 重新触发
+      this.scrollIntoViewId = ''
+      this.$nextTick(() => {
+        this.scrollIntoViewId = 'msg-' + key + '-' + lastIndex
+      })
     },
     
     // 加载更多历史消息
- async loadMoreHistory() {
-       if (!this.currentConversationId) {
-         this.currentConversationId = this.getConversationIdFromLocal();
-         aiService.setConversationId(this.currentConversationId);
-       }
-       // 防止重复加载
-       if (!this.showLoadMore || !this.currentConversationId || this.isLoadingHistory) {
-         return;
-       }
-       this.isFetchingHistory = true;
-       this.isLoadingHistory = true;
-       this.loadingText = '加载历史消息中...';
-       this.hasMoreHistory = true;
- 
-       try {
-         // 关键修改：用独立的historyOffset作为偏移量，不再依赖messages.length
-         const response = await aiService.getConversationHistory({
-           conversation_id: this.currentConversationId,
-           limit: 20,
-           offset: this.historyOffset // 改用独立偏移量
-         });
- 
+    async loadMoreHistory() {
+      if (!this.currentConversationId) {
+        this.currentConversationId = this.getConversationIdFromLocal();
+        aiService.setConversationId(this.currentConversationId);
+      }
+      // 防止重复加载
+      if (!this.hasMoreHistory || !this.currentConversationId || this.isLoadingHistory) {
+        return;
+      }
+      this.isFetchingHistory = true;
+      this.isLoadingHistory = true;
+      this.loadingText = '加载历史消息中...';
+
+      try {
+        const response = await aiService.getConversationHistory({
+          conversation_id: this.currentConversationId,
+          limit: 20,
+          offset: this.historyOffset
+        });
+
         if (response.success && Array.isArray(response.messages) && response.messages.length > 0) {
           const historyMessages = response.messages.map(msg => {
-            // 只使用后端返回的真实时间，不使用假时间
-             const realTimestamp = msg.create_time || msg.created_at || msg.time;
-             return {
-               id: msg.id || `history-${Date.now()}-${Math.random().toString(36).slice(2)}`,
-               role: msg.role === 'user' ? 'user' : 'ai',
-               type: 'text',
-               content: msg.content,
-               timestamp: realTimestamp
-             };
-           });
- 
-           // 1. 记录新增消息数量
-           const newMsgCount = historyMessages.length;
-           // 2. 添加到消息列表开头
-           this.messages = [...historyMessages, ...this.messages];
-           // 3. 更新历史偏移量（累加，不是覆盖）
-           this.historyOffset += newMsgCount;
- 
-           // 4. 等待DOM渲染后，精准计算滚动位置
-           await this.$nextTick();
-           // 获取新增消息的实际DOM高度
-           const query = uni.createSelectorQuery().in(this);
-           const heightPromises = [];
-           for (let i = 0; i < newMsgCount; i++) {
-             heightPromises.push(new Promise(resolve => {
-               query.select(`.message-item:nth-child(${i + 1})`).boundingClientRect(rect => {
-                 resolve(rect ? rect.height + 32 : 0); // 加上消息间距（32rpx）
-               }).exec();
-             }));
-           }
-           // 计算总高度
-           const heights = await Promise.all(heightPromises);
-           const totalNewHeight = heights.reduce((sum, h) => sum + h, 0);
-           // 5. 设置scrollTop，保持滚动条在顶部附近
-           this.scrollTop = totalNewHeight;
-         } else {
-           // 无更多历史
-           this.showLoadMore = false;
-         }
-       } catch (error) {
-         console.error('加载历史失败:', error);
-         uni.showToast({ title: '加载历史失败', icon: 'none' });
-         this.showLoadMore = false;
-       } finally {
-         this.isLoadingHistory = false;
-		  this.isFetchingHistory = false;
-         this.hasMoreHistory = false;
-         this.loadingText = '加载更多历史消息';
-       }
-     },
+            const realTimestamp = msg.create_time || msg.created_at || msg.time;
+            return {
+              id: msg.id || `history-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+              role: msg.role === 'user' ? 'user' : 'ai',
+              type: 'text',
+              content: msg.content,
+              timestamp: realTimestamp
+            };
+          });
+
+          const newMsgCount = historyMessages.length;
+          this.messages = [...historyMessages, ...this.messages];
+          this.historyOffset += newMsgCount;
+
+          // 根据服务端 total 判断是否还有更多
+          if (response.total !== undefined) {
+            this.hasMoreHistory = this.historyOffset < response.total;
+          }
+
+          await this.$nextTick();
+          const query = uni.createSelectorQuery().in(this);
+          const heightPromises = [];
+          for (let i = 0; i < newMsgCount; i++) {
+            heightPromises.push(new Promise(resolve => {
+              query.select(`.message-item:nth-child(${i + 1})`).boundingClientRect(rect => {
+                resolve(rect ? rect.height + 32 : 0);
+              }).exec();
+            }));
+          }
+          const heights = await Promise.all(heightPromises);
+          const totalNewHeight = heights.reduce((sum, h) => sum + h, 0);
+          this.scrollTop = totalNewHeight;
+        } else {
+          // 无更多历史
+          this.hasMoreHistory = false;
+        }
+      } catch (error) {
+        console.error('加载历史失败:', error);
+        uni.showToast({ title: '加载历史失败', icon: 'none' });
+        this.hasMoreHistory = false;
+      } finally {
+        this.isLoadingHistory = false;
+        this.isFetchingHistory = false;
+        this.loadingText = '加载更多历史消息';
+      }
+    },
     // 显示更多工具
     showMoreTools() {
       this.showToolsPanel = true
@@ -1546,11 +1792,17 @@ async loadChatHistoryIfExist() {
         role: 'ai',
         type: 'loading',
         content: '',
-        timestamp: Date.now()
+        timestamp: Date.now(),
+        loadingText: 'AI正在思考',
+        _loadingIndex: 0
       }
       
       this.messages.push(loadingMessage)
-      
+      this._startLoadingTextRotation(loadingMessage)
+
+      // 等待 Vue 渲染 loading 动画
+      await this.$nextTick()
+
       try {
         // 使用AI服务获取回复
         if (this.enableStreaming) {
@@ -1565,7 +1817,7 @@ async loadChatHistoryIfExist() {
         console.error('AI服务调用失败:', error)
         
         // 移除加载状态
-        this.messages = this.messages.filter(msg => msg.type !== 'loading')
+        this._removeLoadingMessages()
         
         // 显示错误消息
         const errorMessage = {
@@ -1733,6 +1985,13 @@ async loadChatHistoryIfExist() {
     
     // 清空聊天记录
     clearMessages() {
+      // 清理所有加载状态定时器
+      this.messages.forEach(msg => {
+        if (msg._rotationTimer) {
+          clearInterval(msg._rotationTimer)
+          msg._rotationTimer = null
+        }
+      })
       // 清空消息数组
       this.messages = []
       // 重置消息 ID
@@ -1741,8 +2000,9 @@ async loadChatHistoryIfExist() {
       this.currentConversationId = null
       aiService.clearConversationId()
       this.clearConversationIdFromLocal()
-      // 重置历史偏移量
+      // 重置历史偏移量和加载状态
       this.historyOffset = 0
+      this.hasMoreHistory = false
       // 触发清空事件
       this.$emit('messages-cleared')
     },
@@ -1956,14 +2216,17 @@ $radius-lg: 36rpx;
 
 /* 页面样式 */
 .ai-chat-container {
-  height: 100vh;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   display: flex;
   flex-direction: column;
+  box-sizing: border-box;
   background: #f8f8f8; /* 微信聊天页面背景色 */
   overflow: hidden;
-  padding-bottom: env(safe-area-inset-bottom);
   box-sizing: border-box;
-  position: relative;
 
   .chat-messages {
     flex: 1;
@@ -1973,9 +2236,7 @@ $radius-lg: 36rpx;
     min-height: 0; /* 重要：防止flex元素溢出 */
     
     /* 微信小程序专属：聊天消息区域增加底部内边距，确保键盘弹出时最后一条消息可见 */
-    /* #ifdef MP-WEIXIN */
-    padding-bottom: 300rpx;
-    /* #endif */
+    /* 由 chatMessagesStyle 动态控制 */
     
     .load-more {
       text-align: center;
@@ -2041,7 +2302,7 @@ $radius-lg: 36rpx;
         .message-content {
           flex: 1;
           margin-left: 24rpx;
-          max-width: calc(100% - 112rpx);
+          max-width: calc(100% - 96rpx);
           min-width: 0;
           width: 0; /* 添加这个属性防止flex元素溢出 */
 
@@ -2394,31 +2655,68 @@ $radius-lg: 36rpx;
             align-items: center;
             padding: 32rpx 0;
             
-            .loading-dots {
+            .loading-typing {
               display: flex;
-              margin-right: 16rpx;
+              flex-direction: column;
+              align-items: flex-start;
+              gap: 12rpx;
               
-              .dot {
-                width: 14rpx;
-                height: 14rpx;
-                border-radius: 50%;
-                background-color: $color-primary;
-                margin: 0 6rpx;
-                animation: dotPulse 1.5s infinite ease-in-out;
+              .typing-dots {
+                display: flex;
+                align-items: center;
                 
-                &:nth-child(2) {
-                  animation-delay: 0.2s;
-                }
-                
-                &:nth-child(3) {
-                  animation-delay: 0.4s;
+                .dot {
+                  width: 14rpx;
+                  height: 14rpx;
+                  border-radius: 50%;
+                  background-color: $color-primary;
+                  margin: 0 6rpx;
+                  animation: dotPulse 1.5s infinite ease-in-out;
+                  
+                  &:nth-child(2) {
+                    animation-delay: 0.2s;
+                  }
+                  
+                  &:nth-child(3) {
+                    animation-delay: 0.4s;
+                  }
+                }
+              }
+              
+              .loading-text {
+                color: $color-text-light;
+                font-size: 24rpx;
+                display: flex;
+                align-items: center;
+                
+                .loading-status {
+                  color: $color-primary;
+                  font-weight: 500;
+                  transition: opacity 0.3s ease;
+                }
+                
+                .loading-ellipsis {
+                  display: inline-flex;
+                  margin-left: 4rpx;
+                  
+                  .ellipsis-dot {
+                    animation: ellipsisBlink 1.4s infinite ease-in-out;
+                    opacity: 0;
+                    
+                    &:nth-child(1) {
+                      animation-delay: 0s;
+                    }
+                    
+                    &:nth-child(2) {
+                      animation-delay: 0.2s;
+                    }
+                    
+                    &:nth-child(3) {
+                      animation-delay: 0.4s;
+                    }
+                  }
                 }
               }
-            }
-            
-            .loading-text {
-              color: $color-text-light;
-              font-size: 26rpx;
             }
           }
 
@@ -2539,7 +2837,6 @@ $radius-lg: 36rpx;
             height: auto;
             padding: 16rpx 20rpx; /* 微信风格内边距 */
             display: inline-block;
-            max-width: 70%; /* 微信风格宽度 */
             word-break: break-word;
             white-space: pre-wrap;
             line-height: 1.5;
@@ -2576,7 +2873,6 @@ $radius-lg: 36rpx;
             height: auto;
             padding: 16rpx 20rpx; /* 微信风格内边距 */
             display: inline-block;
-            max-width: 70%; /* 微信风格宽度 */
             word-break: break-word;
             white-space: pre-wrap;
             line-height: 1.5;
@@ -2599,24 +2895,19 @@ $radius-lg: 36rpx;
     }
   }
 
-  /* 输入区域 */
+    /* 键盘垫高层：高度变化时平滑过渡 */
+  .keyboard-spacer {
+    flex-shrink: 0;
+    transition: height 0.25s ease;
+  }
+
+    /* 输入区域 */
   .input-area {
     background: white; /* 白色 */
     border-top: 1rpx solid #e5e5e5;
     padding: 16rpx 24rpx;
-    /* 确保在微信小程序中紧贴底部 */
     flex-shrink: 0;
-    /* 微信小程序安全区域适配 */
-    padding-bottom: calc(16rpx + env(safe-area-inset-bottom));
-    /* 确保输入区域正确显示 */
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 10;
-    /* #ifdef MP-WEIXIN */
-    /* 微信小程序中使用绝对定位，方便动态设置bottom */
-    /* #endif */
+    box-sizing: border-box;
 
     .input-tools {
       display: flex;
@@ -2755,17 +3046,8 @@ $radius-lg: 36rpx;
     left: 0;
     right: 0;
     bottom: 0;
-    pointer-events: none; /* 让鼠标事件穿透容器，不影响主内容交互 */
     z-index: 999; /* 基础弹窗层级 */
     
-    /* 子弹窗需要开启 pointer-events，否则点击无效 */
-    > .tools-popup,
-    > .voice-popup,
-    > .avatar-selector-popup,
-    > .nickname-editor-popup {
-      pointer-events: auto;
-    }
-    
     /* 昵称编辑弹窗层级最高，避免被其他弹窗遮挡 */
     > .nickname-editor-popup {
       z-index: 1001;
@@ -2789,7 +3071,6 @@ $radius-lg: 36rpx;
     right: 0;
     bottom: 0;
     background-color: rgba(0, 0, 0, 0.4);
-    backdrop-filter: blur(6rpx);
   }
 
   .nickname-editor-panel {
@@ -2939,7 +3220,6 @@ $radius-lg: 36rpx;
       right: 0;
       bottom: 0;
       background-color: rgba(0, 0, 0, 0.4);
-      backdrop-filter: blur(6rpx);
     }
 
     .tools-panel {
@@ -3050,7 +3330,6 @@ $radius-lg: 36rpx;
       right: 0;
       bottom: 0;
       background-color: rgba(0, 0, 0, 0.4);
-      backdrop-filter: blur(6rpx);
     }
 
     .voice-input-panel {
@@ -3190,7 +3469,6 @@ $radius-lg: 36rpx;
       right: 0;
       bottom: 0;
       background-color: rgba(0, 0, 0, 0.4);
-      backdrop-filter: blur(6rpx);
     }
 
     .avatar-selector-panel {
@@ -3312,6 +3590,15 @@ $radius-lg: 36rpx;
   }
 }
 
+@keyframes ellipsisBlink {
+  0%, 100% {
+    opacity: 0;
+  }
+  50% {
+    opacity: 1;
+  }
+}
+
 @keyframes wave {
   0%, 100% {
     transform: scaleY(0.5);
@@ -3509,7 +3796,7 @@ $radius-lg: 36rpx;
           
           .message-content {
             margin-left: 16rpx;
-            max-width: calc(100% - 88rpx);
+            max-width: calc(100% - 72rpx);
             
             .message-bubble {
               padding: 16rpx 24rpx;
@@ -3560,7 +3847,6 @@ $radius-lg: 36rpx;
     right: 0;
     bottom: 0;
     background-color: rgba(0, 0, 0, 0.4);
-    backdrop-filter: blur(6rpx);
   }
 
   .emoji-panel {
@@ -3682,7 +3968,6 @@ $radius-lg: 36rpx;
     right: 0;
     bottom: 0;
     background-color: rgba(0, 0, 0, 0.4);
-    backdrop-filter: blur(6rpx);
   }
   
   .expand-editor-panel {
diff --git a/pages_tool/ai-chat/index.vue b/pages_tool/ai-chat/index.vue
index 9ce3d21..8111480 100644
--- a/pages_tool/ai-chat/index.vue
+++ b/pages_tool/ai-chat/index.vue
@@ -1,23 +1,19 @@
 <template>
-  <view class="container" :style="wrapperPageStyle">
-    <!--自定义导航头部 - 只在微信小程序显示，H5端隐藏 -->
+  <view class="wrapper">
+    <!--自定义导航头部 - 绝对定位在顶部，不随键盘上移 -->
     <!-- #ifdef MP-WEIXIN -->
     <view class="custom-navbar" ref="pageHeader" v-if="showCustomNavbar">
       <view class="header-left">
         <button class="back-btn" v-show="showBackButton" @click="goBack">
           <text class="iconfont icon-back"></text>
         </button>
-        <!-- 占位元素，确保布局平衡 -->
         <view v-show="!showMenuButton" class="placeholder"></view>
       </view>
     </view>
     <!-- #endif -->
 
-    <!-- 聊天内容区域 -->
-    <view class="chat-content" 
-      :style="wrapperChatContentStyle"
-      >
-      <!-- AI聊天组件 -->
+    <!-- 聊天内容区域：从导航栏下方到容器底部 -->
+    <view class="chat-content">
       <ai-chat-message 
         ref="chat"
         :initial-messages="initialMessages"
@@ -131,37 +127,6 @@ export default {
       return this.globalAIKefuConfig?.aiAvatar || this.$util.img(IMAGE_CONFIG.aiAvatar)
     },
     /// ---- others ----
-    containerHeight() {
-      return `calc(100vh - ${this.navBarHeight + this.statusBarHeight}px)`
-    },
-    wrapperPageStyle() {
-      // #ifdef H5
-      return `top:  $ {this.navBarHeight + 'px'};`
-      // #endif
-
-      // #ifdef MP-WEIXIN
-      return `top: -1px;` // 微信小程序需要上移1px, 否则与系统导航栏出现1px的空隙
-      // #endif
-
-      return ``
-    },
-    wrapperChatContentStyle() {
-      // #ifdef H5
-      // H5端没有自定义导航栏，不需要paddingTop
-      return { 
-        height: this.containerHeight,
-        paddingTop: '0'
-      }
-      // #endif
-      
-      // #ifdef MP-WEIXIN
-      // 微信小程序端根据导航栏显示情况决定
-      return { 
-        height: this.containerHeight,
-        paddingTop: this.showCustomNavbar ? '0' : (this.navBarHeight + 'px')
-      }
-      // #endif
-    }
   },
 
   async onLoad(options) {
@@ -574,20 +539,22 @@ export default {
 @import url('/common/css/iconfont.css');
 
 /* 页面样式 */
-  .container {
-    display: flex;
-    flex-direction: column;
-    background-color: white; /* 白色 */
-    overflow: hidden;
-    position: fixed;
-    top: 48px;
-    left: 0;
-    right: 0;
-    bottom: 0;
-  }
+.wrapper {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  overflow: hidden;
+}
 
-/* 自定义导航头部 */
+/* 自定义导航头部：固定在wrapper顶部，不随键盘上移 */
 .custom-navbar {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 88rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -667,12 +634,18 @@ export default {
   }
 }
 
-/* 聊天内容区域 */
+/* 聊天内容区域：从导航栏下方到容器底部 */
 .chat-content {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
+  position: absolute;
+  /* #ifdef MP-WEIXIN */
+  top: 0;
+  /* #endif */
+  /* #ifndef MP-WEIXIN */
+  top: 44px;
+  /* #endif */
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
 
 /* 底部tabBar占位样式 */
diff --git a/vue.config.js b/vue.config.js
index ad9dbf7..7da20a9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,6 +5,23 @@ const { zionUniMpLoadPackagePlugin } = require('zion-uniapp-mp-load-package/webp
 
 console.log('[vue.config] 已加载');
 
+// 确保 UNI_APP_DOMAIN 有值（从 package.json 脚本配置中读取）
+if (!process.env.UNI_APP_DOMAIN && process.env.UNI_SCRIPT) {
+  try {
+    const pkg = require('./package.json');
+    const scriptCfg = pkg['uni-app']?.scripts?.[process.env.UNI_SCRIPT];
+    if (scriptCfg?.env?.UNI_APP_DOMAIN) {
+      process.env.UNI_APP_DOMAIN = scriptCfg.env.UNI_APP_DOMAIN;
+    }
+  } catch (e) {}
+}
+
+// 输出 H5 域名信息到控制台
+if (process.env.UNI_PLATFORM === 'h5') {
+  console.log(`\n[H5 发行] 脚本: ${process.env.UNI_SCRIPT || '(默认)'}`);
+  console.log(`[H5 发行] 域名: ${process.env.UNI_APP_DOMAIN || '(未配置)'}\n`);
+}
+
 // 打印出process.env
 // for (let key in process.env) {
 //   console.log(key, process.env[key]);
@@ -217,16 +234,15 @@ class VersionInjectPlugin {
       console.log(`[H5Zip] 输出目录名正确: ${outputDirName}`);
     }
 
-    // 上海时区时间戳格式: 20260511_1058
-    const now = new Date();
-    const shanghaiOffset = 8 * 60;
-    const shanghaiTime = new Date(now.getTime() + shanghaiOffset * 60 * 1000);
-    const y = shanghaiTime.getFullYear();
-    const M = String(shanghaiTime.getMonth() + 1).padStart(2, '0');
-    const d = String(shanghaiTime.getDate()).padStart(2, '0');
-    const h = String(shanghaiTime.getHours()).padStart(2, '0');
-    const m = String(shanghaiTime.getMinutes()).padStart(2, '0');
-    const ts = `${y}${M}${d}_${h}${m}`;
+    // 标准时区时间戳格式: 20260511_1058
+    const fmt = new Intl.DateTimeFormat('en-CA', {
+      timeZone: 'Asia/Shanghai',
+      year: 'numeric', month: '2-digit', day: '2-digit',
+      hour: '2-digit', minute: '2-digit', hour12: false
+    });
+    const parts = fmt.formatToParts(new Date());
+    const get = (t) => parts.find(p => p.type === t).value;
+    const ts = `${get('year')}${get('month')}${get('day')}_${get('hour')}${get('minute')}`;
 
     const zipFileName = `${outputDirName}-${this._cachedCommitId}-${ts}.zip`;
     const zipFilePath = path.join(h5Dir, zipFileName);
@@ -248,8 +264,8 @@ class VersionInjectPlugin {
       execSync(command, { stdio: 'inherit' });
       console.log(`✅ H5 ZIP: ${zipFileName}`);
       // 删除已打包的源目录
-      fs.rmSync(targetDir, { recursive: true, force: true });
-      console.log(`[H5Zip] 已删除源目录: ${outputDirName}`);
+      // fs.rmSync(targetDir, { recursive: true, force: true });
+      // console.log(`[H5Zip] 已删除源目录: ${outputDirName}`);
     } catch (e) {
       console.error('H5 ZIP 打包失败:', e.message);
     }