@pisell/private-materials 6.12.236 → 6.12.237

package/es/pro/Login2.0/index.d.ts

@@ -1,4 +1,4 @@
-import { AuthMethodType, VerificationMethod } from "./shared/types.js";
+import { AuthMethodType, EmailAuthConfig, EmailRegistrationVerification, LoginFormData, OAuthConfig, PhoneAuthConfig, RegisterFormData, UIConfig, VerificationMethod } from "./shared/types.js";
 import { Login2, Login2Config, Login2Events, Login2Props } from "./Login2.js";
 import { Register2, Register2Config, Register2Events, Register2Props } from "./Register2.js";
-import { AuthModal, AuthModalProps } from "./AuthModal.js";
+import { AuthModal } from "./AuthModal.js";

package/es/pro/Login2.0/shared/types.d.ts

@@ -226,4 +226,4 @@ interface RegisterFormData {
   verification_token?: string;
 }
 //#endregion
-export { AuthMethodType, EmailAuthConfig, LegalTermsConfig, LoginFormData, LoginMethodItem, OAuthConfig, PhoneAuthConfig, RegisterFormData, RegistrationMethodItem, UIConfig, VerificationMethod };
+export { AuthMethodType, EmailAuthConfig, EmailRegistrationVerification, LegalTermsConfig, LoginFormData, LoginMethodItem, OAuthConfig, PhoneAuthConfig, RegisterFormData, RegistrationMethodItem, UIConfig, VerificationMethod };

package/es/pro/compensatedPisellContainer/floatingLayer/index.js

@@ -129,6 +129,17 @@ const getWrapperStyle = (mode, placement, size, width, height) => {
 	}
 	return _objectSpread2({ width: width || 520 }, height ? { height } : null);
 };
+/**
+* 浮层会被挂到带 transform: scale(...) 的 body 下。modal 的 root 已按
+* `viewport / scale` 做过反向补偿，因此不能再把 vw/% 交给浏览器在另一套
+* viewport 参照系中解析；统一转换成 root 坐标系中的像素值。
+*/
+const resolveModalWidth = (mode, width, layoutWidth) => {
+	if (mode !== "modal" || typeof width !== "string" || !layoutWidth) return width;
+	const match = width.trim().match(/^(\d+(?:\.\d+)?)\s*(vw|%)$/);
+	if (!match) return width;
+	return layoutWidth * Number(match[1]) / 100;
+};
 const getWrapperMotionStyle = (mode, placement, motionOpen, bodyScale, viewportSize) => {
 	const visibleStyle = { pointerEvents: "auto" };
 	const hiddenStyle = { pointerEvents: "none" };
@@ -310,10 +321,11 @@ const TransformFloatingLayer = (props) => {
 	]);
 	const wrapperStyle = useMemo(() => {
 		const scaleX = bodyScale.x || 1;
+		const resolvedWidth = resolveModalWidth(mode, width, viewportSize.width / scaleX);
 		const modalScaleStyle = mode === "modal" ? { maxWidth: Math.max((viewportSize.width - 48) / scaleX, 0) } : null;
 		const layoutChangingStyle = mode === "modal" && isLayoutChanging ? { transition: "none" } : null;
 		const skipEnterMotionStyle = skipCurrentEnterMotion ? { transition: "none" } : null;
-		return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getWrapperStyle(mode, placement, size, width, height)), modalScaleStyle), style), contentWrapperStyle), styles === null || styles === void 0 ? void 0 : styles.wrapper), getWrapperMotionStyle(mode, placement, effectiveMotionOpen, bodyScale, viewportSize)), layoutChangingStyle), skipEnterMotionStyle);
+		return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getWrapperStyle(mode, placement, size, resolvedWidth, height)), modalScaleStyle), style), contentWrapperStyle), styles === null || styles === void 0 ? void 0 : styles.wrapper), getWrapperMotionStyle(mode, placement, effectiveMotionOpen, bodyScale, viewportSize)), layoutChangingStyle), skipEnterMotionStyle);
 	}, [
 		bodyScale,
 		contentWrapperStyle,

package/lib/components/checkout/PaymentModal.js

@@ -2705,11 +2705,11 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 	}, [interaction, open]);
 	const checkoutModalScale = (0, react.useMemo)(() => {
 		if (variant === "smallTablet") return {
-			width: "98vw",
+			width: "98%",
 			heightRatio: .98
 		};
 		if (variant === "tablet") return {
-			width: "98vw",
+			width: "98%",
 			heightRatio: .98
 		};
 		return {
@@ -2986,6 +2986,115 @@ const PaymentModal = ({ open, baseSales, baseSalesModuleName, walletPassMode = "
 		if (data === null || data === void 0 || (_data$order_info = data.order_info) === null || _data$order_info === void 0 ? void 0 : _data$order_info.order_note) setOrderNote(data.order_info.order_note);
 	}, [data]);
 	const logger = require_usePaymentLogger.default();
+	const addPaymentLog = logger === null || logger === void 0 ? void 0 : logger.addLog;
+	const flushPaymentLogs = (0, react.useCallback)(() => {
+		var _logger$storeLog;
+		logger === null || logger === void 0 || (_logger$storeLog = logger.storeLog) === null || _logger$storeLog === void 0 || _logger$storeLog.call(logger, true);
+	}, [logger === null || logger === void 0 ? void 0 : logger.storeLog]);
+	(0, react.useEffect)(() => {
+		var _window$visualViewpor;
+		if (!open || typeof window === "undefined" || typeof document === "undefined") return;
+		const sessionId = `checkout-layout-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+		let lastLoggedAt = 0;
+		const getRect = (selector) => {
+			const element = document.querySelector(selector);
+			if (!element) return null;
+			const rect = element.getBoundingClientRect();
+			return {
+				width: Number(rect.width.toFixed(2)),
+				height: Number(rect.height.toFixed(2)),
+				top: Number(rect.top.toFixed(2)),
+				left: Number(rect.left.toFixed(2)),
+				right: Number(rect.right.toFixed(2)),
+				bottom: Number(rect.bottom.toFixed(2))
+			};
+		};
+		const logLayout = (reason, force = false) => {
+			const now = Date.now();
+			if (!force && now - lastLoggedAt < 120) return;
+			lastLoggedAt = now;
+			try {
+				var _wrapperStyle$width, _wrapperStyle$maxWidt, _wrapperStyle$transfo, _rootStyle$width, _rootStyle$height;
+				const wrapper = document.querySelector(".payment-modal-modal");
+				const root = document.querySelector(".payment-modal-wrapper");
+				const bodyStyle = window.getComputedStyle(document.body);
+				const wrapperStyle = wrapper ? window.getComputedStyle(wrapper) : null;
+				const rootStyle = root ? window.getComputedStyle(root) : null;
+				const viewport = window.visualViewport;
+				addPaymentLog === null || addPaymentLog === void 0 || addPaymentLog({
+					type: "info",
+					title: "Checkout modal layout diagnostic",
+					metadata: {
+						sessionId,
+						reason,
+						timestamp: new Date(now).toISOString(),
+						variant,
+						configuredWidth: checkoutModalScale.width,
+						window: {
+							innerWidth: window.innerWidth,
+							innerHeight: window.innerHeight,
+							documentClientWidth: document.documentElement.clientWidth,
+							documentClientHeight: document.documentElement.clientHeight,
+							devicePixelRatio: window.devicePixelRatio
+						},
+						visualViewport: viewport ? {
+							width: viewport.width,
+							height: viewport.height,
+							scale: viewport.scale,
+							offsetLeft: viewport.offsetLeft,
+							offsetTop: viewport.offsetTop
+						} : null,
+						body: {
+							transform: bodyStyle.transform,
+							zoom: bodyStyle.zoom
+						},
+						modalWrapper: {
+							rect: getRect(".payment-modal-modal"),
+							width: (_wrapperStyle$width = wrapperStyle === null || wrapperStyle === void 0 ? void 0 : wrapperStyle.width) !== null && _wrapperStyle$width !== void 0 ? _wrapperStyle$width : null,
+							maxWidth: (_wrapperStyle$maxWidt = wrapperStyle === null || wrapperStyle === void 0 ? void 0 : wrapperStyle.maxWidth) !== null && _wrapperStyle$maxWidt !== void 0 ? _wrapperStyle$maxWidt : null,
+							transform: (_wrapperStyle$transfo = wrapperStyle === null || wrapperStyle === void 0 ? void 0 : wrapperStyle.transform) !== null && _wrapperStyle$transfo !== void 0 ? _wrapperStyle$transfo : null
+						},
+						floatingRoot: {
+							rect: getRect(".payment-modal-wrapper"),
+							width: (_rootStyle$width = rootStyle === null || rootStyle === void 0 ? void 0 : rootStyle.width) !== null && _rootStyle$width !== void 0 ? _rootStyle$width : null,
+							height: (_rootStyle$height = rootStyle === null || rootStyle === void 0 ? void 0 : rootStyle.height) !== null && _rootStyle$height !== void 0 ? _rootStyle$height : null
+						}
+					}
+				});
+				flushPaymentLogs();
+			} catch (error) {
+				console.warn("Failed to record checkout modal layout diagnostic", error);
+			}
+		};
+		const handleViewportChange = () => logLayout("viewport-change");
+		const bodyObserver = new MutationObserver(() => logLayout("body-mutation"));
+		bodyObserver.observe(document.body, {
+			attributes: true,
+			attributeFilter: ["style", "class"]
+		});
+		logLayout("modal-open", true);
+		const animationFrame = window.requestAnimationFrame(() => logLayout("next-frame", true));
+		const settleTimer = window.setTimeout(() => logLayout("startup-settled", true), 500);
+		window.addEventListener("resize", handleViewportChange);
+		window.addEventListener("orientationchange", handleViewportChange);
+		(_window$visualViewpor = window.visualViewport) === null || _window$visualViewpor === void 0 || _window$visualViewpor.addEventListener("resize", handleViewportChange);
+		return () => {
+			var _window$visualViewpor2;
+			window.cancelAnimationFrame(animationFrame);
+			window.clearTimeout(settleTimer);
+			window.removeEventListener("resize", handleViewportChange);
+			window.removeEventListener("orientationchange", handleViewportChange);
+			(_window$visualViewpor2 = window.visualViewport) === null || _window$visualViewpor2 === void 0 || _window$visualViewpor2.removeEventListener("resize", handleViewportChange);
+			bodyObserver.disconnect();
+			logLayout("modal-close", true);
+		};
+	}, [
+		addPaymentLog,
+		checkoutModalScale.width,
+		flushPaymentLogs,
+		open,
+		variant
+	]);
 	const isLocalOrderCreated = (0, react.useRef)(void 0);
 	const unsubscribeRef = (0, react.useRef)(void 0);
 	(0, react.useEffect)(() => {

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/Add/index.js

@@ -1,5 +1,6 @@
 const require_runtime = require("../../../../../../_virtual/_rolldown/runtime.js");
 const require_asyncToGenerator = require("../../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
+const require_utils = require("../../../utils.js");
 const require_model = require("../../../model.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
@@ -57,6 +58,7 @@ const AddMWCreditCard = (props, ref) => {
 	const { onCreate, shopName = "", btnLoading = false } = props;
 	const [open, setOpen] = (0, react.useState)(false);
 	const [form] = antd.Form.useForm();
+	const cardIsAmex = require_utils.isAmex(antd.Form.useWatch("card_number", form) || "");
 	const { state } = (0, react.useContext)(require_model.Context);
 	/**
 	* @title: 初始化
@@ -98,7 +100,9 @@ const AddMWCreditCard = (props, ref) => {
 			console.log(_pisell_utils.locales.getText("tocPay.text.enterCardNumber"));
 			return;
 		}
-		if (values.card_number.replace(/\s/g, "").length < 16) {
+		const cardNumber = values.card_number.replace(/\D/g, "");
+		const amex = require_utils.isAmex(cardNumber);
+		if (cardNumber.length < (amex ? 15 : 16)) {
 			(0, _pisell_materials.PisellToast)({
 				content: _pisell_utils.locales.getText("tocPay.text.enterValidCardNumber"),
 				duration: 2
@@ -135,7 +139,7 @@ const AddMWCreditCard = (props, ref) => {
 			console.log(_pisell_utils.locales.getText("tocPay.text.enterCVV"));
 			return;
 		}
-		if ((values.card_ccv + "").length < 3) {
+		if ((values.card_ccv + "").length !== (amex ? 4 : 3)) {
 			(0, _pisell_materials.PisellToast)({
 				content: _pisell_utils.locales.getText("tocPay.text.enterValidCVV"),
 				duration: 2
@@ -254,7 +258,10 @@ const AddMWCreditCard = (props, ref) => {
 			required: true,
 			message: _pisell_utils.locales.getText("tocPay.text.incorrectSecurityCode")
 		}]
-	}, /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellInput.SecurityCode, { maxLength: 3 }))), /* @__PURE__ */ react.default.createElement(antd.Col, { span: 24 }, /* @__PURE__ */ react.default.createElement(antd.Form.Item, {
+	}, /* @__PURE__ */ react.default.createElement(_pisell_materials.PisellInput.SecurityCode, {
+		maxLength: cardIsAmex ? 4 : 3,
+		placeholder: cardIsAmex ? "CID" : "CVC"
+	}))), /* @__PURE__ */ react.default.createElement(antd.Col, { span: 24 }, /* @__PURE__ */ react.default.createElement(antd.Form.Item, {
 		label: _pisell_utils.locales.getText("tocPay.text.cardholderName"),
 		name: "card_name",
 		rules: [{

package/lib/components/pay/toC/utils.js

@@ -98,6 +98,10 @@ const clientPayment = (params) => {
 const getUniqueIdempotencyToken = () => {
 	return `${(0, dayjs.default)().format("YYYYMMDDHHmmssSSS")}-${(0, _pisell_utils.getUniqueId)()}`;
 };
+const isAmex = (str) => {
+	const cardNumber = str.replace(/\D/g, "");
+	return cardNumber.startsWith("34") || cardNumber.startsWith("37");
+};
 //#endregion
 exports.clientPayment = clientPayment;
 exports.formatFranchiseeRoute = formatFranchiseeRoute;
@@ -106,3 +110,4 @@ exports.formatWalletPassParams = formatWalletPassParams;
 exports.getAvailableMaxAmount = getAvailableMaxAmount;
 exports.getIsWalletPassAndTripartitePayment = getIsWalletPassAndTripartitePayment;
 exports.getUniqueIdempotencyToken = getUniqueIdempotencyToken;
+exports.isAmex = isAmex;

package/lib/plus/saleDetail/tmpl/B/components/WalletPass/WalletPassRecordCard.js

@@ -11,7 +11,7 @@ function WalletPassRecordCard({ record }) {
 	return /* @__PURE__ */ react.default.createElement("article", { className: (0, classnames.default)(PREFIX, {
 		[`${PREFIX}--received`]: isReceived,
 		[`${PREFIX}--used`]: !isReceived
-	}) }, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__content` }, !isReceived ? /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__pass-id` }, record.code || "—") : null, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__badges` }, /* @__PURE__ */ react.default.createElement("span", { className: `${PREFIX}__badge ${PREFIX}__badge--${record.status}` }, record.status)), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__name` }, record.productName || "—"), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__meta` }, record.encoded ? /* @__PURE__ */ react.default.createElement("span", null, _pisell_utils.locales.getText("pisell2.sale-detail.walletpass.code"), ":", " ", record.encoded) : null, record.balanceText ? /* @__PURE__ */ react.default.createElement("span", null, record.balanceText) : null)), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__amount` }, /* @__PURE__ */ react.default.createElement("span", null, record.usageLabel), /* @__PURE__ */ react.default.createElement("strong", null, record.usageValue)));
+	}) }, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__content` }, !isReceived ? /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__pass-id` }, record.code || "—") : null, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__badges` }, /* @__PURE__ */ react.default.createElement("span", { className: `${PREFIX}__badge ${PREFIX}__badge--${record.status}` }, record.status)), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__name` }, record.productName || "—"), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__meta` }, record.encoded ? /* @__PURE__ */ react.default.createElement("span", null, _pisell_utils.locales.getText("pisell2.sale-detail.walletpass.code"), ":", " ", record.encoded) : null, record.balanceText ? /* @__PURE__ */ react.default.createElement("span", null, record.balanceText) : null)), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}__amount` }, record.usageLabel ? /* @__PURE__ */ react.default.createElement("span", null, record.usageLabel) : null, /* @__PURE__ */ react.default.createElement("strong", null, record.usageValue)));
 }
 //#endregion
 exports.WalletPassRecordCard = WalletPassRecordCard;

package/lib/plus/saleDetail/tmpl/B/components/WalletPass/utils/format.js

@@ -9,6 +9,9 @@ function formatCount(count, locale) {
 	const value = Math.round(count || 0);
 	return locale === "zh" ? `${value} 次` : `${value} use${value === 1 ? "" : "s"}`;
 }
+function formatCountValue(count) {
+	return String(Math.round(count || 0));
+}
 function formatPoints(points, locale) {
 	const value = formatPlainNumber(points);
 	return locale === "zh" ? `${value} 积分` : `${value} pts`;
@@ -22,12 +25,19 @@ function getUsageValue(amount, unit, symbol, locale) {
 	if (unit === "count") return formatCount(amount, locale);
 	return formatMoney(amount, symbol);
 }
-function formatBalanceText(amount, unit, symbol, locale, remainingUses) {
+function formatPercentage(amount) {
+	return `${formatPlainNumber(amount)}%`;
+}
+function formatPercentageBalanceText(amount, locale) {
+	const value = formatPercentage(amount);
+	return locale === "zh" ? `余额 / 剩余：${value}` : `Balance / remaining: ${value}`;
+}
+function formatBalanceText(amount, unit, symbol, locale, remainingUses, showCountUnit = true) {
 	if (amount !== null && Number.isFinite(amount)) {
-		const value = unit === "points" ? formatPoints(amount, locale) : unit === "count" ? formatCount(amount, locale) : formatMoney(amount, symbol);
+		const value = unit === "points" ? formatPoints(amount, locale) : unit === "count" ? showCountUnit ? formatCount(amount, locale) : formatPlainNumber(amount) : formatMoney(amount, symbol);
 		return locale === "zh" ? `余额 / 剩余：${value}` : `Balance / remaining: ${value}`;
 	}
-	if (remainingUses !== void 0 && remainingUses !== null) return locale === "zh" ? `余额 / 剩余：${formatCount(remainingUses, locale)}` : `Balance / remaining: ${formatCount(remainingUses, locale)}`;
+	if (remainingUses !== void 0 && remainingUses !== null) return locale === "zh" ? `余额 / 剩余：${showCountUnit ? formatCount(remainingUses, locale) : formatPlainNumber(remainingUses)}` : `Balance / remaining: ${showCountUnit ? formatCount(remainingUses, locale) : formatPlainNumber(remainingUses)}`;
 	return "";
 }
 function maskPassId(value) {
@@ -37,6 +47,9 @@ function maskPassId(value) {
 }
 //#endregion
 exports.formatBalanceText = formatBalanceText;
+exports.formatCountValue = formatCountValue;
+exports.formatPercentage = formatPercentage;
+exports.formatPercentageBalanceText = formatPercentageBalanceText;
 exports.getUsageLabel = getUsageLabel;
 exports.getUsageValue = getUsageValue;
 exports.maskPassId = maskPassId;

package/lib/plus/saleDetail/tmpl/B/components/WalletPass/utils/vouchers.js

@@ -8,6 +8,10 @@ const WALLET_PASS_VOUCHER_TAGS = new Set([
 	"gift_card",
 	"product_voucher"
 ]);
+function getVoucherAmountUnit(tag) {
+	if (tag === "good_pass") return "count";
+	return "money";
+}
 const TICKET_VOUCHER_TAGS = new Set([
 	"ticket",
 	"product_package_ticket",
@@ -29,30 +33,41 @@ function isWalletPassVoucher(voucher) {
 function normalizeVoucherStatus(voucher) {
 	return require_read.readText(voucher, ["status"]).trim().toLowerCase().replace(/[\s-]+/g, "_") === "used" ? "used" : "unused";
 }
-function readVoucherAmount(voucher, status) {
+function isPercentageDiscountVoucher(voucher, tag) {
+	return tag === "product_discount_card" && require_read.readText(voucher, ["metadata.discount_card_type"]).trim().toLowerCase() === "percent";
+}
+function readVoucherAmount(voucher, status, amountUnit) {
+	var _ref;
 	const usedAmount = require_read.readMoneyFromKeys(voucher, ["used_par_value"]);
 	const issuedAmount = require_read.readMoneyFromKeys(voucher, ["par_value"]);
-	return Math.max(0, status === "used" ? usedAmount !== null && usedAmount !== void 0 ? usedAmount : 0 : issuedAmount !== null && issuedAmount !== void 0 ? issuedAmount : 0);
+	const balance = amountUnit === "money" ? null : require_read.readMoneyFromKeys(voucher, ["balance"]);
+	return Math.max(0, status === "used" ? usedAmount !== null && usedAmount !== void 0 ? usedAmount : 0 : (_ref = issuedAmount !== null && issuedAmount !== void 0 ? issuedAmount : balance) !== null && _ref !== void 0 ? _ref : 0);
 }
-function readVoucherBalance(voucher) {
+function readVoucherBalance(voucher, amountUnit) {
 	var _readMoneyFromKeys, _readMoneyFromKeys2;
+	if (amountUnit !== "money") {
+		const balance = require_read.readMoneyFromKeys(voucher, ["balance"]);
+		if (balance !== null) return Math.max(0, balance);
+	}
 	return ((_readMoneyFromKeys = require_read.readMoneyFromKeys(voucher, ["par_value"])) !== null && _readMoneyFromKeys !== void 0 ? _readMoneyFromKeys : 0) - ((_readMoneyFromKeys2 = require_read.readMoneyFromKeys(voucher, ["used_par_value"])) !== null && _readMoneyFromKeys2 !== void 0 ? _readMoneyFromKeys2 : 0);
 }
 function buildVoucherWalletPassRecord(voucher, index, symbol, locale) {
 	if (!isWalletPassVoucher(voucher)) return null;
 	const status = normalizeVoucherStatus(voucher);
 	const direction = "received";
-	const amountUnit = "money";
-	const amountValue = readVoucherAmount(voucher, status);
+	const tag = normalizeVoucherTag(voucher);
+	const amountUnit = getVoucherAmountUnit(tag);
+	const amountValue = readVoucherAmount(voucher, status, amountUnit);
+	const isPercentageDiscount = isPercentageDiscountVoucher(voucher, tag);
 	const productName = require_read.readText(voucher, ["product_name"]);
 	const code = require_format.maskPassId(require_read.readText(voucher, ["code"]));
 	const encoded = require_read.readText(voucher, ["encoded"]);
-	const balance = readVoucherBalance(voucher);
+	const balance = readVoucherBalance(voucher, amountUnit);
 	const id = String(require_read.readText(voucher, ["voucher_id"]) || code || `voucher-${index}`);
 	return require_recordFactory.buildRecord({
 		amountUnit,
 		amountValue,
-		balanceText: require_format.formatBalanceText(balance, amountUnit, symbol, locale),
+		balanceText: isPercentageDiscount ? require_format.formatPercentageBalanceText(balance, locale) : require_format.formatBalanceText(balance, amountUnit, symbol, locale, void 0, amountUnit !== "count"),
 		code,
 		direction,
 		encoded,
@@ -61,8 +76,8 @@ function buildVoucherWalletPassRecord(voucher, index, symbol, locale) {
 		sortTime: require_recordFactory.getRecordTime(voucher, index),
 		sourceVoucher: voucher,
 		status,
-		usageLabel: require_format.getUsageLabel(status, locale),
-		usageValue: require_format.getUsageValue(amountValue, amountUnit, symbol, locale)
+		usageLabel: isPercentageDiscount ? "" : require_format.getUsageLabel(status, locale),
+		usageValue: isPercentageDiscount ? require_format.formatPercentage(amountValue) : amountUnit === "count" ? require_format.formatCountValue(amountValue) : require_format.getUsageValue(amountValue, amountUnit, symbol, locale)
 	});
 }
 function getVoucherRows(input) {

package/lib/pro/compensatedPisellContainer/floatingLayer/index.js

@@ -132,6 +132,17 @@ const getWrapperStyle = (mode, placement, size, width, height) => {
 	}
 	return require_objectSpread2._objectSpread2({ width: width || 520 }, height ? { height } : null);
 };
+/**
+* 浮层会被挂到带 transform: scale(...) 的 body 下。modal 的 root 已按
+* `viewport / scale` 做过反向补偿，因此不能再把 vw/% 交给浏览器在另一套
+* viewport 参照系中解析；统一转换成 root 坐标系中的像素值。
+*/
+const resolveModalWidth = (mode, width, layoutWidth) => {
+	if (mode !== "modal" || typeof width !== "string" || !layoutWidth) return width;
+	const match = width.trim().match(/^(\d+(?:\.\d+)?)\s*(vw|%)$/);
+	if (!match) return width;
+	return layoutWidth * Number(match[1]) / 100;
+};
 const getWrapperMotionStyle = (mode, placement, motionOpen, bodyScale, viewportSize) => {
 	const visibleStyle = { pointerEvents: "auto" };
 	const hiddenStyle = { pointerEvents: "none" };
@@ -313,10 +324,11 @@ const TransformFloatingLayer = (props) => {
 	]);
 	const wrapperStyle = (0, react.useMemo)(() => {
 		const scaleX = bodyScale.x || 1;
+		const resolvedWidth = resolveModalWidth(mode, width, viewportSize.width / scaleX);
 		const modalScaleStyle = mode === "modal" ? { maxWidth: Math.max((viewportSize.width - 48) / scaleX, 0) } : null;
 		const layoutChangingStyle = mode === "modal" && isLayoutChanging ? { transition: "none" } : null;
 		const skipEnterMotionStyle = skipCurrentEnterMotion ? { transition: "none" } : null;
-		return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, getWrapperStyle(mode, placement, size, width, height)), modalScaleStyle), style), contentWrapperStyle), styles === null || styles === void 0 ? void 0 : styles.wrapper), getWrapperMotionStyle(mode, placement, effectiveMotionOpen, bodyScale, viewportSize)), layoutChangingStyle), skipEnterMotionStyle);
+		return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, getWrapperStyle(mode, placement, size, resolvedWidth, height)), modalScaleStyle), style), contentWrapperStyle), styles === null || styles === void 0 ? void 0 : styles.wrapper), getWrapperMotionStyle(mode, placement, effectiveMotionOpen, bodyScale, viewportSize)), layoutChangingStyle), skipEnterMotionStyle);
 	}, [
 		bodyScale,
 		contentWrapperStyle,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.236",
+  "version": "6.12.237",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,9 +70,9 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/materials": "6.12.63",
-    "@pisell/date-picker": "3.0.10",
     "@pisell/utils": "3.0.4",
+    "@pisell/materials": "6.12.64",
+    "@pisell/date-picker": "3.0.10",
     "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {

package/es/private-materials/lowcode/authmodal/meta.d.ts

@@ -1 +0,0 @@
-export { };