30 Commits

Author SHA1 Message Date
ee6c777fb1 chore:进入客服页面不乱跳了 2025-12-16 14:07:59 +08:00
5503758854 chore:删除了气泡底下的时间 2025-12-16 11:35:55 +08:00
8d84306747 chore:往上翻历史记录,不在乱窜了 2025-12-16 11:32:40 +08:00
c45f3e69da chore:解决了key问题 2025-12-13 16:33:22 +08:00
80428e625f chore:可以看到之前历史对话了,但是获取时会晃动不完整 2025-12-13 16:19:29 +08:00
a06ee95482 chore:可以看见历史记录了 2025-12-12 16:41:54 +08:00
b4aed459c5 chore:目前为止加了历史会话,正常运行没有出错 2025-12-12 16:23:00 +08:00
aa03abf651 chore:ai客服解析流式数据成功 2025-12-12 10:48:26 +08:00
af23505a74 chore:AI客服正常流式聊天 2025-12-11 17:35:34 +08:00
3898518ad0 chore: 可以连接到流式请求 2025-12-11 17:24:14 +08:00
f0d3d1986f chore:把 message替换成 query 2025-12-11 09:42:28 +08:00
2750d8012f chore(merge): 这个版本正常运行 2025-12-10 15:30:39 +08:00
89fbfcaca6 Merge branch 'feat-ai-agent' of http://git.aigc-quickapp.com/Uniapp/lucky_shop into feat-ai-agent 2025-12-10 15:25:35 +08:00
80c172ed77 合并
Squashed commit of the following:

commit 2416eab34f
Author: jinhhanhan <1683105490@qq.com>
Date:   Fri Dec 5 17:12:14 2025 +0800

    chore:加了dify

commit c4f2cea1a9
Author: jinhhanhan <1683105490@qq.com>
Date:   Fri Dec 5 16:47:53 2025 +0800

    chore:加了智能体

commit 227ab42e5a
Author: jinhhanhan <1683105490@qq.com>
Date:   Thu Dec 4 14:27:46 2025 +0800

    chore:挂上了智能客服
2025-12-10 15:21:32 +08:00
a0ddcd673d Squashed commit of the following:
commit 2416eab34f
Author: jinhhanhan <1683105490@qq.com>
Date:   Fri Dec 5 17:12:14 2025 +0800

    chore:加了dify

commit c4f2cea1a9
Author: jinhhanhan <1683105490@qq.com>
Date:   Fri Dec 5 16:47:53 2025 +0800

    chore:加了智能体

commit 227ab42e5a
Author: jinhhanhan <1683105490@qq.com>
Date:   Thu Dec 4 14:27:46 2025 +0800

    chore:挂上了智能客服
2025-12-10 14:52:52 +08:00
c50fab3d3a chore:没有太大关系的代码 2025-12-10 14:35:40 +08:00
578d914e9b chore:客服正常对话 2025-12-10 14:32:38 +08:00
1b194bf3e1 chore:健康检查中加了一个date空值 2025-12-10 14:22:00 +08:00
b685a91598 chore:加了文档中智能客服聊天功能,健康系统检测,流式聊天测试,创建会话接口 2025-12-10 11:37:29 +08:00
7da168e1b2 chore:让智能客服到AI气泡上方 2025-12-10 10:10:18 +08:00
179a9089b7 chore:加了用户自定义昵称 2025-12-10 09:23:04 +08:00
57a0bb9b5a chore:改了 2025-12-09 18:31:47 +08:00
4cfbfa7d8f chore:用户气泡可以随着字数改变而改变 2025-12-09 17:53:25 +08:00
eb189ae9f7 chore:加了用户自定义头像,背景颜色 2025-12-09 17:14:43 +08:00
d489f352db chore:增加了粉色机器人头像 2025-12-08 18:09:38 +08:00
7dbf455341 chore:ai智能客服可以正常对话 2025-12-08 17:16:10 +08:00
2416eab34f chore:加了dify 2025-12-05 17:12:14 +08:00
c4f2cea1a9 chore:加了智能体 2025-12-05 16:47:53 +08:00
227ab42e5a chore:挂上了智能客服 2025-12-04 14:27:46 +08:00
4cf19e417f chore:修改了 // 商户ID uniacid: 460
//api请求地址
    baseUrl: 'https://xcx30.5g-quickapp.com/',
    // baseUrl: 'http://localhost:8010/',

    // 图片域名
    imgDomain: 'https://xcx30.5g-quickapp.com/',
    //imgDomain: 'http://localhost:8010/',

    // H5端域名
    h5Domain: 'https://xcx30.5g-quickapp.com/',
    // h5Domain: 'http://localhost:8010/',
2025-12-01 08:42:50 +08:00
21 changed files with 6066 additions and 4319 deletions

View File

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

View File

@@ -1,6 +1,18 @@
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
@@ -10,45 +22,35 @@ export default {
*/
async sendMessage(message, options = {}) {
try {
// 获取AI配置
const aiConfig = store.getters.globalAIAgentConfig
// 构建Dify API请求参数
const aiConfig = store.getters.globalAIKefuConfig
const params = {
url: '/api/ai/chat', // 后端代理接口
url: '/api/kefu/chat',
data: {
message: message,
conversation_id: options.conversationId || this.generateConversationId(),
user_id: store.state.memberInfo?.id || 'anonymous',
stream: options.stream || false, // 是否流式响应
// Dify API参数
stream: false,
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 // 使用Promise方式
async: false
})
return this.handleResponse(response, options)
const result = this.handleResponse(response, options);
if (result.conversationId) {
this.setConversationId(result.conversationId);
}
return result;
} catch (error) {
console.error('Dify API请求失败:', error)
throw new Error('AI服务暂时不可用请稍后重试')
@@ -57,27 +59,10 @@ export default {
/**
* 流式消息处理
* @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
@@ -85,186 +70,266 @@ export default {
},
/**
* WebSocket连接
* EventSource 流式聊天
*/
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
chatWithEventSource(message, conversationId = '', onMessage, onComplete, onError) {
if (window.currentEventSource) {
window.currentEventSource.close();
}
// #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) => {
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 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) => {
const eventSource = new EventSource(url);
window.currentEventSource = eventSource;
let aiMessage = '';
eventSource.addEventListener('message', (event) => {
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)
const data = JSON.parse(event.data);
if (data.event === 'message') {
aiMessage += data.answer || '';
if (onMessage) onMessage(data.answer || '');
}
} catch (e) {
console.error('WebSocket消息解析失败:', e)
if (data.event === 'message_end') {
if (onComplete) onComplete({
conversation_id: data.conversation_id,
message: aiMessage
});
}
})
uni.onSocketError((error) => {
console.error('WebSocket连接错误:', error)
reject(error)
})
},
fail: (error) => {
reject(error)
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;
}
})
// #endif
})
},
/**
* HTTP流式请求
* Fetch API 流式聊天
*/
async chatWithFetchStream(message, conversationId = '', onMessage, onComplete, onError) {
try {
let requestData;
let headers = {
'Accept': 'text/event-stream'
};
requestData = {
uniacid: store.state.uniacid || '1',
user_id: store.state.memberInfo?.id || '123456',
query: message,
conversation_id: conversationId || '',
stream: true,
inputs: {},
response_mode: 'streaming',
user: store.state.memberInfo?.id || '123456'
};
headers['Content-Type'] = 'application/json';
const response = await fetch('/api/kefu/chat', {
method: 'POST',
headers: headers,
body: JSON.stringify(requestData)
});
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
if (!response.body) {
throw new Error('响应体不可用');
}
const reader = response.body.getReader();
const decoder = new TextDecoder('utf-8');
let buffer = '';
let aiMessage = '';
while (true) {
const { done, value } = await reader.read();
if (done) break;
buffer += decoder.decode(value, { stream: true });
let lineEnd;
while ((lineEnd = buffer.indexOf('\n')) !== -1) {
const line = buffer.substring(0, lineEnd);
buffer = buffer.substring(lineEnd + 1);
if (line.startsWith('data: ')) {
try {
const data = JSON.parse(line.substring(6));
if (data.event === 'message' || data.event === 'text_message') {
const textContent = data.answer || data.text || '';
aiMessage += textContent;
if (onMessage) onMessage(textContent);
} else if (data.event === 'message_end' || data.event === 'done') {
if (onComplete) onComplete({
conversation_id: data.conversation_id,
message: aiMessage,
...data
});
} else if (data.event === 'error' && onError) {
onError(data);
}
if (data.conversation_id) {
conversationId = data.conversation_id;
}
} catch (e) {
console.warn('解析流式数据失败:', e);
}
}
}
}
if (buffer.startsWith('data: ')) {
try {
const data = JSON.parse(buffer.substring(6));
if ((data.event === 'message' || data.event === 'text_message') && onMessage) {
const textContent = data.answer || data.text || '';
onMessage(textContent);
} else if ((data.event === 'message_end' || data.event === 'done') && onComplete) {
onComplete({
conversation_id: data.conversation_id,
message: aiMessage,
...data
});
}
} catch (e) {
console.warn('解析剩余数据失败:', e);
}
}
} catch (error) {
console.error('Fetch流式聊天请求失败:', error);
if (onError) onError({ error: error.message });
}
},
/**
* HTTP流式请求修复conversationId未定义
*/
async sendHttpStream(message, onChunk, onComplete) {
const aiConfig = store.getters.globalAIAgentConfig
const params = {
url: '/api/ai/chat-stream',
url: '/api/kefu/chat',
data: {
message: message,
conversation_id: this.generateConversationId(),
query: message,
conversation_id: '',
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 response = await fetch(`${aiConfig.difyBaseUrl}/chat-messages`, {
const url = Config.baseUrl + `/api/kefu/chat`;
const response = await fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${aiConfig.difyApiKey}`
'Accept': 'text/event-stream',
},
body: JSON.stringify({
uniacid: store.state.uniacid || '1',
inputs: {},
query: message,
response_mode: 'streaming',
user: store.state.memberInfo?.id || 'anonymous'
user_id: store.state.memberInfo?.id || 'anonymous'
})
})
const reader = response.body.getReader()
const decoder = new TextDecoder()
let content = ''
let buffer = ''
// 修复声明conversationId变量
let conversationId = '';
function processStreamData(buffer, callback) {
const lines = buffer.split('\n');
buffer = lines.pop() || '';
lines.forEach(line => {
line = line.trim();
if (!line) return;
if (line.startsWith('data:')) {
const dataPart = line.slice(5).trim();
if (dataPart) {
try {
const data = JSON.parse(dataPart);
if (data.event === 'message') {
callback(data.answer || '');
}
if (data.conversation_id) {
conversationId = data.conversation_id;
}
if (data.event === 'message_end') {
console.log('对话完成');
}
} catch (error) {
console.error('解析流式数据失败:', error);
}
}
}
});
return buffer;
}
while (true) {
const { done, value } = await reader.read()
if (done) break
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) {
// 忽略解析错误
}
}
buffer += decoder.decode(value, { stream: true });
buffer = processStreamData(buffer, (newData) => {
if (newData) {
content += newData;
if (onChunk) onChunk(newData);
}
});
}
if (onComplete) onComplete(content)
return content
if (onComplete) onComplete({ content, conversation_id: conversationId });
return { content, conversation_id: conversationId };
} 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)
@@ -286,7 +351,7 @@ export default {
if (response.code === 0 || response.success) {
return {
success: true,
content: response.data?.answer || response.data?.content || response.data,
content: response.data?.answer || response.data?.content || response.data?.reply|| response.data,
conversationId: response.data?.conversation_id,
messageId: response.data?.message_id
}
@@ -298,8 +363,23 @@ export default {
/**
* 生成会话ID
*/
generateConversationId() {
return 'conv_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9)
async generateConversationId() {
const params = {
url: '/api/kefu/createConversation',
data: {
uniacid: store.state.uniacid,
user_id: store.state.memberInfo?.id || 'anonymous',
member_id: store.state.memberInfo?.id || '',
},
header: {
'Content-Type': 'application/json'
}
}
const response = await http.sendRequest({
...params,
async: false
})
return this.handleResponse(response)
},
/**
@@ -307,26 +387,16 @@ export default {
*/
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
url: '/api/kefu/health',
async: false,
data: {}
})
const available = [response?.data?.status, response?.data?.components?.ai_service_config?.status].filter(item => item === 'healthy').length > 0;
return {
available: response.success,
reason: response.success ? '服务正常' : '服务异常'
available,
reason: available ? '服务正常' : '服务异常'
}
} catch (error) {
return {
available: false,
@@ -341,16 +411,79 @@ export default {
async clearConversation(conversationId) {
try {
const response = await http.sendRequest({
url: '/api/ai/clear-conversation',
url: '/api/kefu/clear-conversation',
data: { conversation_id: conversationId },
async: false
})
return response.success
} catch (error) {
console.error('清除会话失败:', error)
return false
}
},
getConversationId() {
return currentConversationId;
},
setConversationId(id) {
if (id && id !== currentConversationId) {
currentConversationId = id;
try {
uni.setStorageSync(CONVERSATION_KEY, id);
} catch (e) {
console.error('保存会话ID失败:', e);
}
}
},
clearConversationId() {
currentConversationId = null;
try {
uni.removeStorageSync(CONVERSATION_KEY);
} catch (e) {
console.error('清除会话ID失败:', e);
}
},
/**
* 获取会话历史
*/
async getConversationHistory(params = {}) {
try {
if (!params.conversation_id) {
throw new Error('会话IDconversation_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 || '获取会话历史时发生错误,请稍后重试');
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -462,11 +462,7 @@ export default {
openChoosePayment() {
// #ifdef MP
if (this.paymentData.is_virtual) {
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': //物流配送
@@ -609,9 +605,8 @@ 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;
@@ -697,7 +692,7 @@ export default {
let obj = {
delivery: this.orderCreateData.delivery,
dataTime: data
};
}
this.$refs.timePopup.open(obj, type);
this.$forceUpdate();
}

View File

@@ -1,10 +1,9 @@
<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">
@@ -15,24 +14,13 @@
<!-- #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>
@@ -61,7 +49,6 @@
this.phoneimg = this.$util.getDefaultImage().phone
this.pageCount = getCurrentPages().length;
var that = this
uni.getStorage({
key:'shopInfo',
@@ -73,17 +60,17 @@
},
computed: {
...mapGetters([
'globalAIAgentConfig',
'globalAIKefuConfig',
'aiUnreadCount'
]),
aiAgentimg() {
return this.globalAIAgentConfig?.icon || this.$util.getDefaultImage().aiAgent || '' // AI智能助手的头像
return this.globalAIKefuConfig?.icon || this.$util.getDefaultImage().aiAgent || '' // AI智能助手的头像
},
unreadCount() {
return this.aiUnreadCount
},
enableAIChat() {
return this.globalAIAgentConfig?.enable || true // 是否开启AI智能助手
return this.globalAIKefuConfig?.enable || true // 是否开启AI智能助手
},
},
methods: {
@@ -137,8 +124,6 @@
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;
@@ -152,6 +137,7 @@
.btn-item {
display: flex;
justify-content: center;
align-items: center; /* 新增:让🤖表情垂直居中 */
text-align: center;
flex-direction: column;
line-height: 1;
@@ -208,6 +194,16 @@
// #endif
}
}
// AI图标样式优化让🤖表情居中显示
.ai-icon {
font-size: 40rpx; // 调整🤖表情大小
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
}
}
}
</style>

View File

@@ -9,29 +9,25 @@
</view>
<scroll-view scroll-y="true" class="popup-body">
<view class="pay-money">
<text class="money">支付金额{{ payMoney | moneyFormat }}</text>
<text class="money">支付金额{{ payMoney|moneyFormat }}</text>
</view>
<view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
<view class="iconfont icon-yue"></view>
<view class="info-wrap">
<text class="name">余额抵扣</text>
<view class="money">可用¥{{ balanceDeduct | moneyFormat }}</view>
<text class="name">余额支付</text>
<view class="money">可用¥{{ balanceDeduct|moneyFormat }}</view>
</view>
<ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
</view>
<block v-if="payMoney > 0">
<block v-if="payTypeList.length">
<block v-for="(item, index) in payTypeList">
<view v-if="offlineShow || item.type != 'offlinepay'" class="payment-item" :key="index"
@click="payIndex = index">
<view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
<view class="iconfont" :class="item.icon"></view>
<text class="name">{{ item.name }}</text>
<text class="iconfont"
:class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
<text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
</view>
</block>
</block>
<block v-else>
<view class="empty">平台尚未配置支付方式</view>
</block>
@@ -47,16 +43,16 @@
<!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
<script>
import uniPopup from '@/components/uni-popup/uni-popup.vue';
import nsSwitch from '@/components/ns-switch/ns-switch.vue';
import uniPopup from '@/components/uni-popup/uni-popup.vue';
import nsSwitch from '@/components/ns-switch/ns-switch.vue';
// #ifdef H5
import {
// #ifdef H5
import {
Weixin
} from 'common/js/wx-jssdk.js';
// #endif
} from 'common/js/wx-jssdk.js';
// #endif
export default {
export default {
name: 'payment',
components: {
uniPopup,
@@ -67,56 +63,47 @@ export default {
balanceUsable: {
type: Boolean,
default: true
},
}
},
data() {
return {
payIndex: 0,
payTypeList: [
// #ifdef H5
payTypeList: [{
name: '支付宝支付',
icon: 'icon-zhifubaozhifu-',
type: 'alipay'
},
{
name: '微信支付',
icon: 'icon-weixin1',
type: 'wechatpay',
description: '推荐微信用户使用'
},
{
type: 'wechatpay'
}
],
timer: null,
// #endif
// #ifdef MP-WEIXIN
payTypeList: [{
name: '微信支付',
provider: 'wxpay',
icon: 'icon-weixin1',
type: 'wechatpay'
}],
// #endif
// #ifdef MP-ALIPAY
payTypeList: [{
name: '支付宝支付',
icon: 'icon-zhifubaozhifu-',
type: 'alipay',
description: '推荐支付宝用户使用'
},
{
name: '华为支付',
icon: 'icon-huawei-pay',
type: 'huaweipay',
description: '华为用户专属支付'
},
{
name: '线下支付',
icon: 'icondiy icon-yuezhifu',
type: 'offlinepay',
description: '到店支付或银行转账'
},
{
name: '余额支付',
icon: 'icon-balance',
type: 'balancepay',
description: '使用账户余额支付'
}
],
// #ifdef H5
timer: null,
provider: 'alipay'
}],
// #endif
payInfo: null,
balanceConfig: 0,
// 预售页面判断
sale: true,
isBalance: 0,
balance: 0,
//重置是否已完成没有完成不能调用api/pay/pay
resetPayComplete: true,
repeatFlag: false,
flag: false // 保留文件1的flag变量用于支付失败处理
balance: 0
};
},
created(e) {
@@ -140,32 +127,9 @@ export default {
}
}
return money;
},
offlineShow() {
// 获取当前页面栈实例数组
const pages = getCurrentPages();
const currentPage = pages[pages.length - 1];
// 获取页面路由路径
let routePath = currentPage.route;
return this.$store.state.offlineWhiteList.length ? this.$store.state.offlineWhiteList.includes(routePath) : false
}
},
methods: {
/**
* 父级页面onShow调用
*/
pageShow() {
if (this.payInfo) {
let offlinepay = uni.getStorageSync('offlinepay');
if (offlinepay) {
uni.removeStorageSync('offlinepay');
this.close()
}
} else {
uni.removeStorageSync('offlinepay');
}
},
close() {
this.$emit('close');
this.$refs.choosePaymentPopup.close();
@@ -182,22 +146,14 @@ export default {
});
return;
}
if (this.resetPayComplete == false) {
this.$util.showToast({
title: '支付取消中,请稍后再试!'
});
return;
}
uni.showLoading({
title: '支付中...',
mask: true
});
if (this.repeatFlag) return;
this.repeatFlag = true;
this.pay();
uni.setStorageSync('pay_flag', 1);
},
getPayInfo(out_trade_no, callback) {
getPayInfo(out_trade_no) {
this.$api.sendRequest({
url: '/api/pay/info',
data: {
@@ -209,7 +165,6 @@ export default {
if (this.balanceConfig && this.balanceUsable) this.getMemberBalance();
setTimeout(() => {
this.$refs.choosePaymentPopup.open();
if (typeof callback == 'function') callback();
})
} else {
this.$util.showToast({
@@ -223,6 +178,7 @@ export default {
* 获取余额配置
*/
getBalanceConfig() {
this.$api.sendRequest({
url: '/api/pay/getBalanceConfig',
data: {},
@@ -240,6 +196,10 @@ export default {
success: res => {
if (res.code == 0 && res.data) {
this.balance = parseFloat(res.data.usable_balance);
//余额不足以抵扣整个订单时不显示
if(parseFloat(this.payMoney) > this.balance){
this.balanceConfig = 0
}
}
}
})
@@ -255,8 +215,10 @@ export default {
if (res.data.pay_type == '') {
this.payTypeList = [];
} else {
this.payTypeList = this.payTypeList.filter((val, key) => {
return res.data.pay_type.indexOf(val.type) != -1
this.payTypeList.forEach((val, key) => {
if (res.data.pay_type.indexOf(val.type) == -1) {
this.payTypeList.splice(key, 1);
}
});
}
}
@@ -266,48 +228,41 @@ export default {
// #ifdef H5
pay() {
var payType = this.payTypeList[this.payIndex];
// 保留文件2的线下支付逻辑
if (!payType || payType.type === 'offlinepay') {
this.payOffline();
return;
}
// 保留文件2的流程控制
if (!this.resetPayComplete) {
uni.hideLoading();
this.$util.showToast({
title: '支付取消中,请稍后再试!'
});
this.repeatFlag = false;
return;
}
// 复用文件1的核心逻辑调用后端/api/pay/pay接口
var return_url = '';
if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
return_url = '/pages_promotion/blindbox/index?outTradeNo=';
} else {
return_url = '/pages_tool/pay/result?code=';
}
this.$api.sendRequest({
url: '/api/pay/pay',
data: {
out_trade_no: this.payInfo.out_trade_no,
pay_type: payType.type,
return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo.out_trade_no),
pay_type: payType ? payType.type : '',
return_url: encodeURIComponent(this.$config.h5Domain + return_url + this.payInfo
.out_trade_no),
is_balance: this.isBalance
},
success: res => {
uni.hideLoading();
this.repeatFlag = false; // 重置文件2的防重复标记
if (res.code >= 0) {
if (res.data.pay_success) {
this.paySuccess();
return;
}
switch (payType.type) {
// 保留文件1的微信支付逻辑新增空值判断
case 'alipay':
if (this.$util.isWeiXin()) {
var wx_alipay = encodeURIComponent(res.data.data);
this.$util.redirectTo('/pages_tool/pay/wx_pay', {
wx_alipay: wx_alipay,
out_trade_no: this.payInfo.out_trade_no
}, '', 'redirectTo');
} else {
location.href = res.data.data;
this.checkPayStatus();
}
break;
case 'wechatpay':
if (this.$util.isWeiXin()) {
if (uni.getSystemInfoSync().platform == 'ios') {
@@ -324,12 +279,6 @@ export default {
success: jssdkRes => {
var wxJS = new Weixin(),
payData = res.data.data;
// 新增空值判断避免读取undefined属性
if (!payData) {
this.$util.showToast({ title: '微信支付参数获取失败' });
this.close();
return;
}
wxJS.init(jssdkRes.data);
wxJS.pay({
timestamp: payData.timestamp ? payData.timestamp : payData.timeStamp,
@@ -360,96 +309,10 @@ export default {
}
});
} else {
// 新增判断res.data.url是否存在
if (!res.data.url) {
this.$util.showToast({ title: '微信支付链接获取失败' });
this.close();
return;
}
location.href = res.data.url;
this.checkPayStatus();
}
break;
// 保留文件1的支付宝支付逻辑
case 'alipay':
if (this.$util.isWeiXin()) {
// 新增判断res.data.data是否存在
if (!res.data.data) {
this.$util.showToast({ title: '支付宝支付参数获取失败' });
this.close();
return;
}
var wx_alipay = encodeURIComponent(res.data.data);
this.$util.redirectTo('/pages_tool/pay/wx_pay', {
wx_alipay: wx_alipay,
out_trade_no: this.payInfo.out_trade_no
}, '', 'redirectTo');
} else {
// 新增判断res.data.data是否存在
if (!res.data.data) {
this.$util.showToast({ title: '支付宝支付链接获取失败' });
this.close();
return;
}
location.href = res.data.data;
this.checkPayStatus();
}
break;
// 新增华为支付分支处理沿用文件1范式补充空值判断
case 'huaweipay':
// 新增先判断res.data.data是否存在
if (!res.data.data) {
this.$util.showToast({ title: '华为支付参数获取失败' });
this.close();
return;
}
const systemInfo = uni.getSystemInfoSync();
const isHuaweiQuickApp = systemInfo.platform === 'quickapp-huawei';
// 华为快应用尝试原生SDK唤起
if (isHuaweiQuickApp && res.data.data.orderInfo) {
try {
const huaweiPay = require('@service.pay.huawei');
huaweiPay.pay({
orderInfo: res.data.data.orderInfo,
success: () => {
this.paySuccess();
},
fail: (err) => {
// 原生失败跳H5链接
if (res.data.data.payUrl) {
location.href = res.data.data.payUrl;
this.checkPayStatus();
} else {
this.$util.showToast({
title: `华为支付失败:${err.message}`
});
this.close();
}
}
});
} catch (sdkErr) {
// SDK加载失败跳H5
if (res.data.data.payUrl) {
location.href = res.data.data.payUrl;
this.checkPayStatus();
} else {
this.$util.showToast({
title: '华为支付SDK加载失败'
});
this.close();
}
}
} else if (res.data.data.payUrl) {
// 非华为快应用直接跳H5链接
location.href = res.data.data.payUrl;
this.checkPayStatus();
} else {
this.$util.showToast({
title: '未获取到华为支付链接'
});
this.close();
}
break;
}
} else {
this.$util.showToast({
@@ -459,22 +322,12 @@ export default {
},
fail: res => {
uni.hideLoading();
this.repeatFlag = false; // 重置文件2的防重复标记
this.$util.showToast({
title: 'request:fail'
});
}
});
},
/**
* 线下支付处理保留文件2原有逻辑
*/
payOffline() {
this.$util.redirectTo('/pages_tool/pay/offlinepay', {
outTradeNo: this.payInfo.out_trade_no
});
this.repeatFlag = false;
},
checkPayStatus() {
this.timer = setInterval(() => {
this.$api.sendRequest({
@@ -499,37 +352,16 @@ export default {
// #ifdef MP
pay() {
var payType = this.payTypeList[this.payIndex];
// 保留文件2的线下支付逻辑
if (!payType || payType.type === 'offlinepay') {
this.$util.redirectTo('/pages_tool/pay/offlinepay', {
outTradeNo: this.payInfo.out_trade_no
});
this.repeatFlag = false;
return;
}
// 保留文件2的流程控制
if (!this.resetPayComplete) {
uni.hideLoading();
this.$util.showToast({
title: '支付取消中,请稍后再试!'
});
this.repeatFlag = false;
return;
}
// 复用文件1的小程序端核心逻辑调用/api/pay/pay
this.$api.sendRequest({
url: '/api/pay/pay',
data: {
out_trade_no: this.payInfo.out_trade_no,
pay_type: payType.type,
pay_type: payType ? payType.type : '',
scene: uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene,
is_balance: this.isBalance
},
success: res => {
uni.hideLoading();
this.repeatFlag = false; // 重置文件2的防重复标记
if (res.code >= 0) {
if (res.data.pay_success) {
this.paySuccess();
@@ -537,15 +369,7 @@ export default {
}
var payData = res.data.data;
switch (payType.type) {
// 保留文件1的微信支付逻辑新增空值判断
case 'wechatpay':
// 新增:空值判断
if (!payData) {
this.$util.showToast({ title: '微信支付参数获取失败' });
this.close();
return;
}
// #ifdef MP-WEIXIN
var scene = uni.getStorageSync('is_test') ? 1175 : wx.getLaunchOptionsSync().scene;
if ([1175, 1176, 1177, 1191, 1195].indexOf(scene) != -1) {
uni.requestOrderPayment({
@@ -558,84 +382,8 @@ export default {
this.paySuccess();
},
fail: res => {
this.handlePayFail(res);
}
});
return;
}
uni.requestPayment({
provider: 'wxpay',
...payData,
success: res => {
this.paySuccess();
},
fail: res => {
this.handlePayFail(res);
}
});
break;
// 保留文件1的支付宝支付逻辑新增空值判断
case 'alipay':
// 新增:空值判断
if (!payData) {
this.$util.showToast({ title: '支付宝支付参数获取失败' });
this.close();
return;
}
uni.requestPayment({
provider: 'alipay',
...payData,
success: res => {
this.paySuccess();
},
fail: res => {
this.handlePayFail(res);
}
});
break;
// 新增华为支付小程序端逻辑(补充空值判断)
case 'huaweipay':
// 新增:空值判断
if (!payData) {
this.$util.showToast({ title: '华为支付参数获取失败' });
this.close();
return;
}
if (payData.payUrl) {
// 小程序端跳WebView页面
this.$util.redirectTo('/pages/Pay/Pay', {
payUrl: payData.payUrl,
outTradeNo: this.payInfo.out_trade_no
});
} else {
this.$util.showToast({
title: '未获取到华为支付链接'
});
this.close();
}
break;
}
} else {
this.$util.showToast({
title: res.message
});
}
},
fail: res => {
uni.hideLoading();
this.repeatFlag = false; // 重置文件2的防重复标记
this.$util.showToast({
title: 'request:fail'
});
}
});
},
/**
* 统一处理支付失败复用文件1逻辑
*/
handlePayFail(res) {
this.flag = false;
if (res.errMsg.includes('cancel')) {
if (res.errMsg == 'requestOrderPayment:fail cancel') {
this.$util.showToast({
title: '您已取消支付'
});
@@ -649,10 +397,53 @@ export default {
this.close();
}, 1500)
}
}
});
return
}
// #endif
uni.requestPayment({
provider: payType.provider,
...payData,
success: res => {
this.paySuccess();
},
fail: res => {
this.flag = false;
if (res.errMsg == 'requestPayment:fail cancel') {
this.$util.showToast({
title: '您已取消支付'
});
this.resetpay();
} else {
uni.showModal({
content: '支付失败,失败原因: ' + res.errMsg,
showCancel: false
});
setTimeout(() => {
this.close();
}, 1500)
}
}
});
} else {
this.$util.showToast({
title: res.message
});
}
},
fail: res => {
uni.hideLoading();
this.$util.showToast({
title: 'request:fail'
});
}
});
},
// #endif
/**
* 支付成功之后跳转(真实业务逻辑)
* 支付成功之后跳转
*/
paySuccess() {
if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
@@ -669,26 +460,16 @@ export default {
}
},
/**
* 重置支付单据(真实业务逻辑)
* 重置支付单据
*/
resetpay() {
this.resetPayComplete = false;
this.$api.sendRequest({
url: '/api/pay/resetpay',
data: {
out_trade_no: this.payInfo.out_trade_no,
},
success: res => {
if (res.code == 0) {
this.getPayInfo(res.data, () => {
this.resetPayComplete = true;
});
} else {
this.resetPayComplete = true;
}
},
fail: res => {
this.resetPayComplete = true;
if (res.code == 0) this.getPayInfo(res.data);
}
})
}
@@ -698,11 +479,11 @@ export default {
clearInterval(this.timer);
},
// #endif
};
};
</script>
<style lang="scss" scoped>
.popup {
.popup {
width: 75vw;
background: #fff;
border-top-left-radius: $border-radius;
@@ -757,9 +538,9 @@ export default {
padding-bottom: env(safe-area-inset-bottom);
}
}
}
}
.choose-payment-popup {
.choose-payment-popup {
.payment-item {
display: flex;
align-items: center;
@@ -789,16 +570,9 @@ export default {
color: #24af41;
}
.icon-yuezhifu {
color: #f9a647;
}
.icon-zhifubaozhifu- {
color: #00a0e9;
}
.icon-huawei-pay {
color: #c7000b; // 华为支付品牌色
}
.icon-checkboxblank {
font-size: 40rpx;
@@ -868,13 +642,13 @@ export default {
font-size: $font-size-toolbar;
}
}
}
}
.empty {
.empty {
width: 100%;
text-align: center;
padding: 40rpx 0;
color: $color-sub;
font-size: $font-size-tag;
}
}
</style>

View File

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

12
main.js
View File

@@ -27,6 +27,7 @@ Vue.prototype.$lang = Lang.lang; //解析语言包
Vue.prototype.$config = Config;
// #ifdef H5
EventBus.setDomBridge(DomEventBridge)
// #endif
@@ -58,17 +59,6 @@ Vue.component('ns-login', NsLogin);
import PrivacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
Vue.component('privacy-popup', PrivacyPopup)
// ========== 新增注册diy系列组件 ==========
import DiyBottomNav from '@/components/diy-components/diy-bottom-nav.vue'
import DiyGroup from '@/components/diy-components/diy-group.vue'
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

View File

@@ -54,6 +54,8 @@
}
}
},
/* */
"quickapp" : {},
/* */
"mp-weixin" : {
"appid" : "wxa8f94045d9c2fc10",
@@ -124,12 +126,5 @@
"uniStatistics" : {
"version" : "2"
},
"sassImplementationName" : "node-sass",
/** **/
"quickapp-webview" : {
"package" : "com.jieganfsj.fivegshop",
"minPlatformVersion" : 1070,
"versionName" : "1.0.0",
"versionCode" : 0
}
"sassImplementationName" : "node-sass"
}

View File

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

View File

@@ -1,13 +1,42 @@
{
"_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",
"version": "1.6.0",
"description": "微信JS-SDK",
"main": "lib/index.js",
"scripts": {},
"repository": {
"type": "git",
"url": "git+https://github.com/zhetengbiji/jweixin-module.git"
"escapedName": "jweixin-module",
"rawSpec": "",
"saveSpec": null,
"fetchSpec": "latest"
},
"_requiredBy": [
"#USER",
"/"
],
"_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz",
"_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1",
"_spec": "jweixin-module",
"_where": "E:\\demo\\niushop_uniapp",
"author": {
"name": "Shengqiang Guo"
},
"bugs": {
"url": "https://github.com/zhetengbiji/jweixin-module/issues"
},
"bundleDependencies": false,
"deprecated": false,
"description": "微信JS-SDK",
"devDependencies": {
"textfile": "^1.2.0",
"uglify-js": "^3.4.9"
},
"homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
"keywords": [
"wxjssdk",
"weixin",
@@ -16,11 +45,16 @@
"jssdk",
"wx"
],
"author": "Shengqiang Guo",
"license": "ISC",
"bugs": {
"url": "https://github.com/zhetengbiji/jweixin-module/issues"
"main": "out/index.js",
"name": "jweixin-module",
"repository": {
"type": "git",
"url": "git+https://github.com/zhetengbiji/jweixin-module.git"
},
"homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
"devDependencies": {}
"scripts": {
"build": "node build",
"prepublish": "npm run build"
},
"version": "1.4.1"
}

28
package-lock.json generated
View File

@@ -1,23 +1,13 @@
{
"name": "frontend",
"name": "uniappsaas",
"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",
@@ -629,12 +619,6 @@
"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",
@@ -1000,11 +984,6 @@
}
},
"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",
@@ -1477,11 +1456,6 @@
"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",

View File

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

View File

@@ -0,0 +1,20 @@
<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>

View File

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

View File

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

View File

@@ -0,0 +1,704 @@
<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>

View File

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

View File

@@ -0,0 +1,23 @@
{
"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
}
}

View File

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