wxd / MShopWeApp

Commit 17d906c8eeec7e740bcbc698f8b0cbc36027b277

Authored by 泉州测试
2 parents ed1e8547 255c96ce

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 3 changed files with 21 additions and 6 deletions
pages/giftpack/buygiftpack/giftpackbuy.js
  View file @17d906c
... ... @@ -36,9 +36,8 @@ Page({
36 36 getStorageID: a.stoid,
37 37 getUserID: d.user_id
38 38 });
39   -
40 39 //-- 获取分享人的ID --
41   - var first_leader = options.first_leader;
  40 + var first_leader = options.first_leader || getApp().globalData.first_leader;
42 41 if (first_leader) {
43 42 this.setData({
44 43 first_leader,
... ...
pages/giftpack/giftpacklist/giftpacklist.js
  View file @17d906c
... ... @@ -39,9 +39,8 @@ Page({
39 39 orderSn: options.orderSn,
40 40 getUserID: d.user_id,
41 41 })
42   -
43 42 //-- 获取分享人的ID --
44   - var first_leader = options.first_leader;
  43 + var first_leader = options.first_leader || getApp().globalData.first_leader;
45 44 if (first_leader) {
46 45 this.setData({
47 46 first_leader,
... ...
pages/giftpack/mygiftpack/mygiftpack.js
  View file @17d906c
... ... @@ -25,7 +25,8 @@ Page({
25 25 curpage: 1, //当前分页数
26 26 pageSize: 10, //页大小
27 27 total: 0, //总数量
28   - ad_data:null,
  28 + ad_data:null,
  29 + first_leader: e.globalData.first_leader || 0, // 推荐人ID
29 30 },
30 31  
31 32 onLoad: function(options) {
... ... @@ -35,7 +36,23 @@ Page({
35 36 getUserID: d.user_id,
36 37 loadingType: 0,
37 38 getDate: i.formatTime(new Date().getTime())
38   - })
  39 + });
  40 +
  41 + //-- 获取分享人的ID --
  42 + var first_leader = options.first_leader || getApp().globalData.first_leader;
  43 + if (first_leader) {
  44 + this.setData({
  45 + first_leader,
  46 + })
  47 + //-- user_id代过来免登录 --
  48 + getApp().globalData.first_leader = first_leader;
  49 + //调用接口判断是不是会员
  50 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
  51 + if (res.data.code == 0) {
  52 + getApp().globalData.guide_id = res.data.data.id;
  53 + }
  54 + })
  55 + }
39 56  
40 57 getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
41 58 data: {
... ...