diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js index 271aa21..992772e 100644 --- a/components/diy_seckill/diy_seckill.js +++ b/components/diy_seckill/diy_seckill.js @@ -217,7 +217,28 @@ Component({ all_array[i].price_n = price } - all_array[i].residue=all_array[i].goods_num*1 - all_array[i].buy_num*1 + let virtual = all_array[i].virtual ? all_array[i].virtual : 0 + if (all_array[i].status) { + if (all_array[i].is_virtual_count ) { + // all_array[i].goods_num -= all_array[i].virtual + all_array[i].buy_num += virtual*1 + all_array[i].residue = all_array[i].goods_num*1 - all_array[i].buy_num*1 + }else{ + all_array[i].buy_num += virtual*1 + all_array[i].residue=all_array[i].goods_num*1 + virtual*1 - all_array[i].buy_num*1 + } + }else{ + if (all_array[i].is_virtual_count ) { + // all_array[i].goods_num -= all_array[i].virtual + all_array[i].buy_num = 0 + all_array[i].residue = all_array[i].goods_num*1 - all_array[i].buy_num*1 + }else{ + all_array[i].buy_num = 0 + all_array[i].residue=all_array[i].goods_num*1 + virtual*1 - all_array[i].buy_num*1 + } + } + + // all_array[i].residue=all_array[i].goods_num*1 - all_array[i].buy_num*1 if (all_array[i].residue && all_array[i].residue > 0 && all_array[i].status !=2) { empty.push(all_array[i]) } diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index cfbf176..5acf55d 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -114,7 +114,7 @@ - 总数量:{{prom_act.goods_num+prom_act.virtual}}件 + 总数量:{{prom_act.is_virtual_count ? prom_act.goods_num : (prom_act.goods_num+prom_act.virtual)}}件 限购:{{prom_act.buy_limit}}件 限购:不限 diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml index 4a156b0..1bc8153 100644 --- a/pages/activity/seckill_list/seckill_list.wxml +++ b/pages/activity/seckill_list/seckill_list.wxml @@ -46,9 +46,9 @@ - + - 剩余{{type==1?filters.toFix(100-(item.buy_num+item.virtual)/(item.goods_num+item.virtual)*100,0):'100'}}% + 剩余{{type==1?filters.toFix(100-(item.buy_num+item.virtual)/((item.is_virtual_count ? item.goods_num : item.goods_num+item.virtual))*100,0):'100'}}% diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index e1337e7..e2c11e2 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -456,7 +456,7 @@ - 总数量:{{prom_act.goods_num+prom_act.virtual}}件 + 总数量:{{prom_act.is_virtual_count ? prom_act.goods_num : (prom_act.goods_num+prom_act.virtual)}}件 限购:{{prom_act.buy_limit}}件 限购:不限 @@ -1295,7 +1295,7 @@ 已售:{{prom_act.buy_num+prom_act.virtual}} 已售:{{prom_act.buy_num}} - 可售:{{prom_act.goods_num-prom_act.buy_num}} + 可售:{{(prom_act.is_virtual_count && prom_act.virtual) ? (prom_act.goods_num - prom_act.buy_num - prom_act.virtual) : (prom_act.goods_num-prom_act.buy_num)}}