From 17196b97793ea95059e6399bda4fddef1918f861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Mon, 24 Jan 2022 15:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=81=8A=E8=81=8A=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue            |   3 +-
 pages/im/index.vue | 128 +++++++++++++++++++++------------------------
 2 files changed, 62 insertions(+), 69 deletions(-)

diff --git a/App.vue b/App.vue
index 2fca784..185135f 100644
--- a/App.vue
+++ b/App.vue
@@ -4,7 +4,8 @@
 
     export default {
         onLaunch: function() {
-            // im.initIm('lmxuhwaglu76d')
+            im.initIm('lmxuhwaglu76d')
+			return
             //#ifdef APP-PLUS
             // 获取系统版本号
             getVersions({
diff --git a/pages/im/index.vue b/pages/im/index.vue
index fb3b874..e82ccf3 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -1,25 +1,24 @@
 <template>
-    <view class="content">
+    <view class="contents">
+		<view class="ios-top"></view>
 		<!-- header -->
 		<view class="custom-header">
 			<view class="header-flex">
 				<view class="tabs">
 					<view class="item show">私聊</view>
-					<view class="item">群聊</view>
+					<view class="item" @click="onNav('', {})">群聊</view>
 				</view>
 				<view class="btns">
-					<view class="item">
-						<uni-icons color="#555" custom-prefix="iconfont" type="icon-sousuo" size="22"></uni-icons>
-					</view>
-					<view class="item">
-						<uni-icons color="#555" custom-prefix="iconfont" type="icon-gengduo2" size="22"></uni-icons>
-					</view>
-					<view class="item">
+					<view class="item" @click="onNav('imFriends', {})">
 						<uni-icons color="#555" custom-prefix="iconfont" type="icon-tuandui" size="22"></uni-icons>
 					</view>
+					<view class="item" @click="onNav('', {})">
+						<uni-icons color="#555" custom-prefix="iconfont" type="icon-gengduo2" size="22"></uni-icons>
+					</view>
 				</view>
 			</view>
-		</view>
+		</view>
+		<!-- content -->
         <view v-if="$store.state.token != ''">
             <block v-if="conversations.length < 1">
                 <view class="vertical null-list">
@@ -31,29 +30,22 @@
                 </view>
             </block>
             <block v-else>
-                <u-alert type="warning" v-if="connection != 0" description="网络似乎断开了" :show-icon="true"></u-alert>
-                <view v-for="(item, index) in conversations" :key="index" :class="['message', { 'is-top': item.isTop }]"
-                    @tap="toDetail(item)" @longpress="onLongPress" :data-item="item">
-                    <view class="avatar">
-                        <u-badge numberType="ellipsis" max="99" shape="horn" absolute :offset="[-5, -5]"
-                            :value="item.unreadMessageCount" />
-                        <u-avatar size="44" v-if="!friend(item.targetId).portraitUrl"
-                            :text="friend(item.targetId).name ? friend(item.targetId).name.substring(0,1) : '未'"
-                            font-size="14" randomBgColor></u-avatar>
-                        <u-avatar v-else :src="friend(item.targetId).portraitUrl" size="44">
-                        </u-avatar>
-                    </view>
-
-                    <view class="content">
-                        <view class="header">
+                <u-alert type="warning" v-if="connection != 0" description="网络似乎断开了" :show-icon="true"></u-alert>
+                <view v-for="(item, index) in conversations" :key="index" :class="['message', { 'is-top': item.isTop }]" @tap="toDetail(item)" @longpress="onLongPress" :data-item="item">
+					<view class="avatar">
+						<u-badge numberType="ellipsis" max="99" shape="horn" absolute :offset="[-5, -5]" :value="item.unreadMessageCount" />
+						<u-avatar size="44" v-if="!friend(item.targetId).portraitUrl" shape="square" :text="friend(item.targetId).name ? friend(item.targetId).name.substring(0,1) : '未'" font-size="16" randomBgColor></u-avatar>
+						<u-avatar v-else :src="friend(item.targetId).portraitUrl" shape="square" size="44"></u-avatar>
+					</view>
+					<view class="content">
+						<view class="header">
                             <view class="name">{{ friend(item.targetId).name || '未知用户' }}</view>
                             <view class="time">{{ item.sentTime|timeCustomCN }}</view>
-                        </view>
-                        <view class="preview">{{ item.latestMessage.content || '&nbsp;' }}</view>
-                    </view>
+						</view>
+						<view class="preview">{{ item.latestMessage.content || '' }}</view>
+                    </view>
                 </view>
-
-                <view class="shade" @tap="hidePop">
+                <view class="shade" @tap="hidePop">
                     <view class="pop" :style="popStyle" :class="{'show':showPop}">
                         <view v-for="(item, index) in popButton" :key="index" @tap="pickerMenu" :data-index="index">
                             {{item}}
@@ -77,10 +69,8 @@
     import * as RongIMLib from '@rongcloud/imlib-uni'
     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 {
@@ -164,7 +154,7 @@
                 this.getConversationList()
                 this.hidePop()
             },
-            onLongPress(e) {
+            onLongPress(e) {
                 let [touches, style, item] = [e.touches[0], "", e.currentTarget.dataset.item]
 
                 if (touches.clientY > (this.winSize.height / 2)) {
@@ -213,7 +203,20 @@
                     url: '/pages/im/private/index?targetId=' + item.targetId + '&conversationType=' + item
                         .conversationType
                 })
-            }
+            },
+			// 点击按钮
+			onNav(name, params){
+				if(this.toLogin){
+					if(name === ''){
+						uni.showToast({
+							title: '开发中，敬请期待',
+							icon : 'none'
+						})
+						return
+					}
+					this.$Router.push({name, params})
+				}
+			}
         }
     }
 </script>
@@ -227,7 +230,7 @@
 		top: 0;
 		left: 0;
 		right: 0;
-		z-index: 99;
+		z-index: 9999;
 		.header-flex{
 			padding: 20rpx $padding;
 			display: flex;
@@ -261,15 +264,15 @@
 		}
 	}
 	
-	// content
-    .content {
+	// contents
+    .contents {
         background-color: $window-color;
-        min-height: 100vh;
-
+        min-height: 100vh;
+		padding-top: 90rpx;
+		box-sizing: border-box;
         .null-list {
             height: 100vh;
             text-align: center;
-
             &-btn {
                 margin-top: $margin * 2;
                 line-height: 70rpx;
@@ -281,57 +284,46 @@
                 box-sizing: border-box;
             }
         }
-
         .message {
-            position: relative;
-            display: flex;
-            background: white;
-            padding: 24rpx 24rpx 20rpx 24rpx;
-
+            background: white;
+			padding: 20rpx 30rpx;
+			position: relative;
+			display: flex;
             &.is-top {
-                background: $window-color;
-            }
-
-            .avatar {
-                position: relative;
-
+                background: $window-color;
+            }
+            .avatar {
+				position: relative;
                 .u-badge {
-                    z-index: 999;
+                    z-index: 998;
                 }
             }
-
-            .content {
-                margin-left: 16rpx;
+            .content {
+				padding-left: 30rpx;
                 flex: 1;
-
                 .header {
                     display: flex;
                     justify-content: space-between;
-
                     .name {
-                        font-size: 36rpx
+                        font-size: $title-size + 4;
                     }
-
                     .time {
-                        font-size: 24rpx;
+                        font-size: $title-size-sm;
                         color: $text-gray;
                     }
                 }
-
                 .preview {
-                    width: 520rpx;
                     word-break: break-all;
                     color: $text-gray;
-                    font-size: 26rpx;
+                    font-size: $title-size-sm;
                     @extend .nowrap;
                 }
             }
         }
-
         .message:not(:last-child) {
             &::after {
                 position: absolute;
-                left: $padding + 108;
+                left: calc(44px + #{$padding} + 30rpx);
                 right: 0;
                 bottom: 0;
                 content: " ";