Merge branch 'dev' into 'test'

Dev See merge request !283

Merge branch 'dev' into 'test'
Dev See merge request !283
后端研发-苏明海
2 parents b7151bec abdcef98
Showing 13 changed files with 1356 additions and 25 deletions
app.json
pages/goods/goodsInfo/goodsInfo.js
pages/test/zhuli_test.js
pages/test/zhuli_test.json
pages/test/zhuli_test.wxml
pages/test/zhuli_test.wxss
pages/user/assistance/assistance.js
pages/user/assistance/assistance.wxml
pages/user/assistance/giftpacklist.js
pages/user/assistance/giftpacklist.wxml
pages/user/assistance/giftpacklist.wxss
pages/user/assistance/task_assistance.js
pages/user/assistance/task_assistance.wxml
@@ -89,8 +89,12 @@
     "pages/giftpack/mygiftpack/mygiftpack",
  
      "pages/user/assistance/giftpacklist",
-     "pages/user/assistance/task_assistance"
+     "pages/user/assistance/task_assistance",
+     "pages/user/assistance/friend_assistance",
+     "pages/user/assistance/assistance_success",
+     "pages/user/assistance/assistance",
  
+     "pages/test/zhuli_test"
  
   ],
   "permission": {
@@ -2601,6 +2601,14 @@ Page({
  
   //--定义的保存图片方法，分享团---
   saveImageToPhotosAlbum: function() {
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      //getApp().my_warnning("请先登录",0,this);    
+      wx.navigateTo({ url: '/pages/getphone/getphone', })     
+      return false;
+    }
+   
     //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团
     var type = this.data.prom_type;
     if (type == 6) type = 2;
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a;
+var regeneratorRuntime = require('../../utils/runtime.js');
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    iurl: a.imghost, //图片地址前缀\
+    taskId:0,
+    mobile:0,
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+    wx.setNavigationBarTitle({
+      title: "测试帮忙助力",
+    })
+    var th = this;
+    var taskId=options.taskId;
+    this.data.taskId=taskId;
+  },
+
+  getphoneValue:function(e){
+     this.data.mobile=e.detail.value;
+  },
+  //测试正在进行任务
+  bindReg:async function () {
+    var userinfo=null;
+    await getApp().request.promiseGet("/api/weshop/users/page",{
+        data:{mobile:this.data.mobile,store_id:os.stoid}
+    }).then(res=>{
+      userinfo=res.data.data.pageData[0];
+    })
+    if(!userinfo)  {
+      getApp().my_warnning("未找到会员",0,this); return false;
+    }
+
+    var task=null;
+    await getApp().request.promiseGet("/api/weshop/marketing/help/help/task/get",{
+      data:{taskId:this.data.taskId,storeId:os.stoid,userId:userinfo.user_id}
+    }).then(res=>{
+      task=res.data.data;
+    })
+    if(!task)  {
+      getApp().my_warnning("未找任务",0,this); return false;
+    }
+
+    if(task.status!=0){
+      getApp().my_warnning("任务不是进行中",0,this); return false;
+    }
+    var taking=task.id;
+    getApp().goto("/pages/user/assistance/friend_assistance?tasking=" + taking + "&userId=" + userinfo.user_id);
+  },
+
+
+})
+{
+  "navigationBarTitleText": "助力测试专用",
+  "usingComponents": {
+    "warn": "/components/long_warn/long_warn"
+  }
+}
 \ No newline at end of file
+<view class="index">
+
+  <!-- 发送验证码登录注册 -->
+  <view class="sr">
+    <view class="inputs fs30">
+      <!-- 手机号码 -->
+      <view class="flex rel phone_view">
+        <image src="{{iurl}}/mddmscp/regico1.jpg" class="tubiao_set"></image>
+        <input class="input_phone" type="number" placeholder="请输入手机号码" placeholder-style="color:rgb(190,190,190);"
+               maxlength="11" bindinput="getphoneValue"></input>
+      </view>
+    </view>
+    <!-- 点击注册 -->
+    <view class="flex-center fs30 reg_btn" bindtap="bindReg">
+      <view class="userlogin flex-center on">
+        <view>去帮忙助力</view>
+      </view>
+    </view>
+  </view>
+</view>
+
+<warn id="warn"></warn>
+page{
+  border-top: 3rpx solid #EAEAEC;
+}
+.index {
+  position: absolute; width: 100%;
+  z-index: 1;
+}
+
+.logins {
+  width: 100%;
+  padding-top: 60rpx;
+  padding-bottom: 120rpx;
+}
+
+.login_img {
+  width: 192rpx;
+  height: 192rpx;
+  border-radius: 50%
+}
+
+.input_phone {
+  height: 55rpx;
+  line-height: 55rpx;
+  margin-left:10rpx ;
+  position: relative; top:10rpx
+}
+
+.input_code {
+  width: 360rpx;
+  height: 55rpx;
+  line-height: 55rpx;
+  border-radius: 12rpx;
+  margin-right: 20rpx;
+  border: 3rpx solid rgb(230, 230, 230);
+  padding-left: 40rpx;
+ color:#ef8179
+}
+
+.codes {
+  margin-bottom: 65rpx;
+}
+
+.get_code {
+  width: 176rpx;
+  height: 65rpx;
+  line-height: 65rpx;
+  border:1rpx solid rgb(236, 109, 95);
+  color: #ed7067;
+  border-radius: 12rpx;
+  right: 0;
+  top:5rpx;
+}
+
+.userlogin {
+  width: 100%;
+  height: 95rpx;
+  line-height: 95rpx;
+  background-color: #ffc5c0;
+  color: rgb(255, 255, 255);
+  margin-bottom: 30rpx;
+  margin-top: 50rpx
+  }
+
+.userlogin.on{
+   background-color:  #eb6359;
+}
+ 
+.go_index {
+  color: #9d9d9d;
+  margin-bottom: 300rpx;
+}
+
+.sr {
+  width: 90%; margin: 0 auto;
+}
+
+.checkbox {
+  width: 25rpx;
+  height: 25rpx;
+  color: rgb(0, 0, 0);
+  margin-right: 50rpx;
+  margin-bottom: 30rpx
+}
+
+.agrs {
+  padding: 0rpx 65rpx;
+}
+
+.agreement {
+  color: rgb(236, 109, 95);
+  display: initial;
+}
+
+.popup {
+  position: fixed;
+  z-index: 10;
+  background-color: rgba(153, 153, 153, 0.568);
+  height: 100%;
+  width: 100%;
+}
+
+.content {
+  max-height: 800rpx;
+min-height: 100rpx;
+padding: 60rpx 35rpx;
+background-color: rgb(255, 255, 255);
+width: 570rpx;
+margin-bottom: 70rpx;
+overflow-y: scroll;
+border-radius: 15rpx;
+line-height: 50rpx;
+font-size: 26rpx;
+color: #545454;
+
+
+}
+
+.close {
+  width: 65rpx;
+  height: 65rpx;
+}
+
+.xy {
+  display: initial;color: #9c9c9c; line-height: 34rpx
+}
+
+.get_code.on{
+ color: #666;
+}
+.tubiao_set{
+   width: 50rpx; height: 64rpx; margin-right:30rpx; position: relative; top:5rpx;
+}
+.tubiao_set2{
+   width: 46rpx; height: 64rpx; margin-right:34rpx; 
+}
+.phone_view{
+   border-bottom:1rpx solid #e8e8e8 ;
+   height: 96rpx; margin-top:50rpx 
+
+}
+.phone_view.mt{
+  margin-top:20rpx 
+}
+.reg_btn{
+  margin-top:40rpx; margin-bottom: 20rpx
+}
@@ -20,7 +20,7 @@ Page({
     switch_head: 0, //0：我的任务，1：活动说明
     zl_act: null, //助力活动
     zl_user_list: [], //任务列表
-    is_load: 0, //是否已经加载 
+    is_load: 0, //是否已经加载
     cur_page: 1, //页码
     page_num: 5, //每页多少个
     is_show_more: 0, //是否加载更多
@@ -37,15 +37,16 @@ Page({
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.set_name("助力", "/pages/user/assistance/assistance");
-    // 助力活动
-    th.assistance();
+
   },
  
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-
+    var th = this;
+    // 助力活动
+    th.assistance();
   },
   // 助力活动
   assistance() {
@@ -94,7 +95,9 @@ Page({
  
     var th = this;
     var page = th.data.page;
+    if(page==1)th.data.zl_user_list=[];
     var help_id = this.data.help_id;
+    var r=Math.random()*100;
     t.request.get("/api/weshop/marketing/help/help/user/page", {
       isShowLoading: true,
       data: {
@@ -102,7 +105,8 @@ Page({
         storeId: os.stoid,
         helpId: help_id,
         page: page,
-        pageSize: 5
+        pageSize: 5,
+        r:r,
       },
       success: function(res) {
         clearTimeout(th.data.timer);
@@ -113,7 +117,7 @@ Page({
           })
         if (res.data.code == 0) {
           var list = th.data.zl_user_list;
-          //连接数组	
+          //连接数组
           list = list.concat(res.data.data.pageData);
           th.setData({
             zl_user_list: list,
@@ -178,6 +182,13 @@ Page({
   select_libao: function(e) {
     var orderSn = e.currentTarget.dataset.ordersn; //订单号
     getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
+  },
+
+  //---查看任务---
+  go_to_task:function (e) {
+    var help_id = this.data.help_id;
+    var taskid=e.currentTarget.dataset.taskid;
+    getApp().goto("/pages/user/assistance/task_assistance?help_id=" + help_id+"&taskid="+taskid);
   }
  
-})
 \ No newline at end of file
+})
@@ -53,7 +53,7 @@
               <view class="flex-center width state" wx:if="{{item.status==1}}">
                 <view class="ellipsis-1" bindtap="get_libao" data-help_id="{{item.helpFormId}}" data-taskId="{{item.helpTaskId}}" data-id="{{item.id}}">领取礼包</view>
               </view>
-              <view class="flex-center width state" wx:if="{{item.status==0}}">
+              <view class="flex-center width state" wx:if="{{item.status==0}}" data-taskId="{{item.helpTaskId}}" bindtap="go_to_task">
                 <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
               </view>
               <view class="flex-center width state" wx:if="{{item.status==2}}">
@@ -107,4 +107,4 @@
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
 <!--  制作一个圆球导航  -->
-<nav_b id="nav_b"></nav_b>
 \ No newline at end of file
+<nav_b id="nav_b"></nav_b>
@@ -334,10 +334,21 @@ Page({
   bind_bnerr2: function(e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
-    _errObj[_errImg] = "/public/images/empty.jpg";
+    _errObj[_errImg] ="/miniapp/images/giftbag/gift01.png";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
  
   },
+
+  //图片失败，默认图片
+  bind_bnerr: function (e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _errObj = {};
+    _errObj[_errImg] = this.data.iurl + "/miniapp/images/empty.jpg";
+    //this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
+    this.setData({ giftImage: this.data.iurl + "/miniapp/images/giftbag/gift01.png"});
+
+  },
+
   //关闭导航
   close: function() {
     var th = this;
 <view wx:if="{{is_head}}" class="box data-v-3a5b7e36" bindtap="close">
   <view class="box_top data-v-3a5b7e36">
-    <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr2" data-errorimg="giftImage"></image>
+    <image src="{{giftImage}}" class="data-v-3a5b7e36" data-i='{{giftImage}}' lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>    
   </view>
   <view class="box_title data-v-3a5b7e36">
     <view class="top_title data-v-3a5b7e36">
@@ -105,9 +105,13 @@
   <view class="foot_button data-v-3a5b7e36">
     <block wx:if="{{is_type!=0}}">
       <block wx:if="{{is_type==1}}">
-        <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetReceive">
+        <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetReceive" wx:if="{{!receiveState}}">
           <text class="data-v-3a5b7e36">一键全部领取</text>
         </view>
+
+        <view class="foot_button_buy data-v-3a5b7e36 on" bindtap="GetReceive" wx:else>
+          <text class="data-v-3a5b7e36">已领取</text>
+        </view>
       </block>
       <block wx:if="{{is_type==2}}">
         <block wx:if="{{is_lb!=1}}">
@@ -141,4 +145,4 @@
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
 <!--  制作一个圆球导航  -->
-<nav_b id="nav_b"></nav_b>
 \ No newline at end of file
+<nav_b id="nav_b"></nav_b>
@@ -96,6 +96,7 @@
   border: 2rpx solid #999;
   width: 120rpx;
   height: 120rpx;
+  background-color:#f8f8f8; 
   /* background-color: rgba(153, 153, 153, 0.664); */
 }
  
@@ -219,6 +220,10 @@
   border-radius: 40rpx;
 }
  
+.foot_button_buy.data-v-3a5b7e36.on{
+   background-color: gainsboro; color: #666;
+}
+
 .foot_button_intalge.data-v-3a5b7e36 {
   background: #ffbb42;
   color: #fff;
+var auth = require("../../../utils/auth.js"),
+  rq = require("../../../utils/request.js");
+var e = getApp(),
+  app = e,
+  i = require("../../../utils/util.js"),
+  ut = i,
+  s = e.globalData.setting,
+  os = s,
+  app_d = e.globalData;
+var regeneratorRuntime = require('../../../utils/runtime.js');
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    swpie_img: s.imghost + "/miniapp/images/user_index_powder.jpg",
+    defaultAvatar: s.imghost + "/miniapp/images/no-head.jpg",//助力头像的默认图
+    sw_index: 0, //轮播的下标控制
+    url: s.url, //接口网址
+    iurl: s.imghost,
+    endDate: "", //活动结束时间
+    activity_data: "25:20:59", //活动剩余时间
+    task_number: 0, //任务数
+    is_task: 0, //历史记录与任务
+    aitem: "", //活动的轮播图数据
+    switch_head: 0, //0：我的任务，1：记录
+    help_id: "", //活动的id    canvasHidden: 0, //分享图片是否已经生成
+    gid: "",
+    timer: null, //全局的定时器
+    user_task_list: [], //会员列表
+    taskid: "", //任务id
+    usercount: 0, //参与的人数
+    dismantle: [], //帮拆记录数据集
+    is_user_task: null, //判断是不是领取的任务
+    zzjx_id: "", //真正进行的任务id
+    is_show: 0, //任务的加载更多
+    is_bc_show: 0, //帮拆的加载更多
+    bc_page: 1, //帮拆的页码
+    rw_page: 1, //任务的页码
+    block: 0, //阻断助力的我的任务在当前位置多次点击
+    is_dismantle: 0, //阻断助力的帮拆记录在当前位置多次点击
+    is_clik: 0,//点击的时候控制划动
+    is_dis_list: 0,//多个数据的时候
+    is_user_list: 0,//我的任务点击加载更多的后
+
+    //*********************************************start钱
+    canvasHidden: 0, //分享图片是否已经生成
+    is_share: 0, //是否显示画布
+    shareImgPath: [], //生成的图片
+    screenWidth: "", //用户的屏幕宽度
+    gid: "",
+    images: ["miniapp/images/friendhelp/help.png", "miniapp/images/friendhelp/background.png", "miniapp/images/friendhelp/no_check.png",
+      "miniapp/images/friendhelp/check.png", "miniapp/images/friendhelp/unfinished.png", "miniapp/images/xc_ellipsis.png"
+    ], //固的分享图片
+
+    dynamic: null, //已助力的微信头像数组
+    head_pic_arr: [], //助力的头像
+    share_lb_img: "", //分享的礼包图片
+
+    is_generate: 0, //是否重复点击拆一拆
+    already: 0, //已有几人助力
+    lack: 0, //还差几人助力
+    zltime: "", //助力时间
+    djs: "", //定时器的显示
+    //*********************************************end
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var th = this;
+    var help_id = options.help_id;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.set_name("助力", "/pages/user/assistance/assistance");
+    th.setData({
+      help_id: help_id
+    });
+    //start 钱
+    if (options.gid != undefined) {
+      th.setData({
+        gid: options.gid
+      })
+    }
+    if (options.taskid != undefined) {
+       th.setData({taskid:options.taskid})
+    }
+
+    th.close();
+    th.syinfo();
+    th.imageinfo();
+
+  },
+
+
+  //选中任务保存
+  add_onlicke: function (e) {
+    var th = this;
+    var taskid = e.target.dataset.taskid;
+    var help_id = th.data.help_id;
+    var user_id = getApp().globalData.user_id;
+    var stoid = os.stoid
+    getApp().request.json_post("/api/weshop/marketing/help/help/task/insert", {
+      helpId: help_id,
+      userId: user_id,
+      storeId: stoid,
+      taskId: taskid
+    },
+      function (res) {
+        if (res.data.code == 0) {
+          getApp().my_warnning(res.data.data, 1, th);
+          //判断是不是领取的任务
+          th.get_user_task();
+          //会员任务列表
+          th.user_task_list();
+        } else {
+          getApp().my_warnning(res.data.msg, 0, th);
+        }
+      }
+
+    )
+
+  },
+
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.data.is_timer = 1;
+    var th = this;
+    var help_id = th.data.help_id;
+    var user_id = getApp().globalData.user_id;
+
+    /*-----助力活动（判断）-----*/
+    rq.get("/api/weshop/marketing/help/act/judge", {
+      data: {
+        userId: user_id,
+        storeId: os.stoid
+      },
+      success: function (res) {
+        if (res.data.code == 0) {
+          var help_data = res.data.data;
+          th.setData({
+            endDate: help_data.endDate,
+          });
+
+          //任务时间 设置全局定时器
+          th.setData({
+            timer: setInterval(function () {
+              th.countDown();
+            }, 1000)
+          })
+
+
+        }
+      }
+    });
+
+
+    /*-----获取助力活动的任务-----*/
+    rq.get("/api/weshop/marketing/help/help/task/page", {
+      data: {
+        helpId: help_id,
+        storeId: os.stoid
+      },
+      success: function (su) {
+        var data = su.data;
+        if (data.code != 0) {
+          getApp().my_warnning(data.msg, 0, th);
+          return false;
+        }
+        if (data.code == 0) {
+          //轮播图的数据
+          var data_aissa = data.data.pageData;
+          //当前时间戳
+          var nt = ut.gettimestamp();
+
+          data_aissa.forEach(function (val, ind) {
+            //已开始
+            if (val.start_time < nt && val.end_time > nt) data_aissa[ind].status = 0;
+            //未开始
+            else if (val.start_time > nt && val.end_time > nt) data_aissa[ind].status = 1;
+            //已结束
+            else if (val.start_time < nt && val.end_time < nt) data_aissa[ind].status = 2;
+          });
+          var task_number = data_aissa[0].giftQty - data_aissa[0].useGiftQty;
+          var taskid = data_aissa[0].id;
+          if(th.data.taskid) {
+            th.setData({
+              aitem: data_aissa,
+              task_number: task_number,
+            });
+            th.go_to_task(th.data.taskid);
+
+          }else{
+            th.setData({
+              aitem: data_aissa,
+              task_number: task_number,
+              taskid: taskid
+            });
+            //判断是不是领取的任务
+            th.get_user_task();
+          }
+        }
+
+      }
+    })
+
+    // 分享的
+    // setTimeout(function() {
+    //   th.shareFrends();
+    // }, 1000)
+
+    //会员任务列表
+    this.user_task_list();
+    //获取助力活动参与的人数
+    this.get_user_task_num();
+
+  },
+  //记录加载更多
+  dismantle_record_list: function () {
+    this.setData({ is_dismantle: 0 });
+    this.dismantle_record();
+  },
+
+  dismantle_record_click(){
+    if(this.data.switch_head==1) return false;
+    this.setData({ is_dismantle: 0 });
+    this.dismantle_record();
+  },
+
+  //帮拆记录的
+  dismantle_record: function (e) {
+    //优化
+    if (this.data.is_dismantle == 1) {
+      return false;
+    }
+
+    var aitem = this.data.aitem; //任务的数据集
+    var sw_index = this.data.sw_index; //轮播的下标
+    //任务id
+    var taskid = aitem[sw_index].id;
+    var th = this;
+    var index = 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;
+    }
+    this.setData({
+      is_task: 1,
+      switch_head: 1,
+      block: 0,
+    });
+
+    var bc_page = th.data.bc_page;
+    rq.get("/api/weshop/marketing/help/help/task/involve/page", {
+      data: {
+        page: bc_page,
+        pageSize: 5,
+        taskId: taskid,
+        userId: getApp().globalData.user_id,
+        storeId: os.stoid
+      },
+      success: function (res) {
+        if (res.data.code == 0) {
+          th.setData({ is_dismantle: 1 });
+          var dismantle = res.data.data.pageData[0].zlHelpUser;
+          if (res.data.data.total > 5) {
+            var bc_page = th.data.bc_page + 1;
+            var dismantle_s = th.data.dismantle.concat(dismantle);
+            th.setData({
+              bc_page: bc_page,
+              is_bc_show: 1,
+              dismantle: dismantle_s,
+              is_dis_list: 1
+            })
+          } else {
+            th.setData({
+              dismantle: dismantle,
+              is_dis_list: 0
+            });
+          }
+          var dis_len = th.data.dismantle.length;
+          if (res.data.data.total == dis_len) {
+            th.setData({
+              is_dis_list: 0,
+            })
+          }
+          th.setData({
+
+            is_clik: 0,
+          });
+        } else {
+          th.setData({
+            dismantle: null
+          });
+        }
+      }
+
+    })
+  },
+  // 领取礼包
+  get_libao: function (e) {
+    var libao_id = e.currentTarget.dataset.libaoid; //礼包id
+    var taskid = e.currentTarget.dataset.taskid;
+    var taskingid = e.currentTarget.dataset.taskingid;
+    getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + this.data.help_id + "&is_libao=" + 1 + "&taskId=" + taskid + "&id=" + taskingid);
+  },
+  //查看礼包id
+  select_libao: function (e) {
+    var orderSn = e.currentTarget.dataset.ordersn;
+    getApp().goto("/pages/user/assistance/giftpacklist?orderSn=" + orderSn);
+  },
+
+  //划动的时候监听
+  onSli: function (e) {
+    var arr = [];
+    this.setData({
+      dismantle: arr
+    });
+    var th = this;
+    var ind = e.detail.current;
+    var aitem = this.data.aitem;
+    var task_number = aitem[ind].giftQty - aitem[ind].useGiftQty;
+    var task_id = aitem[ind].id;
+    th.setData({
+      sw_index: ind,
+      task_number: task_number,
+      taskid: task_id,
+      is_dismantle: 0,
+      bc_page: 1
+    });
+
+    if (this.data.switch_head == 1 && th.data.is_clik == 0) {
+      //判断有没有帮拆记录
+      this.dismantle_record();
+    }
+    //判断是不是领取的任务
+    th.get_user_task();
+
+  },
+  //导航球
+  close: function () {
+    var th = this;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
+  },
+  //我的任务点击加载更多
+  task_list: function () {
+    this.setData({ block: 0 });
+    this.user_task_list();
+  },
+  // 获取会员的参与的任务列表 我的任务
+  user_task_list: function (e) {
+    var th = this;
+    //防止已经当前位置的时候多次点击
+    if (th.data.block == 1) { return false; }
+    th.data.block=1;
+    var index = 0;
+    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,
+      user_task_list:[],
+    });
+    var help_id = th.data.help_id;
+    var user_id = getApp().globalData.user_id;
+    var rw_page = th.data.rw_page;
+    if(rw_page==1)th.data.zl_user_list=[];
+    var r=Math.random()*100;
+    rq.get("/api/weshop/marketing/help/help/user/page", {
+      data: {
+        page: rw_page,
+        pageSize: 5,
+        helpId: help_id,
+        storeId: os.stoid,
+        userId: user_id,
+        r:r,
+      },
+      success: function (su) {
+        th.data.block=0
+        if (su.data.code == 0) {
+          if (su.data.data.total > 5) {
+            var rw_page = th.data.rw_page + 1;
+            th.setData({
+              rw_page: rw_page,
+              is_show: 1
+            })
+
+          }
+
+
+          var user_list = su.data.data.pageData;
+          // if (user_list == "" || user_list.length == 0 || user_list==null){
+          //   th.setData({
+          //     is_user_list: 1
+          //   });
+          //   console.log("走哪里1111");
+          // }else{}
+          console.log("走哪里22222222");
+          var user_lists = th.data.user_task_list.concat(user_list);
+          th.setData({
+            user_task_list: user_lists
+          });
+        } else {
+          th.setData({ is_user_list: 1 });
+          getApp().my_warnning(su.data.msg, 0, th);
+        }
+      }
+    })
+  },
+  //判断是否有领取任务 获取正在进行中的任务
+  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;
+    var taskid = aitem[sw_index].id
+    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;
+          th.setData({
+            is_user_task: is_usertask
+          });
+        }
+      }
+    })
+  },
+  //获取助力活动参与的人数
+  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", {
+      data: {
+        helpId: help_id,
+        storeId: os.stoid,
+      },
+      success: function (su) {
+        if (su.data.code == 0) {
+          var usercount = su.data.data.countAll;
+
+          th.setData({
+            usercount: usercount
+          });
+        }
+      }
+    })
+
+  },
+  //轮播卡死的重置
+  changeGoodsSwip: function (detail) {
+    if (detail.detail.source == "touch") {
+      //当页面卡死的时候，current的值会变成0
+      if (detail.detail.current == 0) {
+        //有时候这算是正常情况，所以暂定连续出现3次就是卡了
+        let swiperError = this.data.swiperError
+        swiperError += 1
+        this.setData({
+          swiperError: swiperError
+        })
+        if (swiperError >= 3) { //在开关被触发3次以上
+          this.setData({
+            sw_index: this.data.preIndex
+          }); //，重置current为正确索引
+          this.setData({
+            swiperError: 0
+          })
+        }
+      } else { //正常轮播时，记录正确页码索引
+        this.setData({
+          preIndex: detail.detail.current
+        });
+        //将开关重置为0
+        this.setData({
+          swiperError: 0
+        })
+      }
+    }
+  },
+
+  // 轮播图点击左边
+  click_pre: function () {
+    var arr = [];
+    this.setData({
+      dismantle: arr
+    });
+    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;
+    this.setData({
+      sw_index: index,
+      task_number: task_number,
+      taskid: task_id,
+      is_dismantle: 0,
+      is_clik: 1,
+      bc_page: 1
+    })
+    if (this.data.switch_head == 1) {
+      //判断有没有帮拆记录
+      console.log("往左点////////////////////");
+      this.dismantle_record();
+    }
+    if (this.data.switch_head == 0) {
+      //判断有没有领取任务
+      this.get_user_task();
+    }
+
+  },
+  //轮播图点击右边
+  click_next: function () {
+    var arr = [];
+    this.setData({
+      is_clik: 1,
+      dismantle: arr
+    });
+    var index = this.data.sw_index;
+    index++;
+    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;
+    this.setData({
+      sw_index: index,
+      task_number: task_number,
+      taskid: task_id,
+      is_dismantle: 0,
+      bc_page: 1,
+    })
+    if (this.data.switch_head == 1) {
+      this.dismantle_record();
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+    //--清理定时器--
+    clearInterval(this.data.timer);
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+  //----助力任务的时间-----
+  countDown() {
+    if (!this.data.is_timer) return false;
+    var th = this;
+    // 获取当前时间，同时得到活动结束时间数组
+    var newTime = ut.gettimestamp();
+
+    // 对结束时间进行处理渲染到页面
+
+    // var o = endTimeList[i];
+    var endTime = th.data.endDate;
+    // if (o.status == 0) endTime = o.start_time
+
+    var obj = null;
+    // 如果活动未结束，对时间进行处理
+    if (endTime - newTime > 0) {
+      var time = (endTime - newTime);
+      // 获取天、时、分、秒
+      var day = parseInt(time / (60 * 60 * 24));
+      var hou = parseInt(time % (60 * 60 * 24) / 3600);
+      var min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+      var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+      obj = {
+        day: this.timeFormat(day),
+        hou: this.timeFormat(hou),
+        min: this.timeFormat(min),
+        sec: this.timeFormat(sec)
+      }
+    } else {
+      //活动已结束，全部设置为'00'
+      obj = {
+        day: '00',
+        hou: '00',
+        min: '00',
+        sec: '00'
+      }
+    }
+    var txt = "aitem[" + 0 + "].djs";
+    th.setData({
+      [txt]: obj
+    });
+  },
+  //---小于10的格式化函数----
+  timeFormat(param) {
+    return param < 10 ? '0' + param : param;
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+  preview: function () {
+    var th = this;
+    var shareImgPath = th.data.shareImgPath;
+    wx.previewImage({
+      url: shareImgPath[0],
+      urls: shareImgPath
+    })
+  },
+
+  //关闭分享显示
+  close_share: function () {
+    var th = this;
+    th.setData({
+      is_share: 0
+    })
+  },
+  syinfo: function () {
+    var th = this;
+    //获取用户设备信息，屏幕宽度
+    wx.getSystemInfo({
+      success: res => {
+        th.setData({
+          screenWidth: res.screenWidth
+        })
+      }
+    })
+  },
+
+
+
+  //************************ */
+  shareFrends: function (e) {
+    var th = this;
+    if (th.data.is_generate) return;
+    th.data.is_generate = 1;
+
+    var scene = 1;
+    ///二微码
+    var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+      os.stoid + "?sceneValue=" + scene + "&pageValue=pages/index/index/index";
+    //读取文件成功则OK--
+    wx.getImageInfo({
+      src: path3,
+      success: function (res) {
+
+        var ewm_path = res.path; //
+        //var act_time="2019.06.26 - 2019.07.02";  //活动的时间
+        var bg_time = ut.formar_no_full(th.data.dynamic.beginDate);
+        var end_time = ut.formar_no_full(th.data.dynamic.endDate);
+        var act_time = bg_time + "-" + end_time;
+
+
+        var iurl = th.data.iurl; //图片地址前缀
+        const ctx = wx.createCanvasContext('share_id'); //绘图上下文
+        var unit = th.data.screenWidth / 750 * 1.35;
+        var numsize = 20 * unit; //几人助力字体大小
+        var head_list_img = th.data.head_pic_arr;
+        var num = th.data.head_pic_arr.length; //已有几位好友助力
+
+        var aitem = th.data.aitem; //任务的数据集
+        var sw_index = th.data.sw_index; //轮播的下标
+        //任务id
+        var help_num = aitem[sw_index].helpNum;
+        var q_num = help_num - num; //还差几位好友助力
+        var already = num.toString().length + 1; //已有几位好友助力
+        var lack = q_num.toString().length + 1; //还差几位好友助力
+
+        var size = 15 * unit;
+        var imagesize = 40 * unit; //助力人的图片大小
+        var left = 74 * unit; //助力人头像跟左边的距离
+        var spacing = 12 * unit; //助力人图片间距
+        var images = th.data.images;
+        ctx.drawImage(images[0], 0, 0, 445 * unit, 700 * unit); //分享的背景图片
+        ctx.drawImage(images[1], 37 * unit, 185 * unit, 370 * unit, 377 * unit); //分享的背景图片
+
+        console.log(111);
+        console.log(th.data.share_lb_img);
+
+        ctx.drawImage(th.data.share_lb_img, 90 * unit, 231 * unit, 266 * unit, 160 * unit); //分享的礼包的背景图片
+
+        ctx.setFillStyle("rgb(221,153,116)");
+        ctx.setFontSize(size)
+        ctx.fillText("已有", 77 * unit, 430 * unit);
+        ctx.setFillStyle("#FF4746");
+        ctx.setFontSize(numsize)
+        ctx.fillText(num + "位", 108 * unit, 430 * unit);
+        ctx.setFillStyle("rgb(221,153,116)");
+        ctx.setFontSize(size)
+        ctx.fillText("好友助力，还差", 116 * unit + already * numsize * unit, 430 * unit);
+        ctx.setFillStyle("#FF4746");
+        ctx.setFontSize(numsize);
+        ctx.fillText(q_num + "位", 223 * unit + already * numsize * unit, 430 * unit);
+        ctx.setFillStyle("rgb(221,153,116)");
+        ctx.setFontSize(size);
+        ctx.fillText("达成助力", 230 * unit + lack * numsize * unit + already * numsize * unit, 430 * unit);
+        var c = num / help_num;
+        ctx.drawImage(images[2], 65 * unit, 445 * unit, 320 * unit, 12 * unit);
+        ctx.drawImage(images[3], 65 * unit, 445 * unit, 320 * unit * c, 12 * unit);
+        var head_list_num = 30;
+        var is_head_list = 0;
+
+        //当需要助力人数小与6个
+        if (help_num < 6) {
+          var pos_arr = ut.get_box_arr(help_num, 225.25 * unit, 505 * unit, spacing, imagesize / 2);
+          var now_ind = 0;
+          //--判断已助力的人数--
+          for (var a = 0; a < head_list_img.length; a++) {
+            var pos = pos_arr[now_ind];
+            ut.draw_circle(ctx, pos.x, pos.y, imagesize / 2, head_list_img[a], 'red', unit);
+            now_ind++;
+          }
+          //--显示还差的人数--
+          if (help_num - head_list_img.length > 0) {
+            var neednum = help_num - head_list_img.length;
+            //这个是还未助力的位置
+            for (var i = 0; i < neednum; i++) {
+              var pos = pos_arr[now_ind];
+              now_ind++;
+              // 助力人的头像
+              ctx.drawImage(images[4], pos.x - imagesize / 2, pos.y - imagesize / 2, imagesize, imagesize); //分享的背景图片
+
+            }
+          }
+
+        } else if (help_num > 7) {
+          //助力头像数量, 是不是要显示省略图
+          var zl_head = 0, is_sheng = 0;
+          if (head_list_img.length >= 6) {
+            zl_head = 5; is_sheng = 1;
+          } else {
+            zl_head = head_list_img.length;
+          }
+
+
+          //判断已助力的人数
+          for (var a = 0; a < zl_head; a++) {
+            //绘制头像
+            ut.draw_circle(ctx, left + imagesize / 2, 505 * unit, imagesize / 2, head_list_img[a], 'red', unit);
+            left += imagesize + spacing;
+          }
+
+          //如果是省略号的话
+          if (is_sheng) {
+            ctx.drawImage(images[5], left, 505 * unit - imagesize / 2, imagesize, imagesize); //头像的省略图片
+          } else {
+            //这个是还未助力的位置
+            for (var i = 0; i < 6 - head_list_img.length; i++) {
+              // 助力人的头像
+              ctx.drawImage(images[4], left, 505 * unit - imagesize / 2, imagesize, imagesize); //分享的?号图片
+              left += imagesize + spacing;
+            }
+          }
+        } else {
+          //  判断已助力的人数
+          for (var a = 0; a < head_list_img.length; a++) {
+            ctx.save();
+            ctx.beginPath(); //开始绘制
+            ctx.arc(left + imagesize / 2, 505 * unit, imagesize / 2, 0, 2 * Math.PI);
+            ctx.setLineWidth(4 * unit);
+            ctx.setStrokeStyle('red');
+            ctx.setFillStyle("white");
+            ctx.fill();
+            ctx.clip();
+            ctx.drawImage(head_list_img[a], left, 505 * unit - imagesize / 2, imagesize, imagesize);
+            ctx.restore();
+            left += imagesize + spacing;
+          }
+
+          if (6 - head_list_img.length > 0) {
+            var neednum = 6 - head_list_img.length;
+            if(neednum>6) neednum=6;
+            //这个是还未助力的位置
+            for (var i = 0; i < neednum; i++) {
+              // 助力人的头像
+              ctx.drawImage(images[4], left, 505 * unit - imagesize / 2, imagesize, imagesize); //分享的背景图片
+              left += imagesize + spacing;
+            }
+          }
+
+        }
+
+        ctx.setFillStyle("rgb(255,255,255)");
+        ctx.setFontSize(size);
+        ctx.fillText("优惠乐翻天，精彩就在你身边!", 37 * unit, 595 * unit);
+        ctx.setFillStyle("rgb(255,255,255)");
+        ctx.setFontSize(size);
+        ctx.fillText(act_time, 37 * unit, 620 * unit); //绘制活动是时间
+        ctx.setFillStyle("rgb(255,255,255)");
+        ctx.setFontSize(size);
+        ctx.fillText("长按识别二维码，可帮我助力!", 37 * unit, 660 * unit);
+        ctx.drawImage(ewm_path, 325 * unit, 585 * unit, 77 * unit, 77 * unit); //分享的背景图片
+        ctx.save();
+        //读取文件成功则OK--
+        // wx.getImageInfo({
+        //   src: path3,
+        //   success: function (res) {
+        //把画板内容绘制成图片，并回调 画板图片路径
+        ctx.draw(false, function () {
+          setTimeout(function () {
+            wx.canvasToTempFilePath({
+              x: 0,
+              y: 0,
+              width: 300,
+              height: 500,
+              destWidth: 400 * 2,
+              destHeight: 720 * 2,
+              canvasId: 'share_id',
+              success: function (res) {
+                wx.hideLoading();
+                var shareImgPath = th.data.shareImgPath;
+                shareImgPath[0] = res.tempFilePath;
+
+                th.setData({
+                  shareImgPath: shareImgPath,
+                  canvasHidden: 1,
+                  is_share: 1,
+                  is_generate: 0,
+                  canvasHidden: 1
+                })
+                if (!res.tempFilePath) {
+                  wx.showModal({
+                    title: '提示',
+                    content: '图片绘制中，请稍后重试',
+                    showCancel: false
+                  })
+                  return false;
+                }
+
+              },
+              fail(r) {
+
+              }
+            }, 500)
+          })
+        })
+      }
+    })
+
+
+  },
+
+
+  preview: function () {
+    var th = this;
+    var shareImgPath = th.data.shareImgPath;
+    wx.previewImage({
+      url: shareImgPath[0],
+      urls: shareImgPath
+    })
+    th.setData({
+      is_share: 0
+    })
+  },
+
+  //关闭分享显示
+  close_share: function () {
+    var th = this;
+    wx.hideLoading();
+    th.setData({
+      is_share: 0
+    })
+  },
+  syinfo: function () {
+    var th = this;
+    //获取用户设备信息，屏幕宽度
+    wx.getSystemInfo({
+      success: res => {
+        th.setData({
+          screenWidth: res.screenWidth
+        })
+      }
+    })
+  },
+
+  //把固定的图片加载到本地
+  imageinfo: async function () {
+    var th = this;
+    var images = th.data.images;
+    var iurl = th.data.iurl;
+    for (var i in images) {
+      var img_path = iurl + images[i];
+      await getApp().request.promise_downimg(img_path).then(res => {
+        images[i] = res;
+      })
+    }
+
+    th.data.images = images;
+  },
+
+
+  //好友猜一猜
+  save_share: function (e) {
+    var th = this;
+    var aitem = this.data.aitem; //任务的数据集
+    var sw_index = this.data.sw_index; //轮播的下标
+    var sw_item = aitem[sw_index];
+    //任务id
+    var taskid = sw_item.id;
+    th.setData({
+      is_share: 1
+    })
+    var url = "/api/weshop/marketing/help/help/task/involve/page";
+    getApp().request.promiseGet(url, {
+      isShowLoading: true,
+      data: {
+        storeId: os.stoid,
+        taskId: taskid,
+        userId: getApp().globalData.user_id
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        var data = res.data.data.pageData; //帮拆数组
+        if (data.length > 0) {
+          th.data.dynamic = data[0];
+          var path = th.data.iurl + (sw_item.giftBagUrl?sw_item.giftBagUrl:'/miniapp/images/no-head.jpg');
+          //先获取礼包分享时的本地路径
+          getApp().request.promise_downimg(path).then(res => {
+            th.data.share_lb_img = res;
+            //先获取会员的头像
+            th.info_head(th.shareFrends);
+          });
+        }
+      } else {
+        wx.hideLoading();
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
+  },
+
+  //把已助力好友头像下载到本地
+  info_head: async function (func) {
+    var th = this;
+    var images = th.data.dynamic.zlHelpUser;
+    var arr = new Array();
+    var block = th.data.block;
+    if (images) {
+      th.data.head_pic_arr.length = 0;
+      for (var i in images) {
+        var img_path = images[i].headPic;
+        await getApp().request.promise_downimg(img_path).then(res => {
+          th.data.head_pic_arr.push(res);
+        })
+      }
+    }
+    func();
+  },
+  //立即兑换
+  redeem_now: function (e) {
+    var libao_id = e.currentTarget.dataset.libaoid;
+    var sw_index = this.data.sw_index;
+    var aitem = this.data.aitem;
+    var taskid = aitem[sw_index].id;
+    var taskingid = e.currentTarget.dataset.taskingid;
+    getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + this.data.help_id + "&is_libao=" + 1 + "&taskId=" + taskid + "&id=" + taskingid);
+  },
+
+
+  //礼包的详情 轮播图
+  libao_details: function (e) {
+    var th = this;
+    var help_id = th.data.help_id; //活动id
+    var taskId = e.currentTarget.dataset.taskid; //任务id
+    getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 0 + "&taskId=" + taskId);
+  },
+
+  user_task_list_click:function(){
+        if (this.data.switch_head==0) return false;
+        this.data.block=0;
+        this.user_task_list();
+  },
+
+  go_task:function(e){
+    var taskid=e.currentTarget.dataset.taskid;
+    this.go_to_task(taskid);
+
+  },
+
+  go_to_task(task_id){
+    var index = 0;
+    var aitem = this.data.aitem;
+    for(var i=0;i<aitem.length;i++){
+      if(aitem[i].id==task_id){
+        index=i;break;
+      }
+    }
+
+    //当是助力首页跳转过来的
+    if(index==this.data.sw_index){
+      this.get_user_task();
+    }
+
+    this.setData({
+      sw_index: index,
+      taskid: task_id,
+      is_dismantle: 0,
+      bc_page: 1,
+    })
+
+
+  },
+
+  //--测试用--
+  test:function(){
+    var ind=this.data.sw_index;
+    var aitem = this.data.aitem;
+    var task_id = aitem[ind].id;
+    getApp().goto("/pages/test/zhuli_test?taskId="+task_id);
+  }
+
+})
@@ -55,10 +55,10 @@
   <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now">
    立即兑换
   </view>
-  <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}" bindtap="test">
-   <!-- <input placeholder="请输助力用户的id" maxlength="11" bindblur="testinput"></input>
-   <view ></view> -->
-   测试专用
+
+
+  <view class="task_clike fs40 t-c flex-center"data-taskid="{{}}" bindtap="test">
+   测试专用帮被人拆
   </view>
  
 </view>
@@ -67,20 +67,20 @@
   <!-- 标题 -->
  
   <view class="flex-vertical-between fs28 padding head">
-    <view class="flex-center lhead {{switch_head==0?'rhead':''}}" bindtap="user_task_list" data-index="0">
+    <view class="flex-center lhead {{switch_head==0?'rhead':''}}" bindtap="user_task_list_click" data-index="0">
       <image class="unfinished" src="{{iurl}}miniapp/images/friendhelp/task.png" lazy-load="true"></image>
       <view>我的任务</view>
     </view>
-    <view class="flex-center lhead {{switch_head==1?'rhead':''}}" bindtap="dismantle_record" data-index='1'>
+    <view class="flex-center lhead {{switch_head==1?'rhead':''}}" bindtap="dismantle_record_click" data-index='1'>
       <image class="unfinished" style="margin-top: 5rpx;" src="{{iurl}}miniapp/images/friendhelp/edit.png" lazy-load="true"></image>
       <view>帮拆记录</view>
     </view>
   </view>
  
   <view class="white">
-  
+
     <view class="items" wx:if="{{is_task==0}}">
-     <view class="tesk_list"> 
+     <view class="tesk_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}}
@@ -88,11 +88,11 @@
         </view>
         <view class="flex-center width state">
           <view class="ellipsis-1">
-            <text wx:if="{{item.status==0}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
+            <text wx:if="{{item.status==0}}" bindtap="go_task"  data-taskid="{{item.helpTaskId}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
             <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text>
             <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}"data-taskingid="{{item.id}}" data-taskid="{{item.helpTaskId}}">领取礼包 </text>
           </view>
-        </view> 
+        </view>
     </view>
       </view>
  
@@ -167,4 +167,4 @@
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
 <!--  制作一个圆球导航  -->
-<nav_b id="nav_b"></nav_b>
 \ No newline at end of file
+<nav_b id="nav_b"></nav_b>