Merge branch 'dev' into 'test'

使用佣金的小数店的问题优化 See merge request !1102

Merge branch 'dev' into 'test'
使用佣金的小数店的问题优化 See merge request !1102
后端研发-苏明海
2 parents b64e3cbe 39424d46
Showing 8 changed files with 20 additions and 21 deletions
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart2.js
pages/cart/cart2/cart2.js
pages/cart/cart2_inte/cart2_inte.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart2_pt/cart2_pt.wxml
@@ -2192,11 +2192,10 @@ Page({
                         var txt4 = "formData.use_commission";
                         if(th.data.bn_use_commission){
-                            order_m=parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission);
+                            order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
                             th.setData({[txt4]:th.data.bn_goods.use_commission})
                         }
-
                         var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money);
                         //--------------如果使用余额---------------------
                         if (th.data.bn_use_money == 1) {
@@ -2257,7 +2256,7 @@ Page({
                     var txt4= "formData.use_commission";
                     if(th.data.bn_use_commission){
-                        order_m=parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission);
+                        order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
                         th.setData({[txt4]:th.data.bn_goods.use_commission})
                     }
@@ -2265,7 +2264,7 @@ Page({
                     var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money);
                     //--------------如果使用余额---------------------
                     if (th.data.bn_use_money == 1) {
-                        if (amoney > order_m) {
+                        if (amoney > parseFloat(order_m)) {
                             order_m = parseFloat(order_m).toFixed(2);
                             th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1 })
                         } else {
@@ -796,14 +796,14 @@ Page({
 				}
 				if(th.data.bn_use_commission){
-					order_m=parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission);
+					order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
 					th.setData({[txt4]:th.data.bn_goods.use_commission})
 				}
 				//--------------如果使用余额---------------------
 				if (th.data.bn_use_money == 1 && th.data.yuer > 0) {
-					if (parseFloat(th.data.yuer) > total_m) {
+					if (parseFloat(th.data.yuer) > parseFloat(order_m)) {
 						th.setData({
-							[txt]: total_m,
+							[txt]: order_m,
 							[txt2]: 0,
                             is_show_sub:1,sub:0
 						})
@@ -2206,7 +2206,7 @@ Page({
                 the_price-=th.data.bn_use_commission;
             }
-            th.setData({ exp_price: exp_price, order_m:the_price, show_submit: 1, })
+            th.setData({ exp_price: exp_price, order_m:the_price.toFixed(2), show_submit: 1, })
         }
     },
@@ -993,14 +993,14 @@ Page({
                         var txt4 = "formData.use_commission";
                         if(th.data.bn_use_commission){
-                            order_m=parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission);
+                            order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
                             th.setData({[txt4]:th.data.bn_goods.use_commission})
                         }
                         var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money);
                         //--------------如果使用余额---------------------
                         if (th.data.bn_use_money == 1) {
-                            if (amoney > order_m) {
+                            if (amoney > parseFloat(order_m)) {
                                 order_m = parseFloat(order_m).toFixed(2);
                                 th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
                             } else {
@@ -1119,7 +1119,7 @@ Page({
                     var txt4 = "formData.use_commission";
                     if(th.data.bn_use_commission){
-                        order_m=parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission);
+                        order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
                         th.setData({[txt4]:th.data.bn_goods.use_commission})
                     }
@@ -2772,7 +2772,7 @@ Page({
                         var txt4 = "formData.use_commission";
                         if(th.data.bn_use_commission){
-                            order_m=parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission);
+                            order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
                             th.setData({[txt4]:th.data.bn_goods.use_commission})
                         }
@@ -2781,7 +2781,7 @@ Page({
                         var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money);
                         //--------------如果使用余额---------------------
                         if (th.data.bn_use_money == 1) {
-                            if (amoney > order_m) {
+                            if (amoney > parseFloat(order_m)) {
                                 order_m = parseFloat(order_m).toFixed(2);
                                 th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,submit:0 })
                             } else {
@@ -2919,7 +2919,7 @@ Page({
                     var txt4= "formData.use_commission";
                     if(th.data.bn_use_commission){
-                        order_m=parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission);
+                        order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
                         th.setData({[txt4]:th.data.bn_goods.use_commission})
                     }
@@ -704,15 +704,15 @@ Page({
       var txt5 = "formData.use_commission";
       if(th.data.bn_use_commission){
-          order_m=parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission);
+          order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
           th.setData({[txt5]:th.data.bn_goods.use_commission})
       }
         var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money);
         //--------------如果使用余额---------------------
         if (th.data.bn_use_money == 1) {
-          if (amoney > order_m) {
-            order_m = order_m.toFixed(2);
+          if (amoney > parseFloat(order_m)) {
+            order_m = parseFloat(order_m).toFixed(2);
             th.setData({ [txt]: order_m, [txt2]: 0, [txt4]: all_integral, show_submit: 1,submit:0 })
           } else {
             order_m = parseFloat(order_m - amoney);
@@ -717,14 +717,14 @@ Page({
         if(th.data.bn_use_commission){
-            order_m=parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission);
+            order_m= (parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
             th.setData({[txt4]:th.data.bn_goods.use_commission})
         }
         //--------------如果使用余额---------------------
         if (th.data.bn_use_money == 1 && th.data.yuer > 0) {
-            if (parseFloat(th.data.yuer) > total_m) {
-                th.setData({[txt]: total_m, [txt2]: 0, submit: 0, show_btn: 1})
+            if (parseFloat(th.data.yuer) > parseFloat(order_m)) {
+                th.setData({[txt]: order_m, [txt2]: 0, submit: 0, show_btn: 1})
             } else {
                 order_m = parseFloat(order_m) - parseFloat(th.data.yuer);
                 order_m = order_m.toFixed(2);
@@ -134,7 +134,7 @@
                          <view class="set-mes" wx:if="{{bn_goods.use_commission>0 && can_commission && kt_type!=3}}">
                              <view class="use-item" bindtap='set_bn_commission' style="padding-left:0;padding-right:0;">
                                  <icon  color="{{bn_use_commission?'red':'gray'}}" size="16" type="success"></icon>
-                                 <view class="yu_er">使用余额 :￥{{bn_goods.use_commission}} </view>
+                                 <view class="yu_er">使用佣金 :￥{{bn_goods.use_commission}} </view>
                              </view>
                          </view>