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

@@ -15,6 +15,18 @@ var $curContent = $contents.not('.hide');
 
 var navHammer, ccHammer;
 
+//初始化container高度
+(function() {
+    var $header = $('.yoho-header'),
+        $search = $('#search-input');
+
+    var h = $(window).height() - $header.outerHeight() - $search.outerHeight() - $nav.outerHeight();
+
+    $categoryContainer.css('min-height', h);
+
+    $contents.height(h);
+}());
+
 $('#search-input').focus(function() {
     $(this).blur();
 });

@@ -16,7 +16,9 @@ var showErrTip = tip.show;
 
 var $phoneNum = $('#phone-num');
 
-api.bindEyesEvt();
+api.bindEyesEvt({
+    status: 'open'
+});
 
 $pwd.bind('input', function() {
     if (trim($pwd.val()) === '') {

@@ -54,14 +54,7 @@ $btnSure.on('touchstart', function() {
                         location.href = data.data;
                     }, 1000);
                 } else {
-                    if (data.code === 401 || data.code === 404 || data.code === 505) {
-                        showErrTip(data.message);
-                    } else {
-                        showErrTip(data.message);
-                        setTimeout(function() {
-                            location.href = data.data;
-                        }, 1000);
-                    }
+                    showErrTip(data.message);
                 }
             }
         });

@@ -17,7 +17,7 @@ var $tip, tipItime;
     $('.yoho-page').append(tipHtml);
 
     $tip = $('#yoho-tip');
-    $tip.on('tap', function() {
+    $tip.on('touchend', function() {
         $tip.hide();
 
         //清除Timeout

@@ -140,7 +140,6 @@
                 i {
                     display: inline-block;
                     margin-top: -4rem / $pxConvertRem;
-                    margin-left: 24rem / $pxConvertRem;
                     width: 108rem / $pxConvertRem;
                     height: 42rem / $pxConvertRem;
                     text-align: center;

@@ -32,7 +32,7 @@
     }
 
     .category-nav {
-        height: 71rem / $pxConvertRem;
+        height: 70rem / $pxConvertRem;
         border-bottom: 1px solid #e6e6e6;
 
         li {
@@ -40,10 +40,9 @@
             box-sizing: border-box;
             float: left;
             height: 100%;
-            line-height: 71rem / $pxConvertRem;
+            padding: 20rem / $pxConvertRem 0;
             width: 25%;
             text-align: center;
-            border-right: 1px solid #e6e6e6;
             color: #999;
 
             &:last-child {
@@ -54,17 +53,33 @@
                 color: #000;
             }
         }
+
+        span {
+            display: block;
+            width: 100%;
+            height: 30rem / $pxConvertRem;
+            line-height: 30rem / $pxConvertRem;
+            font-size: 30rem / $pxConvertRem;
+            border-right: 1px solid #e6e6e6;
+        }
+
+        li:last-child span {
+            border-right: 0;
+        }
     }
 
-    .content.hide {
-        display: none;
+    .content {
+        background: #f8f8f8;
+
+        &.hide {
+            display: none;
+        }
     }
 
     .primary-level {
         float: left;
         box-sizing: border-box;
         width: 40%;
-        background: #f8f8f8;
 
         > li {
             height: 69rem / $pxConvertRem;
@@ -83,6 +98,8 @@
         padding-left: 20rem / $pxConvertRem;
         background: #fff;
         width: 60%;
+        height: 100%;
+        overflow: auto;
     }
 
     .sub-level {
@@ -107,10 +124,6 @@
             height: 100%;
             width: 100%;
             color: #000;
-
-            &:visisted {
-                color: #000;
-            }
         }
     }
 }
\ No newline at end of file

 .hot-brands {
-    background: #fff;
+    background: #f0f0f0;
     border-bottom: 1px solid #e0e0e0;
 
     a {
@@ -8,6 +8,10 @@
         height: 100%;
     }
 
+    > * {
+        background: #fff;
+    }
+
     .brand {
         float: left;
         width: 158rem / $pxConvertRem;

@@ -45,6 +45,13 @@ a {
     text-decoration: none;
     outline: none;
     color: #000;
+
+    &:link,
+    &:visited,
+    &:hover,
+    &:actived {
+        color: #000;
+    }
 }
 
 *:focus {

@@ -66,10 +66,6 @@
             font-size: 28rem / $pxConvertRem;
             background: #f8f8f8;
             color: #000;
-
-            &:visited {
-                color: #000;
-            }
         }
 
         .clear-history {

@@ -50,10 +50,6 @@
             font-size: 17px;
             background: #fff;
             color: #000;
-
-            &:visisted {
-                color: #000;
-            }
         }
 
         .brand-thumb {

@@ -10,7 +10,7 @@
         <div class="category-nav clearfix">
             {{# class}}
                 <li class={{#if focus}}focus{{/if}}>
-                    {{name}}
+                    <span>{{name}}</span>
                 </li>
             {{/ class}}
         </div>

@@ -3,7 +3,7 @@
     {{> passport/header}}
     <div class="content">
         <div class="input-container row has-eye">
-            <input id="pwd" class="input pwd" type="password" placeholder="请输入新密码" autocomplete="off" maxlength="20">
+            <input id="pwd" class="input pwd" type="text" placeholder="请输入新密码" autocomplete="off" maxlength="20">
         </div>
         <span id="btn-ok" class="btn btn-ok disable">完成</span>
     </div>

@@ -3,7 +3,7 @@
     {{> passport/header}}
     <div class="content">
         <div class="input-container row has-eye">
-            <input id="pwd" class="input pwd" type="password" placeholder="请输入密码" autocomplete="off" maxlength="20">
+            <input id="pwd" class="input pwd" type="text" placeholder="请输入密码" autocomplete="off" maxlength="20">
         </div>
         <span id="btn-sure" class="btn btn-sure disable row">确定</span>
     </div>

 <div class="header">
     {{#backUrl}}
-        <a class="go-back" href={{.}}></a>
+        <a class="go-back" href="javascript:history.go(-1);"></a>
     {{/backUrl}}
     {{#showHeaderImg}}
         <div class="img-header"></div>

@@ -165,7 +165,7 @@ class BackController extends AbstractAction
      */
     public function sendcodeAction()
     {
-        $result = array('code' => 400, 'message' => '手机号码格式不正确，请重新输入', 'data' => '');
+        $result = array('code' => 400, 'message' => '密码只能使用数字、字母和半角标点符号，请重新输入', 'data' => '');
         do
         {
             /* 判断是不是AJAX请求 */

@@ -149,7 +149,7 @@ class RegController extends AbstractAction
      */
     public function verifycodeAction()
     {
-        $data = array('code' => 400, 'message' => '验证码不正确', 'data' => '');
+        $data = array('code' => 400, 'message' => '验证码错误', 'data' => '');
         
         do {
             /* 判断是不是AJAX请求 */
@@ -175,6 +175,8 @@ class RegController extends AbstractAction
             if ($data['code'] == 200) {
                 $token = Helpers::makeToken($mobile);
                 $data['data'] = '/passport/reg/password?token='.$token.'&phoneNum='.$mobile.'&areaCode='.$area;
+            } else if ($data['code'] == 404) {
+                $data['message'] = '验证码错误'; //统一验证提示
             }
             
         } while (false);