From 4f8aacf965b38eae22bf4518a7f0ef085194966b Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 27 Nov 2023 15:02:38 +0800
Subject: [PATCH] 组合购的商品，活动总数和限购次数在商品详情页面的时候，要提示

---
 pages/goods/goodsInfo/goodsInfo.js | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
 1 file changed, 75 insertions(+), 36 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 90ed7b6..712d49f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1598,7 +1598,7 @@ Page({
 
         })
       },
-      async getUserBuyPromNum(prom_id) {
+      async getUserBuyPromNum(prom_id,is_zh) {
         var userInfo = getApp().globalData.userInfo;
         var url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=7&prom_id=${prom_id}`;
         let res = await getApp().request.promiseGet(url, {
@@ -1611,6 +1611,7 @@ Page({
         this.setData({
           userbuynum
         })
+        if(is_zh) this.data.user_zh_buy_num=userbuynum;
         // return userbuynum
       },
 
@@ -2183,6 +2184,7 @@ Page({
             newd['pick_name'] = th.data.sto_sele_name;
             newd['pick_dis'] = th.data.sto_sele_distr;
             th.buyNow(newd);
+
          }
       },
 
@@ -2249,46 +2251,82 @@ Page({
                 s.set_b_now(e);
                 getApp().goto("/packageE/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id)
               } else {
-                
-                //----其他就按照公众号的购物车立即购买形式来修改，先看会员在购物车中是否加入了该商品,立即购买的-----
-                getApp().request.get("/api/weshop/cart/page", {
-                  data: {
-                    store_id: os.stoid,
-                    user_id: oo.user_id,
-                    state: 1
-                  },
-                  success: function (res) {
-                    //-------如果购物车中有相关的数据---------
-                    if (res.data.code == 0 && res.data.data.total > 0) {
-                      for (let j in res.data.data.pageData) {
-                        let item_j = res.data.data.pageData[j];
-                        var url = '/api/weshop/cart/del/' + os.stoid + '/' + item_j.id;
-                        getApp().request.delete(url, {});
-                      }
+                //-- 如果是第一顺序是组合购的时候 --
+                if(th.data.cx_prom_group && th.data.cx_prom_group.length && th.data.cx_prom_group[0].prom_type==7){
+                    if(!th.data.is_has_zh_num){
+                        th.data.adding=0;
+                        wx.hideLoading();
+                        wx.showModal({
+                          title: '提示',
+                          content: '超出组合购总数，将以普通商品购买',
+                          success (res) {
+                            if (res.confirm) {
+                              th.cart_next_next(e);
+                            }
+                          }
+                        })
+                    }else if(th.data.user_zh_buy_num>=th.data.zh_act.buy_limit && th.data.zh_act.buy_limit>0){
+                        th.data.adding=0;
+                        wx.hideLoading();
+                        wx.showModal({
+                          title: '提示',
+                          content: '超出组合购限购次数，将以普通商品购买',
+                          success (res) {
+                            if (res.confirm) {
+                              th.cart_next_next(e);
+                            }
+                          }
+                        })
+                    }else{
+                      th.cart_next_next(e);
                     }
+                }
+                else{
+                   th.cart_next_next(e);
+                }
+              }
 
-                    //-- 推迟一下，因为删除没有那么快 --
-                    setTimeout(() => {
-                      e.state = 1;
-                      e.prom_type = 0;
-                      e.prom_id = 0
-                      getApp().request.post("/api/weshop/cart/save", {
-                        data: e,
-                        success: function (t) {
-                          th.closeSpecModal();
-                          getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
-                        }
-                      });
-                    }, 500)
 
-                  }
-                })
-              }
+            }
+          },
+
 
 
+          cart_next_next(e){
+            var th=this;
+            //----其他就按照公众号的购物车立即购买形式来修改，先看会员在购物车中是否加入了该商品,立即购买的-----
+            getApp().request.get("/api/weshop/cart/page", {
+              data: {
+                store_id: os.stoid,
+                user_id: oo.user_id,
+                state: 1
+              },
+              success: function (res) {
+                //-------如果购物车中有相关的数据---------
+                if (res.data.code == 0 && res.data.data.total > 0) {
+                  for (let j in res.data.data.pageData) {
+                    let item_j = res.data.data.pageData[j];
+                    var url = '/api/weshop/cart/del/' + os.stoid + '/' + item_j.id;
+                    getApp().request.delete(url, {});
+                  }
+                }
 
+                //-- 推迟一下，因为删除没有那么快 --
+                setTimeout(() => {
+                  e.state = 1;
+                  e.prom_type = 0;
+                  e.prom_id = 0
+                  getApp().request.post("/api/weshop/cart/save", {
+                    data: e,
+                    success: function (t) {
+                      th.closeSpecModal();
+                      getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
+                    }
+                  });
+                }, 500)
 
-            }
+              }
+            })
           },
 
           //----------增加购买数量-----------
@@ -8724,12 +8762,13 @@ Page({
 
                                                 //判断组合购总数够不够
                                                 var is_has_zh_num = (!e.data.data.zh_num || e.data.data.zh_buy_num < e.data.data.zh_num);
-                                                if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time && is_has_zh_num) {
+                                                if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time ) {
                                                   //-- 获取商品列表 --
                                                   th.setData({
                                                     zh_act: e.data.data
                                                   });
-                                                  th.getUserBuyPromNum(e.data.data.id)
+                                                  th.data.is_has_zh_num= is_has_zh_num;
+                                                  th.getUserBuyPromNum(e.data.data.id,1)
                                                 }
                                               }
 
--
libgit2 0.21.4