Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0

pages/meetingDetail/meetingDetail.js

@@ -172,10 +172,9 @@ create.Page({
           aheadTimesListId: !!res.data.data.aheadTimes ? res.data.data.aheadTimes : [-1],
         },
         "loading.details": true
-
       })
 
-      this.$store.data.originalData = res.data.data
+      this.$store.data.originalData = res.data.data;
       this.$store.data.locationName = res.data.data.location ? res.data.data.location.locationName : ''
       this.$store.data.roomId = res.data.data.meetingRoomId < 0 ? '' : res.data.data.meetingRoomId
       this.store.data.scheduleId = res.data.data.groupId
@@ -983,13 +982,6 @@ create.Page({
       return it
     })
   },
-  showPop(e) {
-    this.setData({
-      pop: e.target.dataset.pop,
-      show: true
-    })
-  },
-
   // 上传文件
   async handleAddFile() {
     this.store.data.description = '';
@@ -1018,37 +1010,11 @@ create.Page({
     this.update()
     dd.navigateTo({ url: `./../uploadFile/uploadFile?id=${this.store.data.scheduleId}` })
   },
-
-
   expand() {
     this.setData({
       isExpand: false
     })
   },
-  setCopy(event) {
-    if (event.currentTarget.dataset.type) {
-      dd.setClipboard({
-        text: event.currentTarget.dataset.item,
-        success: res => {
-          dd.alert({
-            buttonText: '确定',
-            content: '复制成功，请在外部浏览器打开'
-          })
-        }
-      })
-    } else {
-      dd.setClipboard({
-        text: event.currentTarget.dataset.item,
-        success: res => {
-          this.setData({
-            'conToastData.showToast': true,
-            'conToastData.title': '复制成功',
-          });
-
-        }
-      })
-    }
-  },
   //修改任务状态
   changeTaskStatus(e) {
     const data = {
@@ -1196,7 +1162,18 @@ create.Page({
       meetingId: this.store.data.scheduleId,
     }).then(res => {
       if (res.data.code == 0) {
-        this.getAffairList(this.store.data.scheduleId);
+
+        // 修改列表数据
+        const [index] = this.getIndexFromAffairList(this.store.data.parentCommentId);
+        if (index !== -1) {
+          const addData = res.data.data[0].commentListDataModelList[0];
+          addData.updateTime = getCreateShowTime(addData.updateTime);
+          if (this.store.data.affairList[index].replyCommentList) {
+            this.store.data.affairList[index].replyCommentList.push(addData)
+          } else {
+            this.store.data.affairList[index].replyCommentList = [addData];
+          }
+        }
         // clear
         this.store.data.parentCommentId = '';
         this.update();