1 participants
-
Status changed to merged
-
mentioned in commit 4b69d42325333994443644b93f179848ab7f9e98
Showing
2 changed files
packageB/pages/zuhegou/index/index.js
| @@ -124,6 +124,9 @@ Page({ | @@ -124,6 +124,9 @@ Page({ | ||
| 124 | * 生命周期函数--监听页面加载 | 124 | * 生命周期函数--监听页面加载 |
| 125 | */ | 125 | */ |
| 126 | onLoad: function (options) { | 126 | onLoad: function (options) { |
| 127 | + | ||
| 128 | + console.log(options,111); | ||
| 129 | + | ||
| 127 | self = this; | 130 | self = this; |
| 128 | var the_id = options.id; | 131 | var the_id = options.id; |
| 129 | if(options.title) { | 132 | if(options.title) { |
| @@ -131,7 +134,8 @@ Page({ | @@ -131,7 +134,8 @@ Page({ | ||
| 131 | title: options.title, | 134 | title: options.title, |
| 132 | }); | 135 | }); |
| 133 | }; | 136 | }; |
| 134 | - var first_leader=''; | 137 | + var first_leader=options.first_leader; |
| 138 | + | ||
| 135 | //--如果tg_id是空的话，分享回来-- | 139 | //--如果tg_id是空的话，分享回来-- |
| 136 | if (the_id == undefined || the_id == null || the_id == "") { | 140 | if (the_id == undefined || the_id == null || the_id == "") { |
| 137 | var gid_str = decodeURIComponent(options.scene); | 141 | var gid_str = decodeURIComponent(options.scene); |
| @@ -422,6 +426,18 @@ Page({ | @@ -422,6 +426,18 @@ Page({ | ||
| 422 | * 用户点击右上角分享 | 426 | * 用户点击右上角分享 |
| 423 | */ | 427 | */ |
| 424 | onShareAppMessage: function () { | 428 | onShareAppMessage: function () { |
| 429 | + var title = this.data.act.name; | ||
| 430 | + var url= "/packageB/pages/zuhegou/index/index?id="+this.data.act.id; | ||
| 431 | + if (getApp().globalData.user_id) { | ||
| 432 | + url += "&first_leader=" + getApp().globalData.user_id; | ||
| 433 | + } | ||
| 434 | + var ob = { | ||
| 435 | + title:title, | ||
| 436 | + path: url, | ||
| 437 | + }; | ||
| 438 | + if(this.data.act.img_url) | ||
| 439 | + ob.imageUrl=this.data.iurl+this.data.act.img_url; | ||
| 440 | + return ob; | ||
| 425 | }, | 441 | }, |
| 426 | 442 | ||
| 427 | /** | 443 | /** |
pages/goods/goodsInfo/goodsInfo.js
| @@ -5873,8 +5873,6 @@ Page({ | @@ -5873,8 +5873,6 @@ Page({ | ||
| 5873 | getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | 5873 | getApp().request.promiseGet(url, {data:req_data}).then(res=>{ |
| 5874 | if(res.data.code==0 && res.data.data && res.data.data.length){ | 5874 | if(res.data.code==0 && res.data.data && res.data.data.length){ |
| 5875 | th.setData({more_flash:res.data.data}); | 5875 | th.setData({more_flash:res.data.data}); |
| 5876 | - }else{ | ||
| 5877 | - func(false); | ||
| 5878 | } | 5876 | } |
| 5879 | }) | 5877 | }) |
| 5880 | }, | 5878 | }, |