18

pages/conversation/chating/index.vue

@@ -19,7 +19,7 @@
 <script>
 	import {mapActions,mapGetters} from "vuex";
 	import {offlinePushInfo} from "@/util/imCommon";
-	import {PageEvents,ContactChooseTypes	} from "@/constant";
+	import {PageEvents,ContactChooseTypes,noticeMessageTypes} from "@/constant";
 	import ChatingHeader from "./components/ChatingHeader";
 	import ChatingFooter from "./components/ChatingFooter/index";
 	import ChatingList from "./components/ChatingList";
@@ -174,9 +174,6 @@
 				}
 			},
 			sendMessage(message, user_id, group_id) {
-				//this.scrollToBottom();
-				//console.log(message);
-				//console.log(user_id,group_id);
 				IMSDK.asyncApi(IMSDK.IMMethods.SendMessage, IMSDK.uuid(), {
 						recvID: user_id,
 						groupID: group_id,
@@ -184,8 +181,16 @@
 						offlinePushInfo,
 					})
 					.then(({data}) => {
-						console.log(data);
-						this.pushNewMessage(message);
+						if(user_id && this.storeCurrentConversation.userID  == user_id){
+							this.pushNewMessage(message);
+							this.scrollToBottom();
+							return ;
+						}
+						if(group_id && this.storeCurrentConversation.groupID  == group_id){
+							this.pushNewMessage(message);
+							this.scrollToBottom();
+							return ;
+						}
 					})
 					.catch((res = {data,errCode,errMsg}) => {
 						console.log(res);
@@ -207,6 +212,9 @@
 				}
 				if (e.type == 'selected') {
 					if (this.selectFlag == true) {
+						if(noticeMessageTypes.includes(data.contentType)){
+							return ;
+						}
 						let founded = false;
 						let arr = [];
 						for (var index = 0; index < this.selectItems.length; index++) {