Merge branch 'develop' into developer/yanjiaxu

src/views/task/task-detail/index.vue

@@ -9,7 +9,19 @@
       </div>
     </div>
     <div class="task-status">
-      <span>(任务状态: 进行中)</span>
+      <span v-if="taskDetail.taskStatus === 'NEW'" style="color: #606266"
+        >(任务状态: 未开始)</span
+      >
+      <span
+        v-else-if="taskDetail.taskStatus === 'PENDING'"
+        style="color: #f9a221"
+        >(任务状态: 进行中)</span
+      >
+      <span
+        v-else-if="taskDetail.taskStatus === 'FINISH'"
+        style="color: #13be24"
+        >(任务状态: 已完成)</span
+      >
     </div>
     <div></div>
     <!-- form表单 -->