Merge branch 'feature/passReset' into release/5.6

@@ -3,7 +3,7 @@
         {{> back/cover}}
         <div class="content">
             <h2 class="title3">重置登录密码</h2>
-            <p class="title-tip">您的账号密码过于简单请重置登陆密码</p>
+            <p class="title-tip">您的账号密码过于简单请重置登录密码</p>
             <form>
                 <ul>
                     <li class="input-container-li po-re">

@@ -7,7 +7,7 @@
             </div>
             <p class="success-text-main">恭喜您！您已经成功修改了登录密码</p>
             <p class="success-text-tip"><span id="count-down">3</span>秒后自动跳转至登录页</p>
-            <a class="success-btn" href="{{refer}}">重新登陆</a>
+            <a class="success-btn" href="{{refer}}">重新登录</a>
         </div>
     {{/ resetSuccess}}
 </div>

@@ -51,18 +51,18 @@ $('.va').keyup(function() {
     if ($this.hasClass('pwd')) {
         if (v === '') {
             $this.addClass('error');
-            $pwdErr.removeClass('hide').find('em').text('请输入密码');
+            $pwdErr.removeClass('hide').find('em').text('密码输入不能为空');
         }
     } else {
         if (v === '') {
             $this.addClass('error');
-            $repwdErr.removeClass('hide').find('em').text('请输入密码确认');
+            $repwdErr.removeClass('hide').find('em').text('密码输入不能为空');
         } else if (v.length < 6 || v.length > 20) {
             $this.addClass('error');
-            $repwdErr.removeClass('hide').find('em').text('密码只支持6-20位');
+            $repwdErr.removeClass('hide').find('em').text('新密码不符合要求');
         } else if (!pwdRegx.test(v)) {
             $this.addClass('error');
-            $repwdErr.removeClass('hide').find('em').text('密码须字母和数字组合');
+            $repwdErr.removeClass('hide').find('em').text('新密码不符合要求');
         }
 
         $waakRepwdTip.find('span').addClass('hide');
@@ -116,7 +116,7 @@ $next.on('click', function() {
             document.location.href = '//www.yohobuy.com/signin.html?refer=' + refer;
             return true;
         } else if (d.code === 401) {
-            // token is error
+            // pwd is error
             $pwdErr.removeClass('hide').find('em').text(d.message);
             return true;
         }