Commit c2f9aaf00edf2bdb3252c85db75778e6b901b0d2
1 parent
8e201614
优化空白行
Showing
3 changed files
with
5 additions
and
14 deletions
packageB/pages/zuhegou/index/index.js
| @@ -1971,7 +1971,6 @@ Page({ | @@ -1971,7 +1971,6 @@ Page({ | ||
| 1971 | if(this.data.act.is_bzyh && zhqty_bz.length > 0 ){ | 1971 | if(this.data.act.is_bzyh && zhqty_bz.length > 0 ){ |
| 1972 | if(zhqty_bz.length>1){ | 1972 | if(zhqty_bz.length>1){ |
| 1973 | zhqty_len=1; | 1973 | zhqty_len=1; |
| 1974 | - aprice += be * aprice; | ||
| 1975 | let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']})); | 1974 | let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']})); |
| 1976 | let new_arr=zhqty_bz.filter(ii=>{ | 1975 | let new_arr=zhqty_bz.filter(ii=>{ |
| 1977 | return ii['num']==min_bz_num | 1976 | return ii['num']==min_bz_num |
| @@ -1997,10 +1996,9 @@ Page({ | @@ -1997,10 +1996,9 @@ Page({ | ||
| 1997 | no_in_arr.splice(index,1) | 1996 | no_in_arr.splice(index,1) |
| 1998 | } | 1997 | } |
| 1999 | } | 1998 | } |
| 1999 | + aprice += be * aprice; | ||
| 2000 | }else{ | 2000 | }else{ |
| 2001 | - for(let i=0;i<zhqty_bz.length;i++){ | ||
| 2002 | - // var zhqty_flag=true; | ||
| 2003 | - var vv=zhqty_bz[i]; | 2001 | + var vv=zhqty_bz[0]; |
| 2004 | var bz_num=be*vv.zhqty; //超量倍增 | 2002 | var bz_num=be*vv.zhqty; //超量倍增 |
| 2005 | var num=vv['num']-vv.zhqty; //购买数量减去超量 | 2003 | var num=vv['num']-vv.zhqty; //购买数量减去超量 |
| 2006 | bz_num_ok=bz_num-num; | 2004 | bz_num_ok=bz_num-num; |
| @@ -2018,7 +2016,6 @@ Page({ | @@ -2018,7 +2016,6 @@ Page({ | ||
| 2018 | }) | 2016 | }) |
| 2019 | no_in_arr.splice(index,1) | 2017 | no_in_arr.splice(index,1) |
| 2020 | } | 2018 | } |
| 2021 | - } | ||
| 2022 | } | 2019 | } |
| 2023 | } | 2020 | } |
| 2024 | if(!zhqty_len){ | 2021 | if(!zhqty_len){ |
pages/cart/cart/zh_calculate.js
| @@ -238,7 +238,6 @@ module.exports = { | @@ -238,7 +238,6 @@ module.exports = { | ||
| 238 | if (act.is_bzyh && zhqty_bz.length > 0) { | 238 | if (act.is_bzyh && zhqty_bz.length > 0) { |
| 239 | if(zhqty_bz.length>1){ | 239 | if(zhqty_bz.length>1){ |
| 240 | zhqty_len=1; | 240 | zhqty_len=1; |
| 241 | - aprice += be * aprice; | ||
| 242 | let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']})); | 241 | let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']})); |
| 243 | let new_arr=zhqty_bz.filter(ii=>{ | 242 | let new_arr=zhqty_bz.filter(ii=>{ |
| 244 | return ii['num']==min_bz_num | 243 | return ii['num']==min_bz_num |
| @@ -264,9 +263,8 @@ module.exports = { | @@ -264,9 +263,8 @@ module.exports = { | ||
| 264 | no_in_arr.splice(index,1) | 263 | no_in_arr.splice(index,1) |
| 265 | } | 264 | } |
| 266 | } | 265 | } |
| 266 | + aprice += be * aprice; | ||
| 267 | }else{ | 267 | }else{ |
| 268 | - // for(let i=0;i<zhqty_bz.length;i++){ | ||
| 269 | - // var zhqty_flag=true; | ||
| 270 | var vv=zhqty_bz[0]; | 268 | var vv=zhqty_bz[0]; |
| 271 | var bz_num=be*vv.zhqty; //超量倍增 | 269 | var bz_num=be*vv.zhqty; //超量倍增 |
| 272 | var num=vv['num']-vv.zhqty; //购买数量减去超量 | 270 | var num=vv['num']-vv.zhqty; //购买数量减去超量 |
| @@ -285,7 +283,6 @@ module.exports = { | @@ -285,7 +283,6 @@ module.exports = { | ||
| 285 | }) | 283 | }) |
| 286 | no_in_arr.splice(index,1) | 284 | no_in_arr.splice(index,1) |
| 287 | } | 285 | } |
| 288 | - // } | ||
| 289 | } | 286 | } |
| 290 | } | 287 | } |
| 291 | if (!zhqty_len) { | 288 | if (!zhqty_len) { |
pages/cart/cart2/zh_calculate.js
| @@ -150,7 +150,6 @@ module.exports = { | @@ -150,7 +150,6 @@ module.exports = { | ||
| 150 | if (act.is_bzyh && zhqty_bz.length > 0) { | 150 | if (act.is_bzyh && zhqty_bz.length > 0) { |
| 151 | if(zhqty_bz.length>1){ | 151 | if(zhqty_bz.length>1){ |
| 152 | zhqty_len=1; | 152 | zhqty_len=1; |
| 153 | - aprice += be * aprice; | ||
| 154 | let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']})); | 153 | let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']})); |
| 155 | let new_arr=zhqty_bz.filter(ii=>{ | 154 | let new_arr=zhqty_bz.filter(ii=>{ |
| 156 | return ii['num']==min_bz_num | 155 | return ii['num']==min_bz_num |
| @@ -176,10 +175,9 @@ module.exports = { | @@ -176,10 +175,9 @@ module.exports = { | ||
| 176 | no_in_arr.splice(index,1) | 175 | no_in_arr.splice(index,1) |
| 177 | } | 176 | } |
| 178 | } | 177 | } |
| 178 | + aprice += be * aprice; | ||
| 179 | }else{ | 179 | }else{ |
| 180 | - for(let i=0;i<zhqty_bz.length;i++){ | ||
| 181 | - // var zhqty_flag=true; | ||
| 182 | - var vv=zhqty_bz[i]; | 180 | + var vv=zhqty_bz[0]; |
| 183 | var bz_num=be*vv.zhqty; //超量倍增 | 181 | var bz_num=be*vv.zhqty; //超量倍增 |
| 184 | var num=vv['num']-vv.zhqty; //购买数量减去超量 | 182 | var num=vv['num']-vv.zhqty; //购买数量减去超量 |
| 185 | bz_num_ok=bz_num-num; | 183 | bz_num_ok=bz_num-num; |
| @@ -197,7 +195,6 @@ module.exports = { | @@ -197,7 +195,6 @@ module.exports = { | ||
| 197 | }) | 195 | }) |
| 198 | no_in_arr.splice(index,1) | 196 | no_in_arr.splice(index,1) |
| 199 | } | 197 | } |
| 200 | - } | ||
| 201 | } | 198 | } |
| 202 | } | 199 | } |
| 203 | if (!zhqty_len) { | 200 | if (!zhqty_len) { |