Merge branch 'release/6.9.8' into 'master'

Release/6.9.8



See merge request !16

@@ -16,22 +16,16 @@ Page({
     userInfo: {},
     tabBarArr: [
       {
-        // icon: '../../static/images/limit/icon_jjfs_n@3x.png',
-        // iconSelected: '../../static/images/limit/icon_jjfs_p@3x.png',
-        name: '即将发售',
-        method: 'app.limitProduct.soonToSaleLimitProduct',
-        reportName: 'home_soon'
-      },
-      {
-        // icon: '../../static/images/limit/icon_rmfs_n@3x.png',
-        // iconSelected: '../../static/images/limit/icon_rmfs_p@3x.png',
         name: '热门发售',
         method: 'app.limitProduct.hotLimitProduct',
         reportName: 'home_hot'
       },
       {
-        // icon: '../../static/images/limit/icon_yjfs_n@3x.png',
-        // iconSelected: '../../static/images/limit/icon_yjfs_p@3x.png',
+        name: '即将发售',
+        method: 'app.limitProduct.soonToSaleLimitProduct',
+        reportName: 'home_soon'
+      },
+      {
         name: '已经发售',
         method: 'app.limitProduct.alreadySaleLimitProduct',
         reportName: 'home_already'

@@ -167,6 +167,12 @@ Page(Object.assign({
       appParameter
     });
 
+    let userInfo = app.getUserInfo();
+    if (!userInfo.wechat || !this.getUserWechatId()) {
+      this.goLogin({'login': '0', 'type': 'redirectTo'});
+      return;
+    }
+
     yas = new Yas(app); // 实例化埋点
 
     this.initActionSheet();
@@ -552,7 +558,7 @@ Page(Object.assign({
     let userInfo = app.getUserInfo();
 
     if (!userInfo.wechat || !this.getUserWechatId()) {
-      this.goLogin(0);
+      this.goLogin({'login': '0'});
       return;
     }
 
@@ -616,7 +622,7 @@ Page(Object.assign({
     let userInfo = app.getUserInfo();
 
     if (!userInfo.wechat || !this.getUserWechatId()) {
-      this.goLogin(0);
+      this.goLogin({'login': '0'});
       return;
     }
 
@@ -778,7 +784,9 @@ Page(Object.assign({
     });
   },
 
-  goLogin(login = 1) {
+  goLogin(params) {
+    let login = parseInt(params['login']) || 1;
+    let type = params['type'] || 'navigateTo';
     let data = {};
 
     if (this.data.originUid) {
@@ -795,7 +803,8 @@ Page(Object.assign({
     router.go('userCenter', {
       referer: `/pages/product/detail/detail?${decodeURIComponent(stringify(data))}`,
       login
-    });
+    },
+    type);
   },
   onPullDownRefresh: function() {
     this.setData({