Merge branch 'feature/wwwGuang' into gray

@@ -71,7 +71,7 @@ module.exports = class extends global.yoho.BaseModel {
             [{
             [{
                 name: '逛',
                 name: '逛',
                 pathTitle: '逛',
                 pathTitle: '逛',
-                href: helpers.urlFormat('', '', 'guang')
+                href: helpers.urlFormat('/guang/', null)
             }]
             }]
         );
         );
 
 
@@ -239,7 +239,7 @@ module.exports = class extends global.yoho.BaseModel {
 
 
         return {
         return {
             img: helpers.image(adData.src, 640, 640),
             img: helpers.image(adData.src, 640, 640),
-            url: helpers.urlFormat('/info/index', param, 'guang'),
+            url: helpers.urlFormat('/guang/info/index', param),
             title: adData.title,
             title: adData.title,
             bgColor: adData.bgColor
             bgColor: adData.bgColor
         };
         };
@@ -1029,10 +1029,10 @@ module.exports = class extends global.yoho.BaseModel {
                 pageSize: pageSize,
                 pageSize: pageSize,
                 page: page,
                 page: page,
                 list: list,
                 list: list,
-                baseUrl: helpers.urlFormat('/info/index', {
+                baseUrl: helpers.urlFormat('/guang/info/index', {
                     id: aid,
                     id: aid,
                     pageSize: pageSize
                     pageSize: pageSize
-                }, 'guang')
+                })
             };
             };
         });
         });
     }
     }

@@ -239,7 +239,7 @@ const favoriteArticleListAsync = (uid, udid, page, limit, type)=> {
                 name: item.title,
                 name: item.title,
                 img: helpers.image(item.src, 146, 96),
                 img: helpers.image(item.src, 146, 96),
                 desc: item.intro,
                 desc: item.intro,
-                url: helpers.urlFormat('/' + item.id + '.html', '', 'guang')
+                url: helpers.urlFormat(`/guang/${item.id}.html`, null)
             };
             };
         });
         });
 
 

@@ -722,7 +722,7 @@ const getShopData = (shopId, channel, params, shopInfo) => {
 
 
                 for (let i = 0; i < 3; i++) {
                 for (let i = 0; i < 3; i++) {
                     trendList.push({
                     trendList.push({
-                        href: helpers.urlFormat(`/${articleList[i].id}.html`, '', 'guang'),
+                        href: helpers.urlFormat(`/guang/${articleList[i].id}.html`, null),
                         src: helpers.getForceSourceUrl(articleList[i].src) +
                         src: helpers.getForceSourceUrl(articleList[i].src) +
                             '?imageView2/1/w/{width}/h/{height}',
                             '?imageView2/1/w/{width}/h/{height}',
                         mainTitle: articleList[i].title,
                         mainTitle: articleList[i].title,

@@ -104,7 +104,7 @@ const _proListHandler = (data, params) => {
         if (pro.recommend_type === 'fashionArticle') {
         if (pro.recommend_type === 'fashionArticle') {
 
 
             proObj = {
             proObj = {
-                url: helpers.urlFormat('/' + pro.data.id + '.html', {channel: params.channel}, 'guang'),
+                url: helpers.urlFormat(`/guang/${pro.data.id}.html`, null),
                 src: pro.data.src,
                 src: pro.data.src,
                 title: pro.data.title,
                 title: pro.data.title,
                 publishTime: moment(parseInt(pro.data.publish_time_long, 10)).format('YYYY年MM月DD HH:mm'),
                 publishTime: moment(parseInt(pro.data.publish_time_long, 10)).format('YYYY年MM月DD HH:mm'),