From b522b1de05ba6b7a07e616f7f52420b642cb562a Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 13 Apr 2025 11:19:37 +0800
Subject: [PATCH] no message

---
 .../pages/manage/components/DialogWrapper.vue | 14 ++++--
 .../js/pages/manage/components/UserDetail.vue | 48 +++++++++++--------
 .../assets/js/pages/manage/messenger.vue      | 10 ++--
 .../sass/pages/components/user-detail.scss    |  7 ++-
 4 files changed, 49 insertions(+), 30 deletions(-)

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 @@
                     </div>
 
                     <div class="dialog-block">
-                        <div class="dialog-avatar" @click="onViewAvatar">
+                        <div class="dialog-avatar" @click="onViewDetail">
                             <template v-if="dialogData.type=='group'">
                                 <EAvatar v-if="dialogData.avatar" class="img-avatar" :src="dialogData.avatar" :size="42"></EAvatar>
                                 <i v-else-if="dialogData.group_type=='department'" class="taskfont icon-avatar department">&#xe75c;</i>
@@ -41,7 +41,7 @@
                                 <template v-for="tag in $A.dialogTags(dialogData)" v-if="tag.color != 'success'">
                                     <Tag :color="tag.color" :fade="false">{{$L(tag.text)}}</Tag>
                                 </template>
-                                <h2 class="user-select-auto" @click="onViewAvatar">{{dialogData.name}}</h2>
+                                <h2 class="user-select-auto" @click="onViewDetail">{{dialogData.name}}</h2>
                                 <em v-if="peopleNum > 0" @click="onDialogMenu('groupInfo')">({{peopleNum}})</em>
                                 <Tag v-if="dialogData.bot" class="after" :fade="false">{{$L('机器人')}}</Tag>
                                 <Tag v-if="dialogData.type === 'user' && approvaUserStatus" class="after" color="red" :fade="false">{{$L(approvaUserStatus)}}</Tag>
@@ -83,8 +83,8 @@
                                 <div>{{$L('独立窗口')}}</div>
                             </EDropdownItem>
                             <template v-if="dialogData.type === 'user'">
-                                <EDropdownItem v-if="dialogData.userimg" command="previewAvatar">
-                                    <div>{{$L('查看头像')}}</div>
+                                <EDropdownItem command="previewDetail">
+                                    <div>{{$L('查看详情')}}</div>
                                 </EDropdownItem>
                                 <EDropdownItem v-if="isManageBot" command="modifyNormal">
                                     <div>{{$L('修改资料')}}</div>
@@ -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">
             <div class="user-detail-body">
-                <UserAvatar :userid="userData.userid" :size="120" :show-state-dot="false"/>
+                <UserAvatar
+                    :userid="userData.userid"
+                    :size="120"
+                    :show-state-dot="false"
+                    @open-dialog="onOpenAvatar"/>
                 <ul>
                     <li>
                         <h1>{{userData.nickname}}</h1>
                         <em v-if="userData.delete_at" class="deleted no-dark-content">{{$L('已删除')}}</em>
                         <em v-else-if="userData.disable_at" class="disabled no-dark-content">{{$L('已离职')}}</em>
                     </li>
-                    <li class="department-name">
-                        <span>{{$L('部门')}}: </span>
-                        {{userData.department_name || '-'}}
-                    </li>
-                    <li>
-                        <span>{{$L('职位/职称')}}: </span>
-                        {{userData.profession || '-'}}
-                    </li>
-                    <li v-if="userData.delete_at">
-                        <strong><span>{{$L('删除时间')}}: </span>{{userData.delete_at}}</strong>
-                    </li>
-                    <li v-else-if="userData.disable_at">
-                        <strong><span>{{$L('离职时间')}}: </span>{{userData.disable_at}}</strong>
-                    </li>
-                    <li>
-                        <span>{{$L('最后在线')}}: </span>
-                        {{userData.line_at || '-'}}
-                    </li>
+                    <template v-if="!userData.bot">
+                        <li class="department-name">
+                            <span>{{$L('部门')}}: </span>
+                            {{userData.department_name || '-'}}
+                        </li>
+                        <li>
+                            <span>{{$L('职位/职称')}}: </span>
+                            {{userData.profession || '-'}}
+                        </li>
+                        <li v-if="userData.delete_at">
+                            <strong><span>{{$L('删除时间')}}: </span>{{userData.delete_at}}</strong>
+                        </li>
+                        <li v-else-if="userData.disable_at">
+                            <strong><span>{{$L('离职时间')}}: </span>{{userData.disable_at}}</strong>
+                        </li>
+                        <li>
+                            <span>{{$L('最后在线')}}: </span>
+                            {{userData.line_at || '-'}}
+                        </li>
+                    </template>
                 </ul>
                 <Button icon="md-chatbubbles" :disabled="userData.delete_at" @click="onOpenDialog">{{ $L('开始聊天') }}</Button>
             </div>
@@ -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 @@
                                         <i class="taskfont">&#xe63f;</i>
                                     </div>
                                 </DropdownItem>
-                                <DropdownItem @click.native="handleUserClick('avatar')">
+                                <DropdownItem @click.native="handleUserClick('detail')">
                                     <div class="item">
-                                        {{ $L('查看头像') }}
-                                        <i class="taskfont">&#xe7bc;</i>
+                                        {{ $L('查看详情') }}
+                                        <i class="taskfont">&#xe71b;</i>
                                     </div>
                                 </DropdownItem>
                             </template>
@@ -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 {