diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 9c00997..12d19f2 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -545,7 +545,16 @@ Page({ } }).then(res => { if (res.data.code == 0) { - prom = res.data.data + //开始时间已经开始的情况 + for(var i=0;itimes){ + prom.show_time_off=ut.formatTime(prom.start_time) + } } console.log('活动详情------------'); console.log(prom); @@ -4197,6 +4204,14 @@ Page({ if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { var inte_data = res.data.data.pageData[0]; var can_integral = (parseFloat(integrals) >= parseFloat(inte_data.integral)); + let times = new Date().getTime() + inte_data.show_time_off="" + let atimes= inte_data.start_time*1000 + + if(atimes>times){ + inte_data.show_time_off=ut.formatTime(inte_data.start_time) + } + ee.setData({ prom_price: parseFloat(inte_data.addmoney), prom_integral: parseFloat(inte_data.integral), diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 7d5b45d..439dbc5 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -282,6 +282,9 @@ 分享 + + {{prom_act.show_time_off}}开始兑换 + {{data.goods_name}} @@ -1167,15 +1170,37 @@ 单独购买 - - 立即兑换 + + + + + 即将开始 + 立即兑换 积分不足 - - 立即兑换 + + 即将开始 + 立即兑换 + + + 积分不足