wxd / MShopWeApp

Commit 53452c439e0aed55acab73733ddb055fcf9ce0dd

Authored by 后端研发-苏明海
2 parents e264ceba 9bc4d827

Merge branch 'qa' into 'master' 

Qa

See merge request !78
Inline Side-by-side
Showing 1 changed file with 22 additions and 2 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @53452c4
... ... @@ -220,7 +220,6 @@ Page({
220 220 ee.setData({
221 221 gid: gid
222 222 });
223   -t
224 223  
225 224 getApp().getConfig2(function (e) {
226 225 if (e.categoryset.indexOf("," + 1 + ",") != -1) { ee.setData({ is_show_pl: 1 }); }
... ... @@ -447,6 +446,7 @@ t
447 446 t.data.data.original_img = o.imghost + t.data.data.original_img;
448 447  
449 448 if(t.data.data.goods_content==null) t.data.data.goods_content="";
  449 +
450 450 //-----商品详情---
451 451 a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
452 452 e.wxParseAddFullImageUrl(ee, "content");
... ... @@ -997,8 +997,28 @@ t
997 997 openPromModal: !0
998 998 });
999 999 },
  1000 +
  1001 + //--点击分享事件---
1000 1002 onShareAppMessage: function(t) {
1001   - return o.share;
  1003 + var th = this;
  1004 + var price = th.data.data.shop_price;
  1005 + if (th.data.prom_act) {
  1006 + price = th.data.prom_act.price;
  1007 +
  1008 + }
  1009 + var title= th.data.data.goods_name;
  1010 + var img=th.data.data.original_img;
  1011 + if(th.data.prom_type==6){
  1012 + title=th.data.prom_act.share_title;
  1013 + img=th.data.iurl+th.data.prom_act.share_imgurl;
  1014 + }
  1015 +
  1016 + return {
  1017 + title: price + "元 " +title,
  1018 + path: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid,
  1019 + imageUrl: img,
  1020 + }
  1021 +
1002 1022 },
1003 1023  
1004 1024 //-----图片失败，默认图片-----
... ...