diff --git a/resources/assets/js/components/UserAvatar/index.vue b/resources/assets/js/components/UserAvatar/index.vue index d2c85a6fa..8758d78c0 100755 --- a/resources/assets/js/components/UserAvatar/index.vue +++ b/resources/assets/js/components/UserAvatar/index.vue @@ -9,7 +9,7 @@ :class="boxClass" :style="boxStyle" :title="showName ? undefined : user.nickname"> - + {{nickname}} diff --git a/resources/assets/js/components/UserAvatar/mixin.js b/resources/assets/js/components/UserAvatar/mixin.js index fbf958e1b..22f35900e 100644 --- a/resources/assets/js/components/UserAvatar/mixin.js +++ b/resources/assets/js/components/UserAvatar/mixin.js @@ -34,6 +34,10 @@ export default { }, userResult: { default: null + }, + showStateDot: { + type: Boolean, + default: true } } } diff --git a/resources/assets/js/components/UserAvatar/tip.vue b/resources/assets/js/components/UserAvatar/tip.vue index cb058fb46..2856d457e 100755 --- a/resources/assets/js/components/UserAvatar/tip.vue +++ b/resources/assets/js/components/UserAvatar/tip.vue @@ -11,9 +11,6 @@

{{$L('删除时间')}}: {{user.delete_at}}

{{$L('离职时间')}}: {{user.disable_at}}

-
- -
@@ -42,10 +40,6 @@ export default { type: Boolean, default: false }, - showIconMenu: { - type: Boolean, - default: false - }, tooltipPlacement: { type: String, default: 'bottom' @@ -75,26 +69,12 @@ export default { }, computed: { - showMenu() { - if (this.$store.state.userId == this.userid) { - return false - } - if (this.user.delete_at || this.user.disable_at) { - return false - } - return this.showIconMenu - }, - isBot() { return !!(this.user && this.user.bot); }, }, methods: { - onOpenDialog() { - this.$refs.avatar.openDialog(); - }, - onUserResult(info) { if (typeof this.userResult === "function") { this.userResult(info); diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 952591a17..0b578512b 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -291,6 +291,9 @@ + + + {{$L(tag.text)}} -

{{dialogData.name}}

+

{{dialogData.name}}

({{peopleNum}}) {{$L('机器人')}} {{$L(approvaUserStatus)}} @@ -4273,15 +4273,19 @@ export default { }, onViewAvatar(e) { - let src = null - if (e.target.tagName === "IMG") { - src = e.target.src - } else { - src = $A(e.target).find("img").attr("src") - } - if (src) { - this.$store.dispatch("previewImage", src) + if (this.dialogData.type == 'group') { + let src = null + if (e.target.tagName === "IMG") { + src = e.target.src + } else { + src = $A(e.target).find("img").attr("src") + } + if (src) { + this.$store.dispatch("previewImage", src) + } + return; } + emitter.emit("openUser", this.dialogData.dialog_user?.userid) }, onTopOperate() { diff --git a/resources/assets/sass/components/user-avatar.scss b/resources/assets/sass/components/user-avatar.scss index a740e48e1..edcfc82fe 100755 --- a/resources/assets/sass/components/user-avatar.scss +++ b/resources/assets/sass/components/user-avatar.scss @@ -126,23 +126,4 @@ } } } - .avatar-icons { - margin-top: 12px; - border-top: 1px solid rgba(244, 244, 245, 0.5); - padding: 8px 0 0; - display: flex; - align-items: center; - > i { - cursor: pointer; - font-size: 22px; - margin-right: 12px; - color: #F4F4F5; - &:last-child { - margin-right: 0; - } - &:hover { - color: #ffffff; - } - } - } } diff --git a/resources/assets/sass/pages/components/_.scss b/resources/assets/sass/pages/components/_.scss index c0da46bc4..bbfc2b588 100755 --- a/resources/assets/sass/pages/components/_.scss +++ b/resources/assets/sass/pages/components/_.scss @@ -31,3 +31,4 @@ @import "calendar"; @import "dialog-droup-word-chain"; @import "dialog-complaint-info"; +@import "user-detail"; diff --git a/resources/assets/sass/pages/components/user-detail.scss b/resources/assets/sass/pages/components/user-detail.scss new file mode 100755 index 000000000..adfa75b73 --- /dev/null +++ b/resources/assets/sass/pages/components/user-detail.scss @@ -0,0 +1,56 @@ +.common-user-detail-modal { + .ivu-modal { + max-width: 90%; + + &.ivu-modal-fullscreen { + max-width: none; + + .ivu-modal-content { + margin-top: calc(var(--status-bar-height) + 46px); + margin-bottom: 0; + border-top-left-radius: 18px !important; + border-top-right-radius: 18px !important; + + .ivu-modal-body { + .user-detail-body { + padding-bottom: var(--navigation-bar-height); + } + } + } + } + + .ivu-modal-content { + overflow: hidden; + + .ivu-modal-body { + padding: 0 !important; + display: flex; + flex-direction: column; + + .user-detail-body { + display: flex; + flex-direction: column; + align-items: center; + gap: 16px; + padding: 84px 24px; + + > ul { + > li { + list-style: none; + display: flex; + justify-content: center; + max-width: 80%; + margin: 12px auto; + + > span { + flex-shrink: 0; + opacity: 0.8; + padding-right: 4px; + } + } + } + } + } + } + } +}