From 6b74a12ede5682ad2ee4a085d4c66068db4dbf30 Mon Sep 17 00:00:00 2001
From: wystan_rin <wystanRin@outlook.com>
Date: Thu, 21 Nov 2024 20:11:16 +0800
Subject: [PATCH] developing

---
 payment_headend/css/customAlert.css |  2 +-
 payment_headend/index.html          |  9 ---------
 payment_headend/js/customAlert.js   |  6 +++---
 payment_headend/js/index.js         | 24 ++++++++++++------------
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/payment_headend/css/customAlert.css b/payment_headend/css/customAlert.css
index b267e8d..7d0e595 100644
--- a/payment_headend/css/customAlert.css
+++ b/payment_headend/css/customAlert.css
@@ -12,6 +12,6 @@
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
     z-index: 1000;
     opacity: 0;
-    transition: opacity 0.3s ease-in-out;
+    transition: opacity 1s ease-in-out;
     text-align: center;
 }
\ No newline at end of file
diff --git a/payment_headend/index.html b/payment_headend/index.html
index 36d28b3..9de9ead 100644
--- a/payment_headend/index.html
+++ b/payment_headend/index.html
@@ -152,15 +152,6 @@
         </div>
     </div>
 </div>
-<div id="alertModal" class="modal" style="display: none;">
-    <div class="modal-content">
-        <div class="modal-header" id="alertMessage">
-        </div>
-        <div class="modal-footer">
-            <button onclick="closeAlertModal()">Close</button>
-        </div>
-    </div>
-</div>
 <div id="customAlert" class="custom-alert"></div>
 <script>
     function copyText(text) {
diff --git a/payment_headend/js/customAlert.js b/payment_headend/js/customAlert.js
index 2b65d91..136242d 100644
--- a/payment_headend/js/customAlert.js
+++ b/payment_headend/js/customAlert.js
@@ -1,6 +1,6 @@
 function showCustomAlert(message) {
     const alertBox = document.getElementById('customAlert');
-    alertBox.textContent = message;
+    alertBox.innerText = message;
     alertBox.style.display = 'block';
     alertBox.style.opacity = '1';
 
@@ -10,6 +10,6 @@ function showCustomAlert(message) {
         // 等到过渡效果结束再隐藏元素
         setTimeout(() => {
             alertBox.style.display = 'none';
-        }, 300); // 与过渡时间一致
-    }, 3000);
+        }, 1000); // 与过渡时间一致
+    }, 5000);
 }
diff --git a/payment_headend/js/index.js b/payment_headend/js/index.js
index 19436b8..73e0d0c 100644
--- a/payment_headend/js/index.js
+++ b/payment_headend/js/index.js
@@ -32,7 +32,6 @@ document.addEventListener('DOMContentLoaded', () => {
     });
     const completeBtn = document.getElementById('completeBtn');
     completeBtn.addEventListener('click', () => {
-        closePaymentModal();
         finishOrder();
     });
 
@@ -115,16 +114,17 @@ function closeAddressModal() {
     addressList.innerHTML = '';
 }
 
-function closeAlertModal() {
-    document.getElementById('alertModal').style.display = 'none';
-    const alertElement = document.getElementById("alertMessage")
-    alertElement.innerText = "";
-}
+// function closeAlertModal() {
+//     document.getElementById('alertModal').style.display = 'none';
+//     const alertElement = document.getElementById("alertMessage")
+//     alertElement.innerText = "";
+// }
 
 function openAlertModal(message) {
-    document.getElementById("alertMessage").innerText = message;
-    document.getElementById('alertModal').style.display = 'flex';
-    setTimeout(closeAlertModal, 5000);
+    // document.getElementById("alertMessage").innerText = message;
+    // document.getElementById('alertModal').style.display = 'flex';
+    // setTimeout(closeAlertModal, 5000);
+    showCustomAlert(message)
 }
 
 function closeModalOnClickOutside(event) {
@@ -223,8 +223,11 @@ function finishOrder() {
                 // 订单超时, 联系客服
                 openAlertModal("<h2>The order has timed out. Please contact customer support if you have any questions.</h2>");
             } else if (data.status === 1) {
+                closePaymentModal();
                 const createOrderElement = document.getElementById('createOrder');
                 createOrderElement.textContent = 'Gain More Points!!!';
+            } else if (data.status === 2) {
+                openAlertModal("<h2>\"Transaction not found. Please check your payment order or contact support for assistance.\"</h2>")
             } else if (data.status === 3) {
                 openAlertModal("<h2>The payment amount is abnormal. Please contact customer support if you have any questions.</h2>");
             }
@@ -242,9 +245,6 @@ function handleQuery() {
     const email = document.getElementById('email').value.trim();
     const payment_address = document.getElementById('wallet').value.trim();
 
-    // 清除之前的消息
-    // document.getElementById('message').classList.add('hidden');
-
     // 调用createOrder函数
     queryOrder(name, phone, email, payment_address);
 }