feat: 页面优化1
This commit is contained in:
parent
6c0b41639b
commit
b0fd568271
|
@ -1,10 +1,9 @@
|
|||
{{define "payPage.html"}}
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>收银台页面</title>
|
||||
|
||||
<style>
|
||||
|
@ -37,7 +36,7 @@
|
|||
|
||||
/* 按钮样式 */
|
||||
button {
|
||||
background-color: #007BFF;
|
||||
background-color: #007bff;
|
||||
color: #fff;
|
||||
border: none;
|
||||
padding: 10px 20px;
|
||||
|
@ -64,7 +63,7 @@
|
|||
|
||||
.loading-spinner {
|
||||
border: 5px solid #f3f3f3;
|
||||
border-top: 5px solid #007BFF;
|
||||
border-top: 5px solid #007bff;
|
||||
border-radius: 50%;
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
|
@ -73,8 +72,12 @@
|
|||
}
|
||||
|
||||
@keyframes spin {
|
||||
0% { transform: rotate(0deg); }
|
||||
100% { transform: rotate(360deg); }
|
||||
0% {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
.loading-text {
|
||||
|
@ -106,7 +109,7 @@
|
|||
}
|
||||
|
||||
.payment-option:hover {
|
||||
border-color: #007BFF;
|
||||
border-color: #007bff;
|
||||
background-color: #f0f7ff;
|
||||
}
|
||||
|
||||
|
@ -115,7 +118,7 @@
|
|||
}
|
||||
|
||||
.payment-option.selected {
|
||||
border-color: #007BFF;
|
||||
border-color: #007bff;
|
||||
background-color: #f0f7ff;
|
||||
}
|
||||
</style>
|
||||
|
@ -124,35 +127,39 @@
|
|||
{{if eq .code 200 }}
|
||||
<body>
|
||||
<!-- 页面内容 -->
|
||||
<div class="payment-info" id="payment-info" style="display: none;">
|
||||
<div class="payment-info" id="payment-info" style="display: none">
|
||||
<h2>订单支付</h2>
|
||||
<p>{{.desc}}</p>
|
||||
<p>交易号:{{ .id }}</p>
|
||||
<p>交易金额:<strong style="color: #ff5500; font-size: 24px;">{{ .amount }}</strong> 元</p>
|
||||
<p>
|
||||
交易金额:<strong style="color: #ff5500; font-size: 24px"
|
||||
>{{ .amount }}</strong
|
||||
>
|
||||
元
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- 支付方式选择区域 -->
|
||||
<div id="pay-container" style="display: none;">
|
||||
<div id="pay-container" style="display: none">
|
||||
<div id="pay"></div>
|
||||
<!-- 支付方式列表 -->
|
||||
<ul id="payment-list"></ul>
|
||||
</div>
|
||||
|
||||
<!-- Loading状态 -->
|
||||
<div id="loading" class="loading-container" style="display: flex;">
|
||||
<div id="loading" class="loading-container" style="display: flex">
|
||||
<div class="loading-spinner"></div>
|
||||
<p class="loading-text">支付处理中,请稍等...</p>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
<script>
|
||||
// 从URL中提取参数
|
||||
function getQueryParam(param) {
|
||||
const queryString = window.location.search.substring(1);
|
||||
const params = queryString.split('&');
|
||||
const params = queryString.split("&");
|
||||
for (let i = 0; i < params.length; i++) {
|
||||
const [key, value] = params[i].split('=');
|
||||
const [key, value] = params[i].split("=");
|
||||
if (key === param) {
|
||||
return decodeURIComponent(value);
|
||||
}
|
||||
|
@ -162,35 +169,35 @@
|
|||
|
||||
// 显示Loading效果
|
||||
function showLoading() {
|
||||
document.getElementById('payment-info').style.display = 'none';
|
||||
document.getElementById('pay-container').style.display = 'none';
|
||||
document.getElementById('loading').style.display = 'block';
|
||||
document.getElementById("payment-info").style.display = "none";
|
||||
document.getElementById("pay-container").style.display = "none";
|
||||
document.getElementById("loading").style.display = "block";
|
||||
}
|
||||
|
||||
// 关闭Loading效果
|
||||
function closeLoading() {
|
||||
document.getElementById('loading').style.display = 'none';
|
||||
document.getElementById('payment-info').style.display = 'block';
|
||||
document.getElementById('pay-container').style.display = 'block';
|
||||
document.getElementById("loading").style.display = "none";
|
||||
document.getElementById("payment-info").style.display = "block";
|
||||
document.getElementById("pay-container").style.display = "block";
|
||||
}
|
||||
|
||||
// 处理支付回调
|
||||
function handlePaymentCallback() {
|
||||
const id = getQueryParam('no');
|
||||
const id = getQueryParam("no");
|
||||
if (!id) {
|
||||
closeLoading();
|
||||
return;
|
||||
};
|
||||
}
|
||||
|
||||
// 查询订单状态
|
||||
fetch(`/pay/front/api/v1/payPage/query?no=${id}`, {
|
||||
method: 'POST',
|
||||
method: "POST",
|
||||
})
|
||||
.then(async response => {
|
||||
if (!response.ok) throw new Error('请求失败');
|
||||
.then(async (response) => {
|
||||
if (!response.ok) throw new Error("请求失败");
|
||||
return await response.json();
|
||||
})
|
||||
.then(data => {
|
||||
.then((data) => {
|
||||
closeLoading();
|
||||
switch (data.status) {
|
||||
case 2: // 处理中
|
||||
|
@ -206,7 +213,7 @@
|
|||
// window.location.reload();
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
.catch((error) => {
|
||||
// closeLoading();
|
||||
window.location.reload();
|
||||
});
|
||||
|
@ -214,34 +221,33 @@
|
|||
|
||||
// 获取支付方式列表
|
||||
function fetchPaymentMethods() {
|
||||
|
||||
const id = getQueryParam('no');
|
||||
const id = getQueryParam("no");
|
||||
if (id) {
|
||||
fetch(`/pay/front/api/v1/payPage/list?id=${id}`, {
|
||||
method: 'POST',
|
||||
method: "POST",
|
||||
})
|
||||
.then(async response => {
|
||||
.then(async (response) => {
|
||||
if (response.ok) {
|
||||
const data = await response.json()
|
||||
console.log(data)
|
||||
const data = await response.json();
|
||||
console.log(data);
|
||||
if (data.code !== 200) {
|
||||
throw new Error('无效');
|
||||
throw new Error("无效");
|
||||
} else {
|
||||
return data;
|
||||
}
|
||||
} else {
|
||||
throw new Error('无效');
|
||||
throw new Error("无效");
|
||||
}
|
||||
})
|
||||
.then(data => {
|
||||
.then((data) => {
|
||||
// 处理返回的数据,例如渲染支付方式列表
|
||||
if (data === null || data.data.length === 0) {
|
||||
const pay = document.getElementById('pay');
|
||||
pay.innerHTML = '<h3>支付环境异常,请检查</h3>';
|
||||
const pay = document.getElementById("pay");
|
||||
pay.innerHTML = "<h3>支付环境异常,请检查</h3>";
|
||||
} else if (data.data.length === 1) {
|
||||
if(localStorage.getItem('auto-redirect') != 2){
|
||||
if (localStorage.getItem("auto-redirect") != 2) {
|
||||
// 否则设置自动跳转标记,并跳转
|
||||
localStorage.setItem('auto-redirect', 2);
|
||||
localStorage.setItem("auto-redirect", 2);
|
||||
window.location.href = `/pay/front/api/v1/payPage/submit?pay_channel_id=${data.data[0].pay_channel_id}&no=${id}`;
|
||||
} else {
|
||||
closeLoading();
|
||||
|
@ -253,55 +259,56 @@
|
|||
renderPaymentMethods(data.data);
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
.catch((error) => {
|
||||
closeLoading();
|
||||
console.error('获取支付方式失败:', error);
|
||||
const pay = document.getElementById('pay');
|
||||
pay.innerHTML = '<h3 style="color: red;">获取支付方式失败,请刷新重试</h3>';
|
||||
console.error("获取支付方式失败:", error);
|
||||
const pay = document.getElementById("pay");
|
||||
pay.innerHTML =
|
||||
'<h3 style="color: red;">获取支付方式失败,请刷新重试</h3>';
|
||||
});
|
||||
} else {
|
||||
closeLoading();
|
||||
console.error('Order no not found in URL');
|
||||
console.error("Order no not found in URL");
|
||||
}
|
||||
}
|
||||
|
||||
// 渲染支付方式列表
|
||||
function renderPaymentMethods(paymentMethods) {
|
||||
const pay = document.getElementById('pay');
|
||||
pay.innerHTML = '<h3>请选择支付方式</h3>';
|
||||
const pay = document.getElementById("pay");
|
||||
pay.innerHTML = "<h3>请选择支付方式</h3>";
|
||||
|
||||
const paymentList = document.getElementById('payment-list');
|
||||
paymentList.innerHTML = '';
|
||||
const paymentList = document.getElementById("payment-list");
|
||||
paymentList.innerHTML = "";
|
||||
|
||||
// 标记是否是第一个支付方式
|
||||
let isFirstMethod = true;
|
||||
|
||||
paymentMethods.forEach(method => {
|
||||
const listItem = document.createElement('li');
|
||||
listItem.className = 'payment-option';
|
||||
paymentMethods.forEach((method) => {
|
||||
const listItem = document.createElement("li");
|
||||
listItem.className = "payment-option";
|
||||
|
||||
const radioInput = document.createElement('input');
|
||||
radioInput.type = 'radio';
|
||||
radioInput.name = 'paymentMethod';
|
||||
const radioInput = document.createElement("input");
|
||||
radioInput.type = "radio";
|
||||
radioInput.name = "paymentMethod";
|
||||
radioInput.value = method.pay_channel_id;
|
||||
radioInput.id = `method-${method.pay_channel_id}`;
|
||||
|
||||
// 如果是第一个支付方式,默认选中
|
||||
if (isFirstMethod) {
|
||||
radioInput.checked = true;
|
||||
listItem.classList.add('selected');
|
||||
listItem.classList.add("selected");
|
||||
isFirstMethod = false;
|
||||
}
|
||||
|
||||
const label = document.createElement('label');
|
||||
const label = document.createElement("label");
|
||||
label.htmlFor = `method-${method.pay_channel_id}`;
|
||||
label.textContent = method.pay_name;
|
||||
|
||||
if (method.icon_url) {
|
||||
const icon = document.createElement('img');
|
||||
const icon = document.createElement("img");
|
||||
icon.src = method.icon_url;
|
||||
icon.style.height = '24px';
|
||||
icon.style.marginRight = '10px';
|
||||
icon.style.height = "24px";
|
||||
icon.style.marginRight = "10px";
|
||||
label.prepend(icon);
|
||||
}
|
||||
|
||||
|
@ -310,69 +317,74 @@
|
|||
paymentList.appendChild(listItem);
|
||||
|
||||
// 点击整个区域也可以选择
|
||||
listItem.addEventListener('click', () => {
|
||||
listItem.addEventListener("click", () => {
|
||||
// 移除所有选中样式
|
||||
document.querySelectorAll('.payment-option').forEach(item => {
|
||||
item.classList.remove('selected');
|
||||
document.querySelectorAll(".payment-option").forEach((item) => {
|
||||
item.classList.remove("selected");
|
||||
});
|
||||
// 添加当前选中样式
|
||||
listItem.classList.add('selected');
|
||||
listItem.classList.add("selected");
|
||||
radioInput.checked = true;
|
||||
});
|
||||
});
|
||||
|
||||
// 添加提交按钮
|
||||
const submitButton = document.createElement('button');
|
||||
submitButton.type = 'button';
|
||||
submitButton.textContent = '立即支付';
|
||||
const submitButton = document.createElement("button");
|
||||
submitButton.type = "button";
|
||||
submitButton.textContent = "立即支付";
|
||||
|
||||
submitButton.onclick = function () {
|
||||
const no = getQueryParam('no');
|
||||
const selectedMethod = document.querySelector('input[name="paymentMethod"]:checked');
|
||||
const no = getQueryParam("no");
|
||||
const selectedMethod = document.querySelector(
|
||||
'input[name="paymentMethod"]:checked'
|
||||
);
|
||||
if (selectedMethod) {
|
||||
window.location.href = `/pay/front/api/v1/payPage/submit?pay_channel_id=${selectedMethod.value}&no=${no}`;
|
||||
} else {
|
||||
alert('请选择支付方式');
|
||||
alert("请选择支付方式");
|
||||
}
|
||||
};
|
||||
|
||||
const buttonContainer = document.createElement('div');
|
||||
buttonContainer.style.textAlign = 'center';
|
||||
const buttonContainer = document.createElement("div");
|
||||
buttonContainer.style.textAlign = "center";
|
||||
buttonContainer.appendChild(submitButton);
|
||||
paymentList.appendChild(buttonContainer);
|
||||
}
|
||||
|
||||
// 页面加载时执行
|
||||
// 监听页面可见性变化
|
||||
document.addEventListener('visibilitychange', function() {
|
||||
if (!document.hidden && localStorage.getItem('auto-redirect') == 2) {
|
||||
document.addEventListener("visibilitychange", function () {
|
||||
if (!document.hidden && localStorage.getItem("auto-redirect") == 2) {
|
||||
// 页面从后台返回且处于支付状态
|
||||
fetchPaymentMethods();
|
||||
}
|
||||
});
|
||||
|
||||
// 页面加载时执行
|
||||
window.onload = function () {
|
||||
if (localStorage.getItem('auto-redirect') && localStorage.getItem('auto-redirect') == 2) {
|
||||
alert(`return:${getQueryParam("return")}`);
|
||||
if (
|
||||
localStorage.getItem("auto-redirect") &&
|
||||
localStorage.getItem("auto-redirect") == 2
|
||||
) {
|
||||
alert("查询支付状态");
|
||||
handlePaymentCallback(); // 如果是支付回调且不是自动跳转,处理支付结果
|
||||
} else {
|
||||
localStorage.setItem('auto-redirect', 1); // 设置自动跳转标记
|
||||
localStorage.setItem("auto-redirect", 1); // 设置自动跳转标记
|
||||
fetchPaymentMethods(); // 获取支付方式
|
||||
}
|
||||
};
|
||||
|
||||
</script>
|
||||
|
||||
{{ else}}
|
||||
|
||||
<body>
|
||||
<div class="payment-info" style="text-align: center;">
|
||||
<h2 style="color: #ff0000;">支付异常</h2>
|
||||
<div class="payment-info" style="text-align: center">
|
||||
<h2 style="color: #ff0000">支付异常</h2>
|
||||
<p>{{.message}}</p>
|
||||
<button onclick="window.location.href='/'">返回</button>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
{{end}}
|
||||
|
||||
</html>
|
||||
{{end}}
|
Loading…
Reference in New Issue