From 83ecb9c196b767fed11199cea5525f80af3dd729 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 12 Jun 2018 09:32:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E7=9A=84=E6=A0=87?=
 =?UTF-8?q?=E7=82=B9=E7=AC=A6=E5=8F=B7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 18 +++++++++---------
 public/javascripts/new_user.js   |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 6061066d6..5bb1e5ba3 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -21,7 +21,7 @@
         $(".navHomepageSearchBoxcontainer").mouseout(function(){
             $(".navSearchTypeBox").css({display:"none"});
         });
-    })
+    });
     $(document).ready(function(){
         if(<%= @login%>){
             $("#signUpBox").css({display:"none"});
@@ -37,15 +37,16 @@
     var $passwd_correct = false;
     var $passwd_comfirm_correct = false;
     jQuery(document).ready(function () {
-        var $login = $('#user_login')
-        var $mail = $('#user_mail')
-        var $password = $('#user_password')
-        var $password_confirmation = $('#user_password_confirmation')
+        var $login = $('#user_login');
+        var $mail = $('#user_mail');
+        var $password = $('#user_password');
+        var $password_confirmation = $('#user_password_confirmation');
         $login.blur(function (event) {
             if ($(this).is('#user_login')) {
                 if (/^[a-zA-Z][a-zA-Z\d]{3,14}$/.test(this.value) == false){
                     $('#login_req').html('<span style="color: #c00202">只能使用英文字母和数字，必须以字母开头，长度不少于4个字符、不超过15个字符</span>');
                     $('#login_req').show();
+                    $login_correct = false;
                     return ;
                 }
                 else{
@@ -91,7 +92,6 @@
                             $('#mail_req').css('display','block');
                         });
             }
-            ;
         });
         $password.blur(function () {
             var pas1 = document.getElementById("user_password").value;
@@ -180,14 +180,14 @@
       <p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
     </div>
     <div class="new_login_box fr mr45 mt50">
-      <h2 class="new_login_h2">注册<a href="<%= signin_url_without_domain %>"  class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
+      <h2 class="new_login_h2">注册<a href="<%= signin_url_without_domain %>" class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
       <div class="new_login_form">
         <%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
             <%= error_messages_for 'user' %>
             <ul>
               <li class="new_register_li">
-                <%= f.text_field :mail, :size => 25, :class => 'new_register_input' , :placeholder => "请输入邮箱地址"%>
-                <p class="new_login_error" id="mail_req" style="display: none"  >请输入正确的邮箱</p>
+                <%= f.text_field :mail, :size => 25, :class => 'new_register_input', :placeholder => "请输入邮箱地址"%>
+                <p class="new_login_error" id="mail_req" style="display: none">请输入正确的邮箱</p>
               </li>
               <li class="new_register_li">
                 <%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_register_input' %>
diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js
index 20989ab58..04b4d4199 100644
--- a/public/javascripts/new_user.js
+++ b/public/javascripts/new_user.js
@@ -607,6 +607,7 @@ function register(){
         return;
     }
     if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
+        $("#loginUpButton").addClass('new_login_submit_disable');
         $("#main_reg_form").submit();
     }else{
         $('#user_login').blur();