huai-sian 3 gadi atpakaļ
vecāks
revīzija
c79a2516d8
5 mainītis faili ar 23 papildinājumiem un 5 dzēšanām
  1. 1 1
      .vscode/settings.json
  2. 1 0
      html/login.html
  3. 18 2
      html/login.js
  4. 1 1
      html/reset_pwd_email.html
  5. 2 1
      html/static/script_test.js

+ 1 - 1
.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "liveServer.settings.port": 5504
+    "liveServer.settings.port": 5505
 }

+ 1 - 0
html/login.html

@@ -174,6 +174,7 @@
         integrity="sha512-Y/Pox7RqKmT84klgmJCva3drWoXQWO42oHiWWhb9zd1pkIH60NF2SamgBrFHOTzrzHJhwgPGNGjNJ5ZmxLpUAQ=="
         crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="static/owl.carousel.min.js"></script>
+    <script src="static/loading-overlay.js"></script>
     <script src="login.js"></script>
     <script type="text/javascript" src="static/lan.js"></script>
     <script src="static/common.js"></script>

+ 18 - 2
html/login.js

@@ -42,12 +42,28 @@ function login(){
 
         return;
     }
+    JsLoadingOverlay.show({
+        "overlayBackgroundColor": "#666666",
+        "overlayOpacity": 0.6,
+        "spinnerIcon": "ball-circus",
+        "spinnerColor": "#000",
+        "spinnerSize": "3x",
+        "overlayIDName": "overlay",
+        "spinnerIDName": "spinner",
+        "offsetX": 0,
+        "offsetY": 0,
+        "containerID": null,
+        "lockScroll": false,
+        "overlayZIndex": 10,
+        "spinnerZIndex": 11
+      });
     
     var data = "grant_type=&username=" + username + "&password="+password+"&scope=&client_id=&client_secret=";
     const headers = {
         "accept": "application/json",
         "Content-Type": "application/x-www-form-urlencoded"
     }
+    
     axios({
         method: 'post',
         url: url,
@@ -56,6 +72,7 @@ function login(){
     }).then(res => {
         console.log(res.data);
         document.cookie = 'jwt_token='+res.data.access_token;
+        JsLoadingOverlay.hide();
         if(res.data.access_token!=null && res.data.veri == 'ok') {
             var title = "登入成功";
             if (lang == 'en') { // 英文版訊息
@@ -86,11 +103,10 @@ function login(){
             });
         } else {
             var title = "登入失敗";
-
+            JsLoadingOverlay.hide();
             if (lang == 'en') { // 英文版訊息
                 title = "Login Failed!"
             }
-
             Swal.fire({
                 title: title,
                 icon: 'error',

+ 1 - 1
html/reset_pwd_email.html

@@ -127,7 +127,7 @@
                 <h3 class="fs-subtitle" style="display: inline-block;">Email</h3><br/>
                 <input type="text" id='in_email' name='m1' class='imgsrc imgsrc1' value="" placeholder="" /><br/>
                 
-                <input id="checker" type="button" class="sender action-button" value="送出" />
+                <input id="checker" type="button" class="sender action-button" value="送出" set-lan="value:submit" />
 
                 </fieldset>
             </form>

+ 2 - 1
html/static/script_test.js

@@ -3,7 +3,8 @@
 
 let userBasics = JSON.parse(localStorage.getItem('user_profile')) || [];
 
-if(userBasics !== [] && typeof(userBasics) !== 'string'){
+console.log(userBasics);
+if(userBasics.length >0 && typeof(userBasics) !== 'string'){
   $('.userName').html(`<h2 class="user-name text-white mt-lg-3 mt-xl-1 fw-bold">Hi ${userBasics.user_info.userName}</h2>`);
 }