diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index f795d44..450ce8e 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -43,8 +43,20 @@ Page({ //------初始化加载---------- onLoad: function(t) { var goods_id=t.goods_id; - this.setData({gid:goods_id}); + this.setData({gid:goods_id}); var ee=this,th=ee,that=ee; + var first_leader=t.first_leader; + if(first_leader){ + 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; + } + }) + } + + //----获取系统参数,并判断等级价格----- getApp().getConfig2(function(e) { var json_d = JSON.parse(e.switch_list); @@ -323,7 +335,6 @@ Page({ a = 0, o = this.data.data; a = o.goods_id; - //----------添加到购物车时，要判断限购数量，-------- e.get_buy_num(o, function(ee) { //---判断商品是否超出限购--- diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js index 559c9a2..ea1bb48 100644 --- a/pages/activity/pind_list/pind_list.js +++ b/pages/activity/pind_list/pind_list.js @@ -17,6 +17,24 @@ Page({ iurl: os.imghost, }, + //------初始化加载---------- + onLoad: function(t) { + var first_leader = t.first_leader; + + console.log("------------"); + console.log(first_leader); + + if (first_leader) { + 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; + } + }) + } + }, + onShow: function(t) { wx.setNavigationBarTitle({ title: "天天拼单",}) @@ -143,6 +161,9 @@ Page({ pagePath+="?first_leader="+getApp().globalData.user_id; } } + + console.log("11"+pagePath); + return { title: "限时团购", path:pagePath, diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js index d728e26..aa6e5e0 100644 --- a/pages/activity/seckill_list/seckill_list.js +++ b/pages/activity/seckill_list/seckill_list.js @@ -12,6 +12,26 @@ Page({ ismore:1, //是否可以加载更多 isshow:0, }, + + //------初始化加载---------- + onLoad: function(t) { + var first_leader = t.first_leader; + + console.log("------------"); + console.log(first_leader); + + if (first_leader) { + 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; + } + }) + } + }, + + onShow: function(t) { wx.setNavigationBarTitle({ title: "商品秒杀",}) @@ -140,6 +160,8 @@ Page({ pagePath+="?first_leader="+getApp().globalData.user_id; } } + + console.log("11"+pagePath); return { title: "限时秒杀", path:pagePath, diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 357e537..d5a4918 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -353,7 +353,7 @@ Page({ }); }, //--------------------提交订单----------------------- - submitForm:function(t){ + submitForm: async function(t){ if(this.data.is_summit_ing==1) return false; //--提交中退出-- this.data.is_summit_ing=1; @@ -440,6 +440,13 @@ Page({ if(gg.guide_id){ goods.guide_id=gg.guide_id; goods.guide_type=gg.guide_type; + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{ + if(res.data.code==0){ + goods.guide_name=res.data.data.salesman; + goods.guide_sn=res.data.data.salesman_no; + } + }) } item.order_goods.push(goods); diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 582555f..df742b9 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -2799,6 +2799,19 @@ Page({ sku: o.sku, }; + //---是不是从收藏夹出来的--- + if(th.data.c_guide_id){ + newd['guide_id'] = th.data.c_guide_id; + newd['guide_type']=2; + + }else{ + if(getApp().globalData.guide_id){ + newd['guide_id'] = getApp().globalData.guide_id; + newd['guide_type']=0; + + } + } + //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ if(th.data.is_normal == 1){ @@ -3196,7 +3209,7 @@ Page({ var vpath = res.path; var context = wx.createCanvasContext('share'); //先画背景 - var pg_path = "/pacj/images/share/share_bg.png"; + var pg_path = "../../../images/share/share_bg.png"; context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); //--昵称--- context.setFontSize(24 * unit) diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 9dddacd..f5638ca 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -66,7 +66,7 @@ Page({ wx.setNavigationBarTitle({ title: "拼团订单",}) //var postdata=getApp().globalData.to_group; var postdata=options; - var tg_id = postdata.tg_id, first_leader=t.first_leader; + var tg_id = postdata.tg_id, first_leader=options.first_leader; //如果tg_id是空的话 if(tg_id==undefined || tg_id==null || tg_id==""){ var tg_id_str=decodeURIComponent(postdata.scene); @@ -585,7 +585,6 @@ Page({ }); setTimeout(th.countDown2, 1000); }, - //--获取门店--- async get_sto(e) { var th = this, dd = null,i=getApp().request; @@ -758,6 +757,20 @@ Page({ goods_name: th.data.goods.goods_name, goods_sn: th.data.goods.goods_sn, }; + + //---是不是从收藏夹出来的--- + if(th.data.c_guide_id){ + newd['guide_id'] = th.data.c_guide_id; + newd['guide_type']=2; + + }else{ + if(getApp().globalData.guide_id){ + newd['guide_id'] = getApp().globalData.guide_id; + newd['guide_type']=0; + + } + } + //-----拼团----- newd.goods_price = th.data.teamlist.price; newd.prom_type = 6; diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 16352d8..000d1bc 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -674,7 +674,6 @@ Page({ }, - //------ 分享配置 -------- onShareAppMessage: function (e) { var th=this; @@ -693,7 +692,7 @@ Page({ return { path:url, - title: "商品分类", + title: th.data.teamlist.title, imageUrl: img, } },