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 fd72b3c..7d50b95 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -1039,9 +1039,10 @@ Page({
   },
   //礼包的详情 轮播图
   libao_details: function(e) {
-    var giftbagid = e.currentTarget.dataset.giftbagid;
-    var help_id = this.data.help_id;
-    getApp().goto("/pages/user/assistance/giftpacklist?libao_id=" + giftbagid + "&is_libao=" + 0+"help_id");
+    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.wxml b/pages/user/assistance/task_assistance.wxml
index 04bac0e..4eb7e0d 100644
--- a/pages/user/assistance/task_assistance.wxml
+++ b/pages/user/assistance/task_assistance.wxml
@@ -17,7 +17,7 @@
     </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>
+        <image class="xc-center-img" bindtap="libao_details" src="{{iurl+aitem.giftBagUrl}}"></image>
       </swiper-item>
     </swiper>
 
@@ -76,7 +76,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>