Fix:修复关闭验证码但无法登陆的bug

zhuchunshu · Aug 10, 2023 · 36fc3a8 · 36fc3a8
1 parent ee8ad4e
commit 36fc3a8
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 12 deletions.
diff --git a/app/Plugins/Core/resources/assets/js/sign.js b/app/Plugins/Core/resources/assets/js/sign.js
diff --git a/app/Plugins/Core/resources/package/js/sign.js b/app/Plugins/Core/resources/package/js/sign.js
@@ -3,7 +3,10 @@ import swal from "sweetalert";
 
 function getCaptchaInputValue(){
     const inputs = document.querySelectorAll('input[isCaptchaInput]');
-    let v= inputs[0].value
+    let v;
+    if(inputs.length>0){
+        v = inputs[0].value
+    }
     if(!v){
         v = localStorage.getItem("captcha_token")
     }

diff --git a/app/Plugins/User/resources/assets/js/order.js b/app/Plugins/User/resources/assets/js/order.js
diff --git a/app/Plugins/User/resources/package/js/order.js b/app/Plugins/User/resources/package/js/order.js
@@ -3,7 +3,10 @@ import iziToast from "izitoast";
 import qs from "querystring";
 function getCaptchaInputValue(){
     const inputs = document.querySelectorAll('input[isCaptchaInput]');
-    let v= inputs[0].value
+    let v;
+    if(inputs.length>0){
+        v = inputs[0].value
+    }
     if(!v){
         v = localStorage.getItem("captcha_token")
     }

diff --git a/app/Themes/CodeFec/resources/views/user/login.blade.php b/app/Themes/CodeFec/resources/views/user/login.blade.php
@@ -27,7 +27,7 @@
             </div>
         @endif
         <div class="form-footer">
-            <button type="submit" isNeedCaptcha disabled class="btn btn-primary w-100">登陆</button>
+            <button type="submit" @if(get_options('core_user_login_captcha','开启')==='开启') {{"isNeedCaptcha disabled"}} @endif class="btn btn-primary w-100">登陆</button>
         </div>
     </form>
 </div>
diff --git a/app/Themes/CodeFec/resources/views/user/login_username.blade.php b/app/Themes/CodeFec/resources/views/user/login_username.blade.php
@@ -27,7 +27,7 @@
         @endif
 
         <div class="form-footer">
-            <button type="submit" isNeedCaptcha disabled class="btn btn-primary w-100">登陆</button>
+            <button type="submit" @if(get_options('core_user_login_captcha','开启')==='开启') {{"isNeedCaptcha disabled"}} @endif class="btn btn-primary w-100">登陆</button>
         </div>
     </form>
 </div>
diff --git a/app/Themes/CodeFec/resources/views/user/register.blade.php b/app/Themes/CodeFec/resources/views/user/register.blade.php
@@ -47,7 +47,7 @@
         @endif
 
         <div class="form-footer">
-            <button type="submit" class="btn btn-primary w-100">立即注册</button>
+            <button type="submit" @if(get_options('core_user_reg_captcha','开启')==='开启') {{"isNeedCaptcha disabled"}} @endif class="btn btn-primary w-100">立即注册</button>
         </div>
     </form>
 </div>
diff --git a/public/js/admin/login.js b/public/js/admin/login.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,7 +1,7 @@
 {
     "/js/app.js": "/js/app.js?id=4be8928615be8e29d90a",
     "/js/install.js": "/js/install.js?id=8787ba5d0ec807f2d7aa",
-    "/js/admin/login.js": "/js/admin/login.js?id=c9af0e95e54130f7de8d",
+    "/js/admin/login.js": "/js/admin/login.js?id=a74fee6e7def6229a755",
     "/js/admin/EditFile.js": "/js/admin/EditFile.js?id=c549eac80e00b999ce76",
     "/js/admin/error.js": "/js/admin/error.js?id=73606bb3d3674528bf49",
     "/js/admin/component.js": "/js/admin/component.js?id=022edaadc6e5d90911ce",
@@ -11,13 +11,13 @@
     "/plugins/Core/js/admin.js": "/plugins/Core/js/admin.js?id=ee4a80e4d856b074ccc9",
     "/plugins/Core/js/app.js": "/plugins/Core/js/app.js?id=7981238fe8011bb690da",
     "/plugins/Core/js/report.js": "/plugins/Core/js/report.js?id=f0498920bd2ea95bd2ad",
-    "/plugins/Core/js/sign.js": "/plugins/Core/js/sign.js?id=9bc92e8f8207eba52a8a",
+    "/plugins/Core/js/sign.js": "/plugins/Core/js/sign.js?id=b1cc8727fab4267704da",
     "/plugins/Core/js/user.js": "/plugins/Core/js/user.js?id=d0e94076f618f6fae765",
     "/plugins/Topic/js/tag.js": "/plugins/Topic/js/tag.js?id=1e874b0101d587c0a73e",
     "/plugins/Topic/js/topic.js": "/plugins/Topic/js/topic.js?id=5e3cb57b4063e99612bb",
     "/plugins/Topic/js/editor.js": "/plugins/Topic/js/editor.js?id=d41d8cd98f00b204e980",
     "/plugins/Topic/js/core.js": "/plugins/Topic/js/core.js?id=d9aab0be882bb2f26d60",
-    "/plugins/User/js/order.js": "/plugins/User/js/order.js?id=4ed6c996588a2862870f",
+    "/plugins/User/js/order.js": "/plugins/User/js/order.js?id=c00a6dabf17cd32a229c",
     "/plugins/User/js/pm.js": "/plugins/User/js/pm.js?id=00970bdf6a4b6fefa9e5",
     "/plugins/User/js/user.js": "/plugins/User/js/user.js?id=4f7e20e856fc2ab616dc",
     "/plugins/Comment/js/edit.js": "/plugins/Comment/js/edit.js?id=401095050fa73934ebd1",

diff --git a/resources/js/admin/login.js b/resources/js/admin/login.js
@@ -3,7 +3,10 @@ import swal from 'sweetalert';
 
 function getCaptchaInputValue(){
     const inputs = document.querySelectorAll('input[isCaptchaInput]');
-    let v= inputs[0].value
+    let v;
+    if(inputs.length>0){
+        v = inputs[0].value
+    }
     if(!v){
         v = localStorage.getItem("captcha_token")
     }