From fcbbd2b64cc178497be2c983dfa58483a1a432b7 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 12 Jul 2022 10:37:46 +0800
Subject: [PATCH] no message

---
 .../js/pages/manage/components/DialogWrapper.vue      | 11 ++++-------
 .../assets/js/pages/manage/components/FileHistory.vue |  2 --
 resources/assets/js/pages/manage/messenger.vue        |  3 ++-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index ec77e89e7..56d5811bc 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -876,21 +876,18 @@ export default {
                 });
             } else {
                 // 发送
-                const tempId = $A.randNum(1000000000, 9999999999);
+                const tempId = $A.randNum(1000000000, 9999999999)
+                const typeLoad = $A.stringLength(msgText) > 2000
                 const tempMsg = {
                     id: tempId,
                     dialog_id: this.dialogData.id,
                     reply_id: this.replyId,
                     reply_data: this.replyItem,
-                    type: 'text',
+                    type: typeLoad ? 'loading' : 'text',
                     userid: this.userId,
                     msg: {
-                        text: $A.stringLength(msgText) > 2000 ? '' : msgText,
+                        text: typeLoad ? '' : msgText,
                     },
-                };
-                if (msgText.length > 2000) {
-                    tempMsg.type = 'loading';
-                    tempMsg.msg = { };
                 }
                 this.tempMsgs.push(tempMsg)
                 this.msgType = ''
diff --git a/resources/assets/js/pages/manage/components/FileHistory.vue b/resources/assets/js/pages/manage/components/FileHistory.vue
index a3c955801..0bd77a366 100644
--- a/resources/assets/js/pages/manage/components/FileHistory.vue
+++ b/resources/assets/js/pages/manage/components/FileHistory.vue
@@ -32,8 +32,6 @@
 }
 </style>
 <script>
-import {mapState} from "vuex";
-
 export default {
     name: "FileHistory",
     props: {
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index 4f0729e8a..8ea41ab09 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -485,10 +485,11 @@ export default {
             }
             this.$set(user, 'loading', true);
             this.$store.dispatch("openDialogUserid", user.userid).then(_ => {
-                this.$set(user, 'loading', false);
                 if (this.windowLarge) {
                     this.tabActive = 'dialog';
                 }
+            }).finally(_ => {
+                this.$set(user, 'loading', false);
             });
         },