diff --git a/login/login.html b/login/login.html
index 14db1c9..91ed702 100644
--- a/login/login.html
+++ b/login/login.html
@@ -16,8 +16,9 @@
         <div class="login-main">
             <div class="login-name">中兴智能日报系统</div>
             <div class="login-hint">轻松工作每一天</div>
-            <input type="text" class="login-username" id="login-username" placeholder="邮箱或者账户名">
-            <input type="password" class="login-password" id="login-password" placeholder="密码">
+            <input type="text" autocomplete=”off” class="login-username" id="login-username" placeholder="邮箱或者账户名">
+            <input type="password" autocomplete=”off” class="login-password" id="login-password" placeholder="密码">
+            <div class="login-errorifo" id="login-errorifo"></div>
             <div class="login-btn" id="login-btn">登录</div>
         </div>
     </div>
@@ -25,6 +26,6 @@
 
 
 <script src="../resource/lib/jquery/jquery.min.js"></script>
-<script src="../topages/login/login.js"></script>
+<script src="../topages/login/login.js?a=1"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/topages/login/login.css b/topages/login/login.css
index 78cbc10..fc22564 100644
--- a/topages/login/login.css
+++ b/topages/login/login.css
@@ -32,7 +32,7 @@ html,body{
     height: 58px;
     cursor: pointer;
     text-align: center;
-    line-height: 68px;
+    line-height: 58px;
     font-size: 20px;
     color: #fff;
     background: url("../../resource/img/login-btn.png") no-repeat;
@@ -42,4 +42,32 @@ html,body{
     width: 800px;
     background: url("../../resource/img/login-bg.png") no-repeat;
     background-size:100% 100% ;
-}
\ No newline at end of file
+}
+.login-username,.login-password{
+    width: 400px;
+    height: 48px;
+    line-height: 48px;
+    padding-left: 20px;
+    background-color: #f2f3f4;
+    font-size: 14px;
+    color: rgba(0,0,0,.4);
+    border: 0;
+    border-radius: 25px;
+}
+input:focus {outline: none;}
+input:-webkit-autofill {
+    -webkit-box-shadow: 0 0 0px 1000px white inset !important;
+}
+.login-username{
+    margin: 64px 0 40px;
+}
+.login-errorifo{
+    font-size: 14px;
+    color:#f94c6e ;
+    height: 14px;
+    line-height: 14px;
+    margin: 23px 0;
+}
+/*.login-password{*/
+    /*margin-bottom: 60px;*/
+/*}*/
\ No newline at end of file
diff --git a/topages/login/login.js b/topages/login/login.js
index 3b71d51..11fa7fa 100644
--- a/topages/login/login.js
+++ b/topages/login/login.js
@@ -1,3 +1,21 @@
 /**
  * Created by mac on 18/7/27.
  */
+
+$('#login-btn').on('click',function () {
+
+   var username = $.trim($('#login-username').val());
+   var userpwd = $.trim($('#login-password').val());
+   if(username==''||username==null||username==undefined){
+       $('#login-errorifo').text('请输入用户名');
+       return;
+
+   }else{
+       if(userpwd==''||userpwd==null||userpwd==undefined){
+           $('#login-errorifo').text('请输入密码');
+
+       }else{
+           //ajax 如果输入不正确 继续提示 。如果正确把 $('#login-errorifo').text('')清空;
+       }
+   }
+});
\ No newline at end of file