diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml index cdd2466..c505cfc 100644 --- a/components/goods_list/goods_list.wxml +++ b/components/goods_list/goods_list.wxml @@ -4,15 +4,15 @@ - - + + {{item.goods_name}} - + {{item.prom_integral}}积分 diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js index 21f8f1a..6cdb951 100644 --- a/packageA/pages/activity_share/activity_share.js +++ b/packageA/pages/activity_share/activity_share.js @@ -167,10 +167,22 @@ Page({ if(item){ var price = item.price; if(!price) price=item.shop_price; - + switch(th.data.currentIndex){ + case 0: item.prom_type=1;break; + case 1: item.prom_type=6;break; + case 2: + if(th.data.currentIndex2==1) item.prom_type = 5; + if(th.data.currentIndex2==2) { + item.prom_type = 3; + item.id=item.prom_id; + } + break; + } + item.prom_id=item.id; + var title= item.goods_name; var img=this.data.url+item.original_img; - var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id; + var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id+"&prom_type="+item.prom_type+"&prom_id="+item.prom_id; if(getApp().globalData.user_id){ url+="&first_leader="+getApp().globalData.user_id; } @@ -547,7 +559,26 @@ Page({ var app = getApp(); var unit = that.data.screenWidth / 750 * 1.35; //基础单位, + + var prom_type=0; + var prom_id=th.data.share_good.id; + switch(th.data.currentIndex){ + case 0: prom_type=1;break; + case 1: prom_type=6;break; + case 2: + if(th.data.currentIndex2==1) prom_type = 5; + if(th.data.currentIndex2==2){ + prom_type = 3; + prom_id=th.data.share_good.prom_id; + } + break; + } + + + var scene = th.data.share_good.goods_id+""; + scene+="."+prom_type+"."+prom_id; + var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0; if(user_id>0){ scene+="_"+user_id; @@ -1129,14 +1160,27 @@ Page({ this.data.currentPage=1; this.requestGoodsList(); }, - - - go_goods:function(e){ - var index=e.currentTarget.dataset.index; - var item=this.data.list[index]; - var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id; - getApp().goto(url); - }, + + + go_goods: function (e) { + var index = e.currentTarget.dataset.index; + var item = this.data.list[index]; + var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id; + + switch(this.data.currentIndex){ + case 0: item.prom_type = 1;break; + case 1: item.prom_type = 6;break; + case 2: + if(th.data.currentIndex2==1) item.prom_type = 5; + if(th.data.currentIndex2==2) item.prom_type = 3; + break; + } + + item.prom_id = item.id; + url+="&prom_type="+item.prom_type+"&prom_id="+item.prom_id + + getApp().goto(url); + }, go_coll_good:function(e){ var gid=e.currentTarget.dataset.gid; diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml index aa6f6a3..b2844fc 100644 --- a/packageA/pages/distribution/goods/goods.wxml +++ b/packageA/pages/distribution/goods/goods.wxml @@ -75,13 +75,13 @@ --> - + {{item.goods_name}} - + {{item.prom_integral}}积分 + @@ -214,7 +214,7 @@ - + {{item.goods_name}} @@ -222,7 +222,7 @@ - + {{item.prom_integral}}积分 + diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml index d4f3b96..419c52f 100644 --- a/packageA/pages/distribution/shop/shop.wxml +++ b/packageA/pages/distribution/shop/shop.wxml @@ -69,14 +69,14 @@ - + {{item.goods_name}} - + {{item.prom_integral}} @@ -213,14 +213,14 @@ - + {{item.goods_name}} - + {{item.prom_integral}} diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js index a11f645..7c98985 100644 --- a/pages/activity/seckill_list/seckill_list.js +++ b/pages/activity/seckill_list/seckill_list.js @@ -76,7 +76,7 @@ Page({ }, onHide:function(){ //--清理定时器-- - clearInterval(this.timer); + clearInterval(this.data.timer); this.setData({isshow:0}); }, //---小于10的格式化函数---- diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 02bd993..d832427 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -2376,6 +2376,28 @@ Page({ go_url(e){ var url=e.currentTarget.dataset.url; getApp().goto(url); + }, + + //跳转到商品 + go_gd:function (e) { + var gd= e.currentTarget.dataset.gd; + var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; + var url="/api/weshop/activitylist/getGoodActInfo"; + var req_data={ + store_id:os.stoid,goodsidlist:gd,is_detail:1 + }; + //获取秒杀的多规格 + getApp().request.promiseGet(url, {data:req_data}).then(res=>{ + if(res.data.code==0 && res.data.data){ + if(res.data.data.length==1){ + good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id; + } + getApp().goto(good_url); + + }else{ + getApp().goto(good_url); + } + }) } }); \ No newline at end of file diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml index 9dc7ee6..bbd4c83 100644 --- a/pages/cart/cart/cart.wxml +++ b/pages/cart/cart/cart.wxml @@ -56,7 +56,6 @@ - @@ -77,7 +76,7 @@ - + 赠品 @@ -102,7 +101,7 @@ - {{items.goods_name}} + {{items.goods_name}} diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index b4e76c1..23a705c 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -289,7 +289,6 @@ Page({ } }, 1); - //值在这里换 getApp().globalData.plus_buy_back = 0; }, @@ -3815,6 +3814,11 @@ Page({ var index = e.currentTarget.dataset.index; var txt = "cartlist[" + index + "].focus"; this.setData({[txt]:0}) + }, + + go_url:function (e) { + var url = e.currentTarget.dataset.url; + getApp().goto(url); } diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml index 80fc6f4..0983b21 100644 --- a/pages/cart/cart2/cart2.wxml +++ b/pages/cart/cart2/cart2.wxml @@ -78,15 +78,13 @@ - + 组合购 - - - + {{items.goods_name}} @@ -252,10 +250,10 @@ - + - + {{bn_goods.goods_name}} diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index eb2dbca..caf3f37 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -2135,7 +2135,7 @@ Page({ var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" - + th.data.sele_g.gid+"&prom_type="+th.data.sele_g.prom_type+"&prom_id="+th.data.sele_g.prom_id; + + th.data.sele_g.goods_id+"&prom_type="+th.data.sele_g.prom_type+"&prom_id="+th.data.sele_g.prom_id; if (getApp().globalData.user_id) { url += "&first_leader=" + getApp().globalData.user_id; } @@ -4308,10 +4308,8 @@ Page({ var unit = that.data.screenWidth / 750 * 1.35; //基础单位, var path2 = that.data.data.original_img; var scene = th.data.gid + ""; + scene+="."+th.data.sele_g.prom_type+"."+th.data.sele_g.prom_id; - if(th.data.sele_g.prom_type==1){ - scene+="."+th.data.sele_g.prom_type+"."+th.data.sele_g.prom_id; - } var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0; if (user_id > 0) { scene += "_" + user_id; diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index 6318e21..381a377 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -177,7 +177,7 @@ {{item.goods_name}} - + diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml index e8c8f42..a27767a 100644 --- a/pages/goods/search/search.wxml +++ b/pages/goods/search/search.wxml @@ -35,7 +35,7 @@ {{item.goods_name}} - + {{item.prom_integral}}积分 diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index ad29c11..277b338 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -1441,6 +1441,28 @@ Page({ corpId: id, success(res) {} }) + }, + + //跳转到商品 + go_gd:function (e) { + var gd= e.currentTarget.dataset.gd; + var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; + var url="/api/weshop/activitylist/getGoodActInfo"; + var req_data={ + store_id:os.stoid,goodsidlist:gd,is_detail:1 + }; + //获取秒杀的多规格 + getApp().request.promiseGet(url, {data:req_data}).then(res=>{ + if(res.data.code==0 && res.data.data){ + if(res.data.data.length==1){ + good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id; + } + getApp().goto(good_url); + + }else{ + getApp().goto(good_url); + } + }) } diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index af5b3ea..6d4f920 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -20,12 +20,12 @@ - + - - + + {{item.goods_name}} {{filters.show_gui_ge(item.goods_spec,item.goods_color)}}