Commit 3a62294c7c0d258880aa8e9eb349868cfd51f501
1 parent
871ffcf1
优惠券使用时候,提交订单金额不对
Showing
2 changed files
with
10 additions
and
1 deletions
packageC/pages/presell/cart/cart2.js
@@ -572,7 +572,6 @@ Page({ | @@ -572,7 +572,6 @@ Page({ | ||
572 | //---------计算立即购买---------- | 572 | //---------计算立即购买---------- |
573 | calculatePrice2: function () { | 573 | calculatePrice2: function () { |
574 | var th = this, good = this.data.bn_goods; | 574 | var th = this, good = this.data.bn_goods; |
575 | - | ||
576 | if (!good) return false; | 575 | if (!good) return false; |
577 | 576 | ||
578 | //搭配的计算要用购物的车计算方法 | 577 | //搭配的计算要用购物的车计算方法 |
@@ -842,6 +841,10 @@ Page({ | @@ -842,6 +841,10 @@ Page({ | ||
842 | } | 841 | } |
843 | }) | 842 | }) |
844 | } else { | 843 | } else { |
844 | + var order_prom_txt1 = "formData.order_prom_id"; | ||
845 | + var order_prom_txt2 = "formData.order_prom_amount"; | ||
846 | + th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0}) | ||
847 | + | ||
845 | total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); | 848 | total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); |
846 | order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); | 849 | order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); |
847 | var atxt = "formData.total_amount"; | 850 | var atxt = "formData.total_amount"; |
pages/cart/cart2/cart2.js
@@ -1935,6 +1935,12 @@ Page({ | @@ -1935,6 +1935,12 @@ Page({ | ||
1935 | } | 1935 | } |
1936 | }) | 1936 | }) |
1937 | } else { | 1937 | } else { |
1938 | + | ||
1939 | + var order_prom_txt1 = "formData.order_prom_id"; | ||
1940 | + var order_prom_txt2 = "formData.order_prom_amount"; | ||
1941 | + th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0}) | ||
1942 | + | ||
1943 | + | ||
1938 | total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); | 1944 | total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); |
1939 | order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); | 1945 | order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); |
1940 | var atxt = "formData.total_amount"; | 1946 | var atxt = "formData.total_amount"; |