fe / yohobuywap-node · Commits

Go to a project

Authored by 毕凯
Commit 3f4d91612989be9fb3cbb3558b23205270bc9bdb 2 parents ec81d527 2a576072

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

零元支付跳转条件判断



See merge request !267
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
@@ -271,7 +271,7 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) { @@ -271,7 +271,7 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) {
271 result.cartPayData = cartData.promotion_formula_list; 271 result.cartPayData = cartData.promotion_formula_list;
272 result.num = cartData.goods_count; 272 result.num = cartData.goods_count;
273 result.goodsPrice = cartData.str_order_amount; 273 result.goodsPrice = cartData.str_order_amount;
274 - result.price = cartData.last_order_amount; 274 + result.price = orderComputeData ? orderComputeData.last_order_amount : cartData.last_order_amount;
275 275
276 if (cartData.gain_yoho_coin > 0) { 276 if (cartData.gain_yoho_coin > 0) {
277 result.yohoCoinNum = cartData.gain_yoho_coin; 277 result.yohoCoinNum = cartData.gain_yoho_coin;