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

@@ -21,15 +21,15 @@ const index = (req, res, next) => {
     if (channel === 'women') {
         contentCode = '527079e6c46d0f125eb46b835968971b';
         name = 'WOMEN首页';
-        link = 'http://www.yohoblk.com';
+        link = 'http://www.yohoblk.com/women';
     } else if (channel === 'lifestyle') {
         contentCode = '94b5ed607b6d565ffc29c2c04be121dc';
         name = 'LIFT STYLE首页';
-        link = 'http://www.yohoblk.com/women';
+        link = 'http://www.yohoblk.com/lifestyle';
     } else {
         contentCode = '81886aaa5e82e3741bc1ba1e04ec7706';
         name = 'MEN首页';
-        link = 'http://www.yohoblk.com/lifestyle';
+        link = 'http://www.yohoblk.com';
     }
 
     let appType = 1;

@@ -124,7 +124,7 @@ const list = (req, res) => {
                     },
                     {
                         pathTitle: '资讯',
-                        name: req.query.query
+                        name: req.query.query || result.authorName
                     }
                 ],
                 pathTitle: req.query.query || result.authorName,

@@ -36,6 +36,7 @@ const _processListData = (list) => {
     });
 
     _.forEach(list.list.artList, (data) => {
+        // console.log(data)
 
         if (data.author) {
             listData = _.assign(listData, {
@@ -151,7 +152,6 @@ const _processHeadData = (list) => {
         _.forEach(list, function(data, index) {
 
             if (index === 0) {
-
                 data.isPraise = data.isPraise === 'Y';
                 data.isFavor = data.isFavor === 'Y';
 
@@ -340,13 +340,19 @@ const _processContentData = (list) => {
  * @param id
  * @returns {*}
  */
+
 const _getHeadData = (id, uid, udid, appType) => {
-    return serviceAPI.get('/guang/api/*/article/getArticleBaseInfo', {
+    let par = {
         id: id,
-        uid: uid,
         udid: udid,
         app_type: appType
-    }).then((result) => {
+    };
+
+    if (uid) {
+        par.uid = uid;
+    }
+
+    return serviceAPI.get('/guang/api/*/article/getArticleBaseInfo', par).then((result) => {
         if (result && result.code === 200) {
             return result.data;
         } else {

@@ -7,7 +7,7 @@
                 <a href="/me/collection"><span class="badge"></span>商品收藏</a>
             </li>
             <li class="{{#if brand}}active{{/if}}">
-                <a href="/me/collection/brand"><span class="badge"></span>店铺收藏</a>
+                <a href="/me/collection/brand"><span class="badge"></span>品牌收藏</a>
             </li>
             <li class="{{#if editorial}}active{{/if}}">
                 <a href="/me/collection/editorial"><span class="badge"></span>资讯收藏</a>

 {{# data}}
 
     {{#if total}}
+
         <div class="favorite-brands">
+            <span class="num">您共收藏了{{total}}个品牌</span>
             <div class="brands-list clearfix">
                 {{#each brandList}}
                     <div class="brand-raw clearfix">

@@ -2,6 +2,7 @@
 
     {{#if total}}
         <div class="favorite-editorials">
+            <span class="num">您共收藏了{{total}}篇文章</span>
             <div class="editorial-list clearfix">
                 {{#each editorialList}}
                     <div class="editorial-raw clearfix" data-id="{{id}}">

@@ -22,8 +22,8 @@ module.exports = {
     },
     cookieDomain: 'yohoblk.com',
     domains: {
-        api: 'http://dev-api.yohops.com:9999/', // devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
-        service: 'http://dev-service.yohops.com:9999/', // testservice.yoho.cn:28077 devservice.yoho.cn:58077
+        api: 'http://testapi.yoho.cn:28078/', // devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
+        service: 'http://testservice.yoho.cn:28077/', // testservice.yoho.cn:28077 devservice.yoho.cn:58077
         search: 'http://192.168.102.216:8080/yohosearch/'
     },
     useOneapm: false,

@@ -202,7 +202,7 @@
     }
 
     .brands {
-        width: 950px;
+        width: 960px;
         padding: 30px 0 30px 30px;
         overflow: hidden;
 
@@ -242,6 +242,10 @@
         }
     }
 
+    .brand:nth-child(7n) {
+        margin-right: 0;
+    }
+
     .user-handle {
         float: right;
         ul {

 .favorite-brands {
+    position: relative;
+
+    .num {
+        position: absolute;
+        top: -30px;
+        left: 600px;
+        font-size: 16px;
+        color: #666;
+    }
 
     .brand-raw > div {
         float: left;

 .favorite-editorials {
+     position: relative;
+    
+    .num {
+        position: absolute;
+        top: -30px;
+        left: 600px;
+        font-size: 16px;
+        color: #666;
+    }
 
     .editorial-raw > div {
         float: left;