From 18e2b985d19d81d6cf8cbb72cb2be05575cd9742 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 15 Jan 2020 14:50:53 +0800
Subject: [PATCH] 定时器任务的修改

---
 pages/user/assistance/task_assistance.js   | 70 +++++++++++++++++-----------------------------------------------------
 pages/user/assistance/task_assistance.wxml |  4 +++-
 2 files changed, 20 insertions(+), 54 deletions(-)

diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index bea079b..ed4f9c7 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -47,6 +47,7 @@ Page({
     already: 0, //已有几人助力
     lack: 0, //还差几人助力
     zltime: "", //助力时间
+	djs:"",//定时器的显示
     //*********************************************end
   },
 
@@ -132,6 +133,11 @@ Page({
           th.setData({
             endDate: help_data.endDate,
           });
+		  
+		  //任务时间 设置全局定时器
+		  th.data.timer = setInterval(function() {
+		    th.countDown();
+		  }, 1000);
 
         }
       }
@@ -180,14 +186,12 @@ Page({
 
       }
     })
+	
     // 分享的
     // setTimeout(function() {
     //   th.shareFrends();
     // }, 1000)
-    //任务时间 设置全局定时器
-    th.data.timer = setInterval(function() {
-      th.countDown();
-    }, 1000);
+   
     //会员任务列表
     this.user_task_list();
     // 获取会员的参与的任务列表 我的任务
@@ -479,14 +483,11 @@ Page({
     var th = this;
     // 获取当前时间，同时得到活动结束时间数组
     var newTime = ut.gettimestamp();
-    var List = this.data.aitem;
-    for (var j = 0; j < List.length; j++) {
-      var o = List[j];
-
+   
       // 对结束时间进行处理渲染到页面
 
       // var o = endTimeList[i];
-      var endTime = o.endDate
+      var endTime = th.data.endDate
 
       // if (o.status == 0) endTime = o.start_time
 
@@ -507,7 +508,6 @@ Page({
           sec: this.timeFormat(sec)
         }
       } else {
-
         //活动已结束，全部设置为'00'
         obj = {
           day: '00',
@@ -516,14 +516,14 @@ Page({
           sec: '00'
         }
       }
-      var txt = "aitem[" + j + "]djs";
+  
       th.setData({
-        [txt]: obj
+        djs: obj
       });
 
 
-    }
-    setTimeout(th.countDown, 1000);
+    
+    
 
   },
   //---小于10的格式化函数----
@@ -654,8 +654,7 @@ Page({
         }, 500)
       })
     })
-    //   }
-    // })
+    
   },
   preview: function() {
     var th = this;
@@ -1141,43 +1140,8 @@ Page({
     getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" +giftbagid + "&is_libao=" + 0);
   },
   //正在进行任务
-  test: function (e) {
-    var th=this;
-    var aitem = this.data.aitem; //任务的数据集
-    var sw_index = this.data.sw_index; //轮播的下标
-    //任务id
-    var taskid = aitem[sw_index].id;
-    //查看正在进行中的任务
-    getApp().request.promiseGet("/api/weshop/marketing/help/help/task/get",{
-        data:{
-          storeId: os.stoid,
-          userId: getApp().globalData.user_id,
-          taskId:taskid
-        }   
-    }).then(res=>{
-      if (res.data.code==0){
-        var zzjx_id=res.data.data.id;
-        th.setData({zzjx_id:zzjx_id});
-        var zzjx_id=th.data.zzjx_id;
-        getApp().goto("/pages/user/friend_assistance/friend_assistance?taskimg=" + zzjx_id);
-    //     return getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert",{
-    //       id:zzjx_id,
-    //       storeId: os.stoid,
-    //       userId: getApp().globalData.user_id,
-    //       zlUserId: 4379287
-    //     },function (res) {
-    //       if (res.data.code==0){
-           
-    
-    //  }
-    //   }
-       
-      }
-    //     )}
-     })
-
-
-
+  test: function (e) {  
+       getApp().goto("/pages/user/assistance/friend_assistance?tasking=13");
   },
 
 })
\ No newline at end of file
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index 50050ce..ebecdab 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -7,7 +7,9 @@
       {{aitem[sw_index].helpTaskName}}
     </view>
     <view class="activity-data t-c fs28  white">
-      活动剩余时间:<text class='tui-conutdown-box'> {{aitem[0].djs.day}}</text>:<text class='tui-conutdown-box'>{{aitem[0].djs.hou}}</text>:<text class='tui-conutdown-box'>{{aitem[0].djs.min}}</text>:<text class='tui-conutdown-box tui-countdown-bg'>{{aitem[0].djs.sec}}</text>
+      活动剩余时间:<text class='tui-conutdown-box'> {{djs.day}}</text>:
+	  <text class='tui-conutdown-box'>{{djs.hou}}</text>:<text class='tui-conutdown-box'>{{djs.min}}</text>:
+	  <text class='tui-conutdown-box tui-countdown-bg'>{{djs.sec}}</text>
     </view> 
   </view>
   <!-- 图片的轮播图 -->
--
libgit2 0.21.4