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

WXD-SEASON\season
2 parents 0979c926 cf34ddf4
Showing 2 changed files with 34 additions and 2 deletions
packageB/pages/user/user_coupon/user_coupon.js
packageB/pages/user/user_coupon/user_coupon.wxml
@@ -130,8 +130,23 @@ Page({
  
   //获取券
   get_quan:function (e) {
+
+      console.log("get_quan_ing:"+this.data.get_quan_ing);
+
+      if(this.data.get_quan_ing) return false;
+      this.data.get_quan_ing=1;
+
       var th=this,index=e.currentTarget.dataset.ind;
       var item = this.data.quan_list[index];
+
+      var txt_get="quan_list["+index+"].get_quan_ing";
+
+
+      this.setData({
+        [txt_get]:1
+      })
+
+
       var can_get = item.ObtainTimes;
       var Obtain = item.Obtain;
       var Id = item.Id;
@@ -153,8 +168,25 @@ Page({
            obj[text] = Obtain;
            th.setData(obj);
            getApp().my_warnning("您已成功领取该券",1,th);
+
+           setTimeout(()=>{
+            th.data.get_quan_ing=0;
+            th.setData({
+               [txt_get]:0
+            })
+           },1000)
+
+           
+        
         }else{
             getApp().my_warnning(e.data.msg,0,th);
+
+            setTimeout(()=>{
+              th.data.get_quan_ing=0;
+              th.setData({
+                [txt_get]:0
+            })
+           })
         }
       }
     })
@@ -82,8 +82,8 @@
                    </view>
              </view>
  
-           <view class="clik-get t-c white five-level-word abs {{filter.setcolor(item.UseObjectType)}} "
-                   wx:if="{{item.ObtainTimes>0 || item.SecondNo==0 }}" bindtap="get_quan" data-ind="{{index}}" >立即领取</view>
+           <view class="clik-get t-c white five-level-word abs {{item.get_quan_ing?'g_gray':filter.setcolor(item.UseObjectType)}} "
+                   wx:if="{{item.ObtainTimes>0 || item.SecondNo==0 }}" bindtap="get_quan" data-ind="{{index}}" > {{item.get_quan_ing?'领取中':'立即领取'}}</view>
            <view class="clik-get t-c white five-level-word abs g_gray" wx:else  bindtap="get_out" data-ind="{{index}}"
                     >已领取</view>