Merge branch 'master' into pre

components/message.vue

@@ -346,8 +346,8 @@
                 return true;
             }
 
-            // 系统推送的消息，默认为客服发送
-            if (this.messageBody && +this.messageBody.eid === 0) {
+            // 系统推送的消息或老用户（一般是客服，eid为负数），默认为客服发送
+            if (this.messageBody && +this.messageBody.eid <= 0) {
                 return true;
             }
 
@@ -377,15 +377,19 @@
         }
 
         private get userName() {
+            if (this.refetchUsername) {
+                return this.refetchUsername;
+            }
             if (this.chatMembers) {
                 const t = this.chatMembers.find((i) => i.eid === this.data.eid);
                 if (t) {
-                    return this.getFilterUsername(t.alias_name || t.name);
+                    const name = this.getFilterUsername(t.alias_name || t.name);
+                    if (name) {
+                        return name;
+                    }
                 }
             }
-            if (!this.refetchUsername) {
-                this.refetchUsername4Message();
-            }
+            this.refetchUsername4Message();
             return this.refetchUsername;
         }