diff --git a/app/controllers/UserController.go b/app/controllers/UserController.go index c2b74b8..0ac9beb 100644 --- a/app/controllers/UserController.go +++ b/app/controllers/UserController.go @@ -94,7 +94,7 @@ func (c User) ReSendActiveEmail() revel.Result { } // 修改Email发送激活邮箱 -func (c User) UpdateEmailSendActiveEmail(email string) revel.Result { +func (c User) updateEmailSendActiveEmail(email, pwd string) revel.Result { re := info.NewRe() if(c.GetUsername() == "demo") { re.Msg = "cannotUpdateDemo" @@ -193,4 +193,4 @@ func (c User) UpdateLeftIsMin(leftIsMin bool) revel.Result { } } return c.RenderJson(re) -} \ No newline at end of file +} diff --git a/app/views/member/user/email.html b/app/views/member/user/email.html index f99878b..541fa49 100644 --- a/app/views/member/user/email.html +++ b/app/views/member/user/email.html @@ -13,11 +13,15 @@ {{msg . "verified"}} {{else}} {{msg . "unVerified"}} - {{msg . "verifiedNow"}} + {{msg . "verifiedNow"}} {{msg . "or"}} - {{msg . "resendVerifiedEmail"}} + {{msg . "resendVerifiedEmail"}} {{end}} + + @@ -76,7 +96,8 @@ $("#emailBtn").click(function(e) { return; } var email = $("#email").val(); - post("/user/updateEmailSendActiveEmail", {email: email}, function(e) { + var pwd = $("#pwd").val(); + post("/user/updateEmailSendActiveEmail", {email: email, pwd: pwd}, function(e) { if(e.Ok) { var url = getEmailLoginAddress(email); showAlert("#emailMsg", getMsg("verifiedEmaiHasSent") +" " + getMsg("checkEmail") + "", "success"); diff --git a/app/views/member/user/password.html b/app/views/member/user/password.html index 7a791e4..778c5f0 100644 --- a/app/views/member/user/password.html +++ b/app/views/member/user/password.html @@ -24,7 +24,7 @@ ]' data-msg_target="#pwdMsg" > - {{msg . "passwordTips"}} +