From 52366d11b34b1c2fce1349b4d29ef8922d61b36c Mon Sep 17 00:00:00 2001
From: filesite <release@filesite.io>
Date: Wed, 8 May 2024 18:19:31 +0800
Subject: [PATCH] sms code send button improved

---
 themes/tajian/views/site/login.php    |  2 +-
 themes/tajian/views/site/register.php |  2 +-
 www/js/tajian.js                      | 18 +++++++-----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/themes/tajian/views/site/login.php b/themes/tajian/views/site/login.php
index 24f8831..66d15b4 100644
--- a/themes/tajian/views/site/login.php
+++ b/themes/tajian/views/site/login.php
@@ -7,7 +7,7 @@
         <div class="mb-3 twocol">
             <label for="text_input_sm" class="form-label">验证码</label>
             <input id="text_input_sm" name="smscode" placeholder="输入收到的短信验证码">
-            <button disabled="disabled" class="smsbtn bt_sms_JS">发送验证码</button>
+            <button class="smsbtn bt_sms_JS">发送验证码</button>
         </div>
         <div class="avform_bt vercenter">
             <button class="jsbtn" aria-label="登录" type="button">
diff --git a/themes/tajian/views/site/register.php b/themes/tajian/views/site/register.php
index 4c6d9b6..dfe06fb 100644
--- a/themes/tajian/views/site/register.php
+++ b/themes/tajian/views/site/register.php
@@ -15,7 +15,7 @@
         <div class="mb-3 twocol">
             <label for="text_input_sm" class="form-label">验证码</label>
             <input id="text_input_sm" name="smscode" placeholder="输入收到的短信验证码">
-            <button disabled="disabled" type="button" class="smsbtn bt_sms_JS">发送验证码</button>
+            <button type="button" class="smsbtn bt_sms_JS">发送验证码</button>
         </div>
         <div class="avform_bt vercenter">
             <button class="jsbtn" aria-label="注册" type="button">
diff --git a/www/js/tajian.js b/www/js/tajian.js
index 55cf4ef..3a4088b 100644
--- a/www/js/tajian.js
+++ b/www/js/tajian.js
@@ -208,13 +208,6 @@ if ($('.bt_kf_JS').get(0)) {
     }
 }
 
-var smsCodeBtnHandler = function(e) {
-    var cellphone = $('input[name=username]').val();
-    if (/^1[3-9][0-9]{9}$/.test(cellphone)) {
-        $('.bt_sms_JS').removeAttr('disabled');
-    }
-};
-
 //验证码发送
 if ($('.bt_sms_JS').get(0)) {
     var timer_restore_smsBtn = null, timer_num = 60;
@@ -232,6 +225,13 @@ if ($('.bt_sms_JS').get(0)) {
     };
 
     $('.bt_sms_JS').click(function(e) {
+        var cellphone = $('input[name=username]').val();
+        if (/^1[3-9][0-9]{9}$/.test(cellphone) == false) {
+            alert('请填写正确的手机号码！');
+            $('input[name=username]').focus();
+            return false;
+        }
+
         autoRestoreSmsBtn();
         
         //调用api发送验证码
@@ -253,8 +253,6 @@ if ($('.bt_sms_JS').get(0)) {
 
 // 注册
 if ($('#register_form').get(0)) {
-    $('#register_form input[name=username]').blur(smsCodeBtnHandler);
-
     $('#register_form .jsbtn').click(function(e) {
         e.preventDefault();
 
@@ -310,8 +308,6 @@ if ($('#register_form').get(0)) {
 
 // 登录
 if ($('#login_form').get(0)) {
-    $('#login_form input[name=username]').blur(smsCodeBtnHandler);
-
     $('#login_form .jsbtn').click(function(e) {
         e.preventDefault();