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

pages/im/components/messageCell.vue

@@ -6,11 +6,12 @@
         </view>
         <view class="content">
             <view class="header">
-                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3" class='qun'>[群]</text></view>
+                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3"
+                        class='qun'>[群]</text></view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
-            <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType"
+            <message-preview class="preview" :msg="item.latestMessage" :draft="item.draft"
-                :user="item.latestMessage.userInfo" />
+                :conversationType="item.conversationType" :user="item.latestMessage.userInfo" />
         </view>
     </view>
 </template>
@@ -26,6 +27,9 @@
                     return {}
                 }
             }
+        },
+        mounted() {
+          console.log(this.item);  
         },
         computed: {
             contact() {
@@ -58,7 +62,7 @@
             box-sizing: border-box;
             position: relative;
             flex: 1;
-            
+
 
             border-bottom-width: 0.5px !important;
             border-color: #f9f9f9 !important;

pages/im/components/messagePreview.vue

@@ -1,32 +1,37 @@
 <template>
-    <view>
+    <view>
-        <view class="preview" v-if="msg.objectName=='RC:TxtMsg'">
+        <view class="preview" v-if="draft">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>{{ msg.content || '' }}
+            <text class="draft">[草稿]</text> {{ draft }}
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:HQVCMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[语音]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:ImgMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[图片]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:GIFMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[表情]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:FileMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[文件]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:LBSMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[位置]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:AudioMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[语音通话]
-        </view>
-        <view class="preview" v-if="msg.objectName=='RC:VideoMsg'">
-            <text v-if="conversationType == 3">{{ user.name }}：</text>[视频通话]
         </view>
-        <view class="preview" v-if="msg.objectName=='RC:GrpNtf'">
+        <block v-else>
-            [{{ msg.message }}]
+            <view class="preview" v-if="msg.objectName=='RC:TxtMsg'">
-        </view>
+                <text v-if="conversationType == 3">{{ user.name }}：</text>{{ msg.content || '' }}
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:HQVCMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[语音]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:ImgMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[图片]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:GIFMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[表情]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:FileMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[文件]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:LBSMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[位置]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:AudioMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[语音通话]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:VideoMsg'">
+                <text v-if="conversationType == 3">{{ user.name }}：</text>[视频通话]
+            </view>
+            <view class="preview" v-if="msg.objectName=='RC:GrpNtf'">
+                [{{ msg.message }}]
+            </view>
+        </block>
     </view>
 </template>
 
@@ -36,10 +41,14 @@
             msg: {
                 type: Object,
                 default: {}
-            },
+            },
-            conversationType: {
+            conversationType: {
-                type: Number,
+                type: Number,
-                default: 0
+                default: 0
+            },
+            draft: {
+                type: String,
+                default: ''
             },
             user: {
                 type: Object,
@@ -63,6 +72,11 @@
         height: 32rpx;
         line-height: 32rpx;
         width: 520rpx;
-        @extend .nowrap;
+        @extend .nowrap;
+        
+        .draft {
+            color: $text-price;
+            padding-right: 10rpx;
+        }
     }
 </style>

pages/im/private/chat.vue

@@ -1,9 +1,9 @@
 <template>
     <view class="chat">
         <!-- chat -->
-        <scroll-view class="body" scroll-y>
+        <view class="body">
-            <view class="cell" v-for="(item, index) in messages" :key="index">
+            <view class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="time">{{ customCN(item.sentTime) }}</view>
+                <view class="time">{{ item.sentTime|timeCustomCN }}</view>
                 <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
                     <u-avatar class="avatar" size="40" shape="square" @click="showUser(targetId, item.messageDirection)"
                         :src="contact(item.senderUserId).portraitUrl" />
@@ -21,16 +21,12 @@
                     </view>
                 </view>
             </view>
-            <view class="cell-footer" ref="chatBottom"></view>
+        </view>
-        </scroll-view>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>
 </template>
 
 <script>
-    import {
-        timeCustomCN
-    } from '@/utils/filters.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
     import showVoice from '../components/showVoice'
@@ -38,8 +34,6 @@
     import showText from '../components/showText'
     import sentMessageBar from '../components/sentMessageBar'
 
-    const ChatList = uni.requireNativePlugin('dom')
-
     export default {
         components: {
             sentMessageBar,
@@ -106,9 +100,6 @@
             uni.$off('onReadReceiptReceived')
         },
         methods: {
-            customCN(val) {
-                return timeCustomCN(val)
-            },
             getNewMessage() {
                 im.getMessageList(
                     this.conversationType,
@@ -116,10 +107,9 @@
                     this.latestMessage.sentTime || 0,
                     1,
                     false,
-                    (messages) => {
+                    (messages) => {
-                        console.log(messages);
+                        this.messages.unshift(...messages)
-                        this.messages = this.messages.concat(messages)
+                        // this.scrollBottom()
-                        this.scrollBottom()
                     })
             },
             // 获取消息列表
@@ -131,9 +121,8 @@
                     100,
                     true,
                     (messages) => {
-                        console.log(messages);
+                        this.messages = messages
-                        this.messages = messages.reverse()
+                        // this.scrollBottom()
-                        this.scrollBottom()
                     })
             },
             // 展示好友信息,  type 1 是自己， 2 是对方
@@ -174,12 +163,15 @@
         display: flex;
         flex-direction: column;
 
-        .body {
+        .body {
-            flex: 1;
+            flex: 1;
-            overflow: scroll;
+            overflow-y: scroll;
+            display: flex;
+            flex-direction: column-reverse;
+            justify-content: flex-end;
 
             .cell {
-                padding: 10rpx 30rpx;
+                padding: 10rpx 30rpx;
 
                 .time {
                     text-align: center;

router/index.js

@@ -9,10 +9,6 @@ import store from '@/store/index'
 // #ifdef APP-NVUE
 const ROUTES = [{
     "path": "/pages/im/private/call"
-}, {
-    "path": "/pages/im/private/chat"
-}, {
-    "path": "/pages/im/group/chat"
 }];
 // #endif
 

utils/im/listeners.js

@@ -115,7 +115,8 @@ const callLibListeners = () => {
         uni.$emit('onCallOutgoing')
     })
     // 远端响铃
-    CallLib.onRemoteUserRinging((res) => {
+    CallLib.onRemoteUserRinging((res) => {
+        console.log('onRemoteUserRinging', res);
         uni.$emit('onRemoteUserRinging')
     })
     // 远端加入