Merge branch 'dev' into 'test'

组合购发送给朋友 See merge request !843

Merge branch 'dev' into 'test'
组合购发送给朋友 See merge request !843
后端研发-苏明海
2 parents e7943aec d4058908
Showing 2 changed files with 17 additions and 3 deletions
packageB/pages/zuhegou/index/index.js
pages/goods/goodsInfo/goodsInfo.js
@@ -124,6 +124,9 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+
+        console.log(options,111);
+
         self = this;
         var the_id = options.id;
 				if(options.title) {
@@ -131,7 +134,8 @@ Page({
 						title: options.title,
 					});
 				};
-        var first_leader='';
+        var first_leader=options.first_leader;
+
         //--如果tg_id是空的话，分享回来--
         if (the_id == undefined || the_id == null || the_id == "") {
             var  gid_str = decodeURIComponent(options.scene);
@@ -422,6 +426,18 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage: function () {
+        var title = this.data.act.name;
+        var url= "/packageB/pages/zuhegou/index/index?id="+this.data.act.id;
+        if (getApp().globalData.user_id) {
+            url += "&first_leader=" + getApp().globalData.user_id;
+        }
+        var ob = {
+            title:title,
+            path: url,
+        };
+        if(this.data.act.img_url)
+            ob.imageUrl=this.data.iurl+this.data.act.img_url;
+        return ob;
     },
  
     /**
@@ -5873,8 +5873,6 @@ Page({
         getApp().request.promiseGet(url, {data:req_data}).then(res=>{
             if(res.data.code==0 && res.data.data && res.data.data.length){
                 th.setData({more_flash:res.data.data});
-            }else{
-                func(false);
             }
         })
     },