From 31fea55a31d472f0ff31917e66dae78faf73e24e Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Thu, 30 Mar 2023 11:09:06 +0800
Subject: [PATCH] oa优惠

---
 packageE/pages/cart/cart2/cart2.js   | 28 ++++++++++++++++++++--------
 packageE/pages/cart/cart2/cart2.wxml |  2 +-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index ddf8ea7..2ba4ffd 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -147,7 +147,8 @@ Page({
     appoint_pick_keyid: '',
     is_pre_cut:0, //是否可以使用预存 0是不可以1的可以
 
-    coll_prom:{} //搭配活动存储
+    coll_prom:{}, //搭配活动存储
+    yh_is_xz_yh:{},//优惠促销优惠券使用开关
 
   },
   onLoad: function (t) {
@@ -754,23 +755,23 @@ Page({
               }
             })
           }  
-                
+          
           //要把优惠活动加入,prom_goods_map中,赠品不要运算，代发商品不算优惠
           if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
             // th.check_is_youhui(item1.goods_id, item1.pick_id);            
             //增加优惠活动次数限制
-            let limit_num= await th.getprom(item1.prom_id)  //活动限制次数 
+            let limit_num= await th.getprom(item1)  //活动限制次数 
             
             if(!limit_num){
               await th.add_prom_goods_map(item1);
-              item1.prom_id=''
-              item1.prom_type=''
+              // item1.prom_id=''
+              // item1.prom_type=''
             }else{
-              let user_pre_buynum = await th.getUserBuyPromNum_pre(item1.prom_id)  //用户已经参与次数
-              
+              let user_pre_buynum = await th.getUserBuyPromNum_pre(item1.prom_id)  //用户已经参与次数           
               if(user_pre_buynum<limit_num){
                 await th.add_prom_goods_map(item1);
               }else{
+                // await th.add_prom_goods_map(item1);
                 item1.prom_id=''
                 item1.prom_type=''
               }
@@ -5560,6 +5561,9 @@ Page({
             arr.prom_price=null;
             arr.prom_id="";
             arr.prom_type="";
+            if(prom.is_xz_yh){
+              arr.is_xz_yh=prom.is_xz_yh
+            }
             func(arr);
           }else{
             let min_value = 0
@@ -5717,12 +5721,20 @@ Page({
     return user_pre_buynum
   },
   //获取优惠活动
-  async getprom(prom_id){
+  async getprom(item){
+    
+    let prom_id=item.prom_id
+    let pickup_id=item.pick_id
     let limit_num=0
     await getApp().request.promiseGet("/api/weshop/promgoods/get/" + oo.stoid + "/" + prom_id, {}).then(res => {
       if (res.data.code == 0) {
         let prom = res.data.data;
         limit_num =prom.limit_num
+        let yh_is_xz_yh=this.data.yh_is_xz_yh
+        yh_is_xz_yh[pickup_id]=prom.is_xz_yh
+        this.setData({
+          ['yh_is_xz_yh']:yh_is_xz_yh
+        })
       }
     })
     return limit_num
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 5780298..bb88c69 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -241,7 +241,7 @@
         </view>
 
         <!-----使用优惠券------>
-        <view class="xc-coupon-frame flex-center" data-bn="0" bindtap="open_coupon_list" wx:if="{{(item.quan_list && item.quan_list.length>0) || get_by_quan_list_cart[item.pickup_id]!=null && item.can_num>0}}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
+        <view class="xc-coupon-frame flex-center" data-bn="0" bindtap="open_coupon_list" wx:if="{{!(yh_is_xz_yh[item.pickup_id]) && ((item.quan_list && item.quan_list.length>0  ) || get_by_quan_list_cart[item.pickup_id]!=null && item.can_num>0)}}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
           <view class="work-frame flex-space-between">
             <view class="work">优惠券<text class="quan_num_show fs20">{{item.can_num}}张可用</text></view>
             <view class="xc-right-frame">
--
libgit2 0.21.4