From 87373b9a49a163f9036ba815986f58aa9bf0e3ab Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 22 Apr 2024 17:21:21 +0800
Subject: [PATCH] 拼团的商品团和阶梯团使用优惠券

---
 packageE/pages/cart/cart2_pt/cart2_pt.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packageE/pages/cart/cart2_pt/cart2_pt.js b/packageE/pages/cart/cart2_pt/cart2_pt.js
index 303aae4..35e3360 100644
--- a/packageE/pages/cart/cart2_pt/cart2_pt.js
+++ b/packageE/pages/cart/cart2_pt/cart2_pt.js
@@ -813,6 +813,7 @@ Page({
     //to.getwuliuprice(async function (rs) {
     console.log('calculatePrice2222');
     //console.log(rs);
+    let all_gd_price=allpice;
 
     var o_shipping_price = 0, goods_weight = -1, goods_piece = -1;
     var out_of_weight = null; //超出多少重量
@@ -1201,9 +1202,12 @@ Page({
     var total_m = parseFloat(allpice) + parseFloat(th.data.formData.shipping_price);
     total_m = parseFloat(total_m).toFixed(2);
 
+    all_gd_price = parseFloat(all_gd_price) + parseFloat(th.data.formData.shipping_price);
+    all_gd_price = parseFloat(all_gd_price).toFixed(2);
 
     var atxt = "formData.total_amount";
-    th.setData({ [atxt]: total_m, })
+    th.setData({ [atxt]: all_gd_price,})  ;  //因为allprice有减了券的钱，不能在用allprice了
+
     var order_m = total_m;
 
 
@@ -1516,7 +1520,6 @@ Page({
     }
 
 
-
     var gg = to.get_b_now();
     var goods = {
       'goods_id': gg.goods_id,
@@ -1589,6 +1592,12 @@ Page({
       goods.is_whsle_goods = 1;
     }
 
+    //组装优惠券的钱
+    if (parseFloat(th.data.formData.coupon_price) > 0) {
+      goods.quan_num = th.data.formData.coupon_price;
+      goods.quan_no = item.coupon_no;
+    }
+
     //--导购分享过来的id--
     if (gg.guide_id) {
       goods.guide_id = gg.guide_id;
--
libgit2 0.21.4