From 8db5852a61b05c1bc90fb2fccf5a79e23b7db0f1 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 15:49:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BF=80=E6=B4=BB=E9=82=AE=E7=AE=B1=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=82=AE=E7=AE=B1=EF=BC=8C=E6=BF=80?=
=?UTF-8?q?=E6=B4=BB=E9=82=AE=E7=AE=B1=E7=95=8C=E9=9D=A2=E7=95=99=E8=A8=80?=
=?UTF-8?q?=E5=A4=AA=E9=95=BF=E4=B8=8D=E8=83=BD=E7=95=99=E8=A8=80=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/account_controller.rb | 7 ++--
app/views/account/email_activation.html.erb | 34 +++++++++++--------
.../projects/invite_members_by_mail.html.erb | 2 +-
config/routes.rb | 2 +-
4 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 62b076754..8187055be 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -239,17 +239,18 @@ class AccountController < ApplicationController
end
def resendmail
- status = 1
+ result = {:status=>1, :email=>""}
user = User.find(params[:user]) if params[:user]
+ result[:email] = user.mail
token = Token.new(:user => user, :action => "register")
if token.save
# Mailer.run.register(token)
Mailer.register(token).deliver
else
yield if block_given?
- status = 0
+ result[:status] = 0
end
- render :json => status
+ render :json => result
end
def email_activation
diff --git a/app/views/account/email_activation.html.erb b/app/views/account/email_activation.html.erb
index d625e7fc9..9655efcf4 100644
--- a/app/views/account/email_activation.html.erb
+++ b/app/views/account/email_activation.html.erb
@@ -23,9 +23,15 @@
url,
{user: id },
function (data) {
- console.log("1111111111");
- console.log(data);
- $(".email_verify_btn").replaceWith("激活邮件已发送至您的注册邮箱，请及时登录邮箱进行验证。
");
+ //邮箱@之前用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,"***");
+ }
+
+ $(".email_verify_btn").replaceWith("激活邮件已发送至您的注册邮箱("+mail+")，请及时登录邮箱进行验证。
");
}
);
}
@@ -37,16 +43,16 @@
pop_up_box(htmlvalue,580,30,50);
return;
}
- $.get(
- url,
- {user:user,text:$(".email_prompt_mes").val() },
- function (data) {
- console.log("2222222");
- console.log(data);
- var htmlvalue = "您的留言已发送
我们将尽快处理好，并通过邮件通知您。感谢您的反馈！
您的留言已发送
我们将尽快处理好，并通过邮件通知您。感谢您的反馈！