diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 263ad1b18..d341d3fba 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -18,7 +18,7 @@
-
+
@@ -41,7 +41,7 @@
{{$L(tag.text)}}
- {{dialogData.name}}
+ {{dialogData.name}}
({{peopleNum}})
{{$L('机器人')}}
{{$L(approvaUserStatus)}}
@@ -83,8 +83,8 @@
{{$L('独立窗口')}}
-
- {{$L('查看头像')}}
+
+ {{$L('查看详情')}}
{{$L('修改资料')}}
@@ -2712,6 +2712,10 @@ export default {
this.modifyShow = true
break;
+ case "previewDetail":
+ emitter.emit("openUser", this.dialogData.dialog_user?.userid)
+ break;
+
case "previewAvatar":
if (this.dialogData.type === 'user') {
this.$store.dispatch("previewImage", this.dialogData.userimg)
@@ -4272,7 +4276,7 @@ export default {
return "";
},
- onViewAvatar(e) {
+ onViewDetail(e) {
if (this.dialogData.type == 'group') {
let src = null
if (e.target.tagName === "IMG") {
diff --git a/resources/assets/js/pages/manage/components/UserDetail.vue b/resources/assets/js/pages/manage/components/UserDetail.vue
index a7b171c5b..8c784b65d 100755
--- a/resources/assets/js/pages/manage/components/UserDetail.vue
+++ b/resources/assets/js/pages/manage/components/UserDetail.vue
@@ -7,31 +7,37 @@
:footer-hide="true"
width="600">
-
+
-
{{userData.nickname}}
{{$L('已删除')}}
{{$L('已离职')}}
- -
- {{$L('部门')}}:
- {{userData.department_name || '-'}}
-
- -
- {{$L('职位/职称')}}:
- {{userData.profession || '-'}}
-
- -
- {{$L('删除时间')}}: {{userData.delete_at}}
-
- -
- {{$L('离职时间')}}: {{userData.disable_at}}
-
- -
- {{$L('最后在线')}}:
- {{userData.line_at || '-'}}
-
+
+ -
+ {{$L('部门')}}:
+ {{userData.department_name || '-'}}
+
+ -
+ {{$L('职位/职称')}}:
+ {{userData.profession || '-'}}
+
+ -
+ {{$L('删除时间')}}: {{userData.delete_at}}
+
+ -
+ {{$L('离职时间')}}: {{userData.disable_at}}
+
+ -
+ {{$L('最后在线')}}:
+ {{userData.line_at || '-'}}
+
+
@@ -91,6 +97,10 @@ export default {
this.showModal = false
},
+ onOpenAvatar() {
+ this.$store.dispatch("previewImage", this.userData.userimg)
+ },
+
onOpenDialog() {
this.$store.dispatch("openDialogUserid", this.userData.userid).then(_ => {
this.onHide()
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index b50ff7329..fde97605f 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -245,10 +245,10 @@
-
+
- {{ $L('查看头像') }}
-
+ {{ $L('查看详情') }}
+
@@ -1184,8 +1184,8 @@ export default {
}
break;
- case 'avatar':
- this.$store.dispatch("previewImage", this.operateItem.userimg)
+ case 'detail':
+ emitter.emit("openUser", this.operateItem.userid)
break;
}
},
diff --git a/resources/assets/sass/pages/components/user-detail.scss b/resources/assets/sass/pages/components/user-detail.scss
index adfa75b73..dbf8f70d4 100755
--- a/resources/assets/sass/pages/components/user-detail.scss
+++ b/resources/assets/sass/pages/components/user-detail.scss
@@ -34,12 +34,17 @@
gap: 16px;
padding: 84px 24px;
+ .avatar-wrapper {
+ cursor: pointer;
+ }
+
> ul {
+ width: 80%;
+
> li {
list-style: none;
display: flex;
justify-content: center;
- max-width: 80%;
margin: 12px auto;
> span {