Commit 87373b9a49a163f9036ba815986f58aa9bf0e3ab

Authored by yvan.ni
1 parent b67f6cf0

拼团的商品团和阶梯团使用优惠券

packageE/pages/cart/cart2_pt/cart2_pt.js
@@ -813,6 +813,7 @@ Page({ @@ -813,6 +813,7 @@ Page({
813 //to.getwuliuprice(async function (rs) { 813 //to.getwuliuprice(async function (rs) {
814 console.log('calculatePrice2222'); 814 console.log('calculatePrice2222');
815 //console.log(rs); 815 //console.log(rs);
  816 + let all_gd_price=allpice;
816 817
817 var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; 818 var o_shipping_price = 0, goods_weight = -1, goods_piece = -1;
818 var out_of_weight = null; //超出多少重量 819 var out_of_weight = null; //超出多少重量
@@ -1201,9 +1202,12 @@ Page({ @@ -1201,9 +1202,12 @@ Page({
1201 var total_m = parseFloat(allpice) + parseFloat(th.data.formData.shipping_price); 1202 var total_m = parseFloat(allpice) + parseFloat(th.data.formData.shipping_price);
1202 total_m = parseFloat(total_m).toFixed(2); 1203 total_m = parseFloat(total_m).toFixed(2);
1203 1204
  1205 + all_gd_price = parseFloat(all_gd_price) + parseFloat(th.data.formData.shipping_price);
  1206 + all_gd_price = parseFloat(all_gd_price).toFixed(2);
1204 1207
1205 var atxt = "formData.total_amount"; 1208 var atxt = "formData.total_amount";
1206 - th.setData({ [atxt]: total_m, }) 1209 + th.setData({ [atxt]: all_gd_price,}) ; //因为allprice有减了券的钱,不能在用allprice了
  1210 +
1207 var order_m = total_m; 1211 var order_m = total_m;
1208 1212
1209 1213
@@ -1516,7 +1520,6 @@ Page({ @@ -1516,7 +1520,6 @@ Page({
1516 } 1520 }
1517 1521
1518 1522
1519 -  
1520 var gg = to.get_b_now(); 1523 var gg = to.get_b_now();
1521 var goods = { 1524 var goods = {
1522 'goods_id': gg.goods_id, 1525 'goods_id': gg.goods_id,
@@ -1589,6 +1592,12 @@ Page({ @@ -1589,6 +1592,12 @@ Page({
1589 goods.is_whsle_goods = 1; 1592 goods.is_whsle_goods = 1;
1590 } 1593 }
1591 1594
  1595 + //组装优惠券的钱
  1596 + if (parseFloat(th.data.formData.coupon_price) > 0) {
  1597 + goods.quan_num = th.data.formData.coupon_price;
  1598 + goods.quan_no = item.coupon_no;
  1599 + }
  1600 +
1592 //--导购分享过来的id-- 1601 //--导购分享过来的id--
1593 if (gg.guide_id) { 1602 if (gg.guide_id) {
1594 goods.guide_id = gg.guide_id; 1603 goods.guide_id = gg.guide_id;