diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index 354fa3f..f51f0da 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -216,7 +216,7 @@ Page({ //--- 判断是等级会员,且在有效期范围内 --- if(user.card_field && now5) card_name=card_name.substring(0,5); + if(card_name && card_name.length>5) card_name=card_name.substring(0,5); th.setData({card_field:user.card_field,card_name:card_name}); if(t.data.data[user.card_field]>0) t.data.data.shop_price=t.data.data[user.card_field]; } @@ -634,22 +634,25 @@ Page({ //--点击分享事件--- onShareAppMessage: function(t) { - var th = this; - var price = th.data.data.shop_price; - if (th.data.prom_act) { - price = th.data.prom_act.price; - } - var title= th.data.data.goods_name; - var img=th.data.data.original_img; - if(th.data.prom_type==6){ - title=th.data.prom_act.share_title; - img=th.data.iurl+th.data.prom_act.share_imgurl; - } + var curPage=this; + var pagePath = curPage.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + if(getApp().globalData.user_id){ + if(pagePath.indexOf("?")>0){ + pagePath+="&first_leader="+getApp().globalData.user_id; + }else{ + pagePath+="?first_leader="+getApp().globalData.user_id; + } + } + + console.log("111"); + console.log(pagePath); return { - title: price + "元 " +title, - path: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid, - imageUrl: img, + title: "搭配购", + path: pagePath, } },