diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php
index 6ba078f..cd57791 100644
--- a/app/admin/controller/Login.php
+++ b/app/admin/controller/Login.php
@@ -18,7 +18,7 @@ class Login extends Common
      */
     public function index()
     {
-        //
+        View::assign('captcha_login', env('captcha_login', true));
         return View::fetch();
     }
 
@@ -27,13 +27,14 @@ class Login extends Common
     {
         $post_data = $this->request->post();
 
-       
-
         $validate = Validate::rule('account',Rule::isRequire())
-        ->rule('password',Rule::isRequire())
-        ->rule('captcha',function($value){
-            return \captcha_check($value)?true:'验证码错误';
-        });
+        ->rule('password',Rule::isRequire());
+
+        if (env('captcha_login', true)) {
+            $validate->rule('captcha',function($value){
+                return \captcha_check($value)?true:'验证码错误';
+            });
+        }
 
         if(!$validate->check($post_data)){
             return json_message($validate->getError());
diff --git a/view/admin/login/index.html b/view/admin/login/index.html
index fdb937a..ce3ce9b 100644
--- a/view/admin/login/index.html
+++ b/view/admin/login/index.html
@@ -47,6 +47,7 @@
                     <input type="password" name="password" required lay-verify="required" placeholder="请输入密码" value="" autocomplete="off" class="layui-input">
                   </div>
                 </div>
+                {if $captcha_login}
                 <div class="layui-form-item">
                   <label class="layui-form-label">验证码</label>
                   <div class="layui-input-block">
@@ -55,6 +56,7 @@
                   </div>
 
                 </div>
+                {/if}
 
                 <div class="layui-form-item">
 
@@ -88,7 +90,9 @@
               location.href = '{:url("admin/Index/index")}'
             }, 1200);
           } else {
-            $('.captcha').click()
+            if ($('.captcha').length) {
+              $('.captcha').click()
+            }
             layer.msg(result.msg);
           }
         })