From 7a70bfe03f9d1c84806c53e38f99f72595e1e259 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 6 Oct 2020 17:09:32 +0800
Subject: [PATCH] 1。   秒杀再来一单的功能，提交订单时候无法提交的bug优化

---
 pages/user/order_detail/order_detail.js | 7 +++++++
 pages/user/order_list/order_list.js     | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index b687528..cc3881d 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -902,6 +902,8 @@ Page({
 			      if(prom){
 			      		req_data.prom_type= good.prom_type;
 			      		req_data.prom_id= good.prom_id;
+						b_item.prom_type=good.prom_type;
+						b_item.prom_id=good.prom_id;		
 											
 						//------判断活动是否抢光-----
 						await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
@@ -1024,6 +1026,11 @@ Page({
 			  if(g_item.is_pd_normal){
 			  	   newd['is_pd_normal']=g_item.is_pd_normal;	  
 			  }
+			  if(g_item.prom_type){
+			  		newd['prom_type']=g_item.prom_type;	  
+			  		newd['prom_id']=g_item.prom_id;	  
+			  }
+			  
 			  
 			 
 			  var b_cart_goods=null; 
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index cb011b7..5d01c08 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -987,7 +987,8 @@ Page({
 		      if(prom){
 		      		req_data.prom_type= good.prom_type;
 		      		req_data.prom_id= good.prom_id;
-										
+					b_item.prom_type=good.prom_type;		
+					b_item.prom_id=good.prom_id;												
 					//------判断活动是否抢光-----
 					await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
 					    os.stoid + "/" + good.prom_type + "/" + good.prom_id, {
@@ -1110,6 +1111,11 @@ Page({
 		  		newd['is_pd_normal']=g_item.is_pd_normal;	  
 		  }
 		  
+		  if(g_item.prom_type){
+		  		newd['prom_type']=g_item.prom_type;	  
+		  		newd['prom_id']=g_item.prom_id;	  
+		  }
+		  
 		 
 		  var b_cart_goods=null; 
 		  await getApp().request.promiseGet("/api/weshop/cart/page", {
--
libgit2 0.21.4