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

泉州测试
2 parents ed1e8547 255c96ce
Showing 3 changed files with 21 additions and 6 deletions
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/mygiftpack/mygiftpack.js
@@ -36,9 +36,8 @@ Page({
       getStorageID: a.stoid,
       getUserID: d.user_id
     });
-
     //-- 获取分享人的ID --
-    var first_leader = options.first_leader;
+    var first_leader = options.first_leader || getApp().globalData.first_leader;
     if (first_leader) {
       this.setData({
         first_leader,
@@ -39,9 +39,8 @@ Page({
       orderSn: options.orderSn,
       getUserID: d.user_id,
     })
-
     //-- 获取分享人的ID --
-    var first_leader = options.first_leader;
+    var first_leader = options.first_leader || getApp().globalData.first_leader;
     if (first_leader) {
       this.setData({
         first_leader,
@@ -25,7 +25,8 @@ Page({
     curpage: 1, //当前分页数
     pageSize: 10, //页大小
     total: 0, //总数量
-	  ad_data:null,
+    ad_data:null,
+    first_leader: e.globalData.first_leader || 0, // 推荐人ID
   },
   onLoad: function(options) {
@@ -35,7 +36,23 @@ Page({
       getUserID: d.user_id,
       loadingType: 0,
       getDate: i.formatTime(new Date().getTime())
-    })
+    });
+    
+    //-- 获取分享人的ID --
+    var first_leader = options.first_leader || getApp().globalData.first_leader;
+    if (first_leader) {
+      this.setData({
+        first_leader,
+      })
+      //--  user_id代过来免登录 --
+      getApp().globalData.first_leader = first_leader;
+      //调用接口判断是不是会员
+      getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+        if (res.data.code == 0) {
+          getApp().globalData.guide_id = res.data.data.id;
+        }
+      })
+    }
 	getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
 	  data: {