Merge branch 'release/5.1' of git.yoho.cn:fe/yohobuywap-node into release/5.1

@@ -15,8 +15,7 @@ const shopList = (uid, tabName) => {
         uid: uid,
         tab_name: tabName
     }, {
-        code: 200,
-        cache: true
+        code: 200
     }).then((result) => {
         if (result && result.code === 200) {
             _.forEach(result.data, function(data) {

@@ -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>

@@ -18,7 +18,7 @@
                     <p class="good-tag new-festival-tag">新品节</p>
                 {{/ is_yohood}}
                 {{# is_limited}}
-                    <p class="good-tag limit-tag">限量商品</p>
+                    <p class="good-tag limit-tag">限量</p>
                 {{/ is_limited}}
             {{/ tags}}
         </div>

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

@@ -3,7 +3,7 @@
         <a href="{{href}}">
             <div class="info-title">
                 <div class="collect">
-                    <span class="fans">粉丝：{{collectionNum}}</span>
+                    <span class="fans">粉丝：<b class="fans-count">{{collectionNum}}</b></span>
                     <i class="iconfont collect-btn {{#if isFavorite}}already-collect{{/ if}}">&#xe605;</i>
                 </div>
 

@@ -96,7 +96,8 @@ function shopListData(tabName, stoping) {
             // 店铺收藏
             $('.collect-btn').on('click', function(e) {
                 var opt,
-                    $this = $(this);
+                    $this = $(this),
+                    fansCount = parseInt($this.parent().find('.fans-count').html());
 
                 shopId = $this.parents('.shop-info').data('id');
 
@@ -131,9 +132,11 @@ function shopListData(tabName, stoping) {
                             if ($this.hasClass('already-collect')) {
                                 $this.removeClass('already-collect');
                                 tip.show('店铺取消收藏成功');
+                                $this.parent().find('.fans-count').html(fansCount - 1);
                             } else {
                                 $this.addClass('already-collect');
                                 tip.show('店铺收藏成功');
+                                $this.parent().find('.fans-count').html(fansCount + 1);
                             }
                         }
 

@@ -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;

@@ -26,7 +26,6 @@
 
         .active {
             color: #000;
-            font-weight: bold;
         }
     }
 
@@ -86,7 +85,7 @@
                 float: left;
                 margin-left: 25px;
                 font-size: 22px;
-                width: 170px;
+                width: 200px;
                 height: 65px;
             }
 
@@ -98,17 +97,16 @@
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
+                width: 240px;
             }
 
             .shop-name {
-                width: 170px;
                 font-weight: bold;
                 font-size: 24px;
                 height: 35px;
             }
 
             .giving {
-                width: 170px;
                 color: #b0b0b0;
                 font-size: 22px;
             }

@@ -137,9 +137,6 @@
     }
 
     .cost {
-        
-        /*margin-bottom: 100px; 排除被固定底部遮挡的影响*/
-
         li {
             font-size: 28px;
 
@@ -156,11 +153,11 @@
     .dollar {
         background: #fff;
         padding: 0.5rem 0.75rem;
-        height:1.5rem;
-        line-height:1.5rem;
-        font-size:0.7rem ;
-        
-        .bg-dollar{
+        height: 1.5rem;
+        line-height: 1.5rem;
+        font-size: 0.7rem;
+
+        .bg-dollar {
             display: inline-block;
             width: 0.6rem;
             height: 0.6rem;
@@ -262,9 +259,9 @@
             }
 
             .box-main {
-                background: #FFFFFF;
+                background: #FFF;
                 padding: 20px;
-                height:300px;
+                height: 300px;
 
                 .active-mask {
                     width: 500px;
@@ -368,8 +365,4 @@
             float: right;
         }
     }
-
-    .price-wrap {
-        top: 0;
-    }
 }

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