diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 541124f..2da23ec 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -228,6 +228,11 @@ Page({ giftTitle: res.data.data.giftTitle, default_color: res.data.data.bgcolor }) + + if(res.data.data.iswarelbtype==1) { + th.setData({iswarelbtype:1}) + } + if (!res.data.data.giftRemark || res.data.data.giftRemark == '') { th.setData({ giftRemark: '暂无详情......' diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml index 07f7ad8..b145b27 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.wxml +++ b/pages/giftpack/giftpacklist/giftpacklist.wxml @@ -18,13 +18,13 @@ - {{"兑换结束时间:"+giftDate}} + {{"兑换结束时间:"+giftDate}} {{"活动结束时间:"+giftDate}} - + {{"兑换时间:领取后"+exchangeDay+"天内兑换"}} diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml index 3adf1e9..8b9b359 100644 --- a/pages/giftpack/mygiftpack/mygiftpack.wxml +++ b/pages/giftpack/mygiftpack/mygiftpack.wxml @@ -81,7 +81,8 @@ {{"零售价:¥"+item.giftPosPrice}} - + + {{"兑换截至日期:"+item.endTime}} @@ -89,6 +90,7 @@ {{"距兑换开始时间: "+item.starTime}} +