From 7898b811b29e0fe853b7f4ce93d4b7ffc2ce579a Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Tue, 2 Apr 2024 16:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=92=8C=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/view/common/script.html |  2 +-
 public/assets/js/frontend.js              | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/application/index/view/common/script.html b/application/index/view/common/script.html
index 4c45a84d..a71bbab5 100644
--- a/application/index/view/common/script.html
+++ b/application/index/view/common/script.html
@@ -8,7 +8,7 @@
                     <div class="input-group">
                         <input type="text" name="captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length})" />
                         <span class="input-group-btn" style="padding:0;border:none;">
-                            <img src="{:captcha_src()}" width="107" height="32" onclick="this.src = '{:captcha_src()}?r=' + Math.random();"/>
+                            <img src="{:captcha_src()}" width="107" height="32" class="captcha-img" onclick="this.src = '{:captcha_src()}?r=' + Math.random();"/>
                         </span>
                     </div>
                     <span class="msg-box n-right" style="left:0;top:33px;text-align: left;" for="captcha"></span>
diff --git a/public/assets/js/frontend.js b/public/assets/js/frontend.js
index fbe23f31..64303561 100644
--- a/public/assets/js/frontend.js
+++ b/public/assets/js/frontend.js
@@ -2,7 +2,7 @@ define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
     var Frontend = {
         api: {
             //发送验证码
-            sendcaptcha: function (btn, type, data, callback) {
+            sendcaptcha: function (btn, type, data, success, error) {
                 $(btn).addClass("disabled", true).text("发送中...");
                 var si = {};
                 Frontend.api.ajax({url: $(btn).data("url"), data: data}, function (data, ret) {
@@ -17,11 +17,15 @@ define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
                             $(btn).addClass("disabled").text(seconds + "秒后可再次发送");
                         }
                     }, 1000);
-                    if (typeof callback == 'function') {
-                        callback.call(this, data, ret);
+                    if (typeof success == 'function') {
+                        success.call(this, data, ret);
                     }
-                }, function () {
+                }, function (data, ret) {
                     $(btn).removeClass("disabled").text('发送验证码');
+
+                    if (typeof error == 'function') {
+                        error.call(this, data, ret);
+                    }
                 });
             },
             //准备验证码
@@ -39,6 +43,8 @@ define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
                                     data.captcha = $("input[name=captcha]", form).val();
                                     Frontend.api.sendcaptcha(btn, type, data, function (data, ret) {
                                         Layer.close(index);
+                                    }, function (data, ret) {
+                                        $("img.captcha-img", form).trigger("click");
                                     });
                                     return true;
                                 }