助力排队

@@ -41,15 +41,15 @@ Page({
             clock: '../../static/images/limit/clock_left.png'
             clock: '../../static/images/limit/clock_left.png'
         }
         }
     },
     },
-  onLoad: function() {
+    onLoad: function () {
         yas = new Yas(app);
         yas = new Yas(app);
 
 
         this.getList(0, 1, 20, false);
         this.getList(0, 1, 20, false);
     },
     },
-  onShow: function() {
+    onShow: function () {
         yas.pageOpenReport();
         yas.pageOpenReport();
     },
     },
-  onPullDownRefresh: function() {
+    onPullDownRefresh: function () {
         this.setData({
         this.setData({
             refreshText: '加载中...'
             refreshText: '加载中...'
         });
         });
@@ -62,7 +62,7 @@ Page({
         });
         });
 
 
     },
     },
-  onReachBottom: function() {
+    onReachBottom: function () {
         let page = this.data.listData[this.data.tabSelected].page;
         let page = this.data.listData[this.data.tabSelected].page;
         let page_total = this.data.listData[this.data.tabSelected].page_total;
         let page_total = this.data.listData[this.data.tabSelected].page_total;
 
 
@@ -71,7 +71,7 @@ Page({
             this.getList(this.data.tabSelected, page, 20, true);
             this.getList(this.data.tabSelected, page, 20, true);
         }
         }
     },
     },
-  getUserInfo: function(e) {
+    getUserInfo: function (e) {
         console.log(e);
         console.log(e);
         if (e.detail.errMsg === 'getUserInfo:ok') {
         if (e.detail.errMsg === 'getUserInfo:ok') {
             //   AccountModel.decodeUserInfo();
             //   AccountModel.decodeUserInfo();
@@ -82,7 +82,7 @@ Page({
             hasUserInfo: true
             hasUserInfo: true
         });
         });
     },
     },
-  tabChange: function(e) { // 切换TAB
+    tabChange: function (e) { // 切换TAB
         let index = e.currentTarget.dataset.index;
         let index = e.currentTarget.dataset.index;
 
 
         if (index !== this.data.tabSelected) {
         if (index !== this.data.tabSelected) {
@@ -104,7 +104,7 @@ Page({
      * limit: 每页数量，
      * limit: 每页数量，
      * isBottom:是否是到达底部后触发
      * isBottom:是否是到达底部后触发
      */
      */
-  getList: function(index, page, limit, isBottom) {
+    getList: function (index, page, limit, isBottom) {
         let method = this.data.tabBarArr[index].method;
         let method = this.data.tabBarArr[index].method;
         let that = this;
         let that = this;
 
 
@@ -136,20 +136,21 @@ Page({
             }
             }
         });
         });
     },
     },
-  navigateToDetail: function(e) { // 跳转到详情页
+    navigateToDetail: function (e) { // 跳转到详情页
         console.log(e);
         console.log(e);
         let id = e.currentTarget.dataset.id;
         let id = e.currentTarget.dataset.id;
         let limitProductCode = e.currentTarget.dataset.code;
         let limitProductCode = e.currentTarget.dataset.code;
 
 
         if (app.getUid() && app.getUserInfo().wechat) {
         if (app.getUid() && app.getUserInfo().wechat) {
-      router.go('productDetail', { limitProductCode });
+            router.go('productDetail', {limitProductCode});
         } else {
         } else {
-      let referer = getCurrentPages()[0].route;
+            let pages = getCurrentPages();
+            let referer = pages[pages.length - 1].route;
 
 
-      router.go('userCenter', { referer });
+            router.go('userCenter', {referer});
         }
         }
     },
     },
-  navigateToHome: function(e) { // 跳转到我的限购码
+    navigateToHome: function (e) { // 跳转到我的限购码
         router.go('userCenter');
         router.go('userCenter');
     }
     }
 });
 });

@@ -160,6 +160,7 @@ Page(Object.assign({
       };
       };
     } else if (res.from === 'button') {
     } else if (res.from === 'button') {
       // 用户点击分享按钮
       // 用户点击分享按钮
+        console.log(`/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`)
       return {
       return {
         title: params.TITLE, // 分享标题
         title: params.TITLE, // 分享标题
         desc: params.DESC, // 分享描述
         desc: params.DESC, // 分享描述

@@ -4,7 +4,8 @@ import event from '../../common/event';
 import LimitModel from '../../models/limit/index';
 import LimitModel from '../../models/limit/index';
 import helper from '../../utils/helper';
 import helper from '../../utils/helper';
 import wx from '../../utils/wx';
 import wx from '../../utils/wx';
-import {Actionsheet} from '../../vendors/zanui/index';
+import { Actionsheet } from '../../vendors/zanui/index';
+import { stringify } from '../../vendors/query-stringify';
 
 
 let app = getApp();
 let app = getApp();
 let router = global.router;
 let router = global.router;
@@ -102,7 +103,7 @@ Page(Object.assign({
     tempScrollTop: 0, // 手动滚动页面时保存当前滚动的位置
     tempScrollTop: 0, // 手动滚动页面时保存当前滚动的位置
     showMsg: 0, // 0不显示提示框， 1显示提示框
     showMsg: 0, // 0不显示提示框， 1显示提示框
     hidePopup: 0, // 用于显示头像旁边的气泡 0:显示 1:不显示
     hidePopup: 0, // 用于显示头像旁边的气泡 0:显示 1:不显示
-    hideInviteButton: 0, // 用户显示邀请按钮
+    hideInviteButton: 1, // 用户显示邀请按钮
     actionSheet: {
     actionSheet: {
       componentId: 'shareActionSheet',
       componentId: 'shareActionSheet',
       show: false,
       show: false,
@@ -162,6 +163,11 @@ Page(Object.assign({
      */
      */
   onShow: function(options) {
   onShow: function(options) {
     setTimeout(this.hidePopup, 4000);
     setTimeout(this.hidePopup, 4000);
+    if (app.getUid()) {
+        this.setData({
+            hideInviteButton: 0
+        });
+    }
   },
   },
 
 
   /**
   /**
@@ -343,17 +349,20 @@ Page(Object.assign({
      * 点击参加活动按钮
      * 点击参加活动按钮
      */
      */
   joinInQueue: function(e) {
   joinInQueue: function(e) {
-    let uid = app.getUid() || this.data.test_uid[this.data.now_test_uid_index];
+    let uid = app.getUid();
     let activityId = this.data.activityInfo.activityId;
     let activityId = this.data.activityInfo.activityId;
     let isEnd = this.data.activityInfo.isEnd === 0 ? 0 : 1;
     let isEnd = this.data.activityInfo.isEnd === 0 ? 0 : 1;
 
 
     if (activityId && uid && !isEnd) {
     if (activityId && uid && !isEnd) {
       this.addQueue(this.data.activityInfo.activityId, uid);
       this.addQueue(this.data.activityInfo.activityId, uid);
     } else if (isEnd) {
     } else if (isEnd) {
-
       this.setData({
       this.setData({
         showMsg: 1
         showMsg: 1
       });
       });
+    } else if(!uid) {
+        let pages = getCurrentPages();
+        let referer = pages[pages.length - 1].route + '?' + stringify(this.data.shareInfo);
+        router.go('userCenter', { referer });
     }
     }
   },
   },