diff --git a/components/diy_goodsGroup/g_filter.wxs b/components/diy_goodsGroup/g_filter.wxs index 9e0910a..e4ca724 100644 --- a/components/diy_goodsGroup/g_filter.wxs +++ b/components/diy_goodsGroup/g_filter.wxs @@ -93,7 +93,11 @@ var g_filters = { var url = ''; if(item.prom_type == 9) { url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id; - } else { + } + else if(item.prom_type==8){ + url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id + } + else { url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type; }; return url; @@ -107,5 +111,5 @@ module.exports = { is_has_rank:g_filters.is_has_rank, get_card_price:g_filters.get_card_price, get_border_type:g_filters.get_border_type, - get_url_by_type: g_filters.get_url_by_type, + get_url_by_type: g_filters.get_url_by_type, } diff --git a/components/goods_list/g_filter.wxs b/components/goods_list/g_filter.wxs index 608fb4d..3155059 100644 --- a/components/goods_list/g_filter.wxs +++ b/components/goods_list/g_filter.wxs @@ -62,8 +62,24 @@ var g_filters = { if(min_name.length>4 ) min_name=min_name.substring(0, 8); return min_name; }, + + get_url_by_type: function(item) { + var url = ''; + if(item.prom_type == 9) { + url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id; + } + else if(item.prom_type==8){ + url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id + } + else { + url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type; + }; + return url; + }, + } module.exports = { is_has_rank:g_filters.is_has_rank, get_card_price:g_filters.get_card_price, + get_url_by_type:g_filters.get_url_by_type, } \ No newline at end of file diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml index ef89b5a..3be78b8 100644 --- a/components/goods_list/goods_list.wxml +++ b/components/goods_list/goods_list.wxml @@ -4,7 +4,9 @@ - + + + diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 939de7d..9331966 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -2369,6 +2369,8 @@ Page({ }); + + that.check_is_youhui(gid, that.data.is_normal); this.get_sto(that.data.is_normal); @@ -3125,6 +3127,7 @@ Page({ this.get_sto(); this.get_sku(o.stoid, this.data.data, gid); this.check_has_flash(); + this.data.is_normal=1; this.check_is_youhui(gid,1); return false; } diff --git a/pages/goods/goodsList/g_filter.wxs b/pages/goods/goodsList/g_filter.wxs index 1c25e9d..36ab263 100644 --- a/pages/goods/goodsList/g_filter.wxs +++ b/pages/goods/goodsList/g_filter.wxs @@ -79,9 +79,14 @@ var g_filters = { if(min_name.length>4) min_name=min_name.substring(0, 8); return min_name; }, + //跳转的接口 get_goods_url:function(item){ var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id + + if(item.prom_type == 9) { + url1 = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id; + } if(item.prom_type==8){ url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id }