diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js
index 36d2762..1c64842 100644
--- a/packageA/pages/quan_pro/quan_pro.js
+++ b/packageA/pages/quan_pro/quan_pro.js
@@ -88,13 +88,19 @@ Page({
         th.setData({is_get:1});
         return false;
     }
+
+    //-- 券已经领取完的优化 --
+    if(r_data.sum_num && r_data.sum_num<=r_data.use_sumnum){
+        th.setData({is_get:1});
+        return false;
+    }
+
     if(r_data.type!=1){
         th.setData({is_get:2});
         return false;
     }
 
     var now=ut.gettimestamp();
-
     if(r_data.send_start_time>now){
        th.setData({is_get:3});
        return false;
@@ -102,26 +108,26 @@ Page({
 
     if(r_data.send_end_time<now){
        th.setData({is_get:4});
-       return false;
     }
 
-    th.setData({is_get:1});
     th.setData({ q_data:r_data });
 
+    var url2='/api/weshop/couponList/getUserCouponListMsg?store_id='+os.stoid+'&cid='+th.data.id+'&uid='+getApp().globalData.user_id;
+    var rss=await getApp().request.promiseGet(url2, {})
+    if(rss && rss.data.code==-1){
+          if(rss.data.msg.indexOf('您下一次')>-1){
+              th.setData({is_get:5,err_txt:'您已领过该券'});
+          }else if(rss.data.msg.indexOf('您已领完该券')>-1){
+              th.setData({is_get:5,err_txt:'您已领完该券'});
+          }
+    }else if(rss && rss.data.code==0){
+        //获取会员已经领取了多少张券
+        var n1=rss.data.data.usercounted?rss.data.data.usercounted:0;
+        th.setData({'q_data.lqnum':n1})
+    }
 
 
 
-    // var user_id=getApp().globalData.user_id;
-    // await getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
-    //   data:{store_id:os.stoid,type:1,id:th.data.id,user_id:user_id}
-    // }).then(res => {
-    //      th.setData({is_get:1});
-    //      if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
-    //         th.setData({q_data:res.data.data.pageData[0]});
-    //      }
-    // });
-
-
   },
   onUnload:function(){
     wx.offCopyUrl()
@@ -198,7 +204,7 @@ Page({
       success: function(res) {
         th.data.linging = 0;
         if (res.data.code == 0) {
-          item.lqnum++;
+         
           var text3="q_data";
           var obj = {};obj[text3] = item;
           th.setData(obj);
@@ -214,9 +220,24 @@ Page({
 							}
 						})
 					} else {
-						th.setData({
+
+            //设置一下优惠券领取的数量
+            var q_data=th.data.q_data;
+            q_data.use_sumnum++;
+            q_data.lqnum++;
+						
+            th.setData({
 							show_success: 1,
+              q_data
 						})
+
+            if(q_data.everyone_num>0 && q_data.everyone_num<= q_data.lqnum){
+               th.setData({is_get:5,err_txt:'您已领完该券'});
+            }else if(q_data.interval_time>0){
+              th.setData({is_get:5,err_txt:'您已领过该券'});
+            }
+
+          
 					}
         } else {
           app.confirmBox(res.data.msg);
diff --git a/packageA/pages/quan_pro/quan_pro.wxml b/packageA/pages/quan_pro/quan_pro.wxml
index 467d6d4..ab48f5a 100644
--- a/packageA/pages/quan_pro/quan_pro.wxml
+++ b/packageA/pages/quan_pro/quan_pro.wxml
@@ -34,7 +34,7 @@
                 </view>
             </view>
 
-            <block wx:if="{{ q_data}}">
+            <block wx:if="{{q_data}}">
                 <view wx:if="{{ q_data.endtype==0}}" class="lower fs30">有效期
                     <text wx:if="{{q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
                     <text wx:if="{{q_data.use_start_time>0 && q_data.starttype==0}}"> {{filters.format_time(q_data.use_start_time)}}</text>至
@@ -58,7 +58,9 @@
     </view>
 
     <view wx:if="{{q_data}}" class="flex jc-center" style="margin-top: 40rpx">
-        <view wx:if="{{q_data.everyone_num>0 && q_data.lqnum>=q_data.everyone_num}}" class="btn flex jc-center ai-center gray" bindtap="get_quan">已领取</view>
+        <view wx:if="{{q_data.sum_num>0 && q_data.use_sumnum>=q_data.sum_num}}" class="btn flex jc-center ai-center gray" >该券已领完</view>
+        <view wx:elif="{{is_get==4}}" class="btn flex jc-center ai-center gray" >优惠券已过期</view>
+        <view wx:elif="{{is_get==5}}" class="btn flex jc-center ai-center gray" >{{err_txt}}</view>
         <view wx:else class="btn flex jc-center ai-center" bindtap="get_quan">立即领取</view>
     </view>
 
diff --git a/packageA/pages/quan_pro/quan_pro.wxss b/packageA/pages/quan_pro/quan_pro.wxss
index bf3560a..0dd8457 100644
--- a/packageA/pages/quan_pro/quan_pro.wxss
+++ b/packageA/pages/quan_pro/quan_pro.wxss
@@ -26,7 +26,7 @@ page{background-color: #f8f8f8;}
     border-bottom-left-radius:25rpx;
 }
 
-.btn.gray{background-color: #dcdcdc; color: #adb3be;}
+.btn.gray{background-color: #aaa; color: #fff;}
 .coupon_remark{padding: 30rpx 0 10rpx 0; box-sizing: border-box; overflow: hidden;}
 
 .q_title{