merge master

@@ -38,6 +38,17 @@ let _channelPage = (req, res, data) => {
         gender: data.gender,
         gender: data.gender,
         uid: _.toString(req.user.uid)
         uid: _.toString(req.user.uid)
     }).then(result => {
     }).then(result => {
+        result.content = [{
+            seckill: true,
+            data: {
+                title: {
+                    name: '限时秒抢',
+                    title: '限时秒抢',
+                    moreUrl: 'http://m.yohobuy.com'
+                }
+            }
+        }].concat(result.content);
+        console.log(result.content[9])
         res.render('channel', Object.assign({}, _renderData, data, result));
         res.render('channel', Object.assign({}, _renderData, data, result));
     });
     });
 };
 };

+
 {{#content}}
 {{#content}}
     {{! 头部banner}}
     {{! 头部banner}}
     {{#if focus}}
     {{#if focus}}
@@ -55,4 +56,8 @@
     {{#if newUserFloor}}
     {{#if newUserFloor}}
         {{> resources/fresh-only}}
         {{> resources/fresh-only}}
     {{/if}}
     {{/if}}
+    {{! 秒杀}}
+    {{#if seckill}}
+        {{> resources/seckill}}
+    {{/if}}
 {{/content}}
 {{/content}}

+/**
+ * 秒杀页面
+ * @author: 陈峰<feng.chen@yoho.cn>
+ * @date: 2016/09/08
+ */
+
+'use strict';
+const headerModel = require('../../../doraemon/models/header');
+
+
+/**
+ * [秒杀列表页面]
+ */
+const _index = (req, res, next) => {
+	let headerData = headerModel.setNav({
+        navTitle: '秒杀活动',
+        navBtn: true
+    });
+    let result = {};
+
+    res.render('seckill', Object.assign({
+    	pageHeader: headerData
+    }, result));
+}
+
+module.exports = {
+	index: _index
+}

@@ -24,6 +24,9 @@ const outlet = require(`${cRoot}/outlet`);
 // recommend-for-you controller
 // recommend-for-you controller
 const recommendForYou = require(`${cRoot}/recommend-for-you`);
 const recommendForYou = require(`${cRoot}/recommend-for-you`);
 
 
+// 秒杀 controller
+const seckill = require(`${cRoot}/seckill`);
+
 // routers
 // routers
 
 
 // /pro_136349_455445/HEARTSOFARMianMaShuJiaoXiuXianKuPS1684.html
 // /pro_136349_455445/HEARTSOFARMianMaShuJiaoXiuXianKuPS1684.html
@@ -57,4 +60,6 @@ router.get('/outlet/activityinfo', outlet.activityList);
 router.get('/recommend-for-you/userCenter', recommendForYou.userCenter);
 router.get('/recommend-for-you/userCenter', recommendForYou.userCenter);
 router.get('/recommend-for-you/cart', recommendForYou.cart);
 router.get('/recommend-for-you/cart', recommendForYou.cart);
 
 
+router.get('/seckill', seckill.index); //秒杀列表页
+
 module.exports = router;
 module.exports = router;

+<nav class="nav-list">
+	<ul>
+		<li>&nbsp;</li>
+		<li>&nbsp;</li>
+		<li>测试1</li>
+		<li>测试2</li>
+		<li>测试3</li>
+		<li>测试4</li>
+		<li>测试5</li>
+		<li>测试6</li>
+		<li>测试7</li>
+		<li>测试8</li>
+		<li>测试9</li>
+		<li>测试10</li>
+		<li>&nbsp;</li>
+		<li>&nbsp;</li>
+	</ul>
+</nav>

+{{#data}}
+	{{> common/floor-header-more}}
+	<div class="seckill">
+		<div class="seckill-times">
+			<ul>
+				<li class="time-item">
+					<div class="normal">
+						<p class="time">12:00</p>
+						<p>已开抢</p>
+					</div>
+					<div class="selected">
+						<p class="time"><span>12:00</span>已开抢</p>
+						<p>还有商品可以继续抢购哦!</p>
+					</div>
+				</li>
+				<li class="time-item foucs">
+					<div class="normal">
+						<p class="time">15:00</p>
+						<p>抢购中</p>
+					</div>
+					<div class="selected">
+						<p class="time"><span>15:00</span>抢购中</p>
+						<p>剩余:<i class="hour">02</i><i class="minute">02</i><i class="second">02</i></p>
+					</div>
+				</li>
+				<li class="time-item">
+					<div class="normal">
+						<p class="time">15:00</p>
+						<p>即将开抢</p>
+					</div>
+					<div class="selected">
+						<p class="time"><span>15:00</span>即将开抢</p>
+						<p>距开抢:<i class="hour">02</i><i class="minute">02</i><i class="second">02</i></p>
+					</div>
+				</li>
+			</ul>
+		</div>
+		<div class="seckill-products">
+			
+		</div>
+	</div>
+{{/data}}

+/**
+ * [秒抢页面js]
+ * author: 陈峰<feng.chen@yoho.cn>
+ * date: 2016/09/08
+ */
+
+(function(){
+	var $ = require('yoho-jquery'),
+    	IScroll = require('yoho-iscroll');
+
+    iScroll = new IScroll($('.nav-list')[0], {
+        scrollX: true,
+        scrollY: false,
+        tap: true,
+        eventPassthrough: true,
+        preventDefault: true
+    });
+    iScroll.on('scrollStart', function () {
+    	$('.nav-list').addClass('srolling');
+    });
+    iScroll.on('scrollEnd', function () {
+    	if ($('.nav-list').hasClass('srolling')) {
+    		$('.nav-list').removeClass('srolling')
+    		iScroll.scrollTo(-200, 0, 400, IScroll.utils.ease.elastic);
+    	}
+    });
+    
+}())

@@ -24,6 +24,7 @@
 @import "discount-list";
 @import "discount-list";
 @import "left-right";
 @import "left-right";
 @import "cate";
 @import "cate";
+@import "seckill";
 
 
 .mobile-container {
 .mobile-container {
     margin-left: auto;
     margin-left: auto;

+.seckill {
+	.seckill-times{
+		height: 3.4rem;
+		border-top: 1px solid #e0e0e0;
+		border-bottom: 1px solid #e0e0e0;
+		.time-item {
+			float: left;
+		}
+	}
+}

 @import "sale/index";
 @import "sale/index";
 @import "detail/index";
 @import "detail/index";
 @import "outlet/index";
 @import "outlet/index";
+@import "seckill/index";

+@import "nav";

+.nav-list {
+	width: auto;
+	ul {
+		width: auto;
+		overflow: hidden;
+		white-space: nowrap;
+		display: table;
+		li{
+			width: 4rem;
+			height: 2rem;
+			border: solid 1px #ccc;
+			display: inline-block;
+		}
+	}
+}
++