Explorar o código

增加群主标签

增加群主标签
Sean hai 3 meses
pai
achega
e95c6716f5
Modificáronse 2 ficheiros con 43 adicións e 4 borrados
  1. 34 3
      src/views/chat/hall.vue
  2. 9 1
      src/views/role/roleList.vue

+ 34 - 3
src/views/chat/hall.vue

@@ -407,8 +407,12 @@
               <div class="rightSlideUserItem" v-for="item in groupUserList" :key="item.user_id">
                 <div class="rightSlideUserItemIcon">
                   <span class="el-dropdown-link">
-                    <img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
-                    <img src="@/assets/chat/user/admin.png" v-else>
+                    <!-- {{ creatorId }} {{ item.user_id }} -->
+                    <div class="rightSlideUserGroupLeader" v-if="creatorId == item.user_id">群主</div>
+                    <div>
+                      <img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
+                      <img src="@/assets/chat/user/admin.png" v-else>
+                    </div>
                   </span>
                 </div>
                 <div class="rightSlideUserItemName">
@@ -965,6 +969,7 @@
               <div class="searchWindowUserIcon">
                 <img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
                 <img src="@/assets/chat/user/admin.png" v-else>
+                <div class="rightSlideUserGroupLeader" v-if="creatorId == item.user_id">群主</div>
                 <div class="searchWindowDeleteUser" @click="editRemoveGroupUser(item.user_id)" v-if="Number(creatorId)==Number(myUserId)&&item.user_id!=myUserId">
                   <i class="el-icon-close"></i>
                 </div>
@@ -3247,7 +3252,20 @@ export default {
               .el-dropdown-link {
                 width: 58px;
                 height: 58px;
-                
+                position: relative;
+                .rightSlideUserGroupLeader{
+                  font-size: 12px;
+                  color: #FEAF50;
+                  background: #FFEAD1;
+                  width: 36px;
+                  height: 20px;
+                  border-radius: 4px;
+                  position: absolute;
+                  bottom: 0;
+                  right: -10px;
+                  text-align: center;
+                  line-height: 20px;
+                }
               }
               .addUserIcon {
                 width: 58px;
@@ -3692,6 +3710,19 @@ export default {
               top: -3px;
               cursor: pointer;
             }
+            .rightSlideUserGroupLeader{
+              font-size: 12px;
+              color: #FEAF50;
+              background: #FFEAD1;
+              width: 36px;
+              height: 20px;
+              border-radius: 4px;
+              position: absolute;
+              bottom: 0;
+              right: -10px;
+              text-align: center;
+              line-height: 20px;
+            }
             img {
               width: 58px;
               height: 58px;

+ 9 - 1
src/views/role/roleList.vue

@@ -145,7 +145,7 @@ export default {
         role_name:"",//角色名称
         rule:[],//权限
         remark:"",//职能描述
-        sort:""//排序
+        sort:0//排序
       },
       expandedKeys:[],//展开的节点  
       checkedKeys:[],//选中的节点 
@@ -276,6 +276,10 @@ export default {
     //4.添加 start ------------------------------------------------------------>
     addData(){
       this.form.id = this.editId;
+      //如果排序不填,默认排序传递数字
+      if(this.form.sort == ""){
+        this.form.sort = 0;
+      }
       //半选的节点
       let supplement = [];
       let allKeys = this.$refs.tree.getHalfCheckedNodes();
@@ -369,6 +373,10 @@ export default {
     //提交编辑
     editData(){
       this.form.id = this.editId;
+      //如果排序不填,默认排序传递数字
+      if(this.form.sort == ""){
+        this.form.sort = 0;
+      }
       //半选的节点
       let supplement = [];
       let allKeys = this.$refs.tree.getHalfCheckedNodes();