From 90531dc8713ba4905b6e1377e79aa38ac2916d15 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 15 Nov 2021 11:06:28 +0800
Subject: [PATCH] 再来一单超出限购的控制。   商品详情页团购商品库存控制，以及已抢光的显示

---
 pages/goods/goodsInfo/goodsInfo.js      | 7 +++++--
 pages/goods/goodsInfo/goodsInfo.wxml    | 4 ++--
 pages/user/order_detail/order_detail.js | 2 +-
 pages/user/order_list/order_list.js     | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index c729070..febc280 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3028,6 +3028,7 @@ Page({
                                 isshow: 1,
                             });
                             ee.get_sku(os.stoid, ee.data.data, gid);
+                            ee.get_sto();
                             return false;
                         }
                         //----已经结束-----
@@ -3042,12 +3043,13 @@ Page({
                         }
                         //----已经过期-----
                         var now = ut.gettimestamp();
-                        if (t.data.data.end_time < now) {
+                        if (t.data.data.end_time < now || t.data.data.start_time>now) {
                             ee.setData({
                                 prom_type: 0,
                                 isshow: 1,
                             });
                             ee.get_sku(os.stoid, ee.data.data, gid);
+                            ee.get_sto();
                             return false;
                         }
 
@@ -3138,6 +3140,7 @@ Page({
                   isshow: 1,
                 });
                 ee.get_sku(os.stoid, ee.data.data, gid);
+                ee.get_sto();
                 return false;
               }
               //----已经结束-----
@@ -3158,9 +3161,9 @@ Page({
                   isshow: 1,
                 });
                 ee.get_sku(os.stoid, ee.data.data, gid);
+                ee.get_sto();
                 return false;
               }
-
               /*-- 还没有开始预热的也不显示 --*/
               if (t.data.data.show_time > now) {
                 ee.setData({
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 299399f..7df57f7 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1052,7 +1052,7 @@
       立即购买
     </view>
     <!-- 普通商品购买 -->
-    <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3}}">
+    <block wx:if="{{prom_type==0 || prom_type==3}}">
       <!-- 线上销售的时候，要判断库存量，  线下库存的时候不用判断 -->
       <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}">
         <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
@@ -1063,7 +1063,7 @@
       </block>
     </block>
     <!-- -----秒杀------ -->
-    <block wx:if="{{prom_type==1}}">
+    <block wx:if="{{prom_type==1 || prom_type==2}}">
       <block wx:if="{{prom_st==1 && !prom_r_null}}">
         <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
         <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index b96bf5c..eeb5ca6 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -1283,7 +1283,7 @@ Page({
 					   }
 
 					   if(prom['buy_limit']>0){
-                           if(cart_num+buynum>prom['buy_limit'] ){
+                           if(cart_num+buynum>=prom['buy_limit'] ){
                                err_text+= good['goods_name']+"超出活动限购\n";continue;
                            }
                            prom['buy_limit'] -= (cart_num+buynum);
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index c0dd4f2..cd4f5fc 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1456,7 +1456,7 @@ Page({
                     }
 
                     if (prom['buy_limit'] > 0) {
-                        if (cart_num + buynum > prom['buy_limit']) {
+                        if (cart_num + buynum >= prom['buy_limit']) {
                             err_text += good['goods_name'] + "超出活动限购\n";
                             continue;
                         }
--
libgit2 0.21.4