From bbd19045bcde9441d449c4acafd9eeaacc10ecb6 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 20 Nov 2022 19:34:27 +0800
Subject: [PATCH] no message

---
 docker/nginx/default.conf                            |  2 ++
 resources/assets/js/components/UserAvatar.vue        | 12 +++++++++++-
 .../assets/js/pages/manage/components/DialogItem.vue |  2 +-
 resources/assets/sass/components/user-avatar.scss    |  8 ++++++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index 6c47f1743..85ef4442b 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -57,6 +57,7 @@ server {
         proxy_set_header Connection $connection_upgrade;
         proxy_read_timeout 3600s;
         proxy_send_timeout 3600s;
+        proxy_connect_timeout 3600s;
         proxy_pass http://service;
     }
 
@@ -111,6 +112,7 @@ server {
         proxy_set_header Connection $connection_upgrade;
         proxy_read_timeout 3600s;
         proxy_send_timeout 3600s;
+        proxy_connect_timeout 3600s;
         proxy_pass http://office/;
     }
 
diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue
index 94e04b9d1..bb962f7a4 100755
--- a/resources/assets/js/components/UserAvatar.vue
+++ b/resources/assets/js/components/UserAvatar.vue
@@ -13,7 +13,7 @@
             <p v-if="user.delete_at"><strong>{{$L('删除时间')}}: {{user.delete_at}}</strong></p>
             <p v-else-if="user.disable_at"><strong>{{$L('离职时间')}}: {{user.disable_at}}</strong></p>
             <slot name="end"/>
-            <div v-if="userId != userid && showIconMenu" class="avatar-icons">
+            <div v-if="showMenu" class="avatar-icons">
                 <Icon type="ios-chatbubbles" @click="openDialog"/>
             </div>
         </div>
@@ -181,6 +181,16 @@
                 return !$A.rightExists(userimg, '/avatar.png');
             },
 
+            showMenu() {
+                if (this.userId == this.userid) {
+                    return false
+                }
+                if (this.user.delete_at || this.user.disable_at) {
+                    return false
+                }
+                return this.showIconMenu
+            },
+
             isDefault() {
                 const {userimg} = this.user
                 return $A.strExists(userimg, '/avatar');
diff --git a/resources/assets/js/pages/manage/components/DialogItem.vue b/resources/assets/js/pages/manage/components/DialogItem.vue
index 491b4b25f..ada2d72b1 100644
--- a/resources/assets/js/pages/manage/components/DialogItem.vue
+++ b/resources/assets/js/pages/manage/components/DialogItem.vue
@@ -24,7 +24,7 @@
             <div class="dialog-avatar">
                 <UserAvatar
                     :userid="source.userid"
-                    :tooltipDisabled="source.userid == userId"
+                    :tooltipDisabled="source.userid == userId || dialogData.type != 'group'"
                     :show-icon-menu="dialogData.type == 'group'"
                     :open-delay="100"
                     :size="30"/>
diff --git a/resources/assets/sass/components/user-avatar.scss b/resources/assets/sass/components/user-avatar.scss
index bea883931..3b822bec5 100755
--- a/resources/assets/sass/components/user-avatar.scss
+++ b/resources/assets/sass/components/user-avatar.scss
@@ -52,10 +52,14 @@
                     left: 0;
                     right: 0;
                     bottom: 0;
-                    background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGNsYXNzPSJpb25pY29uIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiI+PHRpdGxlPkJhbjwvdGl0bGU+PGNpcmNsZSBmaWxsPSJub25lIiBzdHJva2U9IiNFRDQwMTQiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLXdpZHRoPSI0OCIgY3g9IjI1NiIgY3k9IjI1NiIgcj0iMjAwIi8+PHBhdGggc3Ryb2tlPSIjRUQ0MDE0IiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHN0cm9rZS13aWR0aD0iNDgiIGQ9Ik0xMTQuNTggMTE0LjU4bDI4Mi44NCAyODIuODQiLz48L3N2Zz4=");
-                    background-color: rgba(237, 64, 20, 0.2);
+                    background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGNsYXNzPSJpb25pY29uIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiI+PHRpdGxlPkJhbjwvdGl0bGU+PGNpcmNsZSBmaWxsPSJub25lIiBzdHJva2U9IiNjY2NjY2MiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLXdpZHRoPSI0OCIgY3g9IjI1NiIgY3k9IjI1NiIgcj0iMjAwIi8+PHBhdGggc3Ryb2tlPSIjY2NjY2NjIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHN0cm9rZS13aWR0aD0iNDgiIGQ9Ik0xMTQuNTggMTE0LjU4bDI4Mi44NCAyODIuODQiLz48L3N2Zz4=");
+                    background-color: rgba(255, 255, 255, 0.5);
+                    opacity: 0.8;
                     border-radius: 50%;
                 }
+                > em {
+                    background-color: #cccccc;
+                }
             }
             &.deleted {
                 &:after {