Merge branch 'master' of https://git.yuzhankeji.cn/TmOct5/ZhHealth

pages/im/group/chat.nvue

@@ -4,14 +4,15 @@
             <cell class="cell" v-for="(item, index) in messages" :key="index">
                 <view class="cell-item" :class="item.messageDirection == 1 ? 'right' : 'left'">
                     <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
-                        :src="item.content.userInfo.portraitUrl" />
+                        :src="contact(item.senderUserId).portraitUrl" />
+                        <!-- item.content.userInfo.portraitUrl -->
                     <view class="msg">
                         <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="item.content.userInfo.name" />
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
                         <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="item.content.userInfo.name" />
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
                         <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="item.content.userInfo.name" />
+                            :msg="item.content" :name="contact(item.senderUserId).name" />
                     </view>
                 </view>
             </cell>
@@ -50,17 +51,22 @@
                     name: ''
                 }
             }
-        },
-        computed: {
-            latestMessage() {
-                if (this.messages.length > 1) {
-                    return this.messages[this.messages.length - 1]
-                } else {
-                    return {
-                        sentTime: 0
-                    }
+        },
+        computed: {
+            latestMessage() {
+                if (this.messages.length > 1) {
+                    return this.messages[this.messages.length - 1]
+                } else {
+                    return {
+                        sentTime: 0
+                    }
+                }
+            },
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
                 }
-            }
+            }
         },
         onLoad(e) {
             this.targetId = e.targetId

pages/im/index.vue

@@ -91,7 +91,7 @@
                 const count = 1000
                 const timestamp = 0
                 RongIMLib.getConversationList([1, 3], count, timestamp, (res) => {
-                    if (res.code === 0) {
+                    if (res.code === 0) {
                         this.conversations = res.conversations
                     }
                 })

utils/im/index.js

@@ -141,6 +141,13 @@ const addListeners = () => {
                 }).catch(err => {
                     console.log('ERR', err)
                 })
+            }
+            if (!store.getters.contactIsExist(message.senderUserId)) {
+                getUserInfo(message.senderUserId).then(res => {
+                    store.dispatch('initContact', res)
+                }).catch(err => {
+                    console.log('ERR', err)
+                })
             }
             newMessage(message)
         } else if (message.objectName === RongIMLib.ObjectName.ProfileNotification) {