diff --git a/components/nav_b/nav_b.wxss b/components/nav_b/nav_b.wxss
index b71a95c..d3d8838 100644
--- a/components/nav_b/nav_b.wxss
+++ b/components/nav_b/nav_b.wxss
@@ -22,6 +22,7 @@
   text-align: center;
   width: 80rpx;
   height: 80rpx;
+  line-height: 66rpx;
   color: #ffff;
   font-size: 50rpx;
   background: none;
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index d72bc94..57c9994 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -134,7 +134,7 @@
         <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
           <text class="data-v-3a5b7e36">立即使用</text>
         </view>
-        <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue">
+        <view wx:if="{{c_state==1}}" class="foot_button_buy data-v-3a5b7e36 overdue" bindtap="getcode">
           <text class="data-v-3a5b7e36">商品已核销</text>
         </view>
         <view wx:if="{{c_state==2}}" class="foot_button_buy data-v-3a5b7e36 overdue">
diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js
index cebd5a7..41d119f 100644
--- a/pages/user/assistance/assistance.js
+++ b/pages/user/assistance/assistance.js
@@ -34,7 +34,7 @@ Page({
   onLoad: function(options) {
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
-    nav_b.set_name("助力", "");
+    nav_b.set_name("助力", "/pages/user/assistance/assistance");
     // 助力活动
     this.assistance();
   },
@@ -83,11 +83,9 @@ Page({
 
   //--点击获取用户任务列表--会员的任务列表
   get_list:function() {
-    
-    
+  
     var th = this;
     var page=th.data.page;
-    console.log("page是什么", page);
     var help_id=this.data.help_id;
     t.request.get("/api/weshop/marketing/help/help/user/page", {
       data: {
@@ -107,33 +105,32 @@ Page({
      
       
         if (res.data.code == 0) {
-          var page=th.data.page+1;
+         
           var list = th.data.zl_user_list;
           //连接数组	
           list = list.concat(res.data.data.pageData); 
           th.setData({
             zl_user_list: list,
             is_load: 1,
-            page: page
           });
           if (res.data.data.total <= 5) {
             th.setData({
               is_show_more: 1
             })
+          }else{
+            var page = th.data.page + 1;
+            th.setData({
+              is_show_more: 0,
+              page: page
+            })
           }
-          // var n_all_num = th.data.cur_page * th.data.page_num;
-          // if (res.data.data.total > n_all_num) th.setData({
-          //   is_show_more: 1
-          // })
-          // else th.setData({
-          //   is_show_more: 0
-          // })
-          //页吗要更新一下
-          // th.data.cur_page++;
+         
         } else {
-          getApp().showWarning("暂无更多内容");
+        
+          getApp().showWarning("暂无更多内容",0);
           th.setData({
-            is_show_more: 1
+            is_show_more: 1,
+             page: page
           })
         }
 
diff --git a/pages/user/assistance/assistance_success.json b/pages/user/assistance/assistance_success.json
index 5467480..d494c4d 100644
--- a/pages/user/assistance/assistance_success.json
+++ b/pages/user/assistance/assistance_success.json
@@ -1,4 +1,6 @@
 {
+  "navigationBarTitleText": "好友助力,得好礼",
+  "navigationStyle": "custom",
   "usingComponents": {
       "warn": "/components/long_warn/long_warn",
       "my_confirm": "/components/my_confirm/my_confirm",
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index bdc5d76..6d51dec 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -131,7 +131,7 @@ Page({
 		var th = this;
 		var nav_b = th.selectComponent("#nav_b"); //组件的id
 		nav_b.close_box();
-		nav_b.set_name("助力", "");
+    nav_b.set_name("助力", "/pages/user/assistance/assistance");
 	},
 
 	/**
diff --git a/pages/user/assistance/friend_assistance.json b/pages/user/assistance/friend_assistance.json
index 2ee27f1..63f5fe9 100644
--- a/pages/user/assistance/friend_assistance.json
+++ b/pages/user/assistance/friend_assistance.json
@@ -1,4 +1,6 @@
 {
+  "navigationBarTitleText": "好友助力,得好礼",
+  "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
diff --git a/pages/user/assistance/giftpacklist.js b/pages/user/assistance/giftpacklist.js
index e433efa..a4c09b9 100644
--- a/pages/user/assistance/giftpacklist.js
+++ b/pages/user/assistance/giftpacklist.js
@@ -31,38 +31,117 @@ Page({
     receiveState: 0, //0未领取  1已领取
     completeid: "",
     is_sub: 0, //判断是否重复提交
+    is_libao: 0, //0轮播查看活动   1领取礼包 2.查看礼包详情
+    held_id: "", //活动id
+    taskId: "", //任务id
+    orderSn: "", //订单号
   },
   onLoad: function(options) {
     var th = this;
-    th.setData({
-      getGiftID: 100, // options.libao_id,
-      completeid: options.completeid,
-      orderSn: options.orderSn
-    })
     if (options.is_libao == 0) {
-      th.GetMyGiftList();
-    } else {
+      th.setData({
+        held_id: options.help_id, //options.help_id
+        taskId: options.taskId, //options.libao_id
+      })
+      th.help();
+    }
+    if (options.is_libao == 1) {
+      th.setData({
+        taskId: options.libao_id,
+        held_id: options.held_id
+      })
       th.GetBuyGiftList();
     }
-    // th.setData({
-    //   giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img")
-    // })
+    if (options.order_sn) {
+      th.setData({
+        orderSn: options.orderSn
+      })
+      th.GetMyGiftList();
+    }
     th.close();
   },
   onShow: function() {
 
   },
+  //助力活动查看礼包详情调用
+  help: function(e) {
+    var th = this;
+    var url = "/api/weshop/marketing/giftbag/help/get";
+    getApp().request.promiseGet(url, {
+      isShowLoading: true,
+      data: {
+        helpId: th.data.held_id,
+        storeId: a.stoid,
+        taskId: th.data.taskId
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        th.setData({
+          giftImage: th.data.iurl + res.data.data.lbUrl,
+          giftTitle: res.data.data.giftTitle
+        })
+        if (res.data.data.giftRemark == '') {
+          th.setData({
+            giftRemark: '暂无详情......'
+          })
+        } else {
+          th.setData({
+            giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
+          })
+        }
+
+        // //---获取日期的时间戳---
+        // var t_endtime = res.data.data.endTime;
+        // t_endtime = t_endtime.replace(/-/g, '/');
+        // var t_date = new Date(t_endtime) / 1000;
+        // var t_now = ut.gettimestamp();
 
+        // if (res.data.data.goodsUseState) th.setData({
+        //   c_state: 1
+        // })
+        // else if (t_date <= t_now)
+        //   th.setData({
+        //     c_state: 2
+        //   })
+
+        th.setData({
+          giftDate: res.data.data.endTime,
+          giftPosPrice: res.data.data.giftPosPrice,
+          giftQty: res.data.data.giftQty,
+          giftIntegral: res.data.data.payIntegral,
+          giftPrice: res.data.data.payMoney,
+          giftType: res.data.data.actType,
+          actTitle: res.data.data.actTitle,
+          wareCard: res.data.data.wareCard,
+          lbId: res.data.data.lbId
+        })
+        //判断是否有礼包
+        for (var i = 0; i < res.data.data.wareCard.length; i++) {
+          if (res.data.data.wareCard[i].lbType == 1) {
+            th.setData({
+              is_lb: 1
+            })
+            break;
+          }
+        }
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+        return false;
+      }
+
+    })
+  },
   GetMyGiftList: function() {
     var _this = this;
     var th = this;
     getApp().request.get('/api/weshop/marketing/my/giftbag/detail/get', {
+      isShowLoading: true,
       data: {
         "storeId": a.stoid, //商家ID
         "userId": d.user_id, //用户ID
         "orderSn": th.data.orderSn
       },
-      success: function success(res) {
+      success: function(res) {
         if (res.data.code == 0) {
           th.setData({
             giftImage: th.data.iurl + res.data.data.lbUrl,
@@ -74,7 +153,7 @@ Page({
             })
           } else {
             th.setData({
-              giftRemark: res.data.data.giftRemark
+              giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
             })
           }
 
@@ -132,7 +211,7 @@ Page({
       })
       var json = {
         "actId": th.data.completeid, //活动Id
-        "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+        "actType": 5, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
         "giftBagId": th.data.giftID, //礼包Id
         "storeId": a.stoid, //商家Id
         "userId": d.user_id //用户ID
@@ -164,17 +243,14 @@ Page({
   GetBuyGiftList: function() {
     var _this2 = this;
     var th = this.data;
-    wx.showLoading({
-      title: '加载中'
-    })
     getApp().request.get('/api/weshop/marketing/giftbag/detail/get', {
+      isShowLoading: true,
       data: {
         "storeId": a.stoid, //商家ID
         "userId": d.user_id, //用户ID
-        "giftBagId": th.getGiftID
+        "giftBagId": th.taskId
       },
       success: function(res) {
-       wx.hideLoading();
         if (res.data.code == 0) {
           _this2.setData({
             giftImage: th.iurl + res.data.data.lbUrl,
@@ -187,10 +263,9 @@ Page({
             })
           } else {
             _this2.setData({
-              giftRemark: res.data.data.giftRemark
+              giftRemark: res.data.data.giftRemark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"')
             })
           }
-
           _this2.setData({
             giftDate: res.data.data.endTime,
             giftPosPrice: res.data.data.giftPosPrice,
@@ -231,14 +306,8 @@ Page({
     };
     var data = JSON.stringify(json);
     var url = th.data.url + "/api/weshop/marketing/gift/goods/verify/code/get"; //预约接口地址
-    wx.request({
-      url: url,
-      data: data,
-      method: 'put',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
+    getApp().request.json_post(url, json,
+      function(res) {
         if (res.data.code == 0) {
           th.setData({
             code: res.data.data
@@ -247,8 +316,15 @@ Page({
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
         }
-      }
-    })
+      },
+      function(res) {
+
+      }, "put"
+
+    )
+
+
+
   },
   //界面跳转
   goto: function(e) {
diff --git a/pages/user/assistance/giftpacklist.wxml b/pages/user/assistance/giftpacklist.wxml
index 2d2104a..8cf8d4e 100644
--- a/pages/user/assistance/giftpacklist.wxml
+++ b/pages/user/assistance/giftpacklist.wxml
@@ -6,7 +6,7 @@
     <view class="top_title data-v-3a5b7e36">
       <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
     </view>
-    <view class="top_time data-v-3a5b7e36">
+    <view wx:if="{{giftDate}}" class="top_time data-v-3a5b7e36">
       <text class="data-v-3a5b7e36">{{"兑换截至时间："+giftDate}}</text>
     </view>
     <view class="top_price data-v-3a5b7e36">
@@ -67,7 +67,7 @@
           </view>
           <view class="box_ware_code data-v-3a5b7e36">
             <block wx:if="{{c_state==0}}">
-              <block wx:if="{{isBuy==0&item.lbType==1}}">
+              <block wx:if="{{item.lbType==1}}">
                 <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image>
               </block>
             </block>
@@ -76,13 +76,13 @@
                 <image src="{{iurl+'/miniapp/images/giftbag/gift08.png'}}" lazy-load="true" class="data-v-3a5b7e36"></image>
               </block>
             </block>
-            <block wx:if="{{isBuy==0&item.lbType==2}}">
+            <block wx:if="{{item.lbType==2}}">
               <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
             </block>
-            <block wx:if="{{isBuy==0&item.lbType==3}}">
+            <block wx:if="{{item.lbType==3}}">
               <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/my_service/i_service" bindtap="goto"></image>
             </block>
-            <block wx:if="{{isBuy==0&item.lbType>3}}">
+            <block wx:if="{{item.lbType>3}}">
               <text class="data-v-3a5b7e36">奖励已发放</text>
             </block>
           </view>
@@ -95,7 +95,7 @@
       <text class="data-v-3a5b7e36">活动说明</text>
     </view>
     <view class="foot_box_remark data-v-3a5b7e36">
-      <rich-text nodes="{{giftRemark}}"></rich-text>
+      <rich-text nodes="{{giftRemark}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
     </view>
   </view>
   <view class="foot_empty data-v-3a5b7e36"></view>
diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index 29990ac..7d50b95 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -32,6 +32,10 @@ Page({
     dismantle: null, //帮拆记录数据集
     is_user_task: null, //判断是不是领取的任务
     zzjx_id: "", //真正进行的任务id
+    is_show:0,//任务的加载更多
+    is_bc_show:0,//帮拆的加载更多
+    bc_page:1,//帮拆的页码
+    rw_page:1,//任务的页码
     //*********************************************start钱
     canvasHidden: 0, //分享图片是否已经生成
     is_share: 0, //是否显示画布
@@ -77,7 +81,6 @@ 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
@@ -88,10 +91,12 @@ Page({
         taskId: taskid
       },
       function(res) {
-
         if (res.data.code == 0) {
-          console.log(res.data.data);
           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);
         }
@@ -127,17 +132,18 @@ Page({
       },
       success: function(res) {
         if (res.data.code == 0) {
-
           var help_data = res.data.data;
-          console.log('助力活动（判断）', res.data.data);
           th.setData({
             endDate: help_data.endDate,
           });
 
           //任务时间 设置全局定时器
-          th.data.timer = setInterval(function() {
-            th.countDown();
-          }, 1000);
+          th.setData({
+            timer:setInterval(function () {
+              th.countDown();
+            }, 1000)
+          })
+          
 
         }
       }
@@ -194,7 +200,7 @@ Page({
 
     //会员任务列表
     this.user_task_list();
-    // 获取会员的参与的任务列表 我的任务
+     //获取助力活动参与的人数
     this.get_user_task_num();
 
   },
@@ -210,7 +216,6 @@ Page({
     var sw_index = this.data.sw_index; //轮播的下标
     //任务id
     var taskid = aitem[sw_index].id;
-    console.log("任务id", taskid);
     var th = this;
     var index = 1; //获取当前选择的是任务还是活动说明
     var is_task = this.data.is_task; //0任务，1帮拆
@@ -221,24 +226,31 @@ Page({
     if (switch_head == undefined || switch_head == null) {
       switch_head = 1;
     }
-
-    console.log("0任务，1帮拆", is_task, );
     this.setData({
       is_task: 1,
       switch_head: 1
     });
+    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) {
           var dismantle = res.data.data.pageData[0].zlHelpUser;
-          console.log(dismantle.toString, "帮拆记录", dismantle[0].nickName);
-
+          if(res.data.data.total>5){
+            var bc_page = th.data.bc_page + 1;
+            th.data({ bc_page: bc_page,
+              is_bc_show:1
+            })
+          }else{
+            getApp().showWarning("暂无更多内容", 0);
+          }
+         
           th.setData({
             dismantle: dismantle
           });
@@ -292,13 +304,11 @@ Page({
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
-    nav_b.set_name("助力", "");
+    nav_b.set_name("助力", "/pages/user/assistance/assistance");
   },
   // 获取会员的参与的任务列表 我的任务
   user_task_list: function(e) {
-
     var th = this;
-
     var index = 0;
     var is_task = this.data.is_task; //0任务，1帮拆
     if (is_task == undefined || is_task == null) {
@@ -314,24 +324,34 @@ Page({
     });
     var help_id = th.data.help_id;
     var user_id = getApp().globalData.user_id;
+    var rw_page=th.data.rw_page;
     rq.get("/api/weshop/marketing/help/help/user/page", {
       data: {
+        page:rw_page,
+        pageSize:5,
         helpId: help_id,
         storeId: os.stoid,
         userId: user_id
       },
       success: function(su) {
-
         if (su.data.code == 0) {
+          if (su.data.data.total > 5){
+            th.setData({
+              rw_page: rw_page,
+              is_show: 1
+            })
+            getApp().showWarning("暂无更多内容", 0);
+          }else{
+            var rw_page = th.data.rw_page + 1;
+            th.setData({
+              rw_page: rw_page,
+              
+            })
+          }
           var user_list = su.data.data.pageData;
-          console.log("会员列表", user_list);
           th.setData({
             user_task_list: user_list
           });
-        } else {
-          th.setData({
-            user_task_list: null
-          });
         }
       }
     })
@@ -342,9 +362,7 @@ Page({
     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,
@@ -354,7 +372,6 @@ Page({
       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
           });
@@ -424,7 +441,6 @@ Page({
     var aitem = this.data.aitem;
     var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
     var task_id = aitem[index].id;
-    console.log("轮播图点击左边");
     this.setData({
       sw_index: index,
       task_number: task_number,
@@ -446,7 +462,6 @@ Page({
     var aitem = this.data.aitem;
     var task_number = aitem[index].giftQty - aitem[index].useGiftQty;
     var task_id = aitem[index].id;
-    console.log("轮播图点击右边");
     this.setData({
       sw_index: index,
       task_number: task_number,
@@ -462,8 +477,7 @@ Page({
    */
   onHide: function() {
     //--清理定时器--
-    console.log("清理定时器");
-    clearInterval(this.timer);
+    clearInterval(this.data.timer);
   },
 
   /**
@@ -489,14 +503,13 @@ Page({
     // 对结束时间进行处理渲染到页面
 
     // var o = endTimeList[i];
-    var endTime = th.data.endDate
-
+    var endTime = th.data.endDate;
+    console.log("结束时间5555555", endTime);
     // 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));
@@ -518,15 +531,10 @@ Page({
         sec: '00'
       }
     }
-
+    var txt = "aitem[" +0+ "].djs";
     th.setData({
-      djs: obj
+      [txt]: obj
     });
-
-
-
-
-
   },
   //---小于10的格式化函数----
   timeFormat(param) {
@@ -1031,8 +1039,10 @@ Page({
   },
   //礼包的详情 轮播图
   libao_details: function(e) {
-    var giftbagid = e.currentTarget.dataset.giftbagid;
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + giftbagid + "&is_libao=" + 0);
+    var th = this;
+    var help_id = th.data.help_id;//活动id
+    var taskId = th.data.taskid;//任务id
+    getApp().goto("/pages/user/assistance/giftpacklist?help_id=" + help_id + "&is_libao=" + 0 + "&taskId=" + taskId);
   },
   //正在进行任务
   test: function(e) {
diff --git a/pages/user/assistance/task_assistance.json b/pages/user/assistance/task_assistance.json
index d1cfde4..63f5fe9 100644
--- a/pages/user/assistance/task_assistance.json
+++ b/pages/user/assistance/task_assistance.json
@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "好友助力",
+  "navigationBarTitleText": "好友助力,得好礼",
   "navigationStyle": "custom",
   "usingComponents": {
     "warn": "/components/long_warn/long_warn",
diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml
index fb7a752..22495c6 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -1,9 +1,8 @@
-<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
+ <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
 <view class="top-back" style="background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)">
   <!-- 助力活动头部 -->
   <view class="top-frame">
     <view class="top-title white fs36 t-c">
-   
       {{aitem[sw_index].helpTaskName}}
     </view>
     <view class="activity-data t-c fs28  white">
@@ -16,8 +15,11 @@
       <view class="bg_left xc-left bcolor"></view>
     </view>
     <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
-      <swiper-item wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
-        <image class="xc-center-img"bindtap="libao_details"  data-giftbagid="{{aitem.id}}" src="{{iurl+aitem.giftBagUrl}}"></image>
+      <swiper-item class="rel" wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
+   
+        <image class="xc-center-img" bindtap="libao_details" src="{{iurl+aitem.giftBagUrl}}"></image>
+      <view class="abs select_details fs26 white">礼包详情</view>
+     
       </swiper-item>
     </swiper>
 
@@ -44,9 +46,9 @@
    <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"  bindtap="save_share">
   好友拆一拆
   </view>
-   <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}"  bindtap="test">
+   <!-- <view wx:if="{{is_user_task!=null}}" class="task_clike fs40 t-c flex-center"data-taskid="{{is_user_task.id}}"  bindtap="test">
     测试专用
-  </view>
+  </view> -->
 
 </view>
 <!-- 底部列表 -->
@@ -76,7 +78,7 @@
         <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==2}}"bindtap="select_libao" data-libaoid="{{item.helpListGiftBagId}}">查看礼包</text>
+           <text wx:if="{{item.status==2}}"bindtap="select_libao" data-libaoid="{{item.order_sn}}">查看礼包</text>
             <text wx:if="{{item.status==1}}"bindtap="get_libao"data-orderid="{{item.ordersn}}" data-libaoid="{{item.helpListGiftBagId}}"
               data-completeid="{{item.id}}">领取礼包 </text>
           </view>
@@ -108,8 +110,13 @@
         <view class="ellipsis-1">{{filter.format_time(item.zltime)}}
         </view>
       </view>
-
     </view>
+
+     <view class="flex-center fs32" wx:if="{{is_bc_show==1}}">
+    <view class="line"></view>
+    <view class="load  white" bindtap="dismantle_record">点击加载更多</view>
+    <view class="line"></view>
+  </view>
   </block>
   
    <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
@@ -124,9 +131,9 @@
 </view>
 <!-- 加载更多 -->
 <view class="fs32">
-  <view class="flex-center" wx:if="{{user_task_list}}">
+  <view class="flex-center" wx:if="{{is_show==1}}">
     <view class="line"></view>
-    <view class="load  white" bindtap="">点击加载更多</view>
+    <view class="load  white" bindtap="user_task_list">点击加载更多</view>
     <view class="line"></view>
   </view>
   <view class="flex-center white" style="margin-top: 20rpx;">
diff --git a/pages/user/assistance/task_assistance.wxss b/pages/user/assistance/task_assistance.wxss
index 3537b0f..30aeed1 100644
--- a/pages/user/assistance/task_assistance.wxss
+++ b/pages/user/assistance/task_assistance.wxss
@@ -196,4 +196,13 @@ border-color: #fff;
 .close {
   width: 70rpx;
   height: 70rpx;
+}
+.select_details{
+  width: 100%;
+  height: 50rpx;
+  line-height: 50rpx;
+  text-align: center;
+    background: #000;
+    opacity:0.6; filter: alpha(opacity=60);
+  bottom: 0rpx;
 }
\ No newline at end of file