找回密码校验及logobrand js @review by 王成龙

@@ -79,6 +79,10 @@ var $ = require('yoho.jquery'),
                     var brandTpl,
                     var brandTpl,
                         brandHtml;
                         brandHtml;
 
 
+                    if (!data || data.length === 0) {
+                        return;
+                    }
+
                     that._createHelper();
                     that._createHelper();
                     brandHtml = '\{{#brandList logoBrand}}' +
                     brandHtml = '\{{#brandList logoBrand}}' +
                         '<a href="\{{href}}" target="_blank"><img class="lazy" data-original="\{{img}}" alt=""></a>' +
                         '<a href="\{{href}}" target="_blank"><img class="lazy" data-original="\{{img}}" alt=""></a>' +

@@ -174,6 +174,9 @@ $('.va').keyup(function() {
         } else if (v.length < 6 || v.length > 20) {
         } else if (v.length < 6 || v.length > 20) {
             $(this).addClass('error');
             $(this).addClass('error');
             $pwdErr.removeClass('hide').find('em').text('密码只支持6-20位');
             $pwdErr.removeClass('hide').find('em').text('密码只支持6-20位');
+        } else if (/^([a-zA-Z0-9\-\+_!@\#$%\^&\*\(\)\:\;\.=\[\]\\\',\?]){6,20}$/.test(v)) {
+            $(this).addClass('error');
+            $pwdErr.removeClass('hide').find('em').text('密码不能包含特殊字符');
         } else {
         } else {
             $pwdErr.addClass('hide');
             $pwdErr.addClass('hide');
             if ($repwd.val() !== '') {
             if ($repwd.val() !== '') {