Merge remote-tracking branch 'origin/master'

src/components/Flow/FlowTypeDot.vue

@@ -11,7 +11,7 @@
 		</template>
 
 		<!-- 状态 -->
-		<div class="badge">
+		<!-- <div class="badge">
 			<template v-if="status === TaskStatusEnum.ACTIVE">
 				<svg-icon color="#2A5EFF" icon-class="active" />
 			</template>
@@ -24,6 +24,14 @@
 			<template v-else-if="status === TaskStatusEnum.REJECT">
 				<svg-icon icon-class="reject" />
 			</template>
+		</div> -->
+		<div class="badge">
+			<template v-if="type === 3">
+				<svg-icon icon-class="reject" />
+			</template>
+			<template v-else>
+				<svg-icon icon-class="approval" />
+			</template>
 		</div>
 	</div>
 </template>

src/views/approve/components/approvedContent.vue

@@ -50,7 +50,6 @@
 								<template #dot>
 									<FlowTypeDot :status="active.taskState" :type="active.taskType" />
 								</template>
-
 								<div v-show="active.type === 0" class="timeline-box flex-1">
 									<span style="font-size: 16px; color: #86909c; display: block; margin-bottom: 3px">评论</span>
 									<div class="flex flex-align-center">

src/views/approve/launch/ItemDrawer.vue

@@ -44,6 +44,9 @@
 						</div>
 					</template>
 				</el-timeline-item>
+				<el-timeline-item>
+					<div style="padding-bottom: 6px">结束</div>
+				</el-timeline-item>
 			</el-timeline>
 			<el-divider></el-divider>
 		</div>