Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

WXD-SEASON\season
2 parents 7be94812 65202ce0
Showing 2 changed files with 11 additions and 8 deletions
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
@@ -75,7 +75,7 @@ Page({
         canvasHidden:true,
         is_receive:1, //是否已经领取 
         screenWidth: 0,
-       
+        islogin:false,
     },
     onLoad: function (options) {
  
@@ -683,13 +683,13 @@ Page({
  
     getGift(){
       var that=this;
-      
+      if (that.data.islogin) {
+        return
+      }
+      that.setData({
+        islogin:true
+      })
       var json = {
-          // "actId": '', //活动Id
-          // "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销
-          // "buyType":""+that.data.buyType, //1=积分兑换 2=余额购买
-          // "giftBagId": id, //每月礼包主表id
-          // "buyFrom": 2,
           "id":that.data.record_list_id,// "记录Id", 
           "storeId": that.data.getStorageID, //商家Id
           "userId": that.data.getUserID, //用户ID
@@ -716,6 +716,9 @@ Page({
                     that.setData({submit:0})
                     getApp().my_warnning(res.data.msg, 0, that);
                 }
+                that.setData({
+                  islogin:false
+                })
             },
             function (res) {
                 that.setData({submit:0})
@@ -176,7 +176,7 @@
 		          <text class="data-v-3a5b7e36">已领取</text>
 		        </view>
             <view class="foot_button_intalge data-v-3a5b7e36 " wx:else bindtap="getGift" data-id="{{lbId}}">
-		          <text class="data-v-3a5b7e36">领取</text>
+		          <text class="data-v-3a5b7e36">立即领取</text>
 		        </view>
 		      </block>
 		    </view>