diff --git a/src/page/jobSearch/searchList.vue b/src/page/jobSearch/searchList.vue
index 7050094..565e7e6 100644
--- a/src/page/jobSearch/searchList.vue
+++ b/src/page/jobSearch/searchList.vue
@@ -43,16 +43,26 @@
                     </timeline-title>
                     <timeline-title v-if="item.jobStatus=='1'" bg-color="#26a2ff">{{item.jobBelongTo}}正在确认...
                     </timeline-title>
+                    <timeline-title v-if="item.jobStatus=='3'" bg-color="#26a2ff">{{item.jobBelongTo}}已完成
+                    </timeline-title>
+                    <timeline-title v-if="item.jobStatus=='4'" bg-color="#26a2ff">{{item.jobBelongTo}}已取消
+                    </timeline-title>
                     <div v-if="item.showTimeline">
                       <timeline-item>
                         <span class="timeline-left">{{item.createTime}}</span> <span class="timeline-right">发起工单</span>
                       </timeline-item>
-                      <timeline-item>
+                      <timeline-item v-if="item.getJobTime!=''">
                         <span class="timeline-left">{{item.getJobTime}}</span> <span class="timeline-right">{{item.getJobPerson}}接单</span>
                       </timeline-item>
-                      <timeline-item v-if="item.jobStatus=='2'">
+                      <timeline-item v-if="item.confirmJobTime!=''">
                         <span class="timeline-left">{{item.confirmJobTime}}</span> <span class="timeline-right">{{item.confirmJobPerson}}确认工单</span>
                       </timeline-item>
+                      <timeline-item v-if="item.jobStatus=='3' && item.handleJobTime!=''">
+                        <span class="timeline-left">{{item.handleJobTime}}</span> <span class="timeline-right">{{item.confirmJobPerson}}完成工单</span>
+                      </timeline-item>
+                      <timeline-item v-if="item.jobStatus=='4' && item.handleJobTime!=''">
+                        <span class="timeline-left">{{item.handleJobTime}}</span> <span class="timeline-right">{{item.confirmJobPerson}}取消工单</span>
+                      </timeline-item>
                       <div class="detail-btn" @click.stop="item.showTimeline=!item.showTimeline">
                         <i class="iconfont icon-fanhui3"></i>
                       </div>

diff --git a/src/page/jobSearch/searchList.vue b/src/page/jobSearch/searchList.vue
index 7050094..565e7e6 100644
--- a/src/page/jobSearch/searchList.vue
+++ b/src/page/jobSearch/searchList.vue
@@ -43,16 +43,26 @@
                     </timeline-title>
                     <timeline-title v-if="item.jobStatus=='1'" bg-color="#26a2ff">{{item.jobBelongTo}}正在确认...
                     </timeline-title>
+                    <timeline-title v-if="item.jobStatus=='3'" bg-color="#26a2ff">{{item.jobBelongTo}}已完成
+                    </timeline-title>
+                    <timeline-title v-if="item.jobStatus=='4'" bg-color="#26a2ff">{{item.jobBelongTo}}已取消
+                    </timeline-title>
                     <div v-if="item.showTimeline">
                       <timeline-item>
                         <span class="timeline-left">{{item.createTime}}</span> <span class="timeline-right">发起工单</span>
                       </timeline-item>
-                      <timeline-item>
+                      <timeline-item v-if="item.getJobTime!=''">
                         <span class="timeline-left">{{item.getJobTime}}</span> <span class="timeline-right">{{item.getJobPerson}}接单</span>
                       </timeline-item>
-                      <timeline-item v-if="item.jobStatus=='2'">
+                      <timeline-item v-if="item.confirmJobTime!=''">
                         <span class="timeline-left">{{item.confirmJobTime}}</span> <span class="timeline-right">{{item.confirmJobPerson}}确认工单</span>
                       </timeline-item>
+                      <timeline-item v-if="item.jobStatus=='3' && item.handleJobTime!=''">
+                        <span class="timeline-left">{{item.handleJobTime}}</span> <span class="timeline-right">{{item.confirmJobPerson}}完成工单</span>
+                      </timeline-item>
+                      <timeline-item v-if="item.jobStatus=='4' && item.handleJobTime!=''">
+                        <span class="timeline-left">{{item.handleJobTime}}</span> <span class="timeline-right">{{item.confirmJobPerson}}取消工单</span>
+                      </timeline-item>
                       <div class="detail-btn" @click.stop="item.showTimeline=!item.showTimeline">
                         <i class="iconfont icon-fanhui3"></i>
                       </div>
diff --git a/src/page/jobSearch/searchPage.vue b/src/page/jobSearch/searchPage.vue
index d54d5c4..30b124c 100644
--- a/src/page/jobSearch/searchPage.vue
+++ b/src/page/jobSearch/searchPage.vue
@@ -313,8 +313,8 @@
           jobStatus: '', // 工单状态
           beginTime: '点击选择开始时间', // 工单开始时间
           endTime: '点击选择结束时间', // 工单结束时间
-          getJobBeginTime: '点击选择开始时间',// 接单开始时间
-          getJobEndTime: '点击选择结束时间',// 接单结束时间
+          getJobBeginTime: '',// 接单开始时间
+          getJobEndTime: '',// 接单结束时间
           shouldGetBeginTime: '',// 应接单开始时间
           shouldGetEndTime: '',// 应接单结束时间
           handleJobBeginTime: '',// 处理开始时间
@@ -362,10 +362,11 @@
         /*border-bottom 1px solid #f0f0f0*/
         padding 0.5rem 1rem 0rem 0rem
         line-height: 1.5rem
-        font-size: 0.9rem
+        /*font-size: 1rem*/
         .search-btn {
           margin: 5px
           line-height 40px
+          font-size:16px
           float left
         }
         .search-name {
@@ -382,11 +383,10 @@
           float: left
           width: auto
           background-color #f6f6f6
-          /*border:solid 1px #26a2ff*/
           padding 5px 10px
           line-height 20px
           border-radius 3px
-          font-size: 10px
+          font-size: 15px
         }
         .selected-item {
           background-color #246af7