修改url链接

@@ -100,7 +100,7 @@ const getBrandViewTop = channel => {
                 brandAds.push({
                 brandAds.push({
                     name: subValue.name,
                     name: subValue.name,
                     src: helpers.image(subValue.src, 80, 50, 3),
                     src: helpers.image(subValue.src, 80, 50, 3),
-                    url: helpers.urlFormat(subValue.url)
+                    url: subValue.url
                 });
                 });
             });
             });
         }
         }
@@ -120,7 +120,7 @@ const getBrandViewTop = channel => {
                 brandLogos.push({
                 brandLogos.push({
                     name: subValue.title,
                     name: subValue.title,
                     src: srcUrl,
                     src: srcUrl,
-                    url: helpers.urlFormat(subValue.url)
+                    url: subValue.url
                 });
                 });
             });
             });
         }
         }
@@ -162,11 +162,11 @@ const getBrandViewList = (channel, start, length) => {
                     let href;
                     let href;
 
 
                     if (switchParams.channelType === 1) {
                     if (switchParams.channelType === 1) {
-                        href = helpers.urlFormat(ssubValue.brand_domain) + '?gender=1,3';
+                        href = helpers.urlFormat('', {gender: '1,3'}, ssubValue.brand_domain);
                     } else if (switchParams.channelType === 2) {
                     } else if (switchParams.channelType === 2) {
-                        href = helpers.urlFormat(ssubValue.brand_domain) + '?gender=2,3';
+                        href = helpers.urlFormat('', {gender: '2,3'}, ssubValue.brand_domain);
                     } else {
                     } else {
-                        href = helpers.urlFormat(ssubValue.brand_domain);
+                        href = helpers.urlFormat('', '', ssubValue.brand_domain);
                     }
                     }
                     let brandItem = {
                     let brandItem = {
                         name: ssubValue.brand_name,
                         name: ssubValue.brand_name,
@@ -260,7 +260,7 @@ const getBrandInfoByIds = (brandIds) => {
         if (data.data && data.code === 200) {
         if (data.data && data.code === 200) {
             _.forEach(data.data, (subValue, k) => {
             _.forEach(data.data, (subValue, k) => {
                 subValue.desc = _.trim(subValue.brand_intro.replace('/[\r\n\t ]/g', ''));
                 subValue.desc = _.trim(subValue.brand_intro.replace('/[\r\n\t ]/g', ''));
-                subValue.url = helpers.urlFormat(subValue.brand_domain);
+                subValue.url = subValue.brand_domain;
                 delete subValue.brand_intro;
                 delete subValue.brand_intro;
                 brandsInfo[k] = subValue;
                 brandsInfo[k] = subValue;
             });
             });
@@ -287,7 +287,7 @@ const getPlusstarBrandListItem = (channel) => {
         let items = [];
         let items = [];
 
 
         if (resource.data && resource.code === 200) {
         if (resource.data && resource.code === 200) {
-            items[0] = {name: '所有品牌', src: '', url: helpers.urlFormat('/brands'), brandType: ''};
+            items[0] = {name: '所有品牌', src: '', url: helpers.urlFormat('/brands', ''), brandType: ''};
             items[1] = {name: '设计新潮', src: '', url: '', brandType: 4};
             items[1] = {name: '设计新潮', src: '', url: '', brandType: 4};
             items[2] = {name: '潮流经典', src: '', url: '', brandType: 1};
             items[2] = {name: '潮流经典', src: '', url: '', brandType: 1};
             items[3] = {name: '明星潮牌', src: '', url: '', brandType: 2};
             items[3] = {name: '明星潮牌', src: '', url: '', brandType: 2};
@@ -302,7 +302,7 @@ const getPlusstarBrandListItem = (channel) => {
                 }
                 }
 
 
                 if (pos in resourceData[0].data) {
                 if (pos in resourceData[0].data) {
-                    subValue.url = helpers.urlFormat(resourceData[0].data[pos].url);
+                    subValue.url = resourceData[0].data[pos].url;
                     subValue.src = helpers.image(resourceData[0].data[pos].src, 222, 180, 1);
                     subValue.src = helpers.image(resourceData[0].data[pos].src, 222, 180, 1);
                     subValue.name = resourceData[0].data[pos].title;
                     subValue.name = resourceData[0].data[pos].title;
                 }
                 }

@@ -14,6 +14,33 @@ const _ = require('lodash');
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 const pager = require(`${global.utils}/pager`).setPager;
 const pager = require(`${global.utils}/pager`).setPager;
 
 
+const BOYS = 'boys';
+const GIRLS = 'girls';
+
+/**
+ * 获取品牌一览资源位&channelType
+ *
+ * @param string $channelStr
+ * @return array
+ */
+const getGenderByChannel = channel => {
+    let gender = '';
+
+    switch (channel) {
+
+        case BOYS:
+            gender = '1,3';
+            break;
+        case GIRLS:
+            gender = '2,3';
+            break;
+        default:
+            gender = '1,2,3';
+            break;
+    }
+    return gender;
+};
+
 // 添加网站的SEO
 // 添加网站的SEO
 const seoMap = {
 const seoMap = {
     boys: {
     boys: {
@@ -129,18 +156,8 @@ exports.plusstarList = (channel, req) => {
             brandsHomePage: true
             brandsHomePage: true
         };
         };
 
 
-        let genderChannel;
-
-        if (channel === 'boys') {
-            genderChannel = '1,3';
-        } else if (channel === 'girls') {
-            genderChannel = '2,3';
-        } else {
-            genderChannel = '1,2,3';
-        }
-
         let id = req.query.id || '',
         let id = req.query.id || '',
-            gender = req.query.gender || genderChannel,
+            gender = req.query.gender || getGenderByChannel(channel),
             limit = 20,
             limit = 20,
             page = parseInt(req.query.page, 10) || 1;
             page = parseInt(req.query.page, 10) || 1;
 
 
@@ -174,7 +191,7 @@ exports.plusstarList = (channel, req) => {
             _.forEach(brandIds, brandId => {
             _.forEach(brandIds, brandId => {
                 if (brandsInfo[brandId]) {
                 if (brandsInfo[brandId]) {
                     list[brandId].desc = brandsInfo[brandId].desc;
                     list[brandId].desc = brandsInfo[brandId].desc;
-                    list[brandId].url = helpers.urlFormat(brandsInfo[brandId].url + '?gender=' + gender);
+                    list[brandId].url = helpers.urlFormat('', {gender: gender}, brandsInfo[brandId].url);
                 }
                 }
                 brands.push(list[brandId]);
                 brands.push(list[brandId]);
             });
             });