merge

@@ -30,5 +30,12 @@
                 <span class="iconfont icon-yoho-enter">&#xe604;</span>
             </a>
         </div>
+        <div class="connect-item connect-online">
+            <a href="tel:4008869646" target="_blank" title="热线客服">
+                <span class="icon iconfont icon-chat">&#xe63e;</span>
+                热线客服 <span class="call-time">(9:00-22:30)</span>
+                <span class="iconfont icon-yoho-enter call-number">400-886-9646</span>
+            </a>
+        </div>
     </div>
 </div>
\ No newline at end of file

@@ -109,7 +109,7 @@ function fetchProductList(activityInfo, uid) {
  * [秒杀列表页面]
  */
 const index = (req, res, next) => {
-    let focusTime = Number.parseInt(req.query.t, 10) || 0;
+    let focusTime = Number.parseInt(req.query.time, 10) || 0;
     let headerData = headerModel.setNav({
         navTitle: '秒杀活动',
         navBtn: true,

@@ -225,7 +225,7 @@ $.extend({
 }(window, document, 'script', (document.location.protocol === 'https:' ? 'https' : 'http') + '://cdn.yoho.cn/yas-jssdk/1.0.18/yas.js', '_yas'));
 
 (function() {
-    var uid = getUid();
+    var uid = getUid() || queryString().uid;
 
     uid = uid === 0 ? '' : uid;
 

@@ -153,7 +153,7 @@ $(
                             '<div class="seckill-time seckill-time-border">' +
                                 '<span>距结束&nbsp</span>' +
                                 '<span class="end-time">' +
-                                    '<i class="tick day hide">00</i>:' +
+                                    '<i class="tick day hide">00</i>' +
                                     '<i class="tick hour">00</i>:' +
                                     '<i class="tick minute">00</i>:' +
                                     '<i class="tick second">00</i>' +
@@ -162,9 +162,9 @@ $(
                         );
                         $('.text-info').append(
                             '<div class="seckill-time seckill-time-border seckill-chose">' +
-                                '<span>距结束 </span>' +
+                                '<span>距结束&nbsp</span>' +
                                 '<span class="end-time">' +
-                                    '<i class="tick day hide">00</i>:' +
+                                    '<i class="tick day hide">00</i>' +
                                     '<i class="tick hour">00</i>:' +
                                     '<i class="tick minute">00</i>:' +
                                     '<i class="tick second">00</i>' +

@@ -126,6 +126,15 @@
             &.highlight {
                 background: #eee;
             }
+
+            .call-time {
+                color: #ccc;
+                font-size: 24px;
+            }
+
+            .call-number {
+                color: #444;
+            }
         }
         .icon {
             display: inline-block;