Merge branch 'release/5.0.0'

@@ -93,8 +93,8 @@ const handleBrandCheckedData = (params, origin) => {
     if (!_.isEmpty(origin)) {
     if (!_.isEmpty(origin)) {
         _.forEach(origin, (value) => {
         _.forEach(origin, (value) => {
             if (typeof _.find(intBrands, o => {
             if (typeof _.find(intBrands, o => {
-                return _.isEqual(o, value.id);
-            }) !== 'undefined') {
+                    return _.isEqual(o, value.id);
+                }) !== 'undefined') {
                 let checked = {
                 let checked = {
                     name: value.name
                     name: value.name
                 }; // push 到已选择数组
                 }; // push 到已选择数组
@@ -204,7 +204,7 @@ const formatterFilterBrands = (source, paramBrand, params) => {
     };
     };
 
 
 
 
-     // 品牌索引数据处理
+    // 品牌索引数据处理
     for (let i = 65; i < 91; i++) {
     for (let i = 65; i < 91; i++) {
         dbrand.brandIndex.push({
         dbrand.brandIndex.push({
             index: String.fromCharCode(i).toLowerCase(),
             index: String.fromCharCode(i).toLowerCase(),
@@ -212,8 +212,8 @@ const formatterFilterBrands = (source, paramBrand, params) => {
         });
         });
     }
     }
 
 
-     // 品牌数据处理
-     // 分拆品牌参数
+    // 品牌数据处理
+    // 分拆品牌参数
     let brands = _.split(params.brand, ',');
     let brands = _.split(params.brand, ',');
     let intBrands = [];
     let intBrands = [];
 
 
@@ -264,11 +264,11 @@ const formatterFilterBrands = (source, paramBrand, params) => {
             });
             });
         }
         }
 
 
-         // 没有品牌的情况下将 brand 设置为 false，前端不显示 品牌
+        // 没有品牌的情况下将 brand 设置为 false，前端不显示 品牌
         if (_.size(dbrand.brandsShow) <= 0) {
         if (_.size(dbrand.brandsShow) <= 0) {
             return false;
             return false;
         } else {
         } else {
-             // 品牌排序
+            // 品牌排序
             dbrand.brandsShow = _.sortBy(dbrand.brandsShow, o => {
             dbrand.brandsShow = _.sortBy(dbrand.brandsShow, o => {
                 return o.index;
                 return o.index;
             });
             });
@@ -1131,7 +1131,7 @@ exports.handleSortIntro = (data) => {
     _.forEach(data.keyword, function(value) {
     _.forEach(data.keyword, function(value) {
         sortIntro.keyEntry.push({
         sortIntro.keyEntry.push({
             name: value.word,
             name: value.word,
-            url: value.url
+            url: value.url.replace(/(parameter_)(\d+)=(\d+)/, (match, p1, p2, p3) => `standard=${p2}_${p3}`)
         });
         });
     });
     });
 
 
@@ -1270,7 +1270,7 @@ exports.handleNextPage = (params, total) => {
     return {
     return {
         href: href,
         href: href,
         src: '//img10.static.yhbimg.com/product/2014/01/15/11/01fa01614784f6239760f1b749663016f1.jpg?' +
         src: '//img10.static.yhbimg.com/product/2014/01/15/11/01fa01614784f6239760f1b749663016f1.jpg?' +
-            'imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
+        'imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
     };
     };
 };
 };
 
 
@@ -1393,12 +1393,12 @@ exports.getBrandSeo = (channel, brandInfo) => {
         bbc = b + bcn + c,
         bbc = b + bcn + c,
         title = bb || b || '',
         title = bb || b || '',
         keywords = [b ? b + ',' : '',
         keywords = [b ? b + ',' : '',
-                    ((b && bcn) ? (bb + ',') : ''),
-                    bc || '',
-                    '品牌'].join(''),
+            ((b && bcn) ? (bb + ',') : ''),
+            bc || '',
+            '品牌'].join(''),
         desc = [b + '正品网购。',
         desc = [b + '正品网购。',
-                bbc || '',
-                '品牌官方授权！YOHO! 有货中国最大的潮流商品购物网站。100%品牌正品保证,支持货到付款。'].join('');
+            bbc || '',
+            '品牌官方授权！YOHO! 有货中国最大的潮流商品购物网站。100%品牌正品保证,支持货到付款。'].join('');
 
 
     title += (title ? (title + '|') : '') + c + '品牌|YOHO!BUY 有货 100%正品保证';
     title += (title ? (title + '|') : '') + c + '品牌|YOHO!BUY 有货 100%正品保证';