diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 8db3a02..5e8acda 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1555,10 +1555,8 @@ Page({ if (!title) title = th.data.prom_act.title; if (th.data.prom_type == 4) title = th.data.prom_act.name; - if (th.data.presellForm.share_img) - img = th.data.iurl + th.data.presellForm.share_img; - - + //if (th.data.presellForm.share_img) + // img = th.data.iurl + th.data.presellForm.share_img; var url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + th.data.gid+"&pre_id="+th.data.pre_arr.id; if (getApp().globalData.user_id) { @@ -3133,13 +3131,9 @@ Page({ tt(); return false; } - // var img_url = ee.data.data.original_img; - var img_url = ee.data.presellForm.share_img; - img_url?img_url:ee.data.data.original_img; - - if (img_url) { - img_url = this.data.iurl + img_url; - } + var img_url = ee.data.data.original_img; + //var img_url = ee.data.presellForm.share_img; + //img_url?img_url:ee.data.data.original_img; //获取商品是分享图信息 wx.getImageInfo({ diff --git a/packageC/pages/presell/list/list.js b/packageC/pages/presell/list/list.js index c6323d9..5dac02b 100644 --- a/packageC/pages/presell/list/list.js +++ b/packageC/pages/presell/list/list.js @@ -58,6 +58,16 @@ Page({ }else{ getApp().goto("/pages/togoin/togoin"); } + + var room_id = t.room_id; + var room_user_share = t.room_user_share; //如果是会员分享带有room_id的话,那么接下来会员分享就不传room_id + //-- 如果有房间号 -- + if (room_id) { + getApp().globalData.room_id = room_id; + //如果是会员分享过来的要记录 + if (room_user_share) getApp().globalData.room_user_share = room_user_share; + } + }, onShow: function (t) { var userInfo=getApp().globalData.userInfo; @@ -235,4 +245,41 @@ Page({ } }, -}); + onShareAppMessage: async function (t) { + getApp().globalData.no_clear=1; + var img=""; + if(this.data.ad_data && this.data.ad_data.length ){ + img= this.data.ad_data[0]; + }else{ + var url="/api/weshop/store/get/"+os.stoid; + await getApp().promiseGet(url,{}).then(res=>{ + if(res.data.code==0){ + img= os.imghost+res.data.data.store_logo + } + }) + } + + var url = "/packageC/pages/presell/list/list"; + if (getApp().globalData.user_id) { + url += "&first_leader=" + getApp().globalData.user_id; + } + //-- 如果房间分享,且不是会员分享的 -- + if (getApp().globalData.room_id && + this.data.data.goods_id == getApp().globalData.room_goods_id && + !getApp().globalData.room_user_share + ) { + url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1"; + } + + var ob = { + title: "预售列表", path: url, + }; + + if(img){ + ob.imageUrl=img; + } + return ob; + } + + + }); diff --git a/pages/template/index.js b/pages/template/index.js index 13d8475..c45a195 100644 --- a/pages/template/index.js +++ b/pages/template/index.js @@ -19,7 +19,21 @@ Page({ this.data.temp_id=e.scene; if(!this.data.temp_id) this.data.temp_id=e.sence; - if(!this.data.temp_id) wx.showModal({ title:"未读取到模板ID" ,}) + if(!this.data.temp_id) wx.showModal({ title:"未读取到模板ID" ,}) + + var first_leader = e.first_leader; + if (first_leader) { + //-- user_id代过来免登录 -- + getApp().globalData.first_leader = first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + } + + }, @@ -94,26 +108,52 @@ Page({ }, - onShareAppMessage: function(e) { + onShareAppMessage:async function(e) { getApp().globalData.no_clear=1; + getApp().getConfig(await function(e){ + this.setData({ + store_config:e + }) + }.bind(this)) + + var url= `pages/template/index?sence=`+this.data.temp_id; + var userInfo = getApp().globalData.userInfo; + //是分销商才带 + if (userInfo) { + url += "&first_leader=" + userInfo.user_id; + } + + var ob = { + title: this.data.share_title, + path: url, + imageUrl:this.data.url+this.data.store_config.store_logo, + }; + return ob; }, /** * 用户分享朋友圈 */ async onShareTimeline(){ - getApp().globalData.no_clear=1; + getApp().globalData.no_clear=1; getApp().getConfig(await function(e){ this.setData({ store_config:e }) }.bind(this)) var {share_title,temp_id,store_config} = this.data; - // var url= `pages/template/index?sence=${temp_id}`; + var url= `pages/template/index?sence=${temp_id}`; + + var userInfo = getApp().globalData.userInfo; + //是分销商才带 + if (userInfo) { + url += "&first_leader=" + userInfo.user_id; + } + var ob = { title:share_title, - // path: url, - query:`sence=${temp_id}`, + path: url, + //query:`sence=${temp_id}`, imageUrl:this.data.url+store_config.store_logo, }; console.log(ob);