From f23d611bd24f43004162b4c721eda877edf87790 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 14 Sep 2018 15:45:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/_change_user_email.html.erb |  6 ++-
 app/views/account/email_activation.html.erb   | 17 +------
 app/views/account/email_valid.html.erb        | 44 +++++++++----------
 public/javascripts/application.js             | 33 ++++++++++++++
 4 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/app/views/account/_change_user_email.html.erb b/app/views/account/_change_user_email.html.erb
index 519ffb8a5..094620de2 100644
--- a/app/views/account/_change_user_email.html.erb
+++ b/app/views/account/_change_user_email.html.erb
@@ -67,7 +67,11 @@
                         $("#user_email_show").html(data.email);
                         // 更改邮箱地址后，直接给用户发送邮件
                         $.ajax({
-                            url: "<%= resendmail_path(:user => @user) %>"
+                            url: "<%= resendmail_path(:user => @user) %>",
+                            type: 'get',
+                            success:function(data){
+                                task = setInterval(get_email_info(<%= @user.try(:id) %>, "用户注册帐号激活通知"), 1000);
+                            }
                         });
                         hideModal();
                         return;
diff --git a/app/views/account/email_activation.html.erb b/app/views/account/email_activation.html.erb
index 41434afe7..40608b776 100644
--- a/app/views/account/email_activation.html.erb
+++ b/app/views/account/email_activation.html.erb
@@ -42,22 +42,7 @@
 
                   $(".email_verify_btn").replaceWith("<p class='email_verify_p mt30 ml30'>激活邮件已发送至您的注册邮箱("+mail+")，请及时登录邮箱进行验证。</p>");
 
-                  $.ajax({
-                      url:'<%= account_get_email_info_path(:user_id => @user.try(:id), :subject => "用户注册帐号激活通知") %>',
-                      type:'get',
-                      success:function(data){
-                          if(data.result == "succuss"){
-                              $("#email_log_detail").html("邮件概况："+data.message);
-                          } else{
-                              $("#email_log_detail").html("邮件概况：无法查询邮件概况");
-                          }
-                          $("#email_log_detail").parent().show();
-                      },
-                      error:function(){
-                          $("#email_log_detail").html("邮件概况：无法查询邮件概况");
-                          $("#email_log_detail").parent().show();
-                      }
-                  });
+                  get_email_info(<%= @user.try(:id) %>, "用户注册帐号激活通知");
               }
       );
   }
diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb
index 8bb1020ae..d5c3fa12d 100644
--- a/app/views/account/email_valid.html.erb
+++ b/app/views/account/email_valid.html.erb
@@ -9,7 +9,7 @@
     </p>
     <p>
       <a href="http://mail.<%= email %>" class="btn btn-blue" target="_blank"><%= l(:label_check_email)%></a>
-      &nbsp; &nbsp; <%= link_to "<input class='btn btn-blue' type='button' id='btn' value='重新发送激活邮件' onclick='settime(this)' />".html_safe, { :controller => 'account', :action => 'resendmail', :user => @user}, :remote => true, :method => 'get' %>
+      <a href="javascript:void(0);" onclick="resendMail('<%= resendmail_path(@user) %>','<%= @user.id %>');"><input class='btn btn-blue' type='button' id='btn' value='重新发送激活邮件'/></a>
     </p>
 
     <div class="mt10 mb10 email_info_box">
@@ -27,20 +27,7 @@
 
 <script>
     $(document).ready(function(){
-        $.ajax({
-            url:'<%= account_get_email_info_path(:user_id => @user.try(:id), :subject => "用户注册帐号激活通知") %>',
-            type:'get',
-            success:function(data){
-                if(data.result == "succuss"){
-                    $("#email_log_detail").html("邮件概况："+data.message);
-                } else{
-                   $("#email_log_detail").html("邮件概况：无法查询邮件概况");
-                }
-            },
-            error:function(){
-                $("#email_log_detail").html("邮件概况：无法查询邮件概况");
-            }
-        });
+        get_email_info(<%= @user.try(:id) %>, "用户注册帐号激活通知");
 
         $("#change_email").click(function(){
            $.ajax({
@@ -52,6 +39,26 @@
         })
     });
 
+    function resendMail(url,id)
+    {
+        $.get(
+            url,
+            {user: id },
+            function (data) {
+                //邮箱@之前用a**b格式显示
+                var mail = data.email;
+                var pos = mail.indexOf("@");
+                var restr = mail.substring(1,pos-1);
+                if( mail.split("@")[0].length > 2 ){
+                    mail = mail.replace(restr,"***");
+                }
+
+                settime(document.getElementById("btn"));
+                get_email_info(<%= @user.try(:id) %>, "用户注册帐号激活通知");
+            }
+        );
+    }
+
     function regex_mv_name()
     {
         var name = $.trim($("#subject").val());
@@ -111,13 +118,6 @@
             myTips("反馈成功","success");
         });
 
-        $("#scrollsidebar").fix({
-            float: 'right',	//default.left or right
-            minStatue: cookieget('minStatue'),
-            skin: 'green',	//default.gray or blue
-            durationTime: 600
-        });
-
         $("#subject").keydown(function(){
             alert("2222");
             var curLength=$("#subject").val().length;
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 0526ea004..156d02733 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -2347,4 +2347,37 @@ function toggle_student_score(id){
     } else{
         $("#toggle_score_" + id).html("展开评阅详情");
     }
+}
+
+function get_email_info(id, subject) {
+    task = setInterval(search_email_status, 2000);
+    var count = 0;
+    function search_email_status() {
+      count = count + 1;
+      if(count > 3){
+          clearInterval(task);
+      } else {
+          $.ajax({
+              url: '/account/get_email_info?user_id=' + id + '&subject=' + subject,
+              type: 'get',
+              success: function (data) {
+                  $("#email_log_detail").parent().show();
+                  if (data.result == "succuss") {
+                      $("#email_log_detail").html("邮件概况：" + data.message);
+                      if (data.message != "未查询到相关数据" && data.message != "发信中") {
+                          clearInterval(task);
+                      }
+                  } else {
+                      $("#email_log_detail").html("邮件概况：无法查询邮件概况");
+                      clearInterval(task);
+                  }
+              },
+              error: function () {
+                  $("#email_log_detail").html("邮件概况：无法查询邮件概况");
+                  $("#email_log_detail").parent().show();
+                  clearInterval(task);
+              }
+          });
+      }
+    }
 }
\ No newline at end of file