From 11c5c2783d3f4385e51334d2adee645f4cc10ac9 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 14 Jan 2017 09:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=88=90=E5=8A=9F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E6=8C=89=E7=85=A7=E8=A6=81=E6=B1=82=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/email_valid.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb
index 423057da6..84da6d04d 100644
--- a/app/views/account/email_valid.html.erb
+++ b/app/views/account/email_valid.html.erb
@@ -5,18 +5,18 @@
   <div class="email_verify" style="width: 580px;">
     <p class="fb f18" style="color:green;"><i class="icon-ok mr5 f18"></i>注册成功！
       <span style=" color:#3b94d6; font-size:12px; font-weight:normal;">请在24小时内点击邮件中的链接来激活您的账号。</span></p>
-    <p class="f14  mt30  mb5">请登录邮箱（<span class="c_red"><%= @mail_type %></span>）收取账号激活邮件。<br/>点击邮件中的激活链接，方可使用该账号
+    <p class="f14  mt30  mb5">请登录邮箱（<span class="c_red"><%= @user.mail %></span>）收取账号激活邮件。<br/>点击邮件中的激活链接，方可使用该账号
     </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' %>
+      &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' %>
     </p>
 
     <ul class="email_prompt_txt mt30" style="width: 580px;">
       <p class="email_prompt_p">如果您一直收不到激活邮件，请按照以下步骤操作：</p>
       <li>1.请确认是否填写了正确的邮箱地址 </li>
       <li>2.请注意查看邮箱中的“订阅邮件”、“垃圾邮件”，可能Trustie的邮件被误杀了</li>
-      <li>3.点击这里重新发送激活邮件</li>
+      <li>3.请点击重新发送激活邮件按钮</li>
       <li>4.如果您无法收到激活邮件，请直接给我们留言：</li>
       <div class="mt10 clearfix">
         <% get_memo %>