From 8536745351d1111843d55ab1ee7623fb706faf5b Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Thu, 3 Mar 2022 17:14:58 +0800
Subject: [PATCH] 购物车页当购买数量超出限购数量时出现toast提示，并修改商品数量为当前可购买数量

---
 pages/cart/cart/cart.js   | 20 ++++++++++++++------
 pages/cart/cart/cart.wxss |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 529d343..b79d639 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1013,7 +1013,7 @@ Page({
         console.log('add+');
         if (a.goods_num < a.store_count) {
             var e = {
-                goods_num: a.goods_num + 1,
+								goods_num: a.goods_num + 1,
                 id: a.id,
                 goods_id: a.goods_id,
                 store_id: oo.stoid
@@ -1744,16 +1744,24 @@ Page({
 
                 })
 
-
-                var buyed_mum2 = t.goods_num + goodsbuynum;
-                if (buyed_mum2 > limit && limit > 0) {
+								//--> by ty
+                // var buyed_mum2 = t.goods_num + goodsbuynum;
+								var buyed_mum2 = t.goods_num;
+								//<--
+								
+								// 判断当前预购买的数量是否超过可购买的数量
+                if (buyed_mum2 > (limit - goodsbuynum) && limit > 0) {
                     wx.showToast({
                         title: '购买数量超出商品限购',
 												icon: 'none',
-                        // content: '购买数量超出商品限购'
                     });
                     var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
-                    var cbuy = limit - buyed_mum2;
+										
+										//--> by ty
+										var cbuy = limit - goodsbuynum;
+                    // var cbuy = limit - buyed_mum2 + 1;
+										//<-- 
+										
                     e.setData({
                         // [txt]: cbuy > 0 ? cbuy : 0,
 												[txt]: cbuy > 0 ? cbuy : limit,
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index 2e1efe0..0858710 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -131,7 +131,7 @@ radio {
 
 .sub, .add, .count>input {
     /* border-right: 1px solid #000; */
-	background-color: #f8f8f8;
+	background-color: #f0f0f0;
 	border-radius: 8rpx;
 }
 .sub.active {
--
libgit2 0.21.4