From 32e4e09c9ce286deb7d15278fc3eeb9a4af89035 Mon Sep 17 00:00:00 2001
From: banche <wxdtest@yolipai.com>
Date: Wed, 23 Mar 2022 09:20:38 +0800
Subject: [PATCH] fix立即购买再一单多商品问题

---
 packageA/pages/details_serviceCard/details_serviceCard.js | 46 ++++++++++++++++++++++++++++------------------
 packageA/pages/goodsInfo/goodsInfo.js                     |  2 +-
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index 061078f..c511731 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -236,7 +236,7 @@ Page({
 		// var action= t.currentTarget.dataset.action;
 		var action = 'add'; //
 		// if(!ind)  ind = t.currentTarget.dataset.openspecmodal_ind;
-
+		var user_id = getApp().globalData.user_id;
 		th.setData({
 			open_ind_store: ind
 		});
@@ -261,6 +261,13 @@ Page({
 			// th.buyNow(newd);
 		} else {
 
+			var len = details.list.length;
+
+			for (let i = 0; i < len; i++) {
+				
+				
+			
+			
 			var newd = {
 				// service_id: th.data.data.id,
 				// service_sn:th.data.data.service_sn,
@@ -271,14 +278,14 @@ Page({
 				// store_id:os.stoid,
 				// money:th.data.data.shop_price,
 
-				service_id: details.list[0].card_id,
-				service_sn: details.list[0].service_sn,
-				service_name: details.list[0].service_name,
-				goods_num: details.list[0].qty,
-				pick_id: details.list[0].pickup_id,
-				user_id: this.data.userInfo.user_id,
+				service_id: details.list[i].card_id,
+				service_sn: details.list[i].service_sn,
+				service_name: details.list[i].service_name,
+				goods_num: details.list[i].qty,
+				pick_id: details.list[i].pickup_id,
+				user_id: user_id,
 				store_id: app.globalData.setting.stoid,
-				money: details.list[0].price,
+				money: details.list[i].price,
 			};
 			if (getApp().globalData.guide_id) {
 				newd['guide_id'] = getApp().globalData.guide_id;
@@ -286,14 +293,14 @@ Page({
 			};
 			// 秒杀：单独购买的情况下，加入购物车显示的是零售价，否则显示秒杀活动价
 			if(details.list[0].prom_type == 1) {
-				newd['prom_type'] = details.list[0].prom_type;
-				newd['prom_id'] = details.list[0].prom_id;
+				newd['prom_type'] = details.list[i].prom_type;
+				newd['prom_id'] = details.list[i].prom_id;
 			};
 
-			var prom_id = details.list[0].prom_id > 0 ? details.list[0].prom_id : 0;
-			var card_id = details.list[0].card_id;
-			var prom_type = details.list[0].prom_type > 0 ? details.list[0].prom_type : 0;
-			var is_pd_normal = details.list[0].is_pd_normal;
+			var prom_id = details.list[i].prom_id > 0 ? details.list[i].prom_id : 0;
+			var card_id = details.list[i].card_id;
+			var prom_type = details.list[i].prom_type > 0 ? details.list[i].prom_type : 0;
+			var is_pd_normal = details.list[i].is_pd_normal;
 			// 库存
 			var redisNums = 0;
 			// 限购数
@@ -318,7 +325,7 @@ Page({
 					});
 
 					// 获取限购数
-					var user_id = getApp().globalData.user_id;
+					
 					await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, {}).then(res => {
 						if (res.data.code == 0) {
 							limitNum = res.data.data.buy_limit;
@@ -340,7 +347,7 @@ Page({
 			app.request.get("/api/weshop/cartService/page", { 
 				data: {
 					store_id: app.globalData.setting.stoid,
-					user_id: this.data.userInfo.user_id,
+					user_id: user_id,
 					service_id: details.list[0].card_id,
 					pick_id: details.list[0].pickup_id,
 				},
@@ -348,7 +355,7 @@ Page({
 					//-------如果购物车中有相关的数据---------
 					if (re.data.data.total > 0) {
 						var item = re.data.data.pageData[0];
-						var totalNum = details.list[0].qty + item.goods_num;
+						var totalNum = details.list[i].qty + item.goods_num;
 
 						if (prom_type == 1 && !is_pd_normal) {
 							// 秒杀购物车购买 修正数量
@@ -369,7 +376,7 @@ Page({
 						var updata = {
 							id: item.id,
 							goods_num: totalNum,
-							money: details.list[0].price,
+							money: details.list[i].price,
 							store_id: app.globalData.setting.stoid,
 						};
 
@@ -411,6 +418,9 @@ Page({
 			});
 
 		}
+
+
+		}
 	},
 
 
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 9729800..6f9e7bd 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -1175,7 +1175,7 @@ Page({
 							};
 							
 							if(limited <= res) {
-								if(t>limited) {
+								if(t>canBuyNum) {
 									wx.showModal({
 										title: '超出限购数量',
 									});
--
libgit2 0.21.4