diff --git a/linkwe-mobile/src/components/StepList.vue b/linkwe-mobile/src/components/StepList.vue
index ce9110a1bf700468155d93acb96da3d7671830d5..5cf6ff7d2b285ea6fc4ee86374731d7ea1f68297 100644
--- a/linkwe-mobile/src/components/StepList.vue
+++ b/linkwe-mobile/src/components/StepList.vue
@@ -10,8 +10,8 @@
         <!-- {{item[0].createDate}} -->
         <!-- 时间 -->
         <p class="f12" style="position:relative; ">
-          {{ getTime1(item[0].createDate) }}
-          {{ getTime3(getTime1(item[0].createDate)) }}
+          {{ dateFormat(item[0].createDate, 'yyyy-MM-dd') }}
+          {{ dateFormat(item[0].createDate, 'ww') }}
           <!-- {{item1.trajectoryType}} -->
         </p>
         <!-- <van-cell> -->
@@ -24,7 +24,7 @@
         >
           <van-step class="msg">
             <span class="f12 po">
-              {{ getTime2(getTime1(item1.createDate)) }}</span
+              {{ dateFormat(item[0].createDate, 'hh:mm') }}</span
             >
             <span class="fs14">{{ chargeType(item1.trajectoryType) }}</span>
             <span class="finish-box">
@@ -47,13 +47,14 @@
         </van-step> -->
         </van-steps>
       </van-cell>
-      <van-divider />
+      <!-- <van-divider /> -->
     </van-list>
   </div>
 </template>
 
 <script>
 import { removeTrajectory, handleWait } from '@/api/portrait'
+import { dateFormat } from '@/utils'
 export default {
   props: ['stepList'],
   inject: ['reload'],
@@ -63,9 +64,6 @@ export default {
       active: -1,
       //   轨迹外层按时间
       wlist: [],
-      // 轨迹内层
-      nlist: [],
-      oldele: [],
       content: '',
       type: 0,
       wList: [],
@@ -76,34 +74,29 @@ export default {
   watch: {
     stepList(newVal, oldVal) {
       //   console.log(newVal, oldVal);
-      if (newVal != oldVal) {
-        //   debugger
-        this.wlist = []
-        this.wList = []
-        this.oldele = []
-        this.nlist = []
-      }
+      this.wList = []
+      let dayList = []
 
       newVal.forEach((ele) => {
-        this.oldele.push(parseInt(this.getTime(ele.createDate)))
-        // console.log(parseInt(this.getTime(ele.createDate)));
+        let date = this.dateFormat(ele.createDate, 'yyyyMMdd')
+        dayList.includes(date) || dayList.push(date)
       })
-      //   console.log(this.oldele);
-      this.oldele = this.newArr(this.oldele).sort(this.f)
-      //   console.log(this.oldele);
-      for (let i = 0; i < this.oldele.length; i++) {
+      dayList.sort((a, b) => b - a)
+      for (let i = 0; i < dayList.length; i++) {
+        let timeList = []
         for (let j = 0; j < newVal.length; j++) {
           // console.log(newVal[j].createDate);
-          if (this.oldele[i] == this.getTime(newVal[j].createDate)) {
-            this.nlist.push(newVal[j])
-            // console.log(this.nlist);
+          if (dayList[i] == this.dateFormat(newVal[j].createDate, 'yyyyMMdd')) {
+            timeList.push(newVal[j])
           }
         }
-        this.wlist.push(this.nlist)
-        this.nlist = []
+        this.wList.push(timeList)
       }
+      this.loading = false
+      this.finished = true
+
       // console.log(this.wlist);
-      this.onLoad()
+      // this.onLoad()
     }
   },
   methods: {
@@ -116,6 +109,7 @@ export default {
         for (let i = 0; i < total; i++) {
           this.wList.push(this.wlist[i])
         }
+        console.log(this.wList)
         // 加载状态结束
         this.loading = false
 
@@ -137,85 +131,34 @@ export default {
         return (this.type = '待办动态')
       }
     },
-    //   数组去重
-    newArr(arr) {
-      return Array.from(new Set(arr))
-    },
-    // 数组由大到小排序
-    f(a, b) {
-      //排序函数
-      return -(a - b) //取反并返回比较参数
-    },
-    // 时间处理器
-    getTime(data) {
-      const date = new Date(data)
-      // console.log(timer.getFullYear());
-      var Y = date.getFullYear()
-      var M =
-        date.getMonth() + 1 < 10
-          ? '0' + (date.getMonth() + 1)
-          : date.getMonth() + 1
-      var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-      return Y + M + D
-    },
-    getTime1(data) {
-      const date = new Date(data)
-      // console.log(timer.getFullYear());
-      var Y = date.getFullYear() + '-'
-      var M =
-        (date.getMonth() + 1 < 10
-          ? '0' + (date.getMonth() + 1)
-          : date.getMonth() + 1) + '-'
-      var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-      return Y + M + D
-    },
-    getTime2(data) {
-      const date = new Date(data)
-      // console.log(timer.getFullYear());
-      var h =
-        (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'
-      var m =
-        date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-      return h + m
-    },
-    // 处理星期几
-    getTime3(time) {
-      var dateArray = time.split('-')
-      var date = new Date(
-        dateArray[0],
-        parseInt(dateArray[1] - 1),
-        dateArray[2]
-      )
-      var week = '星期' + '日一二三四五六'.charAt(date.getDay())
-      return week
+    dateFormat(data, format) {
+      return dateFormat(new Date(data), format)
     },
+
     // 删除轨迹
     delDynamic(id) {
-      removeTrajectory(id)
+      this.$dialog
+        .confirm({
+          title: '警告',
+          message: '确定要删除吗？'
+        })
+        .then(() => {
+          return removeTrajectory(id)
+        })
         .then((data) => {
-          //   console.log(data.code);
-          if (data.code == 200) {
-            //   提示删除成功
-            // this.msgSuccess("删除成功");
-            // debugger
-            // location.reload();
-            this.$toast.success('删除成功')
-            this.reload()
-            // 重新获取全部数据
-          }
+          this.$toast.success('删除成功')
+          // 重新获取全部数据
+          this.$emit('reload')
         })
-        .catch((err) => {
-          console.log(err)
+        .catch(() => {
+          // on cancel
         })
     },
     // 点击完成
     finDynamic(id) {
       handleWait(id)
         .then((data) => {
-          if (data.code == 200) {
-            // this.delDynamic(id);
-            this.reload()
-          }
+          this.$emit('reload')
         })
         .catch((err) => {
           console.log(err)
@@ -250,17 +193,15 @@ export default {
   color: #9c9c9c;
   font-size: 12px;
   font-weight: 600;
-  margin-right: 16px;
 }
 .con {
   left: 51px;
   margin-top: 20px;
 }
 .finish-box {
-  display: inline-block;
+  float: right;
   position: relative;
-  left: 100px;
-  width: 25%;
+  width: 80px;
 }
 .finish {
   position: absolute;
diff --git a/linkwe-mobile/src/utils/index.js b/linkwe-mobile/src/utils/index.js
index f1d33ace159a35ef876e49b7835591ecb34cdd45..3ba001d58d3b7598c5ea58adce6c2134bc765b3a 100644
--- a/linkwe-mobile/src/utils/index.js
+++ b/linkwe-mobile/src/utils/index.js
@@ -19,3 +19,35 @@ export function param2Obj(url) {
       '"}'
   )
 }
+
+// 日期时间格式化
+export function dateFormat(date = new Date(), fmt = 'yyyy-MM-dd hh:mm:ss') {
+  var o = {
+    'M+': date.getMonth() + 1, //月份
+    'd+': date.getDate(), //日
+    'h+': date.getHours(), //小时
+    'm+': date.getMinutes(), //分
+    's+': date.getSeconds(), //秒
+    'q+': Math.floor((date.getMonth() + 3) / 3), //季度
+    'S+': date.getMilliseconds(), //毫秒
+    'w+': '星期' + '日一二三四五六'.charAt(date.getDay()) //星期
+  }
+
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(
+      RegExp.$1,
+      (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+    )
+  }
+
+  for (var k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) {
+      fmt = fmt.replace(
+        RegExp.$1,
+        RegExp.$1.length == 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
+      )
+    }
+  }
+
+  return fmt
+}
diff --git a/linkwe-mobile/src/views/portrait/index.vue b/linkwe-mobile/src/views/portrait/index.vue
index 3484eecc54ea3ce1a7ba9c69f415644865dc09ca..ac460aad1bb441f3bb726f82cdde12ff644ab870 100644
--- a/linkwe-mobile/src/views/portrait/index.vue
+++ b/linkwe-mobile/src/views/portrait/index.vue
@@ -70,7 +70,7 @@
         <div>客户标签</div>
         <div class="data" is-link @click="labelEdit">编辑</div>
       </div>
-      <div v-if="form.weTagGroupList" class="labelstyle mt15">
+      <div v-if="form.weTagGroupList" class="labelstyle mt10">
         <template v-for="item in form.weTagGroupList">
           <div
             class="label"
@@ -128,7 +128,10 @@
 
       <!-- 步骤条 -->
 
-      <StepList :stepList="list"></StepList>
+      <div class="ac">
+        <van-loading v-if="loadingStep" type="spinner" />
+      </div>
+      <StepList :stepList="list" @reload="changeInfo()"></StepList>
     </div>
 
     <!-- 点击客户标签里的编辑触发弹出框开始 -->
@@ -295,7 +298,7 @@ export default {
       // 待办动态
       todonewsshow: false,
       // 接口开始
-      // externalUserid: 'wmiGuBCgAAoCBD1frD3hRplbsXoBLx6g', // 客户Id
+      externalUserid: '', // 客户IdwmiGuBCgAAoCBD1frD3hRplbsXoBLx6g
       // externalUserid: 'wmiGuBCgAAgeijfvvpJ62cBfwrB-c4kw',
       form: {
         name: '', // 昵称
@@ -334,7 +337,8 @@ export default {
       loading: false,
       finished: false,
       list: [],
-      agentId: ''
+      agentId: '', // 1000012,
+      loadingStep: false
     }
   },
   watch: {
@@ -400,7 +404,7 @@ export default {
     },
     init() {
       let _this = this
-      wx.invoke('getContext', {}, function (res) {
+      wx.invoke('getContext', {}, function(res) {
         if (res.err_msg == 'getContext:ok') {
           let entry = res.entry //返回进入H5页面的入口类型，目前有normal、contact_profile、single_chat_tools、group_chat_tools
           if (
@@ -450,6 +454,8 @@ export default {
         .then((data) => {
           //  重新获取列表
           this.findAddaddEmployes()
+          this.findTrajectory()
+
           if (data.code == 200) {
             this.$toast.success('保存成功')
             this.usershow = false
@@ -461,6 +467,7 @@ export default {
     },
     //   获取轨迹信息
     findTrajectory(page) {
+      this.loadingStep = true
       let query = {
         pageNum: page,
         pageSize: 10,
@@ -468,14 +475,15 @@ export default {
         externalUserid: this.externalUserid
       }
       Object.assign(query, this.query)
-      page && (query.page = page)
       findTrajectory(query)
         .then((data) => {
           //   console.log(data.total);
           this.list = data.rows
+          this.loadingStep = false
         })
         .catch((err) => {
           console.log(err)
+          this.loadingStep = false
         })
     },
     // 点击信息动态
@@ -490,9 +498,9 @@ export default {
         userId: this.userId,
         externalUserid: this.externalUserid,
         content: this.conagency,
-        createDate: new Date(this.dateagency),
-        startTime: new Date(this.startTime),
-        endTime: new Date(this.endTime),
+        createDate: this.dateagency,
+        startTime: `${this.dateagency} ${this.startTime}:00`,
+        endTime: `${this.dateagency} ${this.endTime}:00`,
         status: 1,
         agentId: this.agentId
       }
@@ -502,14 +510,11 @@ export default {
       this.dateagency = ''
       this.startTime = ''
       this.endTime = ''
-      // 重新获取列表
-      this.findTrajectory()
     },
     // 待办日期
     formatDate(dateagency) {
-      return `${dateagency.getFullYear()}-${
-        dateagency.getMonth() + 1
-      }-${dateagency.getDate()}`
+      return `${dateagency.getFullYear()}-${dateagency.getMonth() +
+        1}-${dateagency.getDate()}`
     },
     onConfirm(dateagency) {
       this.dateshow = false