Merge branch 'feature/cart' into 'release/5.4.1'

零元支付跳转条件判断



See merge request !267

@@ -271,7 +271,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 = cartData.last_order_amount;
+        result.price = orderComputeData ? orderComputeData.last_order_amount : cartData.last_order_amount;
 
         if (cartData.gain_yoho_coin > 0) {
             result.yohoCoinNum = cartData.gain_yoho_coin;