From 30e352fa54d8ba172ba9780425ed1715e33a1ca3 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Wed, 18 Aug 2021 15:19:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=9C=9F?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=810=E5=92=8C4=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=8A=A0=E8=BD=BD=E5=9C=86=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../TimeLine/component/TimeStatus.vue         | 27 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b930d9e..bdc413f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -121,6 +121,7 @@
  - | 角色显示状态修改 | [7d3b906](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7d3b906)
  - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/19228d6)
  - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/da1eece)
+ - | 设置时间轴自动滚动到当前位置 | [a3474f8](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a3474f8)
  - | 跳转详情页返回路径修改 | [c5e17c0](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c5e17c0)
  - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e9fdd71)
 
diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue
index 7215474..b98fcef 100644
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@@ -5,13 +5,25 @@
       :style="{ color: orderStyle.color }"
       @tap="changeStatus($event, task.process)"
     >
+      <!-- 1进行中 2暂停中 3已完成 -->
       <u-circle-progress
         :percent="+orderStyle.persent"
         :active-color="orderStyle.color"
         bg-color="rgba(255,255,255,0)"
         border-width="4"
         :width="task.process !== 4 ? 66 : 50"
+        v-if="task.process === 1 || task.process === 2 || task.process === 3"
       >
+        <view class="u-progress-content">
+          <view class="u-progress-dot"></view>
+          <view class="u-progress-info">
+            <u-icon :name="orderStyle.icon" v-if="orderStyle.icon" size="15px"></u-icon>
+            <template v-else>{{ computeDurationText() }}</template>
+          </view>
+        </view>
+      </u-circle-progress>
+      <!-- 0未开始 4添加任务 -->
+      <view class="progress-box flex justify-center items-center rounded-full" v-else :class="task.process === 4 ? 'progress-box-4' : ''">
         <view class="u-progress-content">
           <view class="u-progress-dot"></view>
           <view class="u-progress-info">
@@ -22,7 +34,7 @@
             <template v-else>{{ computeDurationText() }}</template>
           </view>
         </view>
-      </u-circle-progress>
+      </view>
     </view>
   </view>
 </template>
@@ -184,4 +196,17 @@ export default {
   height: 33px;
   width: 33px;
 }
+
+.progress-box {
+  background: rgba(255, 255, 255, 0);
+  width: 33px;
+  height: 33px;
+  border: 2px solid #9ca3af;
+}
+
+.progress-box-4 {
+  width: 25px;
+  height: 25px;
+  border: 2px solid #60a5fa;
+}
 </style>