541469799@qq.com 1 سال پیش
والد
کامیت
a406c7fd41
2فایلهای تغییر یافته به همراه16 افزوده شده و 14 حذف شده
  1. 1 1
      app/index/service/passport/MailCaptcha.php
  2. 15 13
      app/index/view/passport/logIn.html

+ 1 - 1
app/index/service/passport/MailCaptcha.php

@@ -219,7 +219,7 @@ class MailCaptcha extends BaseService
 //        }
         $localCode = Cache::get('captchaSMS.' . $email);
         if (empty($localCode) || empty($localCode['code']) || $localCode['code'] != $captchaCode) {
-            throwError('Sorry,your captcha is invalid');
+            throwError('Sorry, the code is invalid!');
         }
         return true;
     }

+ 15 - 13
app/index/view/passport/logIn.html

@@ -22,13 +22,15 @@
 <body>
 <main id="main">
     <div class="pageContainer">
-        <div class="pageLogo">
-            <img src="/assets/index/asstes/icon/logo.png" alt="">
-        </div>
+        <a href="/index/index/index.html">
+            <div class="pageLogo">
+                <img src="/assets/index/asstes/icon/logo.png" alt="">
+            </div>
+        </a>
         <section class="pageSection">
             <!-- 登录模块 -->
             <div id="loginModel">
-                <h1 class="modelTitle">Log in</h1>
+                <h1 class="modelTitle">Log In</h1>
                 <div class="modelContainer">
                     <!-- 电子邮箱 -->
                     <div class="modelItem">
@@ -43,11 +45,11 @@
                     <a href="/index/passport/retrievePassword.html"><p class="forgotPassword">Forgot Password?</p>
                     </a>
                     <!-- 登录 -->
-                    <div class="pageButton" id="loginButton">Login</div>
+                    <div class="pageButton" id="loginButton">Log In</div>
                     <!-- 没有账户 -->
                     <div class="accountTips">
                         <p>No account?</p>
-                        <span id="toRegister">Register</span>
+                        <span id="toRegister">Sign Up</span>
                     </div>
                 </div>
             </div>
@@ -56,7 +58,7 @@
             <div id="registerModel">
                 <!-- 电子邮箱输入模块 -->
                 <div id="emailInputModel">
-                    <h1 class="modelTitle">Register</h1>
+                    <h1 class="modelTitle">Sign Up</h1>
                     <div class="modelContainer">
                         <!-- 电子邮箱地址 -->
                         <div class="modelItem">
@@ -66,18 +68,18 @@
                         <div class="pageButton" id="continueButton">Continue</div>
                         <div class="accountTips">
                             <p>Have an Account?</p>
-                            <span id="toLogin">Login</span>
+                            <span id="toLogin">Log In</span>
                         </div>
                     </div>
                 </div>
                 <!-- 电子邮箱验证模块 -->
                 <div id="emailVerifyModel">
                     <h1 class="modelTitle">Verify Email Address</h1>
-                    <p class="modelTips">Captcha has been sent to <span id="emailAddress"></span></p>
+                    <p class="modelTips">Code has been sent to <span id="emailAddress"></span></p>
                     <div class="modelContainer">
                         <!-- 电子邮箱验证码 -->
                         <div class="modelItem">
-                            <p class="miTitle">Captcha</p>
+                            <p class="miTitle">Code</p>
                             <input class="input" type="text" name="" id="vcode">
                         </div>
                         <!-- 验证 -->
@@ -294,8 +296,7 @@
                 type: "POST",
                 contentType: 'application/json',
                 success: function (obj) {
-                    console.log(obj);
-                    //return false;
+                    //console.log(obj);
                     //验证成功后进入
                     if (obj.status === 200 || obj.status === '200') {
                         const parentElement = $(this).parent();
@@ -303,7 +304,8 @@
                         //parentElement.siblings().hide(0)
                         $("#setPasswordModel").show(0).siblings().hide(0)
                     } else {
-                        showToast('Please try again later.')
+                        showToast(obj.message)
+                        //showToast('Please try again later.')
                     }
                 }
             })