Commit 2f4a0160100324c1c14510745554e4ddb298a780

Authored by yvan.ni
1 parent d4967804

搭配购的bug优化

packageA/pages/prom_list/prom_list.js
@@ -216,7 +216,7 @@ Page({ @@ -216,7 +216,7 @@ Page({
216 //--- 判断是等级会员,且在有效期范围内 --- 216 //--- 判断是等级会员,且在有效期范围内 ---
217 if(user.card_field && now<end){ 217 if(user.card_field && now<end){
218 var card_name=ob.name_map.get(user.card_field); 218 var card_name=ob.name_map.get(user.card_field);
219 - if(card_name.length>5) card_name=card_name.substring(0,5); 219 + if(card_name && card_name.length>5) card_name=card_name.substring(0,5);
220 th.setData({card_field:user.card_field,card_name:card_name}); 220 th.setData({card_field:user.card_field,card_name:card_name});
221 if(t.data.data[user.card_field]>0) t.data.data.shop_price=t.data.data[user.card_field]; 221 if(t.data.data[user.card_field]>0) t.data.data.shop_price=t.data.data[user.card_field];
222 } 222 }
@@ -634,22 +634,25 @@ Page({ @@ -634,22 +634,25 @@ Page({
634 634
635 //--点击分享事件--- 635 //--点击分享事件---
636 onShareAppMessage: function(t) { 636 onShareAppMessage: function(t) {
637 - var th = this;  
638 - var price = th.data.data.shop_price;  
639 - if (th.data.prom_act) {  
640 - price = th.data.prom_act.price;  
641 - }  
642 - var title= th.data.data.goods_name;  
643 - var img=th.data.data.original_img;  
644 - if(th.data.prom_type==6){  
645 - title=th.data.prom_act.share_title;  
646 - img=th.data.iurl+th.data.prom_act.share_imgurl;  
647 - } 637 + var curPage=this;
  638 + var pagePath = curPage.route; //当前页面url
  639 + if (pagePath.indexOf('/') != 0) {
  640 + pagePath = '/' + pagePath;
  641 + }
  642 + if(getApp().globalData.user_id){
  643 + if(pagePath.indexOf("?")>0){
  644 + pagePath+="&first_leader="+getApp().globalData.user_id;
  645 + }else{
  646 + pagePath+="?first_leader="+getApp().globalData.user_id;
  647 + }
  648 + }
  649 +
  650 + console.log("111");
  651 + console.log(pagePath);
648 652
649 return { 653 return {
650 - title: price + "元 " +title,  
651 - path: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid,  
652 - imageUrl: img, 654 + title: "搭配购",
  655 + path: pagePath,
653 } 656 }
654 657
655 }, 658 },