Merge branch 'qa' into 'master'

Qa See merge request !78

Merge branch 'qa' into 'master'
Qa See merge request !78
后端研发-苏明海
2 parents e264ceba 9bc4d827
Showing 1 changed file with 22 additions and 2 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -220,7 +220,6 @@ Page({
     ee.setData({
       gid: gid
     });
-t
     getApp().getConfig2(function (e) {
        if (e.categoryset.indexOf("," + 1 + ",") != -1) { ee.setData({ is_show_pl: 1 }); }
@@ -447,6 +446,7 @@ t
             t.data.data.original_img = o.imghost + t.data.data.original_img;
           if(t.data.data.goods_content==null) t.data.data.goods_content="";
+
           //-----商品详情---
           a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
           e.wxParseAddFullImageUrl(ee, "content");
@@ -997,8 +997,28 @@ t
       openPromModal: !0
     });
   },
+
+  //--点击分享事件---
   onShareAppMessage: function(t) {
-    return o.share;
+    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;
+    }
+    
+    return {
+      title: price + "元  " +title,
+      path: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid,
+      imageUrl: img,
+    }
+
   },
   //-----图片失败，默认图片-----