feat：新添加华为支付

common/js/ai-service.js

@@ -1,18 +1,6 @@
-import Config from './config.js'
 import http from './http.js'
 import store from '@/store/index.js'
-let currentConversationId = null;
-const CONVERSATION_KEY = 'ai_conversation_id';
 
-// 初始化时从本地读取
-try {
-  const saved = uni.getStorageSync(CONVERSATION_KEY);
-  if (saved) {
-    currentConversationId = saved;
-  }
-} catch (e) {
-  console.warn('读取会话ID失败:', e);
-}
 export default {
   /**
    * 发送消息到Dify API
@@ -22,47 +10,74 @@ export default {
    */
   async sendMessage(message, options = {}) {
     try {
-      const aiConfig = store.getters.globalAIKefuConfig
+      // 获取AI配置
+      const aiConfig = store.getters.globalAIAgentConfig
+      
+      // 构建Dify API请求参数
       const params = {
-        url: '/api/kefu/chat',
+        url: '/api/ai/chat', // 后端代理接口
         data: {
+          message: message,
+          conversation_id: options.conversationId || this.generateConversationId(),
           user_id: store.state.memberInfo?.id || 'anonymous',
-          stream: false,
+          stream: options.stream || false, // 是否流式响应
+          // Dify API参数
           inputs: {},
           query: message,
           response_mode: options.stream ? 'streaming' : 'blocking',
-          user: store.state.memberInfo?.id || 'anonymous',
+          user: store.state.memberInfo?.id || 'anonymous'
-		  conversation_id: this.getConversationId() || '' 
         },
         header: {
           'Content-Type': 'application/json'
         }
       }
-      console.log('Sending request to:', params.url);
-      console.log('Request data:', params.data);
       
+      // 如果有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
+        async: false // 使用Promise方式
       })
       
-      const result = this.handleResponse(response, options);
+      return this.handleResponse(response, options)
-           if (result.conversationId) {
+      
-             this.setConversationId(result.conversationId);
+    } catch (error) {
-           }
+      console.error('Dify API请求失败:', error)
-           return result;
+      throw new Error('AI服务暂时不可用，请稍后重试')
-         } 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 {
-      return this.sendHttpStream(message, onChunk, onComplete)
+      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
@@ -70,266 +85,186 @@ export default {
   },
   
   /**
-   * EventSource 流式聊天
+   * WebSocket连接
    */
-  chatWithEventSource(message, conversationId = '', onMessage, onComplete, onError) {
+  connectWebSocket(message, onChunk, onComplete) {
-    if (window.currentEventSource) {
+    return new Promise((resolve, reject) => {
-      window.currentEventSource.close();
+      const aiConfig = store.getters.globalAIAgentConfig
-    }
+      const wsUrl = aiConfig.difyWsUrl
-    const params = new URLSearchParams({
-      uniacid: store.state.uniacid || '1',
-      user_id: store.state.memberInfo?.id || '123456',
-      query: message,
-      conversation_id: conversationId || '',
-      stream: 'true'
-    });
-    const url = `/api/kefu/chat?${params.toString()}`;
-    try {
-      const eventSource = new EventSource(url);
-      window.currentEventSource = eventSource;
-      let aiMessage = '';
-      eventSource.addEventListener('message', (event) => {
-        try {
-          const data = JSON.parse(event.data);
-          if (data.event === 'message') {
-            aiMessage += data.answer || '';
-            if (onMessage) onMessage(data.answer || '');
-          }
-          if (data.event === 'message_end') {
-            if (onComplete) onComplete({ 
-              conversation_id: data.conversation_id,
-              message: aiMessage 
-            });
-          }
-          if (data.conversation_id) {
-            conversationId = data.conversation_id;
-          }
-        } catch (error) {
-          console.error('解析消息失败:', error);
-        }
-      });
-      eventSource.addEventListener('done', (event) => {
-        try {
-          const data = JSON.parse(event.data);
-          if (onComplete) onComplete(data);
-        } catch (error) {
-          console.error('解析完成事件失败:', error);
-        }
-      });
-      eventSource.addEventListener('close', (event) => {
-        try {
-          const data = JSON.parse(event.data);
-          console.log('连接正常结束:', data);
-        } catch (error) {
-          console.error('解析关闭事件失败:', error);
-        }
-        window.currentEventSource = null;
-      });
-      eventSource.addEventListener('error', (error) => {
-        console.error('EventSource错误:', error);
-        if (onError) onError({ error: 'EventSource连接错误' });
-        window.currentEventSource = null;
-      });
-      return eventSource;
-    } catch (error) {
-      console.error('创建EventSource失败:', error);
-      if (onError) onError({ error: error.message });
-      return null;
-    }
-  },
       
-  /**
+      if (!wsUrl) {
-   * Fetch API 流式聊天
+        reject(new Error('未配置WebSocket地址'))
-   */
+        return
-  async chatWithFetchStream(message, conversationId = '', onMessage, onComplete, onError) {
-    try {
-      let requestData;
-      let headers = {
-        'Accept': 'text/event-stream'
-      };
-      requestData = {
-        uniacid: store.state.uniacid || '1',
-        user_id: store.state.memberInfo?.id || '123456',
-        query: message,
-        conversation_id: conversationId || '',
-        stream: true,
-        inputs: {},
-        response_mode: 'streaming',
-        user: store.state.memberInfo?.id || '123456'
-      };
-      headers['Content-Type'] = 'application/json';
-      const response = await fetch('/api/kefu/chat', {
-        method: 'POST',
-        headers: headers,
-        body: JSON.stringify(requestData)
-      });
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
       }
-      if (!response.body) {
+      
-        throw new Error('响应体不可用');
+      // #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()
+        }))
       }
-      const reader = response.body.getReader();
+      
-      const decoder = new TextDecoder('utf-8');
+      ws.onmessage = (event) => {
-      let buffer = '';
-      let aiMessage = '';
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) break;
-        buffer += decoder.decode(value, { stream: true });
-        let lineEnd;
-        while ((lineEnd = buffer.indexOf('\n')) !== -1) {
-          const line = buffer.substring(0, lineEnd);
-          buffer = buffer.substring(lineEnd + 1);
-          if (line.startsWith('data: ')) {
-            try {
-              const data = JSON.parse(line.substring(6));
-              if (data.event === 'message' || data.event === 'text_message') {
-                const textContent = data.answer || data.text || '';
-                aiMessage += textContent;
-                if (onMessage) onMessage(textContent);
-              } else if (data.event === 'message_end' || data.event === 'done') {
-                if (onComplete) onComplete({
-                  conversation_id: data.conversation_id,
-                  message: aiMessage,
-                  ...data
-                });
-              } else if (data.event === 'error' && onError) {
-                onError(data);
-              }
-              if (data.conversation_id) {
-                conversationId = data.conversation_id;
-              }
-            } catch (e) {
-              console.warn('解析流式数据失败:', e);
-            }
-          }
-        }
-      }
-      if (buffer.startsWith('data: ')) {
         try {
-          const data = JSON.parse(buffer.substring(6));
+          const data = JSON.parse(event.data)
-          if ((data.event === 'message' || data.event === 'text_message') && onMessage) {
+          if (data.type === 'chunk' && onChunk) {
-            const textContent = data.answer || data.text || '';
+            onChunk(data.content)
-            onMessage(textContent);
+          } else if (data.type === 'complete' && onComplete) {
-          } else if ((data.event === 'message_end' || data.event === 'done') && onComplete) {
+            onComplete(data.content)
-            onComplete({
+            ws.close()
-              conversation_id: data.conversation_id,
+            resolve(data.content)
-              message: aiMessage,
-              ...data
-            });
           }
         } catch (e) {
-          console.warn('解析剩余数据失败:', e);
+          console.error('WebSocket消息解析失败:', e)
         }
       }
-    } catch (error) {
+      
-      console.error('Fetch流式聊天请求失败:', error);
+      ws.onerror = (error) => {
-      if (onError) onError({ error: error.message });
+        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流式请求（修复conversationId未定义）
+   * HTTP流式请求
    */
   async sendHttpStream(message, onChunk, onComplete) {
+    const aiConfig = store.getters.globalAIAgentConfig
+    
     const params = {
-      url: '/api/kefu/chat',
+      url: '/api/ai/chat-stream',
       data: {
-        query: message,
+        message: message,
-        conversation_id: '',
+        conversation_id: this.generateConversationId(),
         user_id: store.state.memberInfo?.id || 'anonymous',
-        stream: true,
+        stream: true
-        uniacid: store.state.uniacid,
-        inputs: {},
-        response_mode: 'streaming',
-        user: store.state.memberInfo?.id || 'anonymous'
       },
       header: {
         'Content-Type': 'application/json'
       }
     }
+    
+    if (aiConfig?.difyApiKey) {
+      params.header['Authorization'] = `Bearer ${aiConfig.difyApiKey}`
+    }
+    
+    // 使用fetch API进行流式请求（H5环境）
     // #ifdef H5
     try {
-      const url = Config.baseUrl + `/api/kefu/chat`;
+      const response = await fetch(`${aiConfig.difyBaseUrl}/chat-messages`, {
-      const response = await fetch(url, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
-          'Accept': 'text/event-stream',
+          'Authorization': `Bearer ${aiConfig.difyApiKey}`
         },
         body: JSON.stringify({
-          uniacid: store.state.uniacid || '1',
           inputs: {},
           query: message,
           response_mode: 'streaming',
-          user_id: store.state.memberInfo?.id || 'anonymous'
+          user: store.state.memberInfo?.id || 'anonymous'
         })
       })
+      
       const reader = response.body.getReader()
       const decoder = new TextDecoder()
       let content = ''
-      let buffer = ''
-      // 修复：声明conversationId变量
-      let conversationId = ''; 
-      
-      function processStreamData(buffer, callback) {
-        const lines = buffer.split('\n');
-        buffer = lines.pop() || '';
-        lines.forEach(line => {
-          line = line.trim();
-          if (!line) return;
-          if (line.startsWith('data:')) {
-            const dataPart = line.slice(5).trim();
-            if (dataPart) {
-              try {
-                const data = JSON.parse(dataPart);
-                if (data.event === 'message') {
-                  callback(data.answer || '');
-                }
-                if (data.conversation_id) {
-                  conversationId = data.conversation_id;
-                }
-                if (data.event === 'message_end') {
-                  console.log('对话完成');
-                }
-              } catch (error) {
-                console.error('解析流式数据失败:', error);
-              }
-            }
-          }
-        });
-        return buffer;
-      }
       
       while (true) {
         const { done, value } = await reader.read()
         if (done) break
-        buffer += decoder.decode(value, { stream: true });
+        
-        buffer = processStreamData(buffer, (newData) => {
+        const chunk = decoder.decode(value)
-          if (newData) {
+        const lines = chunk.split('\n')
-            content += newData;
+        
-            if (onChunk) onChunk(newData);
+        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, conversation_id: conversationId });
+      if (onComplete) onComplete(content)
-        return { content, conversation_id: conversationId };
+      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)
@@ -351,7 +286,7 @@ export default {
     if (response.code === 0 || response.success) {
       return {
         success: true,
-        content: response.data?.answer || response.data?.content || response.data?.reply|| response.data,
+        content: response.data?.answer || response.data?.content || response.data,
         conversationId: response.data?.conversation_id,
         messageId: response.data?.message_id
       }
@@ -363,23 +298,8 @@ export default {
   /**
    * 生成会话ID
    */
-  async generateConversationId() {
+  generateConversationId() {
-    const params = {
+    return 'conv_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9)
-      url: '/api/kefu/createConversation',
-      data: {
-        uniacid: store.state.uniacid,
-        user_id: store.state.memberInfo?.id || 'anonymous',
-        member_id: store.state.memberInfo?.id || '',
-      },
-      header: {
-        'Content-Type': 'application/json'
-      }
-    }
-    const response = await http.sendRequest({
-      ...params,
-      async: false
-    })
-    return this.handleResponse(response)
   },
   
   /**
@@ -387,16 +307,26 @@ export default {
    */
   async getServiceStatus() {
     try {
-      const response = await http.sendRequest({
+      const aiConfig = store.getters.globalAIAgentConfig
-        url: '/api/kefu/health',
+      
-        async: false,
+      if (!aiConfig?.difyBaseUrl || !aiConfig?.difyApiKey) {
-        data: {}
+        return {
-      })
+          available: false,
-      const available = [response?.data?.status, response?.data?.components?.ai_service_config?.status].filter(item => item === 'healthy').length > 0;
+          reason: '未配置Dify服务'
-      return {
+        }
-        available,
-        reason: available ? '服务正常' : '服务异常'
       }
+      
+      // 简单的健康检查
+      const response = await http.sendRequest({
+        url: '/api/ai/health',
+        async: false
+      })
+      
+      return {
+        available: response.success,
+        reason: response.success ? '服务正常' : '服务异常'
+      }
+      
     } catch (error) {
       return {
         available: false,
@@ -411,79 +341,16 @@ export default {
   async clearConversation(conversationId) {
     try {
       const response = await http.sendRequest({
-        url: '/api/kefu/clear-conversation',
+        url: '/api/ai/clear-conversation',
         data: { conversation_id: conversationId },
         async: false
       })
+      
       return response.success
+      
     } catch (error) {
       console.error('清除会话失败:', error)
       return false
     }
-  },
-  getConversationId() {
-      return currentConversationId;
-    },
-  
-    setConversationId(id) {
-      if (id && id !== currentConversationId) {
-        currentConversationId = id;
-        try {
-          uni.setStorageSync(CONVERSATION_KEY, id);
-        } catch (e) {
-          console.error('保存会话ID失败:', e);
-        }
-      }
-    },
-  
-    clearConversationId() {
-      currentConversationId = null;
-      try {
-        uni.removeStorageSync(CONVERSATION_KEY);
-      } catch (e) {
-        console.error('清除会话ID失败:', e);
-      }
-    },
-
-  /**
-   * 获取会话历史
-   */
-  async getConversationHistory(params = {}) {
-    try {
-      if (!params.conversation_id) {
-        throw new Error('会话ID（conversation_id）是必填参数');
-      }
-      const requestData = {
-        uniacid: params.uniacid || store.state.uniacid || '1',
-        conversation_id: params.conversation_id,
-        user_id: params.user_id || store.state.memberInfo?.id || 'anonymous',
-        limit: params.limit || 20,
-        offset: params.offset || 0,
-        member_id: params.member_id || store.state.memberInfo?.id || '',
-        token: params.token || ''
-      };
-      const response = await http.sendRequest({
-        url: '/api/kefu/getHistory',
-        data: requestData,
-        header: {
-          'Content-Type': 'application/json'
-        },
-        async: false
-      });
-      if (response.code === 0 || response.success) {
-        return {
-          success: true,
-          data: response.data,
-          messages: response.data?.messages || [],
-          total: response.data?.total || 0,
-          page_info: response.data?.page_info || { limit: 20, offset: 0 }
-        };
-      } else {
-        throw new Error(response.message || '获取会话历史失败');
-      }
-    } catch (error) {
-      console.error('获取会话历史失败:', error);
-      throw new Error(error.message || '获取会话历史时发生错误，请稍后重试');
-    }
   }
 }

common/js/huaweiPay.js

@@ -0,0 +1,152 @@
+/**
+ * 华为支付核心工具类
+ * 适配端：华为快应用（原生支付）、微信小程序（H5支付）、H5端（H5支付）
+ * 核心：统一封装支付调用逻辑，返回H5支付链接适配web-view组件
+ */
+
+/**
+ * 华为支付调用封装
+ * @param {String} outTradeNo 前端生成的唯一订单号
+ * @param {Number} amount 支付金额（单位：元，保留2位小数）
+ * @param {String} subject 订单标题
+ * @param {String} payType 支付类型（默认huaweipay）
+ * @returns {Promise} 支付结果（含H5支付链接）
+ */
+export function invokeHuaweiPay(outTradeNo, amount, subject, payType = 'huaweipay') {
+	return new Promise(async (resolve, reject) => {
+		try {
+			// 1. 显示加载中提示
+			uni.showLoading({
+				title: '发起支付...'
+			});
+
+			// 2. 调用后端生成订单
+			const orderRes = await uni.request({
+				url: getApiUrl() + '/api/huawei/pay/createOrder',
+				method: 'POST',
+				data: {
+					out_trade_no: outTradeNo,
+					total_amount: amount,
+					subject: subject,
+					pay_type: payType
+				}
+			});
+
+			// 3. 校验后端返回结果
+			if (orderRes.data.code !== 0) {
+				uni.hideLoading();
+				reject(new Error(orderRes.data.msg || '生成支付订单失败'));
+				return;
+			}
+
+			// 4. 区分运行端处理
+			const systemInfo = uni.getSystemInfoSync();
+			const accountInfo = uni.getAccountInfoSync();
+			const isHuaweiQuickApp = systemInfo.platform === 'quickapp-huawei'; // 华为快应用
+			const isWechatMini = accountInfo?.miniProgram?.appId?.includes('wx'); // 微信小程序
+			const isH5 = systemInfo.platform === 'web' || !accountInfo?.miniProgram; // H5端
+
+			if (isHuaweiQuickApp) {
+				// 4.1 华为快应用：原生唤起支付控件
+				// 注意：这里需要根据实际的华为快应用支付SDK调用
+				try {
+					// 示例代码，实际需要根据华为快应用文档调整
+					const huaweiPay = require('@service.pay.huawei');
+					huaweiPay.pay({
+						orderInfo: orderRes.data.data.orderInfo,
+						success: (payRes) => {
+							uni.hideLoading();
+							resolve({
+								code: 0,
+								msg: '华为支付控件唤起成功',
+								data: payRes
+							});
+						},
+						fail: (err) => {
+							uni.hideLoading();
+							const errMsg = err.message || err.code || '未知错误';
+							reject(new Error(`支付失败：${errMsg}`));
+						}
+					});
+				} catch (sdkError) {
+					// SDK不存在，降级到H5支付
+					if (orderRes.data.data.payUrl) {
+						uni.hideLoading();
+						resolve({
+							code: 0,
+							msg: '跳转华为支付H5页面',
+							data: { payUrl: orderRes.data.data.payUrl }
+						});
+					} else {
+						uni.hideLoading();
+						reject(new Error('华为支付SDK不可用且无H5支付链接'));
+					}
+				}
+			} else if (isWechatMini || isH5) {
+				// 4.2 微信小程序/H5端：返回H5支付链接（适配web-view）
+				if (!orderRes.data.data.payUrl) {
+					uni.hideLoading();
+					reject(new Error('未获取到华为支付H5跳转链接'));
+					return;
+				}
+				uni.hideLoading();
+				resolve({
+					code: 0,
+					msg: '跳转华为支付H5页面',
+					data: { payUrl: orderRes.data.data.payUrl }
+				});
+			} else {
+				// 4.3 其他端：提示不支持
+				uni.hideLoading();
+				reject(new Error('当前环境暂不支持华为支付'));
+			}
+		} catch (err) {
+			uni.hideLoading();
+			reject(new Error(`支付异常：${err.message || '网络请求失败'}`));
+		}
+	});
+}
+
+/**
+ * 校验支付最终状态（统一适配所有支付方式）
+ * @param {String} outTradeNo 前端生成的订单号
+ * @returns {Promise} 校验结果（包含订单实际支付状态）
+ */
+export function checkPayStatus(outTradeNo) {
+	return new Promise(async (resolve, reject) => {
+		try {
+			// 统一调用后端状态校验接口（适配所有支付类型）
+			const checkRes = await uni.request({
+				url: getApiUrl() + '/api/pay/checkStatus',
+				method: 'POST',
+				data: {
+					out_trade_no: outTradeNo
+				}
+			});
+			
+			resolve(checkRes.data);
+		} catch (err) {
+			reject(new Error(`校验支付状态失败：${err.message || '网络请求失败'}`));
+		}
+	});
+}
+
+/**
+ * 获取API基础URL
+ */
+function getApiUrl() {
+	// 尝试获取配置的API地址
+	try {
+		// #ifdef H5
+		const config = require('@/common/js/config.js').default;
+		return config.baseUrl || '';
+		// #endif
+		// #ifndef H5
+		const config = require('@/common/js/config.js').default;
+		return config.baseUrl || '';
+		// #endif
+	} catch (e) {
+		console.warn('获取API配置失败，使用空字符串');
+		return '';
+	}
+}

common/js/payCore.js

@@ -0,0 +1,28 @@
+/**
+ * 全支付方式统一调用入口
+ * 整合微信/支付宝/华为支付的所有方法，简化页面引入逻辑
+ * 依赖：payUtils.js、huaweiPay.js（无需修改原文件）
+ */
+
+// 1. 引入原工具类的所有方法（修正方法名）
+import { 
+  invokeWechatPay,  // 微信支付（完整方法名）
+  invokeAlipay,     // 支付宝支付（完整方法名）
+  checkPayStatus as payUtilsCheck  // 微信/支付宝支付状态校验（完整方法名）
+} from './payUtils.js';
+
+import { 
+  invokeHuaweiPay,  // 华为支付（完整方法名）
+  checkPayStatus as huaweiCheck    // 华为支付状态校验（完整方法名）
+} from './huaweiPay.js';
+
+// 2. 导出所有支付调用方法（修正方法名，和原方法一致）
+export {
+  invokeWechatPay,
+  invokeAlipay,
+  invokeHuaweiPay
+};
+
+// 3. 导出统一的支付状态校验方法（两个工具类逻辑完全一致，任选其一即可）
+export const checkPayStatus = payUtilsCheck;
+// 若需使用华为支付工具类的校验逻辑，可替换为：export const checkPayStatus = huaweiCheck;

common/js/payUtils.js

@@ -0,0 +1,212 @@
+/**
+ * 微信/支付宝支付工具类
+ * 适配端：微信小程序（全支付方式）、华为快应用（全支付方式）、H5（全支付方式）
+ * 核心：统一封装支付调用逻辑，返回H5支付链接适配web-view组件
+ */
+
+/**
+ * 微信支付调用封装
+ * @param {String} outTradeNo 前端生成的唯一订单号
+ * @param {Number} amount 支付金额（单位：元，保留2位小数）
+ * @param {String} subject 订单标题
+ * @returns {Promise} 支付结果（含H5支付链接）
+ */
+export function invokeWechatPay(outTradeNo, amount, subject) {
+    return new Promise(async (resolve, reject) => {
+        try {
+            // 1. 调用后端接口生成微信支付订单
+            const orderRes = await uni.request({
+                url: getApiUrl() + '/api/pay/wechat/createOrder',
+                method: 'POST',
+                data: {
+                    out_trade_no: outTradeNo,
+                    total_amount: amount,
+                    subject: subject,
+                    pay_type: 'wechatpay'
+                }
+            });
+
+            // 2. 校验后端返回结果
+            if (orderRes.data.code !== 0) {
+                reject(new Error(orderRes.data.msg || '生成微信支付订单失败'));
+                return;
+            }
+
+            // 3. 区分运行端处理
+            const systemInfo = uni.getSystemInfoSync();
+            const accountInfo = uni.getAccountInfoSync();
+            const isWechatMini = accountInfo?.miniProgram?.appId?.includes('wx'); // 微信小程序
+            const isHuaweiQuickApp = systemInfo.platform === 'quickapp-huawei'; // 华为快应用
+
+            if (isWechatMini) {
+                // 3.1 微信小程序：优先原生唤起，失败则返回H5链接
+                if (orderRes.data.data.timeStamp && orderRes.data.data.paySign) {
+                    uni.requestPayment({
+                        timeStamp: orderRes.data.data.timeStamp,
+                        nonceStr: orderRes.data.data.nonceStr,
+                        package: orderRes.data.data.package,
+                        signType: 'MD5',
+                        paySign: orderRes.data.data.paySign,
+                        success: () => {
+                            resolve({
+                                code: 0,
+                                msg: '微信支付控件唤起成功',
+                                data: {}
+                            });
+                        },
+                        fail: (err) => {
+                            // 原生唤起失败，返回H5链接适配web-view
+                            if (orderRes.data.data.payUrl) {
+                                resolve({
+                                    code: 0,
+                                    msg: '原生支付失败，跳转H5支付',
+                                    data: { payUrl: orderRes.data.data.payUrl }
+                                });
+                            } else {
+                                reject(new Error(`微信支付失败：${err.errMsg || '无H5支付链接'}`));
+                            }
+                        }
+                    });
+                } else if (orderRes.data.data.payUrl) {
+                    // 无原生支付参数，直接返回H5链接
+                    resolve({
+                        code: 0,
+                        msg: '跳转微信支付H5页面',
+                        data: { payUrl: orderRes.data.data.payUrl }
+                    });
+                } else {
+                    reject(new Error('缺少微信支付参数（原生/H5）'));
+                }
+            } else if (isHuaweiQuickApp) {
+                // 3.2 华为快应用：返回H5支付链接
+                if (!orderRes.data.data.payUrl) {
+                    reject(new Error('未获取到微信支付H5跳转链接'));
+                    return;
+                }
+                resolve({
+                    code: 0,
+                    msg: '跳转微信支付H5页面',
+                    data: { payUrl: orderRes.data.data.payUrl }
+                });
+            } else {
+                // 3.3 H5端：直接跳转
+                if (!orderRes.data.data.payUrl) {
+                    reject(new Error('未获取到微信支付跳转链接'));
+                    return;
+                }
+                window.location.href = orderRes.data.data.payUrl;
+                resolve({
+                    code: 0,
+                    msg: '跳转微信支付页面成功',
+                    data: {}
+                });
+            }
+        } catch (err) {
+            reject(new Error(`微信支付异常：${err.message || '网络请求失败'}`));
+        }
+    });
+}
+
+/**
+ * 支付宝支付调用封装（全端支持，返回H5链接适配web-view）
+ * @param {String} outTradeNo 前端生成的唯一订单号
+ * @param {Number} amount 支付金额（单位：元）
+ * @param {String} subject 订单标题
+ * @returns {Promise} 支付结果（含H5支付链接）
+ */
+export function invokeAlipay(outTradeNo, amount, subject) {
+    return new Promise(async (resolve, reject) => {
+        try {
+            // 1. 调用后端接口生成支付宝支付订单
+            const orderRes = await uni.request({
+                url: getApiUrl() + '/api/pay/alipay/createOrder',
+                method: 'POST',
+                data: {
+                    out_trade_no: outTradeNo,
+                    total_amount: amount,
+                    subject: subject,
+                    pay_type: 'alipay'
+                }
+            });
+
+            // 2. 校验后端返回结果
+            if (orderRes.data.code !== 0) {
+                reject(new Error(orderRes.data.msg || '生成支付宝支付订单失败'));
+                return;
+            }
+
+            // 3. 区分运行端处理（全端返回H5链接）
+            const accountInfo = uni.getAccountInfoSync();
+            const isWechatMini = accountInfo?.miniProgram?.appId?.includes('wx');
+            const isHuaweiQuickApp = uni.getSystemInfoSync().platform === 'quickapp-huawei';
+
+            if (!orderRes.data.data.payUrl) {
+                reject(new Error('未获取到支付宝支付H5跳转链接'));
+                return;
+            }
+
+            if (isWechatMini || isHuaweiQuickApp) {
+                // 3.1 微信小程序/华为快应用：返回H5链接（适配web-view）
+                resolve({
+                    code: 0,
+                    msg: '跳转支付宝支付H5页面',
+                    data: { payUrl: orderRes.data.data.payUrl }
+                });
+            } else {
+                // 3.2 H5端：直接跳转
+                window.location.href = orderRes.data.data.payUrl;
+                resolve({
+                    code: 0,
+                    msg: '跳转支付宝支付页面成功',
+                    data: {}
+                });
+            }
+        } catch (err) {
+            reject(new Error(`支付宝支付异常：${err.message || '网络请求失败'}`));
+        }
+    });
+}
+
+/**
+ * 统一支付状态校验（和huaweiPay.js的checkPayStatus对齐）
+ * @param {String} outTradeNo 前端生成的订单号
+ * @returns {Promise} 校验结果（包含订单实际支付状态）
+ */
+export function checkPayStatus(outTradeNo) {
+    return new Promise(async (resolve, reject) => {
+        try {
+            // 统一调用后端状态校验接口（适配所有支付类型）
+            const checkRes = await uni.request({
+                url: getApiUrl() + '/api/pay/checkStatus', // 和huaweiPay.js使用同一接口
+                method: 'POST',
+                data: {
+                    out_trade_no: outTradeNo
+                }
+            });
+            
+            resolve(checkRes.data);
+        } catch (err) {
+            reject(new Error(`校验支付状态失败：${err.message || '网络请求失败'}`));
+        }
+    });
+}
+
+/**
+ * 获取API基础URL
+ */
+function getApiUrl() {
+	// 尝试获取配置的API地址
+	try {
+		// #ifdef H5
+		const config = require('@/common/js/config.js').default;
+		return config.baseUrl || '';
+		// #endif
+		// #ifndef H5
+		const config = require('@/common/js/config.js').default;
+		return config.baseUrl || '';
+		// #endif
+	} catch (e) {
+		console.warn('获取API配置失败，使用空字符串');
+		return '';
+	}
+}

components/common-payment/payment.js

@@ -462,7 +462,11 @@ export default {
 		openChoosePayment() {
 			// #ifdef MP
 			if (this.paymentData.is_virtual) {
-				this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY');
+				if(this.paymentData?.is_virtual_delivery == 1){
+					this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY,ORDER_DELIVERY');
+				}else{
+					this.$util.subscribeMessage('ORDER_URGE_PAYMENT,ORDER_PAY');
+				}
 			} else {
 				switch (this.orderCreateData.delivery.delivery_type) {
 					case 'express': //物流配送
@@ -605,8 +609,9 @@ export default {
 			let delivery = {
 				delivery_type: data.name,
 				delivery_type_name: data.title
-			}
+			};
-			// 如果是门店配送
+
+			// 如果是门店配送或者门店自提
 			if (data.name == 'store' || data.name == 'local') {
 				if (data.store_list[0]) {
 					delivery.store_id = data.store_list[0].store_id;
@@ -692,7 +697,7 @@ export default {
 				let obj = {
 					delivery: this.orderCreateData.delivery,
 					dataTime: data
-				}
+				};
 				this.$refs.timePopup.open(obj, type);
 				this.$forceUpdate();
 			}

components/hover-nav/hover-nav.vue

@@ -1,9 +1,10 @@
 <template>
 		<!-- 悬浮按钮 -->
 		<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')"> -->
+
 			<!-- AI智能助手 -->
 			<view class="btn-item" v-if="fixBtnShow && enableAIChat" @click="openAIChat" :style="{backgroundImage:'url('+(aiAgentimg?aiAgentimg:'')+')',backgroundSize:'100% 100%'}">
-				<!-- 核心修改：添加🤖表情，保留原有判断逻辑 -->
 				<text class="ai-icon" v-if="!aiAgentimg">🤖</text>
 				<!-- 未读消息小红点 -->
 				<view v-if="unreadCount > 0" class="unread-badge">
@@ -14,13 +15,24 @@
 			<!-- #ifdef MP-WEIXIN -->
 			<button class="btn-item" v-if="fixBtnShow" hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" :style="{backgroundImage:'url('+(kefuimg?kefuimg:'')+')',backgroundSize:'100% 100%'}">
 				<text class="icox icox-kefu" v-if="!kefuimg"></text>
+			<!-- 	<view>首页</view> -->
 			</button>
 			<!-- #endif -->
 
 			<!-- 电话 -->
 			<view class="btn-item" v-if="fixBtnShow" @click="call()"  :style="{backgroundImage:'url('+(phoneimg?phoneimg:'')+')',backgroundSize:'100% 100%'}">
 				<text class="iconfont icon-dianhua" v-if="!phoneimg"></text>
+				<!-- <view>我的</view> -->
 			</view>
+
+		<!-- 	<view class="btn-item icon-xiala" v-if="fixBtnShow" @click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
+				<text class="iconfont icon-unfold"></text>
+			</view>
+			<view class="btn-item switch" v-else :class="{ show: fixBtnShow }"
+				@click="fixBtnShow ? (fixBtnShow = false) : (fixBtnShow = true)">
+				<view class="">快捷</view>
+				<view>导航</view>
+			</view> -->
 		</view>
 </template>
 
@@ -49,6 +61,7 @@
 			this.phoneimg = this.$util.getDefaultImage().phone
 			this.pageCount = getCurrentPages().length;
 
+
 			var that = this
 			uni.getStorage({
 				key:'shopInfo',
@@ -60,17 +73,17 @@
 		},
 		computed: {
 			...mapGetters([
-				'globalAIKefuConfig',
+				'globalAIAgentConfig',
 				'aiUnreadCount'
 			]),
 			aiAgentimg() {
-				return this.globalAIKefuConfig?.icon || this.$util.getDefaultImage().aiAgent || '' // AI智能助手的头像
+				return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || '' // AI智能助手的头像
 			},
 			unreadCount() {
 				return this.aiUnreadCount
 			},
 			enableAIChat() {
-				return this.globalAIKefuConfig?.enable || true // 是否开启AI智能助手
+				return this.globalAIAgentConfig?.enable || true // 是否开启AI智能助手
 			},
 		},		
 		methods: {
@@ -124,6 +137,8 @@
 		right: 0rpx;
 		bottom: 200rpx;
 		z-index: 10;
+		// background: #fff;
+		// box-shadow: 2rpx 2rpx 22rpx rgba(0, 0, 0, 0.3);
 		border-radius: 120rpx;
 		padding: 20rpx 0;
 		display: flex;
@@ -137,7 +152,6 @@
 		.btn-item {
 			display: flex;
 			justify-content: center;
-			align-items: center; /* 新增：让🤖表情垂直居中 */
 			text-align: center;
 			flex-direction: column;
 			line-height: 1;
@@ -194,16 +208,6 @@
 					// #endif
 				}
 			}
-
-			// AI图标样式优化（让🤖表情居中显示）
-			.ai-icon {
-				font-size: 40rpx; // 调整🤖表情大小
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 100%;
-				height: 100%;
-			}
 		}
 	}
 </style>

lang/zh-cn/goods/detail.js

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

manifest.json

@@ -54,8 +54,6 @@
             }
         }
     },
-    /* 快应用特有相关 */
-    "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
         "appid" : "wxa8f94045d9c2fc10",
@@ -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/README.md

@@ -19,8 +19,8 @@ https://unpkg.com/jweixin-module/out/index.js
 ## 使用
 
 ```js
-var wx = require('jweixin-module')
+var jweixin = require('jweixin-module')
-wx.ready(function(){
+jweixin.ready(function(){
     // TODO
 });
 ```

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/dify-chat/dify-chat.vue

@@ -1,20 +0,0 @@
-<template>
-  <view class="container">
-    <web-view src="https://dify.aigc-quickapp.com/chatbot/ILbr8HHEgpBW2ggp"></web-view>
-  </view>
-</template>
-
-<script>
-export default {
-  onLoad() {
-    console.log('Dify 聊天页已加载')
-  }
-}
-</script>
-
-<style>
-.container {
-  width: 100%;
-  height: 100vh;
-}
-</style>

pages_tool/ai-chat/index.vue

@@ -89,15 +89,15 @@ export default {
   
   computed: {
     ...mapGetters([
-      'globalAIKefuConfig'
+      'globalAIAgentConfig'
     ]),    
 
     /// ---- 关于AI客服的配置，支持远程配置 ----
     userAvatar() {
-      return this.globalAIKefuConfig?.userAvatar || '/static/images/user-avatar.png'
+      return this.globalAIAgentConfig?.userAvatar || '/static/images/user-avatar.png'
     },
     aiAvatar() {
-      return this.globalAIKefuConfig?.aiAvatar || '/static/images/ai-avatar.png'
+      return this.globalAIAgentConfig?.aiAvatar || '/static/images/ai-avatar.png'
     },
     /// ---- others ----
     containerHeight() {

pages_tool/kefu-demo/index.json

@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "智能客服演示",
-  "navigationBarBackgroundColor": "#ffffff",
-  "navigationBarTextStyle": "black",
-  "backgroundColor": "#f5f5f5"
-}

pages_tool/kefu-demo/index.vue

@@ -1,704 +0,0 @@
-<template>
-  <view class="kefu-demo">
-    <view class="header">
-      <text class="title">智能客服接口演示</text>
-    </view>
-    
-    <view class="content">
-      <!-- 聊天接口测试 -->
-      <view class="section">
-        <view class="section-title">1. 智能客服聊天接口</view>
-        <view class="input-group">
-          <input 
-            v-model="chatMessage" 
-            placeholder="输入消息内容" 
-            class="input"
-          />
-          <button @click="testChat" class="btn primary">发送消息</button>
-        </view>
-        <view class="result" v-if="chatResult">
-          <text class="result-title">回复结果：</text>
-          <text class="result-content">{{ chatResult }}</text>
-        </view>
-      </view>
-      
-      <!-- 创建会话接口测试 -->
-      <view class="section">
-        <view class="section-title">2. 创建新会话接口</view>
-        <button @click="testCreateConversation" class="btn primary">创建新会话</button>
-        <view class="result" v-if="conversationInfo">
-          <text class="result-title">会话信息：</text>
-          <text class="result-content">会话ID: {{ conversationInfo.conversationId }}</text>
-          <text class="result-content">创建时间: {{ conversationInfo.createdAt }}</text>
-        </view>
-      </view>
-      
-      <!-- 获取历史记录接口测试 -->
-      <view class="section">
-        <view class="section-title">3. 获取会话历史接口</view>
-        <input 
-          v-model="conversationId" 
-          placeholder="输入会话ID" 
-          class="input"
-        />
-        <button @click="testGetHistory" class="btn primary">获取历史记录</button>
-        <view class="result" v-if="historyData">
-          <text class="result-title">历史记录 ({{ historyData.total }}条)：</text>
-          <view class="message-list">
-            <view 
-              v-for="msg in historyData.messages" 
-              :key="msg.id" 
-              class="message-item"
-            >
-              <text class="message-role">{{ msg.role }}:</text>
-              <text class="message-content">{{ msg.content }}</text>
-              <text class="message-time">{{ msg.created_at }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-      
-      <!-- 健康检查测试 -->
-      <view class="section">
-        <view class="section-title">4. 系统健康检查</view>
-        <view class="input-group">
-          <input 
-            v-model="checkType" 
-            placeholder="检查类型：full/basic/ai_service" 
-            class="input"
-          />
-          <button @click="testHealthCheck" class="btn primary">健康检查</button>
-        </view>
-        <view class="result" v-if="healthResult">
-          <text class="result-title">健康检查结果：</text>
-          <text class="result-content">状态: {{ healthResult.status }}</text>
-          <text class="result-content">检查ID: {{ healthResult.checkId }}</text>
-          <text class="result-content">时间: {{ healthResult.timestamp }}</text>
-          <text class="result-content">通过检查: {{ healthResult.passed_checks }}/{{ healthResult.total_checks }}</text>
-          <view class="components-status" v-if="healthResult.components">
-            <text class="result-title">组件状态：</text>
-            <view v-for="(component, key) in healthResult.components" :key="key" class="component-item">
-              <text class="component-name">{{ key }}: {{ component.status }}</text>
-              <text class="component-message">{{ component.message }}</text>
-              <text class="component-time">响应时间: {{ component.response_time_ms }}ms</text>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 服务配置信息测试 -->
-      <view class="section">
-        <view class="section-title">5. 获取服务配置信息</view>
-        <button @click="testGetServiceInfo" class="btn primary">获取配置信息</button>
-        <view class="result" v-if="serviceInfoResult">
-          <text class="result-title">服务配置：</text>
-          <text class="result-content">服务名称: {{ serviceInfoResult.serviceInfo?.name }}</text>
-          <text class="result-content">服务版本: {{ serviceInfoResult.serviceInfo?.version }}</text>
-          <text class="result-content">启用状态: {{ serviceInfoResult.serviceInfo?.enabled ? '已启用' : '未启用' }}</text>
-          <view class="features-list" v-if="serviceInfoResult.features">
-            <text class="result-title">可用功能：</text>
-            <view v-for="(enabled, feature) in serviceInfoResult.features" :key="feature" class="feature-item">
-              <text class="feature-name">{{ feature }}: {{ enabled ? '✓' : '✗' }}</text>
-            </view>
-          </view>
-          <view class="endpoints-list" v-if="serviceInfoResult.endpoints">
-            <text class="result-title">API端点：</text>
-            <view v-for="(endpoint, name) in serviceInfoResult.endpoints" :key="name" class="endpoint-item">
-              <text class="endpoint-name">{{ name }}: {{ endpoint }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 清除会话测试 -->
-      <view class="section">
-        <view class="section-title">6. 清除会话历史</view>
-        <view class="input-group">
-          <input 
-            v-model="clearConversationId" 
-            placeholder="会话ID（可选）" 
-            class="input"
-          />
-          <button @click="testClearConversation" class="btn primary">清除会话</button>
-        </view>
-        <view class="result" v-if="clearResult">
-          <text class="result-title">清除结果：</text>
-          <text class="result-content">删除消息数: {{ clearResult.deletedMessages }}</text>
-          <text class="result-content">删除会话数: {{ clearResult.deletedConversations }}</text>
-        </view>
-      </view>
-
-      <!-- 流式聊天测试 -->
-      <view class="section">
-        <view class="section-title">7. 流式聊天测试</view>
-        <view class="input-group">
-          <input 
-            v-model="streamMessage" 
-            placeholder="输入消息内容" 
-            class="input"
-          />
-          <button @click="testStreamChat" class="btn primary">开始流式聊天</button>
-        </view>
-        <view class="result" v-if="streamResult">
-          <text class="result-title">流式回复：</text>
-          <text class="stream-content">{{ streamResult }}</text>
-        </view>
-      </view>
-
-      <!-- 完整服务检查测试 -->
-      <view class="section">
-        <view class="section-title">8. 完整服务检查</view>
-        <button @click="testFullServiceCheck" class="btn primary">完整服务检查</button>
-      </view>
-
-      <!-- 服务状态测试（兼容） -->
-      <view class="section">
-        <view class="section-title">9. 服务状态检查（兼容）</view>
-        <button @click="testServiceStatus" class="btn primary">服务状态检查</button>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import kefuService from '@/common/js/kefu-service.js'
-
-export default {
-  data() {
-    return {
-      chatMessage: '',
-      chatResult: '',
-      conversationId: '',
-      conversationInfo: null,
-      historyData: null,
-      streamMessage: '',
-      streamResult: '',
-      currentConversationId: '',
-      // 新增数据
-      checkType: 'full',
-      healthResult: null,
-      serviceInfoResult: null,
-      clearConversationId: '',
-      clearResult: null
-    }
-  },
-  
-  methods: {
-    // 测试聊天接口
-    async testChat() {
-      if (!this.chatMessage.trim()) {
-        uni.showToast({
-          title: '请输入消息内容',
-          icon: 'none'
-        })
-        return
-      }
-      
-      uni.showLoading({
-        title: '发送中...'
-      })
-      
-      try {
-        const response = await kefuService.chatWithAI(
-          this.chatMessage,
-          this.currentConversationId,
-          false
-        )
-        
-        if (response.success) {
-          this.chatResult = response.reply
-          this.currentConversationId = response.conversationId
-          uni.showToast({
-            title: '发送成功',
-            icon: 'success'
-          })
-        } else {
-          uni.showToast({
-            title: response.message || '发送失败',
-            icon: 'none'
-          })
-        }
-      } catch (error) {
-        console.error('聊天测试失败:', error)
-        uni.showToast({
-          title: '请求失败',
-          icon: 'none'
-        })
-      } finally {
-        uni.hideLoading()
-      }
-    },
-    
-    // 测试创建会话接口
-    async testCreateConversation() {
-      uni.showLoading({
-        title: '创建中...'
-      })
-      
-      try {
-        const response = await kefuService.createNewConversation()
-        
-        if (response.success) {
-          this.conversationInfo = response
-          this.currentConversationId = response.conversationId
-          uni.showToast({
-            title: '创建成功',
-            icon: 'success'
-          })
-        } else {
-          uni.showToast({
-            title: response.message || '创建失败',
-            icon: 'none'
-          })
-        }
-      } catch (error) {
-        console.error('创建会话失败:', error)
-        uni.showToast({
-          title: '请求失败',
-          icon: 'none'
-        })
-      } finally {
-        uni.hideLoading()
-      }
-    },
-    
-    // 测试获取历史记录接口
-    async testGetHistory() {
-      if (!this.conversationId.trim() && !this.currentConversationId) {
-        uni.showToast({
-          title: '请先创建会话或输入会话ID',
-          icon: 'none'
-        })
-        return
-      }
-      
-      uni.showLoading({
-        title: '加载中...'
-      })
-      
-      try {
-        const response = await kefuService.getChatHistory(
-          this.conversationId || this.currentConversationId,
-          20,
-          0
-        )
-        
-        if (response.success) {
-          this.historyData = response
-          uni.showToast({
-            title: '加载成功',
-            icon: 'success'
-          })
-        } else {
-          uni.showToast({
-            title: response.message || '加载失败',
-            icon: 'none'
-          })
-        }
-      } catch (error) {
-        console.error('获取历史记录失败:', error)
-        uni.showToast({
-          title: '请求失败',
-          icon: 'none'
-        })
-      } finally {
-        uni.hideLoading()
-      }
-    },
-    
-    // 测试健康检查
-    async testHealthCheck() {
-      uni.showLoading({
-        title: '检查中...'
-      })
-      
-      try {
-        const response = await kefuService.healthCheck(this.checkType)
-        
-        if (response.success) {
-          this.healthResult = response
-          uni.showToast({
-            title: '检查完成',
-            icon: 'success'
-          })
-        } else {
-          uni.showToast({
-            title: response.message || '检查失败',
-            icon: 'none'
-          })
-        }
-      } catch (error) {
-        console.error('健康检查失败:', error)
-        uni.showToast({
-          title: '请求失败',
-          icon: 'none'
-        })
-      } finally {
-        uni.hideLoading()
-      }
-    },
-
-    // 测试获取服务配置信息
-    async testGetServiceInfo() {
-      uni.showLoading({
-        title: '获取中...'
-      })
-      
-      try {
-        const response = await kefuService.getServiceInfo()
-        
-        if (response.success) {
-          this.serviceInfoResult = response
-          uni.showToast({
-            title: '获取成功',
-            icon: 'success'
-          })
-        } else {
-          uni.showToast({
-            title: response.message || '获取失败',
-            icon: 'none'
-          })
-        }
-      } catch (error) {
-        console.error('获取服务配置失败:', error)
-        uni.showToast({
-          title: '请求失败',
-          icon: 'none'
-        })
-      } finally {
-        uni.hideLoading()
-      }
-    },
-
-    // 测试清除会话
-    async testClearConversation() {
-      if (!this.clearConversationId.trim() && !this.currentConversationId) {
-        uni.showToast({
-          title: '请输入会话ID或先创建会话',
-          icon: 'none'
-        })
-        return
-      }
-      
-      uni.showLoading({
-        title: '清除中...'
-      })
-      
-      try {
-        const response = await kefuService.clearConversation(
-          this.clearConversationId || this.currentConversationId
-        )
-        
-        if (response.success) {
-          this.clearResult = response
-          uni.showToast({
-            title: '清除成功',
-            icon: 'success'
-          })
-        } else {
-          uni.showToast({
-            title: response.message || '清除失败',
-            icon: 'none'
-          })
-        }
-      } catch (error) {
-        console.error('清除会话失败:', error)
-        uni.showToast({
-          title: '请求失败',
-          icon: 'none'
-        })
-      } finally {
-        uni.hideLoading()
-      }
-    },
-
-    // 测试流式聊天
-    async testStreamChat() {
-      if (!this.streamMessage.trim()) {
-        uni.showToast({
-          title: '请输入消息内容',
-          icon: 'none'
-        })
-        return
-      }
-      
-      this.streamResult = ''
-      
-      try {
-        await kefuService.chatWithStream(
-          this.streamMessage,
-          this.currentConversationId,
-          // 开始回调
-          (startData) => {
-            console.log('流式聊天开始:', startData)
-          },
-          // 消息回调
-          (messageData) => {
-            this.streamResult += messageData.content || ''
-          },
-          // 完成回调
-          (completeData) => {
-            uni.showToast({
-              title: '流式聊天完成',
-              icon: 'success'
-            })
-          },
-          // 错误回调
-          (errorData) => {
-            console.error('流式聊天错误:', errorData)
-            uni.showToast({
-              title: '聊天失败',
-              icon: 'none'
-            })
-          },
-          // 结束回调
-          (endData) => {
-            console.log('流式聊天结束:', endData)
-          }
-        )
-      } catch (error) {
-        console.error('流式聊天失败:', error)
-        uni.showToast({
-          title: '请求失败',
-          icon: 'none'
-        })
-      }
-    },
-
-    // 测试完整服务检查
-    async testFullServiceCheck() {
-      uni.showLoading({
-        title: '检查中...'
-      })
-      
-      try {
-        const response = await kefuService.fullServiceCheck('full')
-        
-        if (response.available) {
-          uni.showModal({
-            title: '服务状态',
-            content: '服务正常，所有组件运行良好',
-            showCancel: false
-          })
-        } else {
-          uni.showModal({
-            title: '服务状态',
-            content: response.reason || '服务异常',
-            showCancel: false
-          })
-        }
-      } catch (error) {
-        console.error('完整服务检查失败:', error)
-        uni.showToast({
-          title: '检查失败',
-          icon: 'none'
-        })
-      } finally {
-        uni.hideLoading()
-      }
-    },
-    
-    // 测试服务状态（兼容旧版本）
-    async testServiceStatus() {
-      try {
-        const status = await kefuService.checkServiceStatus()
-        uni.showModal({
-          title: '服务状态',
-          content: status.available ? '服务正常' : `服务异常: ${status.reason}`,
-          showCancel: false
-        })
-      } catch (error) {
-        console.error('检查服务状态失败:', error)
-        uni.showToast({
-          title: '检查失败',
-          icon: 'none'
-        })
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.kefu-demo {
-  padding: 20rpx;
-  background-color: #f5f5f5;
-  min-height: 100vh;
-}
-
-.header {
-  text-align: center;
-  margin-bottom: 30rpx;
-  
-  .title {
-    font-size: 36rpx;
-    font-weight: bold;
-    color: #333;
-  }
-}
-
-.content {
-  .section {
-    background-color: white;
-    border-radius: 10rpx;
-    padding: 30rpx;
-    margin-bottom: 20rpx;
-    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
-    
-    .section-title {
-      font-size: 32rpx;
-      font-weight: bold;
-      color: #333;
-      margin-bottom: 20rpx;
-    }
-    
-    .input-group {
-      display: flex;
-      align-items: center;
-      margin-bottom: 20rpx;
-      
-      .input {
-        flex: 1;
-        border: 1rpx solid #ddd;
-        border-radius: 8rpx;
-        padding: 20rpx;
-        margin-right: 20rpx;
-        font-size: 28rpx;
-      }
-    }
-    
-    .btn {
-      padding: 20rpx 40rpx;
-      border-radius: 8rpx;
-      font-size: 28rpx;
-      
-      &.primary {
-        background-color: #007aff;
-        color: white;
-      }
-    }
-    
-    .result {
-      margin-top: 20rpx;
-      padding: 20rpx;
-      background-color: #f8f8f8;
-      border-radius: 8rpx;
-      
-      .result-title {
-        font-size: 28rpx;
-        font-weight: bold;
-        color: #333;
-        display: block;
-        margin-bottom: 10rpx;
-      }
-      
-      .result-content {
-        font-size: 26rpx;
-        color: #666;
-        line-height: 1.5;
-        display: block;
-        margin-bottom: 10rpx;
-      }
-      
-      .stream-content {
-        font-size: 26rpx;
-        color: #007aff;
-        line-height: 1.5;
-      }
-      
-      .components-status {
-        margin-top: 10rpx;
-        
-        .component-item {
-          margin-bottom: 10rpx;
-          padding: 10rpx;
-          background-color: white;
-          border-radius: 4rpx;
-          border-left: 3rpx solid #007aff;
-          
-          .component-name {
-            font-size: 24rpx;
-            color: #007aff;
-            font-weight: bold;
-            display: block;
-            margin-bottom: 3rpx;
-          }
-          
-          .component-message {
-            font-size: 24rpx;
-            color: #666;
-            display: block;
-            margin-bottom: 3rpx;
-          }
-          
-          .component-time {
-            font-size: 22rpx;
-            color: #999;
-            display: block;
-          }
-        }
-      }
-      
-      .features-list {
-        margin-top: 10rpx;
-        
-        .feature-item {
-          margin-bottom: 5rpx;
-          
-          .feature-name {
-            font-size: 24rpx;
-            color: #333;
-            display: block;
-          }
-        }
-      }
-      
-      .endpoints-list {
-        margin-top: 10rpx;
-        
-        .endpoint-item {
-          margin-bottom: 5rpx;
-          
-          .endpoint-name {
-            font-size: 22rpx;
-            color: #666;
-            display: block;
-            word-break: break-all;
-          }
-        }
-      }
-      
-      .message-list {
-        .message-item {
-          margin-bottom: 15rpx;
-          padding: 15rpx;
-          background-color: white;
-          border-radius: 6rpx;
-          border-left: 4rpx solid #007aff;
-          
-          .message-role {
-            font-size: 24rpx;
-            color: #007aff;
-            font-weight: bold;
-            display: block;
-            margin-bottom: 5rpx;
-          }
-          
-          .message-content {
-            font-size: 26rpx;
-            color: #333;
-            display: block;
-            margin-bottom: 5rpx;
-          }
-          
-          .message-time {
-            font-size: 22rpx;
-            color: #999;
-            display: block;
-          }
-        }
-      }
-    }
-  }
-}
-</style>

project.config.json

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

project.private.config.json

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

store/index.js

@@ -58,9 +58,10 @@ const store = new Vuex.Store({
 		cartNumber: 0,
 		cartMoney: 0,
 		cartChange: 0,
+		wechatConfigStatus:0,
 		bottomNavHidden: false, // 底部导航是否隐藏，true：隐藏，false：显示
 		aiUnreadCount: 10, // AI未读消息数量
-		globalAIKefuConfig: null, // AI客服配置
+		globalAIAgentConfig: null, // AI客服配置
 		globalStoreConfig: null, // 门店配置
 		globalStoreInfo: null, // 门店信息
 		defaultStoreInfo: null, // 默认门店
@@ -74,11 +75,21 @@ const store = new Vuex.Store({
 		mapConfig: {
 			tencent_map_key: '',
 			wap_is_open: 1,
-			wap_valid_time: 0
+			wap_valid_time: 0,
+		},
+		copyright: null,
+		initStatus:false,
+		offlineWhiteList:['pages/order/payment','pages/order/list','pages/order/detail'],//线下支付白名单
+		canReceiveRegistergiftInfo: {
+			status: false,
+			path: ''
 		},
-		copyright: null
 	},
 	mutations: {
+		// 设置是否可以领取新人礼
+		setCanReceiveRegistergiftInfo(state, data) {
+			state.canReceiveRegistergiftInfo = data;
+		},
 		// 设置那些组件展示
 		setDiyGroupShowModule(state, data) {
 			state.diyGroupShowModule = data;
@@ -140,9 +151,9 @@ const store = new Vuex.Store({
 		setBottomNavHidden(state, value) {
 			state.bottomNavHidden = value;
 		},
-		setglobalAIKefuConfig(state, value) {
+		setGlobalAIAgentConfig(state, value) {
-			state.globalAIKefuConfig = value;
+			state.globalAIAgentConfig = value;
-			uni.setStorageSync('globalAIKefuConfig', value); // 初始化数据调用
+			uni.setStorageSync('globalAIAgentConfig', value); // 初始化数据调用
 		},
 		setGlobalStoreConfig(state, value) {
 			state.globalStoreConfig = value;
@@ -182,11 +193,19 @@ const store = new Vuex.Store({
 			uni.setStorageSync('copyright', value);
 		},
 		setMemberInfo(state, value) {
+			// 会员被锁定后，清除会员登录信息
+			if (value && value.status == 0) {
+				value = null;
+			}
 			state.memberInfo = value;
 			if (value) {
 				uni.setStorageSync('memberInfo', value);
 			} else {
+				// 会员为空时，清除会员登录信息
 				uni.removeStorageSync('memberInfo');
+				this.commit('setToken', '');
+				this.dispatch('emptyCart');
+				//uni.removeStorageSync('authInfo');
 			}
 		},
 		setCartNumber(state, cartNumber) {
@@ -201,6 +220,12 @@ const store = new Vuex.Store({
 		setCartMoney(state, value) {
 			state.cartMoney = value;
 		},
+		setInitStatus(state,value){
+			state.initStatus = value
+		},
+		setWechatConfigStatus(state,value){
+			state.wechatConfigStatus = value
+		},    
 		// 设置AI未读消息数量
 		setAiUnreadCount(state, value) {
 			state.aiUnreadCount = value;
@@ -208,7 +233,7 @@ const store = new Vuex.Store({
 	},
 	getters: {
 		// AI智能助手配置
-		globalAIKefuConfig: state => state.globalAIKefuConfig,
+		globalAIAgentConfig: state => state.globalAIAgentConfig,
 		// AI未读消息数量
 		aiUnreadCount: state => state.aiUnreadCount,
 	},
@@ -220,6 +245,7 @@ const store = new Vuex.Store({
 					success: res => {
 						var data = res.data;
 						if (data) {
+
 							this.commit('setThemeStyle', colorList[data.style_theme.name]);
 
 							// 底部导航
@@ -237,9 +263,10 @@ const store = new Vuex.Store({
 
 							this.commit('setMapConfig', data.map_config);
 
-							this.commit('setglobalAIKefuConfig', data.ai_agent_config);
+							this.commit('setGlobalAIAgentConfig', data.ai_agent_config);
 
 							this.commit('setGlobalStoreConfig', data.store_config);
+              this.commit('setWechatConfigStatus',data.wechat_config_status)
 							
 							//联系我们
 							
@@ -252,7 +279,7 @@ const store = new Vuex.Store({
 								this.commit('setDefaultStoreInfo', null);
 								this.commit('setGlobalStoreInfo', null);
 							}
-
+							this.commit('setInitStatus',true)
 							resolve(data);
 						}
 					}
@@ -266,7 +293,7 @@ const store = new Vuex.Store({
 				data: {},
 				success: res => {
 					if (res.code == 0) {
-						let list = [];
+						let list = {};
 						let ids = [];
 						let totalMoney = 0;
 						let totalNum = 0;
@@ -279,16 +306,17 @@ const store = new Vuex.Store({
 									goods_id: item.goods_id,
 									sku_id: item.sku_id,
 									num: item.num,
-									discount_price: item.discount_price
+									discount_price: item.discount_price,
+									min_buy: item.min_buy,
+									stock: item.stock,
 								};
 
 								if (!list['goods_' + cart.goods_id]) {
 									list['goods_' + cart.goods_id] = {};
 								}
-								list['goods_' + cart.goods_id]['sku_' + cart
+								list['goods_' + cart.goods_id]['max_buy'] = item.max_buy;
-										.sku_id
+								list['goods_' + cart.goods_id]['goods_name'] = item.goods_name;
-									] =
+								list['goods_' + cart.goods_id]['sku_' + cart.sku_id] = cart;
-									cart;
 								ids.push(cart.cart_id);
 							});
 
@@ -299,8 +327,7 @@ const store = new Vuex.Store({
 									let item = list[goods][sku];
 									if (typeof item == 'object') {
 										num += item.num;
-										money += parseFloat(item.discount_price) * parseInt(item
+										money += parseFloat(item.discount_price) * parseInt(item.num);
-											.num);
 									}
 								}
 								list[goods].num = num;
@@ -311,7 +338,6 @@ const store = new Vuex.Store({
 
 							}
 						}
-
 						this.commit('setCartList', list);
 
 						this.commit('setCartIds', ids);