From c3fd6bf88f9dd55c1b85bd9f020f96c5652fdcc9 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 24 Jan 2022 00:40:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/components/ProjectLog.vue | 6 +++++-
 resources/assets/js/pages/manage/components/TaskDetail.vue | 2 +-
 resources/assets/sass/pages/components/project-log.scss    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue
index 6a60de9d..81d8526c 100644
--- a/resources/assets/js/pages/manage/components/ProjectLog.vue
+++ b/resources/assets/js/pages/manage/components/ProjectLog.vue
@@ -30,7 +30,7 @@
                     </Timeline>
                 </div>
             </li>
-            <li v-if="loadIng > 0" class="logs-loading"><Loading/></li>
+            <li v-if="loadIng > 0 && showLoad" class="logs-loading"><Loading/></li>
             <li v-else-if="hasMorePages" class="logs-more" @click="getMore">{{$L('加载更多')}}</li>
             <li v-else-if="totalNum == 0" class="logs-none" @click="getLists(true)">{{$L('没有任何动态')}}</li>
         </ul>
@@ -52,6 +52,10 @@ export default {
             type: Number,
             default: 0
         },
+        showLoad: {
+            type: Boolean,
+            default: true
+        },
     },
     data() {
         return {
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 8e287115..86339fec 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -373,7 +373,7 @@
                         </div>
                     </div>
                 </div>
-                <ProjectLog v-if="navActive=='log' && taskId > 0" ref="log" :task-id="taskDetail.id" @on-load-change="logLoadChange"/>
+                <ProjectLog v-if="navActive=='log' && taskId > 0" ref="log" :task-id="taskDetail.id" :show-load="false" @on-load-change="logLoadChange"/>
                 <div v-else class="no-dialog">
                     <div class="no-tip">{{$L('暂无消息')}}</div>
                     <div class="no-input">
diff --git a/resources/assets/sass/pages/components/project-log.scss b/resources/assets/sass/pages/components/project-log.scss
index 5fe67993..2a6bec3f 100644
--- a/resources/assets/sass/pages/components/project-log.scss
+++ b/resources/assets/sass/pages/components/project-log.scss
@@ -118,7 +118,7 @@
 
                 .log-text {
                     display: inline-block;
-                    color: rgba(0, 0, 0, .8);
+                    color: rgba(0, 0, 0, .72);
 
                     .detail-user {
                         display: inline-block;