diff --git a/app.json b/app.json index 2442af3..5b57fa3 100644 --- a/app.json +++ b/app.json @@ -239,7 +239,8 @@ "pages/user/my_service/tment_eval", "pages/user_template/index", "pages/team/team_show/team_show", - "pages/user/order_detail/order_detail" + "pages/user/order_detail/order_detail", + "pages/group_buy/goodsInfo/goodsInfo" ] } ], diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js index 7f525e1..69e7c4d 100644 --- a/packageA/pages/cardList/cardList.js +++ b/packageA/pages/cardList/cardList.js @@ -239,13 +239,16 @@ Page({ if(arr2.length==1) { switch(arr2[0].prom_type){ case 1: - url+="&prom_type=1&prom_id="+arr[0].act_id; + url+="&prom_type=1&prom_id="+arr2[0].act_id; + break; + case 2: + url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+gid+"&prom_id="+arr2[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}`; + url = `/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?goods_id=${gid}&prom_type=${arr2[0].prom_type}&prom_id=${arr2[0].act_id}`; break; case 8: - url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr[0].act_id}`; + url = `/packageC/pages/presell/cardInfo/goodsInfo?goods_id=${gid}&prom_id=${arr2[0].act_id}`; break; } } diff --git a/packageC/pages/group_list/group_list.js b/packageC/pages/group_list/group_list.js index d2738a0..2cb2e9b 100644 --- a/packageC/pages/group_list/group_list.js +++ b/packageC/pages/group_list/group_list.js @@ -360,7 +360,15 @@ Page({ }, goto(e) { - let url = e.currentTarget.dataset.url; + let index = e.currentTarget.dataset.index; + let pidx = e.currentTarget.dataset.pidx; + let item=this.data.list[pidx][index]; + + let url="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.id+"&prom_type=2"; + //-- 如果是服务卡项的时候 -- + if(item.goods_type==1){ + url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.id; + } app.goto(url); }, diff --git a/packageC/pages/group_list/group_list.wxml b/packageC/pages/group_list/group_list.wxml index 085e65f..8e5c92e 100644 --- a/packageC/pages/group_list/group_list.wxml +++ b/packageC/pages/group_list/group_list.wxml @@ -4,7 +4,7 @@ - +