diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 42819a4..d2f890c 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -393,7 +393,7 @@ Page({
               if (arr[j].pickup_id == pcid) {
                 arr[j].goods.push(item);				
 				//-- 把等级卡会优惠多少钱装进去 --
-				if(item.cut_price) arr[j].card_cut_price+=arr[j].cut_price;						
+				if(item.cut_price) arr[j].card_cut_price+=item.cut_price;						
                 find = 1;break;
               }
             }
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index e8a4a6c..b687528 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -751,6 +751,7 @@ Page({
 			  b_item.price=good.shop_price;
 			  b_item.goods_sn=good.goods_sn;
 			  b_item.sku=good.sku;
+			  b_item.is_integral_normal=g_item.is_integral_normal;
 			  		  
 			  //--判断商品当前的活动情况--
 			  switch(good.prom_type){
@@ -1016,6 +1017,14 @@ Page({
 				  newd['guide_id']=g_item.guide_id;
 				  newd['guide_type']=g_item.guide_type;
 			  }
+			  
+			  if(g_item.is_integral_normal){
+			  	   newd['is_integral_normal']=g_item.is_integral_normal;
+			  }  
+			  if(g_item.is_pd_normal){
+			  	   newd['is_pd_normal']=g_item.is_pd_normal;	  
+			  }
+			  
 			 
 			  var b_cart_goods=null; 
 			  await getApp().request.promiseGet("/api/weshop/cart/page", {
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 7b18ff7..cb011b7 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -835,20 +835,21 @@ Page({
 		  b_item.pickup_id=item.pickup_id;
 		  b_item.price=good.shop_price;
 		  b_item.goods_sn=good.goods_sn;
-		  b_item.sku=good.sku;
+		  b_item.sku=good.sku;		  
+		  b_item.is_integral_normal=g_item.is_integral_normal;
 		  		  
 		  //--判断商品当前的活动情况--
 		  switch(good.prom_type){
 			  case 1: 
 			     var flash=null;
-			     getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, {						 
+			     await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, {						 
 				 }).then(res=>{
 					  if (res.data.code== 0) {
 						  flash=res.data.data;
 					  }
 				 })				 		
 				 //----已经结束-----
-				 if (flash && flash.is_end == 0 && flash.end_time > timestamp && flash.start_time > timestamp ) {
+				 if (flash && flash.is_end == 0 && flash.end_time>timestamp && flash.start_time<timestamp ) {
 				      prom=flash;
 					  b_item.price=prom.price;  //
 				 }				 
@@ -1101,6 +1102,14 @@ Page({
 			  newd['guide_id']=g_item.guide_id;
 			  newd['guide_type']=g_item.guide_type;
 		  }
+		  
+		  if(g_item.is_integral_normal){
+			   newd['is_integral_normal']=g_item.is_integral_normal;
+		  }  
+		  if(g_item.is_pd_normal){
+		  		newd['is_pd_normal']=g_item.is_pd_normal;	  
+		  }
+		  
 		 
 		  var b_cart_goods=null; 
 		  await getApp().request.promiseGet("/api/weshop/cart/page", {