feat：华为支付完成

.gitignore

@@ -2,3 +2,4 @@
 /.hbuilderx
 /.idea
 /node_modules
+/iconfont-preview.html

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "codingcopilot.enableCompletionLanguage": {}
+}

App.vue

@@ -4,8 +4,6 @@
 	import {
 		Weixin
 	} from 'common/js/wx-jssdk.js';
-	// 新增：引入多语言核心工具类
-    import langConfig from '@/common/js/lang.js';
 
 	export default {
 		mixins: [auth],
@@ -17,9 +15,6 @@
 			}
 			uni.hideTabBar();
 
-			// 新增：应用启动时初始化多语言（核心修改）
-			this.initLang();
-
 			// #ifdef MP
 			const updateManager = uni.getUpdateManager();
 			updateManager.onCheckForUpdate(function(res) {
@@ -28,8 +23,8 @@
 
 			updateManager.onUpdateReady(function(res) {
 				uni.showModal({
-					title: langConfig.lang('common.updateTip'), // 新增：多语言标题
+					title: '更新提示',
-					content: langConfig.lang('common.updateContent'), // 新增：多语言内容
+					content: '新版本已经准备好，是否重启应用？',
 					success(res) {
 						if (res.confirm) {
 							// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
@@ -53,8 +48,8 @@
 			uni.onNetworkStatusChange(function(res) {
 				if (!res.isConnected) {
 					uni.showModal({
-						title: langConfig.lang('common.networkTip'), // 新增：多语言标题
+						title: '网络失去链接',
-						content: langConfig.lang('common.networkContent'), // 新增：多语言内容
+						content: '请检查网络链接',
 						showCancel: false
 					});
 				}
@@ -149,9 +144,6 @@
 			// #endif
 		},
 		onShow: function(options) {
-			// 新增：应用前台显示时刷新多语言（确保切后台后语言仍生效）
-			langConfig.refresh();
-
 			// #ifdef MP
 			// 自动授权登录
 			this.getAuthInfo();
@@ -173,19 +165,6 @@
 		},
 		onHide: function() {},
 		methods: {
-			// 新增：多语言初始化方法
-			initLang() {
-				// 1. 读取本地存储的语言，无则默认中文
-				const currentLang = uni.getStorageSync('lang') || 'zh-cn';
-				// 2. 初始化lang.js的locale变量（确保全局语言一致）
-				langConfig.locale = currentLang;
-				// 3. 刷新多语言配置（标题、tabBar等）
-				langConfig.refresh();
-				// 4. 挂载全局多语言方法（方便所有页面直接调用）
-				uni.$lang = langConfig.lang;
-				// 5. 挂载全局语言切换方法（可选，方便全局调用）
-				uni.$switchLang = langConfig.change;
-			},
 			/**
 			 * 获取授权信息
 			 */

common/js/ai-service.js

@@ -0,0 +1,356 @@
+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.globalAIAgentConfig
+      
+      // 构建Dify API请求参数
+      const params = {
+        url: '/api/ai/chat', // 后端代理接口
+        data: {
+          message: message,
+          conversation_id: options.conversationId || this.generateConversationId(),
+          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'
+        }
+      }
+      
+      // 如果有Dify配置，添加API密钥
+      if (aiConfig?.difyApiKey) {
+        params.header['Authorization'] = `Bearer ${aiConfig.difyApiKey}`
+      }
+      
+      if (aiConfig?.difyBaseUrl) {
+        params.header['X-Dify-Url'] = aiConfig.difyBaseUrl
+      }
+      
+      // 发送请求
+      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 {
+      const aiConfig = store.getters.globalAIAgentConfig
+      
+      // 检查配置
+      if (!aiConfig?.difyBaseUrl || !aiConfig?.difyApiKey) {
+        throw new Error('未配置Dify服务')
+      }
+      
+      // 创建WebSocket连接或使用Server-Sent Events
+      if (aiConfig?.difyWsUrl) {
+        return this.connectWebSocket(message, onChunk, onComplete)
+      } else {
+        // 使用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.globalAIAgentConfig
+      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.globalAIAgentConfig
+    
+    const params = {
+      url: '/api/ai/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(`${aiConfig.difyBaseUrl}/chat-messages`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${aiConfig.difyApiKey}`
+        },
+        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,
+        conversationId: response.data?.conversation_id,
+        messageId: response.data?.message_id
+      }
+    } else {
+      throw new Error(response.message || 'AI服务返回错误')
+    }
+  },
+  
+  /**
+   * 生成会话ID
+   */
+  generateConversationId() {
+    return 'conv_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9)
+  },
+  
+  /**
+   * 获取AI服务状态
+   */
+  async getServiceStatus() {
+    try {
+      const aiConfig = store.getters.globalAIAgentConfig
+      
+      if (!aiConfig?.difyBaseUrl || !aiConfig?.difyApiKey) {
+        return {
+          available: false,
+          reason: '未配置Dify服务'
+        }
+      }
+      
+      // 简单的健康检查
+      const response = await http.sendRequest({
+        url: '/api/ai/health',
+        async: false
+      })
+      
+      return {
+        available: response.success,
+        reason: response.success ? '服务正常' : '服务异常'
+      }
+      
+    } catch (error) {
+      return {
+        available: false,
+        reason: '服务检查失败'
+      }
+    }
+  },
+  
+  /**
+   * 清除会话历史
+   */
+  async clearConversation(conversationId) {
+    try {
+      const response = await http.sendRequest({
+        url: '/api/ai/clear-conversation',
+        data: { conversation_id: conversationId },
+        async: false
+      })
+      
+      return response.success
+      
+    } catch (error) {
+      console.error('清除会话失败:', error)
+      return false
+    }
+  }
+}

common/js/config.js

@@ -14,16 +14,19 @@ try {
 // 调试版本，配置说明
 const devCfg = {
     // 商户ID
-    uniacid: 2285, //825
+    uniacid: 1, //825
 
     //api请求地址
-    baseUrl: 'https://xcx.aigc-quickapp.com/',
+    baseUrl: 'https://dev.aigc-quickapp.com/',
+    // baseUrl: 'http://localhost:8010/',
 
     // 图片域名
-    imgDomain: 'https://xcx.aigc-quickapp.com/',
+    imgDomain: 'https://dev.aigc-quickapp.com/',
+    //imgDomain: 'http://localhost:8010/',
 
     // H5端域名
-    h5Domain: 'https://xcx.aigc-quickapp.com/',
+    h5Domain: 'https://dev.aigc-quickapp.com/',
+    // h5Domain: 'http://localhost:8010/',
 
     // // api请求地址
     // baseUrl: 'https://tsaas.liveplatform.cn/',

common/js/event-safety.js

@@ -0,0 +1,112 @@
+// 事件安全处理工具
+export class EventSafety {
+  // 创建安全的事件对象
+  static createSafeEvent(originalEvent = {}) {
+    const safeEvent = {
+      type: originalEvent.type || 'unknown',
+      timeStamp: originalEvent.timeStamp || Date.now(),
+      detail: originalEvent.detail || {},
+      // 安全的目标对象
+      get target() {
+        return EventSafety.createSafeTarget(originalEvent.target)
+      },
+      get currentTarget() {
+        return EventSafety.createSafeTarget(originalEvent.currentTarget)
+      },
+      // 安全的 matches 方法
+      matches(selector) {
+        return EventSafety.safeMatches(originalEvent.target, selector)
+      }
+    }
+    
+    return new Proxy(safeEvent, {
+      get(obj, prop) {
+        // 防止访问不存在的属性
+        if (prop in obj) {
+          return obj[prop]
+        }
+        return undefined
+      }
+    })
+  }
+  
+  // 创建安全的目标对象
+  static createSafeTarget(target) {
+    if (!target || typeof target !== 'object') {
+      return EventSafety.getFallbackTarget()
+    }
+    
+    const safeTarget = {
+      // 基础属性
+      tagName: target.tagName || '',
+      id: target.id || '',
+      className: target.className || '',
+      // 安全的方法
+      matches: (selector) => EventSafety.safeMatches(target, selector),
+      // 数据集
+      dataset: target.dataset || {}
+    }
+    
+    return safeTarget
+  }
+  
+  // 安全的 matches 检查
+  static safeMatches(element, selector) {
+    if (!element || typeof element.matches !== 'function') {
+      return false
+    }
+    
+    try {
+      return element.matches(selector)
+    } catch (error) {
+      console.warn('matches 检查失败:', error)
+      return false
+    }
+  }
+  
+  // 回退目标对象
+  static getFallbackTarget() {
+    return {
+      tagName: '',
+      id: '',
+      className: '',
+      matches: () => false,
+      dataset: {}
+    }
+  }
+  
+  // 包装事件处理器
+  static wrapEventHandler(handler, options = {}) {
+    return function(event) {
+      try {
+        // 创建安全的事件对象
+        const safeEvent = EventSafety.createSafeEvent(event)
+        return handler.call(this, safeEvent)
+      } catch (error) {
+        console.error('事件处理错误:', error)
+        // 可选的错误处理
+        if (options.onError) {
+          options.onError(error, event, this)
+        }
+      }
+    }
+  }
+  
+  // 验证事件类型
+  static isValidEventType(event, expectedType) {
+    return event && event.type === expectedType
+  }
+  
+  // 提取安全的事件数据
+  static extractEventData(event, fields = ['type', 'timeStamp', 'detail']) {
+    const result = {}
+    
+    fields.forEach(field => {
+      if (event && field in event) {
+        result[field] = event[field]
+      }
+    })
+    
+    return result
+  }
+}

common/js/lang.js

@@ -1,136 +1,129 @@
 const langList = ['zh-cn', 'en-us'];
 
-var locale = uni.getStorageSync('lang') || "zh-cn"; // 设置默认语言
+var locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
 
 export default {
 	langList: ['zh-cn', 'en-us'],
 	/**
-	 * 解析多语言
+	 * * 解析多语言
-	 * @param {String} field 语言包字段（如 'common.title'）
+	 * @param {Object} field
-	 * @returns {String} 对应语言的文字
 	 */
 	lang(field) {
 		let _this = getCurrentPages()[getCurrentPages().length - 1];
-		if (!_this) return field; // 无页面时返回原字段，避免undefined
+		if (!_this) return;
 
-		var value = field; // 默认返回原字段，防止空白
+		var value = '';
 		let newRoute;
 		try {
-			// 1. 加载公共语言包（核心，兜底）
+			//公共语言包
-			var commonLang = require('../../lang/' + locale + '/common.js').lang;
+			var lang = require('../../lang/' + locale + '/common.js').lang;
-			// 2. 加载当前页面语言包（可选，失败不影响）
+		
+			//当前页面语言包
 			let route = _this.route.split("/");
 			newRoute = route.slice(1, route.length);
-			let currentPageLang = {};
+			let currentPageLang = require('../../lang/' + locale + '/' + newRoute.join("/") + '.js').lang;
-			// 容错：页面语言包不存在时不报错
+
-			try {
+			for (let f in currentPageLang) {
-				currentPageLang = require('../../lang/' + locale + '/' + newRoute.join("/") + '.js').lang;
+				lang[f] = currentPageLang[f];
-			} catch (e) {
+			}
-				console.warn(`当前页面(${newRoute.join("/")})无${locale}语言包`);
-			}
-			// 合并：页面语言包覆盖公共语言包
-			var lang = { ...commonLang, ...currentPageLang };
 
-			// 解析字段（支持多级，如 'common.langSwitchBtn'）
 			var arr = field.split(".");
 			if (arr.length > 1) {
-				value = lang; // 初始化为完整语言包
+				for (let i in arr) {
-				for (let i = 0; i < arr.length; i++) {
+					var next = parseInt(i) + 1;
-					if (!value[arr[i]]) break; // 字段不存在时终止，避免报错
+					if (next < arr.length) {
-					value = value[arr[i]];
+						value = lang[arr[i]][arr[next]];
+					}
 				}
+				
 			} else {
-				value = lang[field] || field; // 字段不存在返回原字段
+				value = lang[field];
 			}
 			
 		} catch (e) {
-			console.error("语言包解析失败：", e);
+			if (field.indexOf("common.") != -1 || field.indexOf("tabBar.") != -1) {
-			value = field; // 兜底：返回原字段，避免空白
+				value = lang[field];
+			} else {
+				value = field;
+			}
+		
 		}
 
-		// 替换参数（如 'hello {0}' → 'hello 世界'）
 		if (arguments.length > 1) {
+			//有参数,需要替换
 			for (var i = 1; i < arguments.length; i++) {
-				value = value.replace("{" + (i - 1) + "}", arguments[i] || "");
+				value = value.replace("{" + (i - 1) + "}", arguments[i]);
 			}
 		}
-		// 最终兜底：避免返回undefined/空字符串
+		if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field
-		return value || field;
+		return value;
 	},
-	// 切换语言（核心修复：防白屏+全局事件）
+	//切换语言
 	change(value) {
-		// 1. 校验语言值合法性
+		let _this = getCurrentPages()[getCurrentPages().length - 1];
-		if (!langList.includes(value)) {
+		if (!_this) return;
-			console.error("语言值不合法：", value);
+
-			return;
-		}
-		// 2. 保存语言到本地存储
 		uni.setStorageSync("lang", value);
-		locale = value; // 更新全局locale，立即生效
+		locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
-		// 3. 刷新标题/tabBar（保留原有逻辑）
+		
 		this.refresh();
-		// 4. 触发全局语言切换事件（通知所有页面/组件更新）
+
-		uni.$emit('lang-changed', value);
+		uni.reLaunch({
-		// 5. 修复白屏：延迟重启当前页面（而非固定会员页）
+			url: '/pages/member/index'
-		setTimeout(() => {
+		});
-			let currentPage = getCurrentPages()[getCurrentPages().length - 1];
-			if (currentPage) {
-				uni.reLaunch({
-					url: '/' + currentPage.route // 重启当前页面，而非固定会员页
-				});
-			} else {
-				uni.reLaunch({ url: '/pages/index/index' }); // 兜底：重启首页
-			}
-		}, 300); // 300ms延迟：确保语言配置加载完成，避免白屏
 	},
-	// 刷新标题、tabbar（优化：容错+强制生效）
+	//刷新标题、tabbar
 	refresh() {
 		let _this = getCurrentPages()[getCurrentPages().length - 1];
 		if (!_this) return;
-		locale = uni.getStorageSync('lang') || "zh-cn"; // 重新读取，确保最新
+		locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言
+	
+		this.title(this.lang("title"));
 
-		// 刷新导航栏标题（容错：标题字段不存在时不报错）
+		//设置tabbar的文字语言
-		let titleText = this.lang("title") || "";
+		// uni.setTabBarItem({
-		this.title(titleText);
+		// 	index: 0,
-
+		// 	text: this.lang("tabBar.home")
-		// 修复：启用tabBar文字更新（原代码被注释，导致tabBar语言不切换）
+		// });
-		try {
+		// uni.setTabBarItem({
-			uni.setTabBarItem({ index: 0, text: this.lang("tabBar.home") || "首页" });
+		// 	index: 1,
-			uni.setTabBarItem({ index: 1, text: this.lang("tabBar.category") || "分类" });
+		// 	text: this.lang("tabBar.category")
-			uni.setTabBarItem({ index: 2, text: this.lang("tabBar.cart") || "购物车" });
+		// });
-			uni.setTabBarItem({ index: 3, text: this.lang("tabBar.member") || "我的" });
+		// uni.setTabBarItem({
-		} catch (e) {
+		// 	index: 2,
-			console.warn("tabBar文字更新失败：", e);
+		// 	text: this.lang("tabBar.cart")
-		}
+		// });
+		// uni.setTabBarItem({
+		// 	index: 3,
+		// 	text: this.lang("tabBar.member")
+		// });
 	},
-	// 设置导航栏标题（优化：容错）
 	title(str) {
-		if (str && typeof str === 'string') {
+		if (str) {
 			uni.setNavigationBarTitle({
 				title: str,
+				success: function (res) {
+				},
 				fail: function (err) {
-					console.warn("导航栏标题设置失败：", err);
 				}
 			});
 		}
 	},
-	// 获取语言包列表（优化：容错）
+	// 获取语言包列表
 	list() {
 		var list = [];
 		try {
+			//公共语言包
 			for (var i = 0; i < langList.length; i++) {
-				let langPath = '../../lang/' + langList[i] + '/common.js';
+				let item = require('../../lang/' + langList[i] + '/common.js').lang;
-				let item = require(langPath).lang;
 				list.push({
-					name: item.common.name || langList[i], // 兜底：显示语言值
+					name: item.common.name,
 					value: langList[i]
 				});
 			}
 		} catch (e) {
-			console.error("获取语言包列表失败：", e);
+			// "没有找到语言包:", '../../lang/' + locale + '/common.js'
-			// 兜底：返回基础列表
-			list = langList.map(item => ({ name: item, value: item }));
 		}
 		return list;
 	}
-}
+}

common/js/navigation.js

@@ -0,0 +1,288 @@
+import { EventSafety } from './event-safety'
+
+export class NavigationHelper {
+  constructor() {
+    this.navigationCache = new Map()
+  }
+
+  // 安全地获取导航栏高度
+  async getNavigationHeight(component, options = {}) {
+    const cacheKey = `nav_height`
+
+    // 检查缓存
+    if (this.navigationCache.has(cacheKey) && !options.forceRefresh) {
+      return this.navigationCache.get(cacheKey)
+    }
+
+    // 获取高度
+    try {
+      // 尝试直接获取 uni-page-head
+      const height = await this.getDirectNavigationHeight(component)
+      if (height > 0) {
+        this.navigationCache.set(cacheKey, height)
+        return height
+      }
+      
+      // 备用方案：平台特定方法
+      const platformHeight = await this.getPlatformNavigationHeight()
+      this.navigationCache.set(cacheKey, platformHeight)
+      return platformHeight
+    } catch (error) {
+      console.warn('获取导航栏高度失败，使用默认值:', error)
+      const defaultHeight = this.getDefaultNavHeight()
+      this.navigationCache.set(cacheKey, defaultHeight)
+      return defaultHeight
+    }
+  }
+  
+  // 直接查询导航栏高度
+  getDirectNavigationHeight(component) {
+    return new Promise((resolve) => {
+      const query = uni.createSelectorQuery().in(component)
+      
+      query.select('.uni-page-head').boundingClientRect((rect) => {
+        if (rect && rect.height > 0) {
+          console.log('直接查询导航栏高度成功:', rect.height)
+          resolve(rect.height)
+        } else {
+          console.warn('未找到 uni-page-head 元素或高度为0')
+          resolve(0)
+        }
+      }).exec()
+    })
+  }
+  
+  // 平台特定的高度获取
+  getPlatformNavigationHeight() {
+    return new Promise((resolve) => {
+      // #ifdef MP-WEIXIN
+      // 微信小程序精确计算
+      try {
+        const menuButtonInfo = wx.getMenuButtonBoundingClientRect()
+        const systemInfo = uni.getSystemInfoSync()
+        
+        const height = menuButtonInfo.bottom + 
+                      (menuButtonInfo.top - systemInfo.statusBarHeight)
+        console.log('微信小程序导航栏高度:', height)                    
+        resolve(height)
+      } catch (error) {
+        console.error('微信小程序高度计算失败:', error)
+        resolve(44)
+      }
+
+      // #endif
+      
+      // #ifdef H5
+      // H5环境：尝试获取自定义导航栏或使用默认值
+      if (typeof document !== 'undefined') {
+        const customNav = document.querySelector('.uni-page-head')
+        if (customNav) {
+          resolve(customNav.offsetHeight)
+        } else {
+          resolve(44) // 默认导航栏高度
+        }
+      } else {
+        resolve(44)
+      }
+      // #endif
+      
+      // #ifdef APP-PLUS
+      // App端：状态栏 + 导航栏
+      try {
+        const statusBarHeight = plus.navigator.getStatusbarHeight()
+        resolve(statusBarHeight + 44)
+      } catch (error) {
+        console.error('App端高度获取失败:', error)
+        resolve(88)
+      }
+      // #endif
+      
+      // 默认值
+      resolve(44)
+    })
+  }
+  
+  // 获取默认高度
+  getDefaultHeight() {
+    // #ifdef MP-WEIXIN
+    return 44 // 微信小程序默认
+    // #endif
+    // #ifdef H5
+    return 44 // H5默认
+    // #endif
+    // #ifdef APP-PLUS
+    return 88 // App默认（状态栏44 + 导航栏44）
+    // #endif
+    return 44
+  }
+  
+  // 获取状态栏高度
+  getStatusBarHeight() {
+    // #ifdef MP-WEIXIN
+    const systemInfo = uni.getSystemInfoSync()
+    return systemInfo.statusBarHeight || 20
+    // #endif
+    // #ifdef H5
+    return 0 // H5通常没有状态栏
+    // #endif
+    // #ifdef APP-PLUS
+    try {
+      return plus.navigator.getStatusbarHeight()
+    } catch (error) {
+      return 44
+    }
+    // #endif
+    return 0
+  }
+
+  // 获取安全区域
+  getSafeAreaInsets() {
+    try {
+      const systemInfo = uni.getSystemInfoSync()
+      return systemInfo.safeArea || {
+        top: 0,
+        bottom: 0,
+        left: 0,
+        right: 0
+      }
+    } catch (error) {
+      return {
+        top: 0,
+        bottom: 0,
+        left: 0,
+        right: 0
+      }
+    }
+  } 
+
+  // 创建安全的事件处理器
+  createSafeEventHandler(handler, options = {}) {
+    return EventSafety.wrapEventHandler(handler, options)
+  }  
+
+  // 安全地处理服务请求事件
+  createServiceRequestHandler(component) {
+    return this.createSafeEventHandler((event) => {
+      return this.handleServiceRequest(event, component)
+    }, {
+      onError: (error, event) => {
+        this.handleNavigationError(error, event, component)
+      }
+    })
+  }  
+
+  // 处理服务请求
+  async handleServiceRequest(event, component) {
+    console.log('处理导航相关服务请求:', event.type)
+    
+    // 安全检查事件目标
+    if (this.shouldProcessNavigationRequest(event)) {
+      await this.processNavigationRequest(event, component)
+    }
+  }
+  
+  // 检查是否应该处理导航请求
+  shouldProcessNavigationRequest(event) {
+    // 方法1：检查事件类型
+    if (event.type === 'service.requestComponentInfo') {
+      return true
+    }
+    
+    // 方法2：检查目标元素
+    if (event.matches('.navigation-component') || event.matches('.uni-page-head')) {
+      return true
+    }
+    
+    // 方法3：检查事件详情
+    if (event.detail && event.detail.componentType === 'navigation') {
+      return true
+    }
+    
+    return false
+  }
+  
+  // 处理导航请求
+  async processNavigationRequest(event, component) {
+    try {
+      // 获取导航栏信息
+      const navInfo = await this.getNavigationInfo(component)
+      
+      // 发送响应
+      this.emitNavigationResponse(navInfo, component)
+      
+    } catch (error) {
+      console.error('处理导航请求失败:', error)
+      throw error
+    }
+  }  
+  
+
+  // 获取完整的导航信息
+  async getNavigationInfo(component) {
+    const [navHeight, statusBarHeight, safeArea] = await Promise.all([
+      this.getNavigationHeight(component),
+      this.getStatusBarHeight(),
+      this.getSafeAreaInsets()
+    ])
+    
+    return {
+      navHeight,
+      statusBarHeight,
+      safeArea,
+      timestamp: Date.now()
+    }
+  }
+  
+  // 发送导航响应
+  emitNavigationResponse(navInfo, component) {
+    if (component && component.$emit) {
+      component.$emit('navigation.infoResponse', {
+        success: true,
+        data: navInfo,
+        timestamp: Date.now()
+      })
+    }
+  }  
+
+  // 错误处理
+  handleNavigationError(error, event, component) {
+    console.error('导航处理错误:', {
+      error: error.message,
+      eventType: event?.type,
+      component: component?.$options?.name
+    })
+    
+    // 发送错误响应
+    if (component && component.$emit) {
+      component.$emit('navigation.infoError', {
+        success: false,
+        error: error.message,
+        timestamp: Date.now()
+      })
+    }
+    
+    // 显示用户友好的错误信息
+    this.showError('导航服务暂时不可用')
+  }
+  
+  // 显示错误提示
+  showError(message) {
+    uni.showToast({
+      title: message,
+      icon: 'none',
+      duration: 2000
+    })
+  }  
+  
+  // 清理缓存
+  clearCache() {
+    this.navigationCache.clear()
+    console.log('导航缓存已清理')
+  }
+  
+}
+
+// 创建全局实例
+const navigationHelper = new NavigationHelper()
+
+export default navigationHelper

components/ai-chat-message/README.md

@@ -0,0 +1,271 @@
+# AI智能客服组件
+
+一个功能完整的AI智能客服对话组件，支持多种消息类型和交互功能。
+
+## 功能特性
+
+- ✅ 支持对话上下文管理
+- ✅ 支持多种消息类型：文本、Markdown、文件、音频、视频、链接、商品卡片
+- ✅ 支持语音输入和录音
+- ✅ 支持图片、文件、位置等附件发送
+- ✅ 支持消息操作按钮（点赞、踩等）
+- ✅ 支持历史消息加载
+- ✅ 响应式设计，适配多端
+
+## 安装使用
+
+### 1. 引入组件
+
+在 `pages.json` 中注册组件：
+
+```json
+{
+  "usingComponents": {
+    "ai-chat-message": "/components/ai-chat-message/ai-chat-message"
+  }
+}
+```
+
+### 2. 在页面中使用
+
+```vue
+<template>
+  <view class="container">
+    <ai-chat-message 
+      ref="chat"
+      :initial-messages="messages"
+      @message-sent="onMessageSent"
+      @ai-response="onAIResponse"
+      @action-click="onActionClick" />
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      messages: [
+        {
+          id: 1,
+          role: 'ai',
+          type: 'text',
+          content: '您好！我是AI智能客服，有什么可以帮助您的吗？',
+          timestamp: Date.now()
+        }
+      ]
+    }
+  },
+  methods: {
+    onMessageSent(message) {
+      console.log('用户发送消息:', message)
+    },
+    onAIResponse(message) {
+      console.log('AI回复消息:', message)
+    },
+    onActionClick({ action, message }) {
+      console.log('操作点击:', action, message)
+    }
+  }
+}
+</script>
+```
+
+## Props 配置
+
+| 参数 | 类型 | 默认值 | 说明 |
+|------|------|--------|------|
+| initialMessages | Array | [] | 初始消息列表 |
+| userAvatar | String | '/static/images/default-avatar.png' | 用户头像 |
+| aiAvatar | String | '/static/images/ai-avatar.png' | AI头像 |
+| showLoadMore | Boolean | true | 是否显示加载更多 |
+| maxMessages | Number | 100 | 最大消息数量 |
+
+## Events 事件
+
+| 事件名 | 参数 | 说明 |
+|--------|------|------|
+| message-sent | message | 用户发送消息 |
+| ai-response | message | AI回复消息 |
+| action-click | {action, message} | 操作按钮点击 |
+| history-loaded | messages | 历史消息加载完成 |
+| file-preview | message | 文件预览 |
+| audio-play | message | 音频播放 |
+| audio-pause | message | 音频暂停 |
+| video-play | message | 视频播放 |
+| video-pause | message | 视频暂停 |
+| link-open | message | 链接打开 |
+| product-view | message | 商品查看 |
+| input-change | value | 输入内容变化 |
+
+## 消息类型格式
+
+### 文本消息
+```javascript
+{
+  id: 1,
+  role: 'user', // 或 'ai'
+  type: 'text',
+  content: '消息内容',
+  timestamp: Date.now()
+}
+```
+
+### Markdown消息
+```javascript
+{
+  id: 2,
+  role: 'ai',
+  type: 'markdown',
+  content: '# 标题\n**粗体** *斜体* `代码`',
+  timestamp: Date.now()
+}
+```
+
+### 文件消息
+```javascript
+{
+  id: 3,
+  role: 'ai',
+  type: 'file',
+  fileName: '文档.pdf',
+  fileSize: 1024000,
+  url: '文件地址',
+  timestamp: Date.now()
+}
+```
+
+### 音频消息
+```javascript
+{
+  id: 4,
+  role: 'ai',
+  type: 'audio',
+  title: '语音消息',
+  duration: 60, // 秒
+  url: '音频地址',
+  timestamp: Date.now()
+}
+```
+
+### 视频消息
+```javascript
+{
+  id: 5,
+  role: 'ai',
+  type: 'video',
+  title: '产品介绍',
+  duration: 120, // 秒
+  url: '视频地址',
+  cover: '封面图',
+  timestamp: Date.now()
+}
+```
+
+### 链接消息
+```javascript
+{
+  id: 6,
+  role: 'ai',
+  type: 'link',
+  title: '帮助文档',
+  description: '详细的使用说明',
+  url: 'https://example.com',
+  image: '缩略图',
+  timestamp: Date.now()
+}
+```
+
+### 商品卡片
+```javascript
+{
+  id: 7,
+  role: 'ai',
+  type: 'product',
+  title: '商品名称',
+  price: 299,
+  description: '商品描述',
+  image: '商品图片',
+  timestamp: Date.now()
+}
+```
+
+## 方法
+
+通过 ref 调用组件方法：
+
+```javascript
+// 添加消息
+this.$refs.chat.addMessage(message)
+
+// 清空消息
+this.$refs.chat.clearMessages()
+
+// 滚动到底部
+this.$refs.chat.scrollToBottom()
+```
+
+## 样式定制
+
+组件使用 SCSS 编写，可以通过 CSS 变量进行主题定制：
+
+```css
+.ai-chat-container {
+  --primary-color: #ff4544;
+  --bg-color: #f8f8f8;
+  --text-color: #333;
+}
+```
+
+## 方法
+
+通过 ref 调用组件方法：
+
+```javascript
+// 添加消息
+this.$refs.chat.addMessage(message)
+
+// 清空消息
+this.$refs.chat.clearMessages()
+
+// 滚动到底部
+this.$refs.chat.scrollToBottom()
+
+// 开始语音输入
+this.$refs.chat.startVoiceInput()
+
+// 停止语音输入
+this.$refs.chat.stopVoiceInput()
+```
+
+## 样式定制
+
+组件使用 SCSS 编写，可以通过 CSS 变量进行主题定制：
+
+```css
+.ai-chat-container {
+  --primary-color: #ff4544;
+  --bg-color: #f8f8f8;
+  --text-color: #333;
+  --border-color: #eeeeee;
+  --user-bg: #e6f7ff;
+  --ai-bg: #f6f6f6;
+}
+```
+
+## 图标字体
+
+组件使用自定义图标字体，需要在页面中引入：
+
+```html
+<style>
+@import url('/components/ai-chat-message/iconfont.css');
+</style>
+```
+
+## 注意事项
+
+1. 组件已适配项目中已有的 `ns-loading` 组件
+2. 需要配置对应的图标字体文件
+3. 音频播放功能在 H5 和 APP 端支持较好
+4. 文件预览功能依赖平台能力
+5. 语音输入功能需要用户授权麦克风权限

components/ai-chat-message/ai-chat-message.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "ns-loading": "../ns-loading/ns-loading"
+  }
+}

components/ai-chat-message/demo.vue

@@ -0,0 +1,288 @@
+<template>
+  <view class="demo-container">
+    <view class="demo-header">
+      <text class="demo-title">AI智能客服组件演示</text>
+    </view>
+    
+    <ai-chat-message 
+      ref="chat"
+      :initial-messages="demoMessages"
+      user-avatar="/static/images/demo-user.png"
+      ai-avatar="/static/images/demo-ai.png"
+      @message-sent="onMessageSent"
+      @ai-response="onAIResponse"
+      @action-click="onActionClick"
+      @file-preview="onFilePreview"
+      @audio-play="onAudioPlay"
+      @video-play="onVideoPlay"
+      @link-open="onLinkOpen"
+      @product-view="onProductView" />
+      
+    <view class="demo-controls">
+      <button class="control-btn" @click="addTextMessage">添加文本消息</button>
+      <button class="control-btn" @click="addMarkdownMessage">添加Markdown</button>
+      <button class="control-btn" @click="addFileMessage">添加文件</button>
+      <button class="control-btn" @click="addAudioMessage">添加音频</button>
+      <button class="control-btn" @click="addVideoMessage">添加视频</button>
+      <button class="control-btn" @click="addLinkMessage">添加链接</button>
+      <button class="control-btn" @click="addProductMessage">添加商品</button>
+      <button class="control-btn" @click="clearMessages">清空消息</button>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      demoMessages: [
+        {
+          id: 1,
+          role: 'ai',
+          type: 'text',
+          content: '您好！我是AI智能客服演示程序，我可以展示多种消息类型。请点击下方的按钮体验不同功能！',
+          timestamp: Date.now() - 300000,
+          actions: [
+            { id: 1, text: '开始体验', type: 'like' }
+          ]
+        }
+      ]
+    }
+  },
+  
+  methods: {
+    // 添加文本消息
+    addTextMessage() {
+      const message = {
+        id: Date.now(),
+        role: 'ai',
+        type: 'text',
+        content: '这是一个文本消息示例，支持**粗体**、*斜体*和`代码`格式。也可以包含换行符\n这是第二行内容。',
+        timestamp: Date.now(),
+        actions: [
+          { id: 1, text: '有帮助', type: 'like' },
+          { id: 2, text: '没帮助', type: 'dislike' }
+        ]
+      }
+      this.$refs.chat.messages.push(message)
+    },
+    
+    // 添加Markdown消息
+    addMarkdownMessage() {
+      const message = {
+        id: Date.now(),
+        role: 'ai',
+        type: 'markdown',
+        content: `# Markdown文档示例
+
+## 二级标题
+
+这是一个支持**粗体**、*斜体*和\`代码\`的Markdown消息。
+
+### 功能特性
+- ✅ 支持标题层级
+- ✅ 支持列表展示
+- ✅ 支持代码高亮
+- ✅ 支持链接跳转
+
+[查看详细文档](https://example.com)\n\n**注意：** 这是一个演示内容，实际使用时可以集成真实的文档系统。`,
+        timestamp: Date.now(),
+        actions: [
+          { id: 1, text: '查看文档', type: 'like' }
+        ]
+      }
+      this.$refs.chat.messages.push(message)
+    },
+    
+    // 添加文件消息
+    addFileMessage() {
+      const message = {
+        id: Date.now(),
+        role: 'ai',
+        type: 'file',
+        fileName: '产品介绍文档.pdf',
+        fileSize: 2048000,
+        url: 'https://example.com/document.pdf',
+        timestamp: Date.now()
+      }
+      this.$refs.chat.messages.push(message)
+    },
+    
+    // 添加音频消息
+    addAudioMessage() {
+      const message = {
+        id: Date.now(),
+        role: 'ai',
+        type: 'audio',
+        title: '产品功能介绍',
+        duration: 89,
+        url: 'https://example.com/audio.mp3',
+        timestamp: Date.now(),
+        playing: false,
+        currentTime: 0
+      }
+      this.$refs.chat.messages.push(message)
+    },
+    
+    // 添加视频消息
+    addVideoMessage() {
+      const message = {
+        id: Date.now(),
+        role: 'ai',
+        type: 'video',
+        title: '产品演示视频',
+        duration: 180,
+        url: 'https://example.com/video.mp4',
+        cover: '/static/images/video-cover.jpg',
+        timestamp: Date.now()
+      }
+      this.$refs.chat.messages.push(message)
+    },
+    
+    // 添加链接消息
+    addLinkMessage() {
+      const message = {
+        id: Date.now(),
+        role: 'ai',
+        type: 'link',
+        title: '帮助中心',
+        description: '详细的产品使用说明和常见问题解答',
+        url: 'https://example.com/help',
+        image: '/static/images/link-thumbnail.jpg',
+        timestamp: Date.now()
+      }
+      this.$refs.chat.messages.push(message)
+    },
+    
+    // 添加商品消息
+    addProductMessage() {
+      const message = {
+        id: Date.now(),
+        role: 'ai',
+        type: 'product',
+        title: '智能手表 X1',
+        price: 1299,
+        description: '全新一代智能手表，支持心率监测、运动追踪、消息提醒等功能',
+        image: '/static/images/product-demo.jpg',
+        timestamp: Date.now(),
+        actions: [
+          { id: 1, text: '立即购买', type: 'like' },
+          { id: 2, text: '查看详情', type: 'dislike' }
+        ]
+      }
+      this.$refs.chat.messages.push(message)
+    },
+    
+    // 清空消息
+    clearMessages() {
+      this.$refs.chat.messages = [
+        {
+          id: 1,
+          role: 'ai',
+          type: 'text',
+          content: '消息已清空，可以重新开始体验！',
+          timestamp: Date.now()
+        }
+      ]
+    },
+    
+    // 事件处理
+    onMessageSent(message) {
+      console.log('用户发送消息:', message)
+      uni.showToast({
+        title: '消息发送成功',
+        icon: 'success'
+      })
+    },
+    
+    onAIResponse(message) {
+      console.log('AI回复消息:', message)
+    },
+    
+    onActionClick({ action, message }) {
+      console.log('操作点击:', action, message)
+      uni.showToast({
+        title: `点击了: ${action.text}`,
+        icon: 'none'
+      })
+    },
+    
+    onFilePreview(message) {
+      console.log('文件预览:', message)
+      uni.showToast({
+        title: '正在打开文件...',
+        icon: 'none'
+      })
+    },
+    
+    onAudioPlay(message) {
+      console.log('音频播放:', message)
+    },
+    
+    onVideoPlay(message) {
+      console.log('视频播放:', message)
+    },
+    
+    onLinkOpen(message) {
+      console.log('链接打开:', message)
+      uni.showToast({
+        title: '正在打开链接...',
+        icon: 'none'
+      })
+    },
+    
+    onProductView(message) {
+      console.log('商品查看:', message)
+      uni.showToast({
+        title: '正在查看商品...',
+        icon: 'none'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.demo-container {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background-color: #f5f5f5;
+}
+
+.demo-header {
+  background-color: #ff4544;
+  color: white;
+  padding: 30rpx;
+  text-align: center;
+  
+  .demo-title {
+    font-size: 32rpx;
+    font-weight: bold;
+  }
+}
+
+.demo-controls {
+  background-color: white;
+  padding: 20rpx;
+  border-top: 2rpx solid #eeeeee;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10rpx;
+  
+  .control-btn {
+    flex: 1;
+    min-width: 150rpx;
+    height: 60rpx;
+    background-color: #f8f8f8;
+    border-radius: 30rpx;
+    font-size: 24rpx;
+    color: #333;
+    border: none;
+    
+    &:active {
+      background-color: #eeeeee;
+    }
+  }
+}
+</style>

components/diy-components/diy-audio.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script>
-	// 音频
+	// 视频
 	export default {
 		name: 'diy-audio',
 		props: {

components/diy-components/diy-group.vue

@@ -223,7 +223,6 @@
 </template>
 
 <script>
-	// 组件组
 	export default {
 		components: {},
 		props: {

components/diy-components/diy-seckill.vue

@@ -181,7 +181,6 @@
 </template>
 
 <script>
-	// 秒杀
 	export default {
 		name: 'diy-seckill',
 		props: {

components/hover-nav/hover-nav.vue

@@ -1,177 +1,213 @@
-<template>
+<template>
-	<!-- 悬浮按钮 -->
+		<!-- 悬浮按钮 -->
-	<view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '330rpx' : '120rpx' }">
+		<view v-if="pageCount == 1 || need" class="fixed-box" :style="{ height: fixBtnShow ? '330rpx' : '120rpx' }">
-		<!-- 客服按钮 -->
+			<!-- <view class="btn-item" v-if="fixBtnShow" @click="$util.redirectTo('/pages/index/index')"> -->
-		<!-- #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%'}">
+			<!-- AI智能助手 -->
-			<text class="icox icox-kefu" v-if="!kefuimg"></text>
+			<view class="btn-item" v-if="fixBtnShow && enableAIChat" @click="openAIChat" :style="{backgroundImage:'url('+(aiAgentimg?aiAgentimg:'')+')',backgroundSize:'100% 100%'}">
-		</button>
+				<text class="ai-icon" v-if="!aiAgentimg">🤖</text>
-		<!-- #endif -->
+				<!-- 未读消息小红点 -->
-		<!-- 电话按钮 -->
+				<view v-if="unreadCount > 0" class="unread-badge">
-		<view class="btn-item" v-if="fixBtnShow" @click="call()"  :style="{backgroundImage:'url('+(phoneimg?phoneimg:'')+')',backgroundSize:'100% 100%'}">
+					<text class="badge-text">{{ unreadCount > 99 ? '99+' : unreadCount }}</text>
-			<text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
+				</view>
-		</view>
+			</view>
-		<!-- 新增：语言切换按钮 -->
+
-		<view class="btn-item" v-if="fixBtnShow" @click="switchLang" :style="{backgroundSize:'100% 100%'}">
+			<!-- #ifdef MP-WEIXIN -->
-			<text class="lang-text">{{ currentLang === 'zh-cn' ? 'EN' : '中文' }}</text>
+			<button class="btn-item" v-if="fixBtnShow" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" :style="{backgroundImage:'url('+(kefuimg?kefuimg:'')+')',backgroundSize:'100% 100%'}">
-		</view>
+				<text class="icox icox-kefu" v-if="!kefuimg"></text>
-	</view>
+			<!-- 	<view>首页</view> -->
-</template>
+			</button>
-
+			<!-- #endif -->
-<script>
+
-	export default {
+			<!-- 电话 -->
-		name: 'hover-nav',
+			<view class="btn-item" v-if="fixBtnShow" @click="call()"  :style="{backgroundImage:'url('+(phoneimg?phoneimg:'')+')',backgroundSize:'100% 100%'}">
-		props: {
+				<text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
-			need: {
+				<!-- <view>我的</view> -->
-				type: Boolean,
+			</view>
-				default: false
+
-			},
+		<!-- 	<view class="btn-item icon-xiala" v-if="fixBtnShow" @click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
-		},
+				<text class="iconfont icon-unfold"></text>
-		data() {
+			</view>
-			return {
+			<view class="btn-item switch" v-else :class="{ show: fixBtnShow }"
-				pageCount: 0,
+				@click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
-				fixBtnShow: true,
+				<view class="">快捷</view>
-				tel:'',
+				<view>导航</view>
-				kefuimg:'',
+			</view> -->
-				phoneimg:'',
+		</view>
-				// 新增：当前语言（默认中文）
+</template>
-				currentLang: uni.getStorageSync('lang') || 'zh-cn'
+
-			};
+<script>
-		},
+	import { mapGetters, mapMutations } from 'vuex'
-		created() {
+
-			this.kefuimg = this.$util.getDefaultImage().kefu
+	export default {
-			this.phoneimg = this.$util.getDefaultImage().phone
+		name: 'hover-nav',
-			this.pageCount = getCurrentPages().length;
+		props: {
-			var that = this
+			need: {
-			uni.getStorage({
+				type: Boolean,
-				key:'shopInfo',
+				default: false
-				success(e){
+			},
-					that.tel = e.data.mobile
+		},
-				}
+		data() {
-			})
+			return {
-			// 新增：监听全局语言切换事件，实时更新按钮文字
+				pageCount: 0,
-			uni.$on('lang-changed', (lang) => {
+				fixBtnShow: true,
-				this.currentLang = lang;
+				tel:'',
-			})
+				kefuimg:'',
-		},
+				phoneimg:''
-		methods: {
+			};
-			//拨打电话
+		},
-			call(){
+		created() {
-				uni.makePhoneCall({
+			this.kefuimg = this.$util.getDefaultImage().kefu
-					phoneNumber:this.tel+''
+			this.phoneimg = this.$util.getDefaultImage().phone
-				})
+			this.pageCount = getCurrentPages().length;
-			},
+
-			// 新增：语言切换核心方法
+
-			switchLang() {
+			var that = this
-				// 1. 切换目标语言（中文↔英文）
+			uni.getStorage({
-				const targetLang = this.currentLang === 'zh-cn' ? 'en-us' : 'zh-cn';
+				key:'shopInfo',
-				// 2. 保存到本地存储（全局生效）
+				success(e){
-				uni.setStorageSync('lang', targetLang);
+					that.tel = e.data.mobile
-				// 3. 触发全局语言事件（通知其他页面更新）
+				}
-				uni.$emit('lang-changed', targetLang);
+			})
-				// 4. 延迟重启当前页面（避免白屏，保证语言生效）
+		
-				setTimeout(() => {
+		},
-					const pages = getCurrentPages();
+		computed: {
-					const currentPage = pages[pages.length - 1];
+			...mapGetters([
-					uni.reLaunch({ url: '/' + currentPage.route });
+				'globalAIAgentConfig',
-				}, 300);
+				'aiUnreadCount'
-			}
+			]),
-		},
+			aiAgentimg() {
-		// 新增：页面销毁时移除监听，避免内存泄漏
+				return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || '' // AI智能助手的头像
-		beforeDestroy() {
+			},
-			uni.$off('lang-changed');
+			unreadCount() {
-		}
+				return this.aiUnreadCount
-	};
+			},
-</script>
+			enableAIChat() {
-
+				return this.globalAIAgentConfig?.enable || true // 是否开启AI智能助手
-<style lang="scss">
+			},
-	.container-box {
+		},		
-		width: 100%;
+		methods: {
-
+			...mapMutations([
-		.item-wrap {
+				'setAiUnreadCount'
-			border-radius: 10rpx;
+			]),
-
+
-			.image-box {
+			//拨打电话
-				border-radius: 10rpx;
+			call(){
-			}
+				uni.makePhoneCall({
-
+					phoneNumber:this.tel+''
-			image {
+				})
-				width: 100%;
+			},
-				height: auto;
+
-				border-radius: 10rpx;
+			// 打开AI聊天弹窗
-				will-change: transform;
+			openAIChat() {
-			}
+				if (this.enableAIChat) {
-		}
+					this.setAiUnreadCount(0);
-	}
+				}
-
+
-	//悬浮按钮（容器样式保持原始不变，确保按钮不消失）
+				this.$util.redirectTo('/pages_tool/ai-chat/index')
-	.fixed-box {
+			}
-		position: fixed;
+
-		right: 0rpx;
+		}
-		bottom: 200rpx;
+	};
-		z-index: 10;
+</script>
-		border-radius: 120rpx;
+
-		padding: 20rpx 0;
+<style lang="scss">
-		display: flex;
+	.container-box {
-		justify-content: center;
+		width: 100%;
-		flex-direction: column;
+
-		width: 100rpx;
+		.item-wrap {
-		box-sizing: border-box;
+			border-radius: 10rpx;
-		transition: 0.3s;
+
-		overflow: hidden;
+			.image-box {
-
+				border-radius: 10rpx;
-		.btn-item {
+			}
-			display: flex;
+
-			justify-content: center;
+			image {
-			align-items: center; // 新增：垂直居中，和其他按钮对齐
+				width: 100%;
-			text-align: center;
+				height: auto;
-			flex-direction: column;
+				border-radius: 10rpx;
-			line-height: 1;
+				will-change: transform;
-			margin: 14rpx 0;
+			}
-			transition: 0.1s;
+		}
-			// ========== 修改1：按钮背景改为纯红色（红底） ==========
+	}
-			background: #E60012; 
+
-			border-radius: 50rpx;
+	//悬浮按钮
-			width: 80rpx;
+	.fixed-box {
-			height: 80rpx;
+		position: fixed;
-			padding: 0;
+		right: 0rpx;
-			text {
+		bottom: 200rpx;
-				font-size: 36rpx;
+		z-index: 10;
-				font-weight: bold;
+		// background: #fff;
-				// ========== 修改2：图标文字改为白色（白字） ==========
+		// box-shadow: 2rpx 2rpx 22rpx rgba(0, 0, 0, 0.3);
-				color: #FFFFFF; 
+		border-radius: 120rpx;
-			}
+		padding: 20rpx 0;
-			// 新增：语言按钮文字样式
+		display: flex;
-			.lang-text {
+		justify-content: center;
-				font-size: 24rpx; // 适配圆形按钮大小
+		flex-direction: column;
-				font-weight: 600;
+		width: 100rpx;
-				// ========== 修改3：语言按钮文字改为白色 ==========
+		box-sizing: border-box;
-				color: #FFFFFF; 
+		transition: 0.3s;
-			}
+		overflow: hidden;
-
+
-			view {
+		.btn-item {
-				font-size: 26rpx;
+			display: flex;
-				font-weight: bold;
+			justify-content: center;
-				// ========== 兜底：确保所有文字都是白色 ==========
+			text-align: center;
-				color: #FFFFFF; 
+			flex-direction: column;
-			}
+			line-height: 1;
-
+			margin: 14rpx 0;
-			&.show {
+			transition: 0.1s;
-				transform: rotate(180deg);
+			background: #fff;
-			}
+			border-radius: 50rpx;
-
+			width: 80rpx;
-			&.switch {}
+			height: 80rpx;
-
+			padding: 0;
-			&.icon-xiala {
+			position: relative;
-				margin: 0;
+			text {
-				margin-top: 0.1rpx;
+				font-size: 36rpx;
-			}
+				font-weight: bold;
-
+			}
-			// ========== 新增：按钮点击交互效果 ==========
+
-			&:active {
+			view {
-				background: #C4000F; // 红色轻微加深
+				font-size: 26rpx;
-				transform: scale(0.95); // 按钮小幅度缩小
+				font-weight: bold;
-			}
+			}
-		}
+
-	}
+			&.show {
+				transform: rotate(180deg);
+			}
+
+			&.switch {}
+
+			&.icon-xiala {
+				margin: 0;
+				margin-top: 0.1rpx;
+			}
+			
+			// 未读消息小红点
+			.unread-badge {
+				position: absolute;
+				top: -5rpx;
+				right: -5rpx;
+				background-color: #ff4544;
+				color: white;
+				border-radius: 20rpx;
+				min-width: 30rpx;
+				height: 30rpx;
+				font-size: 10rpx;
+				line-height: 30rpx;
+				text-align: center;
+				padding: 0 8rpx;
+				z-index: 1;
+				box-shadow: 0 2rpx 10rpx rgba(255, 69, 68, 0.3);
+
+				.badge-text {
+					font-size: 8rpx;
+					// #ifdef MP-WEIXIN
+					font-size: 20rpx;
+					// #endif
+				}
+			}
+		}
+	}
 </style>

components/ns-goods-action-icon/ns-goods-action-icon.vue

@@ -1,12 +1,13 @@
 <template>
 	<view>
-		<!-- 修改后（兼容英文） -->
+		<block v-if="text == '客服'">
-<block v-if="text == '客服' || text == 'Contact'">
+		<!-- 	<ns-contact :niushop="chatParam" :send-message-title="sendData.title" :send-message-path="sendData.path" :send-message-img="sendData.img"> -->
-				<button hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" class="action-icon-wrap" style="background: transparent;padding: 0;margin: 0;" @click="contactClick">
+				<button hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" class="action-icon-wrap" style="background: transparent;padding: 0;margin: 0;">
 					<view class="iconfont color-title" :class="icon"></view>
 					<text>{{ text }}</text>
 					<view class="corner-mark color-base-bg" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark }}</view>
 				</button>
+			<!-- </ns-contact> -->
 		</block>
 		<block v-else>
 			<view class="action-icon-wrap" @click="clickEvent">
@@ -23,30 +24,37 @@ import nsContact from '@/components/ns-contact/ns-contact.vue';
 export default {
 	name: 'ns-goods-action-icon',
 	props: {
+		// 商品底部icon导航icon图标
 		icon: {
 			type: String,
 			default: ''
 		},
+		// 商品底部icon导航文字
 		text: {
 			type: String,
 			default: ''
 		},
+		// 角标文字
 		cornerMark: {
 			type: String,
 			default: ''
 		},
+		// 角标背景色
 		cornerMarkBg: {
 			type: String,
 			default: ''
 		},
+		// 角标文字颜色
 		cornerMarkColor: {
 			type: String,
 			default: '#fff'
 		},
+		// 开放能力
 		openType: {
 			type: String,
 			default: ''
 		},
+		// 发送内容 openType="contact"时有效
 		sendData: {
 			type: Object,
 			default: function() {
@@ -69,11 +77,7 @@ export default {
 	},
 	methods: {
 		clickEvent() {
-			console.log('【组件内部】非客服按钮被点击，触发clickEvent');
 			this.$emit('click');
-		},
-		contactClick() {
-			console.log('【组件内部】客服按钮（Contact）被点击，触发contactClick');
 		}
 	}
 };
@@ -139,4 +143,4 @@ export default {
 	font-size: $font-size-tag;
 	line-height: 1;
 }
-</style>
+</style>

lang/en-us/common.js

@@ -1,40 +1,21 @@
 export const lang = {
-	// 底部选项卡（英文）
+
+	// 底部选项卡
 	tabBar: {
-		home: 'Home',
+		home: 'index',
-		category: 'Category',
+		category: 'category',
-		cart: 'Cart',
+		cart: 'cart',
-		member: 'Member Center'
+		member: 'member',
 	},
 
-	// 公共文字
+	//公共
 	common: {
-		name: 'English',
+		//语言包名称
-		mescrollTextInOffset: 'Pull down to refresh',
+		name: '英文',
-		mescrollTextOutOffset: 'Release to update',
+		mescrollTextInOffset: 'pull to refresh',
+		mescrollTextOutOffset: 'Loading...',
 		mescrollEmpty: "No data available",
-		goodsRecommendTitle: 'You May Also Like',
+		goodsRecommendTitle: 'Guess you like',
-		currencySymbol: '¥',
+		currencySymbol: '¥'
-		submit: 'Submit',
-		langSwitchBtn: '中文',
-		// ========== 新增：kefu 对应的英文文案 ==========
-		kefu: 'Contact', 
-		// =============================================
-		// App.vue弹窗翻译
-		updateTip: 'Update Tip',
-		updateContent: 'The new version is ready, do you want to restart the app?',
-		networkTip: 'Network Disconnected',
-		networkContent: 'Please check your network connection', // 关键：这里加逗号！
-		// 首页多语言字段
-		siteName: 'Site Name',
-		welcomeMsg: 'Welcome to follow',
-		followOfficialAccount: 'Follow Official Account',
-		followMoreInfo: 'Follow for more information',
-		iKnow: 'I know',
-		confirmStore: 'Please confirm the store',
-		reposition: 'Reposition',
-		currentStore: 'Current Store',
-		confirmEnter: 'Confirm to enter',
-		chooseOtherStore: 'Choose other stores'
 	}
-}
+}

lang/zh-cn/ai/ai-chat.js

@@ -0,0 +1,4 @@
+export const lang = {
+	//title为每个页面的标题
+	title: 'AI智能客服'
+}

lang/zh-cn/common.js

@@ -1,5 +1,6 @@
 export const lang = {
-	// 底部选项卡（中文）
+
+	// 底部选项卡
 	tabBar: {
 		home: '首页',
 		category: '分类',
@@ -7,31 +8,15 @@ export const lang = {
 		member: '个人中心'
 	},
 
-	// 公共文字
+	//公共
 	common: {
+		//语言包名称
 		name: '中文',
 		mescrollTextInOffset: '下拉刷新',
 		mescrollTextOutOffset: '释放更新',
 		mescrollEmpty: "暂无相关数据",
 		goodsRecommendTitle: '猜你喜欢',
 		currencySymbol: '¥',
-		submit: '提交',
+		submit: '提交'
-		langSwitchBtn: 'EN',
-		// App.vue弹窗翻译
-		updateTip: '更新提示',
-		updateContent: '新版本已经准备好，是否重启应用？',
-		networkTip: '网络失去连接',
-		networkContent: '请检查网络连接', // 关键：这里加逗号！
-		// 首页多语言字段
-		siteName: '站点名称',
-		welcomeMsg: '欢迎关注',
-		followOfficialAccount: '关注公众号',
-		followMoreInfo: '关注了解更多',
-		iKnow: '我知道了',
-		confirmStore: '请确认门店',
-		reposition: '重新定位',
-		currentStore: '当前门店',
-		confirmEnter: '确认进入',
-		chooseOtherStore: '选择其他门店'
 	}
-}
+}

lang/zh-cn/goods/detail.js

@@ -11,7 +11,7 @@ export const lang = {
 	home:'首页',
 	cart:'购物车',
 	leave:'立即留言',
-	make:'立即咨询',
+	make:'立即支付',
 	
 	send:'配送',
 	express:'快递发货',

main.js

@@ -1,67 +1,77 @@
-// #ifdef H5
+// #ifdef H5
-import './common/js/pc'
+import './common/js/pc'
-// #endif
+// #endif
-import Vue from 'vue'
+import Vue from 'vue'
-import App from './App'
+import App from './App'
-import store from './store'
+import store from './store'
-import Util from './common/js/util.js'
+import Util from './common/js/util.js'
-import Http from './common/js/http.js'
+import Http from './common/js/http.js'
-import Lang from './common/js/lang.js'
+import Lang from './common/js/lang.js'
-import Config from './common/js/config.js'
+import Config from './common/js/config.js'
-import EventBus from './common/js/event-bus.js'
+import EventBus from './common/js/event-bus.js'
-import DomEventBridge from './common/js/dom-event-bridge.js'
+import DomEventBridge from './common/js/dom-event-bridge.js'
-import globalConfig from './common/js/golbalConfig.js';
+import globalConfig from './common/js/golbalConfig.js';
-import {
+import {
-	uniStorage
+	uniStorage
-} from './common/js/storage.js'
+} from './common/js/storage.js'
-
+
-Vue.prototype.$store = store //挂在vue
+Vue.prototype.$store = store //挂在vue
-
+
-Vue.config.productionTip = false
+Vue.config.productionTip = false
-
+
-Vue.prototype.$util = Util;
+Vue.prototype.$util = Util;
-Vue.prototype.$api = Http;
+Vue.prototype.$api = Http;
-
+
-Vue.prototype.$langConfig = Lang; //语言包对象
+Vue.prototype.$langConfig = Lang; //语言包对象
-Vue.prototype.$lang = Lang.lang; //解析语言包
+Vue.prototype.$lang = Lang.lang; //解析语言包
-
+
-Vue.prototype.$config = Config;
+Vue.prototype.$config = Config;
-
+
-
+// #ifdef H5
-// #ifdef H5
+EventBus.setDomBridge(DomEventBridge)
-EventBus.setDomBridge(DomEventBridge)
+// #endif
-// #endif
+Vue.prototype.$eventBus = EventBus;
-Vue.prototype.$eventBus = EventBus;
+
-
+Vue.mixin(globalConfig);
-Vue.mixin(globalConfig);
+
-
+App.mpType = 'app';
-App.mpType = 'app';
+
-
+// 重写存储，增加前缀
-// 重写存储，增加前缀
+uniStorage();
-uniStorage();
+
-
+//常用组件
-//常用组件
+import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
+Vue.component('loading-cover', loadingCover);
-Vue.component('loading-cover', loadingCover);
+
-
+import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+Vue.component('ns-empty', nsEmpty);
-Vue.component('ns-empty', nsEmpty);
+
-
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+Vue.component("mescroll-uni", MescrollUni); //上拉加载,下拉刷新组件
-Vue.component("mescroll-uni", MescrollUni); //上拉加载,下拉刷新组件
+
-
+import MescrollBody from "@/components/mescroll/mescroll-body.vue"
-import MescrollBody from "@/components/mescroll/mescroll-body.vue"
+Vue.component('mescroll-body', MescrollBody);
-Vue.component('mescroll-body', MescrollBody);
+
-
+import NsLogin from "@/components/ns-login/ns-login.vue"
-import NsLogin from "@/components/ns-login/ns-login.vue"
+Vue.component('ns-login', NsLogin);
-Vue.component('ns-login', NsLogin);
+
-
+import PrivacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-import PrivacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+Vue.component('privacy-popup', PrivacyPopup)
-Vue.component('privacy-popup', PrivacyPopup)
+
-
+// ========== 新增：注册diy系列组件 ==========
-const app = new Vue({
+import DiyBottomNav from '@/components/diy-components/diy-bottom-nav.vue'
-	...App,
+import DiyGroup from '@/components/diy-components/diy-group.vue'
-	store
+import DiyCategory from '@/components/diy-components/diy-category.vue'
-})
+import DiyIcon from '@/components/diy-components/diy-icon.vue' // 补充diy-icon
-
+
+Vue.component('diy-bottom-nav', DiyBottomNav) // 修正拼写错误
+Vue.component('diy-group', DiyGroup)
+Vue.component('diy-category', DiyCategory)
+Vue.component('diy-icon', DiyIcon) // 注册diy-icon
+// ========== 新增结束 ==========
+const app = new Vue({
+	...App,
+	store
+})
+
 app.$mount()

manifest.json

@@ -54,11 +54,9 @@
             }
         }
     },
-    /* 快应用特有相关 */
-    "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx29215aa1bd97bbd6",
+        "appid" : "wxa8f94045d9c2fc10",
         "setting" : {
             "urlCheck" : false,
             "postcss" : false,
@@ -126,5 +124,12 @@
     "uniStatistics" : {
         "version" : "2"
     },
-    "sassImplementationName" : "node-sass"
+    "sassImplementationName" : "node-sass",
+    /** 快应用配置 **/
+    "quickapp-webview" : {
+        "package" : "com.jieganfsj.fivegshop",
+        "minPlatformVersion" : 1070,
+        "versionName" : "1.0.0",
+        "versionCode" : 0
+    }
 }

node_modules/jweixin-module/package.json

@@ -1,60 +1,26 @@
 {
-  "_from": "jweixin-module",
-  "_id": "jweixin-module@1.4.1",
-  "_inBundle": false,
-  "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==",
-  "_location": "/jweixin-module",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "tag",
-    "registry": true,
-    "raw": "jweixin-module",
     "name": "jweixin-module",
-    "escapedName": "jweixin-module",
+    "version": "1.6.0",
-    "rawSpec": "",
+    "description": "微信JS-SDK",
-    "saveSpec": null,
+    "main": "lib/index.js",
-    "fetchSpec": "latest"
+    "scripts": {},
-  },
+    "repository": {
-  "_requiredBy": [
+        "type": "git",
-    "#USER",
+        "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
-    "/"
+    },
-  ],
+    "keywords": [
-  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
+        "wxjssdk",
-  "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
+        "weixin",
-  "_spec": "jweixin-module",
+        "jweixin",
-  "_where": "E:\\demo\\niushop_uniapp",
+        "wechat",
-  "author": {
+        "jssdk",
-    "name": "Shengqiang Guo"
+        "wx"
-  },
+    ],
-  "bugs": {
+    "author": "Shengqiang Guo",
-    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+    "license": "ISC",
-  },
+    "bugs": {
-  "bundleDependencies": false,
+        "url": "https://github.com/zhetengbiji/jweixin-module/issues"
-  "deprecated": false,
+    },
-  "description": "微信JS-SDK",
+    "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
-  "devDependencies": {
+    "devDependencies": {}
-    "textfile": "^1.2.0",
-    "uglify-js": "^3.4.9"
-  },
-  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
-  "keywords": [
-    "wxjssdk",
-    "weixin",
-    "jweixin",
-    "wechat",
-    "jssdk",
-    "wx"
-  ],
-  "license": "ISC",
-  "main": "out/index.js",
-  "name": "jweixin-module",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
-  },
-  "scripts": {
-    "build": "node build",
-    "prepublish": "npm run build"
-  },
-  "version": "1.4.1"
 }

package-lock.json

@@ -1,13 +1,23 @@
 {
-  "name": "uniappsaas",
+  "name": "frontend",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
+      "dependencies": {
+        "@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
+        "jweixin-module": "^1.6.0"
+      },
       "devDependencies": {
         "terser-webpack-plugin": "^5.3.10"
       }
     },
+    "node_modules/@dcloudio/uni-quickapp-webview": {
+      "version": "2.0.2-4080420251103001",
+      "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-4080420251103001.tgz",
+      "integrity": "sha512-dxDDk/37OoUZ6PmXhXS/9C8Y5tYRalU6FIXT5OlPf1co2VuLF0OrdqAmINJDWs1dBQgN7e6Hw+bkeK9+4SzLxQ==",
+      "license": "Apache-2.0"
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -619,6 +629,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
+      "license": "ISC"
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -984,6 +1000,11 @@
     }
   },
   "dependencies": {
+    "@dcloudio/uni-quickapp-webview": {
+      "version": "2.0.2-4080420251103001",
+      "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-2.0.2-4080420251103001.tgz",
+      "integrity": "sha512-dxDDk/37OoUZ6PmXhXS/9C8Y5tYRalU6FIXT5OlPf1co2VuLF0OrdqAmINJDWs1dBQgN7e6Hw+bkeK9+4SzLxQ=="
+    },
     "@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://repo.huaweicloud.com/repository/npm/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -1456,6 +1477,11 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
     "loader-runner": {
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",

package.json

@@ -6,6 +6,7 @@
     "terser-webpack-plugin": "^5.3.10"
   },
   "dependencies": {
+    "@dcloudio/uni-quickapp-webview": "^2.0.2-4080420251103001",
     "jweixin-module": "^1.6.0"
   }
 }

pages/contact/contact.vue

@@ -131,16 +131,12 @@
 				</view>
 			</uni-popup>
 		</view>
-
 	</view>
 	<hover-nav></hover-nav>
 	<diy-bottom-nav></diy-bottom-nav>
 </template>
 
 <script>
-// 👇 引入语言工具文件
-import langUtil from '@/common/js/lang.js';
-
 export default {
 	data() {
 		return {
@@ -198,13 +194,6 @@ export default {
 		});
 	},
 	methods: {
-		// 👇 新增：语言切换方法
-		toggleLang() {
-			const currentLang = this.$lang?.locale || 'zh-cn';
-			const targetLang = currentLang === 'zh-cn' ? 'en-us' : 'zh-cn';
-			langUtil.change(targetLang);
-		},
-		
 		test(){ 
 				//     channelReady(function(bAvailable) {
 				//         alert('是否存在框架服务：' + bAvailable)
@@ -519,30 +508,4 @@ image {
     width: 90rpx;
     z-index: 9999;
 }
-
+</style>
-/* 👇 新增：语言切换按钮样式 */
-.lang-switch-wrap {
-  position: fixed !important;
-  bottom: 120rpx !important; /* 避开底部tabBar */
-  right: 30rpx !important;
-  z-index: 99999 !important; /* 层级拉满 */
-  width: 120rpx;
-  height: 60rpx;
-  background-color: #ffffff !important;
-  border: 1px solid #e5e5e5 !important;
-  border-radius: 30rpx !important;
-  display: flex !important;
-  align-items: center !important;
-  justify-content: center !important;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1) !important;
-}
-.lang-text {
-  font-size: 28rpx !important;
-  color: #333333 !important;
-  font-weight: 500 !important;
-}
-.lang-switch-wrap:active {
-  transform: scale(0.95) !important;
-  transition: transform 0.1s ease !important;
-}
-</style>

pages/goods/category.vue

@@ -30,9 +30,7 @@
 		components: {},
 		data() {
 			return {
-				diyData: null,
+				diyData: null
-				// 新增：标记是否已监听语言事件，避免重复监听
-				langListenerAdded: false
 			};
 		},
 		onLoad() {
@@ -40,51 +38,20 @@
 			this.$langConfig.refresh();
 			uni.hideTabBar();
 			this.getDiyInfo();
-			// 新增：监听全局语言切换事件
-			this.addLangListener();
 		},
 		onShow() {
 			if (this.$refs.category) this.$refs.category[0].pageShow();
 		},
 		onUnload() {
 			if (!this.storeToken && this.$refs.login) this.$refs.login.cancelCompleteInfo();
-			// 新增：页面销毁时移除语言监听，避免内存泄漏
-			this.removeLangListener();
 		},
 		methods: {
-			// 新增：添加语言切换监听（封装为方法，避免重复监听）
-			addLangListener() {
-				if (!this.langListenerAdded) {
-					uni.$on('lang-changed', this.handleLangChange);
-					this.langListenerAdded = true;
-				}
-			},
-			// 新增：移除语言切换监听
-			removeLangListener() {
-				if (this.langListenerAdded) {
-					uni.$off('lang-changed', this.handleLangChange);
-					this.langListenerAdded = false;
-				}
-			},
-			// 新增：语言切换后的处理逻辑
-			handleLangChange() {
-				// 1. 刷新多语言配置（确保语言包生效）
-				this.$langConfig.refresh();
-				// 2. 显示加载遮罩，提升用户体验
-				if (this.$refs.loadingCover) this.$refs.loadingCover.show();
-				// 3. 重新请求分类数据（核心：获取对应语言的分类内容）
-				this.getDiyInfo();
-			},
 			getDiyInfo() {
 				this.$api.sendRequest({
 					url: '/api/diyview/info',
 					data: {
 						name: 'DIY_VIEW_GOODS_CATEGORY'
 					},
-					// 新增：请求头携带当前语言，让后端返回对应语言的分类数据
-					header: {
-						'lang': uni.getStorageSync('lang') || 'zh-cn'
-					},
 					success: res => {
 						if (res.code == 0 && res.data) {
 							this.diyData = res.data;
@@ -94,11 +61,6 @@
 							}
 							uni.stopPullDownRefresh();
 						}
-					},
-					// 新增：请求失败时隐藏加载遮罩，避免遮罩卡死
-					fail: () => {
-						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-						uni.stopPullDownRefresh();
 					}
 				});
 			},
@@ -109,14 +71,6 @@
 		onPullDownRefresh() {
 			uni.hideTabBar();
 			this.getDiyInfo();
-		},
-		// 新增：页面隐藏时移除监听（可选，增强容错）
-		onHide() {
-			this.removeLangListener();
-		},
-		// 新增：页面重新显示时重新添加监听
-		onReShow() {
-			this.addLangListener();
 		}
 	};
 </script>

pages/goods/public/js/detail.js

@@ -6,9 +6,6 @@ export default {
 			couponBtnSwitch: false, //获取优惠券防止重复提交
 			
 			posterApi: '/api/goods/poster',
-			// 👇 新增初始定义
-    contactData: {}, // 客服基础参数初始值
-    chatRoomParams: {}, // 客服会话参数初始值
 
 			//满减活动
 			manjian: {
@@ -94,14 +91,6 @@ export default {
 		//同步获取商品详情
 		await this.getGoodsSkuDetail();
 	},
-// 在detail.js的created/mounted中添加
-created() {
-  // 监听语言切换事件（需项目有全局事件总线，或直接在切换方法中调用）
-  uni.$on('lang-switch', () => {
-    this.getGoodsSkuDetail(); // 切换语言后重新获取商品数据，赋值两个变量
-  });
-},
-
 	onHide() {
 		this.couponBtnSwitch = false;
 	},
@@ -114,14 +103,6 @@ created() {
 			fail(){}
 		  })
 		},
-		// 新增：跳转到客服会话页面
-		goToContact() {
-			// 新增这行日志：打印“父页面触发跳转”
-  console.log('【父页面】点击Contact，触发goToContact方法');
-			uni.navigateTo({ 
-				url: '/pages/contact/contact' 
-			});
-		},
 		setSkuId(val) {
 			if (val) {
 				this.skuId = val;
@@ -160,12 +141,6 @@ created() {
 				this.chatRoomParams = {
 					sku_id: this.goodsSkuDetail.sku_id
 				};
-				// 👇 新增contactData赋值（至少空对象，也可补充业务参数）
-this.contactData = {
-  goodsId: this.goodsId,
-  shopId: this.goodsSkuDetail.shop_id || '', // 若有店铺ID则补充
-  lang: uni.getStorageSync('lang') // 传递当前语言标识，方便客服组件兼容
-};
 				let typeId = this.goodsSkuDetail.goods_promotion[0];
 				if (typeId) {
 					// 限时折扣

pages/index/index.vue

@@ -7,16 +7,17 @@
 					<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 class="font-size-base">{{ $lang('common.siteName') || siteInfo.site_name }}</text>
+					<text>{{ followOfficialAccount.welcomeMsg }}</text>
-					<!-- 新增：多语言 - 公众号欢迎语 -->
-					<text>{{ $lang('common.welcomeMsg') || followOfficialAccount.welcomeMsg }}</text>
 				</view>
 			</view>
-			<!-- 新增：多语言 - 关注公众号按钮 -->
+			<view class="dite-button" @click="officialAccountsOpen">关注公众号</view>
-			<view class="dite-button" @click="officialAccountsOpen">{{ $lang('common.followOfficialAccount') }}</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"/>
@@ -35,15 +36,33 @@
 			<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>
@@ -58,8 +77,7 @@
 			<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="desc">{{ $lang('common.followMoreInfo') }}</text>
 					<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
 				</view>
 			</uni-popup>
@@ -69,29 +87,25 @@
 		<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>
-				<text @click="closeCollectPopupWindow">{{ $lang('common.iKnow') }}</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="head-wrap" @click="closeChooseStorePopup">{{ $lang('common.confirmStore') }}</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>
-							<text>{{ $lang('common.reposition') }}</text>
 						</view>
 					</view>
 					<view class="store-wrap" v-if="nearestStore">
-						<!-- 新增：多语言 - 当前门店 -->
+						<text class="tag">当前门店</text>
-						<text class="tag">{{ $lang('common.currentStore') }}</text>
 						<view class="store-name">{{ nearestStore.store_name }}</view>
 						<view class="address">{{ nearestStore.show_address }}</view>
 						<view class="distance" v-if="nearestStore.distance">
@@ -99,25 +113,21 @@
 							<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance * 1000 + 'm' }}</text>
 						</view>
 					</view>
-					<!-- 新增：多语言 - 确认进入 -->
+					<button type="primary" @click="enterStore">确认进入</button>
-					<button type="primary" @click="enterStore">{{ $lang('common.confirmEnter') }}</button>
 					<view class="other-store" @click="chooseOtherStore" v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-						<!-- 新增：多语言 - 选择其他门店 -->
+						<text>选择其他门店</text>
-						<text>{{ $lang('common.chooseOtherStore') }}</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>
-
-		<!-- 👇 删除：重复的语言切换按钮（hover-nav里已有） -->
 	</view>
 </template>
 
@@ -128,8 +138,7 @@
 	import indexJs from './public/js/index.js';
     import toTop from '@/components/toTop/toTop.vue';
     import scroll from '@/common/js/scroll-view.js';
-	// 👇 保留引入，但无需重复定义切换方法（hover-nav已处理）
+
-	import langUtil from '@/common/js/lang.js';
 
 	export default {
 		components: {
@@ -137,47 +146,7 @@
 			nsNavbar,
             toTop
 		},
-		mixins: [diyJs, scroll, indexJs],
+		mixins: [diyJs, scroll, indexJs]
-		data() {
-			return {
-				// 新增：标记是否已监听语言事件
-				langListenerAdded: false
-			};
-		},
-		onLoad() {
-			// 新增：监听语言切换事件，刷新首页DIY数据
-			this.addLangListener();
-		},
-		onUnload() {
-			// 新增：页面销毁时移除监听
-			this.removeLangListener();
-		},
-		methods: {
-			// 新增：添加语言监听
-			addLangListener() {
-				if (!this.langListenerAdded) {
-					uni.$on('lang-changed', this.handleLangChange);
-					this.langListenerAdded = true;
-				}
-			},
-			// 新增：移除语言监听
-			removeLangListener() {
-				if (this.langListenerAdded) {
-					uni.$off('lang-changed', this.handleLangChange);
-					this.langListenerAdded = false;
-				}
-			},
-			// 新增：语言切换后刷新首页数据
-			handleLangChange() {
-				// 重新请求首页DIY数据，确保内容同步为新语言
-				if (this.getDiyInfo) {
-					this.getDiyInfo(); // 调用首页获取DIY数据的方法
-				}
-				// 刷新多语言配置
-				this.$langConfig?.refresh();
-			},
-			// 👇 删除：重复的toggleLang方法（hover-nav里已有）
-		}
 	};
 </script>
 
@@ -185,6 +154,8 @@
 	@import '@/common/css/diy.scss';
 	@import './public/css/index.scss';
 	
+	
+	
 	.small-bot {
 	    width: 100%;
 	    height: 100%;
@@ -223,6 +194,7 @@
 	.small-bot-close i {
 	    font-size: 60rpx;
 	}
+
 </style>
 <style scoped>
 	.swiper /deep/ .uni-swiper-dots-horizontal {
@@ -257,9 +229,8 @@
 	}
     
     /deep/ .mescroll-totop {
-        right: 24rpx !important; 
+        right: 24rpx!important; 
-        bottom: 182rpx !important;
+        bottom: 182rpx!important;
     }
 
-	/* 👇 删除：重复的语言按钮样式（hover-nav里已有） */
 </style>

pages/member/index.vue

@@ -1,151 +1,127 @@
 <template>
-  <!-- 补充页面根模板结构（适配uni-app规范） -->
+	<page-meta :page-style="themeColor"></page-meta>
-  <page-meta :page-style="themeColor"></page-meta>
+	<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-  <view class="member-page">
+		<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="true"/>
-    
+		</view>
-  </view>
+
+		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true"/>
+			<ns-copyright v-show="isShowCopyRight"/>
+		</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"/>
+			<ns-copyright v-show="isShowCopyRight"/>
+			
+			<view class="foot">
+				<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=0')">隐私协议</view>
+				<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=1')">注册协议</view>
+			</view>
+		</view>
+
+		<template v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
+			<view @touchmove.prevent.stop>
+				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+					<view class="image-wrap">
+						<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle" @click="uniPopupWindowFn()" mode="aspectFit"/>
+					</view>
+					<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
+				</uni-popup>
+			</view>
+		</template>
+
+		<!-- 底部tabBar -->
+		<view id="tab-bar" :class="{ hide: bottomNavHidden }" v-if="openBottomNav">
+			<diy-bottom-nav @callback="callback"/>
+		</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>
+
+		<ns-birthday-gift ref="birthdayGift"></ns-birthday-gift>
+		<ns-new-gift ref="nsNewGift"></ns-new-gift>
+		
+
+		<hover-nav></hover-nav>
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<privacy-popup ref="privacyPopup"></privacy-popup>
+		<!-- #endif -->
+	</view>
 </template>
 
 <script>
-// 👇 引入语言工具文件
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import langUtil from '@/common/js/lang.js';
+	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+	import diyJs from '@/common/js/diy.js';
+	import indexJs from './public/js/index.js';
 
-export default {
+	export default {
-	data() {
+		components: {
-		return {
+			uniPopup,
-			diyRoute: '/pages/member/index'
+			nsNavbar
-		};
+		},
-	},
+		mixins: [diyJs, indexJs],
-	computed: {},
+		methods:{
-	watch: {
+			
-		storeToken: function(nVal, oVal) {
+			tourl(url){
-			if (nVal) {
+				this.$util.redirectTo(url);
-				this.initData();
-				if (uni.getStorageSync('source_member')) this.$util.onSourceMember(uni.getStorageSync(
-					'source_member'));
 			}
+			
 		}
-	},
+	};
-	onLoad(data) {
-		//刷新多语言
-		this.$langConfig.refresh();
-		
-		uni.hideTabBar();
-		this.name = 'DIY_VIEW_MEMBER_INDEX';
-		if (data.code) {
-			this.$api.sendRequest({
-				url: '/wechat/api/wechat/authcodetoopenid',
-				data: {
-					code: data.code
-				},
-				success: res => {
-					if (res.code >= 0) {
-						if (res.data.userinfo.nickName) this.modifyNickname(res.data.userinfo.nickName);
-						if (res.data.userinfo.avatarUrl) this.modifyHeadimg(res.data.userinfo
-							.avatarUrl);
-					}
-				}
-			});
-		}
-	},
-	onShow() {
-		
-		// 刷新会员数据
-		if (this.$refs.diyGroup) {
-			if (this.$refs.diyGroup.$refs.diyMemberIndex) this.$refs.diyGroup.$refs.diyMemberIndex[0].init();
-			if (this.$refs.diyGroup.$refs.diyMemberMyOrder) this.$refs.diyGroup.$refs.diyMemberMyOrder[0].getOrderNum();
-		}
-	},
-	methods: {
-		// 👇 新增：语言切换方法
-		toggleLang() {
-			const currentLang = this.$lang?.locale || 'zh-cn';
-			const targetLang = currentLang === 'zh-cn' ? 'en-us' : 'zh-cn';
-			langUtil.change(targetLang);
-		},
-		
-		/**
-		 * 查询会员信息
-		 */
-		initData() {
-			if (this.storeToken) {
-				this.$nextTick(() => {
-					this.$refs.nsNewGift.init();
-					this.$refs.birthdayGift.init();
-				});
-			}
-		},
-		/**
-		 * 修改昵称
-		 * @param {Object} nickName
-		 */
-		modifyNickname(nickName) {
-			this.$api.sendRequest({
-				url: '/api/member/modifynickname',
-				data: {
-					nickname: nickName
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.memberInfo.nickname = nickName;
-						this.$store.commit('setMemberInfo', this.memberInfo);
-					}
-				}
-			});
-		},
-		/**
-		 * 修改头像
-		 */
-		modifyHeadimg(headimg) {
-			this.$api.sendRequest({
-				url: '/api/member/modifyheadimg',
-				data: {
-					headimg: headimg
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.memberInfo.headimg = headimg;
-						this.$store.commit('setMemberInfo', this.memberInfo);
-					}
-				}
-			});
-		},
-	},
-};
 </script>
 
-<style scoped>
+<style lang="scss">
-/* 原有页面样式（保留） */
+	@import '@/common/css/diy.scss';
-.member-page {
+	.foot{
-  width: 100%;
+		display: flex;
-  min-height: 100vh;
+		// position: absolute;
-  box-sizing: border-box;
+		width: 100%;
-}
+		margin-bottom: 40rpx;
+		.item{
+			width: 50%;
+			text-align: center;
+			color:#F4391c
+		}
+	}
+</style>
 
-/* 👇 新增：语言切换按钮样式 */
+<style scoped>
-.lang-switch-wrap {
+	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-  position: fixed !important;
+		background: none !important;
-  bottom: 120rpx !important; /* 避开底部tabBar（若显示） */
+	}
-  right: 30rpx !important;
+
-  z-index: 99999 !important; /* 层级拉满 */
+	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
-  width: 120rpx;
+		border-radius: 0;
-  height: 60rpx;
+	}
-  background-color: #ffffff !important;
+
-  border: 1px solid #e5e5e5 !important;
+	.choose-store>>>.goodslist-uni-popup-box {
-  border-radius: 30rpx !important;
+		width: 80%;
-  display: flex !important;
+	}
-  align-items: center !important;
+
-  justify-content: center !important;
+	/deep/ .placeholder {
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1) !important;
+		height: 0;
-}
+	}
-.lang-text {
+
-  font-size: 28rpx !important;
+	/deep/::-webkit-scrollbar {
-  color: #333333 !important;
+		width: 0;
-  font-weight: 500 !important;
+		height: 0;
-}
+		background-color: transparent;
-.lang-switch-wrap:active {
+		display: none;
-  transform: scale(0.95) !important;
+	}
-  transition: transform 0.1s ease !important;
+
-}
+	.hide {
+		display: none;
+	}
+
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		max-height: unset !important;
+	}
 </style>

pages_promotion/merch/detail.vue

@@ -313,11 +313,11 @@
 	@import './public/css/list.scss';
 </style>
 <style scoped>
-	::v-deep .uni-tag--primary.uni-tag--inverted {
+	>>>.uni-tag--primary.uni-tag--inverted {
 		background-color: #f5f5f5 !important;
 	}
 
-	::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		max-height: unset !important;
 	}
 </style>

pages_tool/ai-chat/index.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarBackgroundColor": "#ff4544",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#f8f8f8",
+  "enablePullDownRefresh": false,
+  "onReachBottomDistance": 50,
+  "usingComponents": {
+    "ai-chat-message": "/components/ai-chat-message/ai-chat-message"
+  }
+}

pages_tool/ai-chat/index.vue

@@ -0,0 +1,650 @@
+<template>
+  <view class="ai-chat-page" :style="wrapperPageStyle">
+    <!--自定义导航头部 -->
+    <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="!showBackButton" class="placeholder"></view>
+      </view>
+      <view class="header-center">
+        <text class="header-subtitle">在线为您服务</text>
+      </view>
+      <view class="header-right">
+        <button class="menu-btn" v-show="showMenuButton" @click="showMenu">
+          <text class="iconfont icon-ellipsis"></text>
+        </button>
+        <!-- 占位元素，确保布局平衡 -->
+        <view v-show="!showMenuButton" class="placeholder"></view>
+      </view>
+    </view>
+
+    <!-- 聊天内容区域 -->
+    <view class="chat-content" 
+      :style="wrapperChatContentStyle"
+      >
+      <!-- AI聊天组件 -->
+      <ai-chat-message 
+        ref="chat"
+        :initial-messages="initialMessages"
+        :user-avatar="userAvatar"
+        :ai-avatar="aiAvatar"
+        @message-sent="onMessageSent"
+        @ai-response="onAIResponse"
+        @action-click="onActionClick"
+        @history-loaded="onHistoryLoaded"
+        @file-preview="onFilePreview"
+        @audio-play="onAudioPlay"
+        @audio-pause="onAudioPause"
+        @video-play="onVideoPlay"
+        @video-pause="onVideoPause"
+        @link-open="onLinkOpen"
+        @product-view="onProductView"
+        @input-change="onInputChange" />
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapGetters, mapMutations } from 'vuex'
+import navigationHelper from '@/common/js/navigation';
+import { EventSafety } from '@/common/js/event-safety';
+
+export default {
+  data() {
+    return {
+      initialMessages: [
+        {
+          id: 1,
+          role: 'ai',
+          type: 'text',
+          content: '您好！我是AI智能客服，很高兴为您服务！\n\n我可以帮您：\n• 解答产品相关问题\n• 处理订单问题\n• 提供技术支持\n• 推荐相关商品\n\n请告诉我您需要什么帮助？',
+          timestamp: Date.now() - 60000,
+          actions: [
+            { type: 'like', icon: 'icon-dianzan1', text: '喜欢', count: 0 },
+            { type: 'dislike', icon: 'icon-dianzan1', text: '不喜欢', count: 0 }
+          ]
+        }
+      ],
+
+      // --- 系统导航栏/状态栏相关 ---
+      navBarHeight: 44,   // uni-page-head 系统导航栏，默认高度为44px
+      statusBarHeight: 0, // 状态栏高度，默认0
+
+      // --- 自定义导航栏 ---
+      showCustomNavbar: true,    // 是否显示自定义导航栏
+      showBackButton: false,      // 是否显示返回按钮
+      showMenuButton: true,      // 是否显示设置菜单按钮
+
+      // --- 聊天内容区域 ---  
+      scrollViewHeight: '0px',
+
+
+      // 事件处理器引用（用于清理）
+      safeEventHandlers: new Map()
+    }
+  },
+  
+  computed: {
+    ...mapGetters([
+      'globalAIAgentConfig'
+    ]),    
+
+    /// ---- 关于AI客服的配置，支持远程配置 ----
+    userAvatar() {
+      return this.globalAIAgentConfig?.userAvatar || '/static/images/user-avatar.png'
+    },
+    aiAvatar() {
+      return this.globalAIAgentConfig?.aiAvatar || '/static/images/ai-avatar.png'
+    },
+    /// ---- 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() {
+      return { 
+        height: this.containerHeight,
+        paddingTop: this.showCustomNavbar ? '0' : (this.navHeight + 'px')
+      }
+    }
+  },
+
+  async onLoad(options) {
+    await this.initPage(options)
+  },
+  
+  async onReady() {
+    await this.initNavigation()
+  },
+
+  onShow() {
+    
+  },
+
+  onHide() {
+
+  },
+  
+  onUnload() {
+    this.cleanup()
+  },
+
+
+  
+
+  methods: {
+    // ========== 安全事件处理 ==========
+    setupSafeEventListeners() {
+      // 使用 EventSafety 包装事件处理器
+      const safeHandlers = {
+        serviceRequest: EventSafety.wrapEventHandler(
+          this.handleServiceRequest.bind(this),
+          { onError: this.handleEventError.bind(this) }
+        ),
+        navigationRequest: EventSafety.wrapEventHandler(
+          this.handleNavigationRequest.bind(this),
+          { onError: this.handleEventError.bind(this) }
+        ),
+        componentInteraction: EventSafety.wrapEventHandler(
+          this.handleComponentInteraction.bind(this),
+          { onError: this.handleEventError.bind(this) }
+        )
+      }
+      
+      // 注册事件监听
+      this.$on('service.requestComponentInfo', safeHandlers.serviceRequest)
+      this.$on('navigation.requestInfo', safeHandlers.navigationRequest)
+      this.$on('component.interaction', safeHandlers.componentInteraction)
+      
+      // 保存处理器引用用于清理
+      this.safeEventHandlers.set('serviceRequest', safeHandlers.serviceRequest)
+      this.safeEventHandlers.set('navigationRequest', safeHandlers.navigationRequest)
+      this.safeEventHandlers.set('componentInteraction', safeHandlers.componentInteraction)
+    },
+
+    setupNavigationEvents() {
+      // 监听窗口大小变化
+      uni.onWindowResize((res) => {
+        console.log('窗口大小变化:', res.size)
+        this.calculateScrollViewHeight()
+      })
+    },   
+
+    // ========== 事件处理方法 ========== 
+
+    async handleServiceRequest(event) {
+      console.log('处理服务请求:', EventSafety.extractEventData(event))
+      
+      // 安全地检查事件目标
+      if (event.matches('.service-component') || 
+          event.detail?.componentType === 'service') {
+        await this.processServiceRequest(event)
+      }
+    },
+
+    async handleNavigationRequest(event) {
+      console.log('处理导航请求:', event.type)
+      
+      // 提供导航信息
+      this.emitNavigationInfo(event)
+    },
+
+    handleComponentInteraction(event) {
+      console.log('处理组件交互:', event.detail)
+      
+      // 安全地处理组件交互
+      this.processComponentInteraction(event)
+    },
+
+    handleEventError(error, event) {
+      console.error('事件处理错误:', {
+        error: error.message,
+        eventType: event?.type,
+        component: this.$options.name
+      })
+      
+      this.showError('操作失败，请重试')
+    },
+
+    // ========== 初始化页面 ==========
+    async initPage(options = {}) {
+      this.$langConfig.title('AI智能客服');
+      this.initChat()
+    },
+    
+
+    // 初始化导航栏相关配置
+    async initNavigation() {
+      try {
+        // 获取导航栏高度
+        this.navBarHeight = await navigationHelper.getNavigationHeight(this, {forceRefresh: false})
+        
+        // 获取状态栏高度
+        this.statusBarHeight = navigationHelper.getStatusBarHeight()
+        
+        // 计算滚动视图高度
+        this.calculateScrollViewHeight()
+
+        // 注册导航相关事件
+        this.setupNavigationEvents()
+        
+      } catch (error) {
+        console.error('初始化导航栏失败:', error)
+        this.setFallbackNavigationValues()
+      }
+    },
+
+    // 计算滚动视图高度
+    calculateScrollViewHeight() {
+      const safeArea = navigationHelper.getSafeAreaInsets()
+      const bottomInset = safeArea.bottom || 0
+      const inputHeight = 120 // 输入区域高度
+      
+      this.scrollViewHeight = `calc(100vh - ${this.navBarHeight + this.statusBarHeight + inputHeight + bottomInset}px)`
+    },    
+
+    // 备用高度设置
+    setFallbackNavigationValues() {
+      // #ifdef MP-WEIXIN
+      this.navBarHeight = 44
+      this.statusBarHeight = 20
+      // #endif
+      
+      // #ifdef H5
+      this.navBarHeight = 44
+      this.statusBarHeight = 0
+      // #endif
+      
+      // #ifdef APP-PLUS
+      this.navBarHeight = 88
+      this.statusBarHeight = 44
+      // #endif
+    },    
+
+    cleanup() {
+      // 清理事件监听器
+      this.safeEventHandlers.forEach((handler, eventType) => {
+        this.$off(eventType, handler)
+      })
+      this.safeEventHandlers.clear()
+      
+      console.log('组件清理完成')
+    },
+
+    showError(message) {
+      uni.showToast({
+        title: message,
+        icon: 'none',
+        duration: 2000
+      })
+    },    
+
+
+    // 初始化聊天
+    initChat() {
+      // 可以在这里加载历史消息
+      console.log('AI聊天页面初始化')
+    },
+
+    // 返回上一页
+    goBack() {
+      uni.navigateBack()
+    },
+
+    // 显示菜单
+    showMenu() {
+      uni.showActionSheet({
+        itemList: ['清空聊天', '导出记录', '设置', '帮助'],
+        success: (res) => {
+          switch (res.tapIndex) {
+            case 0:
+              this.clearChat()
+              break
+            case 1:
+              this.exportChat()
+              break
+            case 2:
+              this.showSettings()
+              break
+            case 3:
+              this.showHelp()
+              break
+          }
+        }
+      })
+    },
+
+    // 清空聊天
+    clearChat() {
+      uni.showModal({
+        title: '提示',
+        content: '确定要清空聊天记录吗？',
+        success: (res) => {
+          if (res.confirm) {
+            this.$refs.chat.clearMessages()
+            // 重新添加欢迎消息
+            this.$refs.chat.addMessage({
+              id: Date.now(),
+              role: 'ai',
+              type: 'text',
+              content: '聊天记录已清空，有什么可以帮助您的吗？',
+              timestamp: Date.now()
+            })
+          }
+        }
+      })
+    },
+
+    // 导出聊天记录
+    exportChat() {
+      uni.showToast({
+        title: '功能开发中',
+        icon: 'none'
+      })
+    },
+
+    // 显示设置
+    showSettings() {
+      uni.navigateTo({
+        url: '/pages/settings/index'
+      })
+    },
+
+    // 显示帮助
+    showHelp() {
+      const helpMessage = {
+        id: Date.now(),
+        role: 'ai',
+        type: 'markdown',
+        content: `# 使用帮助
+
+## 基本功能
+- **发送消息**: 在输入框中输入文字后发送
+- **语音输入**: 点击麦克风图标进行语音输入
+- **附件发送**: 点击+号可以发送图片、文件、位置
+
+## 消息类型
+- **文本消息**: 普通文字对话
+- **Markdown**: 支持格式化的文档内容
+- **文件**: 支持各种文件格式预览
+- **音频**: 支持语音消息播放
+- **视频**: 支持视频播放
+- **链接**: 支持网页链接跳转
+- **商品**: 支持商品卡片展示
+
+## 操作功能
+- **点赞/踩**: 对AI回复进行评价
+- **复制**: 长按消息可复制内容
+- **转发**: 支持消息转发功能`,
+        timestamp: Date.now()
+      }
+      this.$refs.chat.addMessage(helpMessage)
+    },
+
+    // 用户发送消息
+    onMessageSent(message) {
+      console.log('用户发送消息:', message)
+      
+      // 使用AI服务获取回复
+      // AI聊天组件内部已经集成了AI服务，这里只需要监听事件
+    },
+
+    // AI回复消息
+    onAIResponse(message) {
+      console.log('AI回复消息:', message)
+      
+      // 可以在这里处理AI回复后的逻辑
+      // 比如记录对话、更新状态等
+    },
+
+    // 生成AI回复
+    generateAIResponse(userMessage) {
+      const responses = [
+        '我理解您的需求，让我为您详细解答。',
+        '感谢您的提问，这是一个很好的问题。',
+        '根据您的问题，我建议您可以考虑以下几个方面：',
+        '这个问题很常见，让我为您提供一些解决方案。',
+        '我明白您的困惑，让我帮您分析一下。'
+      ]
+      
+      const randomResponse = responses[Math.floor(Math.random() * responses.length)]
+      
+      const aiMessage = {
+        id: Date.now(),
+        role: 'ai',
+        type: 'text',
+        content: `${randomResponse}\n\n您的问题"${userMessage.content}"我已经收到，正在为您处理中...`,
+        timestamp: Date.now(),
+        actions: [
+          { type: 'like', count: 0 },
+          { type: 'dislike', count: 0 }
+        ]
+      }
+      
+      this.$refs.chat.addMessage(aiMessage)
+      this.$emit('ai-response', aiMessage)
+    },
+
+    // 操作按钮点击
+    onActionClick({ action, message }) {
+      console.log('操作点击:', action, message)
+      
+      switch (action.type) {
+        case 'like':
+          uni.showToast({
+            title: '感谢您的反馈！',
+            icon: 'success'
+          })
+          break
+        case 'dislike':
+          uni.showToast({
+            title: '我们会改进服务',
+            icon: 'none'
+          })
+          break
+      }
+    },
+
+    // 历史消息加载完成
+    onHistoryLoaded(messages) {
+      console.log('历史消息加载完成:', messages.length)
+    },
+
+    // 文件预览
+    onFilePreview(message) {
+      console.log('文件预览:', message)
+      uni.showToast({
+        title: '打开文件: ' + message.fileName,
+        icon: 'none'
+      })
+    },
+
+    // 音频播放
+    onAudioPlay(message) {
+      console.log('音频播放:', message)
+    },
+
+    // 音频暂停
+    onAudioPause(message) {
+      console.log('音频暂停:', message)
+    },
+
+    // 视频播放
+    onVideoPlay(message) {
+      console.log('视频播放:', message)
+    },
+
+    // 视频暂停
+    onVideoPause(message) {
+      console.log('视频暂停:', message)
+    },
+
+    // 链接打开
+    onLinkOpen(message) {
+      console.log('链接打开:', message)
+      uni.showModal({
+        title: '打开链接',
+        content: `确定要打开链接：${message.url} 吗？`,
+        success: (res) => {
+          if (res.confirm) {
+            // #ifdef H5
+            window.open(message.url, '_blank')
+            // #endif
+            // #ifdef APP-PLUS
+            plus.runtime.openURL(message.url)
+            // #endif
+          }
+        }
+      })
+    },
+
+    // 商品查看
+    onProductView(message) {
+      console.log('商品查看:', message)
+      uni.showToast({
+        title: '查看商品: ' + message.title,
+        icon: 'none'
+      })
+    },
+
+    // 输入内容变化
+    onInputChange(value) {
+      console.log('输入内容:', value)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+
+/* 引入图标字体 */
+@import url('/common/css/iconfont.css');
+
+/* 页面样式 */
+.ai-chat-page {
+  display: flex;
+  flex-direction: column;
+  background-color: #f8f8f8;
+  overflow: hidden;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+/* 自定义导航头部 */
+.custom-navbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx 30rpx;
+  background-color: white;
+  border-bottom: 2rpx solid #eeeeee;
+  
+  .header-left {
+    flex: 0 0 auto;
+    display: flex;
+    align-items: center;
+    
+    .back-btn {
+      width: 60rpx;
+      height: 60rpx;
+      border-radius: 50%;
+      background-color: #f8f8f8;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      
+      .iconfont {
+        font-size: 32rpx;
+        color: #666;
+      }
+    }
+    
+    .placeholder {
+      width: 120rpx;
+      height: 60rpx;
+    }
+  }
+  
+  .header-center {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 20rpx;
+    
+    .header-title {
+      font-size: 36rpx;
+      font-weight: bold;
+      color: #333;
+    }
+    
+    .header-subtitle {
+      font-size: 24rpx;
+      color: #999;
+    }
+  }
+  
+  .header-right {
+    flex: 0 0 auto;
+    display: flex;
+    align-items: center;
+    
+    .menu-btn {
+      width: 60rpx;
+      height: 60rpx;
+      border-radius: 50%;
+      background-color: #f8f8f8;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      
+      .iconfont {
+        font-size: 32rpx;
+        color: #666;
+      }
+    }
+    
+    .placeholder {
+      width: 120rpx;
+      height: 60rpx;
+    }
+  }
+}
+
+/* 聊天内容区域 */
+.chat-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+
+
+/* 底部tabBar占位样式 */
+.page-bottom {
+  width: 100%;
+  background-color: transparent;
+}
+
+</style>

project.config.json

@@ -49,7 +49,7 @@
     "disableSWC": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.12.1",
+  "libVersion": "3.12.0",
   "appid": "wx29215aa1bd97bbd6",
   "projectname": "niushop_b2c_v4_uniapp",
   "isGameTourist": false,

project.private.config.json

@@ -1,24 +0,0 @@
-{
-  "libVersion": "3.12.1",
-  "projectname": "niushop_b2c_v4_uniapp",
-  "condition": {},
-  "setting": {
-    "urlCheck": true,
-    "coverView": true,
-    "lazyloadPlaceholderEnable": false,
-    "skylineRenderEnable": false,
-    "preloadBackgroundData": false,
-    "autoAudits": false,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "showShadowRootInWxmlPanel": true,
-    "useStaticServer": false,
-    "useLanDebug": false,
-    "showES6CompileOption": false,
-    "compileHotReLoad": true,
-    "checkInvalidKey": true,
-    "ignoreDevUnusedFiles": true,
-    "bigPackageSizeSupport": false,
-    "useIsolateContext": true
-  }
-}

scripts/iconfontcss-generate-preview.js

@@ -0,0 +1,57 @@
+// generate-preview.js
+const fs = require('fs');
+const path = require('path');
+
+function generateIconfontPreview(cssPath, outputPath) {
+    const cssContent = fs.readFileSync(cssPath, 'utf8');
+    
+    // 解析图标
+    const iconRegex = /\.(icon-[^:]+):before\s*{\s*content:\s*["']\\([^"']+)["']/g;
+    const icons = [];
+    let match;
+    
+    while ((match = iconRegex.exec(cssContent)) !== null) {
+        icons.push({
+            className: match[1],
+            unicode: '\\' + match[2]
+        });
+    }
+
+    // 计算引入css文件相对于 outputPath的路径
+    const relativeCssPath = path.relative(path.dirname(outputPath), cssPath);
+    
+    // 生成 HTML
+    const html = `<!DOCTYPE html>
+<html>
+<head>
+    <title>Iconfont Preview</title>
+    <link rel="stylesheet" href="${relativeCssPath}">
+    <style>
+        body { font-family: Arial; padding: 20px; }
+        .grid { font-family: iconfont; display: grid; grid-template-columns: repeat(6, 1fr); gap: 10px; }
+        .icon { text-align: center; padding: 10px; border: 1px solid #ddd; }
+        .char { font-size: 24px; }
+        .name { font-size: 12px; margin-top: 5px; }
+    </style>
+</head>
+<body>
+    <h1>Iconfont Preview (${icons.length} icons)</h1>
+    <div class="grid">
+        ${icons.map(icon => `
+            <div class="icon">
+                <div class="char ${icon.className}"></div>
+                <div class="name">${icon.className}</div>
+            </div>
+        `).join('')}
+    </div>
+</body>
+</html>`;
+    
+    fs.writeFileSync(outputPath, html);
+    console.log(`预览已生成: ${outputPath}`);
+}
+
+// 使用
+const cssPath = path.join(__dirname, '../common/css/iconfont.css');
+const outputPath = path.join(__dirname, '../iconfont-preview.html');
+generateIconfontPreview(cssPath, outputPath);

store/index.js

@@ -1,351 +1,396 @@
-import Vue from 'vue'
+import Vue from 'vue'
-import Vuex from 'vuex'
+import Vuex from 'vuex'
-Vue.use(Vuex)
+Vue.use(Vuex)
-
+
-import Http from '../common/js/http.js'
+import Http from '../common/js/http.js'
-import colorList from '../common/js/style_color.js'
+import colorList from '../common/js/style_color.js'
-
+
-const store = new Vuex.Store({
+const store = new Vuex.Store({
-	state: {
+	state: {
-		token: null,
+		token: null,
-		siteInfo: null,
+		siteInfo: null,
-		memberInfo: null,
+		memberInfo: null,
-		tabBarList: '',
+		tabBarList: '',
-		siteState: 1,
+		siteState: 1,
-		themeStyle: '',
+		themeStyle: '',
-		addonIsExist: {
+		addonIsExist: {
-			bundling: 0,
+			bundling: 0,
-			coupon: 0,
+			coupon: 0,
-			discount: 0,
+			discount: 0,
-			fenxiao: 0,
+			fenxiao: 0,
-			gift: 0,
+			gift: 0,
-			groupbuy: 0,
+			groupbuy: 0,
-			manjian: 0,
+			manjian: 0,
-			memberconsume: 0,
+			memberconsume: 0,
-			memberrecharge: 0,
+			memberrecharge: 0,
-			memberregister: 0,
+			memberregister: 0,
-			membersignin: 0,
+			membersignin: 0,
-			memberwithdraw: 0,
+			memberwithdraw: 0,
-			memberrecommend: 0,
+			memberrecommend: 0,
-			pintuan: 0,
+			pintuan: 0,
-			pointexchange: 0,
+			pointexchange: 0,
-			seckill: 0,
+			seckill: 0,
-			store: 0,
+			store: 0,
-			topic: 0,
+			topic: 0,
-			bargain: 0,
+			bargain: 0,
-			membercancel: 0,
+			membercancel: 0,
-			servicer: 0,
+			servicer: 0,
-			supermember: 0,
+			supermember: 0,
-			giftcard: 0,
+			giftcard: 0,
-			divideticket: 0,
+			divideticket: 0,
-			scenefestival: 0,
+			scenefestival: 0,
-			birthdaygift: 0,
+			birthdaygift: 0,
-			pinfan: 0,
+			pinfan: 0,
-			form: 0
+			form: 0
-		},
+		},
-		authInfo: {}, // 授权信息
+		authInfo: {}, // 授权信息
-		flRefresh: 0,
+		flRefresh: 0,
-		location: null, // 定位信息
+		location: null, // 定位信息
-		defaultImg: {
+		defaultImg: {
-			goods: '',
+			goods: '',
-			head: '',
+			head: '',
-			store: '',
+			store: '',
-			article: ''
+			article: '',
-		},
+			aiAgent: ''
-		cartList: {},
+		},
-		cartIds: [],
+		cartList: {},
-		cartNumber: 0,
+		cartIds: [],
-		cartMoney: 0,
+		cartNumber: 0,
-		cartChange: 0,
+		cartMoney: 0,
-		bottomNavHidden: false, // 底部导航是否隐藏，true：隐藏，false：显示
+		cartChange: 0,
-		globalStoreConfig: null, // 门店配置
+		wechatConfigStatus:0,
-		globalStoreInfo: null, // 门店信息
+		bottomNavHidden: false, // 底部导航是否隐藏，true：隐藏，false：显示
-		defaultStoreInfo: null, // 默认门店
+		aiUnreadCount: 10, // AI未读消息数量
-		cartPosition: null, // 购物车所在位置
+		globalAIAgentConfig: null, // AI客服配置
-		componentRefresh: 0, // 组件刷新
+		globalStoreConfig: null, // 门店配置
-		servicerConfig: null, // 客服配置
+		globalStoreInfo: null, // 门店信息
-		diySeckillInterval: 0,
+		defaultStoreInfo: null, // 默认门店
-		diyGroupPositionObj: {},
+		cartPosition: null, // 购物车所在位置
-		diyGroupShowModule: '',
+		componentRefresh: 0, // 组件刷新
-		tabBarHeight: '56px',
+		servicerConfig: null, // 客服配置
-		mapConfig: {
+		diySeckillInterval: 0,
-			tencent_map_key: '',
+		diyGroupPositionObj: {},
-			wap_is_open: 1,
+		diyGroupShowModule: '',
-			wap_valid_time: 0
+		tabBarHeight: '56px',
-		},
+		mapConfig: {
-		copyright: null
+			tencent_map_key: '',
-	},
+			wap_is_open: 1,
-	mutations: {
+			wap_valid_time: 0,
-		// 设置那些组件展示
+		},
-		setDiyGroupShowModule(state, data) {
+		copyright: null,
-			state.diyGroupShowModule = data;
+		initStatus:false,
-		},
+		offlineWhiteList:['pages/order/payment','pages/order/list','pages/order/detail'],//线下支付白名单
-		// 设置diyGroup中组件原有高度，通过他们来实现在首页的定位
+		canReceiveRegistergiftInfo: {
-		setDiyGroupPositionObj(state, data) {
+			status: false,
-			state.diyGroupPositionObj = Object.assign({}, state.diyGroupPositionObj, data);
+			path: ''
-		},
+		},
-		setSiteState(state, siteStateVal) {
+	},
-			state.siteState = siteStateVal;
+	mutations: {
-		},
+		// 设置是否可以领取新人礼
-		setThemeStyle(state, value) {
+		setCanReceiveRegistergiftInfo(state, data) {
-			state.themeStyle = value
+			state.canReceiveRegistergiftInfo = data;
-			uni.setStorageSync('themeStyle', value); // 初始化数据调用
+		},
-		},
+		// 设置那些组件展示
-		setTabBarList(state, value) {
+		setDiyGroupShowModule(state, data) {
-			state.tabBarList = value;
+			state.diyGroupShowModule = data;
-		},
+		},
-		setAddonIsExist(state, value) {
+		// 设置diyGroup中组件原有高度，通过他们来实现在首页的定位
-			state.addonIsExist = value;
+		setDiyGroupPositionObj(state, data) {
-			uni.setStorageSync('addonIsExist', value); // 初始化数据调用
+			state.diyGroupPositionObj = Object.assign({}, state.diyGroupPositionObj, data);
-		},
+		},
-		setToken(state, value) {
+		setSiteState(state, siteStateVal) {
-			state.token = value;
+			state.siteState = siteStateVal;
-			if (value) {
+		},
-				uni.setStorageSync('token', value); // 初始化数据调用
+		setThemeStyle(state, value) {
-			} else {
+			state.themeStyle = value
-				uni.removeStorageSync('token');
+			uni.setStorageSync('themeStyle', value); // 初始化数据调用
-			}
+		},
-		},
+		setTabBarList(state, value) {
-		setAuthinfo(state, value) {
+			state.tabBarList = value;
-			state.authInfo = value;
+		},
-		},
+		setAddonIsExist(state, value) {
-		setflRefresh(state, flRefreshVal) {
+			state.addonIsExist = value;
-			state.flRefresh = flRefreshVal;
+			uni.setStorageSync('addonIsExist', value); // 初始化数据调用
-		},
+		},
-		setLocation(state, value) {
+		setToken(state, value) {
-			var date = new Date();
+			state.token = value;
-			date.setSeconds(60 * state.mapConfig.wap_valid_time);
+			if (value) {
-			value.valid_time = date.getTime() / 1000; // 定位信息 5分钟内有效，过期后将重新获取定位信息
+				uni.setStorageSync('token', value); // 初始化数据调用
-			state.location = value;
+			} else {
-			uni.setStorageSync('location', value); // 初始化数据调用
+				uni.removeStorageSync('token');
-		},
+			}
-		setDefaultImg(state, value) {
+		},
-			state.defaultImg = value;
+		setAuthinfo(state, value) {
-			uni.setStorageSync('defaultImg', value); // 初始化数据调用
+			state.authInfo = value;
-		},
+		},
-		setSiteInfo(state, value) {
+		setflRefresh(state, flRefreshVal) {
-			state.siteInfo = value;
+			state.flRefresh = flRefreshVal;
-			uni.setStorageSync('siteInfo', value); // 初始化数据调用
+		},
-		},
+		setLocation(state, value) {
-		setShopInfo(state, value) {
+			var date = new Date();
-			state.shopInfo = value;
+			date.setSeconds(60 * state.mapConfig.wap_valid_time);
-			uni.setStorageSync('shopInfo', value); // 初始化数据调用
+			value.valid_time = date.getTime() / 1000; // 定位信息 5分钟内有效，过期后将重新获取定位信息
-		},
+			state.location = value;
-		setCartChange(state) {
+			uni.setStorageSync('location', value); // 初始化数据调用
-			state.cartChange += 1;
+		},
-		},
+		setDefaultImg(state, value) {
-		setBottomNavHidden(state, value) {
+			state.defaultImg = value;
-			state.bottomNavHidden = value;
+			uni.setStorageSync('defaultImg', value); // 初始化数据调用
-		},
+		},
-		setGlobalStoreConfig(state, value) {
+		setSiteInfo(state, value) {
-			state.globalStoreConfig = value;
+			state.siteInfo = value;
-			uni.setStorageSync('globalStoreConfig', value); // 初始化数据调用
+			uni.setStorageSync('siteInfo', value); // 初始化数据调用
-		},
+		},
-		setGlobalStoreInfo(state, value) {
+		setShopInfo(state, value) {
-			state.globalStoreInfo = value;
+			state.shopInfo = value;
-			uni.setStorageSync('globalStoreInfo', value); // 初始化数据调用
+			uni.setStorageSync('shopInfo', value); // 初始化数据调用
-		},
+		},
-		setDefaultStoreInfo(state, value) {
+		setCartChange(state) {
-			state.defaultStoreInfo = value;
+			state.cartChange += 1;
-			uni.setStorageSync('defaultStoreInfo', value); // 初始化数据调用
+		},
-		},
+		setBottomNavHidden(state, value) {
-		setCartPosition(state, value) {
+			state.bottomNavHidden = value;
-			state.cartPosition = value;
+		},
-		},
+		setGlobalAIAgentConfig(state, value) {
-		setComponentRefresh(state) {
+			state.globalAIAgentConfig = value;
-			state.componentRefresh += 1;
+			uni.setStorageSync('globalAIAgentConfig', value); // 初始化数据调用
-		},
+		},
-		// 客服配置
+		setGlobalStoreConfig(state, value) {
-		setServicerConfig(state, value) {
+			state.globalStoreConfig = value;
-			state.servicerConfig = value;
+			uni.setStorageSync('globalStoreConfig', value); // 初始化数据调用
-			uni.setStorageSync('servicerConfig', value);
+		},
-		},
+		setGlobalStoreInfo(state, value) {
-		setDiySeckillInterval(state, value) {
+			state.globalStoreInfo = value;
-			state.diySeckillInterval = value;
+			uni.setStorageSync('globalStoreInfo', value); // 初始化数据调用
-		},
+		},
-		setTabBarHeight(state, value) {
+		setDefaultStoreInfo(state, value) {
-			state.tabBarHeight = value;
+			state.defaultStoreInfo = value;
-		},
+			uni.setStorageSync('defaultStoreInfo', value); // 初始化数据调用
-		setMapConfig(state, value) {
+		},
-			state.mapConfig = value;
+		setCartPosition(state, value) {
-			uni.setStorageSync('mapConfig', value);
+			state.cartPosition = value;
-		},
+		},
-		setCopyright(state, value) {
+		setComponentRefresh(state) {
-			state.copyright = value;
+			state.componentRefresh += 1;
-			uni.setStorageSync('copyright', value);
+		},
-		},
+		// 客服配置
-		setMemberInfo(state, value) {
+		setServicerConfig(state, value) {
-			state.memberInfo = value;
+			state.servicerConfig = value;
-			if (value) {
+			uni.setStorageSync('servicerConfig', value);
-				uni.setStorageSync('memberInfo', value);
+		},
-			} else {
+		setDiySeckillInterval(state, value) {
-				uni.removeStorageSync('memberInfo');
+			state.diySeckillInterval = value;
-			}
+		},
-		},
+		setTabBarHeight(state, value) {
-		setCartNumber(state, cartNumber) {
+			state.tabBarHeight = value;
-			state.cartNumber = cartNumber
+		},
-		},
+		setMapConfig(state, value) {
-		setCartList(state, value) {
+			state.mapConfig = value;
-			state.cartList = value;
+			uni.setStorageSync('mapConfig', value);
-		},
+		},
-		setCartIds(state, value) {
+		setCopyright(state, value) {
-			state.cartIds = value;
+			state.copyright = value;
-		},
+			uni.setStorageSync('copyright', value);
-		setCartMoney(state, value) {
+		},
-			state.cartMoney = value;
+		setMemberInfo(state, value) {
-		}
+			// 会员被锁定后，清除会员登录信息
-	},
+			if (value && value.status == 0) {
-	actions: {
+				value = null;
-		init() {
+			}
-			return new Promise((resolve, reject) => {
+			state.memberInfo = value;
-				Http.sendRequest({
+			if (value) {
-					url: '/api/config/init',
+				uni.setStorageSync('memberInfo', value);
-					success: res => {
+			} else {
-						var data = res.data;
+				// 会员为空时，清除会员登录信息
-						if (data) {
+				uni.removeStorageSync('memberInfo');
-							this.commit('setThemeStyle', colorList[data.style_theme.name]);
+				this.commit('setToken', '');
-
+				this.dispatch('emptyCart');
-							// 底部导航
+				//uni.removeStorageSync('authInfo');
-							this.commit('setTabBarList', data.diy_bottom_nav);
+			}
-
+		},
-							this.commit('setAddonIsExist', data.addon_is_exist);
+		setCartNumber(state, cartNumber) {
-
+			state.cartNumber = cartNumber
-							this.commit('setDefaultImg', data.default_img);
+		},
-			
+		setCartList(state, value) {
-							this.commit('setSiteInfo', data.site_info);
+			state.cartList = value;
-
+		},
-							this.commit('setServicerConfig', data.servicer);
+		setCartIds(state, value) {
-						
+			state.cartIds = value;
-							this.commit('setCopyright', data.copyright);
+		},
-
+		setCartMoney(state, value) {
-							this.commit('setMapConfig', data.map_config);
+			state.cartMoney = value;
-
+		},
-							this.commit('setGlobalStoreConfig', data.store_config);
+		setInitStatus(state,value){
-							
+			state.initStatus = value
-							//联系我们
+		},
-							
+		setWechatConfigStatus(state,value){
-							this.commit('setShopInfo', data.shop_info);
+			state.wechatConfigStatus = value
-							// 默认总店
+		},    
-							if (data.store_info) {
+		// 设置AI未读消息数量
-								this.commit('setDefaultStoreInfo', data.store_info);
+		setAiUnreadCount(state, value) {
-							} else {
+			state.aiUnreadCount = value;
-								// 清空不存在的门店信息
+		}
-								this.commit('setDefaultStoreInfo', null);
+	},
-								this.commit('setGlobalStoreInfo', null);
+	getters: {
-							}
+		// AI智能助手配置
-
+		globalAIAgentConfig: state => state.globalAIAgentConfig,
-							resolve(data);
+		// AI未读消息数量
-						}
+		aiUnreadCount: state => state.aiUnreadCount,
-					}
+	},
-				});
+	actions: {
-			})
+		init() {
-		},
+			return new Promise((resolve, reject) => {
-		// 查询购物车列表、总数量、总价格
+				Http.sendRequest({
-		getCartNumber() {
+					url: '/api/config/init',
-			Http.sendRequest({
+					success: res => {
-				url: '/api/cart/lists',
+						var data = res.data;
-				data: {},
+						if (data) {
-				success: res => {
+
-					if (res.code == 0) {
+							this.commit('setThemeStyle', colorList[data.style_theme.name]);
-						let list = [];
+
-						let ids = [];
+							// 底部导航
-						let totalMoney = 0;
+							this.commit('setTabBarList', data.diy_bottom_nav);
-						let totalNum = 0;
+
-
+							this.commit('setAddonIsExist', data.addon_is_exist);
-						if (res.data.length) {
+
-
+							this.commit('setDefaultImg', data.default_img);
-							res.data.forEach((item) => {
+			
-								let cart = {
+							this.commit('setSiteInfo', data.site_info);
-									cart_id: item.cart_id,
+
-									goods_id: item.goods_id,
+							this.commit('setServicerConfig', data.servicer);
-									sku_id: item.sku_id,
+						
-									num: item.num,
+							this.commit('setCopyright', data.copyright);
-									discount_price: item.discount_price
+
-								};
+							this.commit('setMapConfig', data.map_config);
-
+
-								if (!list['goods_' + cart.goods_id]) {
+							this.commit('setGlobalAIAgentConfig', data.ai_agent_config);
-									list['goods_' + cart.goods_id] = {};
+
-								}
+							this.commit('setGlobalStoreConfig', data.store_config);
-								list['goods_' + cart.goods_id]['sku_' + cart
+              this.commit('setWechatConfigStatus',data.wechat_config_status)
-										.sku_id
+							
-									] =
+							//联系我们
-									cart;
+							
-								ids.push(cart.cart_id);
+							this.commit('setShopInfo', data.shop_info);
-							});
+							// 默认总店
-
+							if (data.store_info) {
-							for (let goods in list) {
+								this.commit('setDefaultStoreInfo', data.store_info);
-								let num = 0;
+							} else {
-								let money = 0;
+								// 清空不存在的门店信息
-								for (let sku in list[goods]) {
+								this.commit('setDefaultStoreInfo', null);
-									let item = list[goods][sku];
+								this.commit('setGlobalStoreInfo', null);
-									if (typeof item == 'object') {
+							}
-										num += item.num;
+							this.commit('setInitStatus',true)
-										money += parseFloat(item.discount_price) * parseInt(item
+							resolve(data);
-											.num);
+						}
-									}
+					}
-								}
+				});
-								list[goods].num = num;
+			})
-								list[goods].total_money = money;
+		},
-
+		// 查询购物车列表、总数量、总价格
-								totalNum += num;
+		getCartNumber() {
-								totalMoney += money;
+			Http.sendRequest({
-
+				url: '/api/cart/lists',
-							}
+				data: {},
-						}
+				success: res => {
-
+					if (res.code == 0) {
-						this.commit('setCartList', list);
+						let list = {};
-
+						let ids = [];
-						this.commit('setCartIds', ids);
+						let totalMoney = 0;
-
+						let totalNum = 0;
-						this.commit('setCartNumber', totalNum);
+
-
+						if (res.data.length) {
-						this.commit('setCartMoney', totalMoney);
+
-
+							res.data.forEach((item) => {
-					}
+								let cart = {
-				}
+									cart_id: item.cart_id,
-			});
+									goods_id: item.goods_id,
-		},
+									sku_id: item.sku_id,
-		// 清空购物车 ns-goods-sku-index组件中引用
+									num: item.num,
-		emptyCart() {
+									discount_price: item.discount_price,
-			this.commit('setCartList', {});
+									min_buy: item.min_buy,
-			this.commit('setCartIds', []);
+									stock: item.stock,
-			this.commit('setCartNumber', 0);
+								};
-			this.commit('setCartMoney', 0);
+
-		},
+								if (!list['goods_' + cart.goods_id]) {
-		// 计算购物车数量、价格
+									list['goods_' + cart.goods_id] = {};
-		cartCalculate() {
+								}
-
+								list['goods_' + cart.goods_id]['max_buy'] = item.max_buy;
-			let ids = [];
+								list['goods_' + cart.goods_id]['goods_name'] = item.goods_name;
-			let totalMoney = 0;
+								list['goods_' + cart.goods_id]['sku_' + cart.sku_id] = cart;
-			let totalNum = 0;
+								ids.push(cart.cart_id);
-
+							});
-			for (let k in this.state.cartList) {
+
-				let item = this.state.cartList[k];
+							for (let goods in list) {
-
+								let num = 0;
-				let num = 0;
+								let money = 0;
-				let money = 0;
+								for (let sku in list[goods]) {
-				for (let sku in item) {
+									let item = list[goods][sku];
-					if (typeof item[sku] == 'object') {
+									if (typeof item == 'object') {
-						num += item[sku].num;
+										num += item.num;
-						money += parseFloat(item[sku].discount_price) * parseInt(item[sku].num);
+										money += parseFloat(item.discount_price) * parseInt(item.num);
-						ids.push(item[sku].cart_id);
+									}
-					}
+								}
-				}
+								list[goods].num = num;
-				item.num = num;
+								list[goods].total_money = money;
-				item.total_money = money;
+
-
+								totalNum += num;
-				totalNum += num;
+								totalMoney += money;
-				totalMoney += money;
+
-
+							}
-			}
+						}
-
+						this.commit('setCartList', list);
-			this.commit('setCartNumber', totalNum);
+
-
+						this.commit('setCartIds', ids);
-			this.commit('setCartMoney', totalMoney);
+
-
+						this.commit('setCartNumber', totalNum);
-			this.commit('setCartIds', ids);
+
-
+						this.commit('setCartMoney', totalMoney);
-		}
+
-	}
+					}
-})
+				}
+			});
+		},
+		// 清空购物车 ns-goods-sku-index组件中引用
+		emptyCart() {
+			this.commit('setCartList', {});
+			this.commit('setCartIds', []);
+			this.commit('setCartNumber', 0);
+			this.commit('setCartMoney', 0);
+		},
+		// 计算购物车数量、价格
+		cartCalculate() {
+
+			let ids = [];
+			let totalMoney = 0;
+			let totalNum = 0;
+
+			for (let k in this.state.cartList) {
+				let item = this.state.cartList[k];
+
+				let num = 0;
+				let money = 0;
+				for (let sku in item) {
+					if (typeof item[sku] == 'object') {
+						num += item[sku].num;
+						money += parseFloat(item[sku].discount_price) * parseInt(item[sku].num);
+						ids.push(item[sku].cart_id);
+					}
+				}
+				item.num = num;
+				item.total_money = money;
+
+				totalNum += num;
+				totalMoney += money;
+
+			}
+
+			this.commit('setCartNumber', totalNum);
+
+			this.commit('setCartMoney', totalMoney);
+
+			this.commit('setCartIds', ids);
+
+		}
+	}
+})
 export default store