Compare commits

..

No commits in common. "eee7025a859fd9baba1dd5bfc5b0067267e8586b" and "98435311b2f7b524518c4b5f27fdc14a0cfed9ec" have entirely different histories.

2 changed files with 22 additions and 30 deletions

View File

@ -6,11 +6,12 @@
</view>
<!-- 聊天消息区域 -->
<scroll-view scroll-y :scroll-top="scrollTrigger" class="chat-messages" :scroll-with-animation="true"
<scroll-view scroll-y :scroll-top="scrollTop" class="chat-messages" :scroll-with-animation="true"
@scroll="onScroll">
<view class="" style="padding: 10px 0;">
<view v-for="(msg, index) in messages" :key="index" :id="'msg-' + index" :class="['message', msg.sender === 'me' ? 'sent' : 'received']">
<view v-for="(msg, index) in messages" :key="index"
:class="['message', msg.sender === 'me' ? 'sent' : 'received']">
<image v-if="msg.sender !== 'me'" :src="botAvatar" class="avatar"></image>
<view :class="['message-bubble', msg.sender === 'me' ? 'me' : '']">
@ -18,7 +19,7 @@
{{ msg.type === 'thinking' ? '思考中' : msg.type === 'answer' ? '回答' : '' }}
</text> -->
<view class="message-text" style="color: #999999;">{{ msg.thinkContent }}</view>
<view class="message-text" v-if="msg.answerType===2">{{ msg.answerContent}}</view>
<view class="message-text" v-if="msg.answerType===2">{{ msg.showAnswer}}</view>
<view class="message-text" v-if="msg.answerType===1">
<view>
穿搭建议:
@ -129,7 +130,6 @@
return {
inputMsg: '',
scrollTop: 0,
scrollTrigger: 0, // <<<
userAvatar: require('../../static/imgs/index/nav.png'),
botAvatar: require('../../static/imgs/ai/chuandaguwen.png'),
messages: [],
@ -147,7 +147,6 @@
isHandleClose: false,
connectNum: 0,
aiName: '',
scrollBottom: 0, //
aiDefaultList: [
'最近雨季来了,家里总是很潮湿,有什么简单有效的除湿防霉小妙招吗?',
'我下周要参加一个商务休闲风格的客户午餐会夏天户外庭院身高175cm体型偏瘦肤色偏白有什么搭配建议吗',
@ -159,9 +158,7 @@
onLoad(options) {
this.serviceUrl = options.serviceUrl || '';
this.apiKey = options.apiKey || '';
// this.botAvatar = options.icon || this.botAvatar;
this.botAvatar =this.botAvatar;
console.log(this.botAvatar)
this.botAvatar = options.icon || this.botAvatar;
this.aiName = options.name
const userInfo = wx.getStorageSync('userInfo') || {};
this.userId = userInfo.id || Date.now().toString();
@ -208,7 +205,7 @@
answerContent: '',
type: 'normal',
isTyping: false,
answerContent: '已连接,请输入您的问题',
showAnswer: '已连接,请输入您的问题',
answerType: 2
}
this.addMessage(params);
@ -254,7 +251,7 @@
if (messageData.event === 'text_chunk') {
//
this.handleTextChunk(messageData);
} else if (messageData.event === 'text_chunk_end') {
} else if (messageData.event === 'workflow_finished') {
this.currentAnswer = ''
//
this.handleNodeFinished(messageData);
@ -328,7 +325,7 @@
//
const answerContent = text.replace(/<\/?think>/g, '');
if (!answerContent) return;
console.log(1111)
//
// const lastAnswerMsgIndex = this.messages.findLastIndex(
// msg => msg.type === 'answer' || msg.type === 'normal'
@ -344,7 +341,6 @@
// this.addMessage('bot', answerContent, 'answer');
// }
this.messages[this.messages.length - 1].answerContent += answerContent
console.log(this.messages)
// this.$forceUpdate();
this.scrollToBottom();
},
@ -431,18 +427,17 @@
const params = {
sender: 'me',
thinkContent: '',
answerContent: '',
type: 'normal',
isTyping: false,
answerContent: content,
showAnswer: content,
answerType: 2
}
this.addMessage(params);
this.isAnswering = true
const mid = 'user-' + Date.now()
// 使 socketTask.send
this.socketTask.send({
// data: content,
data:JSON.stringify({ event: 'user_message', data: { id: mid, content: content } }),
data: content,
success: () => {
console.log('消息发送成功');
const params = {
@ -563,12 +558,9 @@
//
scrollToBottom() {
console.log(2222)
this.$nextTick(() => {
// scrollTop scrollTrigger
// Date.now()
this.scrollTrigger = Date.now();
});
this.scrollTop = 99999; //
});
},
onScroll(e) {
@ -601,10 +593,10 @@
}
.chat-messages {
/* flex: 1; 注释掉这行 */
height: calc(100vh - 100px); /* 根据顶部提示条和底部输入框的高度估算,或者使用 JS 动态计算 */
background-color: #e5ddd5;
overflow-y: auto;
flex: 1;
/* padding: 15px; */
background-color: #e5ddd5;
overflow-y: auto;
}
.message {

View File

@ -1,9 +1,9 @@
// export const BASE_URL = 'http://10.10.1.11:8071';
// export const IMAGE_BASE_URL = `http://10.10.1.6:8071`;
export const BASE_URL = 'https://jinshan.nantong.info';
export const IMAGE_BASE_URL = `https://jinshan.nantong.info`;
export const BASE_URL = 'http://10.10.1.6:8071';
export const IMAGE_BASE_URL = `http://10.10.1.6:8071`;
// export const BASE_URL = 'https://jinshan.nantong.info';
// export const IMAGE_BASE_URL = `https://jinshan.nantong.info`;
export const WS_BASE_URL = `wss://jinshan.nantong.info`;
// export const WS_BASE_URL = 'ws://10.10.1.11:8071';
// export const WS_BASE_URL = 'ws://10.10.1.6:8071';
// http://36.212.197.253:8071