diff --git a/components/diy_serviceCard/diy_serviceCard.js b/components/diy_serviceCard/diy_serviceCard.js index 6eca56d..4049c6f 100644 --- a/components/diy_serviceCard/diy_serviceCard.js +++ b/components/diy_serviceCard/diy_serviceCard.js @@ -482,7 +482,46 @@ Component({ if (this.data.object.goodscount * this.data.page < this.data.total) { this.setLoading() } - } + }, + + go_goods:async function(e) { + var gid = e.currentTarget.dataset.gid; + var rurl = '/api/weshop/activitylist/listGoodActInfo2New'; + var req_d = { + "store_id": getApp().globalData.setting.stoid, + "goods_id": gid, + "user_id": getApp().globalData.user_id, + "goods_type":1 + } + var res= await getApp().request.promiseGet(rurl, {data: req_d}); + + var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid; + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { + var arr = res.data.data; + let times = new Date().getTime(); + //-- 预热也要计算 -- + var arr2 = arr.filter(function (e) { + return e.s_time < ut.gettimestamp() || (e.warm_uptime && e.warm_uptime < ut.gettimestamp()) + }) + if(arr2.length==1) { + switch(arr2[0].prom_type){ + case 1: + url+="&prom_type=1&prom_id="+arr[0].act_id; + break; + case 6: + url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr[0].act_id}`; + break; + case 8: + url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr[0].act_id}`; + break; + } + } + + } + + + getApp().goto(url); + }, diff --git a/components/diy_serviceCard/diy_serviceCard.wxml b/components/diy_serviceCard/diy_serviceCard.wxml index eae9eba..386f24d 100644 --- a/components/diy_serviceCard/diy_serviceCard.wxml +++ b/components/diy_serviceCard/diy_serviceCard.wxml @@ -52,7 +52,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -369,7 +369,7 @@ - + @@ -528,7 +528,7 @@ - + @@ -711,7 +711,7 @@ - +