diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 763ac51..3ce362d 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -577,7 +577,7 @@ Page({
         if(!ite.is_gift) {
           let obj = {
             wareno: ite.goods_sn,
-            price: ite.first_account,   //account是平摊后的实收价格
+            price: ite.account_fir,   //account是平摊后的实收价格
             qty: ite.goods_num,
             sumprice: parseFloat(ite.account_fir * ite.goods_num - ite.account_yu_fir-(ite.quan_num?ite.quan_num:0)).toFixed(2)
           }
@@ -2440,6 +2440,11 @@ Page({
       var o_price = 0, q_conditin = 0;
       //--------循环计算总价-----------
       for (var j = 0; j < ord_goods.length; j++) {
+
+        if (ord_goods[j].is_gift) continue;
+        ord_goods[j].account_fir=ord_goods[j].goods_price;     //初始实际价格
+        ord_goods[j].account_yu_fir=0;                         //初始余数
+
         if (ord_goods[j].whsle_id) continue;
         o_price += ord_goods[j].goods_price * ord_goods[j].goods_num;
       }
@@ -2476,8 +2481,6 @@ Page({
                 item_map.zxlbtitle = get_data.zxlbtitle;
 
 
-
-
                 var rule=JSON.parse(get_data.rule);
                 if(rule.is_monthgiftbag &&  parseFloat(rule.is_monthgiftbag )>0){
                   //每月礼包
@@ -2625,7 +2628,6 @@ Page({
             if (!item_map.is_xz_yh) q_conditin = o_price;
           }
 
-
           //--------循环计算商品是不是包邮，是不是使用优惠券,此时循环是商品从表-----------
           for (var j = 0; j < ord_goods.length; j++) {
             if (ord_goods[j].whsle_id) continue;
@@ -2633,10 +2635,11 @@ Page({
               ord_goods[j].is_xz_yh = ord_goods[j].is_xz_yh ? ord_goods[j].is_xz_yh : item_map.is_xz_yh;
               ord_goods[j].is_past = item_map.is_past;
               if (ord_goods[j].is_gift) continue;  //赠品不平摊
-              ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir;
-              ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir;
-              ord_goods[j].account = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account;
-              ord_goods[j].account_yu = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu;
+
+              // ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir;
+              // ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir;
+              // ord_goods[j].account = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account;
+              // ord_goods[j].account_yu = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu;
 
               //-- 如果有参与促销才来进行计算 --
               if (item_map.cy_cx) {
@@ -2650,10 +2653,15 @@ Page({
                     ord_goods[j].is_order_yh = item_map.is_order_yh;
                     ord_goods[j].is_post_temp = item_map.is_post_temp;
 
-                    ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir;
-                    ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir;
-                    ord_goods[j].account = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account;
-                    ord_goods[j].account_yu = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu;
+                    //-- 真的判断 --
+                    var fd_map_gd=th.item_map_get_goods(ord_goods[j].goods_id, item_map);
+                    if(fd_map_gd){
+                      if(fd_map_gd.account_fir!=undefined)  ord_goods[j].account_fir = fd_map_gd.account_fir;
+                      if(fd_map_gd.account_yu_fir!=undefined)  ord_goods[j].account_yu_fir = fd_map_gd.account_yu_fir;
+                      if(fd_map_gd.account!=undefined)  ord_goods[j].account = fd_map_gd.account;
+                      if(fd_map_gd.account_yu!=undefined)  ord_goods[j].account_yu = fd_map_gd.account_yu;
+                    }
+                    
                   }
                 }
               }