From b9d2e08aae572a6d791608a60dc561114ebfac59 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 29 Dec 2016 14:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C=E6=BF=80?=
 =?UTF-8?q?=E6=B4=BB=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb
index 5011bfbab..423057da6 100644
--- a/app/views/account/email_valid.html.erb
+++ b/app/views/account/email_valid.html.erb
@@ -10,9 +10,7 @@
     <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="<%#= resendmail_path(@user) %>" data-remote="true"><input class="btn btn-blue" type="button" id="btn" value="重新获取验证码" onclick="settime(this)" /></a>-->
     </p>
-    <!--<button class="btn btn-blue " >立即查收邮件</button>-->
 
     <ul class="email_prompt_txt mt30" style="width: 580px;">
       <p class="email_prompt_p">如果您一直收不到激活邮件，请按照以下步骤操作：</p>
@@ -22,11 +20,11 @@
       <li>4.如果您无法收到激活邮件，请直接给我们留言：</li>
       <div class="mt10 clearfix">
         <% get_memo %>
-        <%= form_for(@new_memo, :url => mail_feedback_forum_path(@public_forum, :user_id => @user.id), :id => "mail_valid_new_memo", :remote => true) do |f|  %>
+        <%= form_for(@new_memo, :url => mail_feedback_forum_path(@public_forum, :user_id => @user.id), :remote => true) do |f|  %>
             <%= f.text_area :subject, :id => "subject", :class => "email_prompt_mes", :style => "width: 568px;", :placeholder => l(:label_feedback_tips) %>
             <%= f.hidden_field :content, :id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
-            <span class="c_grey fl">还能输入<span id="textCount" class="c_orange">50</span>个字符</span>
-            <button href="javascript:void(0);" class="btn btn-blue fr" onclick="f_submit();">确定</button>
+            <span class="c_red fl" id="mail_valid_feedback_tip" style="display: none;">内容不能为空</span>
+            <a href="javascript:void(0);" class="btn btn-blue fr" onclick="f_submit();">确定</a>
         <% end %>
         <div class="cl"></div>
       </div>
@@ -35,10 +33,27 @@
 </div>
 
 <script>
+    function regex_mv_name()
+    {
+        var name = $.trim($("#subject").val());
+        if(name.length == 0)
+        {
+            $("#mail_valid_feedback_tip").show();
+            return false;
+        }
+        else
+        {
+            $("#mail_valid_feedback_tip").hide();
+            return true;
+        }
+    }
 
     function f_submit()
     {
-        $("#mail_valid_new_memo").submit();
+        if(regex_mv_name()){
+            alert("222");
+            $("#new_memo").submit();
+        }
     }
 
     var countdown = 60;