Merge branch 'refs/heads/master' into feature/coupon

 {
 {
     "name": "yohobuywap-node-activity",
     "name": "yohobuywap-node-activity",
-    "version": "6.9.18",
+    "version": "6.9.20",
     "private": true,
     "private": true,
     "description": "A New Yohobuy Project With Express",
     "description": "A New Yohobuy Project With Express",
     "repository": {
     "repository": {

@@ -88,7 +88,7 @@ class GoodsShowYasRpter {
                     if ($.inviewport($theA, { threshold: 0 })) {
                     if ($.inviewport($theA, { threshold: 0 })) {
                         // 是商品并且可见
                         // 是商品并且可见
                         goodsRawArr.push({
                         goodsRawArr.push({
-                            I_INDEX: aIndex + 1,
+                            I_INDEX: i + 1,
                             PRD_SKN: $theA.attr('skn'),
                             PRD_SKN: $theA.attr('skn'),
                             ARTICLE_ID: $theA.attr('articleId'),
                             ARTICLE_ID: $theA.attr('articleId'),
                             AUTHOR_ID: $theA.attr('authorUid'),
                             AUTHOR_ID: $theA.attr('authorUid'),

@@ -6,11 +6,8 @@ function XianyuLinkHandle() {
         'click',
         'click',
         event => {
         event => {
             let currentTarget = $(event.currentTarget);
             let currentTarget = $(event.currentTarget);
-
-
-            let href = currentTarget.attr('href').replace(/[?|&]openby:yohobuy=.*/, '');
-
-
+            let href = currentTarget.attr('href') ?
+                currentTarget.attr('href').replace(/[?|&]openby:yohobuy=.*/, '') : 'javascript:void(0)';
             let tag = href.indexOf('?') >= 0 ? '&' : '?';
             let tag = href.indexOf('?') >= 0 ? '&' : '?';
 
 
             href = href + tag + 'isNeedRefresh=false';
             href = href + tag + 'isNeedRefresh=false';
@@ -32,9 +29,8 @@ function XianyuLinkHandle() {
                 } else {
                 } else {
                     window.open(args.url, '_blank');
                     window.open(args.url, '_blank');
                 }
                 }
+                event.preventDefault();
             }
             }
-
-            event.preventDefault();
         });
         });
 }
 }