Commit c014c3a8b162d5e642b7883f4013fa1861b3e846
1 parent
bb047c76
超量倍增
Showing
6 changed files
with
221 additions
and
167 deletions
packageA/pages/checkin/checkin.wxml
| @@ -91,41 +91,40 @@ | @@ -91,41 +91,40 @@ | ||
| 91 | </view> | 91 | </view> |
| 92 | 92 | ||
| 93 | <view class="jfbuy-container"> | 93 | <view class="jfbuy-container"> |
| 94 | - <view class="jfbuy flex"> | ||
| 95 | - <!-- <image class="jfbuy-img" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/liwu.png"></image> --> | ||
| 96 | - <!-- <view class="right"> | ||
| 97 | - <view> | ||
| 98 | - <view class="t1">小积分大作为</view> | ||
| 99 | - <view class="t2">积分抵用现金，积少成多</view> | ||
| 100 | - </view> | ||
| 101 | - <view class="t-c"> | ||
| 102 | - <view class="btn-buy" bindtap="goto" data-url="/packageA/pages/jfbuy/jfbuy">去购物 Go!</view> | ||
| 103 | - </view> | ||
| 104 | - </view> --> | ||
| 105 | - <block wx:if="{{ad_data}}"> | ||
| 106 | - <swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500" style="height:240rpx;width: 670rpx;"> | ||
| 107 | - <block wx:for="{{ad_data}}"> | ||
| 108 | 94 | ||
| 109 | - <navigator url="{{item.ad_weapplink}}" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}"> | ||
| 110 | - <swiper-item> | ||
| 111 | - <image src="{{item.ad_code}}" style="width: 100%;height: 240rpx;" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" /> | ||
| 112 | - </swiper-item> | ||
| 113 | - </navigator> | 95 | + <block wx:if="{{ad_data}}"> |
| 96 | + <swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500"> | ||
| 97 | + <block wx:for="{{ad_data}}"> | ||
| 98 | + <navigator url="{{item.ad_weapplink}}" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}"> | ||
| 99 | + <swiper-item> | ||
| 100 | + <image src="{{item.ad_code}}" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" /> | ||
| 101 | + </swiper-item> | ||
| 102 | + </navigator> | ||
| 114 | 103 | ||
| 115 | - <view data-url="{{item.ad_weapplink}}" wx:else bindtap="go_url"> | ||
| 116 | - <swiper-item> | ||
| 117 | - <image src="{{item.ad_code}}" style="width: 100%;height: 240rpx;" class="slide-image" mode="widthFix" lazy-load="true" /> | ||
| 118 | - </swiper-item> | ||
| 119 | - </view> | 104 | + <view data-url="{{item.ad_weapplink}}" wx:else bindtap="go_url"> |
| 105 | + <swiper-item> | ||
| 106 | + <image src="{{item.ad_code}}" class="slide-image" mode="widthFix" lazy-load="true" /> | ||
| 107 | + </swiper-item> | ||
| 108 | + </view> | ||
| 109 | + </block> | ||
| 110 | + </swiper> | ||
| 111 | + </block> | ||
| 112 | + <block wx:else> | ||
| 113 | + <view class="jfbuy flex"> | ||
| 120 | 114 | ||
| 121 | - </block> | ||
| 122 | - </swiper> | 115 | + <image class="jfbuy-img" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/liwu.png"></image> |
| 116 | + <view class="right"> | ||
| 117 | + <view> | ||
| 118 | + <view class="t1">小积分大作为</view> | ||
| 119 | + <view class="t2">积分抵用现金，积少成多</view> | ||
| 120 | + </view> | ||
| 121 | + <view class="t-c"> | ||
| 122 | + <view class="btn-buy" bindtap="goto" data-url="/packageA/pages/jfbuy/jfbuy">去购物 Go!</view> | ||
| 123 | + </view> | ||
| 124 | + </view> | ||
| 125 | + </view> | ||
| 123 | 126 | ||
| 124 | - </block> | ||
| 125 | - <block wx:else> | ||
| 126 | - <image class="xc-top-img" src="{{url}}/miniapp/images/seckill_top_img.jpg"></image> | ||
| 127 | - </block> | ||
| 128 | - </view> | 127 | + </block> |
| 129 | </view> | 128 | </view> |
| 130 | 129 | ||
| 131 | <view class="popup-container" wx:if="{{isShowRules}}"> | 130 | <view class="popup-container" wx:if="{{isShowRules}}"> |
packageB/pages/zuhegou/index/index.js
| @@ -1914,7 +1914,7 @@ Page({ | @@ -1914,7 +1914,7 @@ Page({ | ||
| 1914 | var need_to_buy = 0; | 1914 | var need_to_buy = 0; |
| 1915 | var data = this.data.list; | 1915 | var data = this.data.list; |
| 1916 | var all_zhqty = 0; //所有商品要求起购数之后 | 1916 | var all_zhqty = 0; //所有商品要求起购数之后 |
| 1917 | - var zhqty_bz=[]; //超量 | 1917 | + var zhqty_bz = []; //超量 |
| 1918 | var no_in_arr = []; | 1918 | var no_in_arr = []; |
| 1919 | for (var i in data) { | 1919 | for (var i in data) { |
| 1920 | var item = data[i]; | 1920 | var item = data[i]; |
| @@ -1965,91 +1965,107 @@ Page({ | @@ -1965,91 +1965,107 @@ Page({ | ||
| 1965 | 1965 | ||
| 1966 | //看一下剩下的数量有没有满足组合购的要求，以及要不要倍增 | 1966 | //看一下剩下的数量有没有满足组合购的要求，以及要不要倍增 |
| 1967 | if (this.data.act.is_bz && no_in_arr.length >= this.data.act.zhbuyqty) { | 1967 | if (this.data.act.is_bz && no_in_arr.length >= this.data.act.zhbuyqty) { |
| 1968 | - var bz_num_ok=0; //超量倍增是否满足 | ||
| 1969 | - var delete_num=0; | ||
| 1970 | - var zhqty_len=0; //几个超量倍增 | 1968 | + var bz_num_ok = 0; //超量倍增是否满足 |
| 1969 | + var delete_num = 0; | ||
| 1970 | + var zhqty_len = 0; //几个超量倍增 | ||
| 1971 | var be = parseInt(no_in_arr.length / this.data.act.zhbuyqty); //看一下是几倍 | 1971 | var be = parseInt(no_in_arr.length / this.data.act.zhbuyqty); //看一下是几倍 |
| 1972 | - if(this.data.act.is_bzyh && zhqty_bz.length > 0 ){ | ||
| 1973 | - if(zhqty_bz.length>1){ | ||
| 1974 | - zhqty_len=1; | ||
| 1975 | - let min_bz_num= Math.min.apply(Math, zhqty_bz.map(function(o) {return o['num']})); | ||
| 1976 | - let new_arr=zhqty_bz.filter(ii=>{ | ||
| 1977 | - return ii['num']==min_bz_num | 1972 | + if (this.data.act.is_bzyh && zhqty_bz.length > 0) { |
| 1973 | + if (zhqty_bz.length > 1) { | ||
| 1974 | + let zhqty_bz_arr = []; | ||
| 1975 | + let zhqty_bz_flag = zhqty_bz.every((item1, i) => { | ||
| 1976 | + var bz_num = be * item1['zhqty']; //超量倍增 | ||
| 1977 | + var num = item1['num'] - item1['zhqty']; //购买数量减去超量 | ||
| 1978 | + if (bz_num > num) { | ||
| 1979 | + zhqty_bz_arr.push(item1); | ||
| 1980 | + zhqty_bz.splice(i, 1) | ||
| 1981 | + } | ||
| 1982 | + return bz_num <= num; | ||
| 1978 | }) | 1983 | }) |
| 1979 | - var vv=new_arr[0]; | ||
| 1980 | - // be=new_arr[0].zhqty; | ||
| 1981 | - var bz_num=be*new_arr[0].zhqty; //超量倍增 | ||
| 1982 | - var num=min_bz_num-new_arr[0].zhqty; //购买数量减去超量 | ||
| 1983 | - // if(num > 0){ | ||
| 1984 | - bz_num_ok=bz_num-num; | ||
| 1985 | - if(bz_num_ok <= 0){ | 1984 | + if (zhqty_bz_flag) { |
| 1985 | + for (let i = 0; i < zhqty_bz.length; i++) { | ||
| 1986 | + var vv = zhqty_bz[i]; | ||
| 1987 | + for (let j = 0; j < be * vv['zhqty']; j++) { | ||
| 1988 | + let index = no_in_arr.findIndex(i => { | ||
| 1989 | + return vv.goods_id === i.goods_id | ||
| 1990 | + }) | ||
| 1991 | + if (index > -1) { | ||
| 1992 | + delete_num++ | ||
| 1993 | + no_in_arr.splice(index, 1) | ||
| 1994 | + } | ||
| 1995 | + } | ||
| 1996 | + } | ||
| 1997 | + } else { | ||
| 1998 | + let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) { | ||
| 1999 | + return o['num'] | ||
| 2000 | + })); | ||
| 2001 | + let new_arr = zhqty_bz_arr.filter(ii => { | ||
| 2002 | + return ii['num'] == min_bz_num | ||
| 2003 | + }) | ||
| 2004 | + var vv = new_arr[0]; | ||
| 2005 | + var bz_num = be * new_arr[0].zhqty; //超量倍增 | ||
| 2006 | + var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 | ||
| 2007 | + bz_num_ok = bz_num - num; | ||
| 2008 | + if (bz_num_ok <= 0) { | ||
| 1986 | //超量倍增满足,超量倍增就等于倍数 | 2009 | //超量倍增满足,超量倍增就等于倍数 |
| 1987 | - bz_num_ok=bz_num; | ||
| 1988 | - }else{ | 2010 | + bz_num_ok = bz_num; |
| 2011 | + } else { | ||
| 1989 | //超量倍增不满足,倍数要减去多出得 | 2012 | //超量倍增不满足,倍数要减去多出得 |
| 1990 | - // be=be-bz_num_ok; | ||
| 1991 | - if(num % vv.zhqty == 0){ | ||
| 1992 | - be=num/vv.zhqty; | ||
| 1993 | - // bz_num_ok=num; | ||
| 1994 | - }else{ | ||
| 1995 | - be = Math.floor(num/vv.zhqty) | ||
| 1996 | - // bz_num_ok=be * vv.zhqty ; | ||
| 1997 | - } | ||
| 1998 | - bz_num_ok=be * vv.zhqty ; | 2013 | + // be=be-bz_num_ok; |
| 2014 | + if (num % vv.zhqty == 0) { | ||
| 2015 | + be = num / vv.zhqty; | ||
| 2016 | + } else { | ||
| 2017 | + be = Math.floor(num / vv.zhqty) | ||
| 2018 | + } | ||
| 2019 | + bz_num_ok = be * vv.zhqty; | ||
| 1999 | } | 2020 | } |
| 2000 | - for(let i=0;i<zhqty_bz.length;i++){ | ||
| 2001 | - var vv=zhqty_bz[i]; | ||
| 2002 | - for(let j=0;j<bz_num_ok;j++){ | ||
| 2003 | - let index= no_in_arr.findIndex(i=>{ | ||
| 2004 | - return vv.goods_id===i.goods_id | ||
| 2005 | - }) | ||
| 2006 | - if(index > -1){ | ||
| 2007 | - delete_num++ | ||
| 2008 | - no_in_arr.splice(index,1) | ||
| 2009 | - } | ||
| 2010 | - } | 2021 | + |
| 2022 | + for (let j = 0; j < bz_num_ok; j++) { | ||
| 2023 | + let index = no_in_arr.findIndex(i => { | ||
| 2024 | + return vv.goods_id === i.goods_id | ||
| 2025 | + }) | ||
| 2026 | + if (index > -1) { | ||
| 2027 | + delete_num++ | ||
| 2028 | + no_in_arr.splice(index, 1) | ||
| 2029 | + } | ||
| 2011 | } | 2030 | } |
| 2012 | - // } | ||
| 2013 | - aprice += be * aprice; | ||
| 2014 | - }else{ | ||
| 2015 | - var vv=zhqty_bz[0]; | ||
| 2016 | - var bz_num=be*vv.zhqty; //超量倍增 | ||
| 2017 | - var num=vv['num']-vv.zhqty; //购买数量减去超量 | ||
| 2018 | - if(num > 0){ | ||
| 2019 | - bz_num_ok=bz_num-num; | ||
| 2020 | - if(bz_num_ok <= 0){ | ||
| 2021 | - //超量倍增满足,超量倍增就等于倍数 | ||
| 2022 | - bz_num_ok=bz_num; | ||
| 2023 | - }else{ | ||
| 2024 | - //超量倍增不满足,倍数要减去多出得 | ||
| 2025 | - // be=be-bz_num_ok; | ||
| 2026 | - if(num % vv.zhqty == 0){ | ||
| 2027 | - be=num/vv.zhqty; | ||
| 2028 | - // bz_num_ok=num; | ||
| 2029 | - }else{ | ||
| 2030 | - be = Math.floor(num/vv.zhqty) | ||
| 2031 | - // bz_num_ok=be * vv.zhqty; | ||
| 2032 | - } | ||
| 2033 | - bz_num_ok=be * vv.zhqty; | 2031 | + } |
| 2032 | + } else { | ||
| 2033 | + var vv = zhqty_bz[0]; | ||
| 2034 | + var bz_num = be * vv.zhqty; //超量倍增 | ||
| 2035 | + var num = vv['num'] - vv.zhqty; //购买数量减去超量 | ||
| 2036 | + if (num > 0) { | ||
| 2037 | + bz_num_ok = bz_num - num; | ||
| 2038 | + if (bz_num_ok <= 0) { | ||
| 2039 | + //超量倍增满足,超量倍增就等于倍数 | ||
| 2040 | + bz_num_ok = bz_num; | ||
| 2041 | + } else { | ||
| 2042 | + //超量倍增不满足,倍数要减去多出得 | ||
| 2043 | + // be=be-bz_num_ok; | ||
| 2044 | + if (num % vv.zhqty == 0) { | ||
| 2045 | + be = num / vv.zhqty; | ||
| 2046 | + } else { | ||
| 2047 | + be = Math.floor(num / vv.zhqty) | ||
| 2034 | } | 2048 | } |
| 2035 | - for(let j=0;j<bz_num_ok;j++){ | ||
| 2036 | - let index= no_in_arr.findIndex(i=>{ | ||
| 2037 | - return vv.goods_id===i.goods_id | ||
| 2038 | - }) | ||
| 2039 | - if(index > -1){ | ||
| 2040 | - delete_num++ | ||
| 2041 | - no_in_arr.splice(index,1) | ||
| 2042 | - } | 2049 | + bz_num_ok = be * vv.zhqty; |
| 2050 | + } | ||
| 2051 | + for (let j = 0; j < bz_num_ok; j++) { | ||
| 2052 | + let index = no_in_arr.findIndex(i => { | ||
| 2053 | + return vv.goods_id === i.goods_id | ||
| 2054 | + }) | ||
| 2055 | + if (index > -1) { | ||
| 2056 | + delete_num++ | ||
| 2057 | + no_in_arr.splice(index, 1) | ||
| 2043 | } | 2058 | } |
| 2044 | - }else{ | ||
| 2045 | - zhqty_len=1; | ||
| 2046 | } | 2059 | } |
| 2047 | - } | 2060 | + } else { |
| 2061 | + zhqty_len = 1; | ||
| 2062 | + } | ||
| 2063 | + } | ||
| 2048 | } | 2064 | } |
| 2049 | - if(!zhqty_len){ | 2065 | + if (!zhqty_len) { |
| 2050 | //多个超量就不用pop了 | 2066 | //多个超量就不用pop了 |
| 2051 | aprice += be * aprice; | 2067 | aprice += be * aprice; |
| 2052 | - let pop_num=be * this.data.act.zhbuyqty - delete_num; | 2068 | + let pop_num = be * this.data.act.zhbuyqty - delete_num; |
| 2053 | for (var m = 0; m < pop_num; m++) { | 2069 | for (var m = 0; m < pop_num; m++) { |
| 2054 | no_in_arr.pop(); | 2070 | no_in_arr.pop(); |
| 2055 | } | 2071 | } |
pages/cart/cart/zh_calculate.js
| @@ -238,36 +238,54 @@ module.exports = { | @@ -238,36 +238,54 @@ module.exports = { | ||
| 238 | var be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍 | 238 | var be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍 |
| 239 | if (act.is_bzyh && zhqty_bz.length > 0) { | 239 | if (act.is_bzyh && zhqty_bz.length > 0) { |
| 240 | if (zhqty_bz.length > 1) { | 240 | if (zhqty_bz.length > 1) { |
| 241 | - zhqty_len = 1; | ||
| 242 | - let min_bz_num = Math.min.apply(Math, zhqty_bz.map(function (o) { | ||
| 243 | - return o['num'] | ||
| 244 | - })); | ||
| 245 | - let new_arr = zhqty_bz.filter(ii => { | ||
| 246 | - return ii['num'] == min_bz_num | 241 | + let zhqty_bz_arr = []; |
| 242 | + let zhqty_bz_flag = zhqty_bz.every((item1, i) => { | ||
| 243 | + var bz_num = be * item1['zhqty']; //超量倍增 | ||
| 244 | + var num = item1['num'] - item1['zhqty']; //购买数量减去超量 | ||
| 245 | + if (bz_num > num) { | ||
| 246 | + zhqty_bz_arr.push(item1); | ||
| 247 | + zhqty_bz.splice(i, 1) | ||
| 248 | + } | ||
| 249 | + return bz_num <= num; | ||
| 247 | }) | 250 | }) |
| 248 | - var vv = new_arr[0]; | ||
| 249 | - // be=new_arr[0].zhqty; | ||
| 250 | - var bz_num = be * new_arr[0].zhqty; //超量倍增 | ||
| 251 | - var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 | ||
| 252 | - // if(num > 0){ | ||
| 253 | - bz_num_ok = bz_num - num; | ||
| 254 | - if (bz_num_ok <= 0) { | ||
| 255 | - //超量倍增满足,超量倍增就等于倍数 | ||
| 256 | - bz_num_ok = bz_num; | 251 | + if (zhqty_bz_flag) { |
| 252 | + for (let i = 0; i < zhqty_bz.length; i++) { | ||
| 253 | + var vv = zhqty_bz[i]; | ||
| 254 | + for (let j = 0; j < be * vv['zhqty']; j++) { | ||
| 255 | + let index = no_in_arr.findIndex(i => { | ||
| 256 | + return vv.goods_id === i.goods_id | ||
| 257 | + }) | ||
| 258 | + if (index > -1) { | ||
| 259 | + delete_num++ | ||
| 260 | + no_in_arr.splice(index, 1) | ||
| 261 | + } | ||
| 262 | + } | ||
| 263 | + } | ||
| 257 | } else { | 264 | } else { |
| 258 | - //超量倍增不满足,倍数要减去多出得 | ||
| 259 | - // be=be-bz_num_ok; | ||
| 260 | - if (num % vv.zhqty == 0) { | ||
| 261 | - be = num / vv.zhqty; | ||
| 262 | - // bz_num_ok = num; | 265 | + let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) { |
| 266 | + return o['num'] | ||
| 267 | + })); | ||
| 268 | + let new_arr = zhqty_bz_arr.filter(ii => { | ||
| 269 | + return ii['num'] == min_bz_num | ||
| 270 | + }) | ||
| 271 | + var vv = new_arr[0]; | ||
| 272 | + var bz_num = be * new_arr[0].zhqty; //超量倍增 | ||
| 273 | + var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 | ||
| 274 | + bz_num_ok = bz_num - num; | ||
| 275 | + if (bz_num_ok <= 0) { | ||
| 276 | + //超量倍增满足,超量倍增就等于倍数 | ||
| 277 | + bz_num_ok = bz_num; | ||
| 263 | } else { | 278 | } else { |
| 264 | - be = Math.floor(num / vv.zhqty) | ||
| 265 | - // bz_num_ok = num - (be * vv.zhqty); | 279 | + //超量倍增不满足,倍数要减去多出得 |
| 280 | + // be=be-bz_num_ok; | ||
| 281 | + if (num % vv.zhqty == 0) { | ||
| 282 | + be = num / vv.zhqty; | ||
| 283 | + } else { | ||
| 284 | + be = Math.floor(num / vv.zhqty) | ||
| 285 | + } | ||
| 286 | + bz_num_ok = be * vv.zhqty; | ||
| 266 | } | 287 | } |
| 267 | - bz_num_ok = be * vv.zhqty; | ||
| 268 | - } | ||
| 269 | - for (let i = 0; i < zhqty_bz.length; i++) { | ||
| 270 | - var vv = zhqty_bz[i]; | 288 | + |
| 271 | for (let j = 0; j < bz_num_ok; j++) { | 289 | for (let j = 0; j < bz_num_ok; j++) { |
| 272 | let index = no_in_arr.findIndex(i => { | 290 | let index = no_in_arr.findIndex(i => { |
| 273 | return vv.goods_id === i.goods_id | 291 | return vv.goods_id === i.goods_id |
| @@ -278,9 +296,7 @@ module.exports = { | @@ -278,9 +296,7 @@ module.exports = { | ||
| 278 | } | 296 | } |
| 279 | } | 297 | } |
| 280 | } | 298 | } |
| 281 | - // } | ||
| 282 | - aprice += be * aprice; | ||
| 283 | - } else { | 299 | + } else { |
| 284 | var vv = zhqty_bz[0]; | 300 | var vv = zhqty_bz[0]; |
| 285 | var bz_num = be * vv.zhqty; //超量倍增 | 301 | var bz_num = be * vv.zhqty; //超量倍增 |
| 286 | var num = vv['num'] - vv.zhqty; //购买数量减去超量 | 302 | var num = vv['num'] - vv.zhqty; //购买数量减去超量 |
pages/cart/cart2/zh_calculate.js
| @@ -151,50 +151,65 @@ module.exports = { | @@ -151,50 +151,65 @@ module.exports = { | ||
| 151 | let be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍 | 151 | let be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍 |
| 152 | if (act.is_bzyh && zhqty_bz.length > 0) { | 152 | if (act.is_bzyh && zhqty_bz.length > 0) { |
| 153 | if (zhqty_bz.length > 1) { | 153 | if (zhqty_bz.length > 1) { |
| 154 | - zhqty_len = 1; | ||
| 155 | - let min_bz_num = Math.min.apply(Math, zhqty_bz.map(function (o) { | ||
| 156 | - return o['num'] | ||
| 157 | - })); | ||
| 158 | - let new_arr = zhqty_bz.filter(ii => { | ||
| 159 | - return ii['num'] == min_bz_num | 154 | + let zhqty_bz_arr = []; |
| 155 | + let zhqty_bz_flag = zhqty_bz.every((item1, i) => { | ||
| 156 | + var bz_num = be * item1['zhqty']; //超量倍增 | ||
| 157 | + var num = item1['num'] - item1['zhqty']; //购买数量减去超量 | ||
| 158 | + if (bz_num > num) { | ||
| 159 | + zhqty_bz_arr.push(item1); | ||
| 160 | + zhqty_bz.splice(i, 1) | ||
| 161 | + } | ||
| 162 | + return bz_num <= num; | ||
| 160 | }) | 163 | }) |
| 161 | - var vv = new_arr[0]; | ||
| 162 | - // be=new_arr[0].zhqty; | ||
| 163 | - var bz_num = be * new_arr[0].zhqty; //超量倍增 | ||
| 164 | - var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 | ||
| 165 | - // if(num > 0){ | ||
| 166 | - bz_num_ok = bz_num - num; | ||
| 167 | - if (bz_num_ok <= 0) { | ||
| 168 | - //超量倍增满足,超量倍增就等于倍数 | ||
| 169 | - bz_num_ok = bz_num; | 164 | + if (zhqty_bz_flag) { |
| 165 | + for (let i = 0; i < zhqty_bz.length; i++) { | ||
| 166 | + var vv = zhqty_bz[i]; | ||
| 167 | + for (let j = 0; j < be * vv['zhqty']; j++) { | ||
| 168 | + let index = no_in_arr.findIndex(i => { | ||
| 169 | + return vv.goods_id === i.goods_id | ||
| 170 | + }) | ||
| 171 | + if (index > -1) { | ||
| 172 | + delete_num++ | ||
| 173 | + no_in_arr.splice(index, 1) | ||
| 174 | + } | ||
| 175 | + } | ||
| 176 | + } | ||
| 170 | } else { | 177 | } else { |
| 171 | - //超量倍增不满足,倍数要减去多出得 | ||
| 172 | - // be=be-bz_num_ok; | ||
| 173 | - if (num % vv.zhqty == 0) { | ||
| 174 | - be = num / vv.zhqty; | ||
| 175 | - // bz_num_ok = num; | 178 | + let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) { |
| 179 | + return o['num'] | ||
| 180 | + })); | ||
| 181 | + let new_arr = zhqty_bz_arr.filter(ii => { | ||
| 182 | + return ii['num'] == min_bz_num | ||
| 183 | + }) | ||
| 184 | + var vv = new_arr[0]; | ||
| 185 | + var bz_num = be * new_arr[0].zhqty; //超量倍增 | ||
| 186 | + var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 | ||
| 187 | + bz_num_ok = bz_num - num; | ||
| 188 | + if (bz_num_ok <= 0) { | ||
| 189 | + //超量倍增满足,超量倍增就等于倍数 | ||
| 190 | + bz_num_ok = bz_num; | ||
| 176 | } else { | 191 | } else { |
| 177 | - be = Math.floor(num / vv.zhqty) | ||
| 178 | - // bz_num_ok = num - (be * vv.zhqty); | 192 | + //超量倍增不满足,倍数要减去多出得 |
| 193 | + // be=be-bz_num_ok; | ||
| 194 | + if (num % vv.zhqty == 0) { | ||
| 195 | + be = num / vv.zhqty; | ||
| 196 | + } else { | ||
| 197 | + be = Math.floor(num / vv.zhqty) | ||
| 198 | + } | ||
| 199 | + bz_num_ok = be * vv.zhqty; | ||
| 179 | } | 200 | } |
| 180 | - bz_num_ok = be * vv.zhqty; | ||
| 181 | - } | ||
| 182 | - for (let i = 0; i < zhqty_bz.length; i++) { | ||
| 183 | - var vv = zhqty_bz[i]; | 201 | + |
| 184 | for (let j = 0; j < bz_num_ok; j++) { | 202 | for (let j = 0; j < bz_num_ok; j++) { |
| 185 | let index = no_in_arr.findIndex(i => { | 203 | let index = no_in_arr.findIndex(i => { |
| 186 | return vv.goods_id === i.goods_id | 204 | return vv.goods_id === i.goods_id |
| 187 | }) | 205 | }) |
| 188 | - if(index > -1){ | 206 | + if (index > -1) { |
| 189 | delete_num++ | 207 | delete_num++ |
| 190 | no_in_arr.splice(index, 1) | 208 | no_in_arr.splice(index, 1) |
| 191 | } | 209 | } |
| 192 | - | ||
| 193 | } | 210 | } |
| 194 | } | 211 | } |
| 195 | - // } | ||
| 196 | - aprice += be * aprice; | ||
| 197 | - } else { | 212 | + } else { |
| 198 | var vv = zhqty_bz[0]; | 213 | var vv = zhqty_bz[0]; |
| 199 | var bz_num = be * vv.zhqty; //超量倍增 | 214 | var bz_num = be * vv.zhqty; //超量倍增 |
| 200 | var num = vv['num'] - vv.zhqty; //购买数量减去超量 | 215 | var num = vv['num'] - vv.zhqty; //购买数量减去超量 |
pages/goods/goodsInfo/goodsInfo.js
| @@ -706,6 +706,7 @@ Page({ | @@ -706,6 +706,7 @@ Page({ | ||
| 706 | //---展示--- | 706 | //---展示--- |
| 707 | onShow: function () { | 707 | onShow: function () { |
| 708 | var goods_list = null, th = this, that = this; | 708 | var goods_list = null, th = this, that = this; |
| 709 | + this.data.is_go_to_team_show=0; | ||
| 709 | var show_prew_img = this.data.show_prew_img | 710 | var show_prew_img = this.data.show_prew_img |
| 710 | if (show_prew_img) { | 711 | if (show_prew_img) { |
| 711 | show_prew_img = 0; | 712 | show_prew_img = 0; |
pages/team/team_success/team_success.js
| @@ -183,6 +183,14 @@ Page({ | @@ -183,6 +183,14 @@ Page({ | ||
| 183 | await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + pt_prom_id, { | 183 | await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + pt_prom_id, { |
| 184 | data: { } | 184 | data: { } |
| 185 | }).then(res => { | 185 | }).then(res => { |
| 186 | + if(res.data.code==0){ | ||
| 187 | + teamlist=res.data.data; | ||
| 188 | + this.setData({ | ||
| 189 | + teamlist:teamlist | ||
| 190 | + }); | ||
| 191 | + var nt =ut.gettimestamp(); | ||
| 192 | + teamlist.status=0; | ||
| 193 | + | ||
| 186 | if (nt >= teamlist.start_time) teamlist.status = 1; | 194 | if (nt >= teamlist.start_time) teamlist.status = 1; |
| 187 | goods_id = res.data.data.goods_id; | 195 | goods_id = res.data.data.goods_id; |
| 188 | id = res.data.data.id; | 196 | id = res.data.data.id; |
| @@ -200,10 +208,9 @@ Page({ | @@ -200,10 +208,9 @@ Page({ | ||
| 200 | }) | 208 | }) |
| 201 | max_num=max; | 209 | max_num=max; |
| 202 | min_price=pri; | 210 | min_price=pri; |
| 203 | - | ||
| 204 | } | 211 | } |
| 205 | 212 | ||
| 206 | - | 213 | + } |
| 207 | //获取商品信息 | 214 | //获取商品信息 |
| 208 | getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { | 215 | getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { |
| 209 | }).then(res => { | 216 | }).then(res => { |