限定频道

@@ -469,7 +469,7 @@ Page(Object.assign({
   queueAction() {
     let userInfo = app.getUserInfo();
 
-    if (!userInfo.wechat) {
+    if (!userInfo.wechat || !app.getUnionID()) {
       this.goLogin(0);
       return;
     }

@@ -57,7 +57,7 @@ Page(Object.assign({
       product_name: '',
       product_qrCode: '',
       product_skn: '',
-      limitProductCode: ''
+      limitProductCode: 0
     },
     test_uid: [349709, // 测试用
       500030924,
@@ -177,6 +177,12 @@ Page(Object.assign({
      * 生命周期函数--监听页面显示
      */
   onShow: function(options) {
+    let actId = this.data.activityInfo.activityId;
+    let uid = app.getUid();
+
+    if (actId && uid) {
+      this.getUserActivityInfo(actId, uid);
+    }
     setTimeout(this.hidePopup, 4000);
     if (app.getUid()) {
       this.setData({
@@ -238,8 +244,7 @@ Page(Object.assign({
     let path = `/pages/product/detail/detail?limitProductCode=${this.data.shareInfo.limitProductCode}`;
 
     if (this.data.userInfo.isDrawline) {
-      path = `/pages/product/detail/detail?limitProductCode=
-      ${this.data.shareInfo.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`;
+      path = `/pages/product/detail/detail?limitProductCode=${this.data.shareInfo.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`; // eslint-disable-line
     }
     let params = {
       FROM: res.from,
@@ -381,7 +386,7 @@ Page(Object.assign({
       });
     } else if (!uid) {
       let pages = getCurrentPages();
-      let referer = pages[pages.length - 1].route + '?' + stringify(this.data.shareInfo);
+      let referer = pages[pages.length - 1].route + '?' + decodeURIComponent(stringify(this.data.shareInfo));
 
       router.go('userCenter', {referer});
     }

@@ -147,8 +147,7 @@ Page(Object.assign({
       SHARE_RESUIL: 0,
       TITLE: decodeURIComponent(this.data.shareInfo.product_name),
       DESC: '我在有货限定频道发现一个不错的商品赶快来看看吧！',
-      PATH: `/pages/product/detail/detail?limitProductCode=
-      ${this.data.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`,
+      PATH: `/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`, // eslint-disable-line
       IMG: decodeURIComponent(this.data.shareInfo.default_image)
     };
 

@@ -33,7 +33,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": -1,
+			"current": 9,
 			"list": [
 				{
 					"id": 0,