no msg

xiaofan-linux · Jan 6, 2022 · 0236897 · 0236897
1 parent 46f95e5
commit 0236897
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 32 deletions.
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -16,17 +16,16 @@
                                 </UserAvatar>
                             </li>
                             <template v-if="projectUser.length > 0 && windowWidth > 980">
-                                <li v-for="(item, index) in projectUser" :key="index" v-if="index < projectUserShowNum">
-                                    <UserAvatar :userid="item.userid" :size="36" :borderWitdh="2" :openDelay="0"/>
-                                </li>
-                                <li v-if="projectUser.length > projectUserShowNum" class="more">
-                                    <ETooltip :content="$L('共' + (projectUser.length + 1) + '个成员')">
-                                        <Icon type="ios-more"/>
-                                    </ETooltip>
-                                </li>
-                                <li class="add">
-                                    <Icon type="md-person-add"/>
-                                </li>
+                                <template v-for="(item, index) in projectUser"  v-if="index < projectUserShowNum">
+                                    <li v-if="index + 1 == projectUserShowNum && projectUser.length > projectUserShowNum" class="more">
+                                        <ETooltip :content="$L('共' + (projectUser.length + 1) + '个成员')">
+                                            <Icon type="ios-more"/>
+                                        </ETooltip>
+                                    </li>
+                                    <li>
+                                        <UserAvatar :userid="item.userid" :size="36" :borderWitdh="2" :openDelay="0"/>
+                                    </li>
+                                </template>
                             </template>
                         </ul>
                     </li>
@@ -1176,6 +1175,9 @@ export default {
                     break;
 
                 case "user":
+                    if (this.projectData.owner_userid !== this.userId) {
+                        return;
+                    }
                     const userids = this.projectData.project_user.map(({userid}) => userid);
                     this.$set(this.userData, 'userids', userids);
                     this.$set(this.userData, 'useridbak', userids);

diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss
@@ -64,38 +64,23 @@
                                 margin-left: -6px;
                                 transition: transform 0.2s;
                                 &:hover {
-                                    transform: scale(1.1);
+                                    transform: scale(1.05);
                                 }
                                 &:first-child {
                                     margin-left: 0;
                                 }
-                                &.more,
-                                &.add {
+                                &.more {
                                     display: flex;
                                     align-items: center;
                                     justify-content: center;
                                     font-size: 17px;
-                                    width: 32px;
+                                    width: 30px;
                                     height: 32px;
-                                    border-radius: 50%;
-                                    color: #b4bcce;
-                                    background-color: #fff;
-                                    font-weight: 700;
-                                    border: 2px dashed #8bcf70;
-                                    cursor: pointer;
-                                    z-index: 1;
-                                    > i {
-                                        color: #8bcf70
-                                    }
-                                }
-                                &.more {
-                                    width: 36px;
-                                    transform: translateX(-1px);
+                                    color: #888888;
                                     background-color: transparent;
                                     border-color: transparent;
-                                    &:hover {
-                                        transform: scale(1);
-                                    }
+                                    transform: scale(1) !important;
+                                    z-index: 1;
                                 }
                             }
                         }