From c2f9aaf00edf2bdb3252c85db75778e6b901b0d2 Mon Sep 17 00:00:00 2001
From: abson <antploy.ni@meidd.com>
Date: Tue, 28 Dec 2021 19:53:59 +0800
Subject: [PATCH] 优化空白行

---
 packageB/pages/zuhegou/index/index.js | 7 ++-----
 pages/cart/cart/zh_calculate.js       | 5 +----
 pages/cart/cart2/zh_calculate.js      | 7 ++-----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js
index 181e4db..e6c47c3 100644
--- a/packageB/pages/zuhegou/index/index.js
+++ b/packageB/pages/zuhegou/index/index.js
@@ -1971,7 +1971,6 @@ Page({
                 if(this.data.act.is_bzyh && zhqty_bz.length > 0 ){
                     if(zhqty_bz.length>1){
                         zhqty_len=1;
-                        aprice += be * aprice;
                         let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']}));
                         let new_arr=zhqty_bz.filter(ii=>{
                             return ii['num']==min_bz_num
@@ -1997,10 +1996,9 @@ Page({
                                  no_in_arr.splice(index,1)
                              }
                         }
+                        aprice += be * aprice;
                        }else{
-                        for(let i=0;i<zhqty_bz.length;i++){
-                            // var zhqty_flag=true;
-                            var vv=zhqty_bz[i];
+                            var vv=zhqty_bz[0];
                             var bz_num=be*vv.zhqty; //超量倍增
                             var num=vv['num']-vv.zhqty; //购买数量减去超量
                             bz_num_ok=bz_num-num;
@@ -2018,7 +2016,6 @@ Page({
                                  })
                                  no_in_arr.splice(index,1)
                              }
-                        }
                        }
                 }
                 if(!zhqty_len){
diff --git a/pages/cart/cart/zh_calculate.js b/pages/cart/cart/zh_calculate.js
index be68219..01385bb 100644
--- a/pages/cart/cart/zh_calculate.js
+++ b/pages/cart/cart/zh_calculate.js
@@ -238,7 +238,6 @@ module.exports = {
 					if (act.is_bzyh && zhqty_bz.length > 0) {
 						if(zhqty_bz.length>1){
 							zhqty_len=1;
-							aprice += be * aprice;
 							let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']}));
 							let new_arr=zhqty_bz.filter(ii=>{
 									return ii['num']==min_bz_num
@@ -264,9 +263,8 @@ module.exports = {
 											 no_in_arr.splice(index,1)
 									 }
 							}
+							aprice += be * aprice;
 						 }else{
-							// for(let i=0;i<zhqty_bz.length;i++){
-									// var zhqty_flag=true;
 									var vv=zhqty_bz[0];
 									var bz_num=be*vv.zhqty; //超量倍增
 									var num=vv['num']-vv.zhqty; //购买数量减去超量
@@ -285,7 +283,6 @@ module.exports = {
 											 })
 											 no_in_arr.splice(index,1)
 									 }
-							// }
 						 }
 					}
 					if (!zhqty_len) {
diff --git a/pages/cart/cart2/zh_calculate.js b/pages/cart/cart2/zh_calculate.js
index 3fbf171..241c467 100644
--- a/pages/cart/cart2/zh_calculate.js
+++ b/pages/cart/cart2/zh_calculate.js
@@ -150,7 +150,6 @@ module.exports = {
 					if (act.is_bzyh && zhqty_bz.length > 0) {
 						if(zhqty_bz.length>1){
                             zhqty_len=1;
-                            aprice += be * aprice;
                             let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']}));
                             let new_arr=zhqty_bz.filter(ii=>{
                                 return ii['num']==min_bz_num
@@ -176,10 +175,9 @@ module.exports = {
                                      no_in_arr.splice(index,1)
                                  }
                             }
+                            aprice += be * aprice;
                            }else{
-                            for(let i=0;i<zhqty_bz.length;i++){
-                                // var zhqty_flag=true;
-                                var vv=zhqty_bz[i];
+                                var vv=zhqty_bz[0];
                                 var bz_num=be*vv.zhqty; //超量倍增
                                 var num=vv['num']-vv.zhqty; //购买数量减去超量
                                 bz_num_ok=bz_num-num;
@@ -197,7 +195,6 @@ module.exports = {
                                      })
                                      no_in_arr.splice(index,1)
                                  }
-                            }
                            }
 					}
 					if (!zhqty_len) {
--
libgit2 0.21.4