用户申请调整

pages/im/friends/index.vue

@@ -68,12 +68,14 @@ export default {
         // 新朋友
         toPending() {
             uni.navigateTo({
-                url: '/pages/im/friends/search'
+                url: '/pages/im/friends/pending'
             });
         }
     },
     onNavigationBarButtonTap(e) {
-        this.toPending();
+        uni.navigateTo({
+            url: '/pages/im/friends/search'
+        });
     }
 };
 </script>

pages/im/index.vue

@@ -22,19 +22,20 @@
         <view v-if="$store.state.token != ''">
             <block v-if="conversations.length < 1">
                 <view class="vertical null-list">
-                    <u-empty icon="http://cdn.uviewui.com/uview/empty/message.png" textColor="#999" text="暂无好友消息">
-                        <!-- <template>
-                            <view class="null-list-btn">开启聊天</view>
-                        </template> -->
-                    </u-empty>
+                    <u-empty mode="message" textColor="#999" text="暂无好友消息" />
                 </view>
             </block>
             <block v-else>
                 <u-alert type="warning" v-if="connection != 0" description="网络似乎断开了" :show-icon="true"></u-alert>
-                <view v-for="(item, index) in conversations" :key="index" :class="['message', { 'is-top': item.isTop }]" @tap="toDetail(item)" @longpress="onLongPress" :data-item="item">
+                <view v-for="(item, index) in conversations" :key="index"
+                    :class="['message', 'u-border-bottom', { 'is-top': item.isTop }]" @tap="toDetail(item)"
+                    @longpress="onLongPress" :data-item="item">
                     <view class="avatar">
-						<u-badge numberType="ellipsis" max="99" shape="horn" absolute :offset="[-5, -5]" :value="item.unreadMessageCount" />
-						<u-avatar size="44" v-if="!friend(item.targetId).portraitUrl" shape="square" :text="friend(item.targetId).name ? friend(item.targetId).name.substring(0,1) : '未'" font-size="16" randomBgColor></u-avatar>
+                        <u-badge numberType="ellipsis" max="99" shape="horn" absolute :offset="[-5, -5]"
+                            :value="item.unreadMessageCount" />
+                        <u-avatar size="44" v-if="!friend(item.targetId).portraitUrl" shape="square"
+                            :text="friend(item.targetId).name ? friend(item.targetId).name.substring(0,1) : '未'"
+                            font-size="16" randomBgColor></u-avatar>
                         <u-avatar v-else :src="friend(item.targetId).portraitUrl" shape="square" size="44"></u-avatar>
                     </view>
                     <view class="content">
@@ -45,6 +46,7 @@
                         <view class="preview">{{ item.latestMessage.content || '' }}</view>
                     </view>
                 </view>
+                <!-- TODO 长按的弹出框，怎么点击隐藏，没搞明白 -->
                 <view class="shade" @tap="hidePop">
                     <view class="pop" :style="popStyle" :class="{'show':showPop}">
                         <view v-for="(item, index) in popButton" :key="index" @tap="pickerMenu" :data-index="index">
@@ -69,7 +71,9 @@
     import * as RongIMLib from '@rongcloud/imlib-uni'
     import im from '@/utils/im/index.js'
     import userAuth from '@/public/userAuth'
-    import { getImToken } from '@/apis/interfaces/im.js'
+    import {
+        getImToken
+    } from '@/apis/interfaces/im.js'
 
     export default {
         data() {
@@ -98,7 +102,6 @@
         onShow() {
             if (this.$store.state.token !== '') {
                 getImToken().then(res => {
-                    console.log("IMTOKEN", res);
                     im.connect(res.token, res.userInfo, () => {
                         this.getConversationList()
                     })
@@ -151,6 +154,7 @@
                 } else {
                     RongIMLib.removeConversation(this.pickedItem.conversationType, this.pickedItem.targetId)
                 }
+                im.setNotifyBadge()
                 this.getConversationList()
                 this.hidePop()
             },
@@ -189,9 +193,9 @@
             getConversationList() {
                 const count = 1000
                 const timestamp = 0
-                RongIMLib.getConversationList(undefined, count, timestamp, (res) => {
-                    console.log('获取列表', res);
-                    if (res.code === 0 && res.conversations.length > 0) {
+                RongIMLib.getConversationList([RongIMLib.ConversationType.PRIVATE], count, timestamp, (res) => {
+                    console.log('getConversationList', res);
+                    if (res.code === 0) {
                         this.conversations = res.conversations
                     }
                 })
@@ -214,7 +218,10 @@
                         })
                         return
                     }
-					this.$Router.push({name, params})
+                    this.$Router.push({
+                        name,
+                        params
+                    })
                 }
             }
         }
@@ -225,18 +232,20 @@
     // header
     .custom-header {
         @extend .ios-top;
-		background: white;
+        background: $window-color;
         position: fixed;
         top: 0;
         left: 0;
         right: 0;
         z-index: 9999;
+
         .header-flex {
             padding: 20rpx $padding;
             display: flex;
             justify-content: space-between;
             height: 60rpx;
             line-height: 60rpx;
+
             .tabs {
                 .item {
                     margin-left: $margin;
@@ -245,9 +254,11 @@
                     color: $text-gray;
                     padding: 0 ($padding - 10);
                     border-radius: 30rpx;
+
                     &:first-child {
                         margin: 0;
                     }
+
                     &.show {
                         background: rgba($color: $main-color, $alpha: .1);
                         color: $main-color;
@@ -255,6 +266,7 @@
                     }
                 }
             }
+
             .btns {
                 .item {
                     display: inline-block;
@@ -270,9 +282,11 @@
         min-height: 100vh;
         padding-top: 90rpx;
         box-sizing: border-box;
+
         .null-list {
             height: 100vh;
             text-align: center;
+
             &-btn {
                 margin-top: $margin * 2;
                 line-height: 70rpx;
@@ -284,35 +298,46 @@
                 box-sizing: border-box;
             }
         }
+
         .message {
             background: white;
             padding: 20rpx 30rpx;
             position: relative;
             display: flex;
+
+            &.u-border-bottom {}
+
             &.is-top {
                 background: $window-color;
             }
+
             .avatar {
                 position: relative;
+
                 .u-badge {
                     z-index: 998;
                 }
             }
+
             .content {
                 padding-left: 30rpx;
                 width: calc(100% - 44px);
                 box-sizing: border-box;
+
                 .header {
                     display: flex;
                     justify-content: space-between;
+
                     .name {
                         font-size: $title-size + 4;
                     }
+
                     .time {
                         font-size: $title-size-sm;
                         color: $text-gray;
                     }
                 }
+
                 .preview {
                     word-break: break-all;
                     color: $text-gray;
@@ -321,17 +346,18 @@
                 }
             }
         }
-        .message:not(:last-child) {
-            &::after {
-                position: absolute;
-                left: calc(44px + #{$padding} + 30rpx);
-                right: 0;
-                bottom: 0;
-                content: " ";
-                height: 1rpx;
-                background: $border-color;
-            }
-        }
+
+        // .message:not(:last-child) {
+        //     &::after {
+        //         position: absolute;
+        //         left: calc(44px + #{$padding} + 30rpx);
+        //         right: 0;
+        //         bottom: 0;
+        //         content: " ";
+        //         height: 1rpx;
+        //         background: $border-color;
+        //     }
+        // }
     }
 
     /* 遮罩 */

utils/im/historyMessages.json

@@ -0,0 +1,23 @@
+[{
+    "objectName": "RC:TxtMsg",
+    "receivedTime": 1643080237399,
+    "extra": "",
+    "messageUId": "BUFC-3FSU-OLE4-I31K",
+    "conversationType": 1,
+    "messageDirection": 2,
+    "senderUserId": "10041",
+    "content": {
+        "content": "你好，这是 1710 条消息条消息条消息条消息条消息条消息条消息条消息条消息0.97796900 1642741562",
+        "objectName": "RC:TxtMsg",
+        "userInfo": {
+            "userId": "10041",
+            "name": "我是eth",
+            "portraitUrl": "http://storage.zh.shangkelian.cn/images/2022/01/12/3d2a103386df6822db7e5290272e8bc2.png"
+        }
+    },
+    "targetId": "10041",
+    "sentTime": 1642741563003,
+    "messageId": 2,
+    "receivedStatus": 1,
+    "sentStatus": 30
+}]

utils/im/index.js

@@ -10,7 +10,7 @@ const initIm = (KEY) => {
     addListeners()
 }
 
-const setNotifyBadge = (count) => {
+const setNotifyBadge = () => {
     // 获取未读消息数量
     RongIMLib.getTotalUnreadCount(({
         code,