diff --git a/static/templates/chat_main.html b/static/templates/chat_main.html
index 660d4cd..4e17061 100644
--- a/static/templates/chat_main.html
+++ b/static/templates/chat_main.html
@@ -786,22 +786,26 @@
}
$.get("/ai-css/2/messagesPages",params,function(res){
let msgList=res.result.list;
- let existKeys={};
+ let existIds={};
+ var existList=[];
for(let i=0;i<_this.msgList.length;i++){
var m=_this.msgList[i];
- if(m.id){
- existKeys['id_'+m.id]=true;
- }
- if(m.time && m.content){
- existKeys[m.time+'_'+m.content]=true;
+ if(m.id) existIds[m.id]=true;
+ if(m.time) existList.push({time:new Date(m.time).getTime(),content:m.content});
+ }
+ function isDuplicate(item){
+ if(item.id && existIds[item.id]) return true;
+ var t=new Date(item["create_time"]).getTime();
+ var c=replaceContent(item["content"]);
+ for(var j=0;j=0;i--){
let item=msgList[i];
- var key1=item.id?'id_'+item.id:'';
- var key2=item["create_time"]+'_'+replaceContent(item["content"]);
- if((key1 && existKeys[key1]) || existKeys[key2]) continue;
+ if(isDuplicate(item)) continue;
if (item["mes_type"] == "kefu") {
item.is_kefu = true;
item.avator=item["kefu_avator"];
diff --git a/static/templates/chat_page.html b/static/templates/chat_page.html
index 4179961..bfa4c3a 100644
--- a/static/templates/chat_page.html
+++ b/static/templates/chat_page.html
@@ -238,7 +238,6 @@
isIframe:false,
kefuInfo:{},
showLoadMore:false,
- pollTimer:null,
messages:{
page:1,
pagesize:5,
@@ -463,7 +462,6 @@
}
if(_this.messages.page==1){
_this.scrollBottom();
- _this.startPollMessages();
}
_this.messages.page++;
});
@@ -765,12 +763,6 @@
this.scrollBottom();
},
},
- beforeDestroy:function(){
- if(this.pollTimer){
- clearInterval(this.pollTimer);
- this.pollTimer=null;
- }
- },
mounted:function() {
document.addEventListener('paste', this.onPasteUpload)
document.addEventListener('scroll',this.textareaBlur)