From 5c3bf0067eea1c313b4609d15a61343039b466bd Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 13 Jan 2022 19:19:58 +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

---
 .../js/pages/manage/components/TaskDetail.vue |  7 +++---
 .../sass/pages/components/project-log.scss    | 24 ++++++-------------
 .../sass/pages/components/task-detail.scss    | 13 ++++++++++
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 7f4bd6eb..be3401f2 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -66,8 +66,8 @@
         </Poptip>
     </li>
     <!--主任务-->
-    <div v-else-if="ready" v-show="taskDetail.id > 0" :class="{'task-detail':true, 'open-dialog': hasOpenDialog, 'completed': taskDetail.complete_at}">
-        <div class="task-info">
+    <div v-else-if="ready" :class="{'task-detail':true, 'open-dialog': hasOpenDialog, 'completed': taskDetail.complete_at}">
+        <div v-show="taskDetail.id > 0" class="task-info">
             <div class="head">
                 <TaskMenu
                     :ref="`taskMenu_${taskDetail.id}`"
@@ -339,7 +339,7 @@
             </div>
             <TaskUpload ref="upload" class="upload"/>
         </div>
-        <div class="task-dialog" :style="dialogStyle">
+        <div v-show="taskDetail.id > 0" class="task-dialog" :style="dialogStyle">
             <template v-if="hasOpenDialog">
                 <DialogWrapper v-if="taskId > 0" ref="dialog" :dialog-id="taskDetail.dialog_id">
                     <div slot="head" class="head">
@@ -389,6 +389,7 @@
                 </div>
             </div>
         </div>
+        <div v-if="!taskDetail.id" class="task-load"><Loading/></div>
     </div>
 </template>
 
diff --git a/resources/assets/sass/pages/components/project-log.scss b/resources/assets/sass/pages/components/project-log.scss
index 8a14ba3d..5fe67993 100644
--- a/resources/assets/sass/pages/components/project-log.scss
+++ b/resources/assets/sass/pages/components/project-log.scss
@@ -109,17 +109,6 @@
                 position: relative;
                 padding: 4px 0 4px 12px;
 
-                &:before {
-                    content: "";
-                    position: absolute;
-                    top: 11px;
-                    left: 0;
-                    width: 5px;
-                    height: 5px;
-                    border-radius: 50%;
-                    background-color: rgba(0, 0, 0, 0.4);
-                }
-
                 > span,
                 > a {
                     padding-right: 6px;
@@ -129,7 +118,7 @@
 
                 .log-text {
                     display: inline-block;
-                    color: rgba(0, 0, 0, .5);
+                    color: rgba(0, 0, 0, .8);
 
                     .detail-user {
                         display: inline-block;
@@ -163,22 +152,23 @@
 
             .log-task {
                 margin-left: 12px;
-                margin-bottom: 3px;
-                opacity: 0.8;
+                margin-bottom: 6px;
+                opacity: 0.6;
                 cursor: pointer;
                 &:hover {
                     opacity: 1;
+                    > em {
+                        color: #8bcf70;
+                    }
                 }
                 > em {
                     display: inline-block;
                     font-style: normal;
                     font-size: 12px;
-                    padding: 0 4px;
                     line-height: 18px;
                     height: 18px;
                     max-width: 100%;
-                    background: #f1f1f1;
-                    color: #9f9f9f;
+                    color: #999999;
                     border-radius: 5px;
                     overflow: hidden;
                     text-overflow: ellipsis;
diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss
index e99e16c5..c6c9cbe8 100644
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -3,6 +3,7 @@
     flex-direction: column;
     margin: 0 -32px 12px -10px;
     padding: 0 22px 12px 0;
+    min-height: 120px;
     overflow: auto;
     .task-info {
         flex: 1;
@@ -579,6 +580,18 @@
             }
         }
     }
+    .task-load {
+        margin-top: 6px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        display: flex;
+        .common-loading {
+            width: 32px;
+            height: 32px;
+        }
+    }
 
     &.open-dialog {
         flex-direction: row;