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

apis/interfaces/im.js

@@ -85,6 +85,15 @@ const pedingFriend = (recipient) => {
     })
 }
 
+/**
+ * 好友申请数量
+ */
+const getPendingCount = () => {
+    return request({
+        url: 'im/friends/pending/count'
+    })
+}
+
 export {
     getImToken,
     deleteFriend,
@@ -95,5 +104,6 @@ export {
     resolveFriend,
     rejectFriend,
     searchFriend,
-    pedingFriend
+    pedingFriend,
+    getPendingCount
 }

manifest.json

@@ -32,6 +32,7 @@
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",

pages/im/friends/index.vue

@@ -4,7 +4,9 @@
             <view>
                 <view class="friend-flex u-border-bottom" @click="toPending">
                     <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_01.png')"></u-avatar>
-                    <view class="name">新的朋友</view>
+                    <view class="name">
+                        新的朋友 ({{ pendingCount }})
+                    </view>
                 </view>
                 <view class="friend-flex" @click="showToast">
                     <u-avatar class="cover" size="40" shape="square" :src="require('@/static/im/im_00.png')"></u-avatar>
@@ -22,7 +24,8 @@
                         <u-index-anchor :text="indexs[friend]" bgColor="#F3F6FB" height="20" size="12" color="#666">
                         </u-index-anchor>
                         <!-- #endif -->
-                        <view v-for="(friendItem, index) in item" :key="friendItem.userId" class="friend-flex u-border-bottom"
+                        <view v-for="(friendItem, index) in item" :key="friendItem.userId"
+                            class="friend-flex u-border-bottom"
                             @click="$Router.push({ name: 'imFriendsInfo', params: { targetId: friendItem.userId } })">
                             <block v-if="friendItem.portraitUrl != ''">
                                 <u-avatar class="cover" size="40" shape="square" :src="friendItem.portraitUrl || ''"
@@ -47,24 +50,29 @@
 
 <script>
     import {
-        getFriends
+        getFriends,
+        getPendingCount
     } from '@/apis/interfaces/im';
+
     export default {
         data() {
             return {
                 indexs: [],
-                friends: []
+                friends: [],
+                pendingCount: 0
             };
         },
         onShow() {
             getFriends().then(res => {
-                this.indexs = res.indexList;
+                this.indexs = res.indexList
-                this.friends = res.itemArr;
+                this.friends = res.itemArr
-            });
+            })
+            getPendingCount().then(res => {
+                console.log(res);
+                this.pendingCount = res
+            })
         },
-        computed: {},
         methods: {
-            // 扫码提示
             showToast() {
                 uni.showToast({
                     title: '群聊功能暂未开放，敬请期待',

pages/im/friends/info.vue

@@ -105,6 +105,7 @@
             }
         },
         onLoad(e) {
+            console.log(e);
             this.targetId = e.targetId
             getFriendInfo(e.targetId).then(res => {
                 this.userInfo = res
@@ -243,16 +244,14 @@
                     })
             },
             singleCall(e) {
-                CallLib.startSingleCall(this.targetId, e.type, '');
+                uni.showToast({
-                uni.redirectTo({
+                    icon: 'none',
-                    url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type,
+                    title: '功能正在开发中'
-                    success: (err) => {
-                        console.log('跳转视频通话成功');
-                    },
-                    fail: (err) => {
-                        console.log('跳转视频页失败', err);
-                    }
                 })
+                // CallLib.startSingleCall(this.targetId, e.type, '');
+                // uni.redirectTo({
+                //     url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type
+                // })
             }
         }
     }

pages/im/friends/mine.vue

@@ -2,12 +2,7 @@
     <view class="content">
         <!-- 用户信息 -->
         <view class="info-flex">
-            <u-avatar
+            <u-avatar :src="infoObj.portraitUrl" shape="square" size="50" bg-color="#fff"></u-avatar>
-                :src="infoObj.portraitUrl"
-                shape="square"
-                size="50"
-                bg-color="#fff"
-            ></u-avatar>
             <view class="info-text">
                 <view class="nickname">{{infoObj.name}}</view>
                 <view class="address">地址：{{infoObj.address}}</view>
@@ -28,7 +23,7 @@
         </view>
         <!-- 二维码 -->
         <view class="info-code">
-            <uqrcode class="info-code-src" :size="198" ref="uQRCode" text="qrContent" />
+            <uqrcode class="info-code-src" :size="198" ref="uQRCode" :text="qrContent" />
             <view class="info-code-text">
                 <view>ZH-HEALTH扫一扫上面的二维码</view>
                 <view>添加我的好友</view>
@@ -38,31 +33,29 @@
 </template>
 
 <script>
-	import { getUserInfo } from '@/apis/interfaces/im'
+    import {
-	export default{
+        getUserInfo
-		data(){
+    } from '@/apis/interfaces/im'
-			return{
+    export default {
+        data() {
+            return {
                 infoObj: {
-                    userId      : '',
+                    userId: '',
-                    username    : '',
+                    username: '',
-                    name        : '',
+                    name: '',
-                    address     : '',
+                    address: '',
-                    portraitUrl : '',
+                    portraitUrl: '',
-                    gender      : 0,
+                    gender: 0,
-                    hash        : ''
+                    hash: ''
                 },
                 qrContent: 'ADDFRIEND|'
             }
         },
-        onLoad(e){
+        onLoad(e) {},
-            console.log(e)
-            
-        },
         mounted() {
             getUserInfo(this.$Route.query.targetId).then(res => {
                 this.infoObj = res
                 this.qrContent += res.userId
-                console.log(this.infoObj)
             })
         },
         methods: {
@@ -72,21 +65,24 @@
 </script>
 
 <style lang="scss" scoped>
-    .content{
+    .content {
         background: $window-color;
         min-height: 100vh;
         padding-top: $padding;
         box-sizing: border-box;
-        .info-code{
+
+        .info-code {
             background: white;
             margin: 0 $margin;
             border-radius: $radius;
             padding: $padding*3 $padding $padding;
             text-align: center;
-            &-src{
+
+            &-src {
                 display: inline-block;
             }
-            &-text{
+
+            &-text {
                 text-align: center;
                 color: $text-gray;
                 font-size: $title-size-sm;
@@ -94,24 +90,28 @@
                 padding: $padding 0;
             }
         }
+
         // 用户信息
-        .info-flex{
+        .info-flex {
             padding: $padding;
             margin: 0 $margin;
             display: flex;
             background: white;
             border-radius: $radius;
-            .info-text{
+
+            .info-text {
                 width: calc(100% - 50px);
                 padding-left: $padding;
                 box-sizing: border-box;
-                .nickname{
+
+                .nickname {
                     line-height: 30px;
                     font-size: $title-size + 6;
                     color: $text-color;
                     text-align: left;
                 }
-                .address{
+
+                .address {
                     line-height: 20px;
                     font-size: $title-size-sm;
                     color: $text-gray;
@@ -122,7 +122,7 @@
         }
 
         // footer
-        .footer{
+        .footer {
             position: fixed;
             bottom: 0;
             left: 0;
@@ -130,21 +130,25 @@
             padding: $padding*2 $padding;
             display: flex;
             justify-content: space-around;
-            .footer-item{
+
+            .footer-item {
                 margin: 0 $margin/2;
-                .icon{
+
+                .icon {
                     background: $main-color;
                     width: 88rpx;
                     height: 88rpx;
                     line-height: 88rpx;
                     display: inline-block;
                     border-radius: 50%;
-                    .icon-u{
+
+                    .icon-u {
                         margin-top: calc((88rpx/2) - 13px);
                         margin-left: calc((88rpx/2) - 13px);
                     }
                 }
-                .text{
+
+                .text {
                     color: $main-color;
                     font-size: $title-size-m;
                     text-align: center;
@@ -154,24 +158,28 @@
         }
 
         // btns
-        .info-btns{
+        .info-btns {
             background: white;
             margin: $margin;
             border-radius: $radius;
-            .item{
+
+            .item {
                 line-height: 100rpx;
                 border-bottom: solid 1rpx $border-color;
                 display: flex;
                 padding: 0 $padding;
                 justify-content: space-between;
                 font-size: $title-size-lg;
-                &:last-child{
+
+                &:last-child {
                     border-bottom: none;
                 }
-                label{
+
+                label {
                     width: 200rpx;
                 }
-                .text{
+
+                .text {
                     width: calc(100% - 200rpx);
                     color: $text-gray-m;
                     text-align: right;

pages/im/index.vue

@@ -74,7 +74,9 @@
     import * as RongIMLib from "@/uni_modules/RongCloud-IMWrapper/js_sdk/index"
     import im from '@/utils/im/index.js'
     import userAuth from '@/public/userAuth'
-    import { getImToken } from '@/apis/interfaces/im.js'
+    import {
+        getImToken
+    } from '@/apis/interfaces/im.js'
     export default {
         data() {
             return {
@@ -99,14 +101,21 @@
                 }
             }
         },
-        onShow() {
+        onLoad() {
-            if (this.$store.state.token !== '') {
+            if (this.isShown) {
-                getImToken().then(res => {
+                uni.$on('onReceiveMessage', (msg) => {
-                    im.connect(res.token, res.userInfo, () => {
+                    console.log(msg);
                     this.getConversationList()
                 })
+                uni.$on('onConnectionStatusChange', (status) => {
+                    this.connection = status
                 })
             }
+        },
+        onShow() {
+            if (this.$store.state.token !== '') {
+                this.getConversationList()
+            }
             this.isShown = true
         },
         onHide() {
@@ -127,16 +136,6 @@
                 }
             }
         },
-        watch: {
-            '$store.getters.newMessage': function(n, o) {
-                if (this.isShown) {
-                    this.getConversationList()
-                }
-            },
-            '$store.getters.connection': function(n, o) {
-                this.connection = n
-            }
-        },
         methods: {
             hidePop() {
                 this.showPop = false
@@ -202,9 +201,6 @@
             // 进入聊天的详情页面，清理未读消息数量
             toDetail(item) {
                 this.hidePop()
-                // uni.navigateTo({
-                //     url: '/pages/im/private/call?targetId=' + item.targetId + '&mediaType=1'
-                // })
                 uni.navigateTo({
                     url: '/pages/im/private/index?targetId=' + item.targetId + '&conversationType=' + item
                         .conversationType
@@ -229,10 +225,8 @@
             scanQrCode() {
                 uni.scanCode({
                     success: (res) => {
-                        // "result": "ADDFRIEND|10010",
                         if (res.scanType == 'QR_CODE') {
                             res.result.substr(0, 10) == 'ADDFRIEND|'
-                            // 跳转到添加好友页面
                             uni.navigateTo({
                                 url: '/pages/im/friends/info?targetId=' + res.result.substr(10)
                             })

pages/im/private/index.vue

@@ -123,6 +123,18 @@
                 console.log('------------------获取到了录音的临时路径---------------')
                 console.log(res.tempFilePath)
             })
+            // 简童收到新消息，判断是否是当前会话，更新会话内容
+            uni.$on('onReceiveMessage', (msg) => {
+                if (msg.targetId == this.targetId) {
+                    RongIMLib.clearMessagesUnreadStatus(msg.conversationType, msg.targetId, msg.sentTime)
+                    RongIMLib.sendReadReceiptMessage(msg.conversationType, msg.targetId, msg.sentTime)
+                    this.getMessageList()
+                    im.setNotifyBadge()
+                }
+            })
+        },
+        beforeDestroy() {
+            uni.$off('onReceiveMessage')
         },
         onUnload() {
             RongIMLib.clearReadReceiptReceivedListener()
@@ -146,16 +158,6 @@
                 })
             }
         },
-        watch: {
-            '$store.getters.newMessage': function(msg) {
-                if (msg.targetId == this.targetId) {
-                    RongIMLib.clearMessagesUnreadStatus(msg.conversationType, msg.targetId, msg.sentTime)
-                    RongIMLib.sendReadReceiptMessage(msg.conversationType, msg.targetId, msg.sentTime)
-                    this.getMessageList()
-                    im.setNotifyBadge()
-                }
-            }
-        },
         methods: {
             // 播放语音消息
             onPlayMsg() {

pages/user/index.vue

@@ -4,7 +4,8 @@
         <view class="info-box">
             <image src="@/static/user/user_back.png" mode="aspectFill" />
             <view class="user-flex">
-                <image class="cover" @click="$Router.push({ name: 'Setting' })" :src="userInfo.avatar || require('@/static/user/cover.png')" mode="aspectFill" />
+                <image class="cover" @click="$Router.push({ name: 'Setting' })"
+                    :src="userInfo.avatar || require('@/static/user/cover.png')" mode="aspectFill" />
                 <view class="user-content">
                     <block v-if="$store.state.token != ''">
                         <view class="name">{{ userInfo.nickname }}</view>
@@ -21,10 +22,14 @@
                             </view>
                         </view>
                         <view class="chainAddress" v-if="userInfo.chain_address">
-                            <u-icon labelPos="left" @click="copy(userInfo.chain_address)" labelSize="14" labelColor="#fff" :label="userInfo.chain_address.substr(0, 20)+'...'" space="10" :name="require('@/static/imgs/copy.png')" size="16" />
+                            <u-icon labelPos="left" @click="copy(userInfo.chain_address)" labelSize="14"
+                                labelColor="#fff" :label="userInfo.chain_address.substr(0, 20)+'...'" space="10"
+                                :name="require('@/static/imgs/copy.png')" size="16" />
                         </view>
                     </block>
-                    <block v-else><view class="name" @click="isLogin()">未登录</view></block>
+                    <block v-else>
+                        <view class="name" @click="isLogin()">未登录</view>
+                    </block>
                 </view>
             </view>
         </view>
@@ -36,7 +41,10 @@
                 <image src="@/static/user/icon_06.png" mode="widthFix" />
                 ZH会员
             </view>
-            <view class="subtitle"><u-notice-bar :text="cardText" icon="" bgColor="" duration="3000" color="#fcc692" direction="column"></u-notice-bar></view>
+            <view class="subtitle">
+                <u-notice-bar :text="cardText" icon="" bgColor="" duration="3000" color="#fcc692" direction="column">
+                </u-notice-bar>
+            </view>
             <view class="btn" @click="openVip" v-if="userInfo.identity.length === 0">开通</view>
         </view>
 
@@ -121,9 +129,13 @@
 </template>
 
 <script>
-import { info } from '@/apis/interfaces/user';
+    import {
-import userAuth from '@/public/userAuth';
+        info
-export default {
+    } from '@/apis/interfaces/user';
+    import userAuth from '@/public/userAuth';
+    import im from '@/utils/im/index.js'
+
+    export default {
         data() {
             return {
                 cardText: ['新用户首单即赠会员', '老用户专属验证开通会员'],
@@ -172,7 +184,9 @@ export default {
                                         cancelText: '去完成',
                                         success: res => {
                                             console.log(res);
-                                        this.$Router.pushTab({ name: 'Store' });
+                                            this.$Router.pushTab({
+                                                name: 'Store'
+                                            });
                                         }
                                     });
                                     break;
@@ -190,15 +204,21 @@ export default {
             // 开通钱包
             onWallet() {
                 if (this.isLogin()) {
-                if (this.userInfo.is_wallet) this.$Router.push({ name: 'WalletProperty' });
+                    if (this.userInfo.is_wallet) this.$Router.push({
-                else this.$Router.push({ name: 'WalletAdd' });
+                        name: 'WalletProperty'
+                    });
+                    else this.$Router.push({
+                        name: 'WalletAdd'
+                    });
                 }
             },
             // 个人档案
             onFiles() {
                 if (this.isLogin()) {
                     if (!this.userInfo.has_record) {
-                    this.$Router.push({ name: 'EssentialInfo' });
+                        this.$Router.push({
+                            name: 'EssentialInfo'
+                        });
                         return;
                     }
                     // this.$Router.push({ name: 'UserFiles',params:{id:this.userInfo.record_id} });
@@ -210,7 +230,10 @@ export default {
             // 按钮导航
             onBtn(name, params) {
                 if (this.isLogin()) {
-                this.$Router.push({ name, params });
+                    this.$Router.push({
+                        name,
+                        params
+                    });
                 }
             },
             // 检查登录
@@ -230,41 +253,46 @@ export default {
                     identity: []
                 };
                 this.$store.commit('setToken', '');
+                // 断开IM链接
+                im.disconnect()
             },
-        copy(data){
+            copy(data) {
                 uni.setClipboardData({
                     data: data,
-                success: function () {
+                    success: function() {
                         uni.showToast({
-                        title:'复制成功',
+                            title: '复制成功',
-                        icon:'none'
+                            icon: 'none'
                         })
                     }
                 });
             }
         }
-};
+    };
 </script>
 
 <style lang="scss" scoped>
-.content {
+    .content {
         background: $window-color;
         min-height: 100vh;
-}
+    }
-// 版权信息
+
-.footer-text {
+    // 版权信息
+    .footer-text {
         text-align: center;
         font-size: $title-size-sm;
         padding: $padding $padding $padding * 2;
         color: $text-gray-m;
-}
+    }
-// 用户信息
+
-.info-box {
+    // 用户信息
+    .info-box {
         position: relative;
         background: linear-gradient(to right, #34ce98, #22aa98);
         color: white;
         @extend .ios-top;
-    & > image {
+
+        &>image {
             position: absolute;
             top: 0;
             right: 0;
@@ -272,10 +300,12 @@ export default {
             height: 100%;
             // z-index: 100;
         }
+
         .user-flex {
             position: relative;
             padding: $padding * 2 $padding ($padding * 2 + 60);
             height: 128rpx;
+
             .cover {
                 position: absolute;
                 width: 128rpx;
@@ -285,6 +315,7 @@ export default {
                 box-sizing: border-box;
                 z-index: 100;
             }
+
             .user-content {
                 padding-left: 158rpx;
                 height: 128rpx;
@@ -292,6 +323,7 @@ export default {
                 flex-direction: column;
                 justify-content: center;
                 position: relative;
+
                 .chainAddress {
                     overflow: hidden;
                     white-space: nowrap;
@@ -305,14 +337,17 @@ export default {
                     position: relative;
                     z-index: 200;
                 }
+
                 .name {
                     line-height: 40rpx;
                     font-weight: bold;
                     font-size: $title-size + 8;
                     @extend .nowrap;
                 }
+
                 .tabs {
                     padding-top: 10rpx;
+
                     &-item {
                         background: rgba($color: #000000, $alpha: 0.3);
                         font-size: $title-size-sm - 4;
@@ -320,6 +355,7 @@ export default {
                         line-height: 36rpx;
                         padding: 0 20rpx;
                         border-radius: 20rpx;
+
                         image {
                             width: 26rpx;
                             height: 26rpx;
@@ -331,9 +367,10 @@ export default {
                 }
             }
         }
-}
+    }
-// 会员卡
+
-.vip-card {
+    // 会员卡
+    .vip-card {
         position: relative;
         margin: -60rpx $margin $margin;
         background: linear-gradient(to right bottom, #3e5364, #31364a);
@@ -341,10 +378,12 @@ export default {
         box-sizing: border-box;
         color: #fcc692;
         padding: $padding ($padding + 170) $padding $padding;
+
         .title {
             font-weight: bold;
             font-size: $title-size-lg;
             line-height: 40rpx;
+
             image {
                 width: 32rpx;
                 height: 32rpx;
@@ -353,13 +392,16 @@ export default {
                 margin-bottom: 4rpx;
             }
         }
+
         .subtitle {
             font-size: $title-size-sm;
             margin-top: 10rpx;
+
             .u-notice-bar {
                 padding: 0;
             }
         }
+
         .btn {
             position: absolute;
             right: $margin;
@@ -375,33 +417,39 @@ export default {
             font-size: $title-size-m;
             border-radius: 30rpx;
         }
-}
+    }
-// 订单信息
+
-.order-box {
+    // 订单信息
+    .order-box {
         margin: $margin;
         background: white;
         border-radius: $radius;
         display: flex;
         justify-content: space-between;
+
         &-item {
             width: 25%;
             padding: $padding $padding/2;
             text-align: center;
+
             .icon {
                 width: 48rpx;
                 height: 48rpx;
                 vertical-align: top;
             }
+
             .title {
                 font-size: $title-size-sm;
                 margin-top: $margin/3;
             }
         }
-}
+    }
-// 健康数据
+
-.health-flex {
+    // 健康数据
+    .health-flex {
         display: flex;
         margin: $margin ($margin - 10);
+
         &-item {
             margin: 0 10rpx;
             background: white;
@@ -409,8 +457,10 @@ export default {
             border-radius: $radius;
             padding: $padding;
             box-sizing: border-box;
+
             .title {
                 font-size: $title-size-lg;
+
                 .icon {
                     width: 32rpx;
                     height: 32rpx;
@@ -419,31 +469,37 @@ export default {
                     margin-bottom: 2rpx;
                 }
             }
+
             .num {
                 font-weight: bold;
                 font-size: $title-size + 10;
                 padding: $padding/3 0;
+
                 text {
                     font-size: 70%;
                     padding-left: 10rpx;
                 }
             }
+
             .hith {
                 font-size: $title-size-sm;
                 color: $text-gray;
             }
         }
-}
+    }
-// 模块
+
-.btns-box {
+    // 模块
+    .btns-box {
         background: white;
         margin: $margin;
         border-radius: $radius;
+
         &-item {
             position: relative;
             line-height: 90rpx;
             padding: $padding * 0.6 $padding;
             font-size: $title-size-lg;
+
             &::after {
                 position: absolute;
                 height: 1rpx;
@@ -453,13 +509,16 @@ export default {
                 bottom: 0;
                 background-color: #f9f9f9;
             }
+
             &:last-child::after {
                 display: none;
             }
+
             .forward {
                 position: absolute;
                 right: $margin;
             }
+
             .icon {
                 width: 44rpx;
                 height: 44rpx;
@@ -468,5 +527,5 @@ export default {
                 margin-bottom: 8rpx;
             }
         }
-}
+    }
 </style>

public/userAuth.js

@@ -5,9 +5,17 @@
  * moduleName: 登录
  */
 
-import { router } from '../router'
+import {
-import { keyAuth } from '../apis/interfaces/auth'
+    router
+} from '../router'
+import {
+    keyAuth
+} from '../apis/interfaces/auth'
 import store from '../store'
+import {
+    getImToken
+} from '@/apis/interfaces/im.js'
+import im from '@/utils/im/index.js'
 
 class userAuth {
     constructor() {
@@ -50,7 +58,9 @@ class userAuth {
     // 预登录
     Login() {
         //#ifdef H5
-			router.push({ name: 'Auth' })
+        router.push({
+            name: 'Auth'
+        })
         return
         //#endif
 
@@ -71,7 +81,9 @@ class userAuth {
                     })
                 },
                 fail: err => {
-					router.push({ name: 'Auth' })
+                    router.push({
+                        name: 'Auth'
+                    })
                 },
                 complete() {
                     uni.hideLoading()
@@ -94,6 +106,10 @@ class userAuth {
                     }).then(res => {
                         uni.closeAuthView()
                         store.commit('setToken', res.token_type + ' ' + res.access_token)
+                        // 在这里，登录成功，链接IM服务
+                        getImToken().then(res => {
+                            im.connect(res.token, res.userInfo)
+                        })
                         resolve()
                     }).catch(err => {
                         reject(err)
@@ -103,7 +119,12 @@ class userAuth {
                     uni.closeAuthView()
                     switch (err.code) {
                         case 30002:
-							router.push({ name: 'Auth', params: { keyPhone: 1 }})
+                            router.push({
+                                name: 'Auth',
+                                params: {
+                                    keyPhone: 1
+                                }
+                            })
                             break
                     }
                 }

store/modules/im.js

@@ -2,19 +2,10 @@ import im from "@/utils/im/index.js"
 
 export default {
     state: {
-        newMsg: {},
         friends: {},
         sender: {},
-        // IM连接状态，0是正常
-        connection: 0
     },
     getters: {
-        newMessage(state) {
-            return state.newMsg
-        },
-        connection(state) {
-            return state.connection
-        },
         friends(state) {
             return state.friends
         },
@@ -40,28 +31,14 @@ export default {
         }
     },
     mutations: {
-        newMessage(state, msg) {
-            Vue.set(state, 'newMsg', msg)
-        },
         updateFriends(state, userInfo) {
             Vue.set(state.friends, userInfo.userId, userInfo)
         },
         SET_state_sender(state, userInfo) {
             state.sender = userInfo
-        },
-        SET_connection_status(state, status) {
-            state.connection = status
         }
     },
     actions: {
-        updateConnectionStatus({commit}, status) {
-            commit('SET_connection_status', status)
-        },
-        newMessage({
-            commit
-        }, msg) {
-            commit('newMessage', msg)
-        },
         setSenderInfo({
             commit
         }, userInfo) {

utils/im/index.js

@@ -3,13 +3,20 @@ import * as CallLib from '@/uni_modules/RongCloud-CallWrapper/lib/index'
 import store from '@/store/index.js'
 import {
     getFriends,
-    getUserInfo
+    getUserInfo,
+    getImToken
 } from '@/apis/interfaces/im.js'
 
 const initIm = (KEY) => {
     RongIMLib.init(KEY)
-    CallLib.init({})
+    CallLib.init()
     addListeners()
+    // 初始化的时候 自动链接
+    if (store.getters.getToken !== '') {
+        getImToken().then(res => {
+            connect(res.token, res.userInfo, () => {})
+        })
+    }
 }
 
 const setNotifyBadge = () => {
@@ -19,6 +26,9 @@ const setNotifyBadge = () => {
         count
     }) => {
         if (code === 0) {
+            // #ifdef APP-PLUS
+            plus.runtime.setBadgeNumber(count)
+            // #endif
             if (count > 0) {
                 uni.setTabBarBadge({
                     index: 3,
@@ -52,14 +62,25 @@ const connect = (token, userInfo, callback) => {
     const model = uni.model.friendModel
 
     model.find((err, results) => {
+        console.log('好友列表', results);
         results.map(item => {
             store.dispatch('updateFriends', item)
         })
     })
 }
 
+/**
+ * 断开链接
+ */
 const disconnect = () => {
     RongIMLib.disconnect()
+    // 移除提醒数量
+    // #ifdef APP-PLUS
+    plus.runtime.setBadgeNumber(0)
+    // #endif
+    uni.removeTabBarBadge({
+        index: 3
+    })
 }
 
 // 允许通知的消息类型，触发更新消息列表操作
@@ -89,8 +110,8 @@ function inArray(search, array) {
 const addListeners = () => {
     // 添加连接状态监听函数 
     RongIMLib.addConnectionStatusListener((res) => {
-        console.log('连接状态监', res.data.status);
+        console.log('连接状态监听', res.data.status);
-        store.dispatch('updateConnectionStatus', res.data.status)
+        uni.$emit('onConnectionStatusChange', res.data.status)
     })
     // 添加消息监听函数
     RongIMLib.addReceiveMessageListener((res) => {
@@ -104,7 +125,8 @@ const addListeners = () => {
     CallLib.onCallReceived(({
         data
     }) => {
-        console.log('onCallReceived');
+        console.log('onCallReceived', data)
+
         uni.navigateTo({
             url: '/pages/im/private/call?targetId=' + data.targetId + '&mediaType=' +
                 data.mediaType
@@ -154,7 +176,8 @@ const newMessage = (msg) => {
         syncUserInfo(msg.targetId)
     }
 
-    store.dispatch('newMessage', msg)
+    uni.$emit('onReceiveMessage', msg);
+    // store.dispatch('newMessage', msg)
 }
 
 function syncUserInfo(targetId) {