Add files via upload

2026-04-14 09:49:00 +08:00
parent 644ae0835d
commit e6f025e8db
1 changed files with 14 additions and 51 deletions
--- a/Scripts/NewAddToCart_Web.js
+++ b/Scripts/NewAddToCart_Web.js
@@ -30,19 +30,20 @@ let currentIndex = 0;
 let productList = [];
 let sourceLabel = "";
 let useRemote = false;
+let _remoteGroupRaw = null; // 保留原始远程数据，用于构建 failedProducts

 function log(type, message, detail = "") {
  const icon  = type === "success" ? "✅" : (type === "error" ? "❌" : "ℹ️");
-  const color = type === "success" ? "#52b043" : (type === "error" ? "#e05050" : "#777");
+  const color = type === "success" ? "green" : (type === "error" ? "red" : "#666");
  console.log(`${icon} ${message} ${detail}`);
-  logBuffer.push(`<li style="color:${color};padding:6px 0;border-bottom:1px solid #1e1e1e">${icon} ${message} <small style="opacity:.6">${detail}</small></li>`);
+  logBuffer.push(`<div style="color:${color}; border-bottom:1px solid #eee; padding:5px;">${icon} ${message} <small>${detail}</small></div>`);
 }

 const generateRiskSessionId = () =>
  "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, c =>
    (c === "x" ? (Math.random() * 16 | 0) : ((Math.random() * 4 | 8) | 0)).toString(16));

-const toNum = k => { const m = /^product(\d+)$/.exec(k); return m ? parseInt(m[1], 10) : Number.MAX_SAFE_INTEGER; };
+const toNum = k => { const m = /^product(\d+)$/.exec(k) || /^\((\d+)\)/.exec(k); return m ? parseInt(m[1], 10) : Number.MAX_SAFE_INTEGER; };
 const normEntry = v => {
  if (!v || typeof v !== "object") return null;
  const productId      = String(v.ProductId      ?? v.productId      ?? "").trim();
@@ -55,7 +56,7 @@ const normEntry = v => {
 function parseProductList(raw) {
  let parsed; try { parsed = JSON.parse(raw || "{}"); } catch { parsed = {}; }
  return Object.keys(parsed)
-    .filter(k => /^product\d+$/.test(k))
+    .filter(k => normEntry(parsed[k]) !== null)  // 接受任意 key，只要 value 有效
    .sort((a, b) => toNum(a) - toNum(b))
    .map(k => { const norm = normEntry(parsed[k]); return norm ? { key: k, ...norm } : null; })
    .filter(Boolean);
@@ -82,10 +83,10 @@ function finalizeAndClean() {
      : `成功: ${successCount} / 失败: ${failureCount}${priceNote}`;

    const failedHtml = failedNames.length > 0
-      ? `<div class="failed-box"><b>加购失败的游戏：</b><ul>${failedNames.map(n => `<li>${n}</li>`).join('')}</ul></div>`
+      ? `<div style="color:red;margin-top:10px;"><b>加购失败的游戏：</b><ul>${failedNames.map(n => `<li>${n}</li>`).join('')}</ul></div>`
      : '';
    const priceHtml = ngnStr
-      ? `<div class="price-box">游戏总价 <span>${ngnStr}</span></div>`
+      ? `<div style="margin-top:10px;font-weight:bold;">游戏总价: ${ngnStr}</div>`
      : '';

    $notification.post(
@@ -93,58 +94,18 @@ function finalizeAndClean() {
      notifSubtitle,
      `来源: ${sourceLabel}`
    );
-    const html = `<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1">
-<title>Xbox Cart · 尼区</title>
-<style>
-  @import url('https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@600;700&family=Noto+Sans+SC:wght@400;500&display=swap');
-  *,*::before,*::after{box-sizing:border-box;margin:0;padding:0}
-  body{background:#0b0b0b;color:#ddd;font-family:'Noto Sans SC',sans-serif;padding:24px 18px;max-width:520px;margin:0 auto;-webkit-font-smoothing:antialiased}
-  .header{display:flex;align-items:center;gap:10px;margin-bottom:18px}
-  .flag{font-size:28px}
-  .title{font-family:'Barlow Condensed',sans-serif;font-size:22px;font-weight:700;color:#fff;letter-spacing:1px}
-  .stats{display:flex;gap:10px;margin-bottom:18px}
-  .stat{flex:1;background:#141414;border:1px solid #222;border-radius:3px;padding:12px;text-align:center}
-  .stat-num{font-family:'Barlow Condensed',sans-serif;font-size:28px;font-weight:700}
-  .stat-lbl{font-size:11px;color:#555;margin-top:2px;letter-spacing:.5px}
-  .s-ok{color:#52b043}.s-err{color:#e05050}
-  .price-box{background:#141414;border:1px solid #333;border-radius:3px;padding:12px 16px;margin-bottom:14px;font-size:14px}
-  .price-box span{font-family:'Barlow Condensed',sans-serif;font-size:20px;font-weight:700;color:#52b043;margin-left:8px}
-  .failed-box{background:#1a0e0e;border:1px solid #3a1a1a;border-radius:3px;padding:12px 16px;margin-bottom:14px;font-size:13px;color:#e05050}
-  .failed-box ul{margin-top:8px;padding-left:18px;line-height:1.8}
-  .source{font-size:11px;color:#444;margin-bottom:14px;letter-spacing:.5px}
-  .logs{background:#111;border-radius:3px;padding:10px 14px}
-  .logs ul{list-style:none;font-size:12px;line-height:1.6}
-</style>
-</head>
-<body>
-<div class="header">
-  <span class="flag">🇳🇬</span>
-  <span class="title">尼区 · 加购完成</span>
-</div>
-<div class="stats">
-  <div class="stat"><div class="stat-num s-ok">${successCount}</div><div class="stat-lbl">成功</div></div>
-  <div class="stat"><div class="stat-num s-err">${failureCount}</div><div class="stat-lbl">失败</div></div>
-  <div class="stat"><div class="stat-num" style="color:#888">${successCount + failureCount}</div><div class="stat-lbl">合计</div></div>
-</div>
-${priceHtml}${failedHtml}
-<div class="source">来源: ${sourceLabel}</div>
-<div class="logs"><ul>${logBuffer.join("")}</ul></div>
-</body>
-</html>`;
+    const html = `<!DOCTYPE html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Xbox Cart</title></head><body style="font-family:sans-serif;padding:20px;"><h3>执行结果: 成功 ${successCount} / 失败 ${failureCount} | 来源: ${sourceLabel}</h3>${priceHtml}${failedHtml}<div style="background:#f9f9f9;padding:10px;margin-top:10px;">${logBuffer.join("")}</div></body></html>`;
    $done({ response: { status: 200, headers: { "Content-Type": "text/html;charset=utf-8", "Cache-Control": "no-store, no-cache, must-revalidate", "Pragma": "no-cache" }, body: html } });
  };

  if (useRemote) {
-    // 构建失败的 product 对象（重新编号 product1, product2...）
+    // 构建失败的 product 对象：优先从原始远程数据取（保留 PriceNGN 等完整字段）
    const failedProducts = {};
-    let fi = 1;
    for (const item of productList) {
      if (results.failure.includes(item.productId)) {
-        failedProducts[`product${fi++}`] = {
+        // 从原始数据里找到对应的完整 product（含 PriceNGN）
+        const originalProduct = _remoteGroupRaw ? _remoteGroupRaw[item.key] : null;
+        failedProducts[item.key] = originalProduct || {
          ProductId: item.productId,
          SkuId: item.skuId,
          AvailabilityId: item.availabilityId
@@ -267,6 +228,8 @@ $httpClient.get(REMOTE_READ_URL, (error, response, data) => {
    sourceLabel = `远程第 ${groupIndex} 组`;
    log("info", "使用远程待同步 Product", `第 ${groupIndex} 组，共 ${Object.keys(remoteGroup).length} 个`);
    productList = parseProductList(JSON.stringify(remoteGroup));
+    // ★ 保留原始数据，供构建 failedProducts 时还原完整字段（含 PriceNGN）
+    _remoteGroupRaw = remoteGroup;
    startTask();
  } else {
    useRemote = false;