Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -1387,8 +1387,8 @@ class HelperSearch
             if (isset(self::$params['shelve_time'])) {
                 $date = explode(',', self::$params['shelve_time']);
                 $date = date('Y-m-d', $date[0]);
+                $type = $date;
             }
-            $type = $date;
         }
         //list - sale
         elseif ($controller == 'list' && $action == 'sale') {

@@ -840,7 +840,7 @@ function closeCover() {
  * @return {[type]} [description]
  */
 function actionCover() {
-    var gender = cookieMap._Gender;
+    var gender = window.cookie('_Gender');
     var newMask = '';
     var windowheight = '';
     var selfheight = '';
@@ -1477,6 +1477,7 @@ function init() {
     actionNav(); //处理导航
     actionTipPic(); //鼠标移入后查询
     actionExeTemplate(); //处理模板
+    actionCover(); //初次登录弹框
     actionInitCookie(); //初始化cookie
     actionExeCookieMap(); //格式化cookie
     actionGoodsCart(); //初始化购物车插件
@@ -1494,7 +1495,6 @@ function init() {
     actionListenDelCarGoods(); //监听购物车删除
     actionListenCartMore(); //
     actionLoginInfo(); //获取登录信息
-    actionCover(); //初次登录弹框
     actionAddKeyWords(); //增加关键字
 }
 init();