diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 2cce371..1f8c4f3 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -379,7 +379,7 @@ Page({ is_closecoupon: json_d.is_closecoupon, is_newsales_rules: json_d.is_newsales_rules }); - ee.init(gid); + // ee.init(gid); //------几人评价------- //n.init(th, "", "comments"); @@ -569,12 +569,16 @@ Page({ is_share: 0, }, }).then(res1 => { + console.log('优惠券+++++++++++++++++'); + console.log(res1); fir_quan = res1.data.data.pageData; }) } //过滤不是本商品的单品优惠券------------------- if (fir_quan.length > 0) { - let goodInfo = ee.data.data || {} + let goodInfo = th.data.data || {} + console.log('商品++++++++++++++++++++++'); + console.log(goodInfo); for (let index = fir_quan.length - 1; index >= 0; index--) { if (fir_quan[index].useobjecttype == 20) { //判断是单品优惠券 if (fir_quan[index].useobjectno != goodInfo.goods_sn) { @@ -583,6 +587,7 @@ Page({ } } } + let arr = [] let length = fir_quan.length if (length <= 3) { @@ -787,7 +792,7 @@ Page({ sele_g: t.data.data, userInfo: getApp().globalData.userInfo, }); - + ee.init(gid); //获取门店 ee.get_sto(); ee.get_sku(o.stoid, t.data.data, gid); @@ -846,7 +851,7 @@ Page({ ee.data.enterAddressPage && (this.data.enterAddressPage = !1); }) - + }, enterAddress: function () { diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml index fda086f..197d3f2 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml +++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml @@ -83,7 +83,7 @@ ¥{{presellList.presell_price}} - + @@ -148,6 +148,24 @@ {{prom_act.remark}} + + + + 领券 + + + + + 满{{item.condition}}减{{item.money}} + + + + + + + + + diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml index e344e70..e929b18 100644 --- a/pages/user/assistance/task_assistance.wxml +++ b/pages/user/assistance/task_assistance.wxml @@ -1,6 +1,6 @@ - + @@ -55,18 +55,18 @@ style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};"> 就选它了 - 好友拆一拆 - + 距离失效: {{invalidObj.h}}:{{invalidObj.m}}:{{invalidObj.s}} 该任务已失效 - 立即兑换