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

pages/im/friends/index.vue

@@ -1,6 +1,5 @@
 <template>
     <view>
-        <block v-if="friends.length > 0">
         <u-index-list :index-list="indexs" inactiveColor="#666" activeColor="#34CE98">
             <view>
                 <view class="friend-flex" @click="toPending">
@@ -12,6 +11,7 @@
                     <view class="name">我的群聊</view>
                 </view>
             </view>
+            <block v-if="friends.length > 0">
                 <template v-for="(item, friend) in friends">
                     <!-- #ifdef APP-NVUE -->
                     <u-index-anchor :text="indexs[friend]" bgColor="#F3F6FB" height="20" size="12" color="#666"></u-index-anchor>
@@ -20,105 +20,95 @@
                         <!-- #ifndef APP-NVUE -->
                         <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">
+                        <view
+                            v-for="(friendItem, index) in item"
+                            :key="friendItem.userId"
+                            class="friend-flex"
+                            @click="$Router.push({ name: 'imFriendsInfo', params: { id: friendItem.userId } })"
+                        >
                             <block v-if="friendItem.portraitUrl != ''">
                                 <u-avatar class="cover" size="40" shape="square" :src="friendItem.portraitUrl || ''" :default-url="require('@/static/user/cover.png')"></u-avatar>
                             </block>
-							<block v-else>
+                            <block v-else><u-avatar class="cover" size="40" shape="square" :src="require('@/static/user/cover.png')"></u-avatar></block>
-								<u-avatar class="cover" size="40" shape="square" :src="require('@/static/user/cover.png')"></u-avatar>
+                            <view class="name">{{ friendItem.name }}</view>
-							</block>
-							<view class="name">{{friendItem.name}}</view>
                         </view>
                     </u-index-item>
                 </template>
+            </block>
+            <block v-else><u-empty class="pages-null" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" text="暂无好友"></u-empty></block>
         </u-index-list>
-        </block>
-        <block v-else>
-            <u-empty class="pages-null" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" text="暂无好友">
-            </u-empty>
-        </block>
     </view>
 </template>
 
 <script>
-    import {
+import { getFriends } from '@/apis/interfaces/im';
-        getFriends
+export default {
-    } from '@/apis/interfaces/im'
-    export default {
     data() {
         return {
-				indexs : [],
+            indexs: [],
             friends: []
-            }
+        };
     },
     onShow() {
         getFriends().then(res => {
-				this.indexs  = res.indexList
+            this.indexs = res.indexList;
-                this.friends = res.itemArr
+            this.friends = res.itemArr;
-				
-				console.log(res.itemArr)
-            })
-        },
-        computed: {
 
+            console.log(res.itemArr);
+        });
     },
+    computed: {},
     methods: {
         // 扫码提示
         showToast() {
             uni.showToast({
-                    title: "群聊功能暂未开放，敬请期待",
+                title: '群聊功能暂未开放，敬请期待',
-                    icon: "none"
+                icon: 'none'
-                })
+            });
         },
         // 新朋友
         toPending() {
             uni.navigateTo({
                 url: '/pages/im/friends/pending'
-                })
+            });
-            },
-            // 用户资料
-            toInfo(targetId) {
-                uni.navigateTo({
-                    url: '/pages/im/friends/info?targetId=' + targetId
-                })
         }
     },
     onNavigationBarButtonTap(e) {
-            this.toPending()
+        this.toPending();
-        }
     }
+};
 </script>
 
 <style lang="scss" scoped>
-    // 页面空
+// 页面空
-    .pages-null {
+.pages-null {
     height: 70vh;
-    }
+}
-	// 好友列表
+// 好友列表
-	.friend-flex{
+.friend-flex {
     position: relative;
     padding: 20rpx $padding;
     display: flex;
     flex-direction: row;
     align-items: center;
     // .cover
-		.name{
+    .name {
         flex: 1;
         padding-left: $padding;
         font-size: $title-size;
         @extend .nowrap;
     }
-		&::after{
+    &::after {
         position: absolute;
         height: 1rpx;
         background: $border-color;
         left: calc(40px + #{$padding * 2});
         right: 0;
         bottom: 0;
-			content: " ";
+        content: ' ';
     }
-		&:last-child::after{
+    &:last-child::after {
         display: none;
     }
-	}
+}
 </style>

pages/im/friends/info.vue

@@ -38,12 +38,9 @@
                 userInfo: {}
             }
         },
-        onLoad(e) {
+		mounted() {
-            this.targetId = e.targetId
+			getUserInfo(this.$Route.query.id).then(res => {
-            console.log('获取资料',e.targetId);
-            getUserInfo(e.targetId).then(res => {
 			    this.userInfo = res
-                console.log('获取资料', res);
 			    uni.setNavigationBarTitle({
 			        title: res.name
 			    })

pages/im/friends/mine.vue

@@ -1,11 +1,29 @@
 <template>
     <div>
         我的资料，也就展示个二维码吧
+		获取一波资料吧
     </div>
 </template>
 
 <script>
+	import { getUserInfo } from '@/apis/interfaces/im'
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		mounted() {
+			console.log(this.$Route)
+			// getUserInfo(this.$Route.query.id).then(res => {
+				
+			// })
+		},
+		methods: {
+			
+		}
+	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 </style>

pages/im/private/index.vue

@@ -12,10 +12,8 @@
                     <view class="chat-status" :class="{'hide': item.sentStatus == 50}"
                         v-if="item.messageDirection == 1">{{ item.sentStatus == 50 ? '已读': '未读'}}</view>
                     <view class="chat-avatar">
-                        <u-avatar v-if="item.messageDirection == 2" bg-color="#ffffff" :src="userInfo.portraitUrl"
+                        <u-avatar v-if="item.messageDirection == 2" bg-color="#ffffff" :src="userInfo.portraitUrl" @click="showFriend(targetId)"></u-avatar>
-                            @click="showFriend(targetId)"></u-avatar>
+                        <u-avatar v-else @click="showMine" bg-color="#ffffff" :src="$store.getters.sender.portraitUrl" />
-                        <u-avatar v-else @click="showMine" bg-color="#ffffff"
-                            :src="$store.getters.sender.portraitUrl" />
                     </view>
                 </view>
                 <view class="chat-item-time" :id="'chatId_'+index">
@@ -249,6 +247,7 @@
                     .chat-avatar {
                         position: absolute;
                         top: 0;
+                        background: white;
                     }
 
                     &.left {