diff --git a/im-uniapp/components/chat-item/chat-item.vue b/im-uniapp/components/chat-item/chat-item.vue
index 5db43c3..db6f955 100644
--- a/im-uniapp/components/chat-item/chat-item.vue
+++ b/im-uniapp/components/chat-item/chat-item.vue
@@ -4,16 +4,14 @@
- {{chat.unreadCount}}
-
+
{{chat.showName}}
-
{{$date.toTimeText(chat.lastSendTime,true)}}
@@ -21,6 +19,7 @@
{{atText}}
{{chat.sendNickName+': '}}
+
@@ -98,18 +97,7 @@
width: 100rpx;
height: 100rpx;
- .unread-text {
- position: absolute;
- background-color: red;
- right: -12rpx;
- top: -12rpx;
- color: white;
- border-radius: 16rpx;
- padding: 4rpx 12rpx;
- font-size: 20rpx;
- text-align: center;
- white-space: nowrap;
- }
+
}
.chat-right {
@@ -124,13 +112,13 @@
display: flex;
line-height: 44rpx;
height: 44rpx;
-
+
.chat-tag {
display: flex;
align-items: center;
- margin-right: 3rpx;
+ margin-right: 5rpx;
}
-
+
.chat-name-text {
flex: 1;
font-size: 30rpx;
@@ -169,6 +157,7 @@
overflow: hidden;
text-overflow: ellipsis;
}
+
}
}
}
diff --git a/im-uniapp/pages/chat/chat-group-video.vue b/im-uniapp/pages/chat/chat-group-video.vue
index de42480..f475d92 100644
--- a/im-uniapp/pages/chat/chat-group-video.vue
+++ b/im-uniapp/pages/chat/chat-group-video.vue
@@ -1,9 +1,5 @@
-
-
-
-
-
+
\ No newline at end of file
diff --git a/im-uniapp/store/friendStore.js b/im-uniapp/store/friendStore.js
index 133a06f..f7d1ed7 100644
--- a/im-uniapp/store/friendStore.js
+++ b/im-uniapp/store/friendStore.js
@@ -9,6 +9,11 @@ export default {
},
mutations: {
setFriends(state, friends) {
+ friends.forEach((f)=>{
+ f.online = false;
+ f.onlineWeb = false;
+ f.onlineApp = false;
+ })
state.friends = friends;
},
updateFriend(state, friend) {
@@ -41,12 +46,10 @@ export default {
let userTerminal = onlineTerminals.find((o)=> f.id==o.userId);
if(userTerminal){
f.online = true;
- f.onlineTerminals = userTerminal.terminals;
f.onlineWeb = userTerminal.terminals.indexOf(TERMINAL_TYPE.WEB)>=0
f.onlineApp = userTerminal.terminals.indexOf(TERMINAL_TYPE.APP)>=0
}else{
f.online = false;
- f.onlineTerminals = [];
f.onlineWeb = false;
f.onlineApp = false;
}
@@ -80,6 +83,7 @@ export default {
},
actions: {
loadFriend(context) {
+ console.log("loadFriend")
return new Promise((resolve, reject) => {
http({
url: '/friend/list',
@@ -88,6 +92,7 @@ export default {
context.commit("setFriends", friends);
context.commit("refreshOnlineStatus");
resolve()
+ console.log("loadFriend ok")
}).catch((res) => {
reject();
})