diff --git a/packageA/pages/distribution/goods/g_filter.wxs b/packageA/pages/distribution/goods/g_filter.wxs index 608fb4d..490f7a1 100644 --- a/packageA/pages/distribution/goods/g_filter.wxs +++ b/packageA/pages/distribution/goods/g_filter.wxs @@ -62,8 +62,21 @@ 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==8){ + url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id + } + if(item.prom_type==1 && item.prom_id>0 ){ + url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1"; + } + return url1; + } } module.exports = { is_has_rank:g_filters.is_has_rank, - get_card_price:g_filters.get_card_price, + get_card_price:g_filters.get_card_price, + get_goods_url:g_filters.get_goods_url } \ No newline at end of file diff --git a/packageA/pages/distribution/goods/goods.js b/packageA/pages/distribution/goods/goods.js index 466737a..025012c 100644 --- a/packageA/pages/distribution/goods/goods.js +++ b/packageA/pages/distribution/goods/goods.js @@ -510,6 +510,11 @@ Page({ * promiseGet请求数据 */ getData: function(isInit, url, data, isShowLoading) { + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + data.user_id=user_id; + return new Promise(function(resolve, reject) { app.request.promiseGet(url, { diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml index b2844fc..bc6344e 100644 --- a/packageA/pages/distribution/goods/goods.wxml +++ b/packageA/pages/distribution/goods/goods.wxml @@ -75,7 +75,7 @@ --> - + {{item.goods_name}} @@ -214,7 +214,7 @@ - + {{item.goods_name}} diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 83e9ed7..939de7d 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -805,8 +805,9 @@ Page({ ee.data.prom_id=t.data.data.prom_id; } - if(ee.data.prom_type!=1 && ee.data.prom_type!=4 && ee.data.prom_type!=6 && ee.data.prom_type!=2) - ee.check_is_youhui(ee.data.gid); + if(ee.data.prom_type!=1 && ee.data.prom_type!=4 && ee.data.prom_type!=6 && ee.data.prom_type!=2){ + ee.check_is_youhui(ee.data.gid); + } t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss'); @@ -3124,6 +3125,7 @@ Page({ this.get_sto(); this.get_sku(o.stoid, this.data.data, gid); this.check_has_flash(); + this.check_is_youhui(gid,1); return false; }