From 634b63241bbc98d21e87ad72135177dd59fd0c5a Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 17 Jun 2021 16:40:25 +0800
Subject: [PATCH] no message

---
 .../assets/js/pages/manage/components/ProjectLog.vue     | 2 +-
 resources/assets/js/store/actions.js                     | 2 +-
 resources/assets/sass/pages/components/task-detail.scss  | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue
index b9023b52..080b0ac1 100644
--- a/resources/assets/js/pages/manage/components/ProjectLog.vue
+++ b/resources/assets/js/pages/manage/components/ProjectLog.vue
@@ -103,7 +103,7 @@ export default {
                     }
                     this.lists[key].lists.push(item);
                 });
-                this.hasMorePages = data.hasMorePages;
+                this.hasMorePages = data.current_page < data.last_page;
                 this.totalNum = data.total;
             }).catch(() => {
                 this.loadIng--;
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 74bdb6c3..eb3ffc1f 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -668,7 +668,7 @@ export default {
                     const column = state.projectDetail.project_column.find(({id}) => id === task.column_id);
                     if (column) {
                         const project_task = column.project_task.find(({id}) => id === task.parent_id)
-                        if (project_task) {
+                        if (project_task && project_task.sub_task) {
                             let index = project_task.sub_task.findIndex(({id}) => id === task.id)
                             if (index === -1) {
                                 project_task.sub_task.push(task);
diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss
index 38ccae8d..da481b82 100644
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -396,6 +396,15 @@
                         height: 59px;
                         line-height: 59px;
                     }
+                    &.logs-loading {
+                        display: flex;
+                        align-items: center;
+                        .common-loading {
+                            width: 22px;
+                            height: 22px;
+                            margin: 0;
+                        }
+                    }
                 }
             }
         }