merge

@@ -140,7 +140,7 @@
                 <input type="hidden" class="user-mobile" value="{{userMobile}}" />
                 <span class="title">发票</span>
                 <span class="iconfont checkbox {{#if needInvoice}}icon-cb-radio{{else}}icon-radio{{/if}}"></span>
-                <a id="invoice" class="invoice-info" href="invoiceInfo">
+                <a id="invoice" class="invoice-info" href="/cart/index/invoiceInfo">
                     <span class="title">发票信息</span>
                     <span class="invoice-type"><i class="iconfont">&#xe614;</i></span>
                 </a>

@@ -109,7 +109,7 @@ const _getOrderStatus = (order, showLogistics) => {
     } else {
 
         /* 订单为货到付款订单时，计算订单状态。(货到付款没有待付款状态) */
-        switch (order.status) {
+        switch (parseInt(order.status, 10)) {
             case 0:
 
                 /* 备货中 */

@@ -15,7 +15,7 @@ const helpers = global.yoho.helpers;
 
 // 新品到着
 const newGoods = (req, res, next) => {
-    let channel = req.yoho.channel;
+    let channel = req.cookies._Channel;
 
     newModel.getNewFocus(channel).then((result) => {
         res.render('new/new', {

@@ -478,8 +478,8 @@ const getBaseShopData = (params, shopInfo) => {
                             appVersion: _.get(params, 'app_version', ''),
                             isBaseShop: true,
                             id: shopId,
-                            intro: shopInfo.shopIntro,
-                            collected: shopInfo.isFavorite === 'Y',
+                            intro: shopInfo.shop_intro,
+                            collected: shopInfo.is_favorite === 'Y',
                             banner: _.get(banner[0], 'shopSrc', '')
                         }
                     });

 {
   "name": "m-yohobuy-node",
-  "version": "5.0.14",
+  "version": "5.0.15",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -14,6 +14,7 @@
 		<ol>
 			<li>秒杀商品限活动开始后，在详情页抢购，提前加入购物车无效</li>
 			<li>秒杀数量有限，抢完即止</li>
+			<li>秒杀商品限购1件, 不能使用优惠券或优惠码</li>
 			<li>活动最终解释权归YOHO!BUY有货所有</li>
 		</ol>
 	</section>

@@ -433,7 +433,7 @@ function search(opt) {
 
 require('../../common/suspend-cart'); // 悬浮购物车
 /* tar add 160914 */
-if ($brandHeader.data('isbaseshop') === 1) {
+if ($brandHeader.data('isbaseshop') === true) {
     Object.assign(defaultOpt, {shop_id: $brandHeader.data('id')});
 }
 

@@ -297,9 +297,17 @@ seckillObj = {
     },
 
     bindEvents: function() {
+        var self = this;
+        var $nav = self.el.$navList;
+        var top = $nav.position().top + $nav.height();
+
         if (yoho.isApp) {
             this.$productList.on('click', '[data-remind]', $.proxy(this.toggleRemind, this));
         }
+
+        $(document).on('scroll', function() {
+            $nav.toggleClass('fix-top', $(window).scrollTop() > top);
+        });
     },
 
     /*

@@ -17,7 +17,8 @@ var nowTime = 0;
 
 var startTime = 0;
 
-var endTime = 0;
+var endTime = 0,
+    diffTime = 0;// 误差时间
 
 var dateText = 0,
     newDate = 0,
@@ -183,7 +184,11 @@ $(
 
                     endTime = data.endTime;
 
-                    nowTime = Date.parse(new Date()) / 1000;
+                    diffTime = data.currentTime;
+
+                    // nowTime = Date.parse(new Date()) / 1000;
+
+                    nowTime = diffTime;// 使用请求服务器时间作为当前时间
 
                     if (startTime > nowTime) {
                         offsetTime = startTime - nowTime;

@@ -87,5 +87,14 @@
 				}
 			}
 		}
+
+		&.fix-top {
+			position: fixed;
+			top: 0;
+			right: 0;
+			left: 0;
+			z-index: 100;
+			box-shadow: 0 1px 0 0 #e1e1e1;
+		}
 	}
 }