diff --git a/components/diy_groupbuy/diy_groupbuy.js b/components/diy_groupbuy/diy_groupbuy.js index 71cef18..c73b494 100644 --- a/components/diy_groupbuy/diy_groupbuy.js +++ b/components/diy_groupbuy/diy_groupbuy.js @@ -71,10 +71,10 @@ Component({ var user_id=getApp().globalData.user_id; if(!user_id){ user_id=0;} - //--调用接口,读取秒杀-- + //--调用接口,读取团购-- app.request.promiseGet("/api/weshop/goods/groupBuy/getGoodsList?store_id=" + os.stoid + "&aidlist=" + goodsidlist+"&user_id="+user_id, {}).then(res => { - console.log(res); + console.log(res,100); //如果秒杀的数组为空的时候 var goodslist = res.data.data; //就算是添加的活动已经过期,就要用最新的进行中活动 @@ -207,7 +207,7 @@ Component({ this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; }, - //跳转到秒杀列表 + //跳转到团购列表 go_to_group: function () { var url="/packageC/pages/group_list/group_list"; diff --git a/components/diy_groupbuy/diy_groupbuy.wxml b/components/diy_groupbuy/diy_groupbuy.wxml index 249862c..d46750c 100644 --- a/components/diy_groupbuy/diy_groupbuy.wxml +++ b/components/diy_groupbuy/diy_groupbuy.wxml @@ -1,3 +1,4 @@ + @@ -20,13 +21,11 @@ class="s1_gk_a1"> - - {{aitem.djs.day}}天 {{aitem.djs.hou}}时 @@ -42,11 +41,14 @@ ¥{{aitem.price}} ¥{{aitem.market_price}} - - 已抢0件 - 0% + + 已买:{{aitem.buy_num + aitem.virtual_num}}件 + - + @@ -60,8 +62,6 @@ - - 距结束时间 @@ -75,7 +75,6 @@ - @@ -85,15 +84,14 @@ {{aitem.title}} - - + + 已买:{{aitem.buy_num + aitem.virtual_num}}件 + ¥{{aitem.price}} ¥{{aitem.market_price}} - - diff --git a/components/diy_groupbuy/diy_groupbuy.wxss b/components/diy_groupbuy/diy_groupbuy.wxss index ec03a93..97b9c68 100644 --- a/components/diy_groupbuy/diy_groupbuy.wxss +++ b/components/diy_groupbuy/diy_groupbuy.wxss @@ -83,7 +83,45 @@ swiper { color: #fff; text-align: center; } +/* .ellipsis-1 { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} */ +.progress_box{ + position: relative; +} +.progress::after{ + content: attr(data-content); + position: absolute; + right: 20px; + font-size: 24rpx; + color: #fff; +} +.on_sale{ + position: absolute; + font-size: 24rpx; + left: 40%; + top: 2rpx; + color: #fff; +} +.progress_list::after{ + content: attr(data-content); + position: absolute; + right: 6rpx; + font-size: 22rpx; + color: #fff; +} +.on_sale_list{ + position: absolute; + font-size: 22rpx; + left: 30%; + top: 4rpx; + color: #fff; +} +/* .on_sale : hover{ +} */ .po { position: absolute; } diff --git a/packageC/pages/group_list/group_list.wxml b/packageC/pages/group_list/group_list.wxml index bd5e499..f64f2b4 100644 --- a/packageC/pages/group_list/group_list.wxml +++ b/packageC/pages/group_list/group_list.wxml @@ -16,7 +16,7 @@ - 已售{{item.buy_num}}件 + 已售{{item.buy_num+item.virtual_num}}件 {{goodlist[index].djs.day}}天{{goodlist[index].djs.hou}}时{{goodlist[index].djs.min}}分{{goodlist[index].djs.sec}}秒 去团购 diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 7df57f7..09c23f6 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -1182,7 +1182,8 @@ {{sele_g[card_field]}} {{sele_g.shop_price}} - {{prom_price}} + {{prom_price}} + 券后¥ @@ -1213,6 +1214,15 @@ 可售:{{prom_act.goods_num-prom_act.buy_num}} + + + + 已售:{{prom_act.buy_num+prom_act.virtualNum}} + + 已售:{{prom_act.buy_num}} + 可售:{{prom_act.goods_num-prom_act.buy_num}} + +