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

@@ -682,7 +682,7 @@ function JsonPCallBack(data) {
             if (data.data.url !== '') {
                 topbanner = '<a target="_blank" href="' + data.data.url + '" class="page-top-banner"' +
                     'style="height:36px;border:none;background-image:url(' + window.unescape(data.data.src) + ');' +
-                    'background-position: center;display:block;background-size:contain">&nbsp;</a>';
+                    'background-position: center;display:block;">&nbsp;</a>';
             } else {
                 topbanner = '<div class="noticewrapper">' +
                     '<div class="noticecontainer">' +
@@ -1825,6 +1825,7 @@ function init() {
     actionAddKeyWords(); //增加关键字
 }
 init();
+
 });
 define("js/simple-header", ["jquery"], function(require, exports, module){
 var $ = require("jquery");
@@ -2112,7 +2113,8 @@ $brandMulti.click(function() {
         $brandMore.trigger('click');
     }
 
-    $brandPanel.addClass('multi'); //显示出checkbox
+    brandShowMore();
+    $brandPanel.removeClass('hide').addClass('multi'); //显示出checkbox
     $(this).addClass('hide');
 });
 
@@ -2194,7 +2196,8 @@ $('.multi-select-cancel').click(function() {
         $brandMore.trigger('click');
     }
 
-    $panel.removeClass('multi');
+    $panel.addClass('hide').removeClass('multi');
+    brandHideMore();
     clearChecked($panel.find('.checkbox.checked')); //清除选中状态
 });
 
@@ -3533,7 +3536,7 @@ slide = new Slide({
     loop: false,
     auto: false,
     timeout: 2,
-    index: 3
+    index: 1
 });
 
 slide.on('change', function(data) {
@@ -4764,7 +4767,7 @@ function validateRule(page, $element, callback) {
             callback();
 
         } else if (val.length <= 3) {
-            validateResult[2].message = '短信验证码为4位';
+            validateResult[2].message = '短信验证码错误';
             validateResult[2].status = false;
             callback();
 
@@ -5778,7 +5781,7 @@ $('#login-btn').on('click', function() {
                     }
                 } else {
                     $passwordTip.removeClass('hide').children('em').html(data.message);
-                    $password.addClass('error');
+                    $password.addClass('error').val('');
                 }
             },
             complete: function() {

@@ -254,7 +254,7 @@ function validateRule(page, $element, callback) {
             callback();
 
         } else if (val.length <= 3) {
-            validateResult[2].message = '短信验证码为4位';
+            validateResult[2].message = '短信验证码错误';
             validateResult[2].status = false;
             callback();
 

@@ -27,11 +27,11 @@ routes.searchsuggest.route.controller = Search
 routes.searchsuggest.route.action = suggest
 
 ;error(suggest 错误提示)
-routes.searchsuggest.type = "rewrite"
-routes.searchsuggest.match = "/error"
-routes.searchsuggest.route.module = Product
-routes.searchsuggest.route.controller = Search
-routes.searchsuggest.route.action = error
+routes.searcherror.type = "rewrite"
+routes.searcherror.match = "/error"
+routes.searcherror.route.module = Product
+routes.searcherror.route.controller = Search
+routes.searcherror.route.action = error
 
 ;about(品牌介绍)
 routes.brandabout.type = "rewrite"