Commit 25af31d6f95284f5c2fb6fb223f7681ba382cb86
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test
Showing
1 changed file
with
3 additions
and
1 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -1012,8 +1012,10 @@ Page({ | @@ -1012,8 +1012,10 @@ Page({ | ||
| 1012 | title: t.data.data.goods_name, | 1012 | title: t.data.data.goods_name, |
| 1013 | }); | 1013 | }); |
| 1014 | 1014 | ||
| 1015 | + var p_type=parseInt(ee.data.prom_type?ee.data.prom_type:0); | ||
| 1016 | + | ||
| 1015 | //-- 判断是不是组合购活动,必须要登录后才能判断 -- | 1017 | //-- 判断是不是组合购活动,必须要登录后才能判断 -- |
| 1016 | - if (getApp().globalData.userInfo && t.data.data.prom_type == 7) { | 1018 | + if (getApp().globalData.userInfo && t.data.data.prom_type == 7 && [1,2,4,6,8,9].indexOf(p_type)==-1) { |
| 1017 | //获取活动信息 | 1019 | //获取活动信息 |
| 1018 | var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + | 1020 | var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + |
| 1019 | t.data.data.prom_id + "/" + getApp().globalData.user_id; | 1021 | t.data.data.prom_id + "/" + getApp().globalData.user_id; |