diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 5e36889..faab3ae 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -1607,7 +1607,7 @@ Page({
 			  }).then(res=>{
 				  //-------如果购物车中有相关的数据-------
 				  if (res.data.data.total > 0) {		  
-				     b_cart_goods= res.data.data.pageData[0];
+				     b_cart_goods= res.data.data.pageData;
 				  }			  
 			  })
 
@@ -1617,14 +1617,14 @@ Page({
               if(b_cart_goods) {
                   for (let jr = 0; jr < b_cart_goods.length; jr++) {
                       var b_cart_item = b_cart_goods[jr];
-                      if (g_item.prom_type == 0) {
+                      if (!g_item.prom_type || g_item.prom_type == 0) {
                           if ([0, 3, 5, 7, 10].indexOf(b_cart_item.prom_type) > -1) {
-                              is_has = b_cart_item.id;
+                              is_has = b_cart_item;
                               break
                           }
                       } else {
                           if (b_cart_goods.prom_type == g_item.prom_type && b_cart_goods.prom_id == g_item.prom_id) {
-                              is_has = b_cart_item.id;
+                              is_has = b_cart_item;
                               break
                           }
                       }
@@ -1635,8 +1635,8 @@ Page({
 			  //-- 如果就加入过购物车 --
 			  if(is_has){
 				  var updata = {
-				     id: is_has,
-				     goods_num: newd.goods_num + b_cart_goods.goods_num,
+				     id: is_has.id,
+				     goods_num: newd.goods_num + is_has.goods_num,
 				     goods_price: newd.goods_price,
 				     member_goods_price:newd.goods_price,
 				     store_id: os.stoid,
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 4bfd4a8..4074f90 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1977,7 +1977,7 @@ Page({
           var b_cart_item = b_cart_goods[jr];
 
 
-          if (g_item.prom_type == 0) {
+          if (!g_item.prom_type || g_item.prom_type == 0) {
             if ([0, 3, 5, 7, 10].indexOf(b_cart_item.prom_type) > -1) {
               is_has = b_cart_item;
               break