From 7853527079081c3d5d2e1aa3744cd4a9b3aec05b Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 25 Sep 2019 15:16:29 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E5=9B=BE=E5=BD=A2=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/sys.php | 4 +++-
 public/static/admin.js    | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/admin/sys.php b/application/admin/sys.php
index 7272efbd8..d542c0267 100644
--- a/application/admin/sys.php
+++ b/application/admin/sys.php
@@ -162,5 +162,7 @@ Console::addDefaultCommands([
 // ThinkAdmin 图形验证码
 Route::get('/think/admin/captcha', function () {
     $image = new CaptchaService();
-    return json(['uniqid' => $image->getUniqid(), 'image' => $image->getData()]);
+    return json(['code' => '1', 'info' => '生成验证码', 'data' => [
+        'uniqid' => $image->getUniqid(), 'image' => $image->getData()
+    ]]);
 });
\ No newline at end of file
diff --git a/public/static/admin.js b/public/static/admin.js
index 6ab481f4c..9c9055f7d 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -755,7 +755,6 @@ $(function () {
                 if (data['skey']) delete data['skey'];
                 $.form.load(location.href, data, "post", function (ret) {
                     if (parseInt(ret.code) !== 1) {
-                        $(that).find('[name=verify]').val('');
                         $(that).find('.verify.layui-hide').removeClass('layui-hide');
                         $(that).find('[data-refresh-captcha]').trigger('click');
                     }
@@ -769,9 +768,9 @@ $(function () {
         image = this, uniqid = this.getAttribute('data-uniqid-field') || 'uniqid';
         verify = this.getAttribute('data-refresh-captcha') || this.getAttribute('data-verify-field') || 'verify';
         $.form.load('?s=think/admin/captcha', {}, 'get', function (ret) {
-            image.src = ret.image;
-            $(image).parents('form').find('[name=' + verify + ']').val('');
-            $(image).parents('form').find('[name=' + uniqid + ']').val(ret.uniqid);
+            image.src = ret.data.image;
+            $(image).parents('form').find('[name=' + verify + ']').attr('value', '');
+            $(image).parents('form').find('[name=' + uniqid + ']').val(ret.data.uniqid);
             return false;
         }, false);
     });