From 7f19295b88d0c8a405404673218bf7588b03ca77 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 26 Aug 2015 15:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 519b6c1a3..85db7f695 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -66,7 +66,7 @@
     }
 
     function register(){
-        if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct){
+        if($login_correct && $mail_correct && $passwd_correct &&  $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
             $("#main_reg_form").submit();
         }else{
             $('#user_login').blur();
@@ -242,6 +242,11 @@
             <%= f.text_field :login, :size => 25,:placeholder=>"请输入用户昵称",:class=>'loginSignBox'%>
             <div class="loginSignAlert" id="login_req" style="display: none">用户昵称为2-18个中英文，数字或下划线</div>
           </div>
+              <div class="loginSignOption">
+                <div class="fl mt3 mr5">
+                  <input type="checkbox" id="read_and_confirm"/>
+                </div>
+                我已阅读并接受<a href="javascript:void(0);" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
           <div class="loginUpButton">
             <a href="javascript:void(0);" class="c_white db" onclick="register();">注册</a>