diff --git a/pages/giftpack/newvipgift/newvipgift.js b/pages/giftpack/newvipgift/newvipgift.js
index b571253..3e3756b 100644
--- a/pages/giftpack/newvipgift/newvipgift.js
+++ b/pages/giftpack/newvipgift/newvipgift.js
@@ -5,197 +5,218 @@ var e = getApp(),
   t = e.request,
   d = e.globalData;
 Page({
+  data: {
+    url: a.url, //接口网址
+    iurl: a.imghost, //图片前缀网址
+    itemShow: false, //项目栏目是否显示
+    cardShow: false, //代金券栏目是否显示
+    packShow: false, //福利栏目是否显示
+    textShow: false, //规则是否显示
+    integralShow: true, //积分领取是否显示
+    growUpShow: true, //成长值领取是否显示
+    itemButton: '',
+    cardButton: '',
+    getActId: '',
+    getActType: '',
+    giftID: '',
+    receiveState: '一键全部领取',
+    textTitle: '',
+    getUrl: '',
+    noShow: false,
+    cards: [], //礼包内容--礼券
+    itemWare: [], //礼包内容--服务项目
+    integralTitle: "",
+    growUpTitle: "",
+    is_sub: 0, //是否重复领取
+  },
+  GetList: function() {
+    var th = this;
+    var url = "/api/weshop/marketing/giftbag/bound/get";
+    getApp().request.promiseGet(url, {
       data: {
-        iurl: a.imghost, //图片前缀网址
-        itemShow: false, //项目栏目是否显示
-        cardShow: false, //代金券栏目是否显示
-        packShow: false, //福利栏目是否显示
-        textShow: false, //规则是否显示
-        integralShow: true, //积分领取是否显示
-        growUpShow: true, //成长值领取是否显示
-        itemButton: '',
-        cardButton: '',
-        getActId: '',
-        getActType: '',
-        giftID: '',
-        getUserID: '',
-        getStorageID: '',
-        receiveState: '已领取',
-        integralTitle: '已领取',
-        growUpTitle: '已领取',
-        textTitle: '',
-        getUrl: '',
-        noShow: false,
-        cards: [],
-        itemWare: []
-      },
-      //判断中间的连接线是否显示
-      itemShows: function itemShows() {
-        if (this.itemShow) {
-          if (this.cardShow) {
-            return true;
+        "actId": th.data.getActId, //活动id
+        "actType": th.data.getActType, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
+        "giftBagId": th.data.giftID, //礼包ID
+        "storeId": a.stoid, //商家ID
+        "userId": d.user_id //用户ID
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        if (res.data.data.lbCoupons != null) {
+          //礼包内容--礼券
+          th.setData({
+            cardShow: true,
+            cards: res.data.data.lbCoupons
+          })
+        }
+        if (res.data.data.lbSM != null) {
+          //礼包内容--服务项目
+          th.setData({
+            itemShow: true,
+            itemWare: res.data.data.lbSM
+          })
+        }
+        //礼包积分
+        if (res.data.data.lbIntegral <= 0) {
+          if (res.data.data.lbGrowthValue <= 0) {
+            th.setData({
+              packShow: false
+            })
           } else {
-            return false;
+            th.setData({
+              packShow: false,
+              integralShow: false,
+              growUpShow: true
+            })
           }
+
         } else {
-          if (this.cardShow) {
-            return false;
+          if (res.data.data.lbGrowthValue > 0) {
+            th.setData({
+              packShow: true
+            })
           } else {
-            return false;
+            th.setData({
+              packShow: true,
+              integralShow: true,
+              growUpShow: false
+            })
           }
-
         }
-      },
-      //判断中间的连接线是否显示
-      cardShows: function cardShows() {
-        if (this.cardShow) {
-          if (this.packShow) {
-            return true;
-          } else {
-            return false;
-          }
+        th.setData({
+          integralTitle: '领取' + res.data.data.lbIntegral + '积分',
+          growUpTitle: '领取' + res.data.data.lbGrowthValue + '成长值'
+        })
+        if (res.data.data.receiveState == 0) {
+          th.setData({
+            receiveState: '一键全部领取'
+          })
         } else {
-          if (this.packShow) {
-            return false;
-          } else {
-            return false;
-          }
+          th.setData({
+            receiveState: '已领取'
+          })
+        }
 
+        if (res.data.data.actIntro != '') {
+          th.setData({
+            textShow: true,
+            textTitle: res.data.data.actIntro
+          })
         }
-      },
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+        return false;
+      }
+    })
+  },
+  //判断中间的连接线是否显示
+  itemShows: function() {
+    if (this.itemShow) {
+      if (this.cardShow) {
+        return true;
+      } else {
+        return false;
+      }
+    } else {
+      if (this.cardShow) {
+        return false;
+      } else {
+        return false;
+      }
 
-  onLoad: function onLoad(options) {
+    }
+  },
+  //判断中间的连接线是否显示
+  cardShows: function() {
+    if (this.cardShow) {
+      if (this.packShow) {
+        return true;
+      } else {
+        return false;
+      }
+    } else {
+      if (this.packShow) {
+        return false;
+      } else {
+        return false;
+      }
 
-    this.getActId = options.actId; //活动id
-    this.getActType = options.actType; //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
-    this.giftID = options.giftBagId; //礼包ID
-    this.getStorageID = options.storeId; //商家ID
-    this.getUserID = options.userId; //用户ID      
-    this.GetList();
+    }
+  },
 
+  onLoad: function onLoad(options) {
+    var th = this;
+    th.setData({
+      getActId: options.actId,
+      getActType: options.actType,
+      giftID: options.giftBagId
+    })
+    th.GetList();
   },
   onShow: function onShow() {
-    this.textTitle = this.textTitle.replace(/<p><img/gi, "<p class='img'><img");
+    var th = this;
+    var textTitle = th.data.textTitle.replace(/<p><img/gi, "<p class='img'><img");
+    th.setData({
+      textTitle: textTitle
+    })
   },
-
-    getQueryString: function getQueryString(name) {
-      var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
-      var r = window.location.search.substr(1).match(reg);
-      if (r != null) {
-        return unescape(r[2]);
-      }
-      return null;
-    },
-
-    GetList: function GetList() {
-      var _this = this;
-      uni.request({
-        url: this.$GetInfo.ApiHttp + '/api/weshop/marketing/giftbag/bound/get',
-        data: {
-          "actId": this.getActId, //活动id
-          "actType": this.getActType, //活动类型 1新人礼 2评价有礼 3节日营销 4生日营销
-          "giftBagId": this.giftID, //礼包ID
-          "storeId": this.getStorageID, //商家ID
-          "userId": this.getUserID //用户ID
-        },
-        method: 'GET',
-        header: {
-          'Content-Type': 'application/x-www-form-urlencoded' //自定义请求头信息
-        },
-        success: function success(res) {
-          console.log(res.data);
-          if (res.data.code == 0) {
-            if (res.data.data.lbCoupons != null) {
-              _this.cardShow = true;
-              _this.cards = res.data.data.lbCoupons;
-            }
-            if (res.data.data.lbSM != null) {
-              _this.itemShow = true;
-              _this.itemWare = res.data.data.lbSM;
-            }
-            if (res.data.data.lbIntegral <= 0) {
-              if (res.data.data.lbGrowthValue <= 0) {
-                _this.packShow = false;
-              } else {
-                _this.packShow = true;
-                _this.integralShow = false;
-                _this.growUpShow = true;
-              }
-
-            } else {
-              if (res.data.data.lbGrowthValue > 0) {
-                _this.packShow = true;
-              } else {
-                _this.packShow = true;
-                _this.integralShow = true;
-                _this.growUpShow = false;
-              }
-            }
-
-            _this.integralTitle = '领取' + res.data.data.lbIntegral + '积分';
-            _this.growUpTitle = '领取' + res.data.data.lbGrowthValue + '积分';
-            if (res.data.data.receiveState == 0) {
-              _this.receiveState = '一键全部领取';
-            } else {
-              _this.receiveState = '已领取';
-            }
-
-
-            if (res.data.data.actIntro != '') {
-              _this.textShow = true;
-              console.log(res.data.data.actIntro);
-              _this.textTitle = res.data.data.actIntro;
-            }
-
-          } else {
-            console.log(res.data.msg);
-          }
-        }
-      });
-
-    },
-    GetWebHttp: function GetWebHttp() {
-      this.getUrl = this.$GetInfo.HtmlHttp + '/mobile/index/index/stoid/' + this.getStorageID + '.html';
-      window.location.href = this.getUrl;
-    },
-    GetReceive: function GetReceive() {
-      var that = this;
-      if (that.receiveState == '已领取') {
-        return false;
-      }
-      uni.request({
-        url: that.$GetInfo.ApiHttp + '/api/weshop/marketing/free/receive/gift/record/insert',
-        data: {
-          "actId": that.getActId, //活动Id
-          "actType": '1', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-          "lbId": that.giftID, //礼包Id
-          "storeId": that.getStorageID, //商家Id
-          "userId": that.getUserID //用户ID
-        },
-        method: 'POST',
+  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.getActId, //活动Id
+        "actType": 1, //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
+        "lbId": 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";
+      wx.request({
+        url: url,
+        data: data,
+        method: 'post',
         header: {
-          'Content-Type': 'application/json' //自定义请求头信息
-        },
-        success: function success(res) {
-          console.log(res.data);
+          'content-type': 'application/json'
+        }, // 设置请求的 header
+        success: function(res) {
+          th.setData({
+            is_sub: 0
+          })
           if (res.data.code == 0) {
-            console.log(res.data.msg);
-            that.receiveState = '已领取';
-            uni.showToast({
-              icon: 'none',
-              title: '领取成功！'
-            });
-
+            th.setData({
+              receiveState: '已领取'
+            })
+            getApp().my_warnning("领取成功", 1, th);
           } else {
-            console.log(res.data.msg);
-            uni.showToast({
-              icon: 'none',
-              title: res.data.msg
-            });
-
+            getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
           }
         }
-      });
-
+      })
+    }
+  },
+  //界面跳转
+  goto:function(e){
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
+  },
+  //图片失败，默认图片
+  bind_bnerr1: function (e) {
+    var th = this;
+    var _errImg = e.target.dataset.errorimg;
+    var _Img = e.target.dataset.img;
+    if (_Img != undefined) {
+      var _errObj = {};
+      _errObj[_errImg] = "/miniapp/images/giftbag/gift02.png";
+      th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
     }
+  },
 });
\ No newline at end of file
diff --git a/pages/giftpack/newvipgift/newvipgift.json b/pages/giftpack/newvipgift/newvipgift.json
index b818239..8699cd6 100644
--- a/pages/giftpack/newvipgift/newvipgift.json
+++ b/pages/giftpack/newvipgift/newvipgift.json
@@ -1,5 +1,8 @@
 {
   "navigationBarTitleText": "新人礼",
   "navigationStyle": "custom",
-  "usingComponents": {}
+  "usingComponents": {
+    "warn": "/components/long_warn/long_warn",
+    "my_confirm": "/components/my_confirm/my_confirm"
+  }
 }
\ No newline at end of file
diff --git a/pages/giftpack/newvipgift/newvipgift.wxml b/pages/giftpack/newvipgift/newvipgift.wxml
index 69961db..7cbb7a6 100644
--- a/pages/giftpack/newvipgift/newvipgift.wxml
+++ b/pages/giftpack/newvipgift/newvipgift.wxml
@@ -1,15 +1,15 @@
 <view>
     <view class="image_box">
-        <image src="{{iurl+'/miniapp/images/giftbag/vip00.png'}}" ></image>
+        <image src="{{iurl+'/miniapp/images/giftbag/vip00.png'}}" lazy-load="true"></image>
     </view>
-    <block wx:if="{{this.itemShow}}">
+    <block wx:if="{{itemShow}}">
         <view class="top">
             <view class="top_box">
                 <view class="top_box_text">
                     <text>______</text>
                 </view>
                 <view class="top_box_text">
-                    <text >新人专享\n你的美丽我来缔造</text>
+                    <text>新人专享\n你的美丽我来缔造</text>
                 </view>
                 <view class="top_box_text">
                     <text >______</text>
@@ -18,27 +18,27 @@
             <block wx:for="{{itemWare}}" wx:for-item="item" wx:for-index="index" wx:key="index">
                 <view class="top_item ">
                     <block wx:if="{{item.lbType==3}}">
-                        <view class="top_item_img ">
-                            <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift02.png'}}" ></image>
+                        <view class="top_item_img">
+                            <image src="{{item.fromImage=='' || item.fromImage==null?iurl+'/miniapp/images/giftbag/gift02.png':iurl+item.fromImage}}" lazy-load="true" data-errorimg="itemWare[{{index}}].fromImage" binderror="bind_bnerr1" data-img="{{item.fromImage}}"></image>
                         </view>
                     </block>
                     <block wx:if="{{item.lbType==1}}">
                         <view class="top_item_img ">
-                            <image src="{{item.fromImage==''?$GetInfo.imgHttp+'/miniapp/images/giftbag/empty.jpg':$GetInfo.imgHttp+item.fromImage}}" ></image>
+                            <image src="{{item.fromImage==''?iurl+'/miniapp/images/giftbag/empty.jpg':iurl+item.fromImage}}" lazy-load="true"></image>
                         </view>
                     </block>
                     <view class="top_item_center ">
-                        <view class="top_item_center_title ">
+                        <view class="top_item_center_title">
                             <block wx:if="{{item.lbType==1}}">
-                                <text >免费领取</text>
+                                <text>免费领取</text>
                             </block>
                             <block wx:if="{{item.lbType==3}}">
-                                <text >{{item.fromName}}</text>
+                                <text>{{item.fromName}}</text>
                             </block>
                         </view>
                         <view class="top_item_center_ramke ">
                             <block wx:if="{{item.lbType==1}}">
-                                <text >{{item.fromName}}</text>
+                                <text>{{item.fromName}}</text>
                             </block>
                             <block wx:if="{{item.lbType==3}}">
                                 <text >{{"新人可免费享受专业"+item.fromName+"，可以享受"+item.num+"次。"}}</text>
@@ -49,13 +49,13 @@
             </block>
         </view>
     </block>
-    <block wx:if="{{$root.g0}}">
+    <block wx:if="{{true}}">
         <view >
-            <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image>
-            <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image>
+            <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
+            <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
         </view>
     </block>
-    <block wx:if="{{this.cardShow}}">
+    <block wx:if="{{cardShow}}">
         <view >
             <view class="top ">
                 <view class="top_box ">
@@ -71,22 +71,23 @@
                 </view>
                 <block wx:for="{{cards}}" wx:for-item="item" wx:for-index="index" wx:key="index">
                     <view class="top_card ">
-                        <view class="{{['',item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3']}}">
+                        <view class="{{item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3'}}">
+                        <!-- class="{{['',item.useObjectType==1?'top_card_box img1':item.useObjectType==2?'top_card_box img2':'top_card_box img3']}}" -->
                             <view class="top_card_tite_box ">
                                 <block wx:if="{{item.useObjectType==0}}">
-                                    <view class="top_card_tite_a ">全场通用</view>
+                                    <view class="top_card_tite_a">全场通用</view>
                                 </block>
                                 <block wx:if="{{item.useObjectType==1}}">
-                                    <view class="top_card_tite_b ">品牌限定</view>
+                                    <view class="top_card_tite_b">品牌限定</view>
                                 </block>
                                 <block wx:if="{{item.useObjectType==2}}">
-                                    <view class="top_card_tite_c ">品类限定</view>
+                                    <view class="top_card_tite_c">品类限定</view>
                                 </block>
                                 <block wx:if="{{item.useObjectType==11}}">
-                                    <view class="top_card_tite_a ">用途限定</view>
+                                    <view class="top_card_tite_a">用途限定</view>
                                 </block>
                                 <block wx:if="{{item.useObjectType==12}}">
-                                    <view class="top_card_tite_a ">分类1限定</view>
+                                    <view class="top_card_tite_a">分类限定</view>
                                 </block>
                             </view>
                             <view class="top_card_counte ">{{item.sum+"元券"}}</view>
@@ -97,15 +98,15 @@
             </view>
         </view>
     </block>
-    <block wx:if="{{$root.g1}}">
-        <view >
-            <view >
-                <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image>
-                <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip05.png'}}" ></image>
+    <block wx:if="{{true}}">
+        <view>
+            <view>
+                <image style="width:10px;height:47px;float:left;top:-38px;left:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
+                <image style="width:10px;height:47px;float:right;top:-38px;right:55px;" src="{{iurl+'/miniapp/images/giftbag/vip05.png'}}" lazy-load="true"></image>
             </view>
         </view>
     </block>
-    <block wx:if="{{this.packShow}}">
+    <block wx:if="{{packShow}}">
         <view >
             <view class="top ">
                 <view class="top_box ">
@@ -119,47 +120,50 @@
                         <text >———</text>
                     </view>
                 </view>
-                <block wx:if="{{this.integralShow}}">
-                    <view >
+                <block wx:if="{{integralShow}}">
+                    <view>
                         <view class="top_box_image ">
-                            <image src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip06.jpg'}}" ></image>
-                            <button >{{this.integralTitle}}</button>
+                            <image src="{{iurl+'/miniapp/images/giftbag/vip06.jpg'}}" lazy-load="true"></image>
+                            <button>{{integralTitle}}</button>
                         </view>
                     </view>
                 </block>
-                <block wx:if="{{this.growUpShow}}">
+                <block wx:if="{{growUpShow}}">
                     <view >
-                        <view class="top_box_image ">
-                            <image src="{{this.$GetInfo.imgHttp+'/miniapp/images/giftbag/vip07.jpg'}}" ></image>
-                            <button >{{this.growUpTitle}}</button>
+                        <view class="top_box_image fs36">
+                            <image src="{{iurl+'/miniapp/images/giftbag/vip07.jpg'}}" lazy-load="true"></image>
+                            <button>{{growUpTitle}}</button>
                         </view>
                     </view>
                 </block>
             </view>
         </view>
     </block>
-    <block wx:if="{{this.textShow}}">
-        <view class="foot_box ">
-            <view class="foot_box_title ">
-                <text >活动规则:</text>
+    <block wx:if="{{textShow}}">
+        <view class="foot_box">
+            <view class="foot_box_title fs36">
+                <text>活动规则:</text>
             </view>
-            <view class="foot_box_text ">
-                <rich-text nodes="{{this.textTitle}}"></rich-text>
+            <view class="foot_box_text">
+                <rich-text nodes="{{textTitle}}"></rich-text>
             </view>
         </view>
     </block>
-    <view class="button_box ">
+    <view class="button_box">
         <view >
-            <button data-event-opts="{{[['tap',[['GetWebHttp',['$event']]]]]}}" class="button " bindtap="__e">进入商城购物</button>
+            <button class="button" bindtap="goto" data-url="/pages/index/index/index">进入商城购物</button>
         </view>
         <view class="button_text ">
             <text >本活动最终解释权归公司所有，如果有问题请联系客服</text>
         </view>
     </view>
     <view class="foot_empty "></view>
-    <view class="foot_button ">
-        <view class="{{['',this.receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy']}}">
-            <text data-event-opts="{{[['tap',[['GetReceive',['$event']]]]]}}" bindtap="__e" >{{this.receiveState}}</text>
+    <view class="foot_button">
+        <view class="{{receiveState=='已领取'?'foot_button_notbuy':'foot_button_buy'}}" bindtap="GetReceive">
+            <text>{{receiveState}}</text>
         </view>
     </view>
-</view>
\ No newline at end of file
+</view>
+<!-- 引入提示组件 -->
+<warn id="warn"></warn>
+<my_confirm id="my_confirm"></my_confirm>
\ No newline at end of file
diff --git a/pages/giftpack/newvipgift/newvipgift.wxss b/pages/giftpack/newvipgift/newvipgift.wxss
index 7a4b82a..d528db9 100644
--- a/pages/giftpack/newvipgift/newvipgift.wxss
+++ b/pages/giftpack/newvipgift/newvipgift.wxss
@@ -258,7 +258,6 @@
 	border-radius: 20rpx;
 }
 .foot_box_title {
-	font-size: 43rpx;
 	color: #000000;
 	padding: 20rpx 30rpx 20rpx 30rpx;
 }
@@ -313,7 +312,7 @@
 	height: 70rpx;
 	font-size: 28rpx;
 	line-height: 70rpx;
-	border-radius: 30rpx 30rpx 30rpx 30rpx;
+	border-radius: 30rpx;
 }
 .foot_button_notbuy{
 	background: #999999;