@pisell/private-materials 6.12.223 → 6.12.225

package/es/components/bigSale/Base.js

@@ -9,7 +9,7 @@ const DEFAULT_MODE = "ticket";
 /**
 * BigSaleBase 位于 SalesSdkProvider 内部，负责把 SDK 数据分发给商品列表和 SaleDetailBase。
 */
-function BigSaleBase({ isActive = true, osKey, saleDetailHeaderSlot, rightActionBarClose, overlaySlot, className, style, mode = DEFAULT_MODE, tmpl, template = "standard", variant = "desktop", productLoadParams, businessCode, bookingConfigParams, hideSelectFloorMapResourceAction, productDisplayConfig, productCatalogSessionKey, productCatalogReady, saleDetailTemplate, saleDetailModuleConfig, autoCreate = true, orderId, locale, saleDetailWrapperProps, cartProductsPerRow, showClient, onOrderComplete, externalActionRequest, onExternalActionAccepted, onExternalPaymentSettled }) {
+function BigSaleBase({ isActive = true, osKey, saleDetailHeaderSlot, rightActionBarClose, overlaySlot, className, style, mode = DEFAULT_MODE, tmpl, template = "standard", variant = "desktop", productLoadParams, businessCode, bookingConfigParams, hideSelectFloorMapResourceAction, productDisplayConfig, productCatalogSessionKey, productCatalogReady, kioskShellLayout, saleDetailTemplate, saleDetailModuleConfig, autoCreate = true, orderId, locale, saleDetailWrapperProps, cartProductsPerRow, showClient, onOrderComplete, externalActionRequest, onExternalActionAccepted, onExternalPaymentSettled }) {
 	var _context$booking$getB, _context$booking, _context$booking$getB2;
 	const context = useBigSaleContext();
 	const currentTemplate = tmpl || template || "standard";
@@ -63,6 +63,7 @@ function BigSaleBase({ isActive = true, osKey, saleDetailHeaderSlot, rightAction
 		productDisplayConfig,
 		productCatalogSessionKey,
 		productCatalogReady,
+		kioskShellLayout,
 		saleDetailTemplate,
 		saleDetailModuleConfig: resolvedSaleDetailModuleConfig,
 		orderId,

package/es/components/bigSale/components/KioskCartCapsule/index.js

@@ -7,7 +7,7 @@ import classNames from "classnames";
 import { ArrowLeftOutlined, CheckOutlined, EditOutlined, PercentageOutlined, ShoppingCartOutlined } from "@ant-design/icons";
 import "./index.less";
 //#region src/components/bigSale/components/KioskCartCapsule/index.tsx
-function KioskCartCapsule({ backDisabled = false, checkoutLoading = false, context, isCartActive, isPromotionVisible = false, locale, onAddNote, onBack, onCheckout, onTogglePromotion, onToggleCart, presentation = "floating", promotionAppliedCount = 0 }) {
+function KioskCartCapsule({ backDisabled = false, catalogPrimaryAction = "toggle-cart", checkoutLoading = false, context, isCartActive, isPromotionVisible = false, locale, onAddNote, onBack, onCheckout, onTogglePromotion, onToggleCart, presentation = "floating", promotionAppliedCount = 0, showCatalogCartAction = true, showCatalogNoteAction = false }) {
 	const cartView = useMemo(() => {
 		var _ref, _ref2, _context$cart$items$l, _context$cart$items, _context$cart$booking, _context$cart$booking2, _tempOrder$note;
 		const tempOrder = resolveSaleDetailTempOrder(context.sales, context.cart);
@@ -34,17 +34,19 @@ function KioskCartCapsule({ backDisabled = false, checkoutLoading = false, conte
 		context.summary.summary,
 		locale
 	]);
-	const primaryActionText = locales.getText(isCartActive ? "pisell2.big-sale.kiosk.checkout" : "pisell2.big-sale.kiosk.next");
+	const isCatalogCheckoutAction = !isCartActive && catalogPrimaryAction === "checkout";
+	const isCheckoutPending = checkoutLoading && (isCartActive || isCatalogCheckoutAction);
+	const primaryActionText = locales.getText(isCartActive || isCatalogCheckoutAction ? "pisell2.big-sale.kiosk.checkout" : "pisell2.big-sale.kiosk.next");
 	const { isSidebarPresentation, normalizedPromotionAppliedCount, shouldShowNoteButton, shouldShowPromotionBadge, shouldShowPromotionButton, shouldShowTotal } = resolveKioskCartCapsuleViewModel({
 		isCartActive,
 		isPromotionVisible,
 		onAddNote,
 		onTogglePromotion,
 		presentation,
-		promotionAppliedCount
+		promotionAppliedCount,
+		showCatalogNoteAction
 	});
 	const promotionActionText = locales.getText("pisell2.big-sale.kiosk.promotions");
-	const isCheckoutPending = isCartActive && checkoutLoading;
 	return /* @__PURE__ */ React.createElement("div", { className: classNames("pisell-kiosk-cart-capsule", {
 		"pisell-kiosk-cart-capsule--cart": isCartActive,
 		"pisell-kiosk-cart-capsule--catalog": !isCartActive,
@@ -80,7 +82,7 @@ function KioskCartCapsule({ backDisabled = false, checkoutLoading = false, conte
 	}, /* @__PURE__ */ React.createElement(PercentageOutlined, null), /* @__PURE__ */ React.createElement("span", { className: "pisell-kiosk-cart-capsule__promotion-label" }, promotionActionText), shouldShowPromotionBadge ? /* @__PURE__ */ React.createElement("span", {
 		"aria-hidden": "true",
 		className: "pisell-kiosk-cart-capsule__promotion-badge"
-	}, normalizedPromotionAppliedCount > 99 ? "99+" : normalizedPromotionAppliedCount) : null) : null, !isCartActive ? /* @__PURE__ */ React.createElement("button", {
+	}, normalizedPromotionAppliedCount > 99 ? "99+" : normalizedPromotionAppliedCount) : null) : null, !isCartActive && showCatalogCartAction ? /* @__PURE__ */ React.createElement("button", {
 		"aria-label": locales.getText("pisell2.big-sale.kiosk.open-cart"),
 		className: "pisell-kiosk-cart-capsule__cart-button",
 		disabled: !cartView.hasItems,
@@ -92,13 +94,13 @@ function KioskCartCapsule({ backDisabled = false, checkoutLoading = false, conte
 	}, cartView.itemCount)), /* @__PURE__ */ React.createElement("span", { className: "pisell-kiosk-cart-capsule__label" }, locales.getText("pisell2.big-sale.kiosk.cart"))) : null, /* @__PURE__ */ React.createElement("button", {
 		"aria-label": primaryActionText,
 		className: classNames("pisell-kiosk-cart-capsule__checkout-button", {
-			"pisell-kiosk-cart-capsule__checkout-button--next": !isCartActive,
+			"pisell-kiosk-cart-capsule__checkout-button--next": !isCartActive && !isCatalogCheckoutAction,
 			"pisell-kiosk-cart-capsule__checkout-button--loading": isCheckoutPending
 		}),
 		"aria-busy": isCheckoutPending || void 0,
 		disabled: !cartView.hasItems || isCheckoutPending,
 		type: "button",
-		onClick: isCartActive ? onCheckout : onToggleCart
+		onClick: isCartActive || isCatalogCheckoutAction ? onCheckout : onToggleCart
 	}, /* @__PURE__ */ React.createElement("span", { className: "pisell-kiosk-cart-capsule__checkout-content" }, isCheckoutPending ? /* @__PURE__ */ React.createElement("span", {
 		"aria-hidden": "true",
 		className: "pisell-kiosk-cart-capsule__checkout-spinner"

package/es/components/bigSale/components/KioskCartCapsule/index.less

@@ -417,7 +417,8 @@
 }
 
 @media (max-width: 720px) {
-  .pisell-kiosk-cart-capsule--floating.pisell-kiosk-cart-capsule--catalog {
+  .pisell-kiosk-sale[data-kiosk-shell='single-screen']
+    .pisell-kiosk-cart-capsule--floating.pisell-kiosk-cart-capsule--catalog {
     gap: 8px;
     padding: 6px 14px;
 
@@ -492,7 +493,8 @@
 }
 
 @media (max-width: 560px) {
-  .pisell-kiosk-cart-capsule--floating.pisell-kiosk-cart-capsule--cart {
+  .pisell-kiosk-sale[data-kiosk-shell='single-screen']
+    .pisell-kiosk-cart-capsule--floating.pisell-kiosk-cart-capsule--cart {
     gap: 8px;
     padding: 6px 14px;
 
@@ -527,7 +529,8 @@
 }
 
 @media (max-width: 390px) {
-  .pisell-kiosk-cart-capsule {
+  .pisell-kiosk-sale[data-kiosk-shell='single-screen']
+    .pisell-kiosk-cart-capsule {
     &__back-button {
       width: 48px;
       justify-content: center;
@@ -539,7 +542,8 @@
     }
   }
 
-  .pisell-kiosk-cart-capsule--catalog {
+  .pisell-kiosk-sale[data-kiosk-shell='single-screen']
+    .pisell-kiosk-cart-capsule--catalog {
     .pisell-kiosk-cart-capsule {
       &__back-button {
         width: auto;
@@ -554,13 +558,15 @@
 }
 
 @media (max-width: 340px) {
-  .pisell-kiosk-cart-capsule {
+  .pisell-kiosk-sale[data-kiosk-shell='single-screen']
+    .pisell-kiosk-cart-capsule {
     gap: 4px;
     padding-right: 6px;
     padding-left: 6px;
   }
 
-  .pisell-kiosk-cart-capsule--cart {
+  .pisell-kiosk-sale[data-kiosk-shell='single-screen']
+    .pisell-kiosk-cart-capsule--cart {
     .pisell-kiosk-cart-capsule {
       &__note-button {
         width: 48px;
@@ -575,7 +581,8 @@
   }
 }
 
-.pisell-kiosk-sale[data-variant='phone'] .pisell-kiosk-cart-capsule {
+.pisell-kiosk-sale[data-kiosk-shell='single-screen']
+  .pisell-kiosk-cart-capsule--floating {
   &__back-button,
   &__promotion-button,
   &__note-button {

package/es/components/bigSale/components/KioskCartCapsule/viewModel.js

@@ -2,12 +2,13 @@
 function resolveKioskCartCapsuleViewModel(options) {
 	const normalizedPromotionAppliedCount = Number.isFinite(options.promotionAppliedCount) ? Math.max(0, Math.floor(options.promotionAppliedCount)) : 0;
 	const isSidebarPresentation = options.presentation === "sidebar";
+	const shouldShowCatalogNoteAction = Boolean(options.showCatalogNoteAction) && !options.isCartActive;
 	const shouldShowPromotionBadge = !options.isPromotionVisible && normalizedPromotionAppliedCount > 0;
 	return {
 		isSidebarPresentation,
 		normalizedPromotionAppliedCount,
 		shouldShowTotal: !options.isCartActive || isSidebarPresentation,
-		shouldShowNoteButton: Boolean(options.onAddNote) && (options.isCartActive || isSidebarPresentation),
+		shouldShowNoteButton: Boolean(options.onAddNote) && (options.isCartActive || isSidebarPresentation || shouldShowCatalogNoteAction),
 		shouldShowPromotionButton: Boolean(options.onTogglePromotion) && (options.isCartActive || isSidebarPresentation),
 		shouldShowPromotionBadge
 	};

package/es/components/bigSale/index.js

@@ -78,6 +78,7 @@ const BigSale = ({ osKey = DEFAULT_OS_KEY, enableMultiCurrencySettlement = false
 		variant
 	]);
 	const resolvedVariant = resolvedTemplate === "kiosk" ? kioskPresentation.variant || variant : variant;
+	const resolvedKioskShellLayout = resolvedTemplate === "kiosk" ? kioskPresentation.kioskShellLayout : void 0;
 	const resolvedNormalProductDetailConfig = useMemo(() => {
 		var _selectionFlowConfig$;
 		const selectionFlowConfig = _objectSpread2(_objectSpread2({}, resolveBigSaleSelectionFlowConfig(selectionFlowScene, normalProductDetailConfig)), {}, { enableMultiCurrencySettlement });
@@ -172,6 +173,7 @@ const BigSale = ({ osKey = DEFAULT_OS_KEY, enableMultiCurrencySettlement = false
 		osKey,
 		mode,
 		variant: resolvedVariant,
+		kioskShellLayout: resolvedKioskShellLayout,
 		template: resolvedTemplate,
 		productLoadParams,
 		productDisplayConfig,

package/es/components/bigSale/templates/Kiosk/index.js

@@ -23,7 +23,7 @@ import Base_default from "../../../../plus/saleDetail/Base.js";
 import locales_default from "../../locales/index.js";
 import { BigSaleProductList } from "../../components/ProductList/index.js";
 import KioskCartCapsule from "../../components/KioskCartCapsule/index.js";
-import { resolveKioskLayoutState, resolveKioskPromotionRevealTarget } from "./layout.js";
+import { normalizeKioskNavigableView, resolveKioskLayoutState, resolveKioskProductListPreferencesChannel, resolveKioskPromotionRevealTarget } from "./layout.js";
 import { isH5ZeroAmountValue, isKioskPlatformZeroAmountCheckout, resolveKioskNoPaymentResultViewModel, resolveKioskNoPaymentSubmitParams, resolveKioskSubmittedPayableAmount, shouldSubmitKioskOrderBeforeCheckout, toFiniteKioskAmount, validateKioskNoPaymentSubmitResult } from "./zeroAmountCheckout.js";
 import { openKioskCheckoutCustomerAuth, resolveKioskCheckoutCustomerAuthRequest } from "./checkoutCustomerAuth.js";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -224,7 +224,7 @@ function createKioskLoginContinuationHandler(options) {
 		});
 	};
 }
-function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant, productLoadParams, businessCode, productDisplayConfig, productCatalogSessionKey, orderId, saleDetailModuleConfig, locale, onOrderComplete }) {
+function KioskBigSaleTemplate({ isActive = true, osKey, productListPreferencesChannel, context, mode, variant, kioskShellLayout = "single-screen", productLoadParams, businessCode, productDisplayConfig, productCatalogSessionKey, orderId, saleDetailModuleConfig, locale, onOrderComplete }) {
 	var _context$sales$bookin, _engineContext$appHel, _utils$getApp, _engineContext$appHel2;
 	locales.init(locales_default, locale || "en");
 	const engineContext = useEngineContext();
@@ -239,7 +239,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 	const shouldUseConsumerPayment = hostChannel === "pc" || hostChannel === "h5";
 	const shouldRequireLogin = isRequireLoginChannel(hostChannel);
 	const { isLoggedIn, openLoginModal } = useSalesUserLogin();
-	const [view, setView] = useState(() => readKioskSessionView(context.sales.bookingTicket));
+	const [view, setView] = useState(() => normalizeKioskNavigableView(kioskShellLayout, readKioskSessionView(context.sales.bookingTicket)));
 	const [isCatalogPromotionVisible, setIsCatalogPromotionVisible] = useState(false);
 	const [isCartPromotionVisible, setIsCartPromotionVisible] = useState(true);
 	const [isCatalogProductListScrolling, setIsCatalogProductListScrolling] = useState(false);
@@ -285,10 +285,12 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 		modalClassName: "pisell-kiosk-modal pisell-kiosk-note-modal"
 	});
 	const setNavigableView = (nextView) => {
-		persistKioskSessionView(context.sales.bookingTicket, nextView);
-		setView(nextView);
+		const normalizedView = normalizeKioskNavigableView(kioskShellLayout, nextView);
+		persistKioskSessionView(context.sales.bookingTicket, normalizedView);
+		setView(normalizedView);
 	};
-	const layoutState = resolveKioskLayoutState(variant, view);
+	const layoutState = resolveKioskLayoutState(kioskShellLayout, view);
+	const resolvedProductListPreferencesChannel = resolveKioskProductListPreferencesChannel(kioskShellLayout, productListPreferencesChannel);
 	const requestRemoveItemConfirmation = useCallback(() => new Promise((resolve) => {
 		var _removeItemConfirmRes;
 		(_removeItemConfirmRes = removeItemConfirmResolverRef.current) === null || _removeItemConfirmRes === void 0 || _removeItemConfirmRes.call(removeItemConfirmResolverRef, false);
@@ -328,13 +330,14 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 		if (!bookingTicket || context.sales.status !== "ready" || !context.sales.tempOrder) return;
 		if (restoredSessionHandleRef.current === bookingTicket) return;
 		restoredSessionHandleRef.current = bookingTicket;
-		const restoredView = resolveRestoredKioskSessionView(bookingTicket);
+		const restoredView = normalizeKioskNavigableView(kioskShellLayout, resolveRestoredKioskSessionView(bookingTicket));
 		persistKioskSessionView(bookingTicket, restoredView);
 		setView(restoredView);
 	}, [
 		context.sales.bookingTicket,
 		context.sales.status,
-		context.sales.tempOrder
+		context.sales.tempOrder,
+		kioskShellLayout
 	]);
 	const defaultProductListPreferences = useMemo(() => {
 		const autoPreferences = resolveBigSaleAutoProductListPreferences({
@@ -413,14 +416,14 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 		const previousRevision = previousPromotionItemIncreaseRevisionRef.current;
 		previousPromotionItemIncreaseRevisionRef.current = nextRevision;
 		if (nextRevision !== previousRevision && isActive) {
-			const target = resolveKioskPromotionRevealTarget(variant, view);
+			const target = resolveKioskPromotionRevealTarget(kioskShellLayout, view);
 			if (target === "catalog") setIsCatalogPromotionVisible(true);
 			else if (target === "cart") setIsCartPromotionVisible(true);
 		}
 	}, [
 		context.sales.promotionScanItemIncreaseRevision,
 		isActive,
-		variant,
+		kioskShellLayout,
 		view
 	]);
 	const catalogPromotionSlot = useMemo(() => layoutState.showCatalogPromotion ? /* @__PURE__ */ React.createElement("div", { className: "pisell-kiosk-sale__catalog-promotions" }, /* @__PURE__ */ React.createElement(Base_default, {
@@ -516,12 +519,17 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 		}, 0);
 	};
 	const handleCapsuleBack = () => {
-		if (layoutState.isDesktop || view === "catalog") {
+		if (layoutState.isPcWideSidebar || view === "catalog") {
 			setIsExitConfirmOpen(true);
 			return;
 		}
 		setNavigableView("catalog");
 	};
+	const handleFloatingCartToggle = () => {
+		const nextView = view === "cart" ? "catalog" : "cart";
+		if (nextView === "cart") setIsCartPromotionVisible(true);
+		setNavigableView(nextView);
+	};
 	const showCheckoutFailure = (failureReason) => {
 		var _ref2, _context$sales$tempOr, _context$sales$bookin2, _context$sales$bookin3, _ref3, _ref4, _resolveVirtualSettle;
 		const tempOrder = (_ref2 = (_context$sales$tempOr = context.sales.tempOrder) !== null && _context$sales$tempOr !== void 0 ? _context$sales$tempOr : (_context$sales$bookin2 = context.sales.bookingTicket) === null || _context$sales$bookin2 === void 0 || (_context$sales$bookin3 = _context$sales$bookin2.getTempOrder) === null || _context$sales$bookin3 === void 0 ? void 0 : _context$sales$bookin3.call(_context$sales$bookin2)) !== null && _ref2 !== void 0 ? _ref2 : null;
@@ -859,18 +867,20 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 	}]];
 	return /* @__PURE__ */ React.createElement("section", {
 		className: "pisell-kiosk-sale",
-		"data-catalog-promotion": view === "catalog" && isCatalogPromotionVisible ? "visible" : "hidden",
+		"data-catalog-promotion": layoutState.showCatalogPromotion && isCatalogPromotionVisible ? "visible" : "hidden",
 		"data-catalog-scrolling": view === "catalog" && isCatalogProductListScrolling ? "true" : "false",
+		"data-kiosk-shell": kioskShellLayout,
 		"data-variant": variant,
 		"data-view": view
 	}, /* @__PURE__ */ React.createElement("div", { className: "pisell-kiosk-sale__content" }, layoutState.showCatalog ? /* @__PURE__ */ React.createElement("div", {
-		"aria-hidden": !layoutState.isDesktop && view !== "catalog",
+		"aria-hidden": !layoutState.isPcWideSidebar && view !== "catalog",
 		className: "pisell-kiosk-sale__catalog"
 	}, /* @__PURE__ */ React.createElement(BigSaleProductList, {
 		addToCartToastIcon: variant === "phone" ? KIOSK_PHONE_ADD_TO_CART_TOAST_ICON : void 0,
 		addToCartToastOptions: variant === "phone" ? KIOSK_PHONE_ADD_TO_CART_TOAST_OPTIONS : void 0,
-		isActive: isActive && (layoutState.isDesktop || view === "catalog"),
+		isActive: isActive && (layoutState.isPcWideSidebar || view === "catalog"),
 		osKey,
+		productListPreferencesChannel: resolvedProductListPreferencesChannel,
 		mode,
 		context,
 		businessCode,
@@ -890,29 +900,23 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 		showActiveCategoryTitle: catalogVariant !== "phone",
 		showSettings: true,
 		variant: catalogVariant
-	})) : null, layoutState.showCart ? /* @__PURE__ */ React.createElement("section", { className: "pisell-kiosk-sale__screen pisell-kiosk-sale__cart-screen" }, /* @__PURE__ */ React.createElement("header", { className: "pisell-kiosk-sale__cart-header" }, /* @__PURE__ */ React.createElement("h1", null, locales.getText("pisell2.big-sale.kiosk.your-order"), " ", "(", cartItemCount, ")")), /* @__PURE__ */ React.createElement("div", { className: "pisell-kiosk-sale__cart-body" }, /* @__PURE__ */ React.createElement(Base_default, {
+	})) : null, layoutState.showCart ? /* @__PURE__ */ React.createElement("section", {
+		"aria-label": locales.getText("pisell2.big-sale.kiosk.your-order"),
+		className: "pisell-kiosk-sale__screen pisell-kiosk-sale__cart-screen"
+	}, /* @__PURE__ */ React.createElement("header", { className: "pisell-kiosk-sale__cart-header" }, /* @__PURE__ */ React.createElement("h1", null, locales.getText("pisell2.big-sale.kiosk.your-order"), " ", "(", cartItemCount, ")")), /* @__PURE__ */ React.createElement("div", { className: "pisell-kiosk-sale__cart-body" }, /* @__PURE__ */ React.createElement(Base_default, {
 		context: saleDetailContext,
 		mobilePresentation: "inline",
 		moduleConfig: kioskSaleDetailModuleConfig,
 		renderType: "current",
 		template: "A",
 		variant
-	})), layoutState.showSidebarCapsule ? /* @__PURE__ */ React.createElement(KioskCartCapsule, {
-		presentation: "sidebar",
-		context,
-		isCartActive: true,
-		isPromotionVisible: isCartPromotionVisible,
-		promotionAppliedCount: selectedCustomerVoucherCount,
-		onAddNote: openOrderNoteModal,
-		onBack: handleCapsuleBack,
-		checkoutLoading: isCheckoutLoading,
-		onCheckout: handleCheckout,
-		onTogglePromotion: () => setIsCartPromotionVisible((visible) => !visible),
-		onToggleCart: () => setNavigableView("cart")
-	}) : null) : null), view === "cart" && isCheckoutLoading ? /* @__PURE__ */ React.createElement("div", { className: "pisell-kiosk-sale__checkout-loading" }, /* @__PURE__ */ React.createElement(Spin, { size: "large" })) : null, catalogPromotionSlot, layoutState.showFloatingCapsule ? /* @__PURE__ */ React.createElement(KioskCartCapsule, {
+	}))) : null), view === "cart" && isCheckoutLoading ? /* @__PURE__ */ React.createElement("div", { className: "pisell-kiosk-sale__checkout-loading" }, /* @__PURE__ */ React.createElement(Spin, { size: "large" })) : null, catalogPromotionSlot, layoutState.showFloatingCapsule ? /* @__PURE__ */ React.createElement(KioskCartCapsule, {
 		presentation: "floating",
 		context,
 		isCartActive: layoutState.cartIsActive,
+		catalogPrimaryAction: layoutState.catalogPrimaryAction,
+		showCatalogCartAction: !layoutState.isPcWideSidebar,
+		showCatalogNoteAction: layoutState.isPcWideSidebar,
 		isPromotionVisible: isCartPromotionVisible,
 		locale,
 		promotionAppliedCount: selectedCustomerVoucherCount,
@@ -921,11 +925,7 @@ function KioskBigSaleTemplate({ isActive = true, osKey, context, mode, variant,
 		checkoutLoading: isCheckoutLoading,
 		onCheckout: handleCheckout,
 		onTogglePromotion: isVirtualSettlementOrder ? void 0 : () => setIsCartPromotionVisible((visible) => !visible),
-		onToggleCart: () => {
-			const nextView = view === "cart" ? "catalog" : "cart";
-			if (nextView === "cart") setIsCartPromotionVisible(true);
-			setNavigableView(nextView);
-		}
+		onToggleCart: handleFloatingCartToggle
 	}) : null, orderNoteModal, /* @__PURE__ */ React.createElement(Modal, {
 		centered: true,
 		closable: false,

package/es/components/bigSale/templates/Kiosk/index.less

@@ -12,6 +12,7 @@
   );
 
   position: relative;
+  box-sizing: border-box;
   width: 100%;
   height: 100%;
   min-height: 0;
@@ -302,7 +303,7 @@
 
 // 手机版商品列表滚动时，底部 catalog 胶囊与顶部搜索框同时让出可视区域。
 // 只改变视觉和点击状态，不删除原来的底部预留空间；滚动停止后可无跳动恢复。
-.pisell-kiosk-sale[data-variant='phone'][data-view='catalog'][data-catalog-scrolling='true']
+.pisell-kiosk-sale[data-kiosk-shell='single-screen'][data-view='catalog'][data-catalog-scrolling='true']
   .pisell-kiosk-cart-capsule--catalog {
   opacity: 0;
   pointer-events: none;
@@ -379,7 +380,15 @@
   min-height: 0;
 }
 
-.pisell-kiosk-sale[data-variant='desktop'] {
+.pisell-kiosk-sale[data-kiosk-shell='pc-wide-sidebar'] {
+  max-width: 1200px;
+  margin-right: auto;
+  margin-left: auto;
+
+  .pisell-kiosk-sale__content {
+    height: calc(100% - var(--pisell-kiosk-cart-capsule-reserved-space));
+  }
+
   .pisell-kiosk-sale__catalog .list-content-vertical {
     padding-bottom: 0;
   }

package/es/components/bigSale/templates/Kiosk/layout.js

@@ -1,20 +1,32 @@
 //#region src/components/bigSale/templates/Kiosk/layout.ts
-function resolveKioskLayoutState(variant, view) {
-	const isDesktop = variant === "desktop";
+function resolveKioskLayoutState(shellLayout, view) {
+	const isPcWideSidebar = shellLayout === "pc-wide-sidebar";
 	const isNavigableView = view === "catalog" || view === "cart";
 	return {
-		isDesktop,
+		isPcWideSidebar,
 		showCatalog: isNavigableView,
-		showCart: isDesktop ? isNavigableView : view === "cart",
-		showCatalogPromotion: !isDesktop && view === "catalog",
-		showFloatingCapsule: !isDesktop && isNavigableView,
-		showSidebarCapsule: isDesktop && isNavigableView,
-		cartIsActive: isDesktop || view === "cart"
+		showCart: isPcWideSidebar ? isNavigableView : view === "cart",
+		showCatalogPromotion: !isPcWideSidebar && view === "catalog",
+		showFloatingCapsule: isNavigableView,
+		cartIsActive: !isPcWideSidebar && view === "cart",
+		catalogPrimaryAction: isPcWideSidebar ? "checkout" : "toggle-cart"
 	};
 }
-function resolveKioskPromotionRevealTarget(variant, view) {
+function resolveKioskPromotionRevealTarget(shellLayout, view) {
 	if (view !== "catalog" && view !== "cart") return null;
-	return variant === "desktop" ? "cart" : view;
+	return shellLayout === "pc-wide-sidebar" ? "cart" : view;
+}
+/** PC 的购物车常驻在右栏，不再恢复或持久化全屏 cart 视图。 */
+function normalizeKioskNavigableView(shellLayout, view) {
+	return shellLayout === "pc-wide-sidebar" ? "catalog" : view;
+}
+/**
+* PC 新版 H5 内容布局使用独立偏好 key，避免旧 desktop 配置回流或污染 H5。
+* H5 / 实体 Kiosk 返回 undefined，继续沿用升级前的存储 key。
+*/
+function resolveKioskProductListPreferencesChannel(shellLayout, channel) {
+	if (shellLayout !== "pc-wide-sidebar") return void 0;
+	return `${String(channel || "").trim() || "pos"}:kiosk-pc-phone`;
 }
 //#endregion
-export { resolveKioskLayoutState, resolveKioskPromotionRevealTarget };
+export { normalizeKioskNavigableView, resolveKioskLayoutState, resolveKioskProductListPreferencesChannel, resolveKioskPromotionRevealTarget };

package/es/components/bigSale/templates/index.js

@@ -7,7 +7,7 @@ import React from "react";
 /**
 * BigSale 模板渲染器：Base 负责外层容器与数据组装，模板只负责区域组合。
 */
-function BigSaleTemplateRenderer({ tmpl = "standard", isActive = true, osKey, productListPreferencesChannel, context, mode, variant, productLoadParams, businessCode, bookingConfigParams, hideSelectFloorMapResourceAction, productDisplayConfig, productCatalogSessionKey, productCatalogReady, saleDetailTemplate, saleDetailModuleConfig, orderId, locale, saleDetailWrapperProps, saleDetailHeaderSlot, rightActionBarClose, onOrderComplete, externalActionRequest, onExternalActionAccepted, onExternalPaymentSettled }) {
+function BigSaleTemplateRenderer({ tmpl = "standard", isActive = true, osKey, productListPreferencesChannel, context, mode, variant, productLoadParams, businessCode, bookingConfigParams, hideSelectFloorMapResourceAction, productDisplayConfig, productCatalogSessionKey, productCatalogReady, kioskShellLayout, saleDetailTemplate, saleDetailModuleConfig, orderId, locale, saleDetailWrapperProps, saleDetailHeaderSlot, rightActionBarClose, onOrderComplete, externalActionRequest, onExternalActionAccepted, onExternalPaymentSettled }) {
 	switch (tmpl) {
 		case "HDLKiosk": return /* @__PURE__ */ React.createElement(HDLKioskBigSaleTemplate, {
 			isActive,
@@ -24,6 +24,7 @@ function BigSaleTemplateRenderer({ tmpl = "standard", isActive = true, osKey, pr
 		case "kiosk": return /* @__PURE__ */ React.createElement(KioskBigSaleTemplate, {
 			isActive,
 			osKey,
+			productListPreferencesChannel,
 			context,
 			mode,
 			variant,
@@ -34,6 +35,7 @@ function BigSaleTemplateRenderer({ tmpl = "standard", isActive = true, osKey, pr
 			productDisplayConfig,
 			productCatalogSessionKey,
 			productCatalogReady,
+			kioskShellLayout,
 			saleDetailTemplate,
 			saleDetailModuleConfig,
 			orderId,

package/es/components/bigSale/types.d.ts

@@ -4,6 +4,7 @@ import { BaseResponsiveProps } from "../../responsive/type.js";
 import { ILoadProductsParams, SalesSdkCartContextValue, SalesSdkContextValue, SalesSdkCustomerContextValue, SalesSdkProductsContextValue, SalesSdkProviderProps, SalesSdkSummaryContextValue } from "../../plus/salesSdk/types.js";
 import { SalesSdkBookingContextValue } from "../../plus/salesSdk/context/SalesSdkBookingContext.js";
 import { SaleDetailModuleConfig, SaleDetailOrderCompletePayload, SaleDetailTemplate, SaleOrderExternalPaymentResult } from "../../plus/saleDetail/types.js";
+import { KioskShellLayout } from "../kioskSale/resolveKioskPresentation.js";
 import { BigSaleSelectionFlowScene } from "./selectionFlowConfig.js";
 import React from "react";
 
@@ -55,6 +56,8 @@ interface BigSaleBaseProps extends BaseResponsiveProps {
   productCatalogSessionKey?: string;
   /** 当前业务的商品目录配置是否已就绪；false 时只渲染 UI，不发商品请求。 */
   productCatalogReady?: boolean;
+  /** Kiosk 模板的页面外壳布局；只影响容器结构，不改变内容 variant。 */
+  kioskShellLayout?: KioskShellLayout;
   saleDetailTemplate?: SaleDetailTemplate;
   saleDetailModuleConfig?: SaleDetailModuleConfig;
   autoCreate?: boolean;

package/es/components/kioskSale/resolveKioskPresentation.d.ts

@@ -0,0 +1,4 @@
+//#region src/components/kioskSale/resolveKioskPresentation.d.ts
+type KioskShellLayout = 'single-screen' | 'pc-wide-sidebar';
+//#endregion
+export { KioskShellLayout };

package/es/components/kioskSale/resolveKioskPresentation.js

@@ -17,8 +17,9 @@ function resolveKioskPresentation(platform, requestedVariant) {
 	switch (normalizedPlatform) {
 		case "pc": return {
 			platform: "pc",
-			variant: "desktop",
+			variant: "phone",
 			productDetailVariant: "desktop",
+			kioskShellLayout: "pc-wide-sidebar",
 			productDetailPresentationPlatform: "default",
 			mergeBookingLinesForDisplay: true,
 			enableCustomerAuthHost: false
@@ -27,6 +28,7 @@ function resolveKioskPresentation(platform, requestedVariant) {
 			platform: "h5",
 			variant: "phone",
 			productDetailVariant: "phone",
+			kioskShellLayout: "single-screen",
 			productDetailPresentationPlatform: "default",
 			mergeBookingLinesForDisplay: true,
 			enableCustomerAuthHost: false
@@ -35,6 +37,7 @@ function resolveKioskPresentation(platform, requestedVariant) {
 			platform: "kiosk",
 			variant: "phone",
 			productDetailVariant: "phone",
+			kioskShellLayout: "single-screen",
 			productDetailPresentationPlatform: "kiosk",
 			mergeBookingLinesForDisplay: false,
 			enableCustomerAuthHost: true
@@ -42,6 +45,7 @@ function resolveKioskPresentation(platform, requestedVariant) {
 		default: return {
 			variant: normalizedVariant,
 			productDetailVariant: normalizedVariant,
+			kioskShellLayout: "single-screen",
 			productDetailPresentationPlatform: "kiosk",
 			mergeBookingLinesForDisplay: false,
 			enableCustomerAuthHost: true

package/es/plus/salesSdk/allergy/AllergySelectionModal.less

@@ -250,7 +250,7 @@
   .sales-sdk-allergy-dialog__waiting {
     display: grid;
     width: 100%;
-    min-height: 116px;
+    min-height: 90px;
     place-items: center;
     margin-top: 34px;
     border-radius: 999px;

package/lib/components/bigSale/Base.js

@@ -12,7 +12,7 @@ const DEFAULT_MODE = "ticket";
 /**
 * BigSaleBase 位于 SalesSdkProvider 内部，负责把 SDK 数据分发给商品列表和 SaleDetailBase。
 */
-function BigSaleBase({ isActive = true, osKey, saleDetailHeaderSlot, rightActionBarClose, overlaySlot, className, style, mode = DEFAULT_MODE, tmpl, template = "standard", variant = "desktop", productLoadParams, businessCode, bookingConfigParams, hideSelectFloorMapResourceAction, productDisplayConfig, productCatalogSessionKey, productCatalogReady, saleDetailTemplate, saleDetailModuleConfig, autoCreate = true, orderId, locale, saleDetailWrapperProps, cartProductsPerRow, showClient, onOrderComplete, externalActionRequest, onExternalActionAccepted, onExternalPaymentSettled }) {
+function BigSaleBase({ isActive = true, osKey, saleDetailHeaderSlot, rightActionBarClose, overlaySlot, className, style, mode = DEFAULT_MODE, tmpl, template = "standard", variant = "desktop", productLoadParams, businessCode, bookingConfigParams, hideSelectFloorMapResourceAction, productDisplayConfig, productCatalogSessionKey, productCatalogReady, kioskShellLayout, saleDetailTemplate, saleDetailModuleConfig, autoCreate = true, orderId, locale, saleDetailWrapperProps, cartProductsPerRow, showClient, onOrderComplete, externalActionRequest, onExternalActionAccepted, onExternalPaymentSettled }) {
 	var _context$booking$getB, _context$booking, _context$booking$getB2;
 	const context = require_useBigSaleContext.useBigSaleContext();
 	const currentTemplate = tmpl || template || "standard";
@@ -66,6 +66,7 @@ function BigSaleBase({ isActive = true, osKey, saleDetailHeaderSlot, rightAction
 		productDisplayConfig,
 		productCatalogSessionKey,
 		productCatalogReady,
+		kioskShellLayout,
 		saleDetailTemplate,
 		saleDetailModuleConfig: resolvedSaleDetailModuleConfig,
 		orderId,

package/lib/components/bigSale/components/KioskCartCapsule/index.js

@@ -10,7 +10,7 @@ classnames = require_runtime.__toESM(classnames);
 let _ant_design_icons = require("@ant-design/icons");
 require("./index.less");
 //#region src/components/bigSale/components/KioskCartCapsule/index.tsx
-function KioskCartCapsule({ backDisabled = false, checkoutLoading = false, context, isCartActive, isPromotionVisible = false, locale, onAddNote, onBack, onCheckout, onTogglePromotion, onToggleCart, presentation = "floating", promotionAppliedCount = 0 }) {
+function KioskCartCapsule({ backDisabled = false, catalogPrimaryAction = "toggle-cart", checkoutLoading = false, context, isCartActive, isPromotionVisible = false, locale, onAddNote, onBack, onCheckout, onTogglePromotion, onToggleCart, presentation = "floating", promotionAppliedCount = 0, showCatalogCartAction = true, showCatalogNoteAction = false }) {
 	const cartView = (0, react.useMemo)(() => {
 		var _ref, _ref2, _context$cart$items$l, _context$cart$items, _context$cart$booking, _context$cart$booking2, _tempOrder$note;
 		const tempOrder = require_utils.resolveSaleDetailTempOrder(context.sales, context.cart);
@@ -37,17 +37,19 @@ function KioskCartCapsule({ backDisabled = false, checkoutLoading = false, conte
 		context.summary.summary,
 		locale
 	]);
-	const primaryActionText = _pisell_utils.locales.getText(isCartActive ? "pisell2.big-sale.kiosk.checkout" : "pisell2.big-sale.kiosk.next");
+	const isCatalogCheckoutAction = !isCartActive && catalogPrimaryAction === "checkout";
+	const isCheckoutPending = checkoutLoading && (isCartActive || isCatalogCheckoutAction);
+	const primaryActionText = _pisell_utils.locales.getText(isCartActive || isCatalogCheckoutAction ? "pisell2.big-sale.kiosk.checkout" : "pisell2.big-sale.kiosk.next");
 	const { isSidebarPresentation, normalizedPromotionAppliedCount, shouldShowNoteButton, shouldShowPromotionBadge, shouldShowPromotionButton, shouldShowTotal } = require_viewModel.resolveKioskCartCapsuleViewModel({
 		isCartActive,
 		isPromotionVisible,
 		onAddNote,
 		onTogglePromotion,
 		presentation,
-		promotionAppliedCount
+		promotionAppliedCount,
+		showCatalogNoteAction
 	});
 	const promotionActionText = _pisell_utils.locales.getText("pisell2.big-sale.kiosk.promotions");
-	const isCheckoutPending = isCartActive && checkoutLoading;
 	return /* @__PURE__ */ react.default.createElement("div", { className: (0, classnames.default)("pisell-kiosk-cart-capsule", {
 		"pisell-kiosk-cart-capsule--cart": isCartActive,
 		"pisell-kiosk-cart-capsule--catalog": !isCartActive,
@@ -83,7 +85,7 @@ function KioskCartCapsule({ backDisabled = false, checkoutLoading = false, conte
 	}, /* @__PURE__ */ react.default.createElement(_ant_design_icons.PercentageOutlined, null), /* @__PURE__ */ react.default.createElement("span", { className: "pisell-kiosk-cart-capsule__promotion-label" }, promotionActionText), shouldShowPromotionBadge ? /* @__PURE__ */ react.default.createElement("span", {
 		"aria-hidden": "true",
 		className: "pisell-kiosk-cart-capsule__promotion-badge"
-	}, normalizedPromotionAppliedCount > 99 ? "99+" : normalizedPromotionAppliedCount) : null) : null, !isCartActive ? /* @__PURE__ */ react.default.createElement("button", {
+	}, normalizedPromotionAppliedCount > 99 ? "99+" : normalizedPromotionAppliedCount) : null) : null, !isCartActive && showCatalogCartAction ? /* @__PURE__ */ react.default.createElement("button", {
 		"aria-label": _pisell_utils.locales.getText("pisell2.big-sale.kiosk.open-cart"),
 		className: "pisell-kiosk-cart-capsule__cart-button",
 		disabled: !cartView.hasItems,
@@ -95,13 +97,13 @@ function KioskCartCapsule({ backDisabled = false, checkoutLoading = false, conte
 	}, cartView.itemCount)), /* @__PURE__ */ react.default.createElement("span", { className: "pisell-kiosk-cart-capsule__label" }, _pisell_utils.locales.getText("pisell2.big-sale.kiosk.cart"))) : null, /* @__PURE__ */ react.default.createElement("button", {
 		"aria-label": primaryActionText,
 		className: (0, classnames.default)("pisell-kiosk-cart-capsule__checkout-button", {
-			"pisell-kiosk-cart-capsule__checkout-button--next": !isCartActive,
+			"pisell-kiosk-cart-capsule__checkout-button--next": !isCartActive && !isCatalogCheckoutAction,
 			"pisell-kiosk-cart-capsule__checkout-button--loading": isCheckoutPending
 		}),
 		"aria-busy": isCheckoutPending || void 0,
 		disabled: !cartView.hasItems || isCheckoutPending,
 		type: "button",
-		onClick: isCartActive ? onCheckout : onToggleCart
+		onClick: isCartActive || isCatalogCheckoutAction ? onCheckout : onToggleCart
 	}, /* @__PURE__ */ react.default.createElement("span", { className: "pisell-kiosk-cart-capsule__checkout-content" }, isCheckoutPending ? /* @__PURE__ */ react.default.createElement("span", {
 		"aria-hidden": "true",
 		className: "pisell-kiosk-cart-capsule__checkout-spinner"