diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml index 99311d7..5328d34 100644 --- a/pages/activity/seckill_list/seckill_list.wxml +++ b/pages/activity/seckill_list/seckill_list.wxml @@ -46,7 +46,7 @@ - 立即开始 + 即将开始 马上抢 已抢光 diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index 89c9478..c91436d 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -90,6 +90,10 @@ Page({ var switch_list_data = data.switch_list; var switch_list = JSON.parse(switch_list_data); var is_newsgoodstype = switch_list.is_newsgoodstype; + if (is_newsgoodstype==undefined) + { + is_newsgoodstype=0; + } that.setData({ is_used_share :is_newsgoodstype}); if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); } if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); } diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index b26cc8c..5c30a94 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -361,7 +361,12 @@ 总数量:{{prom_act.goods_num+prom_act.virtual}}件 限购:{{prom_act.buy_limit}}件 - 已购:{{prom_act.buy_num+prom_act.virtual}}件 + + 已购:0件 + + + 已购:{{prom_act.buy_num+prom_act.virtual}}件 + @@ -416,7 +421,7 @@ - 领券 + diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss index 5c568ae..70b40d8 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxss +++ b/pages/goods/goodsInfo/goodsInfo.wxss @@ -1290,12 +1290,12 @@ left:31rpx;} } .xc-coupon-fram{ position: relative; - width:180rpx; + width:200rpx; padding-top:30rpx; } .xc-coupon-fram .xc-coupon{ - width:145rpx ; + width:175rpx ; height: 40rpx; line-height: 40rpx; background-color:#d60021 ; @@ -1317,11 +1317,11 @@ left:31rpx;} left:3rpx; } .xc-coupon-fram .xc-two{ - left: 153rpx; + left: 175rpx; } .cx-obtain-coupon{ - width: 133rpx; + width: 65rpx; height: 100%; padding-left:15rpx; color: #d70025;