Merge branch 'master' into feature/seo3

-web: npm run dev
-gulp: gulp --cwd=public
 proxy: d:\dev\traefik\traefik.exe -c d:\dev\traefik\conf.toml
 proxy: d:\dev\traefik\traefik.exe -c d:\dev\traefik\conf.toml
 mem: d:\dev\memcached\memcached.exe
 mem: d:\dev\memcached\memcached.exe

@@ -293,6 +293,10 @@
                         <a href="//www.yohobuy.com/privacy.html" rel="nofollow">隐私条款</a>
                         <a href="//www.yohobuy.com/privacy.html" rel="nofollow">隐私条款</a>
                         <span>|</span>
                         <span>|</span>
                         <a href="//www.yohobuy.com/link.html">友情链接</a>
                         <a href="//www.yohobuy.com/link.html">友情链接</a>
+                        <span>|</span>
+                        <a class="police" target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=32010502010132">
+                           苏公网安备 32010502010132号
+                        </a>
                     </p>
                     </p>
                     <p>
                     <p>
                         CopyRight © 2007-2016 南京新与力文化传播有限公司
                         CopyRight © 2007-2016 南京新与力文化传播有限公司

 {
 {
   "name": "yohobuy-node",
   "name": "yohobuy-node",
-  "version": "5.9.1",
+  "version": "5.9.3",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -160,8 +160,14 @@ function bindHoverEvent() {
     $brand.unbind('mouseenter').unbind('mouseleave').hover(function() {
     $brand.unbind('mouseenter').unbind('mouseleave').hover(function() {
         var $this = $(this);
         var $this = $(this);
         var key = $this.attr('data-key');
         var key = $this.attr('data-key');
+        var options;
 
 
-        var options = {
+        // 全球购品牌不展示品牌简介
+        if (+key < 0) {
+            return;
+        }
+
+        options = {
             url: '/brands/brandinfo',
             url: '/brands/brandinfo',
             type: 'get',
             type: 'get',
             data: {
             data: {

@@ -114,7 +114,7 @@ function getShoppingKey() {
     a.src = j;
     a.src = j;
     m.parentNode.insertBefore(a, m);
     m.parentNode.insertBefore(a, m);
 }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//' + // eslint-disable-line
 }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//' + // eslint-disable-line
-    'cdn.yoho.cn/yas-jssdk/2.4.1/yas.js', '_yas')); // eslint-disable-line
+    'cdn.yoho.cn/yas-jssdk/2.4.2/yas.js', '_yas')); // eslint-disable-line
 
 
 (function() {
 (function() {
     var uid = getUid();
     var uid = getUid();
@@ -124,7 +124,7 @@ function getShoppingKey() {
     window._ozuid = uid; // 暴露ozuid
     window._ozuid = uid; // 暴露ozuid
 
 
     if (window._yas) {
     if (window._yas) {
-        window._yas(1 * new Date(), '2.4.1', 'yohobuy_web', uid, '', '');
+        window._yas(1 * new Date(), '2.4.2', 'yohobuy_web', uid, '', '');
     }
     }
 }());
 }());
 
 

@@ -346,6 +346,13 @@
                 padding: 0 10px;
                 padding: 0 10px;
             }
             }
         }
         }
+
+        .police {
+            background: resolve(layout/police.png) no-repeat;
+            height: 20px;
+            display: inline-block;
+            padding-left: 25px;
+        }
     }
     }
 
 
     .right-floating-layer {
     .right-floating-layer {