调整目录结构

manifest.json

@@ -2,8 +2,8 @@
     "name" : "ZH-HEALTH",
     "appid" : "__UNI__C29473D",
     "description" : "ZH-HEALTH，您手上的健康管理专家",
-    "versionName" : "1.0.15",
+    "versionName" : "1.0.16",
-    "versionCode" : 113,
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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,

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>
-export default {
+    import imBase from '../mixins/imBase.js'
+    
+    export default {
+        mixins:[
+            imBase
+        ],
         name: 'friend-apply-reject-agree',
         props: {
             lists: {
@@ -50,16 +56,23 @@ 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
+                });
             }
         }
-};
+    };
 </script>
 
 <style lang="scss" scoped>
-.lists {
+    .lists {
         padding: 0 $padding;
         display: flex;
         flex-direction: row;
@@ -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,25 +119,29 @@ 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;
                 }
             }
         }
-}
+    }
 </style>

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

@@ -38,7 +38,7 @@
         transferGroupOwner
     } from '@/apis/interfaces/im.js'
     import utils from '@/utils/index.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [

pages/im/components/messageCell.vue

@@ -21,7 +21,7 @@
 <script>
     import messagePreview from './messagePreview'
     import utils from '@/utils/index.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
         mixins: [

pages/im/components/show/showCall.vue

@@ -11,8 +11,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 +42,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')

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,11 +42,6 @@
             },
             content() {
                 return this.message.content
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
             }
         },
         methods: {

pages/im/components/show/showText.vue

@@ -11,6 +11,7 @@
 
 <script>
     import messageState from './messageState'
+    import imBase from '../../mixins/imBase.js'
     
     export default {
         name: 'showText',
@@ -35,11 +36,6 @@
             },
             content() {
                 return this.message.content.content
-            },
-            contact() {
-                return function(targetId) {
-                    return this.$store.getters.contactInfo(targetId)
-                }
             }
         }
     }

pages/im/components/show/showVoice.vue

@@ -23,6 +23,7 @@
 <script>
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import messageState from './messageState'
+    import imBase from '../../mixins/imBase.js'
     
     export default {
         props: {
@@ -54,11 +55,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

pages/im/components/showMessageCell.vue

@@ -32,7 +32,7 @@
     import showText from './show/showText'
     import showCall from './show/showCall'
     import utils from '@/utils/index.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [
@@ -72,7 +72,7 @@
             toAnnounce(targetId) {
                 if (targetId) {
                     uni.navigateTo({
-                        url: '/pages/im/group/announceCreate?targetId=' + this.targetId
+                        url: '/pages/im/group/announceCreate?type=check&targetId=' + this.targetId
                     })
                 } else {
                     uni.showToast({

pages/im/friends/index.vue

@@ -39,7 +39,7 @@
     } 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 '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [

pages/im/friends/mine.vue

@@ -23,7 +23,8 @@
 <script>
     import {
         getUserInfo
-    } from '@/apis/interfaces/im'
+    } from '@/apis/interfaces/im.js'
+    
     export default {
         data() {
             return {

pages/im/friends/pending.vue

@@ -43,7 +43,7 @@
         methods: {
             getPendingList() {
                 im.getPendingList((pendings) => {
-                    console.log(pendings,'res......')
+                    console.log(pendings, 'res......')
                     if (pendings.length > 0) {
                         this.bg = '#f9f9f9'
                     } else {

pages/im/friends/search.vue

@@ -32,6 +32,7 @@
         pedingFriend
     } from '@/apis/interfaces/im.js';
     import applyFriend from '../components/friendSearchList.vue';
+
     export default {
         components: {
             applyFriend

pages/im/group/announceCreate.vue

@@ -16,7 +16,7 @@
         createGroupAnnouncement,
         getGroupAnnouncement
     } from '@/apis/interfaces/im.js'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
 
     export default {
         mixins: [

pages/im/group/announcement.vue

@@ -35,8 +35,8 @@
         deleteGroupAnnouncement,
         topGroupAnnouncement
     } from '@/apis/interfaces/im.js'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [

pages/im/group/apply.vue

@@ -20,8 +20,8 @@
         joinGroupPre,
         joinGroup
     } from '@/apis/interfaces/im.js'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [

pages/im/group/chat.vue

@@ -21,8 +21,8 @@
     import sentMessageBar from '../components/sentMessageBar'
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         mixins: [

pages/im/group/info.vue

@@ -57,8 +57,8 @@
     } from '@/apis/interfaces/uploading'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
     import groupUserList from '../components/groupUserList'
-    import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
     
     export default {
         components: {

pages/im/group/invite.vue

@@ -47,7 +47,7 @@
     import utils from '@/utils/index.js'
     import onGroupDismiss from '@/utils/im/onGroupDismiss.js'
     import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
         mixins: [

pages/im/group/reviewed.vue

@@ -34,8 +34,8 @@
     } 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 '@/utils/im/onGroupDismiss.js'
+    import onGroupDismiss from '../mixins/onGroupDismiss.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
         mixins: [

pages/im/group/users.vue

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

pages/im/index.vue

@@ -46,7 +46,8 @@
             return {
                 conversations: [], // 会话列表
                 connection: 0,
-                hasNewFriends: 0
+                hasNewFriends: 0,
+                perPage: 200
             }
         },
         components: {
@@ -101,9 +102,7 @@
             },
             // 获取会话列表，最新的一千条
             getConversationList() {
-                const count = 200
+                RongIMLib.getConversationList([1, 3], this.perPage, 0, ({
-                const timestamp = 0
-                RongIMLib.getConversationList([1, 3], count, timestamp, ({
                     code,
                     conversations
                 }) => {

pages/im/private/chat.vue

@@ -18,7 +18,7 @@
     import sentMessageBar from '../components/sentMessageBar'
     import showMessageCell from '../components/showMessageCell'
     import utils from '@/utils/index.js'
-    import imBase from '@/utils/im/imBase.js'
+    import imBase from '../mixins/imBase.js'
 
     export default {
         mixins: [