@pisell/private-materials 6.12.167 → 6.12.169

package/lib/components/HDLKiosk/slices/catalog/Screen/index.less

@@ -1,5 +1,8 @@
 .pisell-hdl-kiosk {
   .hdl-catalog-screen {
+    --hdl-catalog-menu-font-level-1: 24px;
+    --hdl-catalog-menu-font-level-2: 20px;
+    --hdl-catalog-menu-font-level-3: 18px;
     position: relative;
     width: 100%;
     height: 100%;
@@ -9,16 +12,14 @@
   }
 
   .hdl-catalog-layout {
-    display: grid;
+    display: flex;
     width: 100%;
     height: 100%;
     min-height: 0;
-    grid-template-columns: clamp(96px, 18vw, 180px) minmax(0, 1fr);
     overflow: hidden;
   }
 
   .hdl-catalog-layout > .pisell-kiosk-category-sidebar {
-    width: 100%;
     border-right-color: rgba(255, 255, 255, 0.1);
     background: #202735;
     --pisell-kiosk-cart-capsule-reserved-space: max(
@@ -49,14 +50,17 @@
     .pisell-kiosk-category-sidebar__tabbar
     .text-card {
     box-sizing: border-box;
+    min-height: 80px !important;
     justify-content: flex-start !important;
+    gap: 10px !important;
     border: 1px solid rgba(255, 255, 255, 0.1) !important;
     border-radius: 14px !important;
+    padding: 10px 16px !important;
     background: rgba(255, 255, 255, 0.06) !important;
     color: rgba(255, 255, 255, 0.78) !important;
-    font-size: 29px;
-    font-weight: 950;
-    line-height: 1.05;
+    font-size: var(--hdl-catalog-menu-font-level-1);
+    font-weight: 850;
+    line-height: 1.15;
     text-align: left;
   }
 
@@ -65,9 +69,9 @@
     .text-card
     .text-card__content {
     color: rgba(255, 255, 255, 0.78) !important;
-    font-size: 29px !important;
-    font-weight: 950 !important;
-    line-height: 1.05;
+    font-size: var(--hdl-catalog-menu-font-level-1) !important;
+    font-weight: 850 !important;
+    line-height: 1.15;
     text-align: left !important;
   }
 
@@ -84,6 +88,16 @@
     .text-card
     .anticon {
     color: rgba(255, 255, 255, 0.86) !important;
+    font-size: 24px !important;
+  }
+
+  .hdl-catalog-layout
+    .pisell-kiosk-category-sidebar__tabbar
+    .text-card
+    .text-card__icon
+    img {
+    width: 24px !important;
+    height: 24px !important;
   }
 
   .hdl-catalog-layout
@@ -130,10 +144,14 @@
     .pisell-kiosk-category-sidebar__tabbar
     .pisell-tabbar__level--2
     .text-card {
+    min-height: 68px !important;
+    gap: 8px !important;
     border-radius: 12px !important;
+    padding: 8px 14px !important;
     background: transparent !important;
-    font-size: 21px;
+    font-size: var(--hdl-catalog-menu-font-level-2);
     font-weight: 850;
+    line-height: 1.15;
   }
 
   .hdl-catalog-layout
@@ -141,18 +159,23 @@
     .pisell-tabbar__level--2
     .text-card
     .text-card__content {
-    font-size: 21px !important;
+    font-size: var(--hdl-catalog-menu-font-level-2) !important;
     font-weight: 850 !important;
+    line-height: 1.15;
   }
 
   .hdl-catalog-layout
     .pisell-kiosk-category-sidebar__tabbar
     .pisell-tabbar__level--3
     .text-card {
+    min-height: 60px !important;
+    gap: 8px !important;
     border-radius: 10px !important;
+    padding: 7px 12px !important;
     background: transparent !important;
-    font-size: 18px;
+    font-size: var(--hdl-catalog-menu-font-level-3);
     font-weight: 800;
+    line-height: 1.15;
   }
 
   .hdl-catalog-layout
@@ -160,8 +183,45 @@
     .pisell-tabbar__level--3
     .text-card
     .text-card__content {
-    font-size: 18px !important;
+    font-size: var(--hdl-catalog-menu-font-level-3) !important;
     font-weight: 800 !important;
+    line-height: 1.15;
+  }
+
+  .hdl-catalog-layout
+    .pisell-kiosk-category-sidebar__tabbar
+    .pisell-tabbar__level--2
+    .text-card
+    :is(.pisell-icon, .iconfont, .anticon) {
+    font-size: 20px !important;
+  }
+
+  .hdl-catalog-layout
+    .pisell-kiosk-category-sidebar__tabbar
+    .pisell-tabbar__level--2
+    .text-card
+    .text-card__icon
+    img {
+    width: 20px !important;
+    height: 20px !important;
+  }
+
+  .hdl-catalog-layout
+    .pisell-kiosk-category-sidebar__tabbar
+    .pisell-tabbar__level--3
+    .text-card
+    :is(.pisell-icon, .iconfont, .anticon) {
+    font-size: 18px !important;
+  }
+
+  .hdl-catalog-layout
+    .pisell-kiosk-category-sidebar__tabbar
+    .pisell-tabbar__level--3
+    .text-card
+    .text-card__icon
+    img {
+    width: 18px !important;
+    height: 18px !important;
   }
 
   .hdl-catalog-layout
@@ -206,6 +266,7 @@
   .hdl-catalog-main {
     position: relative;
     display: flex;
+    flex: 1 1 0;
     min-width: 0;
     min-height: 0;
     flex-direction: column;

package/lib/components/HDLKiosk/slices/catalog/slice.js

@@ -1,11 +1,11 @@
 const require_defineSlice = require("../../kernel/application/defineSlice.js");
-const require_cart = require("../../app/operations/cart.js");
+const require_operations = require("../../app/operations.js");
 //#region src/components/HDLKiosk/slices/catalog/slice.ts
 /** Catalog Slice：声明补充商品加购；商品浏览动作不进入 Workflow。 */
 const catalogSlice = require_defineSlice.defineSlice({
 	id: "catalog",
-	screen: { id: "catalog" },
-	commands: { addProduct: require_cart.cartAddProductOperation },
+	surface: { id: "catalog" },
+	commands: { addProduct: require_operations.cartAddProductOperation },
 	intents: { complete: require_defineSlice.intentPrecondition("cart.notEmpty", { navigate: "next" }) }
 });
 //#endregion

package/lib/components/HDLKiosk/slices/customization/Screen/index.js

@@ -1,12 +1,12 @@
 const require_runtime = require("../../../../../_virtual/_rolldown/runtime.js");
 const require_objectSpread2 = require("../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_asyncToGenerator = require("../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
-const require_runtime$1 = require("../../../devices/scale/runtime.js");
 const require_index = require("../../../components/shell/HDLKioskBottomBarHost/index.js");
 const require_index$1 = require("../../../components/shell/HDLKioskOrderSummary/index.js");
 const require_model = require("../../../components/common/HDLKioskSkuOptionsSelection/model.js");
 const require_index$2 = require("../../../components/common/HDLKioskSkuOptionsSelection/index.js");
 const require_product = require("../../../product.js");
+const require_scale = require("../../../ui/scale.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 let _pisell_utils = require("@pisell/utils");
@@ -30,13 +30,10 @@ function getScaleStatusText(scale) {
 	if (scale.error) return _pisell_utils.locales.getText("pisell2.hdl-kiosk.scale-reading-error");
 	if (scale.connectionState === "disconnected") return _pisell_utils.locales.getText("pisell2.hdl-kiosk.scale-disconnected");
 	if (scale.connectionState !== "connected" || !scale.isListening) return _pisell_utils.locales.getText("pisell2.hdl-kiosk.scale-connecting");
-	switch (scale.status) {
-		case "stable": return _pisell_utils.locales.getText("pisell2.hdl-kiosk.scale-stable");
-		case "overload": return _pisell_utils.locales.getText("pisell2.hdl-kiosk.scale-overload");
-		case "negative": return _pisell_utils.locales.getText("pisell2.hdl-kiosk.scale-negative");
-		case "unstable":
-		case null: return _pisell_utils.locales.getText("pisell2.hdl-kiosk.scale-unstable");
-	}
+	if (scale.status === "overload") return _pisell_utils.locales.getText("pisell2.hdl-kiosk.scale-overload");
+	if (scale.status === "negative") return _pisell_utils.locales.getText("pisell2.hdl-kiosk.scale-negative");
+	if (!scale.hasLiveSample) return _pisell_utils.locales.getText("pisell2.hdl-kiosk.scale-connecting");
+	return _pisell_utils.locales.getText(scale.status === "stable" ? "pisell2.hdl-kiosk.scale-stable" : "pisell2.hdl-kiosk.scale-unstable");
 }
 function initialSelections(product) {
 	if (!product) return [];
@@ -74,6 +71,19 @@ function formatMoney(value, currencySymbol) {
 	const amount = value.toDecimalPlaces(2).toNumber();
 	return String((0, _pisell_utils.formatAmount)(amount, 2, currencySymbol || ""));
 }
+function resolveScaleMeasurement(scale, productFacts, minimumWeightKg) {
+	var _scale$grossWeightKg, _productFacts$fixedTa, _productFacts$fixedTa2;
+	const gross = new decimal_js.default((_scale$grossWeightKg = scale.grossWeightKg) !== null && _scale$grossWeightKg !== void 0 ? _scale$grossWeightKg : NaN);
+	const tare = (_productFacts$fixedTa = productFacts === null || productFacts === void 0 || (_productFacts$fixedTa2 = productFacts.fixedTare) === null || _productFacts$fixedTa2 === void 0 ? void 0 : _productFacts$fixedTa2.valueKg) !== null && _productFacts$fixedTa !== void 0 ? _productFacts$fixedTa : new decimal_js.default(0);
+	const numbersValid = gross.isFinite() && tare.isFinite() && !gross.isNegative() && !tare.isNegative();
+	const net = numbersValid ? decimal_js.default.max(gross.minus(tare), 0) : new decimal_js.default(0);
+	return {
+		gross,
+		tare,
+		net,
+		valid: numbersValid && scale.active && scale.hasLiveSample && scale.isListening && scale.connectionState === "connected" && scale.status === "stable" && !scale.error && net.greaterThanOrEqualTo(minimumWeightKg) && (productFacts === null || productFacts === void 0 ? void 0 : productFacts.available) === true
+	};
+}
 function BackIcon() {
 	return /* @__PURE__ */ react.default.createElement("svg", {
 		viewBox: "0 0 24 24",
@@ -162,7 +172,8 @@ function ProductFallback() {
 }
 function CustomizationScreen({ product, loading, errorReference, errorMessage, busy, syncing, canGoBack, minimumWeightKg, orderBar, send }) {
 	var _productFacts$product, _orderBar$primaryLine, _orderBar$primaryLine2, _orderBar$primaryLine3, _orderBar$primaryLine4, _orderBar$primaryLine7, _productFacts$unitPri, _orderBar$primaryLine9, _orderBar$primaryLine11;
-	const scale = require_runtime$1.useHDLScaleSnapshot();
+	const scaleRuntime = require_scale.useHDLScaleRuntime();
+	const scale = require_scale.useHDLScaleSnapshot();
 	const skuOptionsRef = (0, react.useRef)(null);
 	const hydratedDraftKeyRef = (0, react.useRef)();
 	const [skuValue, setSkuValue] = (0, react.useState)(() => initialSkuValue(product));
@@ -182,30 +193,21 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 		(_orderBar$primaryLine7 = orderBar.primaryLine) === null || _orderBar$primaryLine7 === void 0 ? void 0 : _orderBar$primaryLine7.skuValue,
 		product
 	]);
-	const measurement = (0, react.useMemo)(() => {
-		var _scale$grossWeightKg, _productFacts$fixedTa, _productFacts$fixedTa2;
-		const gross = new decimal_js.default((_scale$grossWeightKg = scale.grossWeightKg) !== null && _scale$grossWeightKg !== void 0 ? _scale$grossWeightKg : NaN);
-		const tare = (_productFacts$fixedTa = productFacts === null || productFacts === void 0 || (_productFacts$fixedTa2 = productFacts.fixedTare) === null || _productFacts$fixedTa2 === void 0 ? void 0 : _productFacts$fixedTa2.valueKg) !== null && _productFacts$fixedTa !== void 0 ? _productFacts$fixedTa : new decimal_js.default(0);
-		const numbersValid = gross.isFinite() && tare.isFinite() && !gross.isNegative() && !tare.isNegative();
-		const net = numbersValid ? decimal_js.default.max(gross.minus(tare), 0) : new decimal_js.default(0);
-		return {
-			gross,
-			tare,
-			net,
-			valid: numbersValid && scale.active && scale.isListening && scale.connectionState === "connected" && scale.status === "stable" && !scale.error && net.greaterThanOrEqualTo(minimumWeightKg) && (productFacts === null || productFacts === void 0 ? void 0 : productFacts.available) === true
-		};
-	}, [
+	const measurement = (0, react.useMemo)(() => resolveScaleMeasurement(scale, productFacts, minimumWeightKg), [
 		minimumWeightKg,
 		productFacts,
 		scale
 	]);
 	const statusText = getScaleStatusText(scale);
-	const stable = scale.status === "stable" && scale.connectionState === "connected" && scale.isListening && !scale.error;
+	const readingInvalid = scale.status === "overload" || scale.status === "negative";
+	const stable = scale.status === "stable" && scale.hasLiveSample && scale.connectionState === "connected" && scale.isListening && !scale.error;
 	const unitPricePerStandardWeight = (_productFacts$unitPri = productFacts === null || productFacts === void 0 ? void 0 : productFacts.unitPricePerKg) !== null && _productFacts$unitPri !== void 0 ? _productFacts$unitPri : new decimal_js.default(0);
 	const amountText = orderBar.confirmedAmount !== void 0 ? formatMoney(new decimal_js.default(orderBar.confirmedAmount), orderBar.currencySymbol) : "—";
 	const submit = (0, react.useCallback)(require_asyncToGenerator._asyncToGenerator(function* () {
-		var _skuOptionsRef$curren2, _skuOptionsRef$curren3, _orderBar$primaryLine8, _scale$updatedAt;
-		if (!productFacts || !measurement.valid || busy || syncing) return;
+		var _skuOptionsRef$curren2, _skuOptionsRef$curren3, _orderBar$primaryLine8, _currentScale$updated;
+		const currentScale = scaleRuntime.getSnapshot();
+		const currentMeasurement = resolveScaleMeasurement(currentScale, productFacts, minimumWeightKg);
+		if (!productFacts || !currentMeasurement.valid || busy || syncing) return;
 		try {
 			var _skuOptionsRef$curren;
 			yield (_skuOptionsRef$curren = skuOptionsRef.current) === null || _skuOptionsRef$curren === void 0 ? void 0 : _skuOptionsRef$curren.validate();
@@ -222,33 +224,30 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 				existingLineId: (_orderBar$primaryLine8 = orderBar.primaryLine) === null || _orderBar$primaryLine8 === void 0 ? void 0 : _orderBar$primaryLine8.lineId,
 				skuValue: submittedSkuValue,
 				measurement: {
-					grossWeightKg: formatWeight(measurement.gross),
-					tareWeightKg: formatWeight(measurement.tare),
-					netWeightKg: formatWeight(measurement.net),
+					grossWeightKg: formatWeight(currentMeasurement.gross),
+					tareWeightKg: formatWeight(currentMeasurement.tare),
+					netWeightKg: formatWeight(currentMeasurement.net),
 					source: "auto",
 					status: "stable",
-					measuredAt: (_scale$updatedAt = scale.updatedAt) !== null && _scale$updatedAt !== void 0 ? _scale$updatedAt : Date.now()
+					measuredAt: (_currentScale$updated = currentScale.updatedAt) !== null && _currentScale$updated !== void 0 ? _currentScale$updated : Date.now()
 				}
 			}
 		});
 	}), [
 		busy,
-		measurement.valid,
-		measurement.gross,
-		measurement.net,
-		measurement.tare,
+		minimumWeightKg,
 		(_orderBar$primaryLine9 = orderBar.primaryLine) === null || _orderBar$primaryLine9 === void 0 ? void 0 : _orderBar$primaryLine9.lineId,
 		productFacts,
-		scale.updatedAt,
+		scaleRuntime,
 		skuValue,
 		send,
 		syncing
 	]);
-	const skipPrimaryProduct = (0, react.useCallback)(() => {
+	const omitPrimaryProduct = (0, react.useCallback)(() => {
 		var _orderBar$primaryLine10;
 		send({
 			kind: "intent",
-			intent: "skip",
+			intent: "omit",
 			operationInput: { lineId: (_orderBar$primaryLine10 = orderBar.primaryLine) === null || _orderBar$primaryLine10 === void 0 ? void 0 : _orderBar$primaryLine10.lineId }
 		});
 	}, [(_orderBar$primaryLine11 = orderBar.primaryLine) === null || _orderBar$primaryLine11 === void 0 ? void 0 : _orderBar$primaryLine11.lineId, send]);
@@ -317,9 +316,9 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 		src: productFacts.imageUrl,
 		alt: ""
 	}) : /* @__PURE__ */ react.default.createElement(ProductFallback, null)), /* @__PURE__ */ react.default.createElement("div", { className: "hdl-customization-product__copy" }, /* @__PURE__ */ react.default.createElement("p", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.customization-product-eyebrow")), /* @__PURE__ */ react.default.createElement("h1", { id: "hdl-customization-title" }, (productFacts === null || productFacts === void 0 ? void 0 : productFacts.name) || _pisell_utils.locales.getText("pisell2.hdl-kiosk.weighted-product-loading")), /* @__PURE__ */ react.default.createElement("strong", null, productFacts ? formatMoney(unitPricePerStandardWeight, orderBar.currencySymbol) : "—", " ", /* @__PURE__ */ react.default.createElement("small", null, "/", STANDARD_WEIGHT_UNIT_LABEL)))), /* @__PURE__ */ react.default.createElement("aside", { className: "hdl-customization-weight" }, /* @__PURE__ */ react.default.createElement("div", { className: "hdl-customization-weight__status" }, /* @__PURE__ */ react.default.createElement("span", {
-		className: `hdl-customization-weight__dot${stable ? " is-stable" : ""}`,
+		className: `hdl-customization-weight__dot${readingInvalid ? " is-error" : stable ? " is-stable" : ""}`,
 		"aria-hidden": "true"
-	}), /* @__PURE__ */ react.default.createElement("div", null, /* @__PURE__ */ react.default.createElement("strong", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.customization-weighing")), /* @__PURE__ */ react.default.createElement("small", null, statusText)), /* @__PURE__ */ react.default.createElement(ScaleIcon, null)), /* @__PURE__ */ react.default.createElement("dl", null, /* @__PURE__ */ react.default.createElement("div", null, /* @__PURE__ */ react.default.createElement("dt", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.customization-unit-price")), /* @__PURE__ */ react.default.createElement("dd", null, productFacts ? formatMoney(unitPricePerStandardWeight, orderBar.currencySymbol) : "—", " ", /* @__PURE__ */ react.default.createElement("small", null, "/", STANDARD_WEIGHT_UNIT_LABEL))), /* @__PURE__ */ react.default.createElement("div", { className: "is-featured" }, /* @__PURE__ */ react.default.createElement("dt", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.gross-weight")), /* @__PURE__ */ react.default.createElement("dd", null, measurement.gross.isFinite() ? formatWeight(measurement.gross) : "—", " ", "kg")), /* @__PURE__ */ react.default.createElement("div", null, /* @__PURE__ */ react.default.createElement("dt", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.tare-weight")), /* @__PURE__ */ react.default.createElement("dd", null, formatWeight(measurement.tare), " kg")), /* @__PURE__ */ react.default.createElement("div", null, /* @__PURE__ */ react.default.createElement("dt", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.net-weight")), /* @__PURE__ */ react.default.createElement("dd", null, formatWeight(measurement.net), " kg"))))), /* @__PURE__ */ react.default.createElement("div", { className: "hdl-customization-options" }, product && productFacts ? /* @__PURE__ */ react.default.createElement(require_index$2.default, {
+	}), /* @__PURE__ */ react.default.createElement("div", null, /* @__PURE__ */ react.default.createElement("strong", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.customization-weighing")), /* @__PURE__ */ react.default.createElement("small", null, statusText)), /* @__PURE__ */ react.default.createElement(ScaleIcon, null)), /* @__PURE__ */ react.default.createElement("dl", null, /* @__PURE__ */ react.default.createElement("div", null, /* @__PURE__ */ react.default.createElement("dt", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.customization-unit-price")), /* @__PURE__ */ react.default.createElement("dd", null, productFacts ? formatMoney(unitPricePerStandardWeight, orderBar.currencySymbol) : "—", " ", /* @__PURE__ */ react.default.createElement("small", null, "/", STANDARD_WEIGHT_UNIT_LABEL))), /* @__PURE__ */ react.default.createElement("div", { className: "is-featured" }, /* @__PURE__ */ react.default.createElement("dt", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.gross-weight")), /* @__PURE__ */ react.default.createElement("dd", null, readingInvalid ? "Err." : `${measurement.gross.isFinite() ? formatWeight(measurement.gross) : "—"} kg`)), /* @__PURE__ */ react.default.createElement("div", null, /* @__PURE__ */ react.default.createElement("dt", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.tare-weight")), /* @__PURE__ */ react.default.createElement("dd", null, formatWeight(measurement.tare), " kg")), /* @__PURE__ */ react.default.createElement("div", null, /* @__PURE__ */ react.default.createElement("dt", null, _pisell_utils.locales.getText("pisell2.hdl-kiosk.net-weight")), /* @__PURE__ */ react.default.createElement("dd", null, readingInvalid ? "Err." : `${formatWeight(measurement.net)} kg`))))), /* @__PURE__ */ react.default.createElement("div", { className: "hdl-customization-options" }, product && productFacts ? /* @__PURE__ */ react.default.createElement(require_index$2.default, {
 		ref: skuOptionsRef,
 		product,
 		value: skuValue,
@@ -335,7 +334,7 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 		type: "button",
 		className: "hdl-customization-skip",
 		disabled: busy || syncing,
-		onClick: skipPrimaryProduct
+		onClick: omitPrimaryProduct
 	}, _pisell_utils.locales.getText("pisell2.hdl-kiosk.customization-skip")));
 }
 //#endregion

package/lib/components/HDLKiosk/slices/customization/Screen/index.less

@@ -122,6 +122,11 @@
     box-shadow: 0 0 0 5px rgba(18, 183, 106, 0.16);
   }
 
+  .hdl-customization-weight__dot.is-error {
+    background: #f04438;
+    box-shadow: 0 0 0 5px rgba(240, 68, 56, 0.16);
+  }
+
   .hdl-customization-weight__status > div {
     min-width: 0;
     flex: 1;

package/lib/components/HDLKiosk/slices/customization/slice.js

@@ -1,15 +1,14 @@
 const require_defineSlice = require("../../kernel/application/defineSlice.js");
-const require_cart = require("../../app/operations/cart.js");
-const require_operation = require("./operation.js");
+const require_operations = require("../../app/operations.js");
 //#region src/components/HDLKiosk/slices/customization/slice.ts
 /** Customization Slice：Next 时才提交本地称重草稿；加购成功后才离开。 */
 const customizationSlice = require_defineSlice.defineSlice({
 	id: "customization",
-	screen: { id: "customization" },
-	commands: { removePrimaryProduct: require_cart.cartRemoveLineOperation },
+	surface: { id: "customization" },
+	commands: { removePrimaryProduct: require_operations.cartRemoveLineOperation },
 	intents: {
-		complete: require_defineSlice.effect(require_operation.productSyncPrimaryWeightedProductOperation, { navigate: "next" }),
-		skip: require_defineSlice.effect(require_operation.productRemovePrimaryProductOperation, { navigate: "next" })
+		complete: require_defineSlice.effect(require_operations.productSyncPrimaryWeightedProductOperation, { navigate: "next" }),
+		omit: require_defineSlice.effect(require_operations.productRemovePrimaryProductOperation, { navigate: "next" })
 	}
 });
 //#endregion

package/lib/components/HDLKiosk/slices/fulfillment/slice.js

@@ -1,11 +1,11 @@
 const require_defineSlice = require("../../kernel/application/defineSlice.js");
-const require_fulfillment = require("../../app/operations/fulfillment.js");
+const require_operations = require("../../app/operations.js");
 //#region src/components/HDLKiosk/slices/fulfillment/slice.ts
 /** Fulfillment Slice：声明就餐方式完成条件与回退语义；不依赖 React 或 Host 实现。 */
 const fulfillmentSlice = require_defineSlice.defineSlice({
 	id: "fulfillment",
-	screen: { id: "fulfillment" },
-	intents: { complete: require_defineSlice.effect(require_fulfillment.setFulfillmentOperation, {
+	surface: { id: "fulfillment" },
+	intents: { complete: require_defineSlice.effect(require_operations.setFulfillmentOperation, {
 		precondition: "fulfillment.selected",
 		navigate: "next"
 	}) }

package/lib/components/HDLKiosk/slices/fulfillment/view.js

@@ -6,7 +6,7 @@ react = require_runtime.__toESM(react);
 //#region src/components/HDLKiosk/slices/fulfillment/view.tsx
 /** Fulfillment 展示装配：组合页面、订单摘要与购物车投影；不执行订单写入。 */
 const renderFulfillment = ({ node, viewSnapshot, sales, businessMode, send }) => /* @__PURE__ */ react.default.createElement(require_index.FulfillmentScreen, {
-	model: require_utils.createActivityScreenModel(node.screenId, viewSnapshot, node, sales, businessMode),
+	model: require_utils.createActivityScreenModel(node.surfaceId, viewSnapshot, node, sales, businessMode),
 	orderBar: require_utils.createOrderBarModel(sales),
 	send
 });

package/lib/components/HDLKiosk/slices/identity/Screen/index.js

@@ -10,7 +10,7 @@ const QR_CELLS = Object.freeze(Array.from({ length: 49 }, (_, index) => index *
 * Quick Order 的前置会员提示页。
 *
 * 宿主可注入认证 UI；未注入时保留 QR / SMS 视觉 fallback。Skip 继续产生
-* identity.skip Intent，由本地 Exit Policy 同步访客后进入下一步。
+* identity.omit Intent，由本地 Exit Policy 同步访客后进入下一步。
 */
 function IdentityScreen({ model, orderBar, send, renderIdentityAuth }) {
 	const [authBusy, setAuthBusy] = (0, react.useState)(false);
@@ -82,7 +82,7 @@ function IdentityScreen({ model, orderBar, send, renderIdentityAuth }) {
 		disabled: busy,
 		onClick: () => send({
 			kind: "intent",
-			intent: "skip",
+			intent: "omit",
 			operationInput: {}
 		})
 	}, _pisell_utils.locales.getText("pisell2.hdl-kiosk.skip")), model.errorReference ? /* @__PURE__ */ react.default.createElement("div", {

package/lib/components/HDLKiosk/slices/identity/slice.js

@@ -1,13 +1,13 @@
 const require_defineSlice = require("../../kernel/application/defineSlice.js");
-const require_operation = require("./operation.js");
+const require_operations = require("../../app/operations.js");
 //#region src/components/HDLKiosk/slices/identity/slice.ts
 /** Identity Slice：声明身份节点的 Intent 与客户同步 Effect；不依赖 React 或 Host 实现。 */
 const identitySlice = require_defineSlice.defineSlice({
 	id: "identity",
-	screen: { id: "identity" },
+	surface: { id: "identity" },
 	intents: {
-		complete: require_defineSlice.effect(require_operation.identitySyncOperation, { navigate: "next" }),
-		skip: require_defineSlice.effect(require_operation.identitySyncOperation, { navigate: "next" })
+		complete: require_defineSlice.effect(require_operations.identitySyncOperation, { navigate: "next" }),
+		omit: require_defineSlice.effect(require_operations.identitySyncOperation, { navigate: "next" })
 	}
 });
 //#endregion

package/lib/components/HDLKiosk/slices/identity/view.js

@@ -6,7 +6,7 @@ react = require_runtime.__toESM(react);
 //#region src/components/HDLKiosk/slices/identity/view.tsx
 /** Identity 展示装配：把统一 View Context 转为本 Slice Screen props；不决定流程目标。 */
 const renderIdentity = ({ node, viewSnapshot, sales, businessMode, renderIdentityAuth, send }) => /* @__PURE__ */ react.default.createElement(require_index.IdentityScreen, {
-	model: require_utils.createActivityScreenModel(node.screenId, viewSnapshot, node, sales, businessMode),
+	model: require_utils.createActivityScreenModel(node.surfaceId, viewSnapshot, node, sales, businessMode),
 	orderBar: require_utils.createOrderBarModel(sales),
 	send,
 	renderIdentityAuth

package/lib/components/HDLKiosk/slices/payment/slice.js

@@ -1,20 +1,20 @@
 const require_defineSlice = require("../../kernel/application/defineSlice.js");
-const require_checkout = require("../../app/operations/checkout.js");
+const require_operations = require("../../app/operations.js");
 //#region src/components/HDLKiosk/slices/payment/slice.ts
 /** Payment Slice：声明卡/现金选择、支付派发与 Host 成功确认；支付不确定不作成功处理。 */
 const paymentMethodSlice = require_defineSlice.defineSlice({
 	id: "paymentMethod",
-	screen: { id: "checkout" },
+	surface: { id: "checkout" },
 	commands: {
-		payEftpos: require_checkout.checkoutPayEftposOperation,
-		requestStaffPaymentApproval: require_checkout.checkoutRequestStaffPaymentApprovalOperation
+		payEftpos: require_operations.checkoutPayEftposOperation,
+		requestStaffPaymentApproval: require_operations.checkoutRequestStaffPaymentApprovalOperation
 	},
 	intents: { complete: require_defineSlice.intentPrecondition("payment.succeeded", { navigate: "next" }) }
 });
 /** 支付完成仍复用 Checkout Screen，仅作为 Workflow 的成功终态。 */
 const paymentCompletedSlice = require_defineSlice.defineSlice({
 	id: "paymentCompleted",
-	screen: { id: "checkout" },
+	surface: { id: "checkout" },
 	intents: {}
 });
 //#endregion

package/lib/components/HDLKiosk/slices/primaryProductPrompt/slice.js

@@ -3,11 +3,11 @@ const require_defineSlice = require("../../kernel/application/defineSlice.js");
 /** 主商品询问 Slice：只表达是否进入称重定制，不承担 Catalog 页面职责。 */
 const primaryProductPromptSlice = require_defineSlice.defineSlice({
 	id: "primaryProductPrompt",
-	screen: { id: "primaryProductPrompt" },
+	surface: { id: "primaryProductPrompt" },
 	presentation: "modal",
 	intents: {
 		complete: require_defineSlice.intentPrecondition("cart.notEmpty", { navigate: "next" }),
-		skip: require_defineSlice.intentPrecondition("cart.notEmpty")
+		omit: require_defineSlice.intentPrecondition("cart.notEmpty")
 	}
 });
 //#endregion

package/lib/components/HDLKiosk/slices/primaryProductPrompt/view.js

@@ -3,13 +3,13 @@ const require_index = require("../catalog/PrimaryProductPromptDialog/index.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 //#region src/components/HDLKiosk/slices/primaryProductPrompt/view.tsx
-/** 主商品询问展示：将用户选择转换为标准 completed/skipped 结果。 */
+/** 主商品询问展示：将用户选择转换为标准 complete/omit 结果。 */
 function PrimaryProductPromptView({ busy, send }) {
 	return /* @__PURE__ */ react.default.createElement(require_index.PrimaryProductPromptDialog, {
 		busy,
 		onDecline: () => send({
 			kind: "intent",
-			intent: "skip"
+			intent: "omit"
 		}),
 		onAccept: () => send({
 			kind: "intent",