chore：进入客服页面不乱跳了

App.vue

@@ -1,43 +1,51 @@
 <script>
 	import auth from 'common/js/auth.js';
 	import colorList from 'common/js/style_color.js'
-	import { Weixin } from 'common/js/wx-jssdk.js';
+	import {
+		Weixin
+	} from 'common/js/wx-jssdk.js';
 
 	export default {
 		mixins: [auth],
 		onLaunch: function(options) {
-			// 处理uniacid存储
+			// console.log(options.query.uniacid)
 			if(options.query.uniacid){
 				uni.setStorageSync('uniacid', options.query.uniacid);
+				console.log(uni.getStorageSync('uniacid'))
 			}
 			uni.hideTabBar();
 
 			// #ifdef MP
 			const updateManager = uni.getUpdateManager();
-			updateManager.onCheckForUpdate(() => {});
-			updateManager.onUpdateReady((res) => {
+			updateManager.onCheckForUpdate(function(res) {
+				// 请求完新版本信息的回调
+			});
+
+			updateManager.onUpdateReady(function(res) {
 				uni.showModal({
 					title: '更新提示',
 					content: '新版本已经准备好，是否重启应用？',
 					success(res) {
-						if (res.confirm) updateManager.applyUpdate();
+						if (res.confirm) {
+							// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+							updateManager.applyUpdate();
+						}
 					}
 				});
 			});
-			updateManager.onUpdateFailed(() => {});
+
+			updateManager.onUpdateFailed(function(res) {
+				// 新的版本下载失败
+			});
 			// #endif
 
 			// #ifdef H5
 			if (uni.getSystemInfoSync().platform == 'ios') {
 				uni.setStorageSync('initUrl', location.href);
 			}
-			this.$nextTick(() => {
-				this.createIndependentChatbot();
-			});
 			// #endif
 
-			// 网络状态监听
-			uni.onNetworkStatusChange((res) => {
+			uni.onNetworkStatusChange(function(res) {
 				if (!res.isConnected) {
 					uni.showModal({
 						title: '网络失去链接',
@@ -47,38 +55,75 @@
 				}
 			});
 
-			// 初始化store
 			this.$store.dispatch('init');
 
-			// 批量同步store数据
-			const storeKeys = [
-				{key: 'themeStyle', mutation: 'setThemeStyle', handler: (v) => colorList[v]},
-				{key: 'addonIsExist', mutation: 'setAddonIsExist'},
-				{key: 'defaultImg', mutation: 'setDefaultImg'},
-				{key: 'siteInfo', mutation: 'setSiteInfo'},
-				{key: 'globalStoreConfig', mutation: 'setGlobalStoreConfig'},
-				{key: 'globalStoreInfo', mutation: 'setGlobalStoreInfo'},
-				{key: 'defaultStoreInfo', mutation: 'setDefaultStoreInfo'},
-				{key: 'servicerConfig', mutation: 'setServicerConfig'},
-				{key: 'copyright', mutation: 'setCopyright'},
-				{key: 'mapConfig', mutation: 'setMapConfig'},
-				{key: 'token', mutation: 'setToken'},
-				{key: 'memberInfo', mutation: 'setMemberInfo'}
-			];
-			storeKeys.forEach(item => {
-				const value = uni.getStorageSync(item.key);
-				if (value) {
-					const data = item.handler ? item.handler(value) : value;
-					this.$store.commit(item.mutation, data);
-				}
-			});
+			// 存储到store中
 
-			// 会员信息存在时同步购物车
+			// 主题风格
+			if (uni.getStorageSync('themeStyle')) {
+				this.$store.commit('setThemeStyle', colorList[uni.getStorageSync('themeStyle')]);
+			}
+
+			// 插件是否存在
+			if (uni.getStorageSync('addonIsExist')) {
+				this.$store.commit('setAddonIsExist', uni.getStorageSync('addonIsExist'));
+			}
+
+			// 默认图
+			if (uni.getStorageSync('defaultImg')) {
+				this.$store.commit('setDefaultImg', uni.getStorageSync('defaultImg'));
+			}
+
+			// 站点信息
+			if (uni.getStorageSync('siteInfo')) {
+				this.$store.commit('setSiteInfo', uni.getStorageSync('siteInfo'));
+			}
+
+			// 门店配置
+			if (uni.getStorageSync('globalStoreConfig')) {
+				this.$store.commit('setGlobalStoreConfig', uni.getStorageSync('globalStoreConfig'));
+			}
+
+			// 门店信息
+			if (uni.getStorageSync('globalStoreInfo')) {
+				this.$store.commit('setGlobalStoreInfo', uni.getStorageSync('globalStoreInfo'));
+			}
+
+			// 默认门店信息
+			if (uni.getStorageSync('defaultStoreInfo')) {
+				this.$store.commit('setDefaultStoreInfo', uni.getStorageSync('defaultStoreInfo'));
+			}
+
+			// 客服配置
+			if (uni.getStorageSync('servicerConfig')) {
+				this.$store.commit('setServicerConfig', uni.getStorageSync('servicerConfig'));
+			}
+
+			// 版权信息
+			if (uni.getStorageSync('copyright')) {
+				this.$store.commit('setCopyright', uni.getStorageSync('copyright'));
+			}
+
+			// 地址配置
+			if (uni.getStorageSync('mapConfig')) {
+				this.$store.commit('setMapConfig', uni.getStorageSync('mapConfig'));
+			}
+
+			if (uni.getStorageSync('token')) {
+				this.$store.commit('setToken', uni.getStorageSync('token'));
+			}
+
+			// 会员信息
 			if (uni.getStorageSync('memberInfo')) {
+				this.$store.commit('setMemberInfo', uni.getStorageSync('memberInfo'));
+
+				// 查询购物车信息
 				this.$store.dispatch('getCartNumber');
 			}
 
 			// #ifdef H5
+			// 自动授权登录
+			// 未登录情况下
 			if (!uni.getStorageSync('memberInfo')) {
 				this.getAuthInfo();
 			}
@@ -95,17 +140,18 @@
 			// #endif
 
 			// #ifdef MP-ALIPAY
-			if (options.query?.m) uni.setStorageSync('source_member', options.query.m);
+			if (options.query && options.query.m) uni.setStorageSync('source_member', options.query.m);
 			// #endif
 		},
 		onShow: function(options) {
 			// #ifdef MP
+			// 自动授权登录
 			this.getAuthInfo();
 			if (this.$store.state.token) {
 				this.$api.sendRequest({
 					url: '/api/member/info',
 					success: (res) => {
-						if (res.code >= 10) { 
+						if (res.code >= 0) {
 							this.$store.commit('setMemberInfo', res.data);
 						}
 					}
@@ -114,251 +160,47 @@
 			// #endif
 
 			// #ifdef MP-ALIPAY
-			if (options.query?.m) uni.setStorageSync('source_member', options.query.m);
+			if (options.query && options.query.m) uni.setStorageSync('source_member', options.query.m);
 			// #endif
 		},
 		onHide: function() {},
 		methods: {
-			// 安全的 HTML 转义（防止 XSS）
-			htmlEncode(str) {
-				if (typeof str !== 'string') return '';
-				return str
-					.replace(/&/g, '&amp;')
-					.replace(/</g, '&lt;')
-					.replace(/>/g, '&gt;')
-					.replace(/"/g, '&quot;')
-					.replace(/'/g, '&#039;');
-			},
-
-			createIndependentChatbot() {
-				console.log('创建响应式智能客服窗口...');
-
-				// 清除已存在的元素
-				document.querySelectorAll('[id^="independent-chat-"]').forEach(el => el.remove());
-
-				// ========== 按钮 ==========
-				const chatBtn = document.createElement('div');
-				chatBtn.id = 'independent-chat-btn';
-				chatBtn.innerHTML = '💬';
-				chatBtn.style.cssText = `
-					width: 56px;
-					height: 56px;
-					border-radius: 50%;
-					position: fixed;
-					bottom: calc(180px + env(safe-area-inset-bottom, 0px));
-					right: 0px;
-					z-index: 999999;
-					cursor: pointer;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					color: white;
-					font-size: 24px;
-					box-shadow: 0 4px 12px rgba(0,0,0,0.2);
-					background: linear-gradient(135deg, #ff9a9e, #fad0c4, #a1c4fd, #c2e9fb, #d4fc79, #96e6a1);
-					background-size: 300% 300%;
-					animation: rainbowPulse 4s ease infinite;
-					user-select: none;
-					-webkit-user-drag: none;
-				`;
-				document.body.appendChild(chatBtn);
-
-				// ========== 聊天窗口 ==========
-				const chatWindow = document.createElement('div');
-				chatWindow.id = 'independent-chat-window';
-				chatWindow.style.cssText = `
-					position: fixed;
-					z-index: 999998;
-					border-radius: 12px;
-					background: white;
-					box-shadow: 0 4px 20px rgba(0,0,0,0.2);
-					display: none;
-					flex-direction: column;
-					overflow: hidden;
-				`;
-				document.body.appendChild(chatWindow);
-
-				// 头部
-				const chatHeader = document.createElement('div');
-				chatHeader.style.cssText = `
-					height: 50px;
-					background: #1C64F2;
-					color: white;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					padding: 0 16px;
-					font-size: 18px;
-					font-weight: 600;
-				`;
-				chatHeader.innerHTML = `<span>智能客服</span><span id="close-chat-window" style="cursor:pointer;font-size:24px;">×</span>`;
-				chatWindow.appendChild(chatHeader);
-
-				// 内容区
-				const chatContent = document.createElement('div');
-				chatContent.style.cssText = `
-					flex: 1;
-					padding: 16px;
-					overflow-y: auto;
-					background: #f9fafb;
-				`;
-				chatContent.innerHTML = `
-					<div style="display:flex;margin-bottom:16px;">
-						<div style="width:36px;height:36px;border-radius:50%;background:#1C64F2;color:white;display:flex;align-items:center;justify-content:center;margin-right:8px;">🤖</div>
-						<div style="background:white;padding:8px 12px;border-radius:8px;max-width:70%;">您好！有什么可以帮到您的吗？</div>
-					</div>
-				`;
-				chatWindow.appendChild(chatContent);
-
-				// 输入区
-				const chatInputArea = document.createElement('div');
-				chatInputArea.style.cssText = `
-					height: 60px;
-					display: flex;
-					align-items: center;
-					padding: 0 16px;
-					border-top: 1px solid #eee;
-				`;
-				const chatInput = document.createElement('input');
-				chatInput.type = 'text';
-				chatInput.placeholder = '请输入您的问题...';
-				chatInput.style.cssText = `
-					flex: 1;
-					height: 36px;
-					padding: 0 12px;
-					border: 1px solid #ddd;
-					border-radius: 18px;
-					outline: none;
-					font-size: 14px;
-				`;
-				const sendBtn = document.createElement('button');
-				sendBtn.innerText = '发送'; // 横排文字
-				sendBtn.style.cssText = `
-					margin-left: 12px;
-					padding: 6px 16px;
-					background: #1C64F2;
-					color: white;
-					border: none;
-					border-radius: 18px;
-					cursor: pointer;
-					font-size: 14px;
-					white-space: nowrap; /* 防止换行 */
-					text-align: center; /* 居中 */
-					line-height: 1.5; /* 调整高度 */
-				`;
-				chatInputArea.appendChild(chatInput);
-				chatInputArea.appendChild(sendBtn);
-				chatWindow.appendChild(chatInputArea);
-
-				// ========== 响应式尺寸控制 ==========
-				const updateWindowSize = () => {
-					const isMobile = window.innerWidth <= 768;
-					if (isMobile) {
-						chatWindow.style.width = 'calc(90vw - 40px)';
-						chatWindow.style.maxWidth = '400px';
-						chatWindow.style.height = '70vh';
-						chatWindow.style.maxHeight = '600px';
-						chatWindow.style.right = '5vw';
-						chatWindow.style.bottom = 'calc(86px + env(safe-area-inset-bottom, 0px))';
-					} else {
-						chatWindow.style.width = '360px';
-						chatWindow.style.height = '520px';
-						chatWindow.style.maxWidth = 'none';
-						chatWindow.style.maxHeight = 'none';
-						chatWindow.style.right = '20px';
-						chatWindow.style.bottom = '86px';
-					}
-					chatContent.style.maxHeight = 'calc(100% - 110px)';
-				};
-
-				// 初始化并监听窗口变化
-				updateWindowSize();
-				window.addEventListener('resize', updateWindowSize);
-
-				// ========== 交互逻辑 ==========
-				let isShow = false;
-				const toggleChat = () => {
-					isShow = !isShow;
-					chatWindow.style.display = isShow ? 'flex' : 'none';
-					if (isShow) {
-						updateWindowSize(); // 确保旋转/切换后尺寸正确
-						chatInput.focus();
-					}
-				};
-
-				chatBtn.onclick = toggleChat;
-				document.getElementById('close-chat-window').onclick = () => {
-					isShow = false;
-					chatWindow.style.display = 'none';
-				};
-
-				document.addEventListener('click', (e) => {
-					if (!chatBtn.contains(e.target) && !chatWindow.contains(e.target)) {
-						isShow = false;
-						chatWindow.style.display = 'none';
-					}
-				});
-
-				// 发送消息
-				const sendMessage = () => {
-					const msg = chatInput.value.trim();
-					if (!msg) return;
-					const safeMsg = this.htmlEncode(msg);
-					chatContent.insertAdjacentHTML('beforeend', `
-						<div style="display:flex;margin-bottom:16px;justify-content:flex-end;">
-							<div style="background:#1C64F2;color:white;padding:8px 12px;border-radius:8px;max-width:70%;">
-								${safeMsg}
-							</div>
-							<div style="width:36px;height:36px;border-radius:50%;background:#eee;display:flex;align-items:center;justify-content:center;margin-left:8px;">👤</div>
-						</div>
-					`);
-					chatInput.value = '';
-					chatContent.scrollTop = chatContent.scrollHeight;
-					setTimeout(() => {
-						chatContent.insertAdjacentHTML('beforeend', `
-							<div style="display:flex;margin-bottom:16px;">
-								<div style="width:36px;height:36px;border-radius:50%;background:#1C64F2;color:white;display:flex;align-items:center;justify-content:center;margin-right:8px;">🤖</div>
-								<div style="background:white;padding:8px 12px;border-radius:8px;max-width:70%;">
-									已收到您的问题："${safeMsg}"，我们会尽快回复！
-								</div>
-							</div>
-						`);
-						chatContent.scrollTop = chatContent.scrollHeight;
-					}, 800);
-				};
-
-				sendBtn.onclick = sendMessage;
-				chatInput.onkeydown = (e) => {
-					if (e.key === 'Enter') {
-						e.preventDefault();
-						sendMessage();
-					}
-				};
-
-				console.log('响应式智能客服窗口创建完成');
-			},
-
+			/**
+			 * 获取授权信息
+			 */
 			getAuthInfo() {
 				// #ifdef H5
 				if (this.$util.isWeiXin()) {
 					this.$util.getUrlCode(urlParams => {
-						if (urlParams.source_member) uni.setStorageSync('source_member', urlParams.source_member);
-						if (urlParams.code === undefined) {
+						if (urlParams.source_member) uni.setStorageSync('source_member', urlParams
+							.source_member);
+
+						if (urlParams.code == undefined) {
 							this.$api.sendRequest({
 								url: '/wechat/api/wechat/authcode',
-								data: { redirect_url: location.href, scopes: 'snsapi_userinfo' },
-								success: (res) => res.code >= 0 && (location.href = res.data)
+								data: {
+									redirect_url: location.href,
+									scopes: 'snsapi_userinfo'
+								},
+								success: res => {
+									if (res.code >= 0) {
+										location.href = res.data;
+									}
+								}
 							});
 						} else {
 							this.$api.sendRequest({
 								url: '/wechat/api/wechat/authcodetoopenid',
-								data: { code: urlParams.code },
-								success: (res) => {
+								data: {
+									code: urlParams.code
+								},
+								success: res => {
 									if (res.code >= 0) {
-										const data = {};
-										res.data.openid && (data.wx_openid = res.data.openid);
-										res.data.unionid && (data.wx_unionid = res.data.unionid);
-										res.data.userinfo && Object.assign(data, res.data.userinfo);
+										let data = {};
+										if (res.data.openid) data.wx_openid = res.data.openid;
+										if (res.data.unionid) data.wx_unionid = res.data.unionid;
+										if (res.data.userinfo) Object.assign(data, res.data
+											.userinfo);
 										this.authLogin(data);
 									}
 								}
@@ -367,97 +209,105 @@
 					});
 				}
 				// #endif
+
 				// #ifdef MP
-				this.getCode(data => this.authLogin(data, 'authOnlyLogin'));
+				this.getCode(data => {
+					this.authLogin(data, 'authOnlyLogin');
+				});
 				// #endif
 			},
+			/**
+			 * 授权登录
+			 */
 			authLogin(data, type = 'authLogin') {
-				uni.getStorageSync('source_member') && (data.source_member = uni.getStorageSync('source_member'));
+				if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
+
 				uni.setStorageSync('authInfo', data);
+
 				this.$api.sendRequest({
-					url: type === 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
+					url: type == 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin',
 					data,
-					success: (res) => {
+					success: res => {
 						if (res.code >= 0) {
 							this.$store.commit('setToken', res.data.token);
-							this.getMemberInfo();
+							this.getMemberInfo()
 							this.$store.dispatch('getCartNumber');
 						}
 					}
 				});
 			},
+			/**
+			 * 公众号分享设置
+			 */
 			shareConfig() {
 				this.$api.sendRequest({
 					url: '/wechat/api/wechat/share',
-					data: { url: window.location.href },
-					success: (res) => {
-						if (res.code === 0) {
-							const wxJS = new Weixin();
+					data: {
+						url: window.location.href
+					},
+					success: res => {
+						if (res.code == 0) {
+							var wxJS = new Weixin();
 							wxJS.init(res.data.jssdk_config);
-							const share_data = JSON.parse(JSON.stringify(res.data.share_config.data));
-							share_data && wxJS.setShareData({
-								title: share_data.title,
-								desc: share_data.desc,
-								link: share_data.link,
-								imgUrl: this.$util.img(share_data.imgUrl)
-							}, res => console.log(res));
-							res.data.share_config.permission.hideOptionMenu 
-								? wxJS.weixin.hideOptionMenu() 
-								: wxJS.weixin.showOptionMenu();
+
+							let share_data = JSON.parse(JSON.stringify(res.data.share_config.data));
+							if (share_data) {
+								wxJS.setShareData({
+										title: share_data.title,
+										desc: share_data.desc,
+										link: share_data.link,
+										imgUrl: this.$util.img(share_data.imgUrl)
+									},
+									res => {
+										console.log(res);
+									}
+								);
+							}
+
+							let hideOptionMenu = res.data.share_config.permission.hideOptionMenu;
+							let hideMenuItems = res.data.share_config.permission.hideMenuItems;
+
+							if (hideOptionMenu) {
+								wxJS.weixin.hideOptionMenu(); //屏蔽分享好友等按钮
+							} else {
+								wxJS.weixin.showOptionMenu(); //放开分享好友等按钮
+							}
 						}
-					}
+					},
+					fail: err => {}
 				});
 			},
 			getMemberInfo() {
 				this.$api.sendRequest({
 					url: '/api/member/info',
-					success: (res) => res.code >= 0 && this.$store.commit('setMemberInfo', res.data)
+					success: (res) => {
+						if (res.code >= 0) {
+							// 登录成功，存储会员信息
+							this.$store.commit('setMemberInfo', res.data);
+						}
+					}
 				});
 			}
 		},
 		watch: {
 			$route: {
 				handler(newName, oldName) {
-					this.$util.isWeiXin() && this.shareConfig();
+					if (this.$util.isWeiXin()) {
+						this.shareConfig();
+					}
 				},
+				// 代表在wacth里声明了firstName这个方法之后立即先去执行handler方法
 				immediate: true
 			}
 		}
 	};
 </script>
-
 <style lang="scss">
 	@import './common/css/main.scss';
 	@import './common/css/iconfont.css';
-	@import './common/css/icondiy.css';
-	@import './common/css/icon/extend.css';
-
-	page {
+	@import './common/css/icondiy.css'; // 自定义图标库
+	@import './common/css/icon/extend.css'; // 扩展图标库
+	page{
 		background: #f4f6fa;
 	}
-	body {
-		padding-bottom: 80px !important;
-	}
-
-	/* 聊天窗口滚动条美化 */
-	#independent-chat-window div::-webkit-scrollbar {
-		width: 4px;
-	}
-	#independent-chat-window div::-webkit-scrollbar-thumb {
-		background: #ddd;
-		border-radius: 2px;
-	}
-
-	/* 彩虹动画 */
-	@keyframes rainbowPulse {
-		0% { background-position: 0% 50%; }
-		50% { background-position: 100% 50%; }
-		100% { background-position: 0% 50%; }
-	}
-
-	/* 强制固定定位，防止被其他样式干扰 */
-	#independent-chat-btn,
-	#independent-chat-window {
-		position: fixed !important;
-	}
 </style>

common/js/ai-service.js

@@ -1,349 +1,489 @@
-import http from './http.js'
-import store from '@/store/index.js'
-
-export default {
-  /**
-   * 发送消息到Dify API
-   * @param {string} message 用户消息内容
-   * @param {Object} options 配置选项
-   * @returns {Promise} 
-   */
-  async sendMessage(message, options = {}) {
-    try {
-      // 获取AI配置
-      const aiConfig = store.getters.globalAIKefuConfig
-
-      // const new_conversationId =  await this.generateConversationId()
-      
-      // 构建Dify API请求参数
-      const params = {
-        url: '/api/kefu/chat', // 后端代理接口
-        data: {
-          message: message,
-          // conversation_id: options.conversationId ?? new_conversationId,
-          user_id: store.state.memberInfo?.id || 'anonymous',
-          stream: options.stream || false, // 是否流式响应
-          // Dify API参数
-          inputs: {},
-          query: message,
-          response_mode: options.stream ? 'streaming' : 'blocking',
-          user: store.state.memberInfo?.id || 'anonymous'
-        },
-        header: {
-          'Content-Type': 'application/json'
-        }
-      }
-      
-      // 发送请求
-      const response = await http.sendRequest({
-        ...params,
-        async: false // 使用Promise方式
-      })
-      
-      return this.handleResponse(response, options)
-      
-    } catch (error) {
-      console.error('Dify API请求失败:', error)
-      throw new Error('AI服务暂时不可用，请稍后重试')
-    }
-  },
-  
-  /**
-   * 流式消息处理
-   * @param {string} message 用户消息
-   * @param {Function} onChunk 流式数据回调
-   * @param {Function} onComplete 完成回调
-   */
-  async sendStreamMessage(message, onChunk, onComplete) {
-    try {
-        // 使用HTTP流式请求
-        return this.sendHttpStream(message, onChunk, onComplete)
-      
-    } catch (error) {
-      console.error('流式消息发送失败:', error)
-      throw error
-    }
-  },
-  
-  /**
-   * WebSocket连接
-   */
-  connectWebSocket(message, onChunk, onComplete) {
-    return new Promise((resolve, reject) => {
-      const aiConfig = store.getters.globalAIKefuConfig
-      const wsUrl = aiConfig.difyWsUrl
-      
-      if (!wsUrl) {
-        reject(new Error('未配置WebSocket地址'))
-        return
-      }
-      
-      // #ifdef H5
-      const ws = new WebSocket(wsUrl)
-      
-      ws.onopen = () => {
-        // 发送消息
-        ws.send(JSON.stringify({
-          message: message,
-          user_id: store.state.memberInfo?.id || 'anonymous',
-          conversation_id: this.generateConversationId()
-        }))
-      }
-      
-      ws.onmessage = (event) => {
-        try {
-          const data = JSON.parse(event.data)
-          if (data.type === 'chunk' && onChunk) {
-            onChunk(data.content)
-          } else if (data.type === 'complete' && onComplete) {
-            onComplete(data.content)
-            ws.close()
-            resolve(data.content)
-          }
-        } catch (e) {
-          console.error('WebSocket消息解析失败:', e)
-        }
-      }
-      
-      ws.onerror = (error) => {
-        console.error('WebSocket连接错误:', error)
-        reject(error)
-      }
-      
-      ws.onclose = () => {
-        console.log('WebSocket连接关闭')
-      }
-      // #endif
-      
-      // #ifdef MP-WEIXIN || APP-PLUS
-      // 小程序和APP使用uni.connectSocket
-      uni.connectSocket({
-        url: wsUrl,
-        success: () => {
-          uni.onSocketOpen(() => {
-            uni.sendSocketMessage({
-              data: JSON.stringify({
-                message: message,
-                user_id: store.state.memberInfo?.id || 'anonymous',
-                conversation_id: this.generateConversationId()
-              })
-            })
-          })
-          
-          uni.onSocketMessage((res) => {
-            try {
-              const data = JSON.parse(res.data)
-              if (data.type === 'chunk' && onChunk) {
-                onChunk(data.content)
-              } else if (data.type === 'complete' && onComplete) {
-                onComplete(data.content)
-                uni.closeSocket()
-                resolve(data.content)
-              }
-            } catch (e) {
-              console.error('WebSocket消息解析失败:', e)
-            }
-          })
-          
-          uni.onSocketError((error) => {
-            console.error('WebSocket连接错误:', error)
-            reject(error)
-          })
-        },
-        fail: (error) => {
-          reject(error)
-        }
-      })
-      // #endif
-    })
-  },
-  
-  /**
-   * HTTP流式请求
-   */
-  async sendHttpStream(message, onChunk, onComplete) {
-    const aiConfig = store.getters.globalAIKefuConfig
-    
-    const params = {
-      url: '/api/kefu/chat-stream',
-      data: {
-        message: message,
-        conversation_id: this.generateConversationId(),
-        user_id: store.state.memberInfo?.id || 'anonymous',
-        stream: true
-      },
-      header: {
-        'Content-Type': 'application/json'
-      }
-    }
-    
-    if (aiConfig?.difyApiKey) {
-      params.header['Authorization'] = `Bearer ${aiConfig.difyApiKey}`
-    }
-    
-    // 使用fetch API进行流式请求（H5环境）
-    // #ifdef H5
-    try {
-      const response = await fetch(`/api/kefu/chat-messages`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          inputs: {},
-          query: message,
-          response_mode: 'streaming',
-          user: store.state.memberInfo?.id || 'anonymous'
-        })
-      })
-      
-      const reader = response.body.getReader()
-      const decoder = new TextDecoder()
-      let content = ''
-      
-      while (true) {
-        const { done, value } = await reader.read()
-        if (done) break
-        
-        const chunk = decoder.decode(value)
-        const lines = chunk.split('\n')
-        
-        for (const line of lines) {
-          if (line.startsWith('data: ')) {
-            try {
-              const data = JSON.parse(line.slice(6))
-              if (data.event === 'text_message' && data.text) {
-                content += data.text
-                if (onChunk) onChunk(data.text)
-              }
-            } catch (e) {
-              // 忽略解析错误
-            }
-          }
-        }
-      }
-      
-      if (onComplete) onComplete(content)
-      return content
-      
-    } catch (error) {
-      console.error('HTTP流式请求失败:', error)
-      throw error
-    }
-    // #endif
-    
-    // 非H5环境使用普通请求模拟流式效果
-    // #ifndef H5
-    const response = await http.sendRequest({
-      ...params,
-      async: false
-    })
-    
-    // 模拟流式效果
-    if (response.success && response.data) {
-      const content = response.data
-      const chunkSize = 3
-      let index = 0
-      
-      const streamInterval = setInterval(() => {
-        if (index < content.length) {
-          const chunk = content.substring(index, index + chunkSize)
-          index += chunkSize
-          if (onChunk) onChunk(chunk)
-        } else {
-          clearInterval(streamInterval)
-          if (onComplete) onComplete(content)
-        }
-      }, 100)
-    }
-    // #endif
-  },
-  
-  /**
-   * 处理API响应
-   */
-  handleResponse(response, options) {
-    if (response.code === 0 || response.success) {
-      return {
-        success: true,
-        content: response.data?.answer || response.data?.content || response.data?.reply|| response.data,
-        conversationId: response.data?.conversation_id,
-        messageId: response.data?.message_id
-      }
-    } else {
-      throw new Error(response.message || 'AI服务返回错误')
-    }
-  },
-  
-  /**
-   * 生成会话ID
-   */
-  async generateConversationId() {
-          // 构建Dify API请求参数
-      const params = {
-        url: '/api/kefu/createConversation', // 后端代理接口
-        data: {
-          uniacid: store.state.uniacid,
-          user_id: store.state.memberInfo?.id || 'anonymous',
-          member_id: store.state.memberInfo?.id || '',
-        },
-        header: {
-          'Content-Type': 'application/json'
-        }
-      }
-      
-      // 发送请求
-      const response = await http.sendRequest({
-        ...params,
-        async: false // 使用Promise方式
-      })
-      
-      return this.handleResponse(response, options)
-  },
-  
-  /**
-   * 获取AI服务状态
-   */
-  async getServiceStatus() {
-    try {
-      // 简单的健康检查
-      const response = await http.sendRequest({
-        url: '/api/kefu/health',
-        async: false,
-        data: {}
-      })
-
-      const available = [response?.data?.status, response?.data?.components?.ai_service_config?.status].filter(item => item === 'healthy').length > 0;
-      
-      return {
-        available,
-        reason: available ? '服务正常' : '服务异常'
-      }
-      
-    } catch (error) {
-      return {
-        available: false,
-        reason: '服务检查失败'
-      }
-    }
-  },
-  
-  /**
-   * 清除会话历史
-   */
-  async clearConversation(conversationId) {
-    try {
-      const response = await http.sendRequest({
-        url: '/api/kefu/clear-conversation',
-        data: { conversation_id: conversationId },
-        async: false
-      })
-      
-      return response.success
-      
-    } catch (error) {
-      console.error('清除会话失败:', error)
-      return false
-    }
-  }
+import Config from './config.js'
+import http from './http.js'
+import store from '@/store/index.js'
+let currentConversationId = null;
+const CONVERSATION_KEY = 'ai_conversation_id';
+
+// 初始化时从本地读取
+try {
+  const saved = uni.getStorageSync(CONVERSATION_KEY);
+  if (saved) {
+    currentConversationId = saved;
+  }
+} catch (e) {
+  console.warn('读取会话ID失败:', e);
+}
+export default {
+  /**
+   * 发送消息到Dify API
+   * @param {string} message 用户消息内容
+   * @param {Object} options 配置选项
+   * @returns {Promise} 
+   */
+  async sendMessage(message, options = {}) {
+    try {
+      const aiConfig = store.getters.globalAIKefuConfig
+      const params = {
+        url: '/api/kefu/chat',
+        data: {
+          user_id: store.state.memberInfo?.id || 'anonymous',
+          stream: false,
+          inputs: {},
+          query: message,
+          response_mode: options.stream ? 'streaming' : 'blocking',
+          user: store.state.memberInfo?.id || 'anonymous',
+		  conversation_id: this.getConversationId() || '' 
+        },
+        header: {
+          'Content-Type': 'application/json'
+        }
+      }
+      console.log('Sending request to:', params.url);
+      console.log('Request data:', params.data);
+
+      const response = await http.sendRequest({
+        ...params,
+        async: false
+      })
+	  
+      const result = this.handleResponse(response, options);
+           if (result.conversationId) {
+             this.setConversationId(result.conversationId);
+           }
+           return result;
+         } catch (error) {
+           console.error('Dify API请求失败:', error)
+           throw new Error('AI服务暂时不可用，请稍后重试')
+         }
+       },
+  
+  /**
+   * 流式消息处理
+   */
+  async sendStreamMessage(message, onChunk, onComplete) {
+    try {
+      return this.sendHttpStream(message, onChunk, onComplete)
+    } catch (error) {
+      console.error('流式消息发送失败:', error)
+      throw error
+    }
+  },
+
+  /**
+   * EventSource 流式聊天
+   */
+  chatWithEventSource(message, conversationId = '', onMessage, onComplete, onError) {
+    if (window.currentEventSource) {
+      window.currentEventSource.close();
+    }
+    const params = new URLSearchParams({
+      uniacid: store.state.uniacid || '1',
+      user_id: store.state.memberInfo?.id || '123456',
+      query: message,
+      conversation_id: conversationId || '',
+      stream: 'true'
+    });
+    const url = `/api/kefu/chat?${params.toString()}`;
+    try {
+      const eventSource = new EventSource(url);
+      window.currentEventSource = eventSource;
+      let aiMessage = '';
+      eventSource.addEventListener('message', (event) => {
+        try {
+          const data = JSON.parse(event.data);
+          if (data.event === 'message') {
+            aiMessage += data.answer || '';
+            if (onMessage) onMessage(data.answer || '');
+          }
+          if (data.event === 'message_end') {
+            if (onComplete) onComplete({ 
+              conversation_id: data.conversation_id,
+              message: aiMessage 
+            });
+          }
+          if (data.conversation_id) {
+            conversationId = data.conversation_id;
+          }
+        } catch (error) {
+          console.error('解析消息失败:', error);
+        }
+      });
+      eventSource.addEventListener('done', (event) => {
+        try {
+          const data = JSON.parse(event.data);
+          if (onComplete) onComplete(data);
+        } catch (error) {
+          console.error('解析完成事件失败:', error);
+        }
+      });
+      eventSource.addEventListener('close', (event) => {
+        try {
+          const data = JSON.parse(event.data);
+          console.log('连接正常结束:', data);
+        } catch (error) {
+          console.error('解析关闭事件失败:', error);
+        }
+        window.currentEventSource = null;
+      });
+      eventSource.addEventListener('error', (error) => {
+        console.error('EventSource错误:', error);
+        if (onError) onError({ error: 'EventSource连接错误' });
+        window.currentEventSource = null;
+      });
+      return eventSource;
+    } catch (error) {
+      console.error('创建EventSource失败:', error);
+      if (onError) onError({ error: error.message });
+      return null;
+    }
+  },
+
+  /**
+   * Fetch API 流式聊天
+   */
+  async chatWithFetchStream(message, conversationId = '', onMessage, onComplete, onError) {
+    try {
+      let requestData;
+      let headers = {
+        'Accept': 'text/event-stream'
+      };
+      requestData = {
+        uniacid: store.state.uniacid || '1',
+        user_id: store.state.memberInfo?.id || '123456',
+        query: message,
+        conversation_id: conversationId || '',
+        stream: true,
+        inputs: {},
+        response_mode: 'streaming',
+        user: store.state.memberInfo?.id || '123456'
+      };
+      headers['Content-Type'] = 'application/json';
+      const response = await fetch('/api/kefu/chat', {
+        method: 'POST',
+        headers: headers,
+        body: JSON.stringify(requestData)
+      });
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
+      }
+      if (!response.body) {
+        throw new Error('响应体不可用');
+      }
+      const reader = response.body.getReader();
+      const decoder = new TextDecoder('utf-8');
+      let buffer = '';
+      let aiMessage = '';
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        buffer += decoder.decode(value, { stream: true });
+        let lineEnd;
+        while ((lineEnd = buffer.indexOf('\n')) !== -1) {
+          const line = buffer.substring(0, lineEnd);
+          buffer = buffer.substring(lineEnd + 1);
+          if (line.startsWith('data: ')) {
+            try {
+              const data = JSON.parse(line.substring(6));
+              if (data.event === 'message' || data.event === 'text_message') {
+                const textContent = data.answer || data.text || '';
+                aiMessage += textContent;
+                if (onMessage) onMessage(textContent);
+              } else if (data.event === 'message_end' || data.event === 'done') {
+                if (onComplete) onComplete({
+                  conversation_id: data.conversation_id,
+                  message: aiMessage,
+                  ...data
+                });
+              } else if (data.event === 'error' && onError) {
+                onError(data);
+              }
+              if (data.conversation_id) {
+                conversationId = data.conversation_id;
+              }
+            } catch (e) {
+              console.warn('解析流式数据失败:', e);
+            }
+          }
+        }
+      }
+      if (buffer.startsWith('data: ')) {
+        try {
+          const data = JSON.parse(buffer.substring(6));
+          if ((data.event === 'message' || data.event === 'text_message') && onMessage) {
+            const textContent = data.answer || data.text || '';
+            onMessage(textContent);
+          } else if ((data.event === 'message_end' || data.event === 'done') && onComplete) {
+            onComplete({
+              conversation_id: data.conversation_id,
+              message: aiMessage,
+              ...data
+            });
+          }
+        } catch (e) {
+          console.warn('解析剩余数据失败:', e);
+        }
+      }
+    } catch (error) {
+      console.error('Fetch流式聊天请求失败:', error);
+      if (onError) onError({ error: error.message });
+    }
+  },
+    
+  /**
+   * HTTP流式请求（修复conversationId未定义）
+   */
+  async sendHttpStream(message, onChunk, onComplete) {    
+    const params = {
+      url: '/api/kefu/chat',
+      data: {
+        query: message,
+        conversation_id: '',
+        user_id: store.state.memberInfo?.id || 'anonymous',
+        stream: true,
+        uniacid: store.state.uniacid,
+        inputs: {},
+        response_mode: 'streaming',
+        user: store.state.memberInfo?.id || 'anonymous'
+      },
+      header: {
+        'Content-Type': 'application/json'
+      }
+    }
+    // #ifdef H5
+    try {
+      const url = Config.baseUrl + `/api/kefu/chat`;
+      const response = await fetch(url, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Accept': 'text/event-stream',
+        },
+        body: JSON.stringify({
+          uniacid: store.state.uniacid || '1',
+          inputs: {},
+          query: message,
+          response_mode: 'streaming',
+          user_id: store.state.memberInfo?.id || 'anonymous'
+        })
+      })
+      const reader = response.body.getReader()
+      const decoder = new TextDecoder()
+      let content = ''
+      let buffer = ''
+      // 修复：声明conversationId变量
+      let conversationId = ''; 
+      
+      function processStreamData(buffer, callback) {
+        const lines = buffer.split('\n');
+        buffer = lines.pop() || '';
+        lines.forEach(line => {
+          line = line.trim();
+          if (!line) return;
+          if (line.startsWith('data:')) {
+            const dataPart = line.slice(5).trim();
+            if (dataPart) {
+              try {
+                const data = JSON.parse(dataPart);
+                if (data.event === 'message') {
+                  callback(data.answer || '');
+                }
+                if (data.conversation_id) {
+                  conversationId = data.conversation_id;
+                }
+                if (data.event === 'message_end') {
+                  console.log('对话完成');
+                }
+              } catch (error) {
+                console.error('解析流式数据失败:', error);
+              }
+            }
+          }
+        });
+        return buffer;
+      }
+      
+      while (true) {
+        const { done, value } = await reader.read()
+        if (done) break
+        buffer += decoder.decode(value, { stream: true });
+        buffer = processStreamData(buffer, (newData) => {
+          if (newData) {
+            content += newData;
+            if (onChunk) onChunk(newData);
+          }
+        });
+      }
+	  
+       if (onComplete) onComplete({ content, conversation_id: conversationId });
+        return { content, conversation_id: conversationId };
+    } catch (error) {
+      console.error('HTTP流式请求失败:', error)
+      throw error
+    }
+    // #endif
+    // #ifndef H5
+    const response = await http.sendRequest({
+      ...params,
+      async: false
+    })
+    if (response.success && response.data) {
+      const content = response.data
+      const chunkSize = 3
+      let index = 0
+      const streamInterval = setInterval(() => {
+        if (index < content.length) {
+          const chunk = content.substring(index, index + chunkSize)
+          index += chunkSize
+          if (onChunk) onChunk(chunk)
+        } else {
+          clearInterval(streamInterval)
+          if (onComplete) onComplete(content)
+        }
+      }, 100)
+    }
+    // #endif
+  },
+  
+  /**
+   * 处理API响应
+   */
+  handleResponse(response, options) {
+    if (response.code === 0 || response.success) {
+      return {
+        success: true,
+        content: response.data?.answer || response.data?.content || response.data?.reply|| response.data,
+        conversationId: response.data?.conversation_id,
+        messageId: response.data?.message_id
+      }
+    } else {
+      throw new Error(response.message || 'AI服务返回错误')
+    }
+  },
+  
+  /**
+   * 生成会话ID
+   */
+  async generateConversationId() {
+    const params = {
+      url: '/api/kefu/createConversation',
+      data: {
+        uniacid: store.state.uniacid,
+        user_id: store.state.memberInfo?.id || 'anonymous',
+        member_id: store.state.memberInfo?.id || '',
+      },
+      header: {
+        'Content-Type': 'application/json'
+      }
+    }
+    const response = await http.sendRequest({
+      ...params,
+      async: false
+    })
+    return this.handleResponse(response)
+  },
+  
+  /**
+   * 获取AI服务状态
+   */
+  async getServiceStatus() {
+    try {
+      const response = await http.sendRequest({
+        url: '/api/kefu/health',
+        async: false,
+        data: {}
+      })
+      const available = [response?.data?.status, response?.data?.components?.ai_service_config?.status].filter(item => item === 'healthy').length > 0;
+      return {
+        available,
+        reason: available ? '服务正常' : '服务异常'
+      }
+    } catch (error) {
+      return {
+        available: false,
+        reason: '服务检查失败'
+      }
+    }
+  },
+  
+  /**
+   * 清除会话历史
+   */
+  async clearConversation(conversationId) {
+    try {
+      const response = await http.sendRequest({
+        url: '/api/kefu/clear-conversation',
+        data: { conversation_id: conversationId },
+        async: false
+      })
+      return response.success
+    } catch (error) {
+      console.error('清除会话失败:', error)
+      return false
+    }
+  },
+  getConversationId() {
+      return currentConversationId;
+    },
+  
+    setConversationId(id) {
+      if (id && id !== currentConversationId) {
+        currentConversationId = id;
+        try {
+          uni.setStorageSync(CONVERSATION_KEY, id);
+        } catch (e) {
+          console.error('保存会话ID失败:', e);
+        }
+      }
+    },
+  
+    clearConversationId() {
+      currentConversationId = null;
+      try {
+        uni.removeStorageSync(CONVERSATION_KEY);
+      } catch (e) {
+        console.error('清除会话ID失败:', e);
+      }
+    },
+
+  /**
+   * 获取会话历史
+   */
+  async getConversationHistory(params = {}) {
+    try {
+      if (!params.conversation_id) {
+        throw new Error('会话ID（conversation_id）是必填参数');
+      }
+      const requestData = {
+        uniacid: params.uniacid || store.state.uniacid || '1',
+        conversation_id: params.conversation_id,
+        user_id: params.user_id || store.state.memberInfo?.id || 'anonymous',
+        limit: params.limit || 20,
+        offset: params.offset || 0,
+        member_id: params.member_id || store.state.memberInfo?.id || '',
+        token: params.token || ''
+      };
+      const response = await http.sendRequest({
+        url: '/api/kefu/getHistory',
+        data: requestData,
+        header: {
+          'Content-Type': 'application/json'
+        },
+        async: false
+      });
+      if (response.code === 0 || response.success) {
+        return {
+          success: true,
+          data: response.data,
+          messages: response.data?.messages || [],
+          total: response.data?.total || 0,
+          page_info: response.data?.page_info || { limit: 20, offset: 0 }
+        };
+      } else {
+        throw new Error(response.message || '获取会话历史失败');
+      }
+    } catch (error) {
+      console.error('获取会话历史失败:', error);
+      throw new Error(error.message || '获取会话历史时发生错误，请稍后重试');
+    }
+  }
 }

components/ai-chat-message/ai-chat-message.vue

@@ -5,8 +5,8 @@
       class="chat-messages" 
       scroll-y 
       :scroll-top="scrollTop"
-      @scrolltoupper="loadMoreHistory"
-      :scroll-with-animation="true">
+       @scroll="onScroll"
+      :scroll-with-animation="false">
       
       <!-- 加载更多历史消息 -->
       <view class="load-more" v-if="hasMoreHistory">
@@ -16,7 +16,7 @@
       <!-- 消息列表 -->
       <view 
         v-for="(message, index) in messages" 
-        :key="message.id" 
+        :key="`msg-${message.id || message.timestamp}-${index}`"  
         class="message-item"
         :class="[message.role, { 'first-message': index === 0 }]">
         
@@ -32,8 +32,7 @@
             <view class="message-bubble">
               <text class="message-text">{{ message.content }}</text>
             </view>
-            <view class="message-time">{{ formatTime(message.timestamp) }}</view>
-          </view>
+                      </view>
         </view>
         
         <!-- AI消息 -->
@@ -174,7 +173,7 @@
                 </button>
               </view>
             </view>
-            <view class="message-time">{{ formatTime(message.timestamp) }}</view>
+            
           </view>
         </view>
       </view>
@@ -395,7 +394,7 @@ export default {
     // 是否启用流式响应
     enableStreaming: {
       type: Boolean,
-      default: false
+      default: true
     },
     // 流式响应速度（字符/秒）
     streamSpeed: {
@@ -403,7 +402,7 @@ export default {
       default: 20
     }
   },
-  data() {
+  data(){
     return {
       messages: [],
       inputText: '',
@@ -436,9 +435,35 @@ export default {
       // Dify API相关
       currentConversationId: null,
       isAIServiceAvailable: true,
-      aiServiceError: null
+      aiServiceError: null,
+	  isLoadingHistory: false, // 新增：标记历史加载状态
+      shouldScrollToBottom: false,
+	   scrollTimer: null,
+	  lastScrollTop: 0,
+	  historyOffset: 0,
+	   isFetchingHistory: false
     }
   },
+  onShow() {
+           // 优先读取本地缓存的会话 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;
+               });
+               // 移除：this.historyOffset = 0;（避免覆盖初始历史的偏移量）
+             },
+             // 新增：组件销毁时清除防抖定时器
+             beforeDestroy() {
+               if (this.scrollTimer) clearTimeout(this.scrollTimer);
+             },
   created() {
     this.messages = [...this.initialMessages]
     this.messageId = this.messages.length
@@ -447,21 +472,42 @@ export default {
     this.initUserAvatarData()
     // 初始化用户昵称（缓存优先）
     this.initUserNicknameData()
+	this.currentConversationId = aiService.getConversationId();
   },
-  mounted() {
-    this.scrollToBottom()
-  },
+   mounted() {
+      // 初始加载时滚底（仅一次）
+      this.$nextTick(() => {
+        this.scrollToBottom()
+      })
+    },
   watch: {
-    messages: {
-      handler() {
-        this.$nextTick(() => {
-          this.scrollToBottom()
-        })
-      },
+      messages: {
+        handler() {
+          this.$nextTick(() => {
+            // 仅当不是加载历史、且需要滚底时，才执行滚底
+            if (!this.isLoadingHistory && this.shouldScrollToBottom) {
+              this.scrollToBottom()
+              // 滚底后重置状态，避免重复触发
+              this.shouldScrollToBottom = false
+            }
+          })
+        },
       deep: true
     }
   },
   methods: {
+	  // 【新增：会话 ID 本地缓存方法】
+	   saveConversationIdToLocal(convId) {
+	      if (convId) {
+	        uni.setStorageSync('dify_conversation_id', convId);
+	      }
+	    },
+	    getConversationIdFromLocal() {
+	      return uni.getStorageSync('dify_conversation_id') || null;
+	    },
+	    clearConversationIdFromLocal() {
+	      uni.removeStorageSync('dify_conversation_id');
+	    },
     // 初始化音频上下文
     initAudioContext() {
       // #ifdef H5
@@ -470,7 +516,18 @@ export default {
       }
       // #endif
     },
-    
+        onScroll(e) {
+          const currentScrollTop = e.detail.scrollTop;
+          this.lastScrollTop = currentScrollTop;
+          // 防抖处理：50ms内只执行一次，避免频繁触发
+          if (this.scrollTimer) clearTimeout(this.scrollTimer);
+          this.scrollTimer = setTimeout(() => {
+            // 滚动到顶部附近（<20px）、不在加载中、显示加载更多时，触发加载
+            if (currentScrollTop < 20 && !this.isLoadingHistory && this.showLoadMore) {
+              this.loadMoreHistory();
+            }
+          }, 50);
+        },
     // 初始化用户头像（支持缓存持久化）
     initUserAvatarData() {
       // 1. 优先读取本地缓存的头像
@@ -490,7 +547,43 @@ export default {
         this.localUserAvatar = this.defaultAvatar
       }
     },
-    
+    // 👇 新增：加载历史记录
+   async loadChatHistoryIfExist() {
+     const convId = aiService.getConversationId();
+     if (convId) {
+       try {
+         const history = await aiService.getChatHistory();
+         if (!history || !Array.isArray(history.messages)) {
+           console.warn('历史记录为空或格式无效');
+           return;
+         }
+   
+         this.messages = history.messages.map(msg => {
+           let content = '';
+           if (msg.role === 'user') {
+             content = msg.query || (typeof msg.inputs === 'string' ? msg.inputs : JSON.stringify(msg.inputs || '')) || '';
+           } else {
+             content = msg.answer || '';
+           }
+           return {
+             id: msg.message_id || (Date.now() + Math.random() * 10000),
+             role: msg.role === 'user' ? 'user' : 'assistant',
+             content: content,
+             timestamp: msg.created_at,
+             actions: msg.role !== 'user' ? [
+               { id: 1, text: '有帮助', type: 'like' },
+               { id: 2, text: '没帮助', type: 'dislike' }
+             ] : []
+           };
+         });
+       } catch (error) {
+         console.error('加载历史记录失败:', error);
+         aiService.clearConversationId();
+         this.clearConversationIdFromLocal();
+         this.currentConversationId = null;
+       }
+     }
+   },
     // 新增：初始化用户昵称（支持缓存持久化）
     initUserNicknameData() {
       // 1. 优先读取本地缓存的昵称
@@ -628,7 +721,7 @@ export default {
         content: this.inputText.trim(),
         timestamp: Date.now()
       }
-      
+       this.shouldScrollToBottom = true
       this.messages.push(userMessage)
       this.inputText = ''
       
@@ -640,7 +733,7 @@ export default {
         content: '',
         timestamp: Date.now()
       }
-      
+      this.shouldScrollToBottom = true
       this.messages.push(loadingMessage)
       
       try {
@@ -676,7 +769,7 @@ export default {
             { id: 1, text: '重试', type: 'retry' }
           ]
         }
-        
+        this.shouldScrollToBottom = true
         this.messages.push(errorMessage)
         this.$emit('ai-response', errorMessage)
       }
@@ -697,7 +790,9 @@ export default {
       
       // 更新会话ID
       if (response.conversationId) {
-        this.currentConversationId = response.conversationId
+        this.currentConversationId = response.conversationId;
+		aiService.setConversationId(response.conversationId);
+		  this.saveConversationIdToLocal(response.conversationId);
       }
       
       const aiMessage = {
@@ -713,7 +808,7 @@ export default {
           { id: 2, text: '没帮助', type: 'dislike' }
         ]
       }
-      
+      this.shouldScrollToBottom = true
       this.messages.push(aiMessage)
       this.$emit('ai-response', aiMessage)
     },
@@ -732,34 +827,52 @@ export default {
       
       // 移除加载状态，添加流式消息
       this.messages = this.messages.filter(msg => msg.type !== 'loading')
+	  this.shouldScrollToBottom = true
       this.messages.push(streamMessage)
       
-      // 开始流式响应
-      await aiService.sendStreamMessage(
-        userMessage,
-        // 流式数据回调
-        (chunk) => {
-          streamMessage.content += chunk
-          // 触发内容更新
-          this.$forceUpdate()
-        },
-        // 完成回调
-        (completeContent) => {
-          streamMessage.isStreaming = false
-          streamMessage.content = completeContent
-          
-          // 添加操作按钮
-          streamMessage.actions = [
-            { id: 1, text: '有帮助', type: 'like' },
-            { id: 2, text: '没帮助', type: 'dislike' }
-          ]
-          
-          this.$emit('ai-response', streamMessage)
-        }
-      )
-    },
-    
-    // 生成AI回复（模拟）
+     // 开始流式响应
+     await aiService.sendStreamMessage(
+       userMessage,
+       // 流式数据回调
+       (chunk) => {
+         streamMessage.content += chunk
+         this.$forceUpdate() // 或 this.$nextTick()
+       },
+       // 完成回调：处理对象或字符串
+       (completeResult) => {
+         let finalContent = '';
+         let convId = '';
+     
+         // 判断是对象还是字符串
+         if (typeof completeResult === 'string') {
+           finalContent = completeResult;
+         } else {
+           finalContent = completeResult.content || '';
+           convId = completeResult.conversation_id || ''; // 👈 关键：提取 conversation_id
+         }
+     
+         // 更新消息状态
+         streamMessage.isStreaming = false;
+         streamMessage.content = finalContent;
+     
+         // 添加操作按钮
+         streamMessage.actions = [
+           { id: 1, text: '有帮助', type: 'like' },
+           { id: 2, text: '没帮助', type: 'dislike' }
+         ];
+     
+         //  保存 conversation_id 到本地
+         if (convId) {
+           aiService.setConversationId(convId);
+         }
+     
+         // 触发事件
+         this.$emit('ai-response', streamMessage);
+		 this.saveConversationIdToLocal(convId);
+		 this.currentConversationId = convId;
+       }
+     );
+	 },
     generateAIResponse(userMessage) {
       const responses = {
         '你好': '您好！我是AI智能客服，很高兴为您服务！有什么可以帮助您的吗？',
@@ -767,16 +880,15 @@ export default {
         '发货': '一般情况下，订单会在24小时内发货，具体时效请查看物流信息。',
         '退货': '支持7天无理由退货，请确保商品完好无损。',
         '客服': '我们的客服工作时间是9:00-18:00，有问题可以随时联系我们。'
-      }
-      
+      };
       for (let key in responses) {
         if (userMessage.includes(key)) {
-          return responses[key]
+          return responses[key];
         }
       }
-      
-      return `感谢您的咨询！关于"${userMessage}"的问题，我们的专业客服会尽快为您解答。您也可以查看我们的帮助文档获取更多信息。`
+      return `感谢您的咨询！关于"${userMessage}"的问题，我们的专业客服会尽快为您解答。您也可以查看我们的帮助文档获取更多信息。`;
     },
+  
     
     // 解析Markdown
     parseMarkdown(content) {
@@ -837,37 +949,76 @@ export default {
     },
     
     // 加载更多历史消息
-    loadMoreHistory() {
-      if (!this.showLoadMore) return
-      
-      this.hasMoreHistory = true
-      this.loadingText = '加载历史消息中...'
-      
-      // 模拟加载历史消息
-      setTimeout(() => {
-        const historyMessages = [
-          {
-            id: --this.messageId,
-            role: 'ai',
-            type: 'text',
-            content: '这是历史消息1',
-            timestamp: Date.now() - 86400000
-          },
-          {
-            id: --this.messageId,
-            role: 'user',
-            type: 'text',
-            content: '这是历史消息2',
-            timestamp: Date.now() - 86400000
-          }
-        ]
-        
-        this.messages = [...historyMessages, ...this.messages]
-        this.hasMoreHistory = false
-        this.$emit('history-loaded', historyMessages)
-      }, 1000)
-    },
-    
+ 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 // 改用独立偏移量
+         });
+ 
+         if (response.success && Array.isArray(response.messages) && response.messages.length > 0) {
+           const historyMessages = response.messages.map(msg => ({
+             id: msg.id || `history-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+             role: msg.role === 'user' ? 'user' : 'ai',
+             type: 'text',
+             content: msg.content,
+             timestamp: msg.create_time * 1000
+           }));
+ 
+           // 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 = '加载更多历史消息';
+       }
+     },
     // 显示更多工具
     showMoreTools() {
       this.showToolsPanel = true

components/hover-nav/hover-nav.vue

@@ -1,22 +1,27 @@
 <template>
-	<!-- 悬浮按钮 -->
-	<view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '120rpx' : '120rpx' }">
-		<!-- #ifdef MP-WEIXIN -->
-		<button 
-			class="btn-item" 
-			v-if="fixBtnShow" 
-			hoverClass="none" 
-			openType="contact" 
-			sessionFrom="weapp" 
-			showMessageCard="true" 
+		<!-- 悬浮按钮 -->
+		<view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '330rpx' : '120rpx' }">
+			<!-- AI智能助手 -->
+			<view class="btn-item" v-if="fixBtnShow && enableAIChat" @click="openAIChat" :style="{backgroundImage:'url('+(aiAgentimg?aiAgentimg:'')+')',backgroundSize:'100% 100%'}">
+				<!-- 核心修改：添加🤖表情，保留原有判断逻辑 -->
+				<text class="ai-icon" v-if="!aiAgentimg">🤖</text>
+				<!-- 未读消息小红点 -->
+				<view v-if="unreadCount > 0" class="unread-badge">
+					<text class="badge-text">{{ unreadCount > 99 ? '99+' : unreadCount }}</text>
+				</view>
 			</view>
-		>
-			<text class="icox icox-kefu" v-if="!kefuimg"></text>
-		</button>
-		<!-- #endif -->
-		
-		<!-- 其他按钮（AI 和 电话）已隐藏 -->
-	</view>
+
+			<!-- #ifdef MP-WEIXIN -->
+			<button class="btn-item" v-if="fixBtnShow" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" :style="{backgroundImage:'url('+(kefuimg?kefuimg:'')+')',backgroundSize:'100% 100%'}">
+				<text class="icox icox-kefu" v-if="!kefuimg"></text>
+			</button>
+			<!-- #endif -->
+
+			<!-- 电话 -->
+			<view class="btn-item" v-if="fixBtnShow" @click="call()"  :style="{backgroundImage:'url('+(phoneimg?phoneimg:'')+')',backgroundSize:'100% 100%'}">
+				<text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
+			</view>
+		</view>
 </template>
 
 <script>
@@ -34,9 +39,9 @@
 			return {
 				pageCount: 0,
 				fixBtnShow: true,
-				tel: '',
-				kefuimg: '',
-				phoneimg: ''
+				tel:'',
+				kefuimg:'',
+				phoneimg:''
 			};
 		},
 		created() {
@@ -46,25 +51,26 @@
 
 			var that = this
 			uni.getStorage({
-				key: 'shopInfo',
-				success(e) {
+				key:'shopInfo',
+				success(e){
 					that.tel = e.data.mobile
 				}
 			})
+		
 		},
 		computed: {
 			...mapGetters([
-				'globalAIAgentConfig',
+				'globalAIKefuConfig',
 				'aiUnreadCount'
 			]),
 			aiAgentimg() {
-				return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || ''
+				return this.globalAIKefuConfig?.icon || this.$util.getDefaultImage().aiAgent || '' // AI智能助手的头像
 			},
 			unreadCount() {
 				return this.aiUnreadCount
 			},
 			enableAIChat() {
-				return this.globalAIAgentConfig?.enable || true
+				return this.globalAIKefuConfig?.enable || true // 是否开启AI智能助手
 			},
 		},		
 		methods: {
@@ -72,20 +78,22 @@
 				'setAiUnreadCount'
 			]),
 
-			// 拨打电话（已无调用，可保留或删除）
-			call() {
+			//拨打电话
+			call(){
 				uni.makePhoneCall({
-					phoneNumber: this.tel + ''
+					phoneNumber:this.tel+''
 				})
 			},
 
-			// 打开AI聊天（已无调用，可保留或删除）
+			// 打开AI聊天弹窗
 			openAIChat() {
 				if (this.enableAIChat) {
 					this.setAiUnreadCount(0);
 				}
+
 				this.$util.redirectTo('/pages_tool/ai-chat/index')
 			}
+
 		}
 	};
 </script>
@@ -129,6 +137,7 @@
 		.btn-item {
 			display: flex;
 			justify-content: center;
+			align-items: center; /* 新增：让🤖表情垂直居中 */
 			text-align: center;
 			flex-direction: column;
 			line-height: 1;
@@ -154,12 +163,14 @@
 				transform: rotate(180deg);
 			}
 
+			&.switch {}
+
 			&.icon-xiala {
 				margin: 0;
 				margin-top: 0.1rpx;
 			}
 			
-			// 未读消息小红点（已无使用，可保留样式）
+			// 未读消息小红点
 			.unread-badge {
 				position: absolute;
 				top: -5rpx;
@@ -183,6 +194,16 @@
 					// #endif
 				}
 			}
+
+			// AI图标样式优化（让🤖表情居中显示）
+			.ai-icon {
+				font-size: 40rpx; // 调整🤖表情大小
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 100%;
+				height: 100%;
+			}
 		}
 	}
 </style>

pages.json

@@ -104,14 +104,7 @@
 				"navigationStyle": "custom"
 				// #endif
 			}
-		},
-		{
-			"path": "pages/dify-chat/dify-chat",
-			"style": {
-				"navigationBarTitleText": "智能客服"
-			}
 		}
-		
 	],
 	"subPackages": [
 		{

pages/index/index.vue

@@ -1,236 +1,236 @@
-<template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-		<view class="site-info-box" v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
-			<view class="site-info">
-				<view class="img-box" v-if="siteInfo.logo_square">
-					<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
-				</view>
-				<view class="info-box" :style="{ color: '#ffffff' }">
-					<text class="font-size-base">{{ siteInfo.site_name }}</text>
-					<text>{{ followOfficialAccount.welcomeMsg }}</text>
-				</view>
-			</view>
-			<view class="dite-button" @click="officialAccountsOpen">关注公众号</view>
-		</view>
-
-	<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
-			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
-		</view> -->
-
-		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-			<template v-slot:components>
-				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true" :followOfficialAccount="followOfficialAccount"/>
-			</template>
-			<template v-slot:default>
-				<ns-copyright v-show="isShowCopyRight"/>
-			</template>
-		</diy-index-page>
-
-		<view v-else class="bg-index" :style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :followOfficialAccount="followOfficialAccount"/>
-			<ns-copyright v-show="isShowCopyRight"/>
-		</view>
-
-		<template v-if="adv.advshow != -1">
-			<view @touchmove.prevent.stop>
-				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-					 <view class="small-bot">
-					<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
-							<view bindtap="adverclose">跳过</view>
-							<view class="time">{{clock}}s</view>
-						</view>
-						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
-							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
-						</view> -->
-						<swiper autoplay="true" :circular="true" indicator-active-color="#fff" indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
-							<swiper-item v-for="(item, index) in adv.list" :key="index">
-								<image class="slide-image"  @click="$util.diyRedirectTo(item.link)" height="100%" :src="$util.img(item.imageUrl)" width="100%"></image>
-							<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
-							</swiper-item>
-						</swiper>
-						<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
-							<i class="iconfont icon-round-close" style="color:#fff"></i>
-						</view>
-					</view>
-				<!-- 	<view class="image-wrap">
-						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
-							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
-								<view class="item">
-									<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
-								</view>
-							</swiper-item>
-						</swiper>
-					</view>
-					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
-				</uni-popup>
-			</view>
-		</template>
-
-		<!-- 底部tabBar -->
-		<view class="page-bottom" v-if="openBottomNav">
-			<diy-bottom-nav @callback="callback" :name="name"/>
-		</view>
-
-		<!-- 关注公众号弹窗 -->
-		<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
-			<uni-popup ref="officialAccountsPopup" type="center">
-				<view class="official-accounts-wrap">
-					<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
-					<text class="desc">关注了解更多</text>
-					<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
-				</view>
-			</uni-popup>
-		</view>
-
-		<!-- 收藏 -->
-		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-			<view v-if="showTip" class="collectPopupWindow" :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/>
-				<text @click="closeCollectPopupWindow">我知道了</text>
-			</view>
-		</uni-popup>
-
-		<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
-		<view @touchmove.prevent.stop class="choose-store">
-			<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
-				<view class="choose-store-popup">
-					<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
-					<view class="position-wrap">
-						<text class="iconfont icon-dizhi"></text>
-						<text class="address">{{ currentPosition }}</text>
-						<view class="reposition" @click="reposition" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-							<text class="iconfont icon-dingwei"></text>
-							<text>重新定位</text>
-						</view>
-					</view>
-					<view class="store-wrap" v-if="nearestStore">
-						<text class="tag">当前门店</text>
-						<view class="store-name">{{ nearestStore.store_name }}</view>
-						<view class="address">{{ nearestStore.show_address }}</view>
-						<view class="distance" v-if="nearestStore.distance">
-							<text class="iconfont icon-dizhi"></text>
-							<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance * 1000 + 'm' }}</text>
-						</view>
-					</view>
-					<button type="primary" @click="enterStore">确认进入</button>
-					<view class="other-store" @click="chooseOtherStore" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-						<text>选择其他门店</text>
-						<text class="iconfont icon-right"></text>
-					</view>
-				</view>
-			</uni-popup>
-		</view>
-		<hover-nav></hover-nav>
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-        <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-		<ns-login ref="login"></ns-login>
-	</view>
-</template>
-
-<script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
-	import diyJs from '@/common/js/diy.js';
-	import indexJs from './public/js/index.js';
-    import toTop from '@/components/toTop/toTop.vue';
-    import scroll from '@/common/js/scroll-view.js';
-
-
-	export default {
-		components: {
-			uniPopup,
-			nsNavbar,
-            toTop
-		},
-		mixins: [diyJs, scroll, indexJs]
-	};
-</script>
-
-<style lang="scss">
-	@import '@/common/css/diy.scss';
-	@import './public/css/index.scss';
-	
-	
-	
-	.small-bot {
-	    width: 100%;
-	    height: 100%;
-	    position: fixed;
-	    top: 0;
-	    bottom: 0;
-	    left: 0;
-	    right: 0;
-	    z-index: 122;
-	}
-	
-	.small-bot swiper {
-	    width: 560rpx;
-	    height: 784rpx;
-	    margin: 120rpx auto 0;
-	    border-radius: 10rpx;
-	    overflow: hidden;
-	}
-	
-	.small-bot swiper .slide-image {
-	    width: 100%;
-	    height: 100%;
-	}
-	
-	.small-bot-close {
-	    width: 66rpx;
-	    height: 66rpx;
-	    border-radius: 50%;
-	    text-align: center;
-	    line-height: 64rpx;
-	    font-size: 64rpx;
-	    color: #fff;
-	    margin: 30rpx auto 0;
-	}
-	
-	.small-bot-close i {
-	    font-size: 60rpx;
-	}
-
-</style>
-<style scoped>
-	.swiper /deep/ .uni-swiper-dots-horizontal {
-		left: 40%;
-		bottom:40px
-	}
-	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background: none !important;
-	}
-
-	.choose-store>>>.goodslist-uni-popup-box {
-		width: 80%;
-	}
-
-	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
-		border-radius: 0;
-	}
-
-	/deep/ .placeholder {
-		height: 0;
-	}
-
-	/deep/::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		background-color: transparent;
-		display: none;
-	}
-
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
-    
-    /deep/ .mescroll-totop {
-        right: 24rpx!important; 
-        bottom: 182rpx!important;
-    }
-
+<template>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
+		<view class="site-info-box" v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
+			<view class="site-info">
+				<view class="img-box" v-if="siteInfo.logo_square">
+					<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
+				</view>
+				<view class="info-box" :style="{ color: '#ffffff' }">
+					<text class="font-size-base">{{ siteInfo.site_name }}</text>
+					<text>{{ followOfficialAccount.welcomeMsg }}</text>
+				</view>
+			</view>
+			<view class="dite-button" @click="officialAccountsOpen">关注公众号</view>
+		</view>
+
+	<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
+			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
+		</view> -->
+
+		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+			<template v-slot:components>
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true" :followOfficialAccount="followOfficialAccount"/>
+			</template>
+			<template v-slot:default>
+				<ns-copyright v-show="isShowCopyRight"/>
+			</template>
+		</diy-index-page>
+
+		<view v-else class="bg-index" :style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
+			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :followOfficialAccount="followOfficialAccount"/>
+			<ns-copyright v-show="isShowCopyRight"/>
+		</view>
+
+		<template v-if="adv.advshow != -1">
+			<view @touchmove.prevent.stop>
+				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+					 <view class="small-bot">
+					<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
+							<view bindtap="adverclose">跳过</view>
+							<view class="time">{{clock}}s</view>
+						</view>
+						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
+							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
+						</view> -->
+						<swiper autoplay="true" :circular="true" indicator-active-color="#fff" indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
+							<swiper-item v-for="(item, index) in adv.list" :key="index">
+								<image class="slide-image"  @click="$util.diyRedirectTo(item.link)" height="100%" :src="$util.img(item.imageUrl)" width="100%"></image>
+							<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
+							</swiper-item>
+						</swiper>
+						<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
+							<i class="iconfont icon-round-close" style="color:#fff"></i>
+						</view>
+					</view>
+				<!-- 	<view class="image-wrap">
+						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
+							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
+								<view class="item">
+									<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
+					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
+				</uni-popup>
+			</view>
+		</template>
+
+		<!-- 底部tabBar -->
+		<view class="page-bottom" v-if="openBottomNav">
+			<diy-bottom-nav @callback="callback" :name="name"/>
+		</view>
+
+		<!-- 关注公众号弹窗 -->
+		<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
+			<uni-popup ref="officialAccountsPopup" type="center">
+				<view class="official-accounts-wrap">
+					<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
+					<text class="desc">关注了解更多</text>
+					<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
+				</view>
+			</uni-popup>
+		</view>
+
+		<!-- 收藏 -->
+		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+			<view v-if="showTip" class="collectPopupWindow" :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/>
+				<text @click="closeCollectPopupWindow">我知道了</text>
+			</view>
+		</uni-popup>
+
+		<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
+		<view @touchmove.prevent.stop class="choose-store">
+			<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
+				<view class="choose-store-popup">
+					<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
+					<view class="position-wrap">
+						<text class="iconfont icon-dizhi"></text>
+						<text class="address">{{ currentPosition }}</text>
+						<view class="reposition" @click="reposition" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+							<text class="iconfont icon-dingwei"></text>
+							<text>重新定位</text>
+						</view>
+					</view>
+					<view class="store-wrap" v-if="nearestStore">
+						<text class="tag">当前门店</text>
+						<view class="store-name">{{ nearestStore.store_name }}</view>
+						<view class="address">{{ nearestStore.show_address }}</view>
+						<view class="distance" v-if="nearestStore.distance">
+							<text class="iconfont icon-dizhi"></text>
+							<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance * 1000 + 'm' }}</text>
+						</view>
+					</view>
+					<button type="primary" @click="enterStore">确认进入</button>
+					<view class="other-store" @click="chooseOtherStore" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+						<text>选择其他门店</text>
+						<text class="iconfont icon-right"></text>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		<hover-nav></hover-nav>
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+        <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+		<ns-login ref="login"></ns-login>
+	</view>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+	import diyJs from '@/common/js/diy.js';
+	import indexJs from './public/js/index.js';
+    import toTop from '@/components/toTop/toTop.vue';
+    import scroll from '@/common/js/scroll-view.js';
+
+
+	export default {
+		components: {
+			uniPopup,
+			nsNavbar,
+            toTop
+		},
+		mixins: [diyJs, scroll, indexJs]
+	};
+</script>
+
+<style lang="scss">
+	@import '@/common/css/diy.scss';
+	@import './public/css/index.scss';
+	
+	
+	
+	.small-bot {
+	    width: 100%;
+	    height: 100%;
+	    position: fixed;
+	    top: 0;
+	    bottom: 0;
+	    left: 0;
+	    right: 0;
+	    z-index: 122;
+	}
+	
+	.small-bot swiper {
+	    width: 560rpx;
+	    height: 784rpx;
+	    margin: 120rpx auto 0;
+	    border-radius: 10rpx;
+	    overflow: hidden;
+	}
+	
+	.small-bot swiper .slide-image {
+	    width: 100%;
+	    height: 100%;
+	}
+	
+	.small-bot-close {
+	    width: 66rpx;
+	    height: 66rpx;
+	    border-radius: 50%;
+	    text-align: center;
+	    line-height: 64rpx;
+	    font-size: 64rpx;
+	    color: #fff;
+	    margin: 30rpx auto 0;
+	}
+	
+	.small-bot-close i {
+	    font-size: 60rpx;
+	}
+
+</style>
+<style scoped>
+	.swiper /deep/ .uni-swiper-dots-horizontal {
+		left: 40%;
+		bottom:40px
+	}
+	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		background: none !important;
+	}
+
+	.choose-store>>>.goodslist-uni-popup-box {
+		width: 80%;
+	}
+
+	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+		border-radius: 0;
+	}
+
+	/deep/ .placeholder {
+		height: 0;
+	}
+
+	/deep/::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+		display: none;
+	}
+
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
+    
+    /deep/ .mescroll-totop {
+        right: 24rpx!important; 
+        bottom: 182rpx!important;
+    }
+
 </style>

project.config.json

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": true,
@@ -38,20 +37,20 @@
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "compileWorklet": false,
-    "minifyWXML": true,
-    "localPlugins": false,
-    "disableUseStrict": false,
-    "useCompilerPlugins": false,
-    "condition": false,
-    "swc": false,
-    "disableSWC": true
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.12.0",
+  "libVersion": "2.16.1",
   "appid": "wx29215aa1bd97bbd6",
   "projectname": "niushop_b2c_v4_uniapp",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "scripts": {},
+  "staticServerOptions": {
+    "baseURL": "",
+    "servePath": ""
+  },
   "isGameTourist": false,
   "condition": {
     "search": {
@@ -72,7 +71,5 @@
     "miniprogram": {
       "list": []
     }
-  },
-  "simulatorPluginLibVersion": {},
-  "editorSetting": {}
+  }
 }