Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6

@@ -61,6 +61,7 @@ const getNavBar = (data, type) => {
         obj.link = item.sort_url;
         obj.cn = item.sort_name;
         obj.en = item.sort_name_en;
+        obj.isNewPage = item.is_new_page === 'Y' ? true : false;
 
         if (type === lowEn) {
             obj.active = true;
@@ -186,6 +187,7 @@ const setHeaderData = (resData, type) => {
             subNav: resData ? getSubNav(resData, type) : []
         }
     };
+
     return data;
 };
 

@@ -68,13 +68,13 @@
                     {{# navbars}}
                         <li {{#if active}} class="cure"{{/if}}{{#if ico}} style="background: url({{image ico 54 32}}) no-repeat center center"{{/if}}>
                             {{#if ico}}
-                                <a href="{{link}}" class="menu-ico"></a>
+                                <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}} class="menu-ico"></a>
                             {{^}}
                                 <h3 class="name-cn">
-                                    <a href="{{link}}">{{cn}}</a>
+                                    <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>{{cn}}</a>
                                 </h3>
                                 <h3 class="name-en">
-                                    <a href="{{link}}">{{en}}</a>
+                                    <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>{{en}}</a>
                                 </h3>
                             {{/if}}
                         </li>

@@ -282,7 +282,7 @@
 
             li {
                 float: left;
-                padding: 8px 23px 5px;
+                padding: 8px 22px 5px;
 
                 a {
                     font-size: 12px;
@@ -324,7 +324,7 @@
             background: resolve('layout/logo-en.png') no-repeat center center;
             width: 182px;
             height: 53px;
-            left: 42%;
+            left: 43%;
             margin-top: 22px;
             position: absolute;
             animation: logoflip 20s infinite;