Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -31,7 +31,7 @@ const _processListData = (list) => {
     _.forEach(list.data.allList, function(value, index) {
 
         _.forEach(value, function(data) {
-            data.brandDomain = `${config.siteUrl}/product/shop/${data.brandDomain}/list`;
+            data.brandDomain = `${config.siteUrl}/product/shop/${data.brandDomain}`;
         });
 
         if (index !== '0~9') {

@@ -41,7 +41,7 @@ const getProductBaseAsync = (productId, uid, skn) => {
  * @return { Object } 收藏状态
  */
 const getUserIsFav = (uid, productId) => {
-    return SingleAPI.get('', {
+    return SingleAPI.get('/favorite', {
         method: 'app.favorite.isFavoriteNew',
         id: productId,
         uid: uid,

@@ -6,7 +6,8 @@
                     {{# navbars}}
                     <li class="nav-item{{#if cur}} cur{{/if}}">
                         <a href="{{link}}"{{#if isNewPage}} target="_blank"{{/if}}>
-                            {{en}}{{cn}}
+                            <span class="nav-en">{{en}}</span>
+                            <span class="nav-cn">{{cn}}</span>
                         </a>
                     </li>
                     {{/ navbars}}