群通知，更新群消息页面

App.vue

@@ -12,7 +12,7 @@
             // 获取系统版本号
             getVersions({
                 platform: plus.os.name,
-                version: plus.runtime.versionCode
+                version: plus.runtime.version
             }).then(res => {
                 if (res.update) {
                     uni.showModal({

README.md

@@ -1,3 +1,6 @@
 # ZhHealth
 
 ZH健康
+
+## uni-icons图标组件
+[图标组件](https://hellouniapp.dcloud.net.cn/pages/extUI/icons/icons)

apis/interfaces/im.js

@@ -323,6 +323,7 @@ export {
     dismissGroup,
     inviteGroupUser,
     removeGroupUser,
+    transferGroupOwner,
     setGroupAdmin,
     removeGroupAdmin,
     groupMakeSure, //  通过审核

main.js

@@ -10,15 +10,16 @@ import Vue from 'vue'
 import store from './store'
 import uView from 'uview-ui'
 import filters from './utils/filters.js'
-import {
-    usqlite
-} from '@/uni_modules/onemue-USQLite/js_sdk/usqlite.js'
-import model from '@/utils/im/models.js'
-
 import {
     router,
     RouterMount
 } from 'router'
+import {
+    usqlite
+} from '@/uni_modules/onemue-USQLite/js_sdk/usqlite.js'
+import {
+    contactModel
+} from '@/utils/im/models.js'
 
 Object.keys(filters).forEach(key => {
     Vue.filter(key, filters[key])
@@ -29,12 +30,20 @@ Vue.use(router)
 
 Vue.config.productionTip = false
 Vue.prototype.$store = store
-uni.$sql = usqlite
-uni.model = model
 
-uni.$sql.connect({
+usqlite.connect({
     name: 'zh-health', // 数据库名称
     path: '_doc/health.db', // 路径
+}, (err, res) => {
+    uni.getStorage({
+        key: 'FIRST_RUN',
+        fail: () => {
+            contactModel.create((err, res) => {
+                console.error('SQLITE 创建表格', err, res)
+                uni.setStorageSync('FIRST_RUN', 'X')
+            })
+        }
+    })
 })
 
 App.mpType = 'app'

manifest.json

@@ -2,8 +2,8 @@
     "name" : "ZH-HEALTH",
     "appid" : "__UNI__C29473D",
     "description" : "ZH-HEALTH，您手上的健康管理专家",
-    "versionName" : "1.0.13",
+    "versionName" : "1.0.20",
-    "versionCode" : 113,
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -59,7 +59,15 @@
                 "autoSdkPermissions" : true
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "privacyDescription" : {
+                    "NSMicrophoneUsageDescription" : "发送语音消息以及音视频通话",
+                    "NSCameraUsageDescription" : "发送图文消息以及视频通话",
+                    "NSPhotoLibraryUsageDescription" : "发送图文消息",
+                    "NSPhotoLibraryAddUsageDescription" : "保存图片消息",
+                    "NSLocationWhenInUseUsageDescription" : "发送当前位置信息"
+                }
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "oauth" : {
@@ -89,7 +97,7 @@
                     "amap" : {
                         "__platform__" : [ "android" ],
                         "appkey_ios" : "",
-                        "appkey_android" : "05b7f32ca9c897c8b63c505d92cd654b"
+                        "appkey_android" : "1dfbe526a37dcb1f13263e0b5871ca4d"
                     },
                     "system" : {
                         "__platform__" : [ "android" ]
@@ -98,41 +106,44 @@
                 "maps" : {
                     "amap" : {
                         "appkey_ios" : "",
-                        "appkey_android" : "05b7f32ca9c897c8b63c505d92cd654b"
+                        "appkey_android" : "1dfbe526a37dcb1f13263e0b5871ca4d"
                     }
                 }
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "hdpi" : "",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xhdpi" : "",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxhdpi" : "",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                    "xxxhdpi" : ""
                 },
                 "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "appstore" : "",
                     "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
+                        "app" : "",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "app@2x" : "",
-                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification" : "",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@2x" : "",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "proapp@2x" : "",
-                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings" : "",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@2x" : "",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight" : "",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                        "spotlight@2x" : ""
                     },
                     "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@2x" : "",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "app@3x" : "",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@2x" : "",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "notification@3x" : "",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@2x" : "",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "settings@3x" : "",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@2x" : "",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                        "spotlight@3x" : ""
                     }
                 }
+            },
+            "splashscreen" : {
+                "androidStyle" : "common"
             }
         },
         "nativePlugins" : {

pages/im/components/conversation/messageCell.vue

@@ -6,8 +6,10 @@
         </view>
         <view class="content">
             <view class="header">
-                <view class="name">{{ contact(item.targetId).name }} <text v-if="item.conversationType === 3"
+                <view class="name">
-                        class='qun'>[群]</text></view>
+                    {{ contact(item.targetId).name }}
+                    <text v-if="item.conversationType === 3" class='group'>[群]</text>
+                </view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
             <message-preview class="preview" :msg="item.latestMessage" :draft="item.draft"
@@ -19,8 +21,12 @@
 <script>
     import messagePreview from './messagePreview'
     import utils from '@/utils/index.js'
+    import imBase from '../../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         props: {
             item: {
                 type: Object,
@@ -29,21 +35,6 @@
                 }
             }
         },
-        data() {
-            return {
-                avatarRpx: 84
-            }
-        },
-        computed: {
-            avatarSize() {
-                return utils.rpx2px(this.avatarRpx)
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            }
-        },
         components: {
             messagePreview
         }
@@ -80,10 +71,8 @@
                 .name {
                     font-size: $title-size + 2;
                     color: #454545;
-                    display: flex;
-                    align-items: center;
 
-                    .qun {
+                    .group {
                         color: $main-color;
                         font-size: $title-size-m - 4;
                         margin-left: 4px;

pages/im/components/conversationList.vue

@@ -1,23 +1,24 @@
 <template>
     <view>
-        <view v-for="(item, index) in conversations" :key="index" :class="['message', { 'is-top': item.isTop, 'is-active': pickedItem.targetId == item.targetId }]"
+        <view class="shade" @click="hidePop" @touchmove="hidePop" v-show="showPop">
-            :data-item="item" @longpress="onLongPress" @click="toDetail(item)">
-            <message-cell :item="item" />
-        </view>
-        <view class="shade" @click="hidePop" v-show="showPop">
             <view class="pop" :style="popStyle" :class="{'show':showPop}">
-                <view v-for="(item, index) in popButton" :key="index" @click="pickerMenu" :data-index="index">
+                <view v-for="(item, index) in popButton" :key="index" @click="pickerMenu(index)">
                     {{ item }}
                 </view>
             </view>
         </view>
+        <view v-for="(item, index) in conversations" :key="index"
+            :class="['message', { 'is-top': item.isTop, 'is-active': pickedItem.targetId == item.targetId }]"
+            :data-item="item" @longpress="onLongPress" @click="toDetail(item)">
+            <message-cell :item="item" />
+        </view>
     </view>
 </template>
 
 <script>
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
-    import messageCell from './messageCell'
+    import messageCell from './conversation/messageCell'
 
     export default {
         props: {
@@ -65,9 +66,7 @@
                 }, 250)
             },
             // 点击会话功能菜单
-            pickerMenu(e) {
+            pickerMenu(index) {
-                const index = Number(e.currentTarget.dataset.index)
-
                 if (index == 0) {
                     RongIMLib.setConversationToTop(this.pickedItem.conversationType, this.pickedItem.targetId, !this
                         .pickedItem.isTop)
@@ -142,8 +141,10 @@
         position: fixed;
         width: 100%;
         height: 100%;
+        z-index: 999;
 
         .pop {
+            border-radius: 10rpx;
             position: fixed;
             z-index: 101;
             width: 200rpx;

pages/im/components/friendApplyCell.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="apply--cell">
         <view class="avatar">
-            <u-avatar :src="user.portraitUrl || require('@/static/user/cover.png')" shape="square" size="46" />
+            <u-avatar :src="user.portraitUrl || require('@/static/user/cover.png')" shape="square" :size="avatarSize" />
         </view>
         <view class="info">
             <view class="name"> {{ user.name }}</view>
@@ -20,8 +20,12 @@
         resolveFriend,
         rejectFriend
     } from '@/apis/interfaces/im.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         props: {
             message: {
                 type: Object,
@@ -36,7 +40,6 @@
         methods: {
             resolve() {
                 resolveFriend(this.message.sourceUserId).then(res => {
-                    this.clearMessages()
                     uni.showToast({
                         icon: 'none',
                         title: '通过好友申请'
@@ -47,6 +50,8 @@
                         icon: 'none',
                         title: err.message
                     })
+                }).finally(() => {
+                    this.clearMessages()
                 })
             },
             reject() {
@@ -70,7 +75,9 @@
             clearMessages() {
                 RongIMLib.deleteMessages(RongIMLib.ConversationType.SYSTEM, this.message.sourceUserId)
                 this.$emit('success')
-                uni.$emit('onContactNotification')
+                uni.$emit('onNewContactConversation')
+                uni.$emit('onNewContactFriends')
+                uni.$emit('onNewContactPendings')
             }
         }
     }

pages/im/components/friendApplyList.vue

@@ -3,7 +3,7 @@
         <block v-for="(item, index) in lists" v-if="lists.length > 0" :key="index">
             <view class="lists">
                 <view class="" style="width: 100rpx;height: 100rpx;">
-                    <u-avatar :src="JSON.parse(item.latestMessage.extra).portraitUrl" shape="square" size="44" />
+                    <u-avatar :src="JSON.parse(item.latestMessage.extra).portraitUrl" shape="square" :size="avatarSize" />
                 </view>
                 <view class="right">
                     <view class="title">
@@ -14,7 +14,8 @@
                         <span v-if="isAgree" @click="action('agree', item)">通过</span>
                         <span v-if="isAgree" @click="action('reject', item)">拒绝</span>
                         <span v-if="isApply && !item.is_friend" @click="action('apply', item)">查看</span>
-                        <span class="isFri" v-if="isApply && item.is_friend" @click="action('isFriend', item)">已是好友</span>
+                        <span class="isFri" v-if="isApply && item.is_friend"
+                            @click="action('isFriend', item)">已是好友</span>
                     </view>
                 </view>
             </view>
@@ -23,7 +24,12 @@
 </template>
 
 <script>
+    import imBase from '../mixins/imBase.js'
+    
     export default {
+        mixins:[
+            imBase
+        ],
         name: 'friend-apply-reject-agree',
         props: {
             lists: {
@@ -50,9 +56,16 @@ export default {
             action(type, item) {
                 if (type === 'isFriend') {
                     // ，后期可以跳转到信息介绍页面，先留在这里
-                return uni.showToast({ title: '已是好友，无需重复添加', icon: 'none', duration:2000});
+                    return uni.showToast({
+                        title: '已是好友，无需重复添加',
+                        icon: 'none',
+                        duration: 2000
+                    });
                 }
-            this.$emit('action', { type, item });
+                this.$emit('action', {
+                    type,
+                    item
+                });
             }
         }
     };
@@ -72,6 +85,7 @@ export default {
         .cover {
             background-color: #ffffff;
         }
+
         .right {
             width: 570rpx;
             margin-left: $margin - 10;
@@ -81,8 +95,10 @@ export default {
             justify-content: space-between;
             padding: $padding 0;
             border-bottom: solid 1rpx #f9f9f9;
+
             .title {
                 width: 370rpx;
+
                 .name {
                     width: 100%;
                     color: $text-color;
@@ -91,6 +107,7 @@ export default {
                     text-overflow: ellipsis;
                     white-space: nowrap;
                 }
+
                 .des {
                     width: 100%;
                     flex: 1;
@@ -102,20 +119,24 @@ export default {
                     color: $text-gray-m;
                 }
             }
+
             .agress-btn {
                 display: flex;
                 color: #fff;
                 font-size: $title-size-m;
+
                 span {
                     display: inline-block;
                     padding: 6rpx 14rpx;
                     background-color: $text-price;
                     border-radius: 10rpx;
                 }
+
                 span:nth-child(1) {
                     background-color: $main-color;
                     margin-right: 10rpx;
                 }
+
                 .isFri {
                     background-color: #f9f9f9 !important;
                     color: #666;

pages/im/components/friendSearchList.vue

@@ -3,7 +3,7 @@
         <block v-for="(item, index) in lists" v-if="lists.length > 0" :key="index">
             <view class="lists">
                 <view class="" style="width: 100rpx;height: 100rpx;">
-                    <u-avatar :src="item.portraitUrl || require('@/static/user/cover.png')" shape="square" size="44" />
+                    <u-avatar :src="item.portraitUrl || require('@/static/user/cover.png')" shape="square" :size="avatarSize" />
                 </view>
                 <view class="right">
                     <view class="title">
@@ -21,7 +21,12 @@
 </template>
 
 <script>
+    import imBase from '../mixins/imBase.js'
+    
     export default {
+        mixins: [
+            imBase
+        ],
         name: 'friend-apply-reject-agree',
         props: {
             lists: {

pages/im/components/groupUserList.vue

@@ -18,9 +18,8 @@
             </view>
         </view>
 
-        <view class="loadmore">
+        <view class="loadmore" @click="loadMore" v-if="members > users.length">
-            <u-icon name="arrow-right" @click="loadMore" v-if="members > users.length" color="#999" labelColor="#999"
+            查看更多群成员 <uni-icons size="30rpx" type="right"></uni-icons>
-                label="查看更多群成员" labelPos="left" :labelSize="labelSize" :size="iconSize" />
         </view>
 
         <u-action-sheet :actions="actionMap" :title="actionTitle" cancelText="取消" @close="hideAction"
@@ -38,8 +37,12 @@
         transferGroupOwner
     } from '@/apis/interfaces/im.js'
     import utils from '@/utils/index.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         props: {
             targetId: {
                 type: String,
@@ -62,28 +65,16 @@
                 actionMap: [],
                 actionTitle: '',
                 currentUser: {},
-                avatarSize: 45,
                 labelSize: 14,
                 iconSize: 14
-
-            }
-        },
-        computed: {
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
             }
         },
         created() {
-            this.avatarSize = utils.rpx2px(90)
-            this.labelSize = utils.rpx2px(24)
             this.iconSize = utils.rpx2px(26)
         },
         mounted() {
             this.initGroupInfo()
             getGroupUsers(this.targetId, this.count).then(res => {
-                console.log("res..",res)
                 this.users = res
                 res.map(item => {
                     this.$store.dispatch('updateContact', item)
@@ -110,6 +101,9 @@
                 this.actionShow = false
             },
             showAction(item) {
+                if (item.is_admin == 2) {
+                    return
+                }
                 this.currentUser = item
                 this.actionTitle = item.name
                 // 只有管理员以上才会弹窗
@@ -278,7 +272,6 @@
                 border-radius: 0 8rpx 0 0;
                 position: relative;
                 width: 84rpx;
-                height: 84rpx;
                 overflow: hidden;
 
                 .admin {
@@ -327,12 +320,16 @@
 
     .loadmore {
         font-size: 26rpx;
-        color: $text-gray-m;
+        color: $text-gray-m !important;
         text-align: center;
         display: flex;
         flex-direction: row;
         align-items: center;
         justify-content: center;
         box-sizing: border-box;
+
+        .uni-icons {
+            color: $text-gray-m !important;
+        }
     }
 </style>

pages/im/components/sent/sentEmoji.vue

@@ -0,0 +1,79 @@
+<template>
+    <view class="emoji--lay" v-show="show">
+        <scroll-view class="scroll" :scroll-y="true">
+            <view class="emoji-flex">
+                <view class="item" v-for="(item, index) in emojiArr" :key="index" @click="$emit('onEmoji', item)">{{item.emoji}}</view>
+            </view>
+        </scroll-view>
+        <view class="tool">
+            <!-- <view class="item" @click="$emit('delete')">删除</view> -->
+            <view class="item sent" @click="$emit('sent')">发送</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import emoji from '@/static/im/emoji'
+    export default{
+        props:{
+            show: {
+                type: Boolean,
+                default: () => {
+                    return false
+                }
+            }
+        },
+        data(){
+            return {
+                emojiArr: emoji
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .emoji--lay{
+        height: 600rpx;
+        position: relative;
+        .scroll{
+            height: 600rpx;
+            .emoji-flex{
+                padding: 15rpx 15rpx 120rpx;
+                display: flex;
+                flex-wrap: wrap;
+                .item{
+                    margin: 10rpx 15rpx;
+                    font-size: 52rpx;
+                    width: calc(12.5% - 30rpx);
+                    box-sizing: border-box;
+                }
+            }
+        }
+        .tool{
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            background-image: linear-gradient(to top, #FFF, rgba(255, 255, 255, .0));
+            display: flex;
+            justify-content: flex-end;
+            padding: 20rpx 30rpx 30rpx;
+            .item{
+                line-height: 70rpx;
+                border-radius: 35rpx;
+                width: 140rpx;
+                text-align: center;
+                font-size: 28rpx;
+                margin-left: 20rpx;
+                background: white;
+                border: solid 1rpx #f5f5f5;
+                box-sizing: border-box;
+                &.sent{
+                    border-color: #34CE98;
+                    background: #34CE98;
+                    color: white;
+                }
+            }
+        }
+    }
+</style>

pages/im/components/sent/sentPopups.vue

@@ -33,9 +33,12 @@
 
 <script>
     import im from '@/utils/im/index.js'
-    import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
+    import imBase from '../../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         data() {
             return {
                 callActions: [{
@@ -64,15 +67,11 @@
                 default: ''
             }
         },
-        computed: {
-            sender() {
-                return this.$store.getters.sender
-            }
-        },
         methods: {
             singleCall(e) {
                 uni.navigateTo({
-                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type + '&isCall=true'
+                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type +
+                        '&isCall=true'
                 })
             },
             onPopupsItem(type) {
@@ -104,16 +103,11 @@
                         this.callShow = true
                         break;
                     case 'location':
-                        // uni.showToast({
+                        uni.chooseLocation({
-                        //     icon: 'none',
+                            success: (c) => {
-                        //     title: '功能正在开发中'
+                                console.log(c);
-                        // })
+                            }
-                        // uni.chooseLocation({
+                        })
-                        //     success: res => {
-                        //         console.log(res);
-                        //         // this.success()
-                        //     }
-                        // })
                         break;
                     case 'redpacket':
                         uni.showToast({
@@ -144,6 +138,7 @@
         display: flex;
         flex-wrap: wrap;
         flex-direction: row;
+
         .item {
             width: 150rpx;
             margin: 15rpx;

pages/im/components/sent/sentText.vue

@@ -1,15 +1,29 @@
 <template>
     <view class="sent--text">
-        <input class="input" type="text" :auto-blur="true" @focus="focus" @blur="blur" :focus="focusState"
+        <input
-            v-model="inputTxt" confirm-type="send" @confirm="sent" cursor-spacing="10" />
+            class="input"
+            type="text"
+            :auto-blur="true"
+            :focus="focusState"
+            v-model="inputTxt"
+            confirm-type="send"
+            cursor-spacing="10"
+            @focus="focus"
+            @blur="blur"
+            @confirm="sent"
+        />
     </view>
 </template>
 
 <script>
     import im from '@/utils/im/index.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+    import imBase from '../../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         props: {
             conversationType: {
                 type: Number,
@@ -24,9 +38,6 @@
             disabled() {
                 return this.inputTxt.length === 0
             },
-            sender() {
-                return this.$store.getters.sender
-            }
         },
         mounted() {
             RongIMLib.getTextMessageDraft(this.conversationType, this.targetId, ({
@@ -45,6 +56,12 @@
                 inputTxt: ''
             }
         },
+        created(){
+            uni.$on('emojiValue', res => {
+                this.inputTxt = res.value
+            })
+        },
+        
         methods: {
             sent() {
                 if (!this.disabled) {
@@ -58,10 +75,13 @@
             focus() {
                 this.$emit('focus')
             },
-            blur() {
+            blur(e) {
                 uni.hideKeyboard()
-                this.$emit('blur')
+                this.$emit('blur', e.detail)
             }
+        },
+        destroyed() {
+            uni.$off('emojiValue')
         }
     }
 </script>
@@ -71,11 +91,10 @@
         display: flex;
         flex-direction: row;
         justify-content: space-between;
-
         .input {
             background: #F3F6FB;
             height: 70rpx;
-            width: 500rpx;
+            width: 400rpx;
             border-radius: 10rpx;
             margin-right: 15rpx;
             padding: 0 20rpx;

pages/im/components/sent/sentVoice.vue

@@ -0,0 +1,301 @@
+<template>
+    <view class="send--voice">
+        <view class="voice" hover-class="chat-hover" @touchstart="startRecord" @touchend="stopRecord" @touchmove="touchmove">
+            <text class="button">按住 说话</text>
+        </view>
+        <!-- 录音层 -->
+        <view class="lay" v-if="showRecordTip">
+            <view class="lay-header">
+                <view class="modal">
+                    <image class="icon" src="@/static/icon/record-icon.png" mode="widthFix"></image>
+                    <text class="text">录音中 {{recordTime}} s</text>
+                </view>
+            </view>
+            <view class="lay-toast">上滑取消</view>
+            <view class="lay-footer">
+                <image class="lay-footer-icon videoFlicker" src="@/static/icon/audio_green.png" mode="widthFix"></image>
+                <view class="lay-footer-text">松开发送</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import im from '@/utils/im/index.js'
+    import permision from '@/utils/permission.js'
+    import imBase from '../../mixins/imBase.js'
+    
+    export default {
+        mixins: [
+            imBase
+        ],
+        props: {
+            conversationType: {
+                type: Number,
+                default: 0
+            },
+            targetId: {
+                type: String,
+                default: ''
+            }
+        },
+        data() {
+            return {
+                showRecordTip: false,
+                recordTime: 60,
+                interval: 0,
+                maxRecordTime: 60,
+                recorderManager: null,
+                mp3AudioSrc: null,
+                isMoveCancel: false,
+                isBetaPlay: false, // 暂时无用
+                startOffsetTop: 0
+            }
+        },
+        computed: {
+            sender() {
+                return this.$store.getters.sender
+            }
+        },
+        created() {
+            this.recorderManager = uni.getRecorderManager()
+        },
+        methods: {
+            // 检查安卓录制权限
+            async getAndroidPermission() {
+                return await permision.requestAndroidPermission('android.permission.RECORD_AUDIO')
+            },
+            // 录制语音消息
+            startRecord(e) {
+                this.getAndroidPermission().then(code => {
+                    switch (code) {
+                        case 1:
+                            this.startOffsetTop = e.target.offsetTop
+                            this.showRecordTip = true
+                            this.recorderManager.start()
+                            this.interval = setInterval(() => {
+                                this.recordTime -= 1
+                                if (this.recordTime === 0) {
+                                    this.stopRecord()
+                                }
+                            }, 1000)
+                            break;
+                        case 0:
+                            uni.showToast({
+                                title: '暂无麦克风权限，请前往应用设置开启麦克风',
+                                icon: 'none'
+                            })
+                            break;
+                        case -1:
+                            uni.showToast({
+                                title: '应用权限错误',
+                                icon: 'none'
+                            })
+                            break;
+                    }
+                })
+            },
+            // 结束录音
+            stopRecord(e) {
+                if (!this.showRecordTip) return
+                // 延迟500毫秒结束录音
+                setTimeout(()=> {
+                    this.recorderManager.stop()
+                    clearInterval(this.interval)
+                    // 监听录音结束
+                    this.recorderManager.onStop(res => {
+                        if(this.isMoveCancel) {
+                            this.isMoveCancel = false
+                            return
+                        }
+                        if((this.maxRecordTime - this.recordTime) <= 0){
+                            uni.showToast({
+                                title: '说话时间太短',
+                                icon : 'none',
+                            })
+                            this.showRecordTip = false
+                            return
+                        }
+                        this.mp3AudioSrc = res.tempFilePath
+                        this.showRecordTip = false
+                        this.senVoice()
+                    })
+                },500)
+            },
+            // 发送语音消息
+            senVoice(){
+                if(this.mp3AudioSrc === null) {
+                    uni.showToast({
+                        title: '发送失败, 暂无音频信息',
+                        icon : 'none'
+                    })
+                    return
+                }
+                im.sentVoice(this.conversationType, this.targetId, this.mp3AudioSrc, (this.maxRecordTime -
+                    this.recordTime), this.sender, () => {
+                    this.recordTime = this.maxRecordTime
+                    this.mp3AudioSrc = null
+                    setTimeout(() => {
+                        this.$emit('success')
+                        this.toastAudiMp3()
+                    }, 500)
+                })
+            },
+            // 移动按钮
+            touchmove(e){
+                if(this.startOffsetTop - e.changedTouches[0].pageY > 100){
+                    if(this.showRecordTip){
+                        this.isMoveCancel = true
+                        this.showRecordTip = false
+                        this.recorderManager.stop()
+                        clearInterval(this.interval)
+                        this.recordTime = this.maxRecordTime
+                        this.mp3AudioSrc = null
+                        return
+                    }
+                }
+            },
+            // 试听语音
+            startPlay() {
+                let betaAudio = uni.createInnerAudioContext()
+                betaAudio.src = this.mp3AudioSrc;
+                // 在播放中
+                if(this.isBetaPlay){
+                    betaAudio.stop()
+                    betaAudio.onStop(() => {
+                        this.isBetaPlay = false;
+                        betaAudio.destroy()
+                    })
+                    return
+                }
+                // 监听音频播放中
+                betaAudio.play()
+                betaAudio.onPlay(() => {
+                    this.isBetaPlay = true;
+                })
+                // 监听音频结束
+                betaAudio.onEnded(() => {
+                    this.isBetaPlay = false;
+                    betaAudio.destroy()
+                })
+            },
+            // 播放提示音乐
+            toastAudiMp3(){
+                let toastAudio = uni.createInnerAudioContext()
+                toastAudio.src = require('@/static/im/toast/sentVoice.mp3')
+                toastAudio.autoplay = true
+                toastAudio.volume = .1
+                toastAudio.onEnded(() => {
+                    toastAudio.destroy()
+                })
+            }
+        }
+    }
+</script>
+
+<style>
+    @keyframes playFlicker {
+        0% {
+            opacity: 1;
+        }
+
+        50% {
+            opacity: .5;
+        }
+
+        100% {
+            opacity: 1;
+        }
+    }
+
+    .videoFlicker {
+        animation: playFlicker 1s infinite;
+    }
+</style>
+
+<style scoped lang="scss">
+    .send--voice {
+        .voice {
+            display: flex;
+            background: $window-color;
+            height: 70rpx;
+            line-height: 70rpx;
+            justify-content: center;
+            align-items: center;
+            width: 400rpx;
+            border-radius: 10rpx;
+            margin-right: 15rpx;
+            padding: 0 20rpx;
+            font-weight: bold;
+            .button {
+                font-size: 30rpx;
+                color: #333;
+            }
+        }
+        .lay{
+            position: absolute;
+            left: 0;
+            top: 0;
+            z-index: 9;
+            background: rgba($color: #000000, $alpha: .5);
+            height: 100vh;
+            width: 100vw;
+            box-sizing: border-box;
+            .lay-header{
+                height: calc(100vh - 140px);
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                .modal {
+                    display: flex;
+                    background: rgba(0, 0, 0, .6);
+                    position: fixed;
+                    height: 200rpx;
+                    width: 300rpx;
+                    border-radius: 10rpx;
+                    z-index: 99;
+                    flex-direction: column;
+                    align-items: center;
+                    justify-content: center;
+                    .icon {
+                        width: 88rpx;
+                        height: 88rpx;
+                    }
+                
+                    .text {
+                        font-size: 28rpx;
+                        color: #FFFFFF;
+                    }
+                }
+            }
+            .lay-toast{
+                text-align: center;
+                color: rgba($color: #fff, $alpha: .8);
+                font-size: 28rpx;
+            }
+            .lay-footer{
+                background-color: white;
+                height: 100px;
+                border-radius: 50% 50% 0 0;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                right: 0;
+                text-align: center;
+                display: flex;
+                justify-content: center;
+                flex-direction: column;
+                align-items: center;
+                .lay-footer-icon{
+                    width: 58rpx;
+                    height: 58rpx;
+                }
+                .lay-footer-text{
+                    line-height: 40rpx;
+                    color: gray;
+                    font-size: 28rpx;
+                }
+            }
+        }
+    }
+</style>

pages/im/components/sentMessageBar.vue

@@ -7,18 +7,27 @@
                 <image class="icon" src="@/static/icon/msg-icon.png" v-if="chatType === 1" mode="widthFix" />
             </view>
             <sent-voice v-if="chatType === 0" :conversationType="conversationType" :targetId="targetId" @success="onSuccess" />
-            <sent-text v-if="chatType === 1" :conversationType="conversationType" :targetId="targetId" @success="onSuccess" />
+            <sent-text ref="textView" v-if="chatType === 1" :conversationType="conversationType" :targetId="targetId" @success="onSuccess" @blur="onBlur"  />
-            <view class="msg-type msg-popups" @click="showPopups = !showPopups"> <image class="icon" src="@/static/icon/popups-icon.png" /> </view>
+            <view class="msg-type msg-popups" @click="onShowEmoji">
+                <image class="icon" src="@/static/icon/emoji-icon.png" /> 
+                <!-- 考虑唤起键盘，暂时保留v-show -->
+                <!-- <image v-show="!showEmoji" class="icon" src="@/static/icon/emoji-icon.png" /> -->
+                <!-- <image v-show="showEmoji" class="icon" src="@/static/icon/key-icon.png" /> -->
+            </view>
+            <view class="msg-type msg-popups" @click="() => {showPopups = !showPopups, showEmoji = false}"> <image class="icon" src="@/static/icon/popups-icon.png" /> </view>
         </view>
         <!-- 弹出层 -->
         <sent-popups :show="showPopups" :conversationType="conversationType" :targetId="targetId" @success="() => {showPopups = false, onSuccess()}" />
+        <!-- 表情包 -->
+        <sent-emoji :show="showEmoji" @onEmoji="onEmoji" @delete="onDelete" @sent="onSent"></sent-emoji>
     </view>
 </template>
 
 <script>
-    import sentText from './sentText'
+    import sentText from './sent/sentText'
-    import sentVoice from './sentVoice'
+    import sentVoice from './sent/sentVoice'
-    import sentPopups from './sentPopups'
+    import sentPopups from './sent/sentPopups'
+    import sentEmoji from './sent/sentEmoji'
 
     export default {
         props: {
@@ -34,18 +43,26 @@
         components: {
             sentText,
             sentVoice,
-            sentPopups
+            sentPopups,
+            sentEmoji
         },
         data() {
             return {
                 chatType    : 1, // 0 语音，1 文本
-                showPopups: false
+                showPopups  : false,
+                showEmoji   : false,
+                chatText    : {
+                    value   : "",
+                    cursor  : 0
+                }
             }
         },
         methods: {
             // 切换聊天类型，语音/文本
             changeMessageType() {
                 this.chatType = this.chatType === 1 ? 0 : 1
+                if(this.showEmoji) this.showEmoji = false
+                if(this.showPopups) this.showPopups = false
             },
             onSuccess() {
                 this.$emit('onSuccess')
@@ -55,6 +72,39 @@
                 if(this.showPopups){
                     this.showPopups = false
                 }
+            },
+            // 输入表情
+            onEmoji(e){
+                let atMsg  = this.chatText
+                let newMsg = () => {
+                    return atMsg.value.slice(0, atMsg.cursor) + e.emoji + atMsg.value.slice(atMsg.cursor)
+                }
+                atMsg.value = newMsg()
+                atMsg.cursor += 2
+                // 全局通讯
+                uni.$emit('emojiValue', atMsg)
+            },
+            // 删除表情
+            onDelete(){
+                console.log('删除')
+            },
+            // 发送消息
+            onSent(){
+                this.$refs.textView.sent()
+                this.chatText = {
+                    value   : "",
+                    cursor  : 0
+                }
+            },
+            // 获取输入框文字最新状态
+            onBlur(e){
+                this.chatText = e
+            },
+            // 显示emoji表情
+            onShowEmoji(){
+                this.showEmoji = !this.showEmoji
+                this.chatType = 1
+                if(this.showPopups) this.showPopups = false
             }
         }
     }

pages/im/components/sentVoice.vue

@@ -1,143 +0,0 @@
-<template>
-    <view class="send--voice">
-        <view class="voice" hover-class="chat-hover" @touchstart="startRecord" @touchend="stopRecord">
-            <text class="button">按住说话</text>
-        </view>
-        <!-- 录音中提示 -->
-        <view class="modal" v-if="showRecordTip">
-            <image class="icon" src="@/static/icon/record-icon.png" mode="widthFix"></image>
-            <text class="text">录音中 {{recordTime}} s</text>
-        </view>
-    </view>
-</template>
-
-<script>
-    import im from '@/utils/im/index.js'
-    import permision from '@/utils/permission.js'
-
-    export default {
-        props: {
-            conversationType: {
-                type: Number,
-                default: 0
-            },
-            targetId: {
-                type: String,
-                default: ''
-            }
-        },
-        data() {
-            return {
-                showRecordTip: false,
-                recordTime: 60,
-                interval: 0,
-                maxRecordTime: 60,
-                recorderManager: null
-            }
-        },
-        computed: {
-            sender() {
-                return this.$store.getters.sender
-            }
-        },
-        created() {
-            this.recorderManager = uni.getRecorderManager()
-        },
-        methods: {
-            // 检查安卓录制权限
-            async getAndroidPermission() {
-                return await permision.requestAndroidPermission('android.permission.RECORD_AUDIO')
-            },
-            // 录制语音消息
-            startRecord() {
-                this.getAndroidPermission().then(code => {
-                    switch (code) {
-                        case 1:
-                            this.showRecordTip = true
-                            this.recorderManager.start()
-                            this.interval = setInterval(() => {
-                                this.recordTime -= 1
-                                if (this.recordTime === 0) {
-                                    this.stopRecord()
-                                }
-                            }, 1000)
-                            break;
-                        case 0:
-                            uni.showToast({
-                                title: '暂无麦克风权限，请前往应用设置开启麦克风',
-                                icon: 'none'
-                            })
-                            break;
-                        case -1:
-                            uni.showToast({
-                                title: '应用权限错误',
-                                icon: 'none'
-                            })
-                            break;
-                    }
-                })
-            },
-            // 结束录音
-            stopRecord(e) {
-                if (!this.showRecordTip) return
-                this.recorderManager.stop()
-                clearInterval(this.interval)
-                // 监听录音结束
-                this.recorderManager.onStop(res => {
-                    im.sentVoice(this.conversationType, this.targetId, res.tempFilePath, (this.maxRecordTime -
-                        this.recordTime), this.sender, () => {
-                        setTimeout(() => {
-                            this.$emit('success')
-                        }, 500)
-                    })
-                    this.recordTime = this.maxRecordTime
-                    this.showRecordTip = false
-                })
-            },
-        }
-    }
-</script>
-
-<style scoped lang="scss">
-    .send--voice {
-        .voice {
-            display: flex;
-            background: $window-color;
-            height: 70rpx;
-            line-height: 70rpx;
-            justify-content: center;
-            align-items: center;
-            width: 500rpx;
-            border-radius: 10rpx;
-            margin-right: 15rpx;
-            .button {
-                font-size: 30rpx;
-                color: #333;
-            }
-        }
-
-        .modal {
-            display: flex;
-            background: rgba(0, 0, 0, .6);
-            position: fixed;
-            height: 200rpx;
-            width: 300rpx;
-            border-radius: 10rpx;
-            z-index: 99;
-            top: 550rpx;
-            left: 225rpx;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            .icon {
-                width: 88rpx;
-                height: 88rpx;
-            }
-
-            .text {
-                font-size: 28rpx;
-                color: #FFFFFF;
-            }
-        }
-    }
-</style>

pages/im/components/show/messageState.vue

@@ -2,18 +2,12 @@
     <view v-if="!isRemote">
         <view class="state" v-if="isGroup">
             <!-- 已发送 -->
-            <u-icon name="checkbox-mark" :size="iconSize" class="sent"
+            <uni-icons class="sent" type="checkmarkempty" size="28rpx" :color="message.sentStatus >= 30 ? '#34CE98' : '#999999'" />
-                :color="message.sentStatus >= 30 ? '#34CE98' : '#999999' " />
-            <!-- 已阅读 -->
             <text class="readers">{{ readers }}</text>
         </view>
         <view class="state" v-else>
-            <!-- 已发送 -->
+            <uni-icons class="sent" type="checkmarkempty" size="28rpx" :color="message.sentStatus >= 30 ? '#34CE98' : '#999999'" />
-            <u-icon name="checkbox-mark" :size="iconSize" class="sent"
+            <uni-icons class="receive" type="checkmarkempty" size="28rpx" :color="message.sentStatus >= 50 ? '#34CE98' : '#999999'" />
-                :color="message.sentStatus >= 30 ? '#34CE98' : '#999999' " />
-            <!-- 已阅读 -->
-            <u-icon name="checkbox-mark" :size="iconSize" class="receive"
-                :color="message.sentStatus >= 50 ? '#34CE98' : '#999999' " />
         </view>
     </view>
 </template>

pages/im/components/show/showCall.vue

@@ -2,8 +2,9 @@
     <view class="msg--call">
         <view class="name" v-if="isGroup && isRemote">{{ contact(message.senderUserId).name }}</view>
         <view class="im--text" :class="isRemote ? 'left': 'right'">
-            <u-icon name="camera" size="22" v-if="msg.mediaType == 1" :label="label" />
+            <uni-icons type="videocam" size="44rpx" v-if="msg.mediaType == 1" />
-            <u-icon name="phone" size="22" v-else :label="label" />
+            <uni-icons type="phone" size="40rpx" v-else  />
+            {{ label }}
         </view>
     </view>
 </template>
@@ -11,8 +12,12 @@
 <script>
     import utils from '@/utils/index.js'
     import moment from 'moment'
+    import imBase from '../../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         name: 'showText',
         props: {
             message: {
@@ -38,11 +43,6 @@
             isRemote() {
                 return this.message.messageDirection == 2
             },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            },
             duration() {
                 if (this.message.duration > 3600) {
                     return moment.utc(this.message.duration * 1000).format('HH:mm:ss')
@@ -70,6 +70,7 @@
             color: $text-color;
             display: flex;
             flex-direction: row;
+            align-items: center;
 
             &.left {
                 border-radius: 0 20rpx 20rpx 20rpx;
@@ -81,8 +82,8 @@
                 background: $main-color;
                 color: white;
 
-                .u-icon {
+                .uni-icons {
-                    color: white;
+                    color: white !important;
                 }
             }
         }

pages/im/components/show/showImage.vue

@@ -14,8 +14,12 @@
 <script>
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import messageState from './messageState'
+    import imBase from '../../mixins/imBase.js'
     
     export default {
+        mixins: [
+            imBase
+        ],
         name: 'showImage',
         props: {
             message: {
@@ -38,51 +42,30 @@
             },
             content() {
                 return this.message.content
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
             }
         },
         methods: {
-            previewImage() {
+            showImage(path) {
-                if (this.content.local) {
-                    uni.previewImage({
-                        urls: [
-                            this.content.local
-                        ],
-                        success: (e) => {
-                            console.log(e);
-                        },
-                        fail: (er) => {
-                            console.log(er);
-                        }
-                    })
-                } else {
-                    RongIMLib.downloadMediaMessage(this.messageId, {
-                        success: (path) => {
-                            this.content.local = path
                 uni.previewImage({
                     urls: [
                         path
-                                ],
+                    ]
-                                success: (e) => {
-                                    console.log(e);
-                                },
-                                fail: (er) => {
-                                    console.log(er);
-                                }
                 })
             },
-                        progress: (progress, messageId) => {
+            previewImage() {
-                            console.log('progress', progress);
+                if (this.content.local && this.content.local.indexOf('///data/user/') < 0) {
-                        },
+                    this.showImage(this.content.local)
-                        cancel: (messageId) => {
+                } else {
-                            console.log('cancel', messageId);
+                    this.showImage(this.content.remote)
+                    RongIMLib.downloadMediaMessage(this.message.messageId, {
+                        success: (path) => {
+                            this.content.local = path
                         },
                         error: (errorCode, messageId) => {
-                            console.log('errorCode', errorCode);
+                            uni.showToast({
+                                icon: 'none',
+                                title: errorCode
+                            })
                         }
                     })
                 }

pages/im/components/show/showText.vue

@@ -11,9 +11,13 @@
 
 <script>
     import messageState from './messageState'
+    import imBase from '../../mixins/imBase.js'
 
     export default {
         name: 'showText',
+        mixins: [
+            imBase,
+        ],
         props: {
             message: {
                 type: Object,
@@ -35,11 +39,6 @@
             },
             content() {
                 return this.message.content.content
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
             }
         }
     }
@@ -58,7 +57,7 @@
         .text {
             box-sizing: border-box;
             max-width: 502rpx;
-            padding: 20rpx;
+            padding: 20rpx 24rpx;
             line-height: 46rpx;
             font-size: 32rpx;
             color: $text-color;

pages/im/components/show/showVoice.vue

@@ -23,8 +23,12 @@
 <script>
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import messageState from './messageState'
+    import imBase from '../../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         props: {
             message: {
                 type: Object,
@@ -54,11 +58,6 @@
             isRemote() {
                 return this.message.messageDirection == 2
             },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            },
             width() {
                 if (this.duration > 3) {
                     return (this.duration * 5) + 150
@@ -75,11 +74,6 @@
                 }
             })
         },
-
-        created() {
-            console.log(this.message.messageId)
-        },
-
         methods: {
             // 播放语音消息
             startPlay() {

pages/im/components/showMessageCell.vue

@@ -1,13 +1,17 @@
 <template>
     <view class="">
-        <view class="notify" v-if="message.objectName === 'RC:GrpNtf'">{{ message.content.message }}</view>
+        <view class="notify" v-if="message.objectName === 'RC:GrpNtf'">
+            {{ message.content.message }}
+            <text class="link" @click="toAnnounce(message)" v-if="message.content.operation == 'ANNOUNCEMENT'">点击查看
+            </text>
+        </view>
         <view class="notify" v-else-if="message.objectName === 'RC:RcNtf'">
             {{ contact(message.senderUserId).name }} 撤回了一条消息
         </view>
         <view v-else :class="['cell-item', message.messageDirection == 1 ? 'right' : 'left']">
             <u-avatar class="avatar" @click="toUser(message)" :size="avatarSize" shape="square"
                 :src="contact(message.senderUserId).portraitUrl" />
-            <view class="msg" @longpress="backMessage">
+            <view class="msg" @longpress="messageAction($event, message)">
                 <show-text v-if="message.objectName === 'RC:TxtMsg'" :message="message" :isGroup="isGroup" />
                 <show-voice v-else-if="message.objectName === 'RC:HQVCMsg'" :message="message" :isGroup="isGroup" />
                 <show-image v-else-if="message.objectName === 'RC:ImgMsg'" :message="message" :isGroup="isGroup" />
@@ -22,14 +26,21 @@
 </template>
 
 <script>
+    import {
+        getGroupAnnouncement
+    } from '@/apis/interfaces/im.js'
     import * as IMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import showVoice from './show/showVoice'
     import showImage from './show/showImage'
     import showText from './show/showText'
     import showCall from './show/showCall'
     import utils from '@/utils/index.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase
+        ],
         components: {
             showCall,
             showVoice,
@@ -48,22 +59,13 @@
                 default: false
             }
         },
-        data() {
-            return {
-                avatarRpx: 84
-            }
-        },
-        computed: {
-            avatarSize() {
-                return utils.rpx2px(this.avatarRpx)
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            }
-        },
         methods: {
+            messageAction(event, message) {
+                this.$emit('messageAction', {
+                    event,
+                    message
+                })
+            },
             toUser(item) {
                 if (item.messageDirection == 1) {
                     uni.navigateTo({
@@ -75,40 +77,34 @@
                     })
                 }
             },
-            // 撤回消息测试
+            // 跳转群公告
-            backMessage() {
+            toAnnounce(message) {
-                if (this.$store.getters.sender.userId != this.message.senderUserId) {
+                if (message.content.extra) {
-                    uni.showToast({
+                    getGroupAnnouncement(message.targetId, message.content.extra).then(res => {
-                        icon: 'none',
+                        uni.navigateTo({
-                        title: '不能撤回别人的消息'
+                            url: '/pages/im/group/announceCreate?type=check&targetId=' + message
+                                .targetId + '&aId=' + message.content.extra
                         })
-                    return
+                    }).catch(err => {
-                }
+                        IMLib.deleteMessagesByIds([message.messageId], ({
-                // 判断时间超过了多久 就不能撤回 TODO
+                            code
-                // this.message.sentTime
-                const pushContent = this.$store.getters.sender.name + '撤回了一条消息'
-                IMLib.recallMessage(this.message.messageId, pushContent,
-                    ({
-                        code,
-                        message
                         }) => {
                             if (code === 0) {
-                            uni.showToast({
+                                uni.$emit('remove_message_' + message.targetId, message.messageId)
-                                icon: 'none',
+                            }
-                                title: '消息撤回成功'
+                        })
+                        uni.showToast({
+                            title: '公告不存在或已删除',
+                            icon: 'none',
                         })
-                            IMLib.getMessage(this.message.messageId, res => {
-                                uni.$emit('onRecallMessage', res.message)
                     })
                 } else {
                     uni.showToast({
                         icon: 'none',
-                                title: '撤回失败' + code
+                        title: '旧版本，无链接'
                     })
                 }
             }
-                )
-            }
         }
     }
 </script>
@@ -118,6 +114,11 @@
         text-align: center;
         font-size: 24rpx;
         color: #666;
+
+        .link {
+            color: $main-color;
+            margin-left: 10rpx;
+        }
     }
 
     .cell-item {

pages/im/friends/index.vue

@@ -2,12 +2,12 @@
     <view>
         <u-index-list :index-list="indexs" inactiveColor="#666" activeColor="#34CE98">
             <view class="friend-flex" @click="toPending">
-                <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_01.png')"></u-avatar>
+                <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_01.png')" />
                 <u-badge max="99" absolute :offset="[23, 20]" :value="pendingCount" />
                 <view class="info">新的朋友</view>
             </view>
             <view class="friend-flex" @click="toGroup">
-                <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_00.png')"></u-avatar>
+                <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_00.png')" />
                 <view class="info">我的群聊</view>
             </view>
             <block v-if="friends.length > 0">
@@ -20,14 +20,15 @@
                             :src="contact(friendItem.targetId).portraitUrl" />
                         <view class="info">
                             <view class="name">{{ contact(friendItem.targetId).name }}</view>
-                            <!-- <view class="address">地址:{{ friendItem.address }}</view> -->
                         </view>
                     </view>
                 </u-index-item>
             </block>
-            <block v-else>
+            <view class="no-lists" v-else>
-                <u-empty class="pages-null" mode="data" text="暂无好友" />
+                <u-image class="cover" radius="4" width="400rpx" height="400rpx"
-            </block>
+                    :src=" require('@/static/imgs/no-friend.png')" :lazy-load="true" />
+                <span>暂无好友列表~</span>
+            </view>
         </u-index-list>
     </view>
 </template>
@@ -38,8 +39,12 @@
     } from '@/apis/interfaces/im';
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import im from '@/utils/im/index.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
+        mixins: [
+            imBase
+        ],
         data() {
             return {
                 indexs: [],
@@ -55,9 +60,14 @@
             }
         },
         onLoad() {
+            uni.$on('onNewContactFriends', this.checkNewFriendPending)
+        },
+        onShow() {
             this.getFriendList()
             this.checkNewFriendPending()
-            uni.$on('onContactNotification', this.checkNewFriendPending)
+        },
+        onUnload() {
+            uni.$off("onNewContactFriends")
         },
         methods: {
             getFriendList() {
@@ -73,10 +83,7 @@
             },
             toGroup() {
                 uni.navigateTo({
-                    url: '/pages/im/group/index',
+                    url: '/pages/im/group/index'
-                    fail(err) {
-                        console.log(err);
-                    }
                 })
             },
             toFriend(targetId) {
@@ -86,24 +93,15 @@
             },
             // 新朋友
             toPending() {
-                // if (this.pendingCount > 0) {
                 uni.navigateTo({
                     url: '/pages/im/friends/pending'
-                });
+                })
-                // } else {
-                //     uni.showToast({
-                //         title: ` 暂无好友申请 ~ `,
-                //         icon: "none",
-                //         mask: true,
-                //         duration: 3000
-                //     })
-                // }
             }
         },
         onNavigationBarButtonTap(e) {
             uni.navigateTo({
                 url: '/pages/im/friends/search'
-            });
+            })
         }
     };
 </script>
@@ -172,4 +170,19 @@
         line-height: 24px;
         background-color: #fff;
     }
+
+    .no-lists {
+        padding-top: $padding * 3;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        font-size: $title-size-m;
+        color: $text-gray-m;
+
+        span {
+            padding-top: $padding;
+        }
+    }
 </style>

pages/im/friends/info.vue

@@ -2,10 +2,10 @@
     <view class="content">
         <!-- 用户信息 -->
         <view class="info-flex">
-            <u-avatar :src="userInfo.portraitUrl || require('@/static/user/cover.png')" shape="square" size="50"
+            <u-avatar :src="userInfo.portraitUrl || require('@/static/user/cover.png')" shape="square"
-                bg-color="#fff"></u-avatar>
+                :size="rpx2px(100)" bg-color="#fff"></u-avatar>
             <view class="info-text">
-                <view class="nickname">{{ userInfo.name }}</view>
+                <view class="nickname">{{ contact(targetId).name }} ({{ userInfo.name }})</view>
                 <view class="address" @longpress="copyAddress">地址：{{ userInfo.address }}</view>
             </view>
         </view>
@@ -14,23 +14,19 @@
             <view class="item">
                 <label>性别</label>
                 <view class="text" v-if="userInfo.gender === 0">保密</view>
-                <view class="text" v-if="userInfo.gender === 1">男</view>
+                <view class="text" v-else-if="userInfo.gender === 1">男</view>
-                <view class="text" v-if="userInfo.gender === 2">女</view>
+                <view class="text" v-else>女</view>
             </view>
         </view>
-
+        <!-- 如果是好友 -->
         <block v-if="userInfo.friendship ==='accepted'">
             <view class="info-btns">
                 <view class="item u-border-bottom" @click="setRemark">
                     <label>设置备注</label>
-                    <u-icon name="arrow-right" color="#eee" size="16" />
+                    <uni-icons type="right" size="32rpx" />
-                </view>
-                <view class="item u-border-bottom" @click="setRemark">
-                    <label>设置标签</label>
-                    <u-icon name="arrow-right" color="#eee" size="16" />
                 </view>
                 <view class="item u-border-bottom">
-                    <label>聊天免打扰</label>
+                    <label>消息免打扰</label>
                     <u-switch size="22" v-model="status" activeColor="#34CE98" @change="setStatus"></u-switch>
                 </view>
                 <view class="item">
@@ -69,6 +65,14 @@
                 </view>
             </view>
         </block>
+
+        <u-modal negativeTop="300" :show="modalShow" title="修改备注" showCancelButton @cancel="onHideModal"
+            @confirm="onChangeRemark">
+            <view class="slot-content">
+                <u--input placeholder="好友备注" border="surround" focus v-model="contactRemark" maxlength="12" />
+            </view>
+        </u-modal>
+
         <u-action-sheet :actions="callActions" cancelText="取消" @close="callShow = false" @select="singleCall"
             :show="callShow">
         </u-action-sheet>
@@ -83,12 +87,17 @@
     } from '@/apis/interfaces/im.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
+    import imBase from '../mixins/imBase.js'
+
     // friendship: ''    没有好友关系
     // accepted    好友
     // pending  申请中
     // denied 拒绝 
     // blocked 黑名单
     export default {
+        mixins: [
+            imBase
+        ],
         data() {
             return {
                 targetId: '',
@@ -107,13 +116,14 @@
                     }
                 ],
                 callShow: false,
-                hasPeding: false
+                hasPeding: false,
+                modalShow: false,
+                contactRemark: ''
             }
         },
         onLoad(e) {
             this.targetId = e.targetId
             getFriendInfo(e.targetId).then(res => {
-                console.log(res, "获取朋友的信息")
                 this.userInfo = res
                 // 获取到用户信息之后，去检查一下要不要更新
                 this.$store.dispatch('updateContact', res)
@@ -148,11 +158,30 @@
                 })
             },
             toPrivate() {
-                uni.redirectTo({
+                uni.navigateTo({
                     url: '/pages/im/private/chat?targetId=' + this.targetId
                 });
             },
+            // 设置好友备注操作
             setRemark() {
+                this.modalShow = true
+                this.contactRemark = this.$store.getters.contactInfo(this.targetId).name
+            },
+            onHideModal() {
+                this.modalShow = false
+            },
+            onChangeRemark() {
+                this.$store.dispatch('setContactRemark', {
+                    targetId: this.targetId,
+                    remark: this.contactRemark
+                })
+                uni.showToast({
+                    icon: 'none',
+                    title: '备注设置成功'
+                })
+                this.onHideModal()
+            },
+            setTag() {
                 uni.showToast({
                     title: '开发中',
                     icon: 'none'
@@ -209,7 +238,7 @@
                     })
                     return
                 }
-                pedingFriend(this.targetId, 'message').then(res => {
+                pedingFriend(this.targetId, '').then(res => {
                         uni.showToast({
                             title: `  申请成功,等待审核  `,
                             icon: 'none',
@@ -228,8 +257,9 @@
                     })
             },
             singleCall(e) {
-                uni.redirectTo({
+                uni.navigateTo({
-                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type + '&isCall=true'
+                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type +
+                        '&isCall=true'
                 })
             }
         }
@@ -344,6 +374,10 @@
                 width: 200rpx;
             }
 
+            .uni-icons {
+                color: $text-gray-m !important;
+            }
+
             .text {
                 width: calc(100% - 200rpx);
                 color: $text-gray-m;

pages/im/friends/mine.vue

@@ -4,7 +4,7 @@
         <!-- 用户信息 -->
         <view class="info-flex">
             <view class="info-flex-item">
-                <u-avatar :src="infoObj.portraitUrl" shape="square" size="210rpx" bg-color="#fff" class="avatar" />
+                <u-avatar :src="infoObj.portraitUrl" @click='previewImg(infoObj.portraitUrl)' shape="square" size="210rpx" bg-color="#fff" class="avatar" />
                 <view class="nickname">{{infoObj.name}}</view>
                 <view class="address">{{infoObj.address}}</view>
                 <view class="info-code">
@@ -23,7 +23,8 @@
 <script>
     import {
         getUserInfo
-    } from '@/apis/interfaces/im'
+    } from '@/apis/interfaces/im.js'
+    
     export default {
         data() {
             return {
@@ -47,6 +48,12 @@
             })
         },
         methods: {
+            previewImg(item){
+                console.log(item)
+                uni.previewImage({
+                    urls:[item]
+                })
+            },
             copy() {
                 uni.setClipboardData({
                     data: this.downUrl,
@@ -99,7 +106,7 @@
 
                 .avatar {
                     // padding: 14rpx; 
-                    border-radius: 10rpx;
+                    border-radius: 20rpx;
                     background-color: #fff;
                     border: solid 14rpx rgba($color: #fff, $alpha:1);
                 }

pages/im/friends/pending.vue

@@ -2,7 +2,7 @@
     <view class="pending">
         <u-sticky>
             <view class="header-search" @click="$Router.push({ name: 'SearchFriend' })">
-                <u-search placeholder="输入手机号码搜索" height="74" searchIcon="search" inputAlign="center" bgColor="white"
+                <u-search placeholder="输入手机号码搜索" searchIcon="search" inputAlign="center" bgColor="white"
                     :disabled="true" :show-action="false" />
             </view>
         </u-sticky>
@@ -33,13 +33,17 @@
                 bg: '#fff'
             }
         },
-        onLoad() {
+        onShow() {
             this.getPendingList()
-            uni.$on('onContactNotification', this.getPendingList)
+            uni.$on('onNewContactPendings', this.getPendingList)
+        },
+        onUnload() {
+            uni.$off('onNewContactPendings')
         },
         methods: {
             getPendingList() {
                 im.getPendingList((pendings) => {
+                    console.log(pendings, 'res......')
                     if (pendings.length > 0) {
                         this.bg = '#f9f9f9'
                     } else {

pages/im/friends/search.vue

@@ -8,17 +8,19 @@
 
 <template>
     <view class="search">
-        <!-- 搜索 、   -->
+        <!-- 搜索 -->
         <u-sticky>
             <view class="header-search">
-                <u-search placeholder="输入用户账号、手机号" height="74" searchIcon="search" @custom="search" v-model="searchValue" @search="search" bgColor="#f9f9f9" :focus="focused" />
+                <u-search placeholder="输入用户账号、手机号" searchIcon="search" @custom="search" v-model="searchValue"
+                    @search="search" bgColor="#F3F6FB" :focus="focused" />
             </view>
         </u-sticky>
         <block v-if="searchResult.length > 0">
             <applyFriend :lists="searchResult" :isApply="true" @action="action" />
         </block>
-        <view class="no-lists" v-else>
+        <view class="no-lists" v-if="searchResult.length === 0 && searchValue.length > 1">
-            <u-image class="cover" radius="4" width="400rpx" height="400rpx" :src="require('@/static/imgs/no-search.png')" :lazy-load="true" />
+            <u-image class="cover" radius="4" width="400rpx" height="400rpx"
+                :src="require('@/static/imgs/no-search.png')" :lazy-load="true" />
             <span>暂无匹配内容~</span>
         </view>
     </view>
@@ -30,6 +32,7 @@
         pedingFriend
     } from '@/apis/interfaces/im.js';
     import applyFriend from '../components/friendSearchList.vue';
+
     export default {
         components: {
             applyFriend
@@ -41,6 +44,20 @@
                 focused: true
             };
         },
+        watch: {
+            searchValue(value) {
+                console.log(value.length, 'length...')
+                if (value.length > 1) {
+                    this.searchResult = []
+                    this.search()
+                    return
+                }
+                if(value.length === 0){
+                    this.searchResult = []
+                    return
+                }
+            }
+        },
         methods: {
             search() {
                 // friendship: ''    没有好友关系

pages/im/group/announceCreate.vue

@@ -1,13 +1,15 @@
 <template>
     <view class="create">
         <view class="create-title">公告内容</view>
-        <block v-if="type !== 'cheack'">
+
+        <block v-if="type === 'check'">
+            <view class="content"> {{content}} </view>
+        </block>
+
+        <block v-else>
             <u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
             <u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
         </block>
-        <block v-if="type === 'cheack'">
-            <view class="content-a"> {{content}} </view>
-        </block>
     </view>
 </template>
 
@@ -16,32 +18,42 @@
         createGroupAnnouncement,
         getGroupAnnouncement
     } from '@/apis/interfaces/im.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
 
     export default {
+        mixins: [
+            onGroupDismiss
+        ],
         data() {
             return {
                 targetId: '',
                 content: '',
                 aId: '',
-                type: '' // check ' 查看详情'
+                type: '' // cheack ' 查看详情'
             }
         },
         onLoad(e) {
             this.targetId = e.targetId
-            if (e.type) {
-                this.type = e.type
-            }
             if (e.aId) {
+                this.type = e.type
+                uni.setNavigationBarTitle({
+                    title: '群公告'
+                })
                 this.aId = e.aId
                 getGroupAnnouncement(this.targetId, this.aId).then(res => {
-                    console.log(res.content)
                     this.content = res.content
                 }).catch(err => {
+                    if (err.status_code == 404) {
+                        this.$nextTick(() => {
+                            uni.navigateBack()
+                        })
+                    } else {
                         uni.showToast({
                             title: err.message,
                             icon: 'none',
                             mask: true
                         })
+                    }
                 })
             }
         },
@@ -95,7 +107,7 @@
             }
         }
 
-        .content-a {
+        .content {
             color: $text-color;
             font-size: $title-size;
             line-height: 1.7;

pages/im/group/announcement.vue

@@ -35,8 +35,14 @@
         deleteGroupAnnouncement,
         topGroupAnnouncement
     } from '@/apis/interfaces/im.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase,
+            onGroupDismiss
+        ],
         data() {
             return {
                 targetId: '',
@@ -115,7 +121,7 @@
             },
             tabA(id) {
                 uni.navigateTo({
-                    url: '/pages/im/group/announceCreate?type=cheack&targetId=' + this.targetId + '&aId=' + id
+                    url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId + '&aId=' + id
                 })
             },
             onTop(aId) {
@@ -128,14 +134,6 @@
                     uni.$emit('updateAnnouncement')
                     this.initData()
                 })
-                // uni.showModal({
-                //     title: ' 置顶该公告',
-                //     success: (res) => {
-                //         if (res.confirm) {
-
-                //         }
-                //     }
-                // })
             },
             //  删除公告
             onDelete(aId) {
@@ -148,14 +146,6 @@
                     uni.$emit('updateAnnouncement')
                     this.initData()
                 })
-                //        uni.showModal({
-                //            title: '删除该公告',
-                //            success: (res) => {
-                //                if (res.confirm) {
-
-                //                }
-                //            }
-                //        })
             }
         }
     }
@@ -194,7 +184,8 @@
                 box-sizing: border-box;
                 font-size: $title-size-m;
                 color: $text-gray-m;
-                padding: 10rpx;
+                padding: 20rpx 10rpx 10rpx 10rpx;
+                border-top: solid 1rpx #F9F9F9;
 
                 .name {
                     padding-left: 10rpx;
@@ -215,8 +206,6 @@
                 -webkit-line-clamp: 3;
                 overflow: hidden;
                 line-height: 1.5;
-                border-bottom: solid 1rpx  #F9F9F9;
-                padding-bottom: 20rpx;
 
                 span {
                     color: #fff;

pages/im/group/apply.vue

@@ -20,8 +20,14 @@
         joinGroupPre,
         joinGroup
     } from '@/apis/interfaces/im.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
+        mixins: [
+            imBase,
+            onGroupDismiss
+        ],
         data() {
             return {
                 targetId: '',

pages/im/group/chat.vue

@@ -2,10 +2,18 @@
     <view class="chat">
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
 
+        <view class="shade" @click="hidePop" v-show="showPop">
+            <view class="pop" :style="popStyle" :class="{'show':showPop}">
+                <view v-for="(item, index) in popButton" :key="index" @click="pickerMenu(item)">
+                    {{ item }}
+                </view>
+            </view>
+        </view>
+
         <view class="body">
             <view class="scroll">
                 <view class="cell" v-for="(message, index) in messages" :key="index">
-                    <show-message-cell :message="message" isGroup />
+                    <show-message-cell :message="message" isGroup @messageAction="messageAction" />
                 </view>
             </view>
         </view>
@@ -21,8 +29,16 @@
     import sentMessageBar from '../components/sentMessageBar'
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+    import imBase from '../mixins/imBase.js'
+    import messageActions from '../mixins/messageActions.js'
 
     export default {
+        mixins: [
+            imBase,
+            onGroupDismiss,
+            messageActions
+        ],
         components: {
             sentMessageBar,
             showMessageCell
@@ -49,21 +65,16 @@
                 }
             }
         },
+        onShow() {
+            this.initGroupInfo()
+        },
         onLoad(e) {
             this.targetId = e.targetId
-            // 获取群成员数量
-            getGroupBase(this.targetId).then(res => {
-                uni.setNavigationBarTitle({
-                    title: res.name + `(${res.members})`
-                })
-            })
             // 获取历史消息列表
             this.getMessageList()
-            // 监听收到本群的消息，追加消息
+            // 监听新消息
-            uni.$on('onReceiveMessage', (msg) => {
+            uni.$on('onReceiveMessage_' + this.targetId, (message) => {
-                if (msg.targetId == this.targetId) {
                 this.getNewMessage()
-                }
             })
             uni.$on('onReceiptRequest', (msg) => {
                 if (msg.targetId == this.targetId) {
@@ -88,20 +99,24 @@
             })
             // 清理聊天记录
             uni.$once('cleanGroupMessage', this.getMessageList)
-            uni.$on('onRecallMessage', (res) => {
+            uni.$on('onRecallMessage_' + this.targetId, (message) => {
-                if (res.targetId == this.targetId) {
                 this.messages = this.messages.map(item => {
-                        if (res.messageId == item.messageId) {
+                    if (message.messageId == item.messageId) {
-                            return res
+                        return message
                     } else {
                         return item
                     }
                 })
-                }
+            })
+            uni.$on('onRemoveMessage_' + this.targetId, (messageId) => {
+                this.messages = this.messages.filter(item => item.messageId != messageId)
             })
         },
         onUnload() {
-            uni.$off('onRecallMessage')
+            uni.$off('onRemoveMessage_' + this.targetId)
+            uni.$off('onReceiveMessage_' + this.targetId)
+            uni.$off('onUpdateProfile_' + this.targetId)
+            uni.$off('onRecallMessage_' + this.targetId)
             uni.$off('onReceiptRequest')
             uni.$off('onReceiptResponse')
         },
@@ -111,6 +126,14 @@
             })
         },
         methods: {
+            initGroupInfo() {
+                // 获取群信息，成员数量，设置标题
+                getGroupBase(this.targetId).then(res => {
+                    uni.setNavigationBarTitle({
+                        title: res.name + `(${res.members})`
+                    })
+                })
+            },
             onScroll(e) {
                 this.$refs.messageBar.onHidePopus()
             },
@@ -164,7 +187,7 @@
         },
         onHide() {
             // console.log(JSON.stringify(this.$refs))
-            this.$refs.voice.stopPlay()
+            // this.$refs.voice.stopPlay()
         }
     }
 </script>
@@ -197,4 +220,47 @@
             }
         }
     }
+
+    /* 遮罩 */
+    .shade {
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        z-index: 999;
+
+        .pop {
+            border-radius: 10rpx;
+            position: fixed;
+            z-index: 101;
+            width: 200rpx;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            text-align: left;
+            color: #333;
+            background-color: #fff;
+            box-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
+            line-height: 80rpx;
+            transition: transform 0.15s ease-in-out 0s;
+            user-select: none;
+            -webkit-touch-callout: none;
+            transform: scale(0, 0);
+
+            &.show {
+                transform: scale(1, 1);
+            }
+
+            &>view {
+                padding: 0 20rpx;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                user-select: none;
+                -webkit-touch-callout: none;
+
+                &:active {
+                    background-color: #f3f3f3;
+                }
+            }
+        }
+    }
 </style>

pages/im/group/index.vue

@@ -3,16 +3,15 @@
         <block v-if="groups.length > 0">
             <view class="title"> 群聊 </view>
             <view v-for="(item, index) in groups" :key="index" class="friend-flex" @click="toGroup(item.targetId)">
-                <u-avatar size="38" shape="square" :src="contact(item.targetId).portraitUrl" />
+                <u-avatar size="36" shape="square" :src="contact(item.targetId).portraitUrl" />
                 <view class="info">
-                    <view class="name">{{ item.name }}</view>
+                    <view class="name">{{ item.name }}  <span class="total">共{{ item.members }} 成员</span></view>
                 </view>
             </view>
             <view class="group-count"> {{ groups.length }}个群聊 </view>
         </block>
         <view class="no-lists" v-else>
-            <u-image class="cover" radius="4" width="400rpx" height="400rpx"
+            <u-image class="cover" radius="4" width="400rpx" height="400rpx" :src="require('@/static/imgs/no-friend.png')" :lazy-load="true" />
-                :src="require('@/static/imgs/no-friend.png')" :lazy-load="true" />
             <span>空空如也~</span>
         </view>
         <u-modal negativeTop="300" :show="createModal" title="创建群聊" showCancelButton @cancel="onHideModal"
@@ -49,13 +48,14 @@
         onNavigationBarButtonTap() {
             this.createModal = true
         },
-        onLoad() {
+        onShow() {
             this.initData()
             uni.$on('onGroupDismiss', this.initData)
         },
         methods: {
             initData() {
                 getMyGroups().then((res) => {
+                    console.log(res,'res...')
                     if (res.length > 0) {
                         this.bg = '#f9f9f9'
                     } else {
@@ -138,6 +138,11 @@
                 font-size: $title-size + 1;
                 color: #454545 !important;
             }
+            .total{
+                color: $text-gray-m;
+                font-size: $title-size-m - 5;
+                padding-left: 10rpx;
+            }
 
             .address {
                 color: $text-gray-m;

pages/im/group/info.vue

@@ -9,12 +9,11 @@
                 <view slot="label" class="announcement-label "> {{announcement}} </view>
             </u-cell>
             <u-cell :border="false" class="u-border-bottom" isLink title="二维码" @click="showGroupQrCode" />
-            <u-cell :border="false" class="u-border-bottom" v-if="group.can_makesure" isLink title="群聊邀请确认"
+            <u-cell :border="false" class="u-border-bottom" v-if="group.can_makesure" isLink title="群聊邀请确认" @click="showGroupsSure" />
-                @click="showGroupsSure" />
             <u-cell :border="false" class="u-border-bottom" title="聊天置顶">
                 <u-switch slot="value" size="20" v-model="isTop" activeColor="#34CE98" @change="setTop" />
             </u-cell>
-            <u-cell class="u-border-bottom" :border="false" title="免打扰">
+            <u-cell class="u-border-bottom" :border="false" title="消息免打扰">
                 <u-switch slot="value" size="20" v-model="status" activeColor="#34CE98" @change="setStatus" />
             </u-cell>
         </u-cell-group>
@@ -22,11 +21,10 @@
         <u-cell-group class="cells" v-if="group.is_admin" :border="false">
             <u-cell :border="false" class="u-border-bottom" isLink title="修改群聊名称" :value="groupName"
                 @click="onGroupName" />
-            <u-cell :border="false" class="u-border-bottom" isLink title="修改群头像" @click="onGroupAvatar">
+           <!-- <u-cell :border="false" class="u-border-bottom" isLink title="修改群头像" @click="onGroupAvatar">
                 <u-avatar slot="value" size="25" shape="square" :src="group.cover" />
-            </u-cell>
+            </u-cell> -->
-            <u-cell :border="false" class="u-border-bottom" isLink v-if="group.is_owner" title="准入方式" :value="joinType"
+            <u-cell :border="false" class="u-border-bottom" isLink v-if="group.is_owner" title="准入方式" :value="joinType" @click="onChangeJoinType" />
-                @click="onChangeJoinType" />
         </u-cell-group>
 
         <view class="cells actions" v-if="loaded">
@@ -35,21 +33,15 @@
             <view class="action u-border-bottom" v-else @click="onQuite">删除并退出</view>
         </view>
 
-        <u-modal negativeTop="300" :show="modalShow" title="修改群名称" showCancelButton @cancel="onHideModal"
+        <u-modal negativeTop="300" :show="modalShow" title="修改群名称" showCancelButton @cancel="onHideModal" @confirm="onChangeGroupName">
-            @confirm="onChangeGroupName">
+            <view class="slot-content"> <u--input placeholder="群名称" border="surround" focus v-model="groupName" maxlength="12" /> </view>
-            <view class="slot-content">
-                <u--input placeholder="群名称" border="surround" focus v-model="groupName" />
-            </view>
         </u-modal>
 
         <u-modal :show="qrCodeShow" :title="group.name" @confirm="qrCodeShow = false">
-            <view class="slot-content">
+            <view class="slot-content"> <uqrcode class="info-code-src" :size="198" :text="qrContent" /> </view>
-                <uqrcode class="info-code-src" :size="198" :text="qrContent" />
-            </view>
         </u-modal>
 
-        <u-action-sheet @select="doAction" :actions="joinTypeMap" cancelText="取消" :show="showActions"
+        <u-action-sheet @select="doAction" :actions="joinTypeMap" cancelText="取消" :show="showActions" @close="showActions=false" />
-            @close="showActions=false" />
     </view>
 </template>
 
@@ -65,11 +57,17 @@
     } from '@/apis/interfaces/uploading'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import groupUserList from '../components/groupUserList'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         components: {
             groupUserList
         },
+        mixins: [
+            imBase,
+            onGroupDismiss
+        ],
         data() {
             return {
                 targetId: '',
@@ -133,7 +131,6 @@
                         return item.key == res.join_type
                     })[0].name
                 }).catch(err => {
-                    console.log('getGroupInfo ERR', err);
                     uni.showToast({
                         icon: 'none',
                         title: '群不存在'

pages/im/group/invite.vue

@@ -8,8 +8,9 @@
             <u-index-list :index-list="indexs" inactiveColor="#666" activeColor="#34CE98">
                 <u-checkbox-group v-if="friends.length > 0" v-model="checkboxValue" placement="column">
                     <u-index-item v-for="(item, fkey) in friends" :key="fkey">
-                        <u-index-anchor :text="indexs[fkey]" v-if="indexs[fkey]" bgColor="#f9f9f9f" height="20" size="12"
+                        <u-index-anchor :text="indexs[fkey]" v-if="indexs[fkey]" bgColor="#f9f9f9f" height="20"
-                            color="#666" style="border:none !important;padding: 10rpx 30rpx;background-color: #f9f9f9 !important;" />
+                            size="12" color="#666"
+                            style="border:none !important;padding: 10rpx 30rpx;background-color: #f9f9f9 !important;" />
                         <view v-for="(friendItem, index) in item" :key="index" class="friend-flex"
                             @click="addContact(friendItem.targetId)">
                             <u-checkbox :name="friendItem.targetId" shape="circle" activeColor="#34ce98"
@@ -25,7 +26,8 @@
                 </u-checkbox-group>
             </u-index-list>
             <view class="bottom">
-                <span class="onInvite" @click="onInvite">完成<span>{{`(${checkboxValue.length})` || ''}}</span></span>
+                <span class="onInvite" v-if="canInvite"> 添加中<span>{{`(${checkboxValue.length})` || ''}}</span></span>
+                <span class="onInvite" v-else @click="onInvite">完成<span>{{`(${checkboxValue.length})` || ''}}</span></span>
             </view>
         </block>
         <view class="no-lists" v-else>
@@ -44,10 +46,15 @@
         getGroupUsers
     } from '@/apis/interfaces/im';
     import utils from '@/utils/index.js'
-
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase,
+            onGroupDismiss
+        ],
         data() {
             return {
                 searchTxt: '',
@@ -57,16 +64,10 @@
                 friends: [],
                 orignalFriends: [],
                 checkboxValue: [],
-                selectValue: []
+                selectValue: [],
+                canInvite:false
             };
         },
-        computed: {
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
-            }
-        },
         onLoad(e) {
             this.targetId = e.targetId
             this.getFriendList()
@@ -125,6 +126,7 @@
             onInvite() {
                 console.log(this.checkboxValue, 'userIds.....')
                 console.log(this.selectValue, 'userIds.....')
+                this.canInvite = true
                 let userIds = []
                 this.checkboxValue.filter(item => {
                     if (!utils.inArray(item, this.selectValue)) {
@@ -138,8 +140,10 @@
                         animationType: 'pop-out',
                         animationDuration: 200
                     });
+                    this.canInvite = false
                     uni.$emit('groupInvitedUser')
                 }).catch(err => {
+                    this.canInvite = false
                     uni.showToast({
                         icon: 'none',
                         title: err.message

pages/im/group/reviewed.vue

@@ -22,7 +22,7 @@
         <view class="no-lists" v-else>
             <u-image class="cover" radius="4" width="400rpx" height="400rpx"
                 :src="require('@/static/imgs/no-friend.png')" :lazy-load="true" />
-            <span> 暂无群聊申请数据~</span>
+            <span>暂无群聊申请数据</span>
         </view>
     </view>
 </template>
@@ -34,9 +34,14 @@
     } from "@/apis/interfaces/im.js"
     import im from '@/utils/im/message.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
-
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
+        mixins: [
+            imBase,
+            onGroupDismiss
+        ],
         data() {
             return {
                 targetId: '',
@@ -79,7 +84,6 @@
                             uni.$emit('groupInvitedUser')
                         }
                     })
-
                 }).catch(err => {
                     // uni.showToast({
                     //     title: err.message,
@@ -153,6 +157,7 @@
         }
 
     }
+
     .no-lists {
         padding-top: $padding * 5;
         display: flex;

pages/im/group/users.vue

@@ -4,7 +4,12 @@
 
 <script>
     import groupUserList from '../components/groupUserList'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
+
     export default {
+        mixins: [
+            onGroupDismiss
+        ],
         components: {
             groupUserList
         },

pages/im/index.vue

@@ -46,7 +46,8 @@
             return {
                 conversations: [], // 会话列表
                 connection: 0,
-                hasNewFriends: 0
+                hasNewFriends: 0,
+                perPage: 200
             }
         },
         components: {
@@ -54,27 +55,35 @@
             connectionStatus
         },
         onLoad() {
-            // 好友申请数量
-            this.checkNewFriendPending()
             // 监听新的好友申请
-            uni.$on('onContactNotification', () => {
+            uni.$on('onNewContactConversation', () => {
+                console.log('更新好友申请数量');
+                // 更新好友申请数量
                 this.checkNewFriendPending()
             })
         },
         onShow() {
+            // 好友申请数量
+            this.checkNewFriendPending()
+
             if (this.$store.state.token !== '') {
                 this.getConversationList()
             }
-            uni.$on('onConnectionStatusChange', (status) => {
-                this.connection = status
-            })
             // 监听新消息
             uni.$on('onReceiveMessage', (msg) => {
                 this.getConversationList()
             })
+            // 监听网络状态变化
+            uni.$on('onConnectionStatusChange', (status) => {
+                this.connection = status
+                if (status == 0) {
+                    this.getConversationList()
+                }
+            })
         },
         onHide() {
             uni.$off('onReceiveMessage')
+            uni.$off('onConnectionStatusChange')
         },
         methods: {
             checkNewFriendPending() {
@@ -91,15 +100,14 @@
                 }
                 return true
             },
-            // 获取私聊的会话列表
+            // 获取会话列表，最新的一千条
             getConversationList() {
-                const count = 1000
+                RongIMLib.getConversationList([1, 3], this.perPage, 0, ({
-                const timestamp = 0
-                RongIMLib.getConversationList([1, 3], count, timestamp, ({
                     code,
                     conversations
                 }) => {
                     if (code === 0) {
+                        console.log(conversations,',,,,,')
                         this.conversations = conversations
                     }
                 })

pages/im/mixins/imBase.js

@@ -0,0 +1,22 @@
+import utils from '@/utils/index.js'
+
+export default {
+    computed: {
+        contact() {
+            return function(targetId) {
+                return this.$store.getters.contactInfo(targetId)
+            }
+        },
+        avatarSize() {
+            return utils.rpx2px(84)
+        },
+        sender() {
+            return this.$store.getters.sender
+        }
+    },
+    methods: {
+        rpx2px(size) {
+            return utils.rpx2px(size)
+        }
+    }
+}

pages/im/mixins/messageActions.js

@@ -0,0 +1,133 @@
+import * as IMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+
+export default {
+    data() {
+        return {
+            winSize: {},
+            showPop: false,
+            /* 弹窗按钮列表 */
+            popButton: ['复制', '删除', '撤回'],
+            /* 弹窗定位样式 */
+            popStyle: "",
+            pickedItem: {}
+        }
+    },
+    onLoad() {
+        uni.getSystemInfo({
+            success: (e) => {
+                this.winSize = {
+                    width: e.windowWidth,
+                    height: e.windowHeight
+                }
+            }
+        })
+    },
+    methods: {
+        // 隐藏功能菜单
+        hidePop() {
+            this.showPop = false
+            this.pickedItem = {}
+            setTimeout(() => {
+                this.showShade = false
+            }, 250)
+        },
+        // 点击会话功能菜单
+        pickerMenu(e) {
+            const msg = this.pickedItem
+            console.log(msg);
+            switch (e) {
+                case '复制':
+                    uni.setClipboardData({
+                        data: msg.content.content
+                    })
+                    uni.showToast({
+                        icon: 'none',
+                        title: '复制成功'
+                    })
+                    break;
+                case '删除':
+                    IMLib.deleteMessagesByIds([msg.messageId], ({
+                        code
+                    }) => {
+                        if (code === 0) {
+                            uni.$emit('onRemoveMessage_' + msg.targetId, msg.messageId)
+                            uni.showToast({
+                                title: '消息删除成功',
+                                icon: 'none',
+                            })
+                        }
+                    })
+                    break;
+                case '撤回':
+                    const pushContent = this.$store.getters.sender.name + '撤回了一条消息'
+                    IMLib.recallMessage(msg.messageId, pushContent,
+                        ({
+                            code,
+                            message
+                        }) => {
+                            if (code === 0) {
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: '消息撤回成功'
+                                })
+                                msg.objectName = 'RC:RcNtf'
+                                uni.$emit('onRecallMessage_' + msg.targetId, msg)
+                            } else {
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: '撤回失败' + code
+                                })
+                            }
+                        }
+                    )
+                    break;
+            }
+            this.hidePop()
+        },
+        messageAction(e) {
+            let [touches, style, item] = [e.event.touches[0], "", e.message]
+
+            if (touches.clientY > (this.winSize.height / 2)) {
+                style = `bottom:${this.winSize.height-touches.clientY}px;`
+            } else {
+                style = `top:${touches.clientY}px;`
+            }
+
+            if (touches.clientX > (this.winSize.width / 2)) {
+                style += `right:${this.winSize.width-touches.clientX}px`
+            } else {
+                style += `left:${touches.clientX}px`
+            }
+
+            if (item.messageDirection == 2) {
+                if (item.objectName == 'RC:TxtMsg') {
+                    this.popButton = ['复制', '删除']
+                } else {
+                    this.popButton = ['删除']
+                }
+            } else {
+                if ((new Date()).getTime() - item.sentTime > 120 * 1000) {
+                    if (item.objectName == 'RC:TxtMsg') {
+                        this.popButton = ['复制', '删除']
+                    } else {
+                        this.popButton = ['删除']
+                    }
+                } else {
+                    if (item.objectName == 'RC:TxtMsg') {
+                        this.popButton = ['复制', '撤回']
+                    } else {
+                        this.popButton = ['删除']
+                    }
+                }
+            }
+
+            this.popStyle = style
+            this.pickedItem = item
+            this.$nextTick(() => {
+                setTimeout(() => {
+                    this.showPop = true;
+                }, 10)
+            })
+        },
+    }
+}

pages/im/mixins/onGroupDismiss.js

@@ -0,0 +1,34 @@
+// 监听群解散的消息，直接跳转到会话列表页面
+export default {
+    data() {
+        return {
+            currentTargetId: ''
+        }
+    },
+    onLoad(e) {
+        this.currentTargetId = e.targetId
+
+        uni.$once('onGroupDismiss_' + e.targetId, () => {
+            uni.showToast({
+                icon: 'none',
+                title: '当前群已解散'
+            })
+            uni.switchTab({
+                url: '/pages/im/index'
+            })
+        })
+        uni.$once('onGroupRemoveYou_' + e.targetId, () => {
+            uni.showToast({
+                icon: 'none',
+                title: '您已被移出群聊'
+            })
+            uni.switchTab({
+                url: '/pages/im/index'
+            })
+        })
+    },
+    onUnload() {
+        uni.$off('onGroupDismiss_' + this.currentTargetId)
+        uni.$off('onGroupRemoveYou_' + this.currentTargetId)
+    }
+}

pages/im/private/call.nvue

@@ -150,7 +150,7 @@
                 } else {
                     IMLib.insertIncomingMessage(1, targetId, targetId, sentStatus, messageContent, sentTime)
                 }
-                uni.$emit('onReceiveMessage', {
+                uni.$emit('onReceiveMessage_' + this.targetId, {
                     targetId: this.targetId
                 })
             },

pages/im/private/chat.vue

@@ -1,11 +1,18 @@
 <template>
     <view class="chat">
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
+        <view class="shade" @click="hidePop" v-show="showPop">
+            <view class="pop" :style="popStyle" :class="{'show':showPop}">
+                <view v-for="(item, index) in popButton" :key="index" @click="pickerMenu(item)">
+                    {{ item }}
+                </view>
+            </view>
+        </view>
         <!-- chat -->
         <view class="body">
             <view class="scroll">
                 <view class="cell" v-for="(message, index) in messages" :key="index">
-                    <show-message-cell :message="message" />
+                    <show-message-cell :message="message" @messageAction="messageAction" />
                 </view>
             </view>
         </view>
@@ -18,8 +25,14 @@
     import sentMessageBar from '../components/sentMessageBar'
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
+    import imBase from '../mixins/imBase.js'
+    import messageActions from '../mixins/messageActions.js'
     
     export default {
+        mixins: [
+            imBase,
+            messageActions
+        ],
         components: {
             sentMessageBar,
             showMessageCell
@@ -45,11 +58,6 @@
                         sentTime: 0
                     }
                 }
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
             }
         },
         onLoad(e) {
@@ -60,6 +68,10 @@
             })
             // 获取消息列表
             this.getMessageList()
+            // 监听新消息
+            uni.$on('onReceiveMessage_' + this.targetId, (message) => {
+                this.getNewMessage()
+            })
             // 监听消息已读状态
             uni.$on('onReadReceiptReceived', (data) => {
                 if (data.targetId == this.targetId) {
@@ -72,25 +84,29 @@
                     })
                 }
             })
-            // 监听收到新消息，判断是否是当前会话，更新会话内容
+            uni.$on('onRecallMessage_' + this.targetId, (message) => {
-            uni.$on('onReceiveMessage', (msg) => {
-                if (msg.targetId == this.targetId) {
-                    this.getNewMessage()
-                }
-            })
-            uni.$on('onRecallMessage', (res) => {
-                if (res.targetId == this.targetId) {
                 this.messages = this.messages.map(item => {
-                        if (res.messageId == item.messageId) {
+                    if (message.messageId == item.messageId) {
-                            return res
+                        return message
                     } else {
                         return item
                     }
                 })
-                }
+            })
+            uni.$once('onUserDelete_' + this.targetId, () => {
+                uni.showToast({
+                    icon: 'none',
+                    title: '好友关系已解除'
+                })
+                uni.switchTab({
+                    url: '/pages/im/index'
+                })
             })
         },
         onUnload() {
+            uni.$off('onUserDelete_' + this.targetId)
+            uni.$off('onReceiveMessage_' + this.targetId)
+            uni.$off('onRecallMessage_' + this.targetId)
             uni.$off('onRecallMessage')
             uni.$off('onReadReceiptReceived')
         },
@@ -195,4 +211,47 @@
             }
         }
     }
+
+    /* 遮罩 */
+    .shade {
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        z-index: 999;
+
+        .pop {
+            border-radius: 10rpx;
+            position: fixed;
+            z-index: 101;
+            width: 200rpx;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            text-align: left;
+            color: #333;
+            background-color: #fff;
+            box-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
+            line-height: 80rpx;
+            transition: transform 0.15s ease-in-out 0s;
+            user-select: none;
+            -webkit-touch-callout: none;
+            transform: scale(0, 0);
+
+            &.show {
+                transform: scale(1, 1);
+            }
+
+            &>view {
+                padding: 0 20rpx;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                user-select: none;
+                -webkit-touch-callout: none;
+
+                &:active {
+                    background-color: #f3f3f3;
+                }
+            }
+        }
+    }
 </style>

static/im/emoji.js

@@ -0,0 +1,795 @@
+var EmojiFactory = {
+	"u1F603": {
+		"en": "Smiley Face",
+		"zh": "绗戣劯",
+		"tag": "\uD83D\uDE03",
+		"position": "-75px 0px"
+	},
+	"u1F600": {
+		"en": "Grinning Face",
+		"zh": "绗戝樆鍢<E6A886>",
+		"tag": "\uD83D\uDE00",
+		"position": "0px 0px"
+	},
+	"u1F60A": {
+		"en": "Smiley",
+		"zh": "寰瑧",
+		"tag": "\uD83D\uDE0A",
+		"position": "-1725px 0px"
+	},
+	"u263A": {
+		"en": "Cute",
+		"zh": "钀岃悓鍝<E68293>",
+		"tag": "\u263A",
+		"position": "-2950px 0px"
+	},
+	"u1F609": {
+		"en": "Winking Face",
+		"zh": "鐪ㄧ溂",
+		"tag": "\uD83D\uDE09",
+		"position": "-200px 0px"
+	},
+	"u1F60D": {
+		"en": "Heart Eyes",
+		"zh": "鑹茶糠杩<E7B3A0>",
+		"tag": "\uD83D\uDE0D",
+		"position": "-1800px 0px"
+	},
+	"u1F618": {
+		"en": "Blowing Kiss",
+		"zh": "椋炲惢",
+		"tag": "\uD83D\uDE18",
+		"position": "-375px 0px"
+	},
+	"u1F61A": {
+		"en": "Kiss Face",
+		"zh": "涔堜箞鍝<E7AE9E>",
+		"tag": "\uD83D\uDE1A",
+		"position": "-1875px 0px"
+	},
+	"u1F61C": {
+		"en": "Crazy Face",
+		"zh": "璋冪毊",
+		"tag": "\uD83D\uDE1C",
+		"position": "-1900px 0px"
+	},
+	"u1F61D": {
+		"en": "Tongue Out",
+		"zh": "鍚愯垖澶<E59E96>",
+		"tag": "\uD83D\uDE1D",
+		"position": "-1925px 0px"
+	},
+	"u1F633": {
+		"en": "Flushed Face",
+		"zh": "鑴哥孩",
+		"tag": "\uD83D\uDE33",
+		"position": "-625px 0px"
+	},
+	"u1F601": {
+		"en": "Grinning With Smiling",
+		"zh": "闇查娇鑰岀瑧",
+		"tag": "\uD83D\uDE01",
+		"position": "-25px 0px"
+	},
+	"u1F614": {
+		"en": "Pensive",
+		"zh": "娌夋€<E5A48B>",
+		"tag": "\uD83D\uDE14",
+		"position": "-300px 0px"
+	},
+	"u1F60C": {
+		"en": "Pleased",
+		"zh": "婊℃剰",
+		"tag": "\uD83D\uDE0C",
+		"position": "-1775px 0px"
+	},
+	"u1F612": {
+		"en": "Dissatisfied",
+		"zh": "涓嶆弧",
+		"tag": "\uD83D\uDE12",
+		"position": "-250px 0px"
+	},
+	"u1F61F": {
+		"en": "Worried Face",
+		"zh": "鑻︾摐鑴<E69190>",
+		"tag": "\uD83D\uDE1F",
+		"position": "-1975px 0px"
+	},
+	"u1F61E": {
+		"en": "Disappointed Face",
+		"zh": "澶辨湜",
+		"tag": "\uD83D\uDE1E",
+		"position": "-1950px 0px"
+	},
+	"u1F623": {
+		"en": "Helpless Face",
+		"zh": "鏃犲姪",
+		"tag": "\uD83D\uDE23",
+		"position": "-450px 0px"
+	},
+	"u1F62D": {
+		"en": "Crying",
+		"zh": "浼ゅ績",
+		"tag": "\uD83D\uDE22",
+		"position": "-425px 0px"
+	},
+	"u1F602": {
+		"en": "Laughing Tears",
+		"zh": "鍠滄瀬鑰屾常",
+		"tag": "\uD83D\uDE02",
+		"position": "-50px 0px"
+	},
+	"u1F622": {
+		"en": "Sobbing",
+		"zh": "鍝常",
+		"tag": "\uD83D\uDE2D",
+		"position": "-2075px 0px"
+	},
+	"u1F62A": {
+		"en": "Sleepy Face",
+		"zh": "鍥<>",
+		"tag": "\uD83D\uDE2A",
+		"position": "-2000px 0px"
+	},
+	"u1F630": {
+		"en": "Cold Sweat",
+		"zh": "鍐锋睏",
+		"tag": "\uD83D\uDE30",
+		"position": "-550px 0px"
+	},
+	"u1F605": {
+		"en": "Happy Sweat",
+		"zh": "灏村艾",
+		"tag": "\uD83D\uDE05",
+		"position": "-100px 0px"
+	},
+	"u1F613": {
+		"en": "Sweat",
+		"zh": "姹<>",
+		"tag": "\uD83D\uDE13",
+		"position": "-275px 0px"
+	},
+	"u1F62B": {
+		"en": "Tired Face",
+		"zh": "鎶撶媯",
+		"tag": "\uD83D\uDE2B",
+		"position": "-2025px 0px"
+	},
+	"u1F629": {
+		"en": "Weary Face",
+		"zh": "鐤叉儷",
+		"tag": "\uD83D\uDE29",
+		"position": "-525px 0px"
+	},
+	"u1F628": {
+		"en": "Fearful Face",
+		"zh": "鍙€<EE889B>",
+		"tag": "\uD83D\uDE28",
+		"position": "-500px 0px"
+	},
+	"u1F631": {
+		"en": "Scream",
+		"zh": "灏栧彨",
+		"tag": "\uD83D\uDE31",
+		"position": "-575px 0px"
+	},
+	"u1F621": {
+		"en": "Angry Face",
+		"zh": "鐢熸皵",
+		"tag": "\uD83D\uDE21",
+		"position": "-400px 0px"
+	},
+	"u1F624": {
+		"en": "Mad Face",
+		"zh": "鎬掓皵鍐插啿",
+		"tag": "\uD83D\uDE24",
+		"position": "-475px 0px"
+	},
+	"u1F616": {
+		"en": "Confounded Face",
+		"zh": "钂欑緸",
+		"tag": "\uD83D\uDE16",
+		"position": "-350px 0px"
+	},
+	"u1F606": {
+		"en": "Big Grin",
+		"zh": "澶х瑧",
+		"tag": "\uD83D\uDE06",
+		"position": "-125px 0px"
+	},
+	"u1F60B": {
+		"en": "Hungry",
+		"zh": "棣<>",
+		"tag": "\uD83D\uDE0B",
+		"position": "-1750px 0px"
+	},
+	"u1F637": {
+		"en": "Mask Face",
+		"zh": "鍙ｇ僵",
+		"tag": "\uD83D\uDE37",
+		"position": "-725px 0px"
+	},
+	"u1F60E": {
+		"en": "Sunglasses",
+		"zh": "澧ㄩ暅",
+		"tag": "\uD83D\uDE0E",
+		"position": "-1825px 0px"
+	},
+	"u1F634": {
+		"en": "Sleeping",
+		"zh": "鐫＄湢",
+		"tag": "\uD83D\uDE34",
+		"position": "-650px 0px"
+	},
+	"u1F635": {
+		"en": "Dizzy Face",
+		"zh": "澶存檿鐪艰姳",
+		"tag": "\uD83D\uDE35",
+		"position": "-675px 0px"
+	},
+	"u1F632": {
+		"en": "Shocked Face",
+		"zh": "闇囨儕",
+		"tag": "\uD83D\uDE32",
+		"position": "-600px 0px"
+	},
+	"u1F608": {
+		"en": "Purple Devil",
+		"zh": "灏忔伓榄<E4BC93>",
+		"tag": "\uD83D\uDE08",
+		"position": "-175px 0px"
+	},
+	"u1F47F": {
+		"en": "Devil",
+		"zh": "鎭堕瓟",
+		"tag": "\uD83D\uDC7F",
+		"position": "-1600px 0px"
+	},
+	"u1F62F": {
+		"en": "Surprised Face",
+		"zh": "鎯婂憜",
+		"tag": "\uD83D\uDE2F",
+		"position": "-2100px 0px"
+	},
+	"u1F62C": {
+		"en": "Grimacing Face",
+		"zh": "鎵鑴<EE8397>",
+		"tag": "\uD83D\uDE2C",
+		"position": "-2050px 0px"
+	},
+	"u1F615": {
+		"en": "Confused",
+		"zh": "鍥版儜",
+		"tag": "\uD83D\uDE15",
+		"position": "-325px 0px"
+	},
+	"u1F636": {
+		"en": "Mouthless",
+		"zh": "鏃犲彛",
+		"tag": "\uD83D\uDE36",
+		"position": "-700px 0px"
+	},
+	"u1F607": {
+		"en": "Halo",
+		"zh": "澶╀娇鍏夌幆",
+		"tag": "\uD83D\uDE07",
+		"position": "-150px 0px"
+	},
+	"u1F60F": {
+		"en": "Smirking Face",
+		"zh": "鍌荤瑧",
+		"tag": "\uD83D\uDE0F",
+		"position": "-1850px 0px"
+	},
+	"u1F611": {
+		"en": "Expressionless Face",
+		"zh": "闈㈡棤琛ㄦ儏",
+		"tag": "\uD83D\uDE11",
+		"position": "-225px 0px"
+	},
+	"u1F648": {
+		"en": "See No Monkey",
+		"zh": "涓嶇湅",
+		"tag": "\uD83D\uDE48",
+		"position": "-2675px 0px"
+	},
+	"u1F649": {
+		"en": "Hear No Monkey",
+		"zh": "涓嶅惉",
+		"tag": "\uD83D\uDE49",
+		"position": "-2700px 0px"
+	},
+	"u1F64A": {
+		"en": "No Speaking",
+		"zh": "闂槾",
+		"tag": "\uD83D\uDE4A",
+		"position": "-2125px 0px"
+	},
+	"u1F47D": {
+		"en": "Alien",
+		"zh": "澶栨槦浜<E6A7A6>",
+		"tag": "\uD83D\uDC7D",
+		"position": "-1575px 0px"
+	},
+	"u1F4A9": {
+		"en": "Pile Of Poo",
+		"zh": "渚夸究",
+		"tag": "\uD83D\uDCA9",
+		"position": "-1025px 0px"
+	},
+	"u1F494": {
+		"en": "Broken Heart",
+		"zh": "蹇冪",
+		"tag": "\uD83D\uDC94",
+		"position": "-2600px 0px"
+	},
+	"u1F525": {
+		"en": "Fire",
+		"zh": "鐏<>",
+		"tag": "\uD83D\uDD25",
+		"position": "-2625px 0px"
+	},
+	"u1F4A2": {
+		"en": "Anger",
+		"zh": "鎰ゆ€<E38286>",
+		"tag": "\uD83D\uDCA2",
+		"position": "-950px 0px"
+	},
+	"u1F4A4": {
+		"en": "Zzz",
+		"zh": "ZZZ",
+		"tag": "\uD83D\uDCA4",
+		"position": "-1000px 0px"
+	},
+	"u1F6AB": {
+		"en": "Prohibited",
+		"zh": "绂佹",
+		"tag": "\uD83D\uDEAB",
+		"position": "-1175px 0px"
+	},
+	"u2B50": {
+		"en": "Star",
+		"zh": "鏄熸槦",
+		"tag": "\u2B50",
+		"position": "-2750px 0px"
+	},
+	"u26A1": {
+		"en": "Lightning Bolt",
+		"zh": "闂數",
+		"tag": "\u26A1",
+		"position": "-2825px 0px"
+	},
+	"u1F319": {
+		"en": "Drescent Moon",
+		"zh": "寮湀",
+		"tag": "\uD83C\uDF19",
+		"position": "-2175px 0px"
+	},
+	"u2600": {
+		"en": "Sunny",
+		"zh": "鏅存湕",
+		"tag": "\u2600",
+		"position": "-3075px 0px"
+	},
+	"u26C5": {
+		"en": "Cloudy",
+		"zh": "澶氫簯",
+		"tag": "\u26C5",
+		"position": "-2900px 0px"
+	},
+	"u2601": {
+		"en": "Cloud",
+		"zh": "浜戝僵",
+		"tag": "\u2601",
+		"position": "-3100px 0px"
+	},
+	"u2744": {
+		"en": "Snowflake",
+		"zh": "闆姳",
+		"tag": "\u2744",
+		"position": "-3175px 0px"
+	},
+	"u2614": {
+		"en": "Umbrella",
+		"zh": "闆ㄤ紴",
+		"tag": "\u2614",
+		"position": "-3125px 0px"
+	},
+	"u26C4": {
+		"en": "Snowman",
+		"zh": "闆汉",
+		"tag": "\u26C4",
+		"position": "-2875px 0px"
+	},
+	"u1F44D": {
+		"en": "Thumbs Up",
+		"zh": "璧<>",
+		"tag": "\uD83D\uDC4D",
+		"position": "-1400px 0px"
+	},
+	"u1F44E": {
+		"en": "Thumbs Down",
+		"zh": "鍠濆€掑僵",
+		"tag": "\uD83D\uDC4E",
+		"position": "-1425px 0px"
+	},
+	"u1F91D": {
+		"en": "Handshake",
+		"zh": "鎻℃墜",
+		"tag": "\uD83E\uDD1D",
+		"position": "-3200px 0px"
+	},
+	"u1F44C": {
+		"en": "Ok Hand",
+		"zh": "娌￠棶棰<E6A3B6>",
+		"tag": "\uD83D\uDC4C",
+		"position": "-1375px 0px"
+	},
+	"u1F44A": {
+		"en": "Raised Fist",
+		"zh": "涓捐捣鎷冲ご",
+		"tag": "\u270A",
+		"position": "-2975px 0px"
+	},
+	"u270A": {
+		"en": "Oncoming Fist",
+		"zh": "鍑绘嫵",
+		"tag": "\uD83D\uDC4A",
+		"position": "-1350px 0px"
+	},
+	"u270C": {
+		"en": "Victory Hand",
+		"zh": "鑰<>",
+		"tag": "\u270C",
+		"position": "-3025px 0px"
+	},
+	"u270B": {
+		"en": "Raised Hand",
+		"zh": "涓炬墜",
+		"tag": "\u270B",
+		"position": "-3000px 0px"
+	},
+	"u1F64F": {
+		"en": "Folded Hands",
+		"zh": "绁堢シ",
+		"tag": "\uD83D\uDE4F",
+		"position": "-2150px 0px"
+	},
+	"u261D": {
+		"en": "Pointing Up",
+		"zh": "绗竴",
+		"tag": "\u261D",
+		"position": "-2925px 0px"
+	},
+	"u1F44F": {
+		"en": "Clapping Hands",
+		"zh": "榧撴帉",
+		"tag": "\uD83D\uDC4F",
+		"position": "-1450px 0px"
+	},
+	"u1F4AA": {
+		"en": "Flexed Biceps",
+		"zh": "鑲岃倝",
+		"tag": "\uD83D\uDCAA",
+		"position": "-1050px 0px"
+	},
+	"u1F46A": {
+		"en": "Family",
+		"zh": "瀹跺涵",
+		"tag": "\uD83D\uDC6A",
+		"position": "-1475px 0px"
+	},
+	"u1F46B": {
+		"en": "Couple",
+		"zh": "鎯呬荆",
+		"tag": "\uD83D\uDC6B",
+		"position": "-1500px 0px"
+	},
+	"u1F47C": {
+		"en": "Baby Angel",
+		"zh": "瀹濊礉澶╀娇",
+		"tag": "\uD83D\uDC7C",
+		"position": "-1550px 0px"
+	},
+	"u1F434": {
+		"en": "Horse",
+		"zh": "椹<>",
+		"tag": "\uD83D\uDC34",
+		"position": "-2475px 0px"
+	},
+	"u1F436": {
+		"en": "Dog",
+		"zh": "鐙<>",
+		"tag": "\uD83D\uDC36",
+		"position": "-2500px 0px"
+	},
+	"u1F437": {
+		"en": "Pig",
+		"zh": "鐚<>",
+		"tag": "\uD83D\uDC37",
+		"position": "-2525px 0px"
+	},
+	"u1F47B": {
+		"en": "Ghost",
+		"zh": "楝<>",
+		"tag": "\uD83D\uDC7B",
+		"position": "-1525px 0px"
+	},
+	"u1F339": {
+		"en": "Rose",
+		"zh": "鐜懓",
+		"tag": "\uD83C\uDF39",
+		"position": "-2225px 0px"
+	},
+	"u1F33B": {
+		"en": "Sunflower",
+		"zh": "鍚戞棩钁<E6A3A9>",
+		"tag": "\uD83C\uDF3B",
+		"position": "-1250px 0px"
+	},
+	"u1F332": {
+		"en": "Pine Tree",
+		"zh": "鏉炬爲",
+		"tag": "\uD83C\uDF32",
+		"position": "-2200px 0px"
+	},
+	"u1F384": {
+		"en": "Christmas Tree",
+		"zh": "鍦ｈ癁鏍<E79981>",
+		"tag": "\uD83C\uDF84",
+		"position": "-2400px 0px"
+	},
+	"u1F381": {
+		"en": "Wrapped Gift",
+		"zh": "绀肩墿",
+		"tag": "\uD83C\uDF81",
+		"position": "-2350px 0px"
+	},
+	"u1F389": {
+		"en": "Party Popper",
+		"zh": "鑱氫細绀艰姳",
+		"tag": "\uD83C\uDF89",
+		"position": "-2425px 0px"
+	},
+	"u1F4B0": {
+		"en": "Money Bag",
+		"zh": "閽辫",
+		"tag": "\uD83D\uDCB0",
+		"position": "-1075px 0px"
+	},
+	"u1F382": {
+		"en": "Birthday Cake",
+		"zh": "鐢熸棩铔嬬硶",
+		"tag": "\uD83C\uDF82",
+		"position": "-2375px 0px"
+	},
+	"u1F356": {
+		"en": "Barbecue",
+		"zh": "BBQ",
+		"tag": "\uD83C\uDF56",
+		"position": "-2275px 0px"
+	},
+	"u1F35A": {
+		"en": "Cooked Rice",
+		"zh": "绫抽キ",
+		"tag": "\uD83C\uDF5A",
+		"position": "-1275px 0px"
+	},
+	"u1F366": {
+		"en": "Ice Cream",
+		"zh": "鍐版穱娣<E7A9B1>",
+		"tag": "\uD83C\uDF66",
+		"position": "-2300px 0px"
+	},
+	"u1F36B": {
+		"en": "Chocolate Bar",
+		"zh": "宸у厠鍔<E58EA0>",
+		"tag": "\uD83C\uDF6B",
+		"position": "-1300px 0px"
+	},
+	"u1F349": {
+		"en": "Watermelon",
+		"zh": "瑗跨摐",
+		"tag": "\uD83C\uDF49",
+		"position": "-2250px 0px"
+	},
+	"u1F377": {
+		"en": "Wine Glass",
+		"zh": "绾㈤厭",
+		"tag": "\uD83C\uDF77",
+		"position": "-2325px 0px"
+	},
+	"u1F37B": {
+		"en": "Cheers",
+		"zh": "骞叉澂",
+		"tag": "\uD83C\uDF7B",
+		"position": "-1325px 0px"
+	},
+	"u2615": {
+		"en": "Coffee",
+		"zh": "鍜栧暋",
+		"tag": "\u2615",
+		"position": "-3150px 0px"
+	},
+	"u1F3C0": {
+		"en": "Basketball",
+		"zh": "绡悆",
+		"tag": "\uD83C\uDFC0",
+		"position": "-825px 0px"
+	},
+	"u26BD": {
+		"en": "Soccer Ball",
+		"zh": "瓒崇悆",
+		"tag": "\u26BD",
+		"position": "-2850px 0px"
+	},
+	"u1F3C2": {
+		"en": "Snowboarder",
+		"zh": "鍗曟澘婊戦洩",
+		"tag": "\uD83C\uDFC2",
+		"position": "-850px 0px"
+	},
+	"u1F3A4": {
+		"en": "Microphone",
+		"zh": "楹﹀厠椋<E58EA0>",
+		"tag": "\uD83C\uDFA4",
+		"position": "-750px 0px"
+	},
+	"u1F3B5": {
+		"en": "Musical Note",
+		"zh": "闊充箰",
+		"tag": "\uD83C\uDFB5",
+		"position": "-800px 0px"
+	},
+	"u1F3B2": {
+		"en": "Game Die",
+		"zh": "楠板瓙",
+		"tag": "\uD83C\uDFB2",
+		"position": "-775px 0px"
+	},
+	"u1F004": {
+		"en": "Mahjong Red Dragon",
+		"zh": "楹诲皢",
+		"tag": "\uD83C\uDC04",
+		"position": "-900px 0px"
+	},
+	"u1F451": {
+		"en": "Crown",
+		"zh": "鐜嬪啝",
+		"tag": "\uD83D\uDC51",
+		"position": "-2550px 0px"
+	},
+	"u1F484": {
+		"en": "Lipstick",
+		"zh": "鍙ｇ孩",
+		"tag": "\uD83D\uDC84",
+		"position": "-2575px 0px"
+	},
+	"u1F48B": {
+		"en": "Kiss",
+		"zh": "鍚<>",
+		"tag": "\uD83D\uDC8B",
+		"position": "-1650px 0px"
+	},
+	"u1F48D": {
+		"en": "Ring",
+		"zh": "鎴掓寚",
+		"tag": "\uD83D\uDC8D",
+		"position": "-1675px 0px"
+	},
+	"u1F4DA": {
+		"en": "Books",
+		"zh": "涔︾睄",
+		"tag": "\uD83D\uDCDA",
+		"position": "-1100px 0px"
+	},
+	"u1F393": {
+		"en": "Graduation Cap",
+		"zh": "姣曚笟甯<E7AC9F>",
+		"tag": "\uD83C\uDF93",
+		"position": "-2450px 0px"
+	},
+	"u270F": {
+		"en": "Pencil",
+		"zh": "閾呯瑪",
+		"tag": "\u270F",
+		"position": "-3050px 0px"
+	},
+	"u1F3E1": {
+		"en": "House With Garden",
+		"zh": "鎴垮瓙",
+		"tag": "\uD83C\uDFE1",
+		"position": "-875px 0px"
+	},
+	"u1F6BF": {
+		"en": "Shower",
+		"zh": "娣嬫荡",
+		"tag": "\uD83D\uDEBF",
+		"position": "-1200px 0px"
+	},
+	"u1F4A1": {
+		"en": "Light Bulb",
+		"zh": "鐏场",
+		"tag": "\uD83D\uDCA1",
+		"position": "-925px 0px"
+	},
+	"u1F4DE": {
+		"en": "Telephone Receiver",
+		"zh": "鐢佃瘽鍚瓛",
+		"tag": "\uD83D\uDCDE",
+		"position": "-1125px 0px"
+	},
+	"u1F4E2": {
+		"en": "Loudspeaker",
+		"zh": "鎵╅煶鍣<E785B6>",
+		"tag": "\uD83D\uDCE2",
+		"position": "-1150px 0px"
+	},
+	"u1F556": {
+		"en": "Clock",
+		"zh": "琛<>",
+		"tag": "\uD83D\uDD56",
+		"position": "-2650px 0px"
+	},
+	"u23F0": {
+		"en": "Alarm Clock",
+		"zh": "闂归挓",
+		"tag": "\u23F0",
+		"position": "-2775px 0px"
+	},
+	"u23F3": {
+		"en": "Hourglass",
+		"zh": "娌欐紡",
+		"tag": "\u23F3",
+		"position": "-2800px 0px"
+	},
+	"u1F4A3": {
+		"en": "Bomb",
+		"zh": "鐐稿脊",
+		"tag": "\uD83D\uDCA3",
+		"position": "-975px 0px"
+	},
+	"u1F52B": {
+		"en": "Pistol",
+		"zh": "鎵嬫灙",
+		"tag": "\uD83D\uDD2B",
+		"position": "-1700px 0px"
+	},
+	"u1F48A": {
+		"en": "Capsule",
+		"zh": "鑽<>",
+		"tag": "\uD83D\uDC8A",
+		"position": "-1625px 0px"
+	},
+	"u1F680": {
+		"en": "Rocket",
+		"zh": "鐏",
+		"tag": "\uD83D\uDE80",
+		"position": "-2725px 0px"
+	},
+	"u1F30F": {
+		"en": "Globe",
+		"zh": "鍦扮悆",
+		"tag": "\uD83C\uDF0F",
+		"position": "-1225px 0px"
+	}
+};
+let EmojiList = []
+
+function setEmojiList() {
+	EmojiList.length = 0;
+	for (var unicode in EmojiFactory) {
+		var detail = EmojiFactory[unicode];
+		if (detail.tag) {
+			var lang = 'en';
+			var symbol = detail[lang];
+			EmojiList.push({
+				unicode: unicode,
+				symbol: '[' + symbol + ']',
+				emoji: detail.tag,
+			});
+		}
+	}
+}
+setEmojiList()
+export default EmojiList

store/modules/im.js

@@ -1,4 +1,7 @@
 import im from "@/utils/im/index.js"
+import {
+    contactModel
+} from '@/utils/im/models.js'
 
 export default {
     state: {
@@ -14,7 +17,7 @@ export default {
                 const info = state.contacts[targetId]
 
                 return {
-                    name: info.name,
+                    name: info.remark ? info.remark : info.name,
                     hash: info.hash,
                     portraitUrl: info.localAvatar ? info.localAvatar : require('@/static/user/cover.png')
                 }
@@ -44,9 +47,31 @@ export default {
                 name: contactInfo.name,
                 portraitUrl: contactInfo.portraitUrl
             }
+<<<<<<< HEAD
         }
+=======
+        },
+        setContactRemark(state, contactInfo) {
+            Vue.set(state.contacts, contactInfo.targetId, contactInfo)
+        }
+>>>>>>> 013c030963aef06a00ac33d5f767cbd97ef2ceac
     },
     actions: {
+        setContactRemark({
+            commit
+        }, {
+            targetId,
+            remark
+        }) {
+            contactModel.find('targetId="' + targetId + '"', (err, result) => {
+                if (!err && result.length > 0) {
+                    result[0].remark = remark
+                    contactModel.update('targetId="' + targetId + '"', result[0], (err, res) => {
+                        commit('setContactRemark', result[0])
+                    })
+                }
+            })
+        },
         setSenderInfo({
             commit
         }, contactInfo) {
@@ -63,8 +88,7 @@ export default {
             commit,
             dispatch
         }, contactInfo) {
-            const model = uni.model.contactModel
+            contactModel.find('targetId="' + contactInfo.targetId + '"', (err, result) => {
-            model.find('targetId="' + contactInfo.targetId + '"', (err, result) => {
                 if (result.length == 0) {
                     // 没有数据，直接新增一条
                     dispatch('initContact', contactInfo)
@@ -75,12 +99,13 @@ export default {
                                 targetId: contactInfo.targetId,
                                 name: contactInfo.name,
                                 hash: contactInfo.hash,
+                                type: contactInfo.type,
                                 portraitUrl: contactInfo.portraitUrl,
                                 localAvatar: savedFilePath
                             }
-                            model.update('targetId="' + contactInfo.targetId + '"', info, (err,
+                            contactModel.update('targetId="' + contactInfo.targetId + '"', info, (err,
                                 res) => {
-                                console.log('UPDATE AVATAR, ERR', err, info);
+                                console.log('UPDATE AVATAR, ERR', err, info)
                             })
                             commit('updateContactInfo', info)
                         })
@@ -89,16 +114,17 @@ export default {
                             targetId: contactInfo.targetId,
                             name: contactInfo.name,
                             hash: contactInfo.hash,
+                            type: contactInfo.type,
                             portraitUrl: contactInfo.portraitUrl,
                             localAvatar: result[0].localAvatar
                         }
-                        model.update('targetId="' + contactInfo.targetId + '"', info, (err, res) => {
+                        contactModel.update('targetId="' + contactInfo.targetId + '"', info, (err, res) => {
                             console.log('UPDATE NAME, ERR', err, info);
                         })
                         commit('updateContactInfo', info)
                     }
                 } else {
-                    console.log('updateContact, 无操作');
+                    console.log('updateContact, 无操作')
                 }
             })
         },
@@ -108,7 +134,6 @@ export default {
         }, contactInfo) {
             // 将好友信息保存到vuex的内存中，方便立即使用
             commit('updateContactInfo', contactInfo)
-            const model = uni.model.contactModel
             // 用户头像，是否需要下载到本地
             if (contactInfo.portraitUrl) {
                 saveAvatar(contactInfo, (savedFilePath) => {
@@ -116,10 +141,13 @@ export default {
                         targetId: contactInfo.targetId,
                         name: contactInfo.name,
                         hash: contactInfo.hash,
+                        type: contactInfo.type,
                         portraitUrl: contactInfo.portraitUrl,
                         localAvatar: savedFilePath
                     }
-                    model.insert(info, (err, res) => {})
+                    contactModel.insert(info, (err, res) => {
+                        console.error('保存头像', err, res)
+                    })
                     // 保存头像后，更新信息
                     commit('updateContactInfo', info)
                 })
@@ -129,10 +157,13 @@ export default {
                     targetId: contactInfo.targetId,
                     name: contactInfo.name,
                     hash: contactInfo.hash,
+                    type: contactInfo.type,
                     portraitUrl: contactInfo.portraitUrl,
                     localAvatar: ''
                 }
-                model.insert(info, (err, res) => {})
+                contactModel.insert(info, (err, res) => {
+                    console.error('没保存头像', err, res)
+                })
             }
         }
     }

uni_modules/onemue-USQLite/changelog.md

@@ -1,7 +1,10 @@
-## 2.1.0（2022-01-14）
+## 2.2.2（2022-02-18）
-1. 新增了添加多个数据的事件选项（options, index）（感谢`@风扬`）
+1. 解决了自增约束的部分bug
-## 2.1.2（2022-01-14）
+2. 解决了处理类型的问题
-1. 新增了添加多个数据的事件选项（options, index）（感谢`@风扬`）
+## 2.2.0（2022-02-16）
+1. 重新处理了判断类型的方法
+2. 解决了`no connect`的问题
+3. 新增了自增约束，需要为数字类型
 ## 2.1.0（2022-01-14）
 1. 新增了添加多个数据的事件选项（options, index）（感谢`@风扬`）
 ## 2.0.2（2022-01-05）

uni_modules/onemue-USQLite/js_sdk/usqlite.js

@@ -37,10 +37,13 @@ class Utils {
 				}
 			}
 		}
+		
 		Utils.log(primaryKeyArr.length);
-		if (primaryKeyArr.length>=1) {
+		if (primaryKeyArr.length>1) {
-			sql = `CREATE TABLE '${name}' (${sqlArr.join(', ')}, PRIMARY KEY (${primaryKeyArr.join()}))`;
+			
-		}else{
+			sql = `CREATE TABLE '${name}' (${sqlArr.join(', ').replaceAll(' PRIMARY KEY','')}, PRIMARY KEY (${primaryKeyArr.join()}))`;
+		}
+		else{
 			sql = `CREATE TABLE '${name}' (${sqlArr.join(', ')})`;
 		}
 		Utils.log(`modelSql :${sql}`);
@@ -59,6 +62,22 @@ class Utils {
 		}
 
 		restrainArray.push(Utils.toType(options.type));
+		
+		// 主键
+		if (options.primaryKey == true) {
+			if(options.autoIncrement != true){
+				restrainArray.push('PRIMARY KEY');
+			}
+		}
+		
+		// 自增
+		if (Utils.isNumber(options.type)&&options.autoIncrement == true) {
+			restrainArray.pop();
+			restrainArray.push('INTEGER');
+			restrainArray.push('PRIMARY KEY');
+			restrainArray.push('AUTOINCREMENT');
+		}
+		
 		// 非空
 		if (options.notNull == true) {
 			restrainArray.push('NOT NULL');
@@ -74,10 +93,6 @@ class Utils {
 			restrainArray.push('UNIQUE');
 		}
 
-		// 主键
-		// if (options.primaryKey === true) {
-		// 	restrainArray.push('PRIMARY KEY');
-		// }
 
 		// 检查
 		if (options.check) {
@@ -87,27 +102,44 @@ class Utils {
 		return restrainArray.join(' ');
 	}
 
-	// 联合主键
-	static getUnionPrimaryKey() {
-
-	}
-
 	static toType(jsType) {
 		let sqliteType = '';
-		if (jsType == Number) {
+		if (Utils.isNumber(jsType)) {
 			sqliteType = 'numeric';
-		} else if (jsType == Date) {
+		} else if (Utils.isDate(jsType)) {
 			sqliteType = 'timestamp';
 		} else {
 			sqliteType = 'varchar';
 		}
 		return sqliteType;
 	}
+	
 	static log() {
 		if (config.deBug) {
 			console.log.apply(null, arguments);
 		}
 	}
+	
+	static warn() {
+		if (config.deBug) {
+			console.warn.apply(null, arguments);
+		}
+	}
+	
+	static error() {
+		console.error.apply(null, arguments);
+	}
+	
+	static isArray(value){ return Object.prototype.toString.call(value) === '[object Array]'}
+	static isObject(value){ return Object.prototype.toString.call(value) === '[object Object]'}
+	static isString(value){ return Object.prototype.toString.call(value) === '[object String]'}
+	static isFunction(value){ return (value === Function || Object.prototype.toString.call(value) === '[object Function]')}
+	static isNumber(value){ return (value === Number || Object.prototype.toString.call(value) === '[object Number]')}
+	static isNaN(value){ return (Object.prototype.toString.call(value) === '[object Number]' && isNaN(value))}
+	static isBoolean(value){ return Object.prototype.toString.call(value) === '[object Boolean]'}
+	static isUndefined(value){ return Object.prototype.toString.call(value) === '[object Undefined]'}
+	static isModel(value){ return Object.prototype.toString.call(value) === '[object Model]'}
+	static isDate(value){ return (value === Date||Object.prototype.toString.call(value) === '[object Date]')}
 }
 
 
@@ -118,7 +150,7 @@ class Model {
 	/**
 	 * @constructor
 	 * @param {String} name 数据库表名
-	 * @param {Object} options 数据表列对象
+	 * @param {} options 数据表列对象
 	 * @returns 
 	 */
 	constructor(name, options) {
@@ -129,7 +161,10 @@ class Model {
 		if (config.isConnect) {
 			self.repair();
 		} else {
-			console.error('no connect');
+			if(!config.name||!config.path){
+				console.error('"config.name" or "config.path" is empty');
+			}
+			usqlite.connect(config);
 		}
 	}
 
@@ -138,21 +173,27 @@ class Model {
 	 * @param {String|Array} options 
 	 * - String  WHERE 内容
 	 * - Array 需要查询的列
-	 * @param {*} callback 
+	 * @param {Function} callback 
 	 * @returns 
 	 */
 	find(options, callback) {
 		let sql = '';
 		let self = this;
 		self.repair();
-		if (!callback) {
+		if(!(Utils.isString(options)||Utils.isArray(options)||Utils.isFunction(options))) {
+			Utils.error('The first parameter of Model.find should be "Array", "String" or "Function" (when there is only one parameter).')
+		}
+		if(!callback&&!(Utils.isFunction(options))) {
+			Utils.error('The second parameter of Model.find should be "Function".')
+		}
+		if (!callback&&Utils.isFunction(options)) {
 			sql = `SELECT * FROM '${this.name}'`; // 查找全部
 			callback = options;
-		} else if (options.constructor == Array) {
+		} else if (Utils.isArray(options)) {
 			sql = `SELECT ${options.join()} FROM '${this.name}'`; // 查找制定列
-		} else if (options.constructor == String) {
+		} else if (Utils.isString(options)) {
 			sql = `SELECT * FROM '${this.name}' WHERE ${options}`; // 制定条件查询
-		};
+		}
 
 		Utils.log(`find: ${sql}`);
 
@@ -180,6 +221,12 @@ class Model {
 		let sql = '';
 		let self = this;
 		self.repair();
+		if(!Utils.isObject(options)){
+			Utils.error('The first parameter of Model.limit should be "Object".')
+		}
+		if(!Utils.isFunction(callback)){
+			Utils.error('The second parameter of Model.limit should be "Function".')
+		}
 		
 		if (!options.where) {
 			// 不存在 where
@@ -215,12 +262,19 @@ class Model {
 		let self = this;
 		self.repair();
 
+		if(!(Utils.isObject(options)||Util.isArray(options))){
+			Utils.error('The first parameter of Model.insert should be "Object" or "Array".')
+		}
+		if(!Utils.isFunction(callback)){
+			Utils.error('The second parameter of Model.insert should be "Function".')
+		}
+		
 		if (config.isConnect) {
-			if (options.constructor == Array) {
+			if (Utils.isArray(options)) {
 				for (var i = 0; i < options.length; i++) {
 					this.insert(options[i], callback, i);
 				}
-			} else if (options.constructor == Object) {
+			} else if (Utils.isObject(options)) {
 				let keys = [];
 				let values = [];
 				let index = arguments[3]??null;
@@ -255,7 +309,7 @@ class Model {
 
 	/**
 	 * @description 更新数据
-	 * @param {Object} options：可选参数 更新条件
+	 * @param {String} options：可选参数 更新条件
 	 * @param {Object} obj： 修改后的数据 
 	 * @param {Function} callback :（err,results）=>{}
 	 */
@@ -265,6 +319,13 @@ class Model {
 		let items = [];
 		self.repair();
 		
+		if(!(Utils.isObject(options)||Utils.isString(options))){
+			Utils.error('The first parameter of Model.update should be "Object" or "String".')
+		}
+		if(!(Utils.isObject(obj)||Utils.isFunction(obj))){
+			Utils.error('The second parameter of Model.update should be "Objrct" or "Function".')
+		}
+		
 		if (!callback) {
 			// 不存在options
 			callback = obj;
@@ -298,7 +359,7 @@ class Model {
 
 	/**
 	 * @description 删除数据
-	 * @param {Object} options ：可选参数 删除条件
+	 * @param {String} options ：可选参数 删除条件
 	 * @param {Function} callback :（err,results）=>{}
 	 */
 	delete(options, callback) {
@@ -306,6 +367,13 @@ class Model {
 		let self = this;
 		self.repair();
 		
+		if(!(Utils.isString(options)||Utils.isFunction(options))){
+			Utils.error('The first parameter of Model.delete should be "Object" or "Function".')
+		}
+		if(callback&&!Utils.isFunction(callback)){
+			Utils.error('The second parameter of Model.delete should be "Function".')
+		}
+
 		if (!callback) {
 			sql = `DELETE FROM '${this.name}'`;
 			callback = options;
@@ -330,7 +398,7 @@ class Model {
 
 	/**
 	 * @description  重命名或者新增列
-	 * @param {Object} options 参数 数组为新增多列 对象为新增单列{aa} 字符串重命名
+	 * @param {Object|Array|String} options 参数 数组为新增多列 对象为新增单列{aa} 字符串重命名
 	 * @param {Function} callback :（err,results）=>{}
 	 * @return: 
 	 */
@@ -338,12 +406,18 @@ class Model {
 		let self = this;
 		let sql = '';
 		self.repair();
+		if(!(Utils.isObject(options)||Utils.isArray(options)||Utils.isString(options))){
+			Utils.error('The first parameter of Model.alter should be "Object", "Array" or "String".')
+		}
+		if(!Utils.isFunction(callback)){
+			Utils.error('The second parameter of Model.alter should be "Function".')
+		}
 		
-		if (options.constructor == Array) { // 新增多列
+		if (Utils.isArray(options)) { // 新增多列
 			for (let i = 0; i < options.length; i++) {
 				self.alter(options[i], callback);
 			}
-		} else if (options.constructor == Object) { // 新增单列
+		} else if (Utils.isObject(options)) { // 新增单列
 			let column = Utils.restrain(options.name, options.option);
 			sql = `ALTER TABLE '${this.name}' ADD COLUMN ${column}`
 		} else if (options.constructor == String) { // 重命名
@@ -374,13 +448,13 @@ class Model {
 	 */
 	join(model, options, callback) {
 		if (!model) {
-			console.error('"model" cannot be empty.');
+			Utils.error('"model" cannot be empty.');
 		}
-		if (options.constructor != Object) {
+		if (!Utils.isObject(options)) {
-			console.error('The type of "options" is wrong, it should be "Object".');
+			Utils.error('The type of "options" is wrong, it should be "Object".');
 		}
 		if (!options.type || !options.predicate) {
-			console.error('Missing required parameters');
+			Utils.error('Missing required parameters');
 		}
 
 		let leftName = this.name;
@@ -427,6 +501,13 @@ class Model {
 	 * @param {Function} callback :（err,results）=>{}
 	 */
 	sql(sql, callback) {
+		if (!Utils.isString(sql)) {
+			Utils.error('"The type of "sql" is wrong, it should be "String".');
+		}
+		if (callback&&!Utils.isFunction(callback)) {
+			Utils.error('The type of "callback" is wrong, it should be "Function".');
+		}
+		
 		let self = this;
 		self.repair();
 
@@ -449,6 +530,10 @@ class Model {
 	 * @param {Function} callback 
 	 */
 	isExist(callback) {
+		if (callback&&!Utils.isFunction(callback)) {
+			Utils.error('The type of "callback" is wrong, it should be "Function".');
+		}
+		
 		let sql = `SELECT count(*) AS isExist FROM sqlite_master WHERE type='table' AND name='${this.name}'`;
 		let self = this;
 		Utils.log(`isExist: ${sql}`);
@@ -470,6 +555,10 @@ class Model {
 	 * @param {Function} callback 
 	 */
 	drop(callback) {
+		if (callback&&!Utils.isFunction(callback)) {
+			Utils.error('The type of "callback" is wrong, it should be "Function".');
+		}
+		
 		var sql = `DROP TABLE '${this.name}'`;
 		let self = this;
 		self.repair();
@@ -493,6 +582,10 @@ class Model {
 	 * @param {Function} callback 
 	 */
 	create(callback) {
+		if (callback&&!Utils.isFunction(callback)) {
+			Utils.error('The type of "callback" is wrong, it should be "Function".');
+		}
+		
 		let self = this;
 		let sql = Utils.modelSql(self.name, self.options);
 		Utils.log(`create: ${sql}`);
@@ -574,6 +667,7 @@ export class usqlite {
 			}
 		});
 	}
+	
 	/**
 	 * @description 断开数据库
 	 * @param {*} callback 
@@ -591,6 +685,19 @@ export class usqlite {
 			}
 		});
 	}
+	static closeAsync(options){
+		plus.sqlite.closeDatabase({
+			name: config.name, //数据库名称
+			path: config.path, //数据库地址
+			success(e) {
+				config.isConnect = false;
+				callback(null, e);
+			},
+			fail(e) {
+				callback(e);
+			}
+		});
+	}
 	/**
 	 * @description 创建 Model 对象
 	 * @example

uni_modules/onemue-USQLite/package.json

@@ -1,7 +1,7 @@
 {
   "id": "onemue-USQLite",
   "displayName": "u-SQLite V2",
-  "version": "2.1.0",
+  "version": "2.2.2",
   "description": "基于ORM技术，使用对象的方式来操作sqlite数据库，而无需编写任何sql语句.",
   "keywords": [
     "USQLite,数据库操作,缓存,大数据缓存,sqlite,sql,orm"

uni_modules/onemue-USQLite/readme.md

@@ -1,5 +1,6 @@
-<h2>onemue-USQLite</h2>
+<h2>onemue-USQLite</h2><h2>onemue-USQLite</h2>
 
+<h2 style="color:red">没有特别说明，均为异步函数</h2>
 > u-SQLite 交流群：643867519
 > 如果觉的当前插件对你有帮助可以前往 [github](https://github.com/onemue/u-sqlite) 点 star!
 
@@ -49,6 +50,7 @@ let studentModel = uni.$sql.model('student',{
 - unique UNIQUE 不重复
 - default DEFAULT 默认值
 - notNull NOT NULL 非空
+- autoIncrement AUTOINCREMENT 非空
 
 **联合主键**
 

uni_modules/uni-icons/changelog.md

@@ -1,3 +1,9 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
 ## 1.3.2（2021-12-01）
 - 优化 示例可复制图标名称
 ## 1.3.1（2021-11-23）

uni_modules/uni-icons/components/uni-icons/icons.js

@@ -173,6 +173,13 @@ export default {
       "unicode": "e6bb",
       "unicode_decimal": 59067
     },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
     {
       "icon_id": "24923354",
       "name": "arrowthinleft",
@@ -180,6 +187,13 @@ export default {
       "unicode": "e6bc",
       "unicode_decimal": 59068
     },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
     {
       "icon_id": "24923355",
       "name": "arrowthinup",
@@ -187,12 +201,25 @@ export default {
       "unicode": "e6bd",
       "unicode_decimal": 59069
     },
+		{
+		  "icon_id": "24923355",
+		  "name": "arrowthinup",
+		  "font_class": "arrowthinup",
+		  "unicode": "e6bd",
+		  "unicode_decimal": 59069
+		},
     {
       "icon_id": "24923356",
       "name": "arrowthindown",
       "font_class": "arrow-down",
       "unicode": "e6be",
       "unicode_decimal": 59070
+    },{
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrowthindown",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
     },
     {
       "icon_id": "24923349",
@@ -200,6 +227,12 @@ export default {
       "font_class": "bottom",
       "unicode": "e6b8",
       "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
     },
     {
       "icon_id": "24923346",
@@ -208,6 +241,13 @@ export default {
       "unicode": "e6b5",
       "unicode_decimal": 59061
     },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
     {
       "icon_id": "24923347",
       "name": "arrowup",
@@ -215,6 +255,13 @@ export default {
       "unicode": "e6b6",
       "unicode_decimal": 59062
     },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
     {
       "icon_id": "24923348",
       "name": "arrowleft",
@@ -222,6 +269,13 @@ export default {
       "unicode": "e6b7",
       "unicode_decimal": 59063
     },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
     {
       "icon_id": "24923334",
       "name": "eye",

uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -1,14 +1,18 @@
 <template>
 	<!-- #ifdef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
 	<!-- #endif -->
 	<!-- #ifndef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
 	<!-- #endif -->
 </template>
 
 <script>
 	import icons from './icons.js';
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
+	} 
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
 	import iconUrl from './uniicons.ttf'
@@ -61,6 +65,9 @@
 					return unescape(`%u${code.unicode}`)
 				}
 				return ''
+			},
+			iconSize(){
+				return getVal(this.size)
 			}
 		},
 		methods: {

uni_modules/uni-icons/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "1.3.2",
+  "version": "1.3.5",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",

uni_modules/uni-id/changelog.md

@@ -1,3 +1,13 @@
+## 3.3.12（2022-01-15）
+- 新增 preferedAppPlatform 配置用于解决uni-app vue2版本vue3版本获取platform不一致的问题 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=prefered-app-platform)
+- 修复 checkToken 未返回自定义token内容的Bug
+## 3.3.11（2022-01-11）
+- 修复用户名密码登录时多个应用出现重复用户名登录报错的Bug
+## 3.3.10（2022-01-07）
+- 新增 自定义国际化语言支持 [详情](https://uniapp.dcloud.net.cn/uniCloud/uni-id?id=custom-i8n)
+- 修复 一键登录时未校验重复手机号是否已验证的Bug
+- 修复 Apple登录时用户邮箱为空时报错的Bug
+- 修复 登录接口未传username时错误提示不正确的Bug
 ## 3.3.9（2021-11-09）
 - 去除重复的context.xxx未找到的提示语
 ## 3.3.8（2021-10-28）

uni_modules/uni-id/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-id",
   "displayName": "uni-id",
-  "version": "3.3.9",
+  "version": "3.3.12",
   "description": "简单、统一、可扩展的用户中心",
   "keywords": [
     "uniid",

uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni-id",
-  "version": "3.3.5",
+  "version": "3.3.12",
   "description": "uni-id for uniCloud",
   "main": "index.js",
   "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id",

uni_modules/uni-scss/changelog.md

@@ -1,3 +1,5 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
 ## 1.0.2（2021-11-22）
 - 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
 ## 1.0.1（2021-11-22）

uni_modules/uni-scss/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-scss",
   "displayName": "uni-scss 辅助样式",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
   "keywords": [
     "uni-scss",
@@ -14,8 +14,8 @@
   },
   "dcloudext": {
     "category": [
-        "uni-app前端模板",
+        "JS SDK",
-        "前端页面模板"
+        "通用 SDK"
     ],
     "sale": {
       "regular": {

utils/im/index.js

@@ -9,6 +9,9 @@ import {
     getImToken,
     getMyGroups
 } from '@/apis/interfaces/im.js'
+import {
+    contactModel
+} from './models.js'
 
 const initIm = (KEY) => {
     RongIMLib.init(KEY)
@@ -20,6 +23,8 @@ const initIm = (KEY) => {
         getImToken().then(res => {
             connect(res.token, res.userInfo, (res) => {
                 console.log('IM.CONNECT', res);
+                // 发布全局事件，有新消息，刷新会话列表
+                uni.$emit('onReceiveMessage')
             })
         })
     }
@@ -62,13 +67,12 @@ const connect = (token, userInfo, callback) => {
         // 设置未读消息数量
         setNotifyBadge()
         // 首次运行获取好友列表
-        const FK = 'ZHKD_' + userInfo.targetId
+        const FK = 'ZH_CONTACT_' + userInfo.targetId
 
         uni.getStorage({
             key: FK,
             success: () => {
-                const model = uni.model.contactModel
+                contactModel.find((err, results) => {
-                model.find((err, results) => {
                     results.map(item => {
                         store.dispatch('launchContact', item)
                     })

utils/im/listeners.js

@@ -20,7 +20,30 @@ const onReceiveMessage = (message) => {
         }
     })
     im.setNotifyBadge()
+    // 发布全局事件，有新消息，刷新会话列表
     uni.$emit('onReceiveMessage', message)
+    // 这个是为了更新消息列表页的
+    uni.$emit('onReceiveMessage_' + message.targetId, message)
+}
+
+// 检测联系人信息，不存在的时候，从服务端获取
+const checkContactExists = (message) => {
+    if (!store.getters.contactIsExist(message.targetId)) {
+        getUserInfo(message.targetId).then(res => {
+            console.log('targetId', res);
+            store.dispatch('initContact', res)
+        }).catch(err => {
+            console.error('getUserInfo ERR', err)
+        })
+    }
+    if (!store.getters.contactIsExist(message.senderUserId)) {
+        getUserInfo(message.senderUserId).then(res => {
+            console.log('senderUserId', message.senderUserId, res);
+            store.dispatch('initContact', res)
+        }).catch(err => {
+            console.error('getUserInfo ERR', err)
+        })
+    }
 }
 
 // 允许通知的消息类型，触发更新消息列表操作,提示音
@@ -32,10 +55,7 @@ const notifyMsgTypes = [
     IMLib.ObjectName.Location,
     IMLib.ObjectName.Voice,
     IMLib.ObjectName.HQVoice,
-    IMLib.ObjectName.Sight,
+    IMLib.ObjectName.Sight
-    IMLib.ObjectName.Text,
-    IMLib.ObjectName.Text,
-    IMLib.ObjectName.Text
 ]
 
 const imLibListeners = () => {
@@ -48,40 +68,56 @@ const imLibListeners = () => {
     IMLib.addReceiveMessageListener((res) => {
         const message = res.data.message
         console.error('[收到消息]', message)
+        checkContactExists(message)
         if (utils.inArray(message.objectName, notifyMsgTypes)) {
-            if (!store.getters.contactIsExist(message.targetId)) {
-                getUserInfo(message.targetId).then(res => {
-                    store.dispatch('initContact', res)
-                }).catch(err => {
-                    console.error('getUserInfo ERR', err)
-                })
-            }
-            if (!store.getters.contactIsExist(message.senderUserId)) {
-                getUserInfo(message.senderUserId).then(res => {
-                    store.dispatch('initContact', res)
-                }).catch(err => {
-                    console.error('getUserInfo ERR', err)
-                })
-            }
             onReceiveMessage(message)
         } else if (message.objectName === IMLib.ObjectName.ProfileNotification) {
-            // 更新会话信息
+            uni.$emit('onUpdateProfile_' + message.targetId)
+            // 更新联系人信息
             store.dispatch('updateContact', JSON.parse(message.content.data))
             // 调用完更新之后，删除这条消息
             IMLib.deleteMessagesByIds([message.messageId])
         } else if (message.objectName === IMLib.ObjectName.ContactNotification) {
-            console.error('触发一个新好友的通知事件', message);
+            if (message.content.operation === 'Request') {
-            // 触发一个新好友的通知事件
+                // 触发一个新好友的通知事件，【会话列表，通讯录，新朋友】页面
-            uni.$emit('onContactNotification', message)
+                uni.$emit('onNewContactConversation', message)
+                uni.$emit('onNewContactFriends', message)
+                uni.$emit('onNewContactPendings', message)
+            } else if (message.content.operation === 'Delete') {
+                IMLib.cleanHistoryMessages(1, message.targetId, message.sentTime, false)
+                // 解散了就删了吧
+                IMLib.removeConversation(1, message.targetId)
+                // 刷新会话列表
+                uni.$emit('onUserDelete_' + message.targetId)
+                uni.$emit('onReceiveMessage', message)
+            }
         } else if (message.objectName === IMLib.ObjectName.GroupNotification) {
+            // 这个是为了更新消息列表页的
+            uni.$emit('onReceiveMessage_' + message.targetId, message)
             // 解散群
             if (message.content.operation === 'Dismiss') {
-                IMLib.cleanHistoryMessages(message.conversationType, message.targetId, message.sentTime,
+                IMLib.cleanHistoryMessages(3, message.targetId, message.sentTime,
                     false)
                 // 解散了就删了吧
-                IMLib.removeConversation(message.conversationType, message.targetId)
+                IMLib.removeConversation(3, message.targetId)
-                uni.$emit('onGroupDismiss', message.targetId)
+                // 发布群解散的消息
+                uni.$emit('onGroupDismiss')
+                uni.$emit('onGroupDismiss_' + message.targetId)
+            } else if (message.content.operation === 'REMOVE') {
+                // 要判断是否当前用户，然后把当前用户踢出到主页去， 删除聊天记录，会话列表
+                if (message.content.extra == store.getters.sender.userId) {
+                    IMLib.cleanHistoryMessages(3, message.targetId, message.sentTime,
+                        false)
+                    // 解散了就删了吧
+                    IMLib.removeConversation(3, message.targetId)
+                    // 为了更新群列表
+                    uni.$emit('onGroupDismiss')
+                    uni.$emit('onGroupRemoveYou_' + message.targetId)
                 }
+                uni.$emit('onReceiveMessage_' + message.targetId, message)
+                // 这个是为了更新消息列表页的
+            }
+            // 触发刷新会话列表
             uni.$emit('onReceiveMessage', message)
         }
     })
@@ -93,10 +129,16 @@ const imLibListeners = () => {
         uni.$emit('onReadReceiptReceived', data)
     })
     // 监听消息撤回操作
-    IMLib.addRecallMessageListener((res) => {
+    IMLib.addRecallMessageListener(({
-        IMLib.getMessage(res.data.messageId, (res) => {
+        data
-            console.error("消息撤回: ", res.message);
+    }) => {
-            uni.$emit('onRecallMessage', res.message)
+        IMLib.getMessage(data.messageId, ({
+            message
+        }) => {
+            console.error("消息撤回: ", message);
+            im.setNotifyBadge()
+            uni.$emit('onReceiveMessage', message)
+            uni.$emit('onRecallMessage_' + message.targetId, message)
         })
     })
     // 监听需要群聊消息回执

utils/im/message.js

@@ -127,7 +127,7 @@ const sentVoice = (conversationType, targetId, voiceUrl, time, user, callback) =
         content: {
             objectName: 'RC:HQVCMsg',
             local: 'file:///' + plus.io.convertLocalFileSystemURL(voiceUrl),
-            duration: time,
+            duration: time == 0 ? 1 : time,
             userInfo: user
         }
     }

utils/im/models.js

@@ -9,14 +9,19 @@ const contactModel = usqlite.model('contacts', {
         unique: true
     },
     name: String,
+    remark: String,
     hash: {
         type: String,
         unique: true
     },
+    type: {
+        type: Number,
+        default: 0
+    },
     portraitUrl: String,
     localAvatar: String
 })
 
-export default {
+export {
     contactModel
 }