Merge branch 'master' into pre

components/controller/chat-list.ts

@@ -64,9 +64,6 @@ export default class ChatList extends Vue {
     @chatStore.Getter(ChatStore.GETTER_CURRENT_CURRENT_CHAT)
     @chatStore.Getter(ChatStore.GETTER_CURRENT_CURRENT_CHAT)
     protected readonly currentChat!: ChatStore.GETTER_CURRENT_CURRENT_CHAT;
     protected readonly currentChat!: ChatStore.GETTER_CURRENT_CURRENT_CHAT;
 
 
-    @chatStore.Action(ChatStore.ACTION_CHAT_FINISH_RECEPTION)
-    protected readonly _finishReception!: ChatStore.ACTION_CHAT_FINISH_RECEPTION;
-
     protected parseMesage(data: ChatItem) {
     protected parseMesage(data: ChatItem) {
         if (data.last_msg_sender && data.last_msg_sender !== "0") {
         if (data.last_msg_sender && data.last_msg_sender !== "0") {
             if (this.userNames[data.last_msg_sender] === undefined) {
             if (this.userNames[data.last_msg_sender] === undefined) {

utils/user-info.ts

@@ -41,7 +41,7 @@ export class ChatUserInfoService {
             )
             )
             .request<any, any, UserInfo>("get");
             .request<any, any, UserInfo>("get");
         const data = {
         const data = {
-            name: info.username || info.realname || info.mobile || info.mobile,
+            name: info.realname || info.username || info.mobile || info.mobile,
             phone: info.mobile,
             phone: info.mobile,
             icon: info.avatar_url,
             icon: info.avatar_url,
             alias_name: info.alias_name,
             alias_name: info.alias_name,