Commit c8ab5549f565e1d3c9024b6cef648dfbddd5fbc6
1 parent
31b86af8
积分购bug优化
Showing
1 changed file
with
12 additions
and
10 deletions
packageE/pages/cart/cart2_inte/cart2_inte.js
... | ... | @@ -1032,17 +1032,8 @@ Page({ |
1032 | 1032 | |
1033 | 1033 | |
1034 | 1034 | |
1035 | - var yc_order_m=order_m; | |
1035 | + var yc_order_m=order_m; | |
1036 | 1036 | |
1037 | - //--看一下有没有订单优惠--0 | |
1038 | - total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); | |
1039 | - order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); | |
1040 | - var atxt = "formData.total_amount"; | |
1041 | - th.setData({ [atxt]: total_m, }) | |
1042 | - | |
1043 | - var txt = "formData.user_money"; | |
1044 | - var txt2 = "formData.order_amount"; | |
1045 | - var txt4 = "formData.integral"; | |
1046 | 1037 | |
1047 | 1038 | if (th.data.bn_goods.keyid) { |
1048 | 1039 | let cart_yc = await th.beforAdvancesum({ |
... | ... | @@ -1140,6 +1131,17 @@ Page({ |
1140 | 1131 | } |
1141 | 1132 | |
1142 | 1133 | |
1134 | + //--看一下有没有订单优惠--0 | |
1135 | + total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); | |
1136 | + order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); | |
1137 | + var atxt = "formData.total_amount"; | |
1138 | + th.setData({ [atxt]: total_m, }) | |
1139 | + | |
1140 | + var txt = "formData.user_money"; | |
1141 | + var txt2 = "formData.order_amount"; | |
1142 | + var txt4 = "formData.integral"; | |
1143 | + | |
1144 | + | |
1143 | 1145 | var txt5 = "formData.use_commission"; |
1144 | 1146 | if(th.data.bn_use_commission){ |
1145 | 1147 | order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2); | ... | ... |