diff --git a/im-uniapp/components/chat-message-item/chat-message-item.vue b/im-uniapp/components/chat-message-item/chat-message-item.vue
index 0904bad..ec00744 100644
--- a/im-uniapp/components/chat-message-item/chat-message-item.vue
+++ b/im-uniapp/components/chat-message-item/chat-message-item.vue
@@ -1,29 +1,29 @@
-
-
+
+
{{ msgInfo.content }}
-
+
{{ $date.toTimeText(msgInfo.sendTime) }}
-
+
-
-
+
+
{{ showName }}
-
+
-
-
+
-
+
-
+
-
-
-
+
+
- {{ fileSize }}
+ {{ fileSize }}
-
+
@@ -52,7 +52,7 @@
-
+
{{ JSON.parse(msgInfo.content).duration + '"' }}
@@ -60,7 +60,7 @@
-
+
{{ msgInfo.content }}
-
+
已读
-
@@ -241,15 +240,14 @@ export default {
return this.$emo.transform(text, 'emoji-normal')
}
}
-
}
\ No newline at end of file
diff --git a/im-uniapp/components/friend-item/friend-item.vue b/im-uniapp/components/friend-item/friend-item.vue
index 6983056..543ef87 100644
--- a/im-uniapp/components/friend-item/friend-item.vue
+++ b/im-uniapp/components/friend-item/friend-item.vue
@@ -20,14 +20,20 @@ export default {
},
methods: {
showFriendInfo() {
- uni.navigateTo({
- url: "/pages/common/user-info?id=" + this.friend.id
- })
- },
+ if (this.detail) {
+ uni.navigateTo({
+ url: "/pages/common/user-info?id=" + this.friend.id
+ })
+ }
+ }
},
props: {
friend: {
type: Object
+ },
+ detail: {
+ type: Boolean,
+ default: true
}
}
}
@@ -73,4 +79,4 @@ export default {
}
}
}
-
+
\ No newline at end of file
diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index d0a8dfb..9ca2d61 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -2,7 +2,7 @@
{{ title }}
-
+
@@ -1015,7 +1015,7 @@ export default {
flex-direction: column;
z-index: 2;
- .chat-msg {
+ .chat-message {
flex: 1;
padding: 0;
overflow: hidden;