From 18d5c7c4cdfe4dc7da592d02d2bfdf909aa10b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Wed, 26 Jan 2022 14:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=B5=84=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json              |  28 ++++++--
 pages/im/friends/mine.vue  | 142 ++++++++++++++++++++++++++++++++++---
 pages/im/private/index.vue |  20 +++---
 scss/globa.scss            |   2 +-
 4 files changed, 163 insertions(+), 29 deletions(-)

diff --git a/manifest.json b/manifest.json
index 52e871e..fe85297 100644
--- a/manifest.json
+++ b/manifest.json
@@ -112,17 +112,31 @@
             }
         },
         "nativePlugins" : {
+            "RongCloud-Call" : {
+                "__plugin_info__" : {
+                    "name" : "RCUniCall",
+                    "description" : "融云实时音视频 SDK uni 原生插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=6372",
+                    "android_package_name" : "io.zhhealth.app",
+                    "ios_bundle_id" : "io.zhhealth.app",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "6372",
+                    "parameters" : {}
+                }
+            },
             "RongCloud-IM" : {
                 "__plugin_info__" : {
                     "name" : "RCUniIM",
-                    "description" : "融云 uni 原生插件",
+                    "description" : "融云即时通讯 SDK uni 原生插件",
                     "platforms" : "Android,iOS",
-                    "url" : "",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=6120",
+                    "android_package_name" : "io.zhhealth.app",
+                    "ios_bundle_id" : "io.zhhealth.app",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "6120",
                     "parameters" : {}
                 }
             }
diff --git a/pages/im/friends/mine.vue b/pages/im/friends/mine.vue
index 2de033d..43dfdf3 100644
--- a/pages/im/friends/mine.vue
+++ b/pages/im/friends/mine.vue
@@ -1,8 +1,45 @@
 <template>
-    <div>
-        我的资料，也就展示个二维码吧
-		获取一波资料吧
-    </div>
+    <view class="content">
+        <!-- 用户信息 -->
+        <view class="info-flex">
+            <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>
+            </view>
+        </view>
+        <!-- 按钮组 -->
+        <view class="info-btns">
+            <view class="item">
+                <label>性别</label>
+                <view class="text">{{infoObj.gender === 0 ? '男': '女'}}</view>
+            </view>
+            <view class="item">
+                <label>地址二维码</label>
+                <u-icon name="arrow-right" color="#999" size="14"></u-icon>
+            </view>
+        </view>
+        <!-- footer -->
+        <view class="footer">
+            <view class="footer-item">
+                <view class="icon">
+                    <u-icon class="icon-u" name="chat-fill" color="#fff" size="26"></u-icon>
+                </view>
+                <view class="text">发消息</view>
+            </view>
+            <view class="footer-item">
+                <view class="icon">
+                    <u-icon class="icon-u" name="chat-fill" color="#fff" size="26"></u-icon>
+                </view>
+                <view class="text">发消息</view>
+            </view>
+        </view>
+    </view>
 </template>
 
 <script>
@@ -10,14 +47,25 @@
 	export default{
 		data(){
 			return{
-				
+				infoObj: {
+                    userId      : '',
+                    username    : '',
+                    name        : '',
+                    address     : '',
+                    portraitUrl : '',
+                    gender      : 0,
+                    hash        : ''
+                }
 			}
 		},
+        onLoad(e){
+            console.log(e)
+        },
 		mounted() {
-			console.log(this.$Route)
-			// getUserInfo(this.$Route.query.id).then(res => {
-				
-			// })
+			getUserInfo(this.$Route.query.targetId).then(res => {
+                this.infoObj = res
+                console.log(this.infoObj)
+			})
 		},
 		methods: {
 			
@@ -26,4 +74,80 @@
 </script>
 
 <style lang="scss" scoped>
+    .content{
+        background: $window-color;
+        min-height: 100vh;
+        // footer
+        .footer{
+            position: fixed;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            padding: $padding*2 $padding;
+            display: flex;
+            justify-content: space-around;
+            .footer-item{
+                margin: 0 $margin/2;
+                .icon{
+                    background: $main-color;
+                    width: 88rpx;
+                    height: 88rpx;
+                    line-height: 88rpx;
+                    display: inline-block;
+                    border-radius: 50%;
+                    .icon-u{
+                        margin-top: calc((88rpx/2) - 13px);
+                        margin-left: calc((88rpx/2) - 13px);
+                    }
+                }
+                .text{
+                    color: $main-color;
+                    font-size: $title-size-m;
+                    text-align: center;
+                    padding-top: 10rpx;
+                }
+            }
+        }
+        // 用户信息
+        .info-flex{
+            padding: $padding;
+            display: flex;
+            .info-text{
+                width: calc(100% - 50px);
+                padding-left: $padding;
+                box-sizing: border-box;
+                .nickname{
+                    line-height: 30px;
+                    font-size: $title-size + 6;
+                    color: $text-color;
+                }
+                .address{
+                    line-height: 20px;
+                    font-size: $title-size-lg;
+                    color: $text-gray;
+                    @extend .nowrap;
+                }
+            }
+        }
+        // 用户信息
+        .info-btns{
+            background: white;
+            margin: 0 $margin;
+            border-radius: $radius;
+            .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{
+                    border-bottom: none;
+                }
+                .text{
+                    color: $text-gray-m;
+                }
+            }
+        }
+    }
 </style>
diff --git a/pages/im/private/index.vue b/pages/im/private/index.vue
index a457798..430e60c 100644
--- a/pages/im/private/index.vue
+++ b/pages/im/private/index.vue
@@ -17,10 +17,10 @@
                         <!-- 预留一些图片，语音表情包等位置 -->
                     </view>
                     <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" shape="square" bg-color="#ffffff" :src="userInfo.portraitUrl" @click="showFriend(targetId)"></u-avatar>
-                        <u-avatar v-else @click="showMine" shape="square" bg-color="#ffffff" :src="$store.getters.sender.portraitUrl" />
+                        v-if="item.messageDirection == 1">{{targetId}}{{ item.sentStatus == 50 ? '已读': '未读'}}</view>
+                    <view class="chat-avatar" @click="showFriend(targetId, item.messageDirection)">
+                        <u-avatar v-if="item.messageDirection == 2" shape="square" bg-color="#ffffff" :src="userInfo.portraitUrl"></u-avatar>
+                        <u-avatar v-else shape="square" bg-color="#ffffff" :src="$store.getters.sender.portraitUrl" />
                     </view>
                 </view>
                 <view class="chat-item-time" :id="'chatId_'+index">
@@ -253,14 +253,10 @@
                     this.inputTxt = ''
                 })
             },
-            showFriend(targetId) {
-                uni.navigateTo({
-                    url: '/pages/im/friends/info?targetId=' + targetId
-                })
-            },
-            showMine() {
-                uni.navigateTo({
-                    url: '/pages/im/friends/mine'
+            showFriend(targetId, type) {
+                this.$Router.push({
+                    name: type === 1 ? 'imFriendsMine' : 'imFriendsInfo',
+                    params: {targetId}
                 })
             },
             scrollBottom() {
diff --git a/scss/globa.scss b/scss/globa.scss
index dccdb6a..7dd07fc 100644
--- a/scss/globa.scss
+++ b/scss/globa.scss
@@ -13,7 +13,7 @@ $text-price: #e6576b;
 $main-color: #34CE98;
 
 // 边框颜色
-$border-color: #ddd;
+$border-color: #f5f5f5;
 
 // 全局窗口色
 $window-color: #F3F6FB;