Merge branch 'feature/cart' into release/5.4.1

郭成尧
Commit cffdc08fed4329b52551753a70eef7274fde7543 2 parents cff902f7 4917e8c3
Showing 1 changed file with 1 additions and 1 deletions
utils/payment-process.js
--- a/utils/payment-process.js
View file @cffdc08
+++ b/utils/payment-process.js
View file @cffdc08
@@ -277,7 +277,7 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) {
         result.cartPayData = cartData.promotion_formula_list;
         result.num = cartData.goods_count;
         result.goodsPrice = cartData.str_order_amount;
-         result.price = _.isNumber(orderComputeData.last_order_amount) ?
+         result.price = orderComputeData && _.isNumber(orderComputeData.last_order_amount) ?
             orderComputeData.last_order_amount : cartData.last_order_amount;
 
         if (cartData.gain_yoho_coin > 0) {