no message

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));
             }
         }
         //昵称

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__;
+    }
+};

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"/>
+                <ETooltip v-else placement="top" :disabled="!$isDesktop" :content="$L('发送')">
-                </div>
+                    <Icon type="md-send"/>
                 </ETooltip>
+            </div>
 
             <slot name="toolbarAfter"/>
         </div>

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>

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 {

resources/assets/sass/scrollbar.scss

@@ -43,3 +43,6 @@
         display: none;
     }
 }
+.overlay-hidden {
+    overflow: hidden !important;
+}