Procházet zdrojové kódy

修改bug

修改bug
Sean před 3 měsíci
rodič
revize
a105d50286

binární
src/assets/chat/editGroup.png


+ 9 - 5
src/views/chat/contacts.vue

@@ -506,11 +506,15 @@ export default {
       }
       //this.editFriendId
       this.$store.dispatch('chat/updateFriend',data).then(res=> {
-        this.$message.success('修改备注名成功!')
-        this.pagestatus = 1;
-        this.editWindowStatus = false;
-        this.getUserFriendList();
-        this.remark = "";
+        if(res.code==200){
+          this.$message.success('修改备注名成功!')
+          this.pagestatus = 1;
+          this.editWindowStatus = false;
+          this.getUserFriendList();
+          this.remark = "";
+        }else{
+          this.$message.error(res.message)
+        }
       }).catch(() => {
         this.$message.error('修改备注名失败!')
       })

+ 1 - 1
src/views/chat/creatTopic.vue

@@ -41,7 +41,7 @@
             </el-form-item>
             <div>
               <el-form-item label="群聊名称:" prop="group_name" class="custom-align-right" v-if="form.is_group=='1'">
-                <el-input v-model="form.group_name" autocomplete="off" placeholder="请输入群聊名称" :disabled="groupStatus"></el-input>
+                <el-input v-model="form.group_name" autocomplete="off" placeholder="请输入群聊名称" :disabled="groupStatus" maxlength="20"></el-input>
               </el-form-item>
               <el-form-item label="作者:" class="custom-align-right">
                 <el-input v-model="form.author" autocomplete="off" placeholder="请输入作者名"></el-input>

+ 25 - 13
src/views/chat/hall.vue

@@ -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;
+              }
             }
           }
         }