Merge branch 'dev_1.1.2' of https://git.yishihui.com/DeNet/de-net into dev_1.1.2

src/view/popup/tabbar-page/message/index.vue

@@ -299,6 +299,19 @@ const getLuckdropRecordsList = () => {
   });
 };
 
+const getCurrentList = () => {
+    getMineLuckdropRecords({
+        params: {
+            pageNum: 1,
+            pageSize: giveList.value.length || 20,
+        }
+    }).then((res) => {
+        if (res.data && res.data.length) {
+            giveList.value = res.data;
+        }
+    })
+}
+
 /**
  * 点击列表跳转到推文
  */
@@ -397,6 +410,8 @@ const modalCancel = () => {
       giveList.value[index]["status"] = res.data.status;
       giveList.value[index]["postTaskLuckdrop"]["reSendAvailable"] = false;
       giveList.value[index]["postTaskLuckdrop"]["terminatedAvailable"] = false;
+      // 重新拉取
+      getCurrentList()
     }
   });
   terminaTask = {};
@@ -477,12 +492,15 @@ const downTimeBegin = () => {
     list.forEach((item) => {
         if (item.endTimestamp) {
             let time = moment(new Date().getTime())
-            let endTime = moment(item.endTimestamp)
+            let endTime = moment(item.endTimestamp + 5000)
             let downTime = (endTime - time) || 0
             if (downTime > 0) {
                 item.downTime = formatSecondsAsTime(downTime / 1000);
                 ifDown = true;
             }
+            if (item && item.downTime && item.downTime == '00:00') {
+                getCurrentList()
+            }
         }
     })