diff --git a/pages/user/assistance/giftpacklist.js b/pages/user/assistance/giftpacklist.js
index e1191c4..e433efa 100644
--- a/pages/user/assistance/giftpacklist.js
+++ b/pages/user/assistance/giftpacklist.js
@@ -28,137 +28,38 @@ Page({
     code: "", //核销码
     c_state: "0", //判断是否已经使用, 0正常  1已使用  2已过期
     is_lb: 0, //是否有礼包
+    receiveState: 0, //0未领取  1已领取
+    completeid: "",
+    is_sub: 0, //判断是否重复提交
   },
-  onLoad: function (options) {
+  onLoad: function(options) {
     var th = this;
     th.setData({
-      getGiftID: options.lbId,
+      getGiftID: 100, // options.libao_id,
+      completeid: options.completeid,
+      orderSn: options.orderSn
     })
-    if (options.isBuy == 0) {
+    if (options.is_libao == 0) {
       th.GetMyGiftList();
     } else {
       th.GetBuyGiftList();
     }
-    th.setData({
-      giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img")
-    })
+    // th.setData({
+    //   giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img")
+    // })
     th.close();
   },
-  onShow: function () {
-
-  },
-  GetBuyPrice: function (e) {
-    var that = this.data;
-    var th = this;
-    // var id = e.currentTarget.dataset.id;//活动id
-    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-    my_confirm.open(
-      "是否确定购买该礼包",
-      "取消",
-      "确定",
-      function () {
-        my_confirm.open_cancel(0);
-      },
-      function () {
-        my_confirm.open_cancel(0);
-        var json = {
-          "actId": '', //活动Id
-          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-          "buyType": '2', //1=积分兑换 2=余额购买
-          "lbId": that.getGiftID, //礼包Id
-          "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID, //用户ID
-          "buyFrom": 2
-        };
-        var data = JSON.stringify(json);
-        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-        wx.request({
-          url: url,
-          data: data,
-          method: 'post',
-          header: {
-            'content-type': 'application/json'
-          }, // 设置请求的 header
-          success: function (res) {
-            if (res.data.code == 0) {
-              res = res.data.data;
-              wx.requestPayment({
-                timeStamp: String(res.timeStamp),
-                nonceStr: res.nonceStr,
-                package: res.packageValue,
-                signType: res.signType,
-                paySign: res.paySign,
-                success: function (n) {
-
-                },
-                fail: function (n) {
-
-                }
-              });
-            } else {
-              getApp().my_warnning(res.data.msg, 0, th);
-            }
-          }
-        })
-
-      }
-
-
-    )
-
+  onShow: function() {
 
   },
-  GetBuyIntegral: function (e) {
-    var that = this.data;
-    var th = this;
-    // var id = e.currentTarget.dataset.id;//活动id
-    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
-    my_confirm.open(
-      "是否确定兑换该礼包",
-      "取消",
-      "确定",
-      function () {
-        my_confirm.open_cancel(0);
-      },
-      function () {
-        my_confirm.open_cancel(0);
-        var json = {
-          "actId": '', //活动Id
-          "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-          "buyType": '1', //1=积分兑换 2=余额购买
-          "lbId": that.getGiftID, //礼包Id
-          "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID //用户ID
-        };
-        var data = JSON.stringify(json);
-        var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
-        wx.request({
-          url: url,
-          data: data,
-          method: 'post',
-          header: {
-            'content-type': 'application/json'
-          }, // 设置请求的 header
-          success: function (res) {
-            if (res.data.code == 0) {
-              getApp().my_warnning("兑换成功！", 1, th);
-            } else {
-              getApp().my_warnning(res.data.msg, 0, th);
-            }
-          }
-        })
-
-      })
-
 
-  },
-  GetMyGiftList: function () {
+  GetMyGiftList: function() {
     var _this = this;
     var th = this;
     getApp().request.get('/api/weshop/marketing/my/giftbag/detail/get', {
       data: {
-        "storeId": th.data.getStorageID, //商家ID
-        "userId": th.data.getUserID, //用户ID
+        "storeId": a.stoid, //商家ID
+        "userId": d.user_id, //用户ID
         "orderSn": th.data.orderSn
       },
       success: function success(res) {
@@ -212,23 +113,68 @@ Page({
             }
           }
         } else {
-          getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
+          getApp().my_warnning(res.data.msg, 0, th);
           return false;
         }
       }
     });
 
   },
-  GetBuyGiftList: function () {
+  GetReceive: function() {
+    var th = this;
+    if (th.data.receiveState) {
+      return false;
+    }
+    var is_sub = th.data.is_sub; //判断是否重复提交
+    if (is_sub == 0) {
+      th.setData({
+        is_sub: 1
+      })
+      var json = {
+        "actId": th.data.completeid, //活动Id
+        "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+        "giftBagId": th.data.giftID, //礼包Id
+        "storeId": a.stoid, //商家Id
+        "userId": d.user_id //用户ID
+      };
+      var data = JSON.stringify(json);
+      var url = th.data.url + "/api/weshop/marketing/free/receive/gift/record/insert";
+      getApp().request.json_post(url, json,
+        function(res) {
+          th.setData({
+            is_sub: 0
+          })
+          if (res.data.code == 0) {
+            th.setData({
+              receiveState: 1
+            })
+            getApp().my_warnning("领取成功", 1, th);
+          } else {
+            getApp().my_warnning(res.data.msg, 0, th);
+          }
+        },
+        function(res) {
+
+        }, "post"
+
+      )
+
+    }
+  },
+  GetBuyGiftList: function() {
     var _this2 = this;
     var th = this.data;
+    wx.showLoading({
+      title: '加载中'
+    })
     getApp().request.get('/api/weshop/marketing/giftbag/detail/get', {
       data: {
-        "storeId": th.getStorageID, //商家ID
-        "userId": th.getUserID, //用户ID
+        "storeId": a.stoid, //商家ID
+        "userId": d.user_id, //用户ID
         "giftBagId": th.getGiftID
       },
-      success: function success(res) {
+      success: function(res) {
+       wx.hideLoading();
         if (res.data.code == 0) {
           _this2.setData({
             giftImage: th.iurl + res.data.data.lbUrl,
@@ -256,7 +202,7 @@ Page({
             wareCard: res.data.data.wareCard
           })
         } else {
-          getApp().my_warnning("系统繁忙,请稍后再试", 0, _this2);
+          getApp().my_warnning(res.data.msg, 0, _this2);
           return false;
         }
       }
@@ -264,7 +210,7 @@ Page({
 
   },
   //显示核销码
-  code_show: function (e) {
+  code_show: function(e) {
     var th = this;
     //--获取成功的时候--
     var no = th.data.code;
@@ -276,7 +222,7 @@ Page({
     qc_com.open(obj)
   },
   //获取核销码
-  getcode: function () {
+  getcode: function() {
     var th = this;
     var orderSn = th.data.orderSn; //订单号
     var json = {
@@ -292,7 +238,7 @@ Page({
       header: {
         'content-type': 'application/json'
       }, // 设置请求的 header
-      success: function (res) {
+      success: function(res) {
         if (res.data.code == 0) {
           th.setData({
             code: res.data.data
@@ -305,13 +251,13 @@ Page({
     })
   },
   //界面跳转
-  goto: function (e) {
+  goto: function(e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
   },
   //图片失败，默认图片
-  bind_bnerr2: function (e) {
+  bind_bnerr2: function(e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
     _errObj[_errImg] = "/public/images/empty.jpg";
@@ -319,7 +265,7 @@ Page({
 
   },
   //关闭导航
-  close: function () {
+  close: function() {
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
diff --git a/pages/user/assistance/giftpacklist.wxml b/pages/user/assistance/giftpacklist.wxml
index a512998..2d2104a 100644
--- a/pages/user/assistance/giftpacklist.wxml
+++ b/pages/user/assistance/giftpacklist.wxml
@@ -102,9 +102,16 @@
   <block wx:if="{{isBuy==0}}">
     <view class="foot_button data-v-3a5b7e36">
       <block wx:if="{{true}}">
-        <view wx:if="{{c_state==0}}" class="foot_button_buy data-v-3a5b7e36" bindtap="getcode">
-          <text class="data-v-3a5b7e36">一键领取</text>
-        </view>
+        <block wx:if="{{receiveState}}">
+          <view class="foot_button_buy data-v-3a5b7e36 overdue">
+            <text class="data-v-3a5b7e36">已领取</text>
+          </view>
+        </block>
+        <block wx:else>
+          <view class="foot_button_buy data-v-3a5b7e36" bindtap="GetReceive">
+            <text class="data-v-3a5b7e36">一键全部领取</text>
+          </view>
+        </block>
       </block>
       <block wx:else>
         <block wx:if="{{is_lb!=1}}">