diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js index de6e31b..6129fd8 100644 --- a/packageA/pages/goods_share/goods_share.js +++ b/packageA/pages/goods_share/goods_share.js @@ -292,6 +292,11 @@ Page({ orderField:this.data.orderField, orderType:this.data.orderType, } + + var user_id=getApp().globalData.user_id; + if(!user_id){ user_id=0;} + req_data.user_id=user_id; + if(this.data.key_str && this.data.key_str.trim()){ var str=this.data.key_str.trim(); req_data.key_str=str; diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index cdb0482..6caec3f 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -124,6 +124,9 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + + console.log(options,111); + self = this; var the_id = options.id; if(options.title) { @@ -131,7 +134,8 @@ Page({ title: options.title, }); }; - var first_leader=''; + var first_leader=options.first_leader; + //--如果tg_id是空的话,分享回来-- if (the_id == undefined || the_id == null || the_id == "") { var gid_str = decodeURIComponent(options.scene); @@ -249,8 +253,7 @@ Page({ return false; } - //获取购物车的内容 - th.get_cart_val(e); + var ee = JSON.parse(JSON.stringify(e)); var appd = getApp().globalData; @@ -342,8 +345,13 @@ Page({ }); } } + //获取购物车的内容 + th.get_cart_val(e); }) + }else{ + //获取购物车的内容 + th.get_cart_val(e); } }, 1); @@ -418,6 +426,18 @@ Page({ * 用户点击右上角分享 */ onShareAppMessage: function () { + var title = this.data.act.name; + var url= "/packageB/pages/zuhegou/index/index?id="+this.data.act.id; + if (getApp().globalData.user_id) { + url += "&first_leader=" + getApp().globalData.user_id; + } + var ob = { + title:title, + path: url, + }; + if(this.data.act.img_url) + ob.imageUrl=this.data.iurl+this.data.act.img_url; + return ob; }, /** diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 04b9dfd..ad88c50 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -5871,10 +5871,8 @@ Page({ }; //获取秒杀的多规格 getApp().request.promiseGet(url, {data:req_data}).then(res=>{ - if(res.data.code==0 && res.data.data){ + if(res.data.code==0 && res.data.data && res.data.data.length){ th.setData({more_flash:res.data.data}); - }else{ - func(false); } }) }, diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 6a12859..3c7a5f3 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -325,6 +325,9 @@ + + + @@ -360,7 +363,8 @@ - + + @@ -374,7 +378,7 @@ - + - - - +