This commit is contained in:
qijq 2025-05-05 11:44:41 +08:00
parent 3e26f6d3b4
commit b3ef52a10d
2 changed files with 12 additions and 7 deletions

View File

@ -362,6 +362,7 @@ class apiconfig {
//.replace(html(), '\<$1 $2\>').replace(html('/'), '\</$1\>') //转移HTML代码 //.replace(html(), '\<$1 $2\>').replace(html('/'), '\</$1\>') //转移HTML代码
//.replace(/\n/g, '<br>') //转义换行 //.replace(/\n/g, '<br>') //转义换行
return content; return content;
} }

View File

@ -592,9 +592,12 @@ export default {
let msg_type = val.msg_type; let msg_type = val.msg_type;
console.log("asdasd", this.user_other_row.user_avatar);
let msg = { let msg = {
type: "user", type: "user",
sendmethod: this.chattype, sendmethod: this.chattype,
avatar: val.avatar,
needload: false, needload: false,
fromid: this.chat_to_puid, fromid: this.chat_to_puid,
toid: tempmy.puid, toid: tempmy.puid,
@ -604,7 +607,7 @@ export default {
userinfo: { userinfo: {
uid: this.chat_to_puid, uid: this.chat_to_puid,
username: this.user_other_row.user_nickname, username: this.user_other_row.user_nickname,
face: this.user_other_row.user_avatar, face: this.user_other_row.user_avatar || val.avatar,
}, },
content: { content: {
text: val.content, text: val.content,
@ -1022,10 +1025,10 @@ export default {
flag: false, flag: false,
}), }),
clearTimeout(t); clearTimeout(t);
that.setData({
page: parseInt(that.page) + 1,
});
var t = setTimeout(() => { var t = setTimeout(() => {
that.setData({
page: parseInt(that.page) + 1,
});
that.getMsgList(() => { that.getMsgList(() => {
// //
this.$nextTick(function () { this.$nextTick(function () {
@ -1194,8 +1197,10 @@ export default {
list[i].msg.content = this.setPicSize(list[i].msg.content); list[i].msg.content = this.setPicSize(list[i].msg.content);
this.msgImgList.push(list[i].msg.content.url); this.msgImgList.push(list[i].msg.content.url);
} }
if (list[i].msg.type != "img") {
list[i].msg = this.$apiconfig.im_decode_msg(list[i].msg);
}
list[i].msg = this.$apiconfig.im_decode_msg(list[i].msg);
list[i].translate_txt = this.__("翻译"); list[i].translate_txt = this.__("翻译");
list[i].msg.translate_txt = this.__("翻译"); list[i].msg.translate_txt = this.__("翻译");
} }
@ -1221,7 +1226,7 @@ export default {
} }
console.info(data); console.info(data);
console.info(this.msgList); console.info("msgList", this.msgList);
if (callback) { if (callback) {
callback(); callback();
@ -1475,7 +1480,6 @@ export default {
if (!this.textMsg) { if (!this.textMsg) {
return; return;
} }
let content = this.replaceEmoji(this.textMsg); let content = this.replaceEmoji(this.textMsg);
let msg = { let msg = {
text: content, text: content,