品牌

+/**
+ * 品牌
+ * @author: zxr<xiaoru.zhang@yoho.cn>
+ * @date: 2016/7/8
+ */
+
+'use strict';
+
+
+const index = (req, res, next) => {
+    res.display('index', {
+        module: 'brand',
+        page: 'index',
+        title: '品牌',
+        brand: {
+            nav: [
+                {
+                    link: '//guang.yohobuy.com/index/index?type=0',
+                    pathTitle: '首页',
+                    name: 'MEN首页'
+                },
+                {
+                    link: '/',
+                    pathTitle: '品牌',
+                    name: 'Brand品牌'
+                }
+            ],
+            tabs: [
+                {
+                    url: '#',
+                    name: '',
+                    src: '#'
+                },
+                {
+                    url: '#',
+                    name: '',
+                    src: '#'
+                },
+                {
+                    url: '#',
+                    name: '',
+                    src: '#'
+                }
+            ],
+            navigation: [
+                {
+                    name: 'A'
+                },
+                {
+                    name: 'B'
+                },
+                {
+                    name: 'B'
+                },
+                {
+                    name: 'A'
+                },
+                {
+                    name: 'B'
+                },
+                {
+                    name: 'B'
+                },
+                {
+                    name: 'B'
+                }
+            ],
+            category: [
+                {
+                    key: 'A',
+                    brandList: [
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        },
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        },
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        },
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        },
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        },
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        }
+                    ]
+                },
+               {
+                    key: 'A',
+                    brandList: [
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        },
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        },
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        },
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        },
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        },
+                        {
+                            key: 'A',
+                            href: '#',
+                            name: 'edhwke'
+                        }
+                    ]
+                }
+            ]
+        },
+
+        helpers: {
+            // import component, path depends on your project
+            pagination: require('../../../doraemon/components/pagination/pagination').createPagination
+        }
+    });
+}
+
+module.exports = {
+    index // 组件demo页
+};

+/**
+ * sub app partial
+ * @author: zhangxiaoru<xiaoru.zhang@yoho.cn>
+ * @date: 2016/07/8
+ */
+'use strict';
+var express = require('express'),
+    path = require('path'),
+    hbs = require('express-handlebars');
+
+var app = express();
+
+// set view engin
+var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root
+// var partials = path.join(__dirname, './views'); // parent view root
+
+app.on('mount', function(parent) {
+    delete parent.locals.settings; // 不继承父 App 的设置
+    Object.assign(app.locals, parent.locals);
+});
+
+app.set('views', path.join(__dirname, 'views/action'));
+app.engine('.hbs', hbs({
+    extname: '.hbs',
+    defaultLayout: 'layout',
+    layoutsDir: doraemon,
+    partialsDir: [path.join(__dirname, 'views/partial'), `${doraemon}/partial`],
+    helpers: global.yoho.helpers
+}));
+
+// router
+app.use(require('./router'));
+
+module.exports = app;

+'use strict';

+/**
+ * router of sub app channel
+ * @author: zhangxiaoru<xiaoru.zhang@yoho.cn>
+ * @date: 2016/07/04
+ */
+
+'use strict';
+
+const router = require('express').Router(); // eslint-disable-line
+const cRoot = './controllers';
+const brand = require(cRoot + '/brand');
+
+router.get('/', brand.index); // 品牌首页
+
+module.exports = router;

+<div class="brand-page blk-page center-content">
+{{# brand}}
+    {{> path-nav}}
+
+    <div class="brands-tabs height-initial">
+        <ul class="clearfix">
+            {{#each tabs}}
+            <li>
+                <a href="{{url}}" target="_blank">
+                    <div class="g-mask"></div>
+                    <p class="tips">{{name}}</p>
+                    <img class="lazy" data-original="{{src}}"/>
+                </a>
+            </li>
+            {{/each}}
+        </ul>
+    </div>
+
+    <div class="brands-category">
+        <div class="category-nav">
+            {{#each navigation}}
+            <a href="#{{name}}">{{name}}</a>
+            {{/each}}    
+        </div>
+    </div>
+
+    <div class="brands-list" >
+        {{> list}}
+    </div>
+
+{{/ brand}}
+</div>
\ No newline at end of file

+{{#each category}}
+    <dl class="clearfix" name="{{key}}">
+        <dt>{{key}}</dt>
+        <dd>
+            <ul class="clearfix">
+                {{#each brandList}}
+                <li>
+                    <a data-key="{{key}}" href="{{href}}" target="_blank">
+                        <img class="lazy" data-original="{{href}}">
+                        <span>{{name}}</span>
+                    </a>
+                </li>
+                {{/each}}
+            </ul>
+        </dd>
+    </dl>
+{{/each}}
\ No newline at end of file

@@ -8,7 +8,7 @@
 
 const editorialModel = require('../models/editorial');
 
-const index = (req, res,next) => {
+const index = (req, res, next) => {
     let pageNum = req.query.page || 1;
     let type = req.query.type || 0;
 
@@ -27,20 +27,20 @@ const index = (req, res,next) => {
                     {
                         link: '/editorial?type=1',
                         pathTitle: '资讯',
-                        name: '咨询'
+                        name: '资讯'
                     },
                     {
                         link: '/',
                         pathTitle: '资讯',
-                        name: '咨询'
+                        name: '资讯'
                     }
                 ],
                 msgTypes: result.msgTypes,
                 msg: result.msg,
                 paginationOpts: {
                     page: pageNum,        // current page: http://host/?page=2
-                    limit: 10,            // per_page records' number
-                    total: 100,            // total page number
+                    limit: 20,            // per_page records' number
+                    total: 300,            // total page number
                     queryParams: req.query
                 }
             },

@@ -4,8 +4,10 @@ const serviceAPI = global.yoho.ServiceAPI;
 // const api = global.yoho.API;
 const camelCase = global.yoho.camelCase;
 const _ = require('lodash');
+const moment = require('moment');
 const logger = global.yoho.logger;
-//const helpers = global.yoho.helpers;
+
+// const helpers = global.yoho.helpers;
 
 const _processNavData = (list, type) => {
     let formatData = [];
@@ -15,38 +17,24 @@ const _processNavData = (list, type) => {
 
     _.forEach(list, (data, index) => {
         data.url = `//127.0.0.1:6003/editorial?type=${data.id}`;
-
-        if (index === _.parseInt(type)) {
-            data.isActive = true;
-        } else {
-            data.isActive = false;
-        }
+        data.isActive = index === parseInt(type) ? true : false;
 
         formatData.push(data);
     });
 
-    console.log(formatData);
-
     return formatData;
 };
 
 const _processListData = (list) => {
-    //let formatData = [];
 
     list = list || [];
+    list = camelCase(list);
 
-    //list = camelCase(list);
-
-    '2016年06月02日 15:56'.match(/^(\d+)年(\d+)月(\d+)日 (\d+):(\d+)$/, function(data) {
-        console.log(data);
-    });
+    let data = moment('2016年06月02日 15:56', "YYYY年MM月DD日 HH:mm").format('YYYY/MM/DD HH:mm');
 
     let artList = list.list.artList.map(data =>{
 
-        // let time = data.publish_time.match(/^(\d+)年(\d+)月(\d+)日 (\d+):(\d+)$/);
-        // data.publishTime = `${time[1]}/${time[2]}/${time[3]} ${time[4]}:${time[5]}`
-
-        data.publishTime = data.publish_time.replace(/年|月/g, '/');
+        data.publishTime = data.publishTime.replace(/年|月/g, '/');
         data.publishTime = data.publishTime.replace(/日/g, '');
 
         return data;
@@ -77,8 +65,8 @@ const _getBreakingSort = () => {
     });
 };
 
-const getIndexData = () => {
-    return Promise.all([_getResources(), _getBreakingSort()])
+const getIndexData = (type) => {
+    return Promise.all([_getResources(type), _getBreakingSort()])
     .then((result) => {
 
         return {

@@ -3,7 +3,7 @@
     <div class="msg-right">
         <a class="msg-title" href="{{url}}" target="_blank">{{title}}</a>
         <a href="{{url}}" target="_blank">
-            <img class="lazy" data-original="{{img}}">
+            <img class="lazy" data-original="{{src}}">
         </a>
         <div class="content">{{intro}}</div>
         <div class="msg-app">

@@ -16,4 +16,5 @@ module.exports = app => {
     app.use('/me', require('./apps/me'));    // 个人中心
     app.use('/editorial', require('./apps/editorial')); // 资讯
     app.use('/product', require('./apps/product'));
+    app.use('/brand', require('./apps/brand')); // 资讯
 };

+/**
+ * 品牌页
+ * @author: zxr<xiaoru.zhang@yoho.cn>
+ * @date: 2016/07/09
+ */
+
+var $ = require('yoho-jquery'),
+    lazyLoad = require('yoho-jquery-lazyload');
+
+require('../common/header');
+require('../common/return-top');
+
+lazyLoad($('#msg-list img.lazy'));
+

@@ -7,26 +7,22 @@
 var $ = require('yoho-jquery'),
     lazyLoad = require('yoho-jquery-lazyload');
 
-// var prising;
+require('../common/header');
+require('../common/return-top');
 
 lazyLoad($('#msg-list img.lazy'));
 
-$('.msg-nav li').on('click', function() {
-    // var activeTab = $(this).attr('data-type'),
-    //     href = $(this).find('a').attr('href');
-
-    $('.msg-nav li').removeClass('active');
-    $(this).addClass('active');
-});
-
 $('.editorial-index-page').on('click', '.like-icon', function() {
-    var $this = $(this);
-
-    // msgId = $this.closest('.content-msg').data().id;
-
-    $this.toggleClass('liked');
-
+    var $this = $(this),
+        num =  parseInt($this.next().html());
+
+    if ($this.hasClass('liked')) {
+        $this.removeClass('liked');
+        num = num - 1;
+    }else {
+        $this.addClass('liked');
+        num = num + 1;
+        console.log(num)
+    }
+    $this.next().html(num) 
 });
-
-require('../common/header');
-require('../common/return-top');

+.brand-page {
+    padding-bottom: 80px;
+
+    .brands-tabs {
+        position: relative;
+
+        a {
+            display: block;
+            width: 370px;
+            height: 304px;
+            /*border: 1px solid red;*/
+
+            img {
+                width: 100%;
+                height: 100%;
+                display: block;
+            }
+
+            .g-mask {
+                width: 100%;
+                height: 100%;
+                display: block;
+                position: absolute;
+                z-index: 1;
+                background: #ffec07;
+                border: 1px solid #ffec07;
+                opacity: 0;
+            }
+        }
+
+        li {
+            float: left;
+            margin-left: 20px;
+            position: relative;
+           
+            p {
+                display: block;
+                font-size: 30px;
+                text-align: center;
+                color: #ffec07;
+                position: absolute;
+                top: 50%;
+                width: 100%;
+                margin-top: -15px;
+                z-index: 3;
+            }
+        }
+
+        li:first-child {
+            margin-left: 0;
+        }
+
+        li:hover {
+           .g-mask {
+                opacity: 0.3;
+           }
+        }
+    }
+
+    .category-nav {
+        margin-top: 20px;
+        border-top: 1px solid #eee;
+        border-bottom: 1px solid #eee;
+        padding-left: 16px;
+        height: 44px;
+        line-height: 44px;
+        font-size: 12px;
+        font-weight: bold;
+        position: relative;
+        z-index: 100;
+        background-color: #fff;
+        
+        a {
+            display: inline-block;
+            padding: 0 7px;
+            text-align: center;
+            color: #222;
+            cursor: pointer;
+        }
+
+        a:hover {
+            color: #379ed6;
+        }
+    }
+
+    .brands-list {
+
+       /* dl {
+            height: 70px;
+            line-height: 70px;
+            border-top: 1px solid #999;
+        }*/
+
+        dt {
+            height: 70px;
+            line-height: 70px;
+            font-weight: bold;
+            font-size: 24px;
+        }
+
+        dd {
+
+            li {
+                float: left;
+                display: block;
+                width: 275px;
+                height: 250px;
+                margin-right: 15px;
+                border: 1px solid #eee;
+                margin-top: 20px;
+            }
+
+            li:nth-child(4n) {
+                margin-right: 0;
+            }
+
+            li:nth-child(-n+4) {
+                margin-top: 0;
+            }
+
+            a {
+                font-size: 16px;
+                display: block;
+                width: 100%;
+                height: 100%;
+
+                img {
+                    width: 275px;
+                    height: 190px;
+                }
+
+                span {
+                    display: block;
+                    height: 60px;
+                    line-height: 60px;
+                    text-align: center;
+                    font-size: 16px;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

@@ -13,7 +13,5 @@
 @import "product/index";
 @import "channel/index";
 @import "passport/index";
-
-/* 资讯 */
 @import "editorial/index";
-
+@import "brand/brand";