editorial

@@ -69,23 +69,19 @@ const _processTabData = (list) => {
     list = list || [];
     list = camelCase(list);
 
-    _.forEach(list, function(value, index) {
-
-        if (index === 1) {
-            _.forEach(value.data, function(data) {
-                tabData.push(
-                    {
-                        url: data.url,
-                        name: data.title,
-                        src: data.src
-                    }
-                );
-            });
-        }
+    _.forEach(list, function(value) {
+
+        _.forEach(value.data, function(data) {
+            tabData.push(
+                {
+                    url: data.url,
+                    src: data.src
+                }
+            );
+        })
     });
 
     return tabData;
-
 };
 
 /**
@@ -95,7 +91,9 @@ const _processTabData = (list) => {
  */
 const _getResources = (contentCode) => {
     return serviceAPI.get('operations/api/v5/resource/get', {content_code: contentCode}).then((result) => {
+
         if (result && result.code === 200) {
+            //console.log(result)
             return _processTabData(result.data);
         } else {
             logger.error('The data of brand resources return code is not 200');

@@ -8,6 +8,7 @@
 
 const editorialModel = require('../models/editorial');
 const md5 = require('md5');
+const config = global.yoho.config;
 
 /**
  * 资讯首页数据
@@ -105,6 +106,12 @@ const list = (req, res) => {
         link = 'http://www.yohoblk.com/lifestyle';
     }
 
+    if(tag) {
+        res.cookie('tag', tag, {
+            domain: config.cookieDomain
+        }); 
+    }
+
     editorialModel.getListData(appType, pageNum, limit, udid, gender, tag, authorId).then((result) => {
 
         res.display('list', {
@@ -159,19 +166,24 @@ const detail = (req, res, next) => {
     let channel = req.cookies._Channel || 'men';
     let name = '';
     let link = '';
+    let gender = '';
+    let tag = req.cookies.tag;
 
     if (channel === 'men') {
         name = 'MEN首页';
         link = 'http://www.yohoblk.com';
+        gender = '1,3';
     } else if (channel === 'women') {
         name = 'WOMEN首页';
         link = 'http://www.yohoblk.com/women';
+        gender = '2,3';
     } else {
         name = 'LIFESTYLE首页';
         link = 'http://www.yohoblk.com/lifestyle';
+        gender = '3,3';
     }
 
-    editorialModel.getDetailData(id, appType, uid, udid).then((result) => {
+    editorialModel.getDetailData(id, appType, gender, tag, uid, udid).then((result) => {
         res.display('detail', {
             module: 'editorial',
             page: 'detail',

@@ -95,7 +95,7 @@ const getListData = (appType, pageNum, limit, udid, gender, tag, authorId) => {
     };
 
     if (tag) {
-        param.tag = tag;
+        param.tag = tag;       
     }
 
     if (authorId) {
@@ -495,11 +495,18 @@ const _getRelateBrand = (id, appType) => {
  * @param id
  * @returns {*}
  */
-const _getArticlePre = (id, appType) => {
-    return serviceAPI.get('guang/api/*/article/getArticlePre', {
+const _getArticlePre = (id, appType,  gender, tag) => {
+    let per = {
         id: id,
-        app_type: appType
-    }).then((result) => {
+        app_type: appType,
+        gender: gender
+    }
+
+    if (tag) {
+        per.tag = tag;
+    }
+
+    return serviceAPI.get('guang/api/*/article/getArticlePre', per).then((result) => {
 
         if (result && result.code === 200) {
             let perArticle = {};
@@ -524,11 +531,19 @@ const _getArticlePre = (id, appType) => {
  * @param id
  * @returns {*}
  */
-const _getArticleNext = (id, appType) => {
-    return serviceAPI.get('guang/api/*/article/getArticleNext', {
+const _getArticleNext = (id, appType, gender, tag) => {
+    let per = {
         id: id,
-        app_type: appType
-    }).then((result) => {
+        app_type: appType,
+        gender: gender
+    }
+
+    if (tag) {
+        per.tag = tag;
+    }
+    console.log(tag)
+
+    return serviceAPI.get('guang/api/*/article/getArticleNext', per).then((result) => {
 
         if (result && result.code === 200) {
 
@@ -656,14 +671,14 @@ const shareData = () => {
  * @param id
  * @returns {*}
  */
-const getDetailData = (id, appType, uid, udid) => {
+const getDetailData = (id, appType, gender, tag, uid, udid) => {
     return co(function *() {
         let result = yield Promise.all([_getHeadData(id, appType, uid, udid),
                                         _getArticleData(id, appType),
                                         _getContentData(id, appType),
                                         _getCommentsData(id, appType),
-                                        _getArticlePre(id, appType),
-                                        _getArticleNext(id, appType),
+                                        _getArticlePre(id, appType, gender, tag),
+                                        _getArticleNext(id, appType, gender, tag),
                                         _getRelateBrand(id, appType)]);
         let res = yield _processHeadData([result[0], result[1], result[3]]);
 

@@ -28,9 +28,11 @@
         <div class="article-main">
             {{# content}}
                 {{# singleImage}}
+                <span class="article-pic">
                     {{# data}}
                         <img src="{{image src 930 660 1}}">
                     {{/ data}}
+                </span>
                 {{/ singleImage}}
                 {{# smallPic}}
                 <span class="article-pictwo">

@@ -77,8 +77,15 @@
     .article-main {
         text-align: center;
         margin: 0 auto;
+    }
 
-        img {
+    .article-pict {
+        max-width: 930px;
+        margin: 0 auto;
+        overflow: hidden;
+        display: block;
+
+       img {
             max-width: 930px;
             display: inherit;
             margin: auto;