kate522/wordpress-theme-aksrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(vip): 积分兑换弹窗改服务端渲染并与 Zibll 1:1 对齐

Browse Source 
/user/vip/ 的积分兑换会员弹窗原先是前端自行拼装的，结构与层级都与参考主题
Zibll 不一致：Zibll 走 zibpay_get_vip_points_exchange_modal() 服务端渲染静态
壳，前端只按需开合。改为同一模型，前端不再拼 HTML。

- VipServiceModal 新增 get_points_exchange_modal_html()：门控（未登录/未开启
  返回空串）、vip-card 套餐选择、积分不足提示与提交表单；wp_footer 挂载输出
- pay-vip.js 移除 renderPointsModal / pointsPackage / exchangeFromModal /
  vipPointsPay，改为自包含开合（.in + 内联 display:flex + 独立遮罩 +
  body.modal-open + ESC），保留 aksrt-vip-points-toast 的 load/success/danger 契约
- 移除 /user/vip/ 页面底部独立积分兑换入口及其样式（uc-vip-points-link）
- credits.js 清理依赖全站不存在选择器的死代码 initVipPointsExchange()
- vip-modal.css 删除 71 行自实现样式，改为 .modal[data-aksrt-vip-points-modal]
  显隐契约；层级 100050 < 遮罩 100055 < 弹窗 100060 < notyf 10000000
- 新增 vip-points-exchange-modal 契约测试（7 项），toast-contract 同步

静止态必须显式 display:none，否则 .flex{display:flex} 会覆盖 .modal{display:none}
形成隐形遮罩拦截整页点击。

未写数据迁移。

验证：node --test tests/widget-system/*.test.cjs 308 项全部通过；php -l 全部
改动文件通过；隔离渲染桩确认积分充足 / 积分不足 / 功能关闭 / 未登录四种情形
的 HTML 产物正确。
This commit is contained in:
kate522
2026-09-18 20:05:05 +08:00
parent d2447f8aa6
commit 95ff0761b7
11 changed files with 401 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/pay-vip.js
+99 -107
View File
@@ -222,77 +222,64 @@
});
}
function renderPointsModal(body, view) {
view = view || {};
if (body.replaceChildren) body.replaceChildren();
else body.innerHTML = "";
// ===== 积分兑换会员弹窗（参考主题 refresh_modal 同构静态壳） =====
// 弹窗壳由服务端静态输出（inc/helpers/aksrt-vip.php → wp_footer），
// 此处只负责开合与提交，形态对齐余额充值/购买积分弹窗的自包含开关：
// .in 显隐 + .modal-backdrop + body.modal-open + ESC，不依赖 jQuery/Bootstrap
// modal 运行时。
var pointsBackdrop = null;
var pointsBound = false;
var pointsFocusReturn = null;
var catalog = view.catalog || {};
var exchange = catalog.points_exchange || {};
var member = view.member || {};
var packages = Array.isArray(exchange.packages) ? exchange.packages : [];
var currency = text(catalog.currency_name || "积分");
var modal = node("div", "box-body payvip-modal aksrt-vip-points-modal");
modal.setAttribute("data-aksrt-vip-points-modal-body", "");
function pointsModal() {
return document.querySelector("[data-aksrt-vip-points-modal]");
}
var close = node("button", "aksrt-modal-close", "×");
close.type = "button";
close.setAttribute("data-aksrt-modal-close", "");
close.setAttribute("aria-label", "关闭");
append(modal, close);
append(modal, node("h2", "aksrt-vip-points-modal__title", "积分兑换会员"));
append(modal, node("p", "aksrt-vip-points-modal__desc", exchange.desc || "使用积分兑换会员权益。"));
var balance = node("div", "aksrt-vip-points-modal__balance");
append(balance, node("span", "aksrt-vip-points-modal__balance-label", "我的积分"));
append(balance, node("strong", "aksrt-vip-points-modal__balance-value", text(member.points || 0) + " " + currency));
append(modal, balance);
var list = node("div", "aksrt-vip-points-modal__packages");
if (!view.enabled || view.allowed_actions && view.allowed_actions.points_exchange === false || !exchange.enabled || !packages.length) {
append(list, node("div", "aksrt-vip-points-modal__empty", "暂无可兑换的会员"));
} else {
packages.forEach(function (item, index) {
if (!item || !item.package_id) return;
var cost = Number(item.points || 0);
var enough = Number(member.points || 0) >= cost;
var label = node("label", "aksrt-vip-points-option" + (enough ? "" : " is-disabled"));
var input = node("input");
input.type = "radio";
input.name = "aksrt_vip_points_package";
input.value = String(item.package_id);
input.checked = index === 0 && enough;
input.disabled = !enough;
input.setAttribute("data-aksrt-vip-points-package", "");
append(label, input);
var card = node("span", "aksrt-vip-points-option__card");
append(card, node("strong", "aksrt-vip-points-option__title", item.title || ("VIP" + text(item.level || ""))));
append(card, node("span", "aksrt-vip-points-option__days", item.days_label || "会员权益"));
var costLabel = enough ? text(item.price_label || (cost + " " + currency)) : "积分不足";
append(card, node("span", "aksrt-vip-points-option__cost", costLabel));
append(label, card);
append(list, label);
});
function openPointsModal(trigger) {
var modal = pointsModal();
if (!modal || modal.classList.contains("in")) return;
bindPointsModal();
pointsFocusReturn = trigger || document.activeElement;
// 打开态用 flex 而非 block：壳的 .flex.jc 负责双轴居中
// （.modal.flex .modal-dialog{margin:0} 在 block 下会把对话框顶到左上角）。
modal.style.display = "flex";
void modal.offsetWidth; // 强制 reflow，让 .fade 过渡从初始态开始
modal.classList.add("in");
if (!pointsBackdrop) {
pointsBackdrop = document.createElement("div");
pointsBackdrop.className = "modal-backdrop fade in";
pointsBackdrop.setAttribute("data-aksrt-vip-points-backdrop", "1");
document.body.appendChild(pointsBackdrop);
}
append(modal, list);
var submit = node("button", "aksrt-vip-points-submit", "立即兑换");
submit.type = "button";
submit.setAttribute("data-aksrt-vip-points-submit", "");
submit.disabled = !view.enabled || !exchange.enabled || (view.allowed_actions && view.allowed_actions.points_exchange === false) || !packages.some(function (item) { return item && Number(member.points || 0) >= Number(item.points || 0); });
append(modal, submit);
if (exchange.desc) append(modal, node("div", "aksrt-vip-points-modal__note", exchange.desc));
append(body, modal);
document.body.classList.add("modal-open");
// 焦点移入兑换弹窗：ESC 只收起本层，不会冒泡到下层会员弹窗。
var closeBtn = modal.querySelector('[data-dismiss="modal"]');
try { (closeBtn || modal).focus(); } catch (error) {}
}
function pointsPackage(root) {
var checked = root.querySelector('[data-aksrt-vip-points-package]:checked');
return checked ? parseInt(checked.value, 10) : 0;
function closePointsModal() {
var modal = pointsModal();
if (!modal || !modal.classList.contains("in")) return;
modal.classList.remove("in");
// 同页可能另有静态弹窗（余额充值/购买积分）打开，仅在没有 .modal.in 时解锁。
if (!document.querySelector(".modal.in")) document.body.classList.remove("modal-open");
if (pointsBackdrop && pointsBackdrop.parentNode) pointsBackdrop.parentNode.removeChild(pointsBackdrop);
pointsBackdrop = null;
window.setTimeout(function () {
if (modal && !modal.classList.contains("in")) modal.style.display = "";
var target = pointsFocusReturn;
pointsFocusReturn = null;
if (target && document.contains(target) && typeof target.focus === "function") {
try { target.focus(); } catch (error) {}
}
}, 300);
}
function exchangeFromModal(root, button) {
var packageId = pointsPackage(root);
if (!button || button.disabled) return;
function exchangePoints(button) {
var modal = pointsModal();
if (!modal || !button || button.disabled) return;
var hidden = modal.querySelector('input[name="product_id"]');
var packageId = hidden ? parseInt(hidden.value, 10) || 0 : 0;
if (!packageId) {
notyf("请选择兑换套餐", "danger");
return;
@@ -306,6 +293,7 @@
button.classList.add("is-loading");
notyf("正在兑换会员…", "load", "", "aksrt-vip-points-toast");
coordinator.exchange({ packageId: packageId, tags: ["vip", "orders"] }).then(function (response) {
button.disabled = false;
button.classList.remove("is-loading");
if (response && response.ok) {
var data = response.data || response.json || {};
@@ -313,7 +301,6 @@
window.setTimeout(function () { window.location.reload(); }, 800);
return;
}
button.disabled = false;
notyf(response && response.json && response.json.message ? response.json.message : "兑换失败，请重试。", "danger", 5, "aksrt-vip-points-toast");
}).catch(function () {
button.disabled = false;
@@ -321,6 +308,38 @@
notyf("网络异常，请稍后重试。", "danger", 5, "aksrt-vip-points-toast");
});
}
function bindPointsModal() {
var modal = pointsModal();
if (!modal || pointsBound) return;
pointsBound = true;
modal.addEventListener("click", function (event) {
// 参考主题契约：点遮罩（壳自身）或 data-dismiss="modal" 关闭按钮收起弹窗。
if (event.target === modal || (event.target.closest && event.target.closest('[data-dismiss="modal"]'))) {
closePointsModal();
return;
}
// 参考主题 data-for/data-value 选中模型：会员兑换卡片。
var card = event.target.closest ? event.target.closest('[data-for="product_id"]') : null;
if (!card) return;
modal.querySelectorAll('[data-for="product_id"]').forEach(function (el) {
el.classList.toggle("active", el === card);
});
var hidden = modal.querySelector('input[name="product_id"]');
if (hidden) hidden.value = card.getAttribute("data-value") || "";
});
var form = modal.querySelector("[data-aksrt-vip-points-form]");
if (form) {
form.addEventListener("submit", function (event) {
event.preventDefault();
exchangePoints(modal.querySelector("[data-aksrt-vip-points-submit]"));
});
}
document.addEventListener("keydown", function (event) {
if (event.key === "Escape" && modal.classList.contains("in")) closePointsModal();
});
}
function renderModalView(body, view) {
view = view || {};
if (body.replaceChildren) body.replaceChildren();
@@ -462,13 +481,20 @@
append(info, infoBa);
append(row, info);
// 右侧：套餐盒 → 积分兑换链接 → more → 支付方式/卡密 → 立即支付。
// 右侧：套餐盒 → 积分兑换入口 → more → 支付方式/卡密 → 立即支付。
var products = node("div", "pay-vip-products");
renderProducts(products, group.items, wallet.mark);
var points = catalog.points_exchange || {};
if (allowed.points_exchange !== false && points.enabled && Array.isArray(points.packages) && points.packages.length && catalog.vip_url) {
var pointsLink = node("a", "but c-green btn-block mb10", "积分兑换会员");
pointsLink.href = text(catalog.vip_url);
if (allowed.points_exchange !== false && points.enabled && Array.isArray(points.packages) && points.packages.length) {
// 参考主题 zibpay_get_pay_uservip_modal 的积分兑换入口：
// btn-block but mb10 padding-lg c-green mini-radius + points-color 图标 +
// fa-angle-right；点击开服务端静态兑换弹窗（不再跳转用户中心）。
var pointsLink = node("a", "btn-block but mb10 padding-lg c-green mini-radius");
pointsLink.href = "javascript:;";
pointsLink.setAttribute("data-aksrt-vip-points-open", "");
pointsLink.innerHTML = '<svg class="icon" aria-hidden="true"><use xlink:href="#icon-points-color"></use></svg>'
+ "积分兑换会员"
+ '<i class="fa fa-angle-right em12 ml10" aria-hidden="true"></i>';
append(products, pointsLink);
}
if (catalog.more) append(products, node("div", "muted-2-color mb10 em09 muted-box padding-10 mini-radius", catalog.more));
@@ -669,10 +695,10 @@
});
return;
}
var pointsSubmit = event.target.closest("[data-aksrt-vip-points-submit]");
if (pointsSubmit) {
var pointsLink = event.target.closest("[data-aksrt-vip-points-open]");
if (pointsLink) {
event.preventDefault();
exchangeFromModal(pointsSubmit.closest("[data-aksrt-vip-points-modal-body]") || root, pointsSubmit);
openPointsModal(pointsLink);
return;
}
var submit = event.target.closest("[data-vip-submit]");
@@ -683,34 +709,6 @@
});
}
function vipPointsPay() {
window.AksrtModalRuntime.openRemote({
url: "/pay/vip/modal",
query: { vip_level: 1, mode: "points" },
className: "aksrt-vip-modal-shell aksrt-vip-points-modal-shell",
mobileBottom: false,
skeleton: '<div class="aksrt-vip-modal-panel"><div class="aksrt-vip-modal-content" data-aksrt-vip-modal-body><div class="text-center padding-20 muted-2-color">加载中…</div></div></div>',
telemetry: "vip-points",
kind: "vip",
responseType: "json",
cacheTtl: 15000,
cacheTags: ["vip"],
renderData: function (data, session) {
renderPointsModal(session.content, data);
bindModalUi(session.content);
},
onError: function (error) {
var unauthorized = error && error.code === "unauthorized";
notyf(unauthorized ? "请先登录" : ((error && error.message) || "会员兑换信息加载失败，请重试"), "danger");
if (unauthorized) {
window.AksrtModalRuntime.close("unauthorized");
var login = document.querySelector(".signin-loader");
if (login) login.click();
}
},
});
}
function vipPay(trigger) {
var level = trigger
? parseInt(trigger.getAttribute("vip-level") || trigger.getAttribute("data-vip-level") || "1", 10) || 1
@@ -742,13 +740,6 @@
}
function onDocClick(event) {
var pointsTrigger = event.target.closest("[data-aksrt-vip-points-modal], [data-aksrt-vip-points-open]");
if (pointsTrigger) {
event.preventDefault();
event.stopPropagation();
vipPointsPay();
return;
}
var trigger = event.target.closest(".pay-vip, a.pay-vip, .float-btn.pay-vip, [data-aksrt-pay-vip]");
if (!trigger) return;
var href = (trigger.getAttribute("href") || "").trim();
@@ -776,6 +767,7 @@
if (window.__aksrtPayVipBound) return;
window.__aksrtPayVipBound = true;
document.addEventListener("click", onDocClick, true);
bindPointsModal();
}
jQuery(document).off("auto_fun.aksrt-pay-vip").on("auto_fun.aksrt-pay-vip", bindOnce);