Merge branch 'master' of http://git.zhiqiyun.com/xionghaojie/renshou

chat/conversation/conversation.vue

@@ -432,13 +432,13 @@
 				console.log('消息》》》》', this.conversationList);
 			},
 			openSearch: function() {
-				// this.setData({
-				// 	search_btn: false,
-				// 	search_chats: true,
-				// 	gotop: true,
-				// });
+				this.setData({
+					search_btn: false,
+					search_chats: true,
+					gotop: true,
+				});
 
-				this.into_singleChatRoom();
+				// this.into_singleChatRoom();
 
 
 			},
@@ -534,7 +534,7 @@
 				var nameList = {
 					myName: my,
 					your: detail.username,
-					// your: 'RS_316923182326'
+					// your: 'rs_316923182331'
 				};
 				const friendUserInfoMap = getApp().globalData.friendUserInfoMap;
 				if (friendUserInfoMap.has(nameList.your) && friendUserInfoMap.get(nameList.your)?.nickname) {