Authored by lijing

使用有货币bug

@@ -48,7 +48,7 @@ const yohoCoinCompute = ($orderCompute) => { @@ -48,7 +48,7 @@ const yohoCoinCompute = ($orderCompute) => {
48 $yohoCoinData.yohoCoinMsg = '共' + $yohoCoinData.totalYohoCoinNum + 48 $yohoCoinData.yohoCoinMsg = '共' + $yohoCoinData.totalYohoCoinNum +
49 '有货币,满' + $orderCompute.yoho_coin_pay_rule.num_limit + '可用'; 49 '有货币,满' + $orderCompute.yoho_coin_pay_rule.num_limit + '可用';
50 } else if ($yohoCoinData.useYohoCoin > 0 || $yohoCoinData.yohoCoin > 0) { 50 } else if ($yohoCoinData.useYohoCoin > 0 || $yohoCoinData.yohoCoin > 0) {
51 - let yohoCoin = parseInt($yohoCoinData.useYohoCoin > 0 ? $yohoCoinData.useYohoCoin : $yohoCoinData.yohoCoin).toFixed(2); 51 + let yohoCoin = parseInt($yohoCoinData.useYohoCoin > 0 ? $yohoCoinData.useYohoCoin : $yohoCoinData.yohoCoin, 10).toFixed(2);
52 52
53 $yohoCoinData.yohoCoinMsg = '可抵¥' + yohoCoin; 53 $yohoCoinData.yohoCoinMsg = '可抵¥' + yohoCoin;
54 $yohoCoinData.yohoCoinClick = 1; 54 $yohoCoinData.yohoCoinClick = 1;
@@ -82,12 +82,12 @@ const ticketsConfirm = (param) => { @@ -82,12 +82,12 @@ const ticketsConfirm = (param) => {
82 color: val.color_name, 82 color: val.color_name,
83 size: val.product_skn == SINGLE_TICKETS_SKN ? '' : val.size_name, 83 size: val.product_skn == SINGLE_TICKETS_SKN ? '' : val.size_name,
84 count: val.buy_number, 84 count: val.buy_number,
85 - price: parseInt(val.last_price).toFixed(2) 85 + price: parseInt(val.last_price, 10).toFixed(2)
86 }); 86 });
87 resu.goods = bulid; 87 resu.goods = bulid;
88 }); 88 });
89 resu.cartPayData = result[0].data.shopping_cart_data.promotion_formula_list; 89 resu.cartPayData = result[0].data.shopping_cart_data.promotion_formula_list;
90 - resu.price = parseInt(result[0].data.shopping_cart_data.last_order_amount).toFixed(2); 90 + resu.price = parseInt(result[0].data.shopping_cart_data.last_order_amount, 10).toFixed(2);
91 resu.yohoCoinCompute = yohoCoinCompute(result[0].data.shopping_cart_data); 91 resu.yohoCoinCompute = yohoCoinCompute(result[0].data.shopping_cart_data);
92 } 92 }
93 return resu; 93 return resu;
@@ -103,7 +103,7 @@ const submitTicket = (param) => { @@ -103,7 +103,7 @@ const submitTicket = (param) => {
103 product_sku: param.productSku, 103 product_sku: param.productSku,
104 buy_number: param.buyNumber, 104 buy_number: param.buyNumber,
105 mobile: param.mobile, 105 mobile: param.mobile,
106 - use_yoho_coin: 0, 106 + use_yoho_coin: param.useYohoCoin,
107 qhy_union: '' 107 qhy_union: ''
108 }, { 108 }, {
109 code: 200 109 code: 200
@@ -515,6 +515,11 @@ function ticketsConfirm() { @@ -515,6 +515,11 @@ function ticketsConfirm() {
515 useYohoCoin: orderInfo('yohoCoin') 515 useYohoCoin: orderInfo('yohoCoin')
516 }; 516 };
517 517
  518 + // 如果没有勾选选择有货币,不取cookie有货币值,直接置0
  519 + if (!$('.checkbox').hasClass('icon-cb-radio')) {
  520 + data.useYohoCoin = 0;
  521 + }
  522 +
518 if (!$ticketsMobile.val()) { 523 if (!$ticketsMobile.val()) {
519 tip.show('手机号必填'); 524 tip.show('手机号必填');
520 return; 525 return;