From df10aa0ba61e4e0f23b03005f110bdf728886f6b Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Tue, 14 Jan 2020 21:35:01 +0800
Subject: [PATCH] 助力模块

---
 pages/user/assistance/assistance.js        |  49 ++++++++++++++++++++++++++++++++-----------------
 pages/user/assistance/assistance.wxml      |  15 ++++++++-------
 pages/user/assistance/task_assistance.js   | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
 pages/user/assistance/task_assistance.wxml |  72 ++++++++++++++++++++++++++++++++++++------------------------------------
 pages/user/assistance/task_assistance.wxss |   3 +++
 5 files changed, 191 insertions(+), 92 deletions(-)

diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index df28cf6..52cefee 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -43,12 +43,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-    var th=this;
-    this.data.timer= setInterval(function () {
-      th.get_list();
-   
-    },2000)
-    
+ 
   },
   // 助力活动
    assistance() {
@@ -63,10 +58,14 @@ Page({
       }
     }).then(res => {
       if (res.data.code == 0) {
-    
         var help_data=res.data.data;
-        console.log(help_data.id,'数据', res.data.data);
         th.setData({ zl_act:help_data, help_id:help_data.id });  
+        console.log(th.data.help_id, '数据', res.data);
+        if (th.data.help_id != "" && th.data.help_id!=null) {
+           //我的任务
+          th.get_list();
+         }
+       
 		return getApp().request.promiseGet("/api/weshop/marketing/help/involve/help/act/people/count", {
 		    data: {
 		      helpId: help_data.id, storeId: store_id
@@ -85,6 +84,7 @@ Page({
 
   //--点击获取用户任务列表--会员的任务列表
   get_list:function() {
+    console.log("有走这里吗会员任务11111");
     var th = this;
     var help_id=this.data.help_id;
     t.request.get("/api/weshop/marketing/help/help/user/page", {
@@ -95,16 +95,20 @@ Page({
       },
       success: function(res) {
         clearTimeout(th.data.timer);
-       
-        if (!th.data.is_load) th.setData({
-          is_load: 1
-        })
+        console.log("有走这里吗会员任务6666666");
+        // if (!th.data.is_load) 
+        // th.setData({
+        //   is_load: 1
+        // })
         if (res.data.code == 0) {
-          
+       
           var list = th.data.zl_user_list;
-          list = list.concat(res.data.data.pageData) //连接数组				  
+          //连接数组	
+          list = list.concat(res.data.data.pageData); 
+          console.log("我的任务数据",list); 
           th.setData({
-            zl_user_list: list
+            zl_user_list: list,
+             is_load: 1,
           });
           var n_all_num = th.data.cur_page * th.data.page_num;
           if (res.data.data.total > n_all_num) th.setData({
@@ -127,8 +131,8 @@ Page({
 
   //-----跳转到领取礼包的页面------
   go_task: function() {
+    console.log("跳转领取任务列表2222");
     var help_id=this.data.help_id;
-    
     getApp().goto("/pages/user/assistance/task_assistance?help_id="+help_id);
   },
   switch_head: function (e) {
@@ -148,5 +152,16 @@ Page({
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
   },
-
+  // 领取礼包
+  get_libao:function(e){
+    var libao_id=e.currentTarget.dataset.libaoid;
+    var completeid= e.currentTarget.dataset.completeid;
+    console.log("礼包id", libao_id);
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&completeid=" + completeid);    
+  },
+  //查看礼包id
+  select_libao:function(){
+    var libao_id = e.currentTarget.dataset.libaoid;
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" +0 );    
+  }
 })
\ No newline at end of file
diff --git a/pages/user/assistance/assistance.wxml b/pages/user/assistance/assistance.wxml
index eb5cf9b..aa5bc2e 100644
--- a/pages/user/assistance/assistance.wxml
+++ b/pages/user/assistance/assistance.wxml
@@ -45,18 +45,19 @@
         <view class="items">
           <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
             <view class="flex-center width">
-              <view class="ellipsis-1">{{item.help_taskname}}</view>
+              <view class="ellipsis-1">{{item.helpTaskName}}</view>
             </view>
            
             <!-- 已完成的颜色nostate -->
-            <view class="flex-center width state" wx:if="{{item.is_acting==0}}">
-              <view class="ellipsis-1">领取礼包</view>
+            <view class="flex-center width state" wx:if="{{item.status==1}}">
+              <view class="ellipsis-1"bindtap="get_libao"data-libaoid="{{item.helpListGiftBagId}}"
+              data-completeid="{{item.id}}" >领取礼包</view>
             </view>
-			<view class="flex-center width state" wx:if="{{item.is_acting==1}}">
-			  <view class="ellipsis-1">{{item.helped}}/{{item.help_num}}</view>
+			<view class="flex-center width state" wx:if="{{item.status==0}}">
+			  <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
 			</view>
-			<view class="flex-center width state" wx:if="{{item.is_acting==2}}">
-			  <view class="ellipsis-1">查看礼包</view>
+			<view class="flex-center width state" wx:if="{{item.status==2}}">
+			  <view class="ellipsis-1" bindtap="select_libao" data-libaoid="{{item.helpListGiftBagId}}">查看礼包</view>
 			</view>
 			
 			
diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index 3f60597..59b3fec 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -4,12 +4,12 @@ var e = getApp(),
   app = e,
   i = require("../../../utils/util.js"),
   ut = i,
-  s = e.globalData.setting,
+  s = e.globalData.setting, 
   os = s,
   app_d = e.globalData;
 var regeneratorRuntime = require('../../../utils/runtime.js');
 Page({
-
+ 
   /**
    * 页面的初始数据
    */
@@ -33,7 +33,8 @@ Page({
     taskid: "", //任务id
     usercount: 0, //参与的人数
     dismantle: null, //帮拆记录数据集
-    is_shares:111111,//判断是不是要分享的
+
+    is_user_task:null,//判断是不是领取的任务
    
     //*********************************************start钱
     canvasHidden: 0, //分享图片是否已经生成
@@ -79,6 +80,7 @@ Page({
   add_onlicke: function(e) {
     var th = this;
     var taskid = e.target.dataset.taskid;
+    console.log("任务id5555555", taskid);
     var help_id = th.data.help_id;
     var user_id = getApp().globalData.user_id;
     var stoid = os.stoid
@@ -137,8 +139,6 @@ Page({
 
         }
       }
-
-
     });
 
 
@@ -171,13 +171,14 @@ Page({
           });
           var task_number = data_aissa[0].giftQty - data_aissa[0].useGiftQty;
           var taskid = data_aissa[0].id;
-
+          console.log("参考", data_aissa);
           th.setData({
             aitem: data_aissa,
             task_number: task_number,
             taskid: taskid
           });
-
+          //判断是不是领取的任务
+          th.get_user_task();
 
         }
 
@@ -195,7 +196,7 @@ Page({
     this.user_task_list();
     // 获取会员的参与的任务列表 我的任务
     this.get_user_task_num();
-
+    
   },
 
 
@@ -212,11 +213,19 @@ Page({
     console.log("任务id", taskid);
     var th = this;
     var index = 1; //获取当前选择的是任务还是活动说明
-    var is_task = th.data.is_task; //0任务，1帮拆
+    var is_task = this.data.is_task; //0任务，1帮拆
+    if (is_task == undefined || is_task==null){
+      is_task=1;
+    }
+    var switch_head=this.data.switch_head;
+    if (switch_head == undefined || switch_head== null){
+      switch_head=1;
+    }
+   
     console.log("0任务，1帮拆", is_task, );
-    th.setData({
+    this.setData({
       is_task: 1,
-      switch_head: 1
+      switch_head:1
     });
     rq.get("/api/weshop/marketing/help/help/task/involve/page", {
       data: {
@@ -227,18 +236,33 @@ Page({
       success: function(res) {
 
         if (res.data.code == 0) {
-          var dismantle = res.data.data.pageData;
+          var dismantle = res.data.data.pageData[0].zlHelpUser;
+          console.log(dismantle.toString, "帮拆记录",dismantle[0].nickName);
+         
           th.setData({
             dismantle: dismantle
           });
+        }else{
+          th.setData({
+            dismantle:null
+          });
         }
       }
 
     })
-
-
   },
-
+  // 领取礼包
+  get_libao: function (e) {
+    var libao_id = e.currentTarget.dataset.libaoid;
+    var completeid = e.currentTarget.dataset.completeid;
+    console.log("礼包id", libao_id);
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 1 + "&completeid=" + completeid);
+  },
+  //查看礼包id
+  select_libao: function () {
+    var libao_id = e.currentTarget.dataset.libaoid;
+    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + libao_id + "&is_libao=" + 0);
+  },
 
   //划动的时候监听
   onSli: function(e) {
@@ -246,12 +270,22 @@ Page({
     var ind = e.detail.current;
     var aitem = this.data.aitem;
     var task_number = aitem[ind].giftQty - aitem[ind].useGiftQty;
-    console.log("划动的任务总数", task_number, "任务所有的参数", aitem);
+    var task_id = aitem[ind].id;
+    console.log("划动的任务总数", task_number, "任务所有的参数", aitem,
+     "任务id",task_id);
     th.setData({
       sw_index: ind,
-      task_number: task_number
+      task_number: task_number,
+      taskid: task_id
     });
-    console.log("可以领取的的任务数", aitem[ind].giftQty, '已领取的任务数据', aitem[ind].useGiftQty);
+   
+    if (this.data.switch_head==1){
+      //判断有没有帮拆记录
+      this.dismantle_record();
+    }
+    //判断是不是领取的任务
+    th.get_user_task();
+
   },
   //导航球
   close: function() {
@@ -262,10 +296,22 @@ Page({
   },
   // 获取会员的参与的任务列表 我的任务
   user_task_list: function(e) {
+    
     var th = this;
-
+    
     var index = 0;
-    var is_task = th.data.is_task; //0任务，1活动说明
+    var is_task = this.data.is_task; //0任务，1帮拆
+    if (is_task == undefined || is_task==null){
+      is_task=0;
+    }
+    var switch_head = this.data.switch_head;
+    if (switch_head == undefined || switch_head == null) {
+      switch_head = 0;
+    }
+    this.setData({
+      is_task: index,
+      switch_head: index
+    });
     var help_id = th.data.help_id;
     var user_id = getApp().globalData.user_id;
     rq.get("/api/weshop/marketing/help/help/user/page", {
@@ -275,10 +321,7 @@ Page({
         userId: user_id
       },
       success: function(su) {
-        th.setData({
-          is_task: index,
-          switch_head: index
-        });
+        
         if (su.data.code == 0) {
           var user_list = su.data.data.pageData;
           console.log("会员列表", user_list);
@@ -293,8 +336,32 @@ Page({
       }
     })
   },
+  //判断是否有领取任务
+  get_user_task:function(){
+    var user_id = getApp().globalData.user_id;
+    var th=this;
+    var aitem= th.data.aitem;
+    var sw_index=th.data.sw_index;
+    console.log(sw_index,"判断是否有领取任务", aitem);
+    var taskid = aitem[sw_index].id
+    console.log("判断是否有领取任务 任务的id", taskid);
+    rq.get("/api/weshop/marketing/help/help/task/get",{
+      data:{
+        storeId: os.stoid,
+        userId: user_id,
+        taskId: taskid 
+      },
+      success: function (res) {
+        if (res.data.code==0){
+          var is_usertask=res.data.data;
+          console.log('判断是不是领取的任务', is_usertask);
+          th.setData({is_user_task: is_usertask});
+       }
+      }
+    })
+  },
   //获取助力活动参与的人数
-  get_user_task_num() {
+  get_user_task_num:function(){
     var th = this;
     var help_id = th.data.help_id;
     rq.get("/api/weshop/marketing/help/involve/help/act/people/count", {
@@ -331,7 +398,7 @@ Page({
         if (swiperError >= 3) { //在开关被触发3次以上
           console.error(this.data.swiperError)
           this.setData({
-            goodsIndex: this.data.preIndex
+            sw_index: this.data.preIndex
           }); //，重置current为正确索引
           this.setData({
             swiperError: 0
@@ -351,32 +418,45 @@ Page({
 
   // 轮播图点击左边
   click_pre: function() {
-    console.log("轮播图点击左边");
     var index = this.data.sw_index;
     index--;
     if (index < 0) return;
     var aitem = this.data.aitem;
     var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
+    var task_id = aitem[index].id;
+    console.log("轮播图点击左边", "任务id", task_id, "任务总的data", aitem,
+      "任务总库存", task_number);
     this.setData({
       sw_index: index,
-      task_number: task_number
+      task_number: task_number,
+      taskid: task_id
     })
-
+    if (this.data.switch_head == 1) {
+      //判断有没有帮拆记录
+      this.dismantle_record();
+    }
+    //判断有没有领取任务
+    this.get_user_task();
   },
   //轮播图点击右边
   click_next: function() {
 
     var index = this.data.sw_index;
     index++;
-    console.log("轮播图点击右边");
     if (index >= this.data.aitem.length) return;
     var aitem = this.data.aitem;
     var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
+    var task_id = aitem[index].id;
+    console.log("轮播图点击右边", "任务id", task_id, "任务总的data",aitem,
+      "任务总库存", task_number);
     this.setData({
       sw_index: index,
-      task_number: task_number
+      task_number: task_number,
+      taskid: task_id
     })
-
+    if (this.data.switch_head == 1) {
+      this.dismantle_record();
+    }
   },
 
   /**
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index 7028232..44bc564 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -8,7 +8,7 @@
     </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>
-    </view>
+    </view> 
   </view>
   <!-- 图片的轮播图 -->
   <view class="xc-specific-more-frame flex-center">
@@ -25,21 +25,23 @@
       <view class="bg_right xc-right bcolor mt"></view>
     </view>
   </view>
-  <view class="plan-frame flex ai-center">
+  <view class="plan-frame flex ai-center" wx:if="{{is_user_task}}">
 	  <view class="plan_num rel">
-		  <view class="is_plam abs"></view>
+		  <view class="is_plam abs" style="width:{{(is_user_task.zlHelpNum/is_user_task.helpNum)*100}}%"></view>
 	  </view>
-	  <text class="white fs24">/</text>
+  
+
+	  <text class="white fs24">{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}</text>
 	  
   </view>
   <view class="task-number fs28   white t-c ">
     今天剩余可领{{task_number}}个任务
   </view>
 
-  <view wx:if="{{is_shares==null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}"  bindtap="add_onlicke">
+  <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}"  bindtap="add_onlicke">
     就选它了
   </view>
-   <view wx:if="{{is_shares!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}"  bindtap="save_share">
+   <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{taskid}}"  bindtap="save_share">
   好友拆一拆
   </view>
 
@@ -63,16 +65,17 @@
  
     <view class="items" wx:if="{{is_task==0}}">
   
-      <view class="item fs26 flex-vertical-between padding" wx:for="{{user_task_list}}" >
+      <view class="item fs26 flex-vertical-between padding" wx:for="{{user_task_list}}"wx:key="*this">
         <view class="flex-center width">
           <view class="ellipsis-1">{{item.helpTaskName}}
           </view>
         </view>
         <view class="flex-center width state">
           <view class="ellipsis-1">
-          <text wx:if="{{item.status==0&&item.zlHelpNum<item.helpNum}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
-           <text wx:if="{{item.status==2&&item.zlHelpNum==item.helpNum}}">查看详情</text>
-            <text wx:if="{{item.status==1&&time.zlHelpNum==item.helpNum}}">领取礼包 </text>
+          <text wx:if="{{item.status==0}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
+           <text wx:if="{{item.status==2}}"bindtap="select_libao" data-libaoid="{{item.helpListGiftBagId}}">查看礼包</text>
+            <text wx:if="{{item.status==1}}"bindtap="get_libao"data-libaoid="{{item.helpListGiftBagId}}"
+              data-completeid="{{item.id}}">领取礼包 </text>
           </view>
         </view>
 
@@ -82,19 +85,30 @@
 
 
   <view class="items" wx:if="{{is_task==1}}">
-    <view class="item fs26 flex flex-vertical-between padding" wx:for="{{dismantle}}">
+  <block wx:if="{{ dismantle!=null|| dismantle!=''}}">
+
+
+    <view class="item fs26 flex flex-vertical-between padding" wx:for="{{dismantle}}"wx:for-index="idx">
+     
       <view class="flex white" style="justify-content: space-around; width: 90%;margin:auto">
-        <image class="circle user_img" src="{{iurl+itme.headPic}}"></image>
-        <view class="ellipsis-1">{{itme.nickName}}
+        <image class="circle user_img" src="{{item.headPic}}"></image>
+        <view class="ellipsis-1">{{item.nickName}}
         </view>
-        <view class="ellipsis-1">{{filter.format_time(itme.beginDate)}}
+        <view class="ellipsis-1">{{filter.format_time(item.zltime)}}
         </view>
       </view>
 
     </view>
-
+  </block>
+  
+   <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
+    <view class="flex-center nothing white">
+      <view>暂无任务记录</view>
+    </view>
   </view>
-  <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}">
+ 
+  </view>
+  <view class="fs30" wx:if="{{user_task_list==null ||  user_task_list==''}}">
     <view class="flex-center nothing white">
       <view>暂无任务记录</view>
     </view>
@@ -114,27 +128,13 @@
     <view>人领取了任务</view>
   </view>
 </view>
-<view wx:if="{{is_share}}">
-  <!-- 蒙尘 -->
-  <view class="dust">
-  </view>
-  <!-- 画布 -->
-  <view class="canvas" style="width:100%;">
-    <view class="flex-center">
-      <canvas canvas-id="share_id" style="width:600rpx;height:1000rpx;" bindtap="preview"></canvas>
-    </view>
-    <view class="closes flex-center">
-      <image class="close" src="{{iurl}}/miniapp/images/plus/Close.png" bindtap="close_share"></image>
-    </view>
-  </view>
-</view>
+
 
 <!--********** 钱巧玲 -->
-<view>
-  <!-- 蒙尘 -->
-  <view class="dust">
-  </view>
-  <!-- 画布 -->
+<!-- <view>
+ 
+  <view class="dust"></view>
+
   <view class="canvas" style="width:100%;">
     <view class="flex-center">
       <canvas wx:if="{{is_share}}" canvas-id="share_id" style="width:600rpx;height:1000rpx;" bindtap="preview"></canvas>
@@ -143,7 +143,7 @@
       <image class="close" src="{{iurl}}/miniapp/images/plus/Close.png" bindtap="close_share"></image>
     </view>
   </view>
-</view>
+</view> -->
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
 <!--  制作一个圆球导航  -->
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index c9e1c26..1c4dda8 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -165,8 +165,11 @@ border-color: #fff;
 	background: #ffe7ab;
 	border-radius: 20rpx;
 	height: 22rpx;
+  margin-right: 10rpx;
 }
 .is_plam{
+  	border-radius: 20rpx;
+  background: #fcc001;
 	height: 100%;
 	top: 0rpx;
 	left: 0rpx;
--
libgit2 0.21.4