From 02b2e8cffb402adb0f90bff26eb06c0ed50f4420 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 14 Jun 2022 09:58:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/store/actions.js          | 23 +++++++++++--------
 .../sass/pages/components/dialog-wrapper.scss |  4 ++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 36647b197..cd58c21ae 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -2211,20 +2211,22 @@ export default {
                     page: dialog.currentPage
                 },
             }).then(result => {
-                dialog.loading = false;
-                dialog.currentPage = result.data.current_page;
-                dialog.hasMorePages = !!result.data.next_page_url;
+                const resData = result.data;
+                dialog.currentPage = resData.current_page;
+                dialog.hasMorePages = !!resData.next_page_url;
+                dialog = Object.assign(dialog, resData.dialog)
                 //
-                const ids = result.data.data.map(({id}) => id)
+                const ids = resData.data.map(({id}) => id)
                 state.dialogMsgs = state.dialogMsgs.filter((item) => item.dialog_id != dialog_id || ids.includes(item.id));
                 //
-                dispatch("saveDialog", result.data.dialog);
-                dispatch("saveDialogMsg", result.data.data);
+                dispatch("saveDialogMsg", resData.data);
                 resolve()
             }).catch(e => {
                 console.warn(e);
-                dialog.loading = false;
                 resolve()
+            }).finally(_ => {
+                dialog.loading = false;
+                dispatch("saveDialog", dialog);
             });
         });
     },
@@ -2260,10 +2262,11 @@ export default {
                     page: dialog.currentPage
                 },
             }).then(result => {
+                const resData = result.data;
                 dialog.loading = false;
-                dialog.currentPage = result.data.current_page;
-                dialog.hasMorePages = !!result.data.next_page_url;
-                dispatch("saveDialogMsg", result.data.data);
+                dialog.currentPage = resData.current_page;
+                dialog.hasMorePages = !!resData.next_page_url;
+                dispatch("saveDialogMsg", resData.data);
                 resolve(result)
             }).catch(e => {
                 console.warn(e);
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index a9509da78..5a00b0e4e 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -651,7 +651,7 @@
                 justify-content: center;
                 font-size: 13px;
                 padding: 3px 0;
-                margin: 12px 0;
+                margin: 0 0 12px;
                 opacity: 0.6;
                 transition: opacity 0.2s;
 
@@ -681,7 +681,7 @@
             }
 
             &.loading {
-                padding: 12px 0;
+                padding: 0 0 12px;
                 justify-content: center;
 
                 .common-loading {