|
@@ -500,17 +500,20 @@
|
|
|
<div class="groupSystem">
|
|
|
<div class="groupChatSystem">
|
|
|
<div class="groupChatTitle">群聊名称</div>
|
|
|
- <div class="groupChatText" @click="editGroupNameWindow=true">
|
|
|
- {{this.messageTitle}}
|
|
|
+ <div class="groupChatText">
|
|
|
+ <div class="groupChatTextContent">{{this.messageTitle}}</div>
|
|
|
+ <img src="@/assets/chat/editGroup.png" @click="editGroupNameWindow=true">
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="groupChatSystem">
|
|
|
<div class="groupChatTitle">群公告</div>
|
|
|
- <div class="groupChatText" v-if="this.groupProfile!=''" @click="editGroupNoticeWindow=true">
|
|
|
- {{this.groupProfile}}
|
|
|
+ <div class="groupChatText" v-if="this.groupProfile!=''">
|
|
|
+ <div class="groupChatTextContent">{{this.groupProfile}}</div>
|
|
|
+ <img src="@/assets/chat/editGroup.png" @click="editGroupNoticeWindow=true" v-if="Number(this.myUserId)==Number(this.creatorId)">
|
|
|
</div>
|
|
|
- <div class="groupChatText" v-else @click="editGroupNoticeWindow=true">
|
|
|
+ <div class="groupChatText" v-else>
|
|
|
暂无群公告
|
|
|
+ <img src="@/assets/chat/editGroup.png" @click="editGroupNoticeWindow=true" v-if="Number(this.myUserId)==Number(this.creatorId)">
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- <div class="groupChatSystem">
|
|
@@ -605,7 +608,7 @@
|
|
|
<el-checkbox v-model="item.status"></el-checkbox>
|
|
|
<img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
|
|
|
<img src="@/assets/chat/user/admin.png" v-else>
|
|
|
- <div class="searchUserName" v-if="item.remark!=null">{{item.remark}}</div>
|
|
|
+ <div class="searchUserName" v-if="item.remark!=null||item.remark!=''">{{item.remark}}</div>
|
|
|
<div class="searchUserName" v-else>{{item.user_name}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -879,7 +882,7 @@
|
|
|
<el-dialog :visible.sync="editGroupNameWindow" title="编辑群名称" :close-on-click-modal="false" width="420px">
|
|
|
<div>
|
|
|
<div>
|
|
|
- <el-input type="textarea" resize="none" v-model="messageTitle" placeholder="请输入"></el-input>
|
|
|
+ <el-input type="textarea" resize="none" v-model="messageTitle" placeholder="请输入" maxlength="20"></el-input>
|
|
|
</div>
|
|
|
<div class="footerButtonBox">
|
|
|
<el-button type="info" @click="editGroupNameWindow=false">取消</el-button>
|
|
@@ -932,9 +935,9 @@
|
|
|
</div>
|
|
|
<div class="searchFriendInfo">
|
|
|
<div class="searchFriendName">
|
|
|
- <div class="searchFriendNameText">{{groupSearchUser.user_name}}</div>
|
|
|
+ <div class="searchFriendNameText">{{groupSearchUser.nickname}}</div>
|
|
|
</div>
|
|
|
- <div class="searchFriendPhone">账号:{{groupSearchUser.user_name}}</div>
|
|
|
+ <div class="searchFriendPhone">账号:{{groupSearchUser.nickname}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="searchFriendButton">
|
|
@@ -2207,7 +2210,7 @@ export default {
|
|
|
console.log("监听消息:",message)
|
|
|
|
|
|
//先判断是否为群消息
|
|
|
- if (message.receiver_id.length == 18) {
|
|
|
+ if (message.receiver_id && message.receiver_id.length == 18) {
|
|
|
//18位就是群聊
|
|
|
if(Number(this.myUserId) == Number(message.user_id)){
|
|
|
//如果message的receiverId和会话的receiverId一致,说明这条信息是自己发的回显
|
|
@@ -3380,9 +3383,18 @@ export default {
|
|
|
overflow: hidden;
|
|
|
font-size: 18px;
|
|
|
color: #999;
|
|
|
- cursor: pointer;
|
|
|
- white-space: nowrap;
|
|
|
- text-overflow: ellipsis;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
+ img {
|
|
|
+ cursor: pointer;
|
|
|
+ }
|
|
|
+ .groupChatTextContent {
|
|
|
+ width: 300px;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ white-space: nowrap;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|