|
|
@@ -610,7 +610,7 @@
|
|
|
:disabled="Number(item.friend_id) == Number(creatorId) || groupUserList.includes(item.friend_id)"></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!=''">{{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>
|
|
|
@@ -630,7 +630,7 @@
|
|
|
<i class="el-icon-close"></i>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="searchWindowUserName" v-if="item.remark!=null">{{item.remark}}</div>
|
|
|
+ <div class="searchWindowUserName" v-if="item.remark!=null&&item.remark!=''">{{item.remark}}</div>
|
|
|
<div class="searchWindowUserName" v-else>{{item.user_name}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -957,7 +957,8 @@
|
|
|
</div>
|
|
|
<div class="searchFriendButton">
|
|
|
<el-button v-if="groupSearchUser.status==false" type="primary" @click="addGroupUser(groupSearchUser)">添加</el-button>
|
|
|
- <el-button v-else type="warning" @click="addGroupUser(groupSearchUser)">移除</el-button>
|
|
|
+ <el-button v-else-if="Number(creatorId)==Number(myUserId)" type="warning" @click="addGroupUser(groupSearchUser)" >移除</el-button>
|
|
|
+ <el-button v-else type="warning" @click="addGroupUser(groupSearchUser)" disabled>移除</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!--搜索用户弹出框 end------------------------------------------------------------>
|
|
|
@@ -1054,7 +1055,7 @@
|
|
|
<div class="shareCardItem">
|
|
|
<img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
|
|
|
<img src="@/assets/chat/user/admin.png" v-else>
|
|
|
- <div class="shareCardName" v-if="item.remark!=null">{{item.remark}}</div>
|
|
|
+ <div class="shareCardName" v-if="item.remark!=null&&item.remark!=''">{{item.remark}}</div>
|
|
|
<div class="shareCardName" v-else>{{item.user_name}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1069,7 +1070,7 @@
|
|
|
<div class="shareCardItem">
|
|
|
<img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
|
|
|
<img src="@/assets/chat/user/group.jpg" v-else>
|
|
|
- <div class="shareCardName" v-if="item.remark!=null">{{item.remark}}</div>
|
|
|
+ <div class="shareCardName" v-if="item.remark!=null&&item.remark!=''">{{item.remark}}</div>
|
|
|
<div class="shareCardName" v-else>{{item.name}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1099,7 +1100,7 @@
|
|
|
<div class="shareCardItem">
|
|
|
<img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
|
|
|
<img src="@/assets/chat/user/admin.png" v-else>
|
|
|
- <div class="shareCardName" v-if="item.remark!=null">{{item.remark}}</div>
|
|
|
+ <div class="shareCardName" v-if="item.remark!=null&&item.remark!=''">{{item.remark}}</div>
|
|
|
<div class="shareCardName" v-else>{{item.user_name}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1114,7 +1115,7 @@
|
|
|
<div class="shareCardItem">
|
|
|
<img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
|
|
|
<img src="@/assets/chat/user/group.jpg" v-else>
|
|
|
- <div class="shareCardName" v-if="item.remark!=null">{{item.remark}}</div>
|
|
|
+ <div class="shareCardName" v-if="item.remark!=null&&item.remark!=''">{{item.remark}}</div>
|
|
|
<div class="shareCardName" v-else>{{item.name}}</div>
|
|
|
</div>
|
|
|
</div>
|
Sean