From ab6ecab23a2c24fd4c423832bcfa379e6022a948 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 17 Feb 2022 14:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/im/components/friendApplyCell.vue | 47 ++++++++++++++-----------
 pages/im/components/friendApplyList.vue |  3 +-
 pages/im/components/groupUserList.vue   |  9 ++++-
 pages/im/components/sentMessageBar.nvue | 19 ++++------
 pages/im/group/chat.nvue                | 14 +++-----
 pages/im/group/info.vue                 | 40 +++++++++++----------
 pages/im/private/chat.nvue              | 18 ++++------
 7 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/pages/im/components/friendApplyCell.vue b/pages/im/components/friendApplyCell.vue
index e9ed0a2..74ecf13 100644
--- a/pages/im/components/friendApplyCell.vue
+++ b/pages/im/components/friendApplyCell.vue
@@ -1,20 +1,15 @@
 <template>
-    <view class="apply--cell u-border-bottom">
+    <view class="apply--cell">
         <view class="avatar">
             <u-avatar :src="user.portraitUrl || require('@/static/user/cover.png')" shape="square" size="46" />
         </view>
         <view class="info">
-            <view class="name">
-                {{ user.name }}
-            </view>
-            <view class="message">
-                {{ message.message }}
-            </view>
+            <view class="name"> {{ user.name }}</view>
+            <view class="message"> {{ message.message!=='null' ? message.message : '听说你很优秀，想认识下你~' }} </view>
         </view>
-
         <view class="action">
-            <u-button type="success" size="mini" @click="resolve">通过</u-button>
-            <u-button type="warning" size="mini" @click="reject">拒绝</u-button>
+            <u-button class="u-button" size="default" type="success" @click="resolve">通过</u-button>
+            <u-button class="u-button" size="default" type="warning" @click="reject">拒绝</u-button>
         </view>
     </view>
 </template>
@@ -41,15 +36,16 @@
         methods: {
             resolve() {
                 resolveFriend(this.message.sourceUserId).then(res => {
-                    this.clearMessages()
-                    uni.showToast({
-                        icon: 'none',
-                        title: '通过好友申请'
+                    this.clearMessages()
+                    uni.showToast({
+                        icon: 'none',
+                        title: '通过好友申请'
                     })
-                }).catch(err => {
-                    uni.showToast({
-                        icon: 'none',
-                        title: err.message
+                    uni.navigateBack({})
+                }).catch(err => {
+                    uni.showToast({
+                        icon: 'none',
+                        title: err.message
                     })
                 })
             },
@@ -73,7 +69,7 @@
             // 不管是通过还是拒绝，都要把相关的信息清理
             clearMessages() {
                 RongIMLib.deleteMessages(RongIMLib.ConversationType.SYSTEM, this.message.sourceUserId)
-                this.$emit('success')
+                this.$emit('success')
                 uni.$emit('onContactNotification')
             }
         }
@@ -85,6 +81,7 @@
         display: flex;
         padding: $padding;
         align-items: center;
+        border-bottom: solid 1rpx #f9f9f9;
 
         .info {
             flex: 1;
@@ -103,9 +100,19 @@
 
         .action {
             justify-content: space-between;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            box-sizing: border-box;
+
+            .u-button {
+                padding: 10rpx 20rpx !important;
+                font-size: $title-size-m;
+                height: 60rpx !important;
+            }
 
             .u-button+.u-button {
-                margin-top: 10rpx;
+                margin-left: 10rpx;
             }
         }
     }
diff --git a/pages/im/components/friendApplyList.vue b/pages/im/components/friendApplyList.vue
index 10e2762..4fa31b6 100644
--- a/pages/im/components/friendApplyList.vue
+++ b/pages/im/components/friendApplyList.vue
@@ -8,7 +8,7 @@
                 <view class="right">
                     <view class="title">
                         <view class="name">{{ item.name }}</view>
-                        <view class="des">{{ item.latestMessage.message }}</view>
+                        <view class="des">{{ item.latestMessage.message || '--' }}</view>
                     </view>
                     <view class="agress-btn">
                         <span v-if="isAgree" @click="action('agree', item)">通过</span>
@@ -105,6 +105,7 @@ export default {
         .agress-btn {
             display: flex;
             color: #fff;
+            font-size: $title-size-m;
             span {
                 display: inline-block;
                 padding: 6rpx 14rpx;
diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue
index 20d07e2..c6ac887 100644
--- a/pages/im/components/groupUserList.vue
+++ b/pages/im/components/groupUserList.vue
@@ -18,7 +18,9 @@
             </view>
         </view>
 
-        <view @click="loadMore" v-if="members > users.length" class="loadmore">查看更多群成员 ></view>
+       <view class="loadmore">
+            <u-icon name="arrow-right" @click="loadMore" v-if="members > users.length" color="#999" labelColor="#999" label="查看更多群成员" labelPos='left' labelSize='28rpx' size="14" />
+       </view>
 
         <u-action-sheet :actions="actionMap" :title="actionTitle" cancelText="取消" @close="hideAction"
             @select="handleAction" :show="actionShow">
@@ -316,5 +318,10 @@
         font-size: 26rpx;
         color: $text-gray-m;
         text-align: center;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
     }
 </style>
diff --git a/pages/im/components/sentMessageBar.nvue b/pages/im/components/sentMessageBar.nvue
index b09be2e..5e4bc93 100644
--- a/pages/im/components/sentMessageBar.nvue
+++ b/pages/im/components/sentMessageBar.nvue
@@ -3,22 +3,15 @@
         <!-- footer -->
         <view class="footer">
             <view class="msg-type" @click="changeMessageType">
-                <image class="icon" src="@/static/icon/key-icon.png" v-if="chatType === 0" mode="widthFix">
-                </image>
-                <image class="icon" src="@/static/icon/msg-icon.png" v-if="chatType === 1" mode="widthFix">
-                </image>
-            </view>
-            <sent-voice v-if="chatType === 0" :conversationType="conversationType" :targetId="targetId"
-                @success="onSuccess" />
-            <sent-text v-if="chatType === 1" :conversationType="conversationType" :targetId="targetId"
-                @success="onSuccess" />
-            <view class="msg-type msg-popups" @click="showPopups = !showPopups">
-                <image class="icon" src="@/static/icon/popups-icon.png"></image>
+                <image class="icon" src="@/static/icon/key-icon.png" v-if="chatType === 0" mode="widthFix" />
+                <image class="icon" src="@/static/icon/msg-icon.png" v-if="chatType === 1" mode="widthFix" />
             </view>
+            <sent-voice v-if="chatType === 0" :conversationType="conversationType" :targetId="targetId" @success="onSuccess" />
+            <sent-text v-if="chatType === 1" :conversationType="conversationType" :targetId="targetId" @success="onSuccess" />
+            <view class="msg-type msg-popups" @click="showPopups = !showPopups"> <image class="icon" src="@/static/icon/popups-icon.png" /> </view>
         </view>
         <!-- 弹出层 -->
-        <sent-popups :show="showPopups" :conversationType="conversationType" :targetId="targetId"
-            @success="() => {showPopups = false, onSuccess()}"></sent-popups>
+        <sent-popups :show="showPopups" :conversationType="conversationType" :targetId="targetId" @success="() => {showPopups = false, onSuccess()}" />
     </view>
 </template>
 
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index ee6d940..65f1fb1 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -6,19 +6,15 @@
                     <text class="text">{{ item.content.message }}</text>
                 </view>
                 <view v-else :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
-                    <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square"
-                        :src="contact(item.senderUserId).portraitUrl" />
+                    <u-avatar class="avatar" @click="toUser(item)" size="36" shape="square" :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
-                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="contact(item.senderUserId).name" />
-                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="contact(item.senderUserId).name" />
-                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
+                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1" :msg="item.content" :name="contact(item.senderUserId).name" />
                     </view>
                 </view>
             </cell>
-            <cell class="cell-footer" ref="chatBottom"></cell>
+            <cell class="cell-footer" ref="chatBottom" />
         </list>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index 78432ad..fc10f13 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -4,35 +4,34 @@
             <group-user-list :targetId="targetId" :count="14" />
         </view>
 
-        <u-cell-group class="cells">
-            <u-cell isLink title="群公告" :label="announcement" @click="toAnnouncement"></u-cell>
-            <u-cell isLink title="二维码" @click="showGroupQrCode"></u-cell>
-            <u-cell title="聊天置顶">
-                <u-switch slot="value" size="20" v-model="isTop" activeColor="#34CE98" @change="setTop"></u-switch>
+        <u-cell-group class="cells" :border="false" >
+            <u-cell :border="false" class="u-border-bottom" isLink title="群公告" :label="announcement" @click="toAnnouncement" />
+            <u-cell :border="false" class="u-border-bottom" isLink title="二维码" @click="showGroupQrCode" />
+            <u-cell :border="false" class="u-border-bottom" title="聊天置顶">
+                <u-switch slot="value" size="20" v-model="isTop" activeColor="#34CE98" @change="setTop" />
             </u-cell>
-            <u-cell title="免打扰">
-                <u-switch slot="value" size="20" v-model="status" activeColor="#34CE98" @change="setStatus"></u-switch>
+            <u-cell class="u-border-bottom" :border="false" title="免打扰">
+                <u-switch slot="value" size="20" v-model="status" activeColor="#34CE98" @change="setStatus" />
             </u-cell>
         </u-cell-group>
 
-        <u-cell-group class="cells" v-if="group.is_admin">
-            <u-cell isLink title="修改群聊名称" :value="groupName" @click="onGroupName"></u-cell>
-            <u-cell isLink title="修改群头像" @click="onGroupAvatar">
-                <u-avatar slot="value" size="25" shape="square" :src="group.cover"></u-avatar>
+        <u-cell-group class="cells" v-if="group.is_admin" :border="false">
+            <u-cell :border="false" class="u-border-bottom" isLink title="修改群聊名称" :value="groupName" @click="onGroupName" />
+            <u-cell :border="false" class="u-border-bottom" isLink title="修改群头像" @click="onGroupAvatar">
+                <u-avatar slot="value" size="25" shape="square" :src="group.cover" />
             </u-cell>
-            <u-cell isLink v-if="group.is_owner" title="准入方式" :value="joinType" @click="onChangeJoinType"></u-cell>
+            <u-cell :border="false" class="u-border-bottom" isLink v-if="group.is_owner" title="准入方式" :value="joinType" @click="onChangeJoinType" />
         </u-cell-group>
 
-        <view class="cells actions u-border-top" v-if="loaded">
+        <view class="cells actions" v-if="loaded">
             <view class="action u-border-bottom" @click="onClean">清空聊天记录</view>
             <view class="action u-border-bottom" v-if="group.is_owner" @click="onDismiss">解散群聊</view>
             <view class="action u-border-bottom" v-else @click="onQuite">删除并退出</view>
         </view>
 
-        <u-modal negativeTop="300" :show="modalShow" title="修改群名称" showCancelButton @cancel="onHideModal"
-            @confirm="onChangeGroupName">
+        <u-modal negativeTop="300" :show="modalShow" title="修改群名称" showCancelButton @cancel="onHideModal" @confirm="onChangeGroupName">
             <view class="slot-content">
-                <u--input placeholder="群名称" border="surround" focus v-model="groupName"></u--input>
+                <u--input placeholder="群名称" border="surround" focus v-model="groupName" />
             </view>
         </u-modal>
 
@@ -42,9 +41,7 @@
             </view>
         </u-modal>
 
-        <u-action-sheet @select="doAction" :actions="joinTypeMap" cancelText="取消" :show="showActions"
-            @close="showActions=false">
-        </u-action-sheet>
+        <u-action-sheet @select="doAction" :actions="joinTypeMap" cancelText="取消" :show="showActions" @close="showActions=false" />
     </view>
 </template>
 
@@ -339,4 +336,9 @@
             justify-content: center;
         }
     }
+
+    .u-border-bottom {
+        border-bottom: solid 1rpx #f9f9f9 !important;
+    }
+    
 </style>
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue
index ddbb87a..87d0922 100644
--- a/pages/im/private/chat.nvue
+++ b/pages/im/private/chat.nvue
@@ -3,26 +3,20 @@
         <!-- chat -->
         <list class="body" :show-scrollbar="false">
             <cell class="cell" v-for="(item, index) in messages" :key="index">
-                <view class="time">
-                    <text class="text">{{ customCN(item.sentTime) }}</text>
-                </view>
+                <view class="time"> <text class="text">{{ customCN(item.sentTime) }}</text> </view>
                 <view :class="['cell-item', item.messageDirection == 1 ? 'right' : 'left']">
-                    <u-avatar class="avatar" size="36" shape="square" @click="showUser(targetId, item.messageDirection)"
-                        :src="contact(item.senderUserId).portraitUrl" />
+                    <u-avatar class="avatar" size="36" shape="square" @click="showUser(targetId, item.messageDirection)" :src="contact(item.senderUserId).portraitUrl" />
                     <view class="msg">
-                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" />
-                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" />
-                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1"
-                            :msg="item.content" />
+                        <show-voice v-if="item.objectName === 'RC:HQVCMsg'" :guest="item.messageDirection == 1" :msg="item.content" />
+                        <show-image v-if="item.objectName === 'RC:ImgMsg'" :guest="item.messageDirection == 1" :msg="item.content" />
+                        <show-text v-if="item.objectName === 'RC:TxtMsg'" :guest="item.messageDirection == 1" :msg="item.content" />
                         <view class="state" v-if="item.messageDirection == 1">
                             <text class="state-text">{{ item.sentStatus == 50 ? '已读': '未读'}}</text>
                         </view>
                     </view>
                 </view>
             </cell>
-            <cell class="cell-footer" ref="chatBottom"></cell>
+            <cell class="cell-footer" ref="chatBottom" />
         </list>
         <sent-message-bar :conversationType="conversationType" :targetId="targetId" @onSuccess="getNewMessage()" />
     </view>