新品节品牌

 var $ = require('jquery'),
-    lazyLoad = require('./common/lazyload'),
-    Swiper = require('yoho-idangerous.swiper');
-
-
-
-new Swiper('.swiper-container0', {
-    pagination: '.swiper-pagination0'
-});
-new Swiper('.swiper-container1', {
-    pagination: '.swiper-pagination1'
-});
-
-new Swiper('.swiper-container2', {
-    pagination: '.swiper-pagination2'
-});
-
-
-
-
-
+	lazyLoad = require('./common/lazyload'),
+	Swiper = require('yoho-idangerous.swiper');
+
+
+function initSwiper() {
+	$('.newfestivalbrandwrapper .show').find('.swiper-container').each(function() {
+		var id = $(this).attr('id');
+		new Swiper('.swiper-container' + id, {
+			pagination: '.swiper-pagination' + id
+		});
+	})
+}
+$(document).on('click', '.navitemwrapper', function() {
+	var nowActHeader = $(this),
+		preActHeader = $('.newfestivalbrandheader').data('actheadtag') || $('.hasunderline'),
+		tagId = nowActHeader.attr('tagid'),
+		nowActContent = $('#showpannel' + tagId),
+		preActContent = $('.newfestivalbrandheader').data('actcontenttag') || $('.newfestivalbrandwrapper .show');
+	preActHeader.removeClass('hasunderline');
+	nowActHeader.addClass('hasunderline');
+	$('.newfestivalbrandheader').data('actheadtag', nowActHeader);
+	preActContent.removeClass('show').addClass('hide');
+	nowActContent.removeClass('hide').addClass('show');
+	$('.newfestivalbrandheader').data('actcontenttag', nowActContent);
+	initSwiper();
+})
+$(document).ready(function(){
+	initSwiper();
+})
\ No newline at end of file

@@ -3,7 +3,7 @@
  * @author: xuqi(qi.xu@yoho.cn)
  * @date: 2015/3/30
  */
-module.exports = function (flag) {
+module.exports = function(flag) {
     switch (flag) {
         //新品节
         case 'newfestival':
@@ -22,7 +22,7 @@ module.exports = function (flag) {
                     url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                     title: '',
                     alt: '单个图片',
-                    imgId:  '0',
+                    imgId: '0',
                     src: 'http://img13.static.yhbimg.com/taobaocms/2015/06/17/07/02934d7696b187d260341d31c084eb93cc.jpg'
                 },
                 imageList: [{
@@ -32,37 +32,37 @@ module.exports = function (flag) {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/0244a127c89c1f77ab47f55891e45be1e6.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }, {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }, {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/04/03/07/0235b2d48417d0e92b94484d284dca06fc.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }, {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/0244a127c89c1f77ab47f55891e45be1e6.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }, {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }, {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/04/03/07/0235b2d48417d0e92b94484d284dca06fc.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }]
                 }, {
@@ -72,37 +72,37 @@ module.exports = function (flag) {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/0244a127c89c1f77ab47f55891e45be1e6.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }, {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }, {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/04/03/07/0235b2d48417d0e92b94484d284dca06fc.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }, {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/0244a127c89c1f77ab47f55891e45be1e6.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }, {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }, {
                         url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                         title: '',
                         alt: '',
-                        imgId:  '0',
+                        imgId: '0',
                         src: 'http://img13.static.yhbimg.com/goodsimg/2015/04/03/07/0235b2d48417d0e92b94484d284dca06fc.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90'
                     }]
                 }],
@@ -112,7 +112,7 @@ module.exports = function (flag) {
                     url: 'http://www.yohobuy.com/special_8585_0618TEEBOY.html',
                     title: '',
                     alt: '单个图片',
-                    imgId:  '0',
+                    imgId: '0',
                     src: 'http://img13.static.yhbimg.com/taobaocms/2015/06/17/07/02934d7696b187d260341d31c084eb93cc.jpg'
                 },
                 newArrival: [{
@@ -166,19 +166,235 @@ module.exports = function (flag) {
                 }]
 
             };
-
-        case 'newstylebrands':
+        case 'newfestivalbrands':
             return {
-                swiper: [
-                    {
+                brandsHeader: [{
+                    id: 'b1',
+                    title: '日韩品牌',
+                    defaultClass: 'hasunderline',
+                }, {
+                    id: 'b2',
+                    title: '欧美品牌',
+                    defaultClass: ''
+                }, {
+                    id: 'b3',
+                    title: '国潮品牌',
+                    defaultClass: ''
+                }],
+                todayBrands: [{
+                    parentId: 'b1',
+                    displayClass: 'show',
+                    todayPic: [{
                         url: '',
                         img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
-                    },
-                    {
+                    }, {
                         url: '',
-                        img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/03/13/01a165dd33db8488edc741241950a596a8.jpg?imageView/2/w/640/h/640'
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }],
+                    tomorrowPic: {
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640',
+                        text: '明日推荐品牌1'
                     }
-                ]
+                }, {
+                    parentId: 'b2',
+                    displayClass: 'hide',
+                    todayPic: [{
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }],
+                    tomorrowPic: {
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640',
+                        text: '明日推荐品牌2'
+                    }
+                }, {
+                    parentId: 'b3',
+                    displayClass: 'hide',
+                    todayPic: [{
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }],
+                    tomorrowPic: {
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640',
+                        text: '明日推荐品牌3'
+                    }
+                }],
+                singleBrands: [{
+                    url: '',
+                    img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                }, {
+                    url: '',
+                    img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                }],
+                singleTomorrowPic: {
+                    url: '',
+                    img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640',
+                    text: '明日推荐品牌3'
+                },
+                todayBtn: {
+                    link: ''
+                },
+                brandsContent: [{
+                    parentId: 'b1',
+                    displayClass: 'show',
+                    brandsList: [{
+                        brandsId: '1',
+                        pic: [{
+                            hasWords: {
+                                words: '太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真太傻太天真'
+                            },
+                            url: '',
+                            img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                        }, {
+                            hasWords: {
+                                words: '很好很强大很好很强大很好很强大很好很强大很好很强大很好很强大很好很强大'
+                            },
+                            url: '',
+                            img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/03/13/01a165dd33db8488edc741241950a596a8.jpg?imageView/2/w/640/h/640'
+                        }]
+                    }, {
+                        brandsId: '2',
+                        pic: [{
+                            url: '',
+                            img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                        }, {
+                            url: '',
+                            img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/03/13/01a165dd33db8488edc741241950a596a8.jpg?imageView/2/w/640/h/640'
+                        }]
+                    }, {
+                        brandsId: '3',
+                        pic: [{
+                            url: '',
+                            img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                        }, {
+                            url: '',
+                            img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/03/13/01a165dd33db8488edc741241950a596a8.jpg?imageView/2/w/640/h/640'
+                        }]
+                    }]
+                }, {
+                    parentId: 'b2',
+                    displayClass: 'hide',
+                    brandsList: [{
+                        brandsId: '1',
+                        pic: [{
+                            url: '',
+                            img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                        }, {
+                            url: '',
+                            img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/03/13/01a165dd33db8488edc741241950a596a8.jpg?imageView/2/w/640/h/640'
+                        }]
+                    }, {
+                        brandsId: '2',
+                        pic: [{
+                            url: '',
+                            img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                        }, {
+                            url: '',
+                            img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/03/13/01a165dd33db8488edc741241950a596a8.jpg?imageView/2/w/640/h/640'
+                        }]
+                    }, {
+                        brandsId: '3',
+                        pic: [{
+                            url: '',
+                            img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                        }, {
+                            url: '',
+                            img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/03/13/01a165dd33db8488edc741241950a596a8.jpg?imageView/2/w/640/h/640'
+                        }]
+                    }]
+                }, {
+                    parentId: 'b3',
+                    displayClass: 'hide',
+                    brandsList: [{
+                        brandsId: '1',
+                        pic: [{
+                            url: '',
+                            img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                        }, {
+                            url: '',
+                            img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/03/13/01a165dd33db8488edc741241950a596a8.jpg?imageView/2/w/640/h/640'
+                        }]
+                    }, {
+                        brandsId: '2',
+                        pic: [{
+                            url: '',
+                            img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                        }, {
+                            url: '',
+                            img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/03/13/01a165dd33db8488edc741241950a596a8.jpg?imageView/2/w/640/h/640'
+                        }]
+                    }, {
+                        brandsId: '3',
+                        pic: [{
+                            url: '',
+                            img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                        }, {
+                            url: '',
+                            img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/03/13/01a165dd33db8488edc741241950a596a8.jpg?imageView/2/w/640/h/640'
+                        }]
+                    }]
+                }],
+                brandsLogoList: [{
+                    brandsLogoRow: [{
+                        showClass: 'logoblack',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        showClass: 'logogrey',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        showClass: 'logoblack',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        showClass: 'logogrey',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        showClass: 'logoblack',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        showClass: 'logogrey',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }]
+                }, {
+                    brandsLogoRow: [{
+                        showClass: 'logogrey',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        showClass: 'logoblack',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        showClass: 'logogrey',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        showClass: 'logoblack',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        showClass: 'logogrey',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }, {
+                        showClass: 'logoblack',
+                        url: '',
+                        img: 'http://img11.static.yhbimg.com/yhb-img01/2015/07/06/10/014fd517e2fe3f3e0dc3cbc3007d8093af.jpg?imageView/2/w/640/h/640'
+                    }]
+                }]
             };
     }
 };
\ No newline at end of file

-@import "common/common","common/grid","common/swiper", "newfestival/brand","error/error", "newfestival/newfestival";
+@import "common/common","common/grid","common/swiper", "newfestival/newfestivalbrand","error/error", "newfestival/newfestival";
 
 //恢复样式覆盖
 b {

-.brandnavwrapper {
-	.hasunderline {
-		border-bottom: 4rem / $pxConvertRem solid #373737 !important;
-	}
-	.hasvline {
-		border-right: 2rem / $pxConvertRem solid #c1c1c1;
-	}
-	.navitemwrapper {
-		height: 50rem / $pxConvertRem;
-		border-bottom: 4rem / $pxConvertRem solid #c1c1c1;
-	} 
-	.navitem {
-		margin-top: 10rem / $pxConvertRem;
-		height: 30rem / $pxConvertRem;	
-		line-height: 30rem / $pxConvertRem;	
-		width: 100%;
-		text-align: center;
-	}
-}
-.mt10 {
-		margin-top: 10rem / $pxConvertRem !important;
-}
-.gridwrapper {
-	width: 100%;
-	clear: both;
-	.gridtiem {
-		height: 100rem / $pxConvertRem;
-		width: 16.666666667%;
-		line-height: 100rem / $pxConvertRem;
-		float: left;
-	}
-}
-.brandpicwrapper {
-	margin-bottom: 20rem / $pxConvertRem;
-}
-.black {
-	background-color: black;
-}
-.grey {
-	background-color: grey;
-}
\ No newline at end of file

+.newfestivalbrandwrapper {
+	.show {
+		  visibility: visible;
+	}
+	.hide {
+		 visibility: hidden;
+	}
+	.newfestivalbrandheader {
+		overflow: hidden;
+		.hasunderline {
+			border-bottom: 4rem / $pxConvertRem solid #373737 !important;
+		}
+		.hasvline {
+			border-right: 2rem / $pxConvertRem solid #c1c1c1;
+		}
+		.navitemwrapper {
+			height: 50rem / $pxConvertRem;
+			border-bottom: 4rem / $pxConvertRem solid #c1c1c1;
+		} 
+		.navitem {
+			margin-top: 10rem / $pxConvertRem;
+			height: 30rem / $pxConvertRem;	
+			line-height: 30rem / $pxConvertRem;	
+			width: 100%;
+			text-align: center;
+		}
+	}
+	.brandsshowpannel {
+	   .brandpicwrapper {
+	         margin-bottom: 20rem / $pxConvertRem;
+	         .branddetail {
+	         	position: relative;
+	         }
+		}
+	}
+	.singlebrandpicwrapper {
+		img{
+			width: 100%;
+		}
+	}
+	.singlebrandbtnleft {
+		background-color:black;
+		.todaybtn {
+			background-color: grey;
+		}
+	}
+	.singlebrandbtnright {
+		background-color:red;
+		.todaybtn {
+			background-color: white;
+			color: black;
+		}
+	}
+	.gridwrapper {
+		  	 width: 100%;
+		  	 clear: both;
+		  .gridtiem {
+			 height: 100rem / $pxConvertRem;
+			 width: 16.666666667%;
+			 line-height: 100rem / $pxConvertRem;
+			 float: left;
+		 }
+		 .logoblack {
+			background-color: black;
+		}
+	   .logogrey {
+			background-color: grey;
+		}
+	}
+	.tomorrowbrand {
+		position: relative;
+		img {
+			width: 100%;
+		}
+	}
+	.picwordswrapper {
+		background: rgba(1,1,1,.5);
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 2;
+		.picwords {
+			text-align: center;
+			margin-top: 25%;
+			line-height: 20rem / $pxConvertRem;
+			color: white;
+			}
+	}
+	.brandpicwordswrapper {
+		position: absolute;
+		box-sizing: border-box;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+		z-index: 2;
+		text-overflow : ellipsis ;
+		line-height: 20rem / $pxConvertRem;
+		font-size: 20rem / $pxConvertRem;
+		padding: 31rem / $pxConvertRem;
+		color: white;
+		.brandpicwords {
+			width: 100%;
+		    height: 100%;
+		    text-align: left;
+		    overflow: hidden;
+		}
+	}
+	.todaybtn {
+		display: block;
+		width: 95%;
+		height: 80rem / $pxConvertRem;
+		margin: 20rem / $pxConvertRem auto;
+		background-color: black;
+		color: white;
+		border: none;
+		border-radius: 5rem / $pxConvertRem;
+	}
+}
+.mt10 {
+		margin-top: 10rem / $pxConvertRem !important;
+}

@@ -12,4 +12,6 @@ module.exports = function(app) {
     //router here
     app.get('/newfestival', newfestival.home);
     app.get('/newfestival/brand', newfestival.brand);
+    app.get('/newfestival/todaybrand', newfestival.todaybrand);
+    app.get('/newfestival/singlebrand', newfestival.singlebrand);
 };
\ No newline at end of file

@@ -4,8 +4,8 @@
  * @date: 2015/3/27
  */
 var data = require('../../public/js/data'),
-	brandsdata = data('newstylebrands');
-	newfestivaldata = data('newfestival');
+    brandsdata = data('newfestivalbrands');
+newfestivaldata = data('newfestival');
 
 //新品节首页
 exports.home = function(req, res) {
@@ -15,7 +15,7 @@ exports.home = function(req, res) {
         isNewFestival: 'NewFestival'
     });
 };
-	
+
 //新品节品牌
 exports.brand = function(req, res) {
     res.render('pages/newfestival-brand', {
@@ -24,4 +24,19 @@ exports.brand = function(req, res) {
         isBrand: 'brand-home'
     });
 };
-
+//今日品牌
+exports.todaybrand = function(req, res) {
+    res.render('pages/newfestival-todaybrand', {
+        data: brandsdata,
+        layout: '../layouts/layout',
+        isBrand: 'brand-home'
+    });
+};
+//今日单品
+exports.singlebrand = function(req, res) {
+    res.render('pages/newfestival-singlebrand', {
+        data: brandsdata,
+        layout: '../layouts/layout',
+        isBrand: 'brand-home'
+    });
+};
\ No newline at end of file

 {{# data}}
-{{> newfestival/newfestival_brand_header}}
-{{> newfestival/newfestival_brand_content}}
+<div class="newfestivalbrandwrapper">
+	{{> newfestival/newfestival_brand_header}}
+	{{> newfestival/newfestival_brand_content}}
+</div>
 {{/ data}}
\ No newline at end of file

+{{# data}}
+<div class="newfestivalbrandwrapper">
+	{{> newfestival/newfestival_singlebrand_content}}
+</div>
+{{/ data}}
\ No newline at end of file

+{{# data}}
+<div class="newfestivalbrandwrapper">
+	{{> newfestival/newfestival_brand_header}}
+	{{> newfestival/newfestival_todaybrand_content}}
+</div>
+{{/ data}}
\ No newline at end of file

-<div class="row brandpicwrapper">
-	<div class="col">
-		<div class="swiper-container swiper-container0">
-			<div class="swiper-wrapper">
-				{{# swiper}}
-				<div class="swiper-slide">
-					<a href="{{url}}">
-						<img src="{{img}}"></a>
-				</div>
-				{{/ swiper}}
-			</div>
-			<div class="swiper-pagination swiper-pagination0"></div>
-		</div>
-	</div>
-</div>
-<div class="row brandpicwrapper">
-	<div class="col">
-		<div class="swiper-container swiper-container1">
-			<div class="swiper-wrapper">
-				{{# swiper}}
-				<div class="swiper-slide">
-					<a href="{{url}}">
-						<img src="{{img}}"></a>
+{{# brandsContent}}
+<div class="brandsshowpannel {{displayClass}}" id="showpannel{{parentId}}" >
+	{{#brandsList}}
+	<div class="row brandpicwrapper">
+		<div class="col">
+			<div class="swiper-container swiper-container{{../parentId}}{{brandsId}}" id="{{../parentId}}{{brandsId}}">
+				<div class="swiper-wrapper">
+					{{# pic}}
+					<div class="swiper-slide branddetail">
+						<a href="{{url}}">
+							<img src="{{img}}" />
+							{{#hasWords}}
+							<div class="brandpicwordswrapper">
+								<p class="brandpicwords">{{words}}</p>
+							</div>
+							{{/ hasWords}}
+						</a>
+					</div>
+					{{/ pic}}
 				</div>
-				{{/ swiper}}
+				<div class="swiper-pagination swiper-pagination{{../parentId}}{{brandsId}}"></div>
 			</div>
-			<div class="swiper-pagination swiper-pagination1"></div>
-		</div>
-	</div>
-</div>
-<div class="row brandpicwrapper2">
-	<div class="col">
-		<div class="swiper-container swiper-container2">
-			<div class="swiper-wrapper">
-				{{# swiper}}
-				<div class="swiper-slide">
-					<a href="{{url}}">
-						<img src="{{img}}"></a>
-				</div>
-				{{/ swiper}}
-			</div>
-			<div class="swiper-pagination swiper-pagination2"></div>
 		</div>
 	</div>
+	{{/brandsList}}
 </div>
+{{/ brandsContent}}
 <div class="row">
 	<div class="col">
+		{{# brandsLogoList}}
 		<ul class="gridwrapper">
-			<li class="gridtiem black"></li>
-			<li class="gridtiem grey"></li>
-			<li class="gridtiem black"></li>
-			<li class="gridtiem grey"></li>
-			<li class="gridtiem black"></li>
-			<li class="gridtiem grey"></li>
-		</ul>
-		<ul class="gridwrapper">
-			<li class="gridtiem grey"></li>
-			<li class="gridtiem black"></li>
-			<li class="gridtiem grey"></li>
-			<li class="gridtiem black"></li>
-			<li class="gridtiem grey"></li>
-			<li class="gridtiem black"></li>
+			{{# brandsLogoRow}}
+			<li class="gridtiem {{showClass}}"></li>
+			{{/brandsLogoRow}}
 		</ul>
+		{{/ brandsLogoList}}
 	</div>
 </div>
\ No newline at end of file

-<div class="row brandnavwrapper">
-	<div class="col col-33 hasunderline navitemwrapper">
-		<h3 class="navitem hasvline">日韩品牌</h3>
-	</div>
-	<div class="col col-33 navitemwrapper ">
-		<h3 class="navitem hasvline ">欧美品牌</h3>
-	</div>
-	<div class="col col-33 navitemwrapper">
-		<h3 class="navitem">国潮品牌</h3>
+<div class="row newfestivalbrandheader">
+	{{# brandsHeader}}
+	<div class="col col-33 navitemwrapper {{defaultClass}}" tagid={{id}}>
+		<h3 class="navitem hasvline">{{title}}</h3>
 	</div>
+	{{/ brandsHeader}}
 </div>
\ No newline at end of file

+{{# singleBrands}}
+<div class="row">
+	<div class="col">
+		<div class="singlebrandpicwrapper">
+			<a href="{{url}}">
+				<img src="{{img}}"/>
+			</a>
+		</div>
+	</div>
+</div>
+{{/ singleBrands}}
+<div class="row">
+	<div class="col">
+		<div class="tomorrowbrand">
+			{{# singleTomorrowPic}}
+			<a href="{{url}}">
+				<img src="{{img}}"/>
+				<div class="picwordswrapper">
+					<p class="picwords">{{text}}</p>
+				</div>
+			</a>
+			{{/ singleTomorrowPic}}
+		</div>
+	</div>
+</div>
+<div class="row">
+	<div class="col col-50 singlebrandbtnleft">
+		{{# todayBtn}}
+		<a href="{{link}}">
+			<input type="button" class="todaybtn" value="点击查看: 更多日韩品牌" />
+		</a>
+		{{/ todayBtn}}
+	</div>
+	<div class="col col-50 singlebrandbtnright">
+		{{# todayBtn}}
+		<a href="{{link}}">
+			<input type="button" class="todaybtn" value="点击查看: 更多日韩品牌" />
+		</a>
+		{{/ todayBtn}}
+	</div>
+</div>
\ No newline at end of file

+{{# todayBrands}}
+<div class="brandsshowpannel {{displayClass}}" id="showpannel{{parentId}}" >
+	{{# todayPic}}
+	<div class="row">
+		<div class="col">
+			<div class="singlebrandpicwrapper">
+				<a href="{{url}}">
+					<img src="{{img}}"/>
+				</a>
+			</div>
+		</div>
+	</div>
+	{{/ todayPic}}
+	<div class="row">
+		<div class="col">
+			<div class="tomorrowbrand">
+				{{# tomorrowPic}}
+				<a href="{{url}}">
+					<img src="{{img}}"/>
+					<div class="picwordswrapper">
+						<p class="picwords">{{text}}</p>
+					</div>
+				</a>
+				{{/ tomorrowPic}}
+			</div>
+		</div>
+	</div>
+</div>
+{{/ todayBrands}}
+{{# todayBtn}}
+<a href="{{link}}">
+	<input type="button" class="todaybtn" value="点击查看: 更多日韩品牌" />
+</a>
+{{/ todayBtn}}
\ No newline at end of file