From 173f5c84db643d570a2cbff591567e5b6be41db0 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 26 May 2022 09:02:42 +0800
Subject: [PATCH] no message

---
 app/Http/Controllers/Api/UsersController.php  |  2 +-
 resources/assets/js/directives/longpress.js   | 46 +++++++++++++++++++
 .../manage/components/ChatInput/index.vue     | 12 ++---
 .../pages/manage/components/DialogWrapper.vue |  2 +-
 .../assets/js/pages/manage/messenger.vue      |  2 +-
 .../sass/pages/components/chat-input.scss     |  2 +-
 resources/assets/sass/scrollbar.scss          |  3 ++
 7 files changed, 59 insertions(+), 10 deletions(-)
 create mode 100755 resources/assets/js/directives/longpress.js

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index f8431e75d..423f9859e 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -249,7 +249,7 @@ class UsersController extends AbstractController
                 $userimg = is_array($userimg) ? $userimg[0]['path'] : $userimg;
                 $user->userimg = Base::unFillUrl($userimg);
             } else {
-                $user->userimg = $user->getUserimgAttribute(null);
+                $user->userimg = Base::unFillUrl($user->getUserimgAttribute(null));
             }
         }
         //昵称
diff --git a/resources/assets/js/directives/longpress.js b/resources/assets/js/directives/longpress.js
new file mode 100755
index 000000000..60eeb63a0
--- /dev/null
+++ b/resources/assets/js/directives/longpress.js
@@ -0,0 +1,46 @@
+const isSupportTouch = "ontouchend" in document;
+export default {
+    bind (el, binding) {
+        if (!isSupportTouch) {
+            return
+        }
+        let timer = 0;
+        el.__touchLongpressDown__ = e => {
+            timer = setTimeout(_ => {
+                timer = 0
+                if (binding.expression) {
+                    binding.value(e, el)
+                }
+            }, 600)
+        };
+        el.__touchLongpressMove__ = _ => {
+            if (timer) {
+                clearTimeout(timer)
+                timer = 0
+            }
+        };
+        el.__touchLongpressUp__ = _ => {
+            if (timer) {
+                clearTimeout(timer)
+                timer = 0
+            }
+        };
+        el.addEventListener('touchstart', el.__touchLongpressDown__);
+        el.addEventListener('touchmove', el.__touchLongpressMove__);
+        el.addEventListener('touchend', el.__touchLongpressUp__);
+    },
+    update () {
+
+    },
+    unbind (el) {
+        if (!isSupportTouch) {
+            return
+        }
+        el.removeEventListener('touchstart', el.__touchLongpressDown__);
+        el.removeEventListener('touchmove', el.__touchLongpressMove__);
+        el.removeEventListener('touchend', el.__touchLongpressUp__);
+        delete el.__touchLongpressDown__;
+        delete el.__touchLongpressMove__;
+        delete el.__touchLongpressUp__;
+    }
+};
diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index 9994cb8a1..72a77d3c0 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -40,12 +40,12 @@
                 </div>
             </EPopover>
 
-            <ETooltip placement="top" :disabled="!$isDesktop" :content="$L('发送')">
-                <div class="chat-send" :class="[value ? '' : 'disabled']" v-touchmouse="send">
-                    <Loading v-if="loading"/>
-                    <Icon v-else type="md-send"/>
-                </div>
-            </ETooltip>
+            <div class="chat-send" :class="[value ? '' : 'disabled']" v-touchmouse="send">
+                <Loading v-if="loading"/>
+                <ETooltip v-else placement="top" :disabled="!$isDesktop" :content="$L('发送')">
+                    <Icon type="md-send"/>
+                </ETooltip>
+            </div>
 
             <slot name="toolbarAfter"/>
         </div>
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 7d6201cff..4a59e425e 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -92,7 +92,7 @@
                     <div class="dialog-avatar">
                         <UserAvatar :userid="item.userid" :tooltipDisabled="item.userid == userId" :size="30"/>
                     </div>
-                    <DialogView :msg-data="item" :dialog-type="dialogData.type" :hidden-percentage="dialogData.dialog_user.userid == userId"/>
+                    <DialogView :msg-data="item" :dialog-type="dialogData.type" :hidden-percentage="dialogData.dialog_user && dialogData.dialog_user.userid == userId"/>
                 </DynamicScrollerItem>
             </template>
         </DynamicScroller>
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index eeb0cd04a..e64102282 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -33,7 +33,7 @@
                     <ul
                         v-if="tabActive==='dialog'"
                         ref="dialogWrapper"
-                        class="dialog" >
+                        class="dialog">
                         <li v-if="dialogList.length === 0" class="nothing">
                             {{$L(dialogKey ? `没有任何与"${dialogKey}"相关的会话` : `没有任何会话`)}}
                         </li>
diff --git a/resources/assets/sass/pages/components/chat-input.scss b/resources/assets/sass/pages/components/chat-input.scss
index f9ef3ee52..a15d37bd0 100755
--- a/resources/assets/sass/pages/components/chat-input.scss
+++ b/resources/assets/sass/pages/components/chat-input.scss
@@ -253,8 +253,8 @@
                 z-index: 2;
                 display: flex;
                 align-items: center;
-                height: 100%;
                 color: #ffffff;
+                line-height: 28px;
                 transition: all 0.3s;
             }
             &:after {
diff --git a/resources/assets/sass/scrollbar.scss b/resources/assets/sass/scrollbar.scss
index b4925d780..dc52df8a2 100644
--- a/resources/assets/sass/scrollbar.scss
+++ b/resources/assets/sass/scrollbar.scss
@@ -43,3 +43,6 @@
         display: none;
     }
 }
+.overlay-hidden {
+    overflow: hidden !important;
+}