From e11a32e113dfb91d6daa5893418563a9a93180ae Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 14 Aug 2020 21:17:28 +0800
Subject: [PATCH] FIX include jquery

---
 app/controllers/oauth_controller.rb       |  4 ++--
 app/views/layouts/oauth_register.html.erb |  1 +
 app/views/oauth/register.html.erb         | 20 ++++++++++++--------
 3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index f9c526fac..2d7bb1cc9 100644
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -60,8 +60,8 @@ class OauthController < ApplicationController
 
   def auto_register
     login = params[:login]
-    email = params[:email]
-    password = params[:login]
+    email = params[:mail]
+    password = params[:password]
     platform = params[:plathform] || 'forge'
 
     result = autologin_register(login, email, password, platform)
diff --git a/app/views/layouts/oauth_register.html.erb b/app/views/layouts/oauth_register.html.erb
index cb1e4ef47..1e43ddbea 100644
--- a/app/views/layouts/oauth_register.html.erb
+++ b/app/views/layouts/oauth_register.html.erb
@@ -2,6 +2,7 @@
   <head>
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
+    <%= javascript_include_tag '/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3', '': '' %>
     <%= stylesheet_link_tag '/stylesheets/css/oauth', '', :media => 'all' %>
   </head>
   <body>
diff --git a/app/views/oauth/register.html.erb b/app/views/oauth/register.html.erb
index 4b053b542..77bfe749a 100644
--- a/app/views/oauth/register.html.erb
+++ b/app/views/oauth/register.html.erb
@@ -1,11 +1,12 @@
 <div class="indexPanel">
   <p class="indexTitle">完善信息，进入比赛</p>
   <div class="indexInfos">
-    <%= form_tag(oauth_auto_register_path, method: :post, class: 'form-inline search-form flex-1') do %>
+
+    <%= form_tag('', method: :post, id: 'oauth_form',  class: 'form-inline search-form flex-1', remote: true) do %>
       <%= hidden_field_tag 'callback_url', params[:callback_url] %>
       <div class="indexInfo">
         <span>用户名：</span>
-        <%= text_field_tag :mail, params[:login], placeholder: '请输入用户名', disabled: true, id: 'login' %>
+        <%= text_field_tag :login, params[:login], placeholder: '请输入用户名', readonly: true, id: 'login' %>
         <p class="checkInfo loginCheck"><span></span></p>
       </div>
       <div class="indexInfo">
@@ -19,27 +20,25 @@
         <p class="checkInfo passwordCheck"><span></span></p>
       </div>
       <div class="indexBtn">
-        <button class="indexSubmit" onclick="sureSubmit();">确定</button>
+        <button type="button" class="indexSubmit" id="indexSubmit"  onclick="submitdata();">确定</button>
       </div>
     <% end %>
   </div>
 </div>
 <script type="text/javascript">
-  function sureSubmit(){
+  function submitdata(){
     var login = $("#login").val();
     var email = $("#email").val();
     var password = $("#password").val();
 
-    alert(email)
-
     if(!login){
       $(".loginCheck span").html("请输入账号");
       return;
     }else{
       $(".loginCheck span").html("");
     }
-    if(!login){
-      $(".loginCheck span").html("请输入账号");
+    if(!email){
+      $(".emailCheck span").html("请输入绑定的邮箱");
       return;
     }else{
       $(".emailCheck span").html("");
@@ -50,5 +49,10 @@
     }else{
       $(".passwordCheck span").html("");
     }
+    $.ajax({
+      url: "<%=  oauth_auto_register_path %>",
+      data: $("#oauth_form").serialize(),
+      type: 'post'
+    })
   }
 </script>
