Merge branch 'dev_oa_lou2' into dev

WXD-SEASON\season
2 parents 21555f9b 31fea55a
Showing 7 changed files with 250 additions and 91 deletions
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/cart2.wxml
pages/cart/cart/cart.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.wxml
@@ -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) {
@@ -757,12 +758,28 @@ Page({
                 item1.is_post_temp=res.data.data.is_post_temp;
               }
             })
-          }
-
+          }  
+          
           //要把优惠活动加入,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);
-            await th.add_prom_goods_map(item1);
+            // th.check_is_youhui(item1.goods_id, item1.pick_id);            
+            //增加优惠活动次数限制
+            let limit_num= await th.getprom(item1)  //活动限制次数 
+            
+            if(!limit_num){
+              await th.add_prom_goods_map(item1);
+              // item1.prom_id=''
+              // item1.prom_type=''
+            }else{
+              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=''
+              }
+            }               
           }
  
           //-- 如果组合购的总数量不足的处理 --
@@ -5593,50 +5610,96 @@ Page({
     return !check;
   },
   //立即购买获取优惠活动的内容
-  buy_now_prom_goods: function (prom_id, arr, func) {
+  buy_now_prom_goods: async function (prom_id, arr, func) {
     var th = this;
     var price = arr.shop_price * arr.goods_num;
     var prom = null;
     var gg = to.get_b_now();
-    getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then(res => {
+    getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then( async res => {
  
       if (res.data.code == 0) {
         prom = res.data.data;
-        let min_value = 0
-        if (prom && prom.is_xz_yh) {
-          let arr = prom.promGoodsList || []
-          arr.map(item => {
-            if (min_value) {
-              min_value = item.condition
-            } else {
-              if (min_value < item.condition) {
-                min_value = item.condition
+        if(prom && prom.limit_num*1){
+          let user_pre_buynum=await th.getUserBuyPromNum_pre(prom.id)        
+          if (user_pre_buynum>=prom.limit_num) {
+            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
+            if (prom && prom.is_xz_yh) {
+              let arr = prom.promGoodsList || []
+              arr.map(item => {
+                if (min_value) {
+                  min_value = item.condition
+                } else {
+                  if (min_value < item.condition) {
+                    min_value = item.condition
+                  }
+                }
+              })
+              if (arr.length > 0) {
+                if (arr[0].prom_type == 0) {
+                  if (price < min_value) {
+                    prom.is_xz_yh = 0
+                  }
+                } else {
+                  if (arr.goods_num < min_value) {
+                    prom.is_xz_yh = 0
+                  }
+                }
               }
             }
-          })
-          if (arr.length > 0) {
-            if (arr[0].prom_type == 0) {
-              if (price < min_value) {
-                prom.is_xz_yh = 0
+            return getApp().request.promiseGet("/api/weshop/goods/getDiscount", {
+              data: {
+                price: parseFloat(price).toFixed(2),
+                prom_id: prom_id,
+                goods_num: arr.goods_num,
+                user_id: getApp().globalData.user_id,
+                is_bz: prom.is_bz
               }
-            } else {
-              if (arr.goods_num < min_value) {
-                prom.is_xz_yh = 0
+            })
+          }
+        }else{
+          let min_value = 0
+          if (prom && prom.is_xz_yh) {
+            let arr = prom.promGoodsList || []
+            arr.map(item => {
+              if (min_value) {
+                min_value = item.condition
+              } else {
+                if (min_value < item.condition) {
+                  min_value = item.condition
+                }
+              }
+            })
+            if (arr.length > 0) {
+              if (arr[0].prom_type == 0) {
+                if (price < min_value) {
+                  prom.is_xz_yh = 0
+                }
+              } else {
+                if (arr.goods_num < min_value) {
+                  prom.is_xz_yh = 0
+                }
               }
             }
           }
+          //-------------------
+          return getApp().request.promiseGet("/api/weshop/goods/getDiscount", {
+            data: {
+              price: parseFloat(price).toFixed(2),
+              prom_id: prom_id,
+              goods_num: arr.goods_num,
+              user_id: getApp().globalData.user_id,
+              is_bz: prom.is_bz
+            }
+          })
         }
-
-        //-------------------
-        return getApp().request.promiseGet("/api/weshop/goods/getDiscount", {
-          data: {
-            price: parseFloat(price).toFixed(2),
-            prom_id: prom_id,
-            goods_num: arr.goods_num,
-            user_id: getApp().globalData.user_id,
-            is_bz: prom.is_bz
-          }
-        })
       } else {
         func(arr);
       }
@@ -5708,6 +5771,38 @@ Page({
       func(arr);
     })
   },
+  //优惠促销用户参与次数
+  async getUserBuyPromNum_pre(prom_id){
+    var userInfo = getApp().globalData.userInfo;
+    var url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
+    let res = await getApp().request.promiseGet(url, {
+      data:{}
+    });
+    let user_pre_buynum=0
+    if(res.data.code==0 && res.data.data){
+      user_pre_buynum=res.data.data.userbuynum
+    }
+    return user_pre_buynum
+  },
+  //获取优惠活动
+  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
+  },
   //--检查订单优惠--
   check_is_order_prom: function (condition, func, pick) {
     var th = this;
@@ -5730,7 +5825,7 @@ Page({
     var pickid = item.pick_id;
     var map = th.data.prom_goods_map;
     var obj = map[pickid];
-
+    
     if (map[pickid]) {
       if (map[pickid][item.prom_id]) {
  
@@ -5749,6 +5844,7 @@ Page({
  
       } else {
         var prom = null;
+        
         await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + item.prom_id, {}).then(res => {
           if (res.data.code == 0) {
             prom = res.data.data;
@@ -5793,6 +5889,7 @@ Page({
     } else {
       var ob = {};
       var prom = null;
+      
       await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + item.prom_id, {}).then(res => {
         if (res.data.code == 0) {
           prom = res.data.data;
@@ -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">
@@ -3841,12 +3841,19 @@ Page({
       if (th.data.promgoods_map[p_item[0]]) {
         prom = th.data.promgoods_map[p_item[0]];
       } else {
+        
         await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + p_item[0], {}).then(res => {
           if (res.data.code == 0) {
             prom = res.data.data;
           }
         })
       }
+      let limit_num=0
+      let user_pre_buynum=0
+      if (prom && prom.limit_num) {
+        limit_num=prom.limit_num;
+        user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id)
+      }
       //如果活动已经结束
       if (!prom || prom.is_end || prom.end_time < ut.gettimestamp()) {
         for (var ii in list.goods) {
@@ -3860,7 +3867,7 @@ Page({
         }
         continue;
       }
-
+      
       if (!th.data.promgoods_map[p_item[0]]) th.data.promgoods_map[p_item[0]] = prom;
       //---读取打折的详情---
       var ob = p_item[1];
@@ -3884,36 +3891,37 @@ Page({
         if (!promgoods_list) continue;
         th.data.promgoods_list[p_item[0]] = promgoods_list;
       }
-
-      for (var i in promgoods_list) {
-        var item = promgoods_list[i];
-        if (item.prom_type == 0) {
-          if (ob.price < item.condition) {
-            var elem = {
-              prom_id: prom.id,
-              diff_type: item.prom_type,
-              diff: (item.condition - ob.price).toFixed(2),
-              content: JSON.parse(item.preferential_type)
+      
+      if (!limit_num || user_pre_buynum<limit_num) {
+        for (var i in promgoods_list) {
+          var item = promgoods_list[i];
+          if (item.prom_type == 0) {
+            if (ob.price < item.condition) {
+              var elem = {
+                prom_id: prom.id,
+                diff_type: item.prom_type,
+                diff: (item.condition - ob.price).toFixed(2),
+                content: JSON.parse(item.preferential_type)
+              }
+              make_up_arr.push(elem);
+              break;
             }
-            make_up_arr.push(elem);
-            break;
-          }
-        } else {
-          if (ob.num < item.condition) {
-            var elem = {
-              prom_id: prom.id,
-              diff_type: item.prom_type,
-              diff: (item.condition - ob.num).toFixed(2),
-              content: JSON.parse(item.preferential_type)
+          } else {
+            if (ob.num < item.condition) {
+              var elem = {
+                prom_id: prom.id,
+                diff_type: item.prom_type,
+                diff: (item.condition - ob.num).toFixed(2),
+                content: JSON.parse(item.preferential_type)
+              }
+              make_up_arr.push(elem);
+              break;
             }
-            make_up_arr.push(elem);
-            break;
           }
         }
       }
  
  
-
       //-- 只有在单赠品的时候，才要进行计算 --
       await getApp().request.promiseGet("/api/weshop/goods/getDiscount", {
         data: {
@@ -4063,7 +4071,19 @@ Page({
     }
  
   },
-
+  //优惠促销用户参与次数
+  async getUserBuyPromNum_pre(prom_id){
+    var userInfo = getApp().globalData.userInfo;
+    var url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
+    let res = await getApp().request.promiseGet(url, {
+      data:{}
+    });
+    let user_pre_buynum=0
+    if(res.data.code==0 && res.data.data){
+      user_pre_buynum=res.data.data.userbuynum
+    }
+    return user_pre_buynum
+  },
   async all_check_prom_activity() {
     this.data.duo_zp_num_arr = {};
     for (var i in this.data.requestData) {
@@ -4150,6 +4170,12 @@ Page({
             }
           })
         }
+        let limit_num=0
+        let user_pre_buynum=0
+        if (prom && prom.limit_num) {
+          limit_num=prom.limit_num;
+          user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id)
+        }
         //如果活动已经结束
         if (!prom || prom.is_end || prom.end_time < ut.gettimestamp()) {
           for (var ii in list.goods) {
@@ -4163,7 +4189,7 @@ Page({
           }
           continue;
         }
-
+        
         if (!th.data.promgoods_map[p_item[0]]) th.data.promgoods_map[p_item[0]] = prom;
         //---读取打折的详情---
         var ob = p_item[1];
@@ -4187,30 +4213,31 @@ Page({
           if (!promgoods_list) continue;
           th.data.promgoods_list[p_item[0]] = promgoods_list;
         }
-
-        for (var i in promgoods_list) {
-          var item = promgoods_list[i];
-          if (item.prom_type == 0) {
-            if (ob.price < item.condition) {
-              var elem = {
-                prom_id: prom.id,
-                diff_type: item.prom_type,
-                diff: (item.condition - ob.price).toFixed(2),
-                content: JSON.parse(item.preferential_type)
+        if (!limit_num || user_pre_buynum<limit_num) {
+          for (var i in promgoods_list) {
+            var item = promgoods_list[i];
+            if (item.prom_type == 0) {
+              if (ob.price < item.condition) {
+                var elem = {
+                  prom_id: prom.id,
+                  diff_type: item.prom_type,
+                  diff: (item.condition - ob.price).toFixed(2),
+                  content: JSON.parse(item.preferential_type)
+                }
+                make_up_arr.push(elem);
+                break;
               }
-              make_up_arr.push(elem);
-              break;
-            }
-          } else {
-            if (ob.num < item.condition) {
-              var elem = {
-                prom_id: prom.id,
-                diff_type: item.prom_type,
-                diff: (item.condition - ob.num).toFixed(2),
-                content: JSON.parse(item.preferential_type)
+            } else {
+              if (ob.num < item.condition) {
+                var elem = {
+                  prom_id: prom.id,
+                  diff_type: item.prom_type,
+                  diff: (item.condition - ob.num).toFixed(2),
+                  content: JSON.parse(item.preferential_type)
+                }
+                make_up_arr.push(elem);
+                break;
               }
-              make_up_arr.push(elem);
-              break;
             }
           }
         }
@@ -267,6 +267,7 @@ Page({
     base_nor_prom_type:0,
     base_nor_prom_id:0,
     base_nor_goods_id:0,
+    user_pre_buynum:0, //用户优惠促销参与次数
   },
  
   //------初始化加载----------
@@ -1540,7 +1541,21 @@ Page({
     })
     // return userbuynum
   },
-
+  //优惠促销用户参与次数
+  async getUserBuyPromNum_pre(prom_id){
+    var userInfo = getApp().globalData.userInfo;
+    var url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
+    let res = await getApp().request.promiseGet(url, {
+      data:{}
+    });
+    let user_pre_buynum=0
+    if(res.data.code==0 && res.data.data){
+      user_pre_buynum=res.data.data.userbuynum
+    }
+    this.setData({
+      user_pre_buynum
+    })
+  },
   //-- 加入购物的函数 --
   add_cart_func: function (t) {
     var i = getApp().request;
@@ -7461,7 +7476,7 @@ Page({
     getApp().pre_img(this.data.sele_g.original_img);
   },
  
-  is_show_more_buy: function () {
+  is_show_more_buy: async function () {
     var prom_goods = this.data.prom_goods;
     var per_price = this.data.sele_g.shop_price
     if (this.data.card_field && this.data.sele_g[this.data.card_field] > 0) {
@@ -7485,7 +7500,10 @@ Page({
         }
       }
     }
-
+    //获取用户参与优惠促销的次数
+    if(con && con.prom_id){
+      await this.getUserBuyPromNum_pre(con.prom_id);
+    }
     this.setData({
       hui_condition: con
     });
@@ -507,7 +507,7 @@
                 <view class="fs28 f1" wx:for="{{prom_goods}}">
                   <view>
                     <text class="prom_condition">
-                      <text class="fill-box">消费满{{item.condition}}{{item.prom_type==1 ? '件':'元'}}</text>享优惠
+                      <text class="fill-box">消费满{{item.condition}}{{item.prom_type==1 ? '件':'元'}}</text>享优惠(每人{{item.limit_num ? '限参与'+item.limit_num+'次' : '参与不限次' }})
                     </text>
                   </view>
  
@@ -1346,7 +1346,7 @@
         </view>
       </view>
       <!-- 提示再买多少优惠 -->
-      <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition && openSpecModal_ind==2}}">
+      <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition && openSpecModal_ind==2 && (!hui_condition.limit_num || user_pre_buynum<hui_condition.limit_num)}}">
         再买{{hui_condition.need}}
         <text wx:if="{{hui_condition.money}}">，免{{hui_condition.money}}元</text>
         <text wx:if="{{hui_condition.sale}}">，打{{hui_condition.sale}}折</text>
@@ -41,6 +41,7 @@ Page({
         fil_nation_state:0,
         fil_brand_state:0,
         fil_price_state:0,
+        limit_num:0,
     },
  
     onLoad: function(t) {
@@ -125,6 +126,9 @@ Page({
                    th.set_prom_list(arr);
                }
           })
+          if (t.prom_id) {
+            this.getprom(t.prom_id)
+          }
       }
  
       //--- 阶梯优惠活动的凑单 ---
@@ -236,7 +240,18 @@ Page({
     onShow:function () {
         getApp().check_can_share();
     },
-
+    //获取优惠活动
+    async getprom(prom_id){
+      await getApp().request.promiseGet("/api/weshop/promgoods/get/" + oo.stoid + "/" + prom_id, {}).then(res => {
+        if (res.data.code == 0) {
+          let prom = res.data.data;
+          let limit_num =prom.limit_num
+          this.setData({
+            limit_num
+          })
+        }
+      })
+    },
     //设置优惠券的
     set_prom_list:async function(arr){
         var th=this;
 <wxs module="g_filter" src="../search/g_filter.wxs"></wxs>
 <view class="container" wx:if="{{show_all}}">
   <view>
+      
      <block wx:for="{{prom_goods_list}}">
          <view  class="fs30 ellipsis-1" style="padding: 20rpx 30rpx">
+          <text style="color: red;" wx:if="{{index==0 && limit_num>0}}">每人限参与{{limit_num}}次;</text>
            满{{item.condition}}<text space="{{true}}" wx:if="{{item.prom_type==0}}">元 </text> <text space="{{true}}" wx:else>件 </text>
            <text space="{{true}}" wx:if="{{item.content.is_money && item.content.is_money!='0'}}">减{{item.content.money}}元 </text>
            <text space="{{true}}" wx:if="{{item.content.is_sale && item.content.is_sale!='0'}}">打{{item.content.sale}}折 </text>