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

@@ -85,12 +85,13 @@ const wechat = {
 
     calcSignature: Promise.coroutine(function* (data) {
         data = Object.assign({
-            noncestr: Math.random().toString(36).substr(2, 15),
+            nonceStr: Math.random().toString(36).substr(2, 15),
             timestamp: Math.floor(Date.now() / 1000) + '',
-            ticket: yield this.getTicket()
+            ticket: yield this.getTicket(),
+            appId: appId
         }, data);
 
-        const str = `jsapi_ticket=${data.ticket}&noncestr=${data.noncestr}&timestamp=${data.timestamp}&url=${data.url}`;
+        const str = `jsapi_ticket=${data.ticket}&noncestr=${data.nonceStr}&timestamp=${data.timestamp}&url=${data.url}`;
 
         data.signature = sha1(str);
         return data;

@@ -5,7 +5,7 @@ var $ = require('yoho-jquery'),
     Countdown = require('./outlet/countdown'),
     iscroll = require('./outlet/nav');
 
-var $el = $('.cd-medium');
+var $el = $('.cd-lite');
 
 require('../common');
 

@@ -5,6 +5,7 @@
  */
 'use strict';
 var $ = require('yoho-jquery');
+var tip = require('../../plugin/tip');
 var EVENT_AFTER_PAINT = 'afterPaint';
 var defaultOPtions = {
     el: {},
@@ -285,6 +286,10 @@ $.extend(Countdown.prototype, {
         // notify 可能更新me.left
         if (me.left < 1) {
             el.text('— 活动已结束 —');
+            el.parents('.back-ground-white').on('click', function() {
+                tip.show('活动即将开始,敬请期待!');
+                return false;
+            });
             timer.remove(me._reflow);
         }
 

@@ -465,7 +465,9 @@ function scrollHandler() {
         $(document).height() - 0.25 * $goodsContainer.height() - 50)) {
         if (typeof $pre !== 'undefined') {
             if (defaultParams) {
-                search({type: 'category'}, defaultParams);
+                // search({type: 'category'}, defaultParams);
+                // 解决请求分页参数商品列表reload的临时方案，需赵彪确认是否影响其它
+                search(false, defaultParams);
             } else {
                 search();
             }