@pisell/private-materials 6.3.139 → 6.3.140

package/lib/components/scanOrder/components/Cart/index.js

@@ -37,9 +37,12 @@ var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_shoppingCart = __toESM(require("../../../shoppingCart"));
 var import_context = require("../../context");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_subTotal = __toESM(require("../../../subTotal"));
+var import_Voucher = __toESM(require("../Voucher"));
 var import_index = require("./index.less");
 function Cart(props) {
+  var _a, _b, _c, _d, _e, _f;
   const {
     open,
     onCancel,
@@ -52,16 +55,24 @@ function Cart(props) {
     disabled = false
   } = props;
   const { runModuleAction, refreshViewModel, scanOrderModule } = (0, import_context.useScanOrderContext)();
+  const engineContext = (0, import_useEngineContext.default)();
+  const businessUtils = (_b = (_a = engineContext == null ? void 0 : engineContext.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.businessUtils;
+  const locale = ((_d = (_c = engineContext == null ? void 0 : engineContext.engine) == null ? void 0 : _c.props) == null ? void 0 : _d.locale) || "en";
+  const hasGoodPassApp = !!((_e = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _e.call(businessUtils, "goodpass"));
+  const hasDiscountCardApp = !!((_f = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _f.call(businessUtils, "discountcard"));
+  const showVoucher = hasGoodPassApp || hasDiscountCardApp;
   const isVisible = embedded || open;
   if (!isVisible) return null;
   const [dineInConfig, setDineInConfig] = (0, import_react.useState)(null);
-  const getConfig = async () => {
+  const getConfig = (0, import_react.useCallback)(async () => {
     const otherParams = await runModuleAction("getOtherParams");
     console.log("otherParams >>>>> ", otherParams);
     const dineInConfig2 = (otherParams == null ? void 0 : otherParams.dineInConfig) ?? {};
     setDineInConfig(dineInConfig2);
-  };
-  getConfig();
+  }, [runModuleAction]);
+  (0, import_react.useEffect)(() => {
+    getConfig();
+  }, []);
   const isShowNote = (0, import_react.useMemo)(() => {
     return dineInConfig == null ? void 0 : dineInConfig["sale.allow_item_notes"];
   }, [dineInConfig]);
@@ -75,11 +86,11 @@ function Cart(props) {
     import_utils.locales.getText("pisell2.scan.order.action.confirm.order") || import_utils.locales.getText("pisell2.event.confirm") || "Confirm"
   );
   const subTotalList = (0, import_react.useMemo)(() => {
-    var _a;
+    var _a2;
     const subTotal = Number((summary == null ? void 0 : summary.product_amount) ?? 0);
     const totalTaxFee = Number((summary == null ? void 0 : summary.tax_fee) ?? 0);
     const total = Number((summary == null ? void 0 : summary.total_amount) ?? (summary == null ? void 0 : summary.expect_amount) ?? 0);
-    const tempOrder = (_a = scanOrderModule == null ? void 0 : scanOrderModule.getTempOrder) == null ? void 0 : _a.call(scanOrderModule);
+    const tempOrder = (_a2 = scanOrderModule == null ? void 0 : scanOrderModule.getTempOrder) == null ? void 0 : _a2.call(scanOrderModule);
     const tempSummary = (tempOrder == null ? void 0 : tempOrder.summary) || {};
     const taxTitle = String(
       (tempSummary == null ? void 0 : tempSummary.tax_title) || (summary == null ? void 0 : summary.tax_title) || "GST/Tax"
@@ -89,11 +100,21 @@ function Cart(props) {
     const isPriceIncludeTax = Boolean(
       (tempSummary == null ? void 0 : tempSummary.is_price_include_tax) ?? (tempSummary == null ? void 0 : tempSummary.isPriceIncludeTax) ?? (summary == null ? void 0 : summary.is_price_include_tax)
     );
+    const surchargeItems = ((summary == null ? void 0 : summary.surcharges) || []).filter((s) => Number(s == null ? void 0 : s.amount) > 0).map((s) => {
+      const labelObj = (s == null ? void 0 : s.label) || (s == null ? void 0 : s.name) || {};
+      const label = labelObj[locale] || labelObj.en || labelObj.original || (s == null ? void 0 : s.key) || "";
+      return {
+        key: (s == null ? void 0 : s.key) || `surcharge_${s == null ? void 0 : s.surcharge_id}`,
+        label,
+        value: Number(s == null ? void 0 : s.amount)
+      };
+    });
     return [
       {
         key: "sub_total",
         value: Number.isNaN(subTotal) ? 0 : subTotal
       },
+      ...surchargeItems,
       {
         key: "tax",
         value: Number.isNaN(totalTaxFee) ? 0 : totalTaxFee,
@@ -111,25 +132,58 @@ function Cart(props) {
         bold: true
       }
     ];
-  }, [summary, scanOrderModule]);
+  }, [summary, scanOrderModule, locale]);
   const handleCartChange = async (item, type) => {
-    if (type !== "delete") return;
-    const productId = (item == null ? void 0 : item.product_id) ?? (item == null ? void 0 : item.id) ?? null;
-    const productVariantId = Number((item == null ? void 0 : item.product_variant_id) ?? 0);
-    const identityKey = (item == null ? void 0 : item.identity_key) || (item == null ? void 0 : item.rowKey) || void 0;
-    if (productId === null && Number.isNaN(productVariantId)) return;
-    try {
-      await runModuleAction("removeProductFromOrder", {
+    if (type === "note") {
+      const productId = (item == null ? void 0 : item.product_id) ?? (item == null ? void 0 : item.id) ?? null;
+      const productVariantId = Number((item == null ? void 0 : item.product_variant_id) ?? 0);
+      const identityKey = item == null ? void 0 : item.identity_key;
+      if (productId === null && Number.isNaN(productVariantId)) return;
+      const identity = {
         product_id: productId,
-        product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId,
-        identity_key: identityKey
-      });
-      await refreshViewModel();
-    } catch (error) {
-      console.error("[scanOrder] removeProductFromOrder failed", {
-        error,
-        item
-      });
+        product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId
+      };
+      if (typeof identityKey === "string" && identityKey.length > 0) {
+        identity.identity_key = identityKey;
+      }
+      try {
+        await runModuleAction(
+          "setOrderProductLineNote",
+          identity,
+          String((item == null ? void 0 : item.note) ?? "")
+        );
+        await refreshViewModel();
+      } catch (error) {
+        console.error("[scanOrder] setOrderProductLineNote failed", {
+          error,
+          item
+        });
+      }
+      return;
+    } else if (type === "delete") {
+      const productId = (item == null ? void 0 : item.product_id) ?? (item == null ? void 0 : item.id) ?? null;
+      const productVariantId = Number((item == null ? void 0 : item.product_variant_id) ?? 0);
+      const identityKey = item == null ? void 0 : item.identity_key;
+      if (productId === null && Number.isNaN(productVariantId)) return;
+      if (typeof identityKey !== "string" || identityKey.length === 0) {
+        console.error("[scanOrder] removeProductFromOrder skipped: missing identity_key", {
+          item
+        });
+        return;
+      }
+      try {
+        await runModuleAction("removeProductFromOrder", {
+          product_id: productId,
+          product_variant_id: Number.isNaN(productVariantId) ? 0 : productVariantId,
+          identity_key: identityKey
+        });
+        await refreshViewModel();
+      } catch (error) {
+        console.error("[scanOrder] removeProductFromOrder failed", {
+          error,
+          item
+        });
+      }
     }
   };
   (0, import_react.useEffect)(() => {
@@ -157,8 +211,9 @@ function Cart(props) {
       onChange: handleCartChange
     }
   );
-  const cartSubtotalSection = /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_subTotal.default, { list: subTotalList, style: { padding: 0 } }), extraContent ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-extra-content" }, extraContent) : null);
-  const cartBodyContent = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-body" }, cartLineItems, cartSubtotalSection);
+  const cartSubtotalSection = /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showVoucher ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_subTotal.default, { list: subTotalList, style: { padding: 0 } }), extraContent ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-extra-content" }, extraContent) : null);
+  const cartBodyClassName = embedded ? "pisell-scan-order-cart-body pisell-scan-order-cart-body-embedded" : "pisell-scan-order-cart-body";
+  const cartBodyContent = /* @__PURE__ */ import_react.default.createElement("div", { className: cartBodyClassName }, cartLineItems, cartSubtotalSection);
   if (embedded) {
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, cartBodyContent, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-cart-embedded-footer" }, /* @__PURE__ */ import_react.default.createElement(
       import_materials.Button,

package/lib/components/scanOrder/components/Cart/index.less

@@ -118,16 +118,22 @@
   cursor: not-allowed;
 }
 
+/* 移动端：结算内嵌卡 — 与 pisell-scan-order-content-mobile-wrap 的底部留白配合；
+ * 不再在 cart-body 上重复 96px，否则与外层叠加会出现大块空白，sticky 在整页滚动时也会与内容同步位移 */
 .pisell-scan-order-content-mobile-wrap {
-  .pisell-scan-order-cart-body {
-    padding-bottom: 96px;
+  .pisell-scan-order-cart-body-embedded {
+    padding-bottom: 16px;
   }
 
   .pisell-scan-order-cart-embedded-footer {
-    position: sticky;
+    position: fixed;
+    left: 0;
+    right: 0;
     bottom: 0;
-    z-index: 5;
-    padding-bottom: calc(20px + env(safe-area-inset-bottom, 0px));
+    z-index: 28;
+    padding: 12px 16px calc(20px + env(safe-area-inset-bottom, 0px));
+    border-top: 1px solid #eaecf0;
+    background: #fff;
     box-shadow: 0 -4px 10px rgba(16, 24, 40, 0.06);
   }
 }

package/lib/components/scanOrder/components/Check/index.js

@@ -35,7 +35,6 @@ module.exports = __toCommonJS(Check_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
-var import_materials = require("@pisell/materials");
 var import_Cart = __toESM(require("../Cart"));
 var import_FulfillmentMode = __toESM(require("../FulfillmentMode"));
 var import_ManualPickupRefModal = __toESM(require("../ManualPickupRefModal"));
@@ -50,13 +49,15 @@ function Check() {
   const [pickupRefOpen, setPickupRefOpen] = (0, import_react.useState)(false);
   const utils = (0, import_hooks.contextUtils)();
   const [dineInConfig, setDineInConfig] = (0, import_react.useState)(null);
-  const getConfig = async () => {
+  const getConfig = (0, import_react.useCallback)(async () => {
     const otherParams = await runModuleAction("getOtherParams");
     console.log("otherParams >>>>> ", otherParams);
     const dineInConfig2 = (otherParams == null ? void 0 : otherParams.dineInConfig) ?? {};
     setDineInConfig(dineInConfig2);
-  };
-  getConfig();
+  }, [runModuleAction]);
+  (0, import_react.useEffect)(() => {
+    getConfig();
+  }, []);
   const isShowOrderNote = (0, import_react.useMemo)(() => {
     return dineInConfig == null ? void 0 : dineInConfig["sale.allow_order_notes"];
   }, [dineInConfig]);
@@ -80,41 +81,50 @@ function Check() {
     () => String(import_utils.locales.getText("pisell2.scan.order.products.title") || "Products"),
     []
   );
+  const showCheckStepEmptyCartTip = () => {
+    import_antd.message.error(import_utils.locales.getText("pisell2.scan.order.check.cart.empty.tip") || "Please go back to add products");
+  };
   const doSubmit = async () => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const items = (viewModel == null ? void 0 : viewModel.cartItems) || [];
+    if (items.length === 0) {
+      showCheckStepEmptyCartTip();
+      setSubmitting(false);
+      return;
+    }
     try {
       setSubmitting(true);
       await runModuleAction("updateTempOrderNote", note);
       const res = await runModuleAction("submitScanOrder");
       console.log("submitScanOrder >>>>> ", res);
       clearStepCache();
-      if (dineInConfig == null ? void 0 : dineInConfig["workflow.require_payment_on_submit"]) {
+      if ((dineInConfig == null ? void 0 : dineInConfig["sale.require_payment_on_submit"]) && !isAdditionalOrder) {
+        try {
+          await runModuleAction("restoreOrder");
+        } catch (error) {
+          console.warn("[scanOrder] restoreOrder after payment failed", error);
+        }
         utils.action({
           type: "pisell1.payment",
           data: {
             order_id: (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.order_id,
-            total_amount: (_b = viewModel == null ? void 0 : viewModel.summary) == null ? void 0 : _b.total_amount
+            total_amount: ((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.order_wait_pay_amount) || ((_c = viewModel == null ? void 0 : viewModel.summary) == null ? void 0 : _c.total_amount)
           },
           callback: async (_e2) => {
-            try {
-              await runModuleAction("restoreOrder");
-            } catch (error) {
-              console.warn("[scanOrder] restoreOrder after payment failed", error);
-            }
           }
         });
       } else {
-        if ((_c = res == null ? void 0 : res.data) == null ? void 0 : _c.order_id) {
+        if ((_d = res == null ? void 0 : res.data) == null ? void 0 : _d.order_id) {
           try {
             await runModuleAction("restoreOrder");
           } catch (error) {
             console.warn("[scanOrder] restoreOrder before redirect failed", error);
           }
-          const link = `/order/details?id=${(_d = res == null ? void 0 : res.data) == null ? void 0 : _d.order_id}`;
-          const app = (_e = utils == null ? void 0 : utils.getApp) == null ? void 0 : _e.call(utils);
-          if ((_f = app == null ? void 0 : app.history) == null ? void 0 : _f.replace) {
+          const link = `/order/details?id=${(_e = res == null ? void 0 : res.data) == null ? void 0 : _e.order_id}`;
+          const app = (_f = utils == null ? void 0 : utils.getApp) == null ? void 0 : _f.call(utils);
+          if ((_g = app == null ? void 0 : app.history) == null ? void 0 : _g.replace) {
             app.history.replace(link);
-          } else if ((_g = app == null ? void 0 : app.history) == null ? void 0 : _g.push) {
+          } else if ((_h = app == null ? void 0 : app.history) == null ? void 0 : _h.push) {
             app.history.push(link);
           } else {
             location.replace(link);
@@ -133,12 +143,7 @@ function Check() {
     if (submitting) return;
     const cartItems = (viewModel == null ? void 0 : viewModel.cartItems) || [];
     if (cartItems.length === 0) {
-      (0, import_materials.PisellToast)({
-        content: String(
-          import_utils.locales.getText("pisell2.scan.order.products.empty.tip") || "Please select products"
-        ),
-        duration: 2
-      });
+      showCheckStepEmptyCartTip();
       return;
     }
     if (isAdditionalOrder) {

package/lib/components/scanOrder/components/Content/index.js

@@ -91,7 +91,9 @@ function ReadyState() {
     scanOrderModule,
     isCacheHydrated,
     markGate,
-    isGatePassed
+    isGatePassed,
+    resumeStep,
+    consumeResumeStep
   } = (0, import_context.useScanOrderContext)();
   const { isLogin, openLoginModal } = (0, import_hooks.useScanOrderLogin)();
   const utils = (0, import_hooks.contextUtils)();
@@ -109,14 +111,55 @@ function ReadyState() {
     content: null
   });
   const [pendingFormPayload, setPendingFormPayload] = (0, import_react.useState)(null);
+  const [productList, setProductList] = (0, import_react.useState)([]);
+  const productListLoadedRef = (0, import_react.useRef)(false);
+  const productListPromiseRef = (0, import_react.useRef)(null);
+  const ensureProductListLoaded = (0, import_react.useCallback)(async () => {
+    if (productListLoadedRef.current) return;
+    if (productListPromiseRef.current) {
+      await productListPromiseRef.current.catch(() => {
+      });
+      return;
+    }
+    const request = (async () => {
+      try {
+        const res = await runModuleAction("getProductList");
+        if (Array.isArray(res)) {
+          productListLoadedRef.current = true;
+          setProductList(res);
+          return;
+        }
+        import_antd.Modal.confirm({
+          title: res == null ? void 0 : res.message,
+          okText: String(import_utils.locales.getText("pisell2.event.confirm") || "OK"),
+          cancelButtonProps: { style: { display: "none" } },
+          maskClosable: false,
+          onOk: () => {
+            location.replace("/");
+          }
+        });
+      } catch (error) {
+        console.warn("[scanOrder] getProductList failed", error);
+      } finally {
+        productListPromiseRef.current = null;
+      }
+    })();
+    productListPromiseRef.current = request;
+    await request;
+  }, [runModuleAction]);
   const requestEntryPaxRef = (0, import_react.useRef)(0);
   const requestPaxMinRef = (0, import_react.useRef)(1);
   const requestPaxMaxRef = (0, import_react.useRef)(1);
   const tableFormRecordRef = (0, import_react.useRef)(null);
+  const entryPaxModalWasPresentedRef = (0, import_react.useRef)(false);
   const getLocalizedName = (nameMap) => {
     if (!nameMap) return "";
     const currentLocale = import_utils.locales.getLocale();
-    return nameMap[currentLocale] || nameMap.original || nameMap.en || "";
+    const localized = nameMap[currentLocale];
+    if (typeof localized === "string" && localized) return localized;
+    const original = nameMap.original;
+    if (typeof original === "string" && original) return original;
+    return "";
   };
   const resolveLocalizedText = (value) => {
     if (value == null) return "";
@@ -140,6 +183,34 @@ function ReadyState() {
     };
   };
   const app = (_a = utils == null ? void 0 : utils.getApp) == null ? void 0 : _a.call(utils);
+  const navigateToHome = () => {
+    var _a2, _b2;
+    if ((_a2 = app == null ? void 0 : app.history) == null ? void 0 : _a2.replace) {
+      app.history.replace("/");
+    } else if ((_b2 = app == null ? void 0 : app.history) == null ? void 0 : _b2.push) {
+      app.history.push("/");
+    } else {
+      location.replace("/");
+    }
+  };
+  const requestEntryPaxModal = () => new Promise((resolve) => {
+    var _a2;
+    if (typeof (utils == null ? void 0 : utils.action) !== "function") {
+      resolve(null);
+      return;
+    }
+    utils.action({
+      type: "pisell1.handlePaxModal",
+      data: {
+        tableName: getLocalizedName((_a2 = tableFormRecordRef.current) == null ? void 0 : _a2.name),
+        requestPaxMin: requestPaxMinRef.current,
+        requestPaxMax: requestPaxMaxRef.current
+      },
+      callback: (result) => {
+        resolve(extractEntryPaxNumber(result));
+      }
+    });
+  });
   const handleOrderDetail = (order_id) => {
     var _a2, _b2;
     const link = `/order/details?id=${order_id}`;
@@ -152,7 +223,6 @@ function ReadyState() {
     }
   };
   const handleBack = () => {
-    var _a2, _b2;
     if (currentStep !== "product") {
       prevStep();
       return;
@@ -161,13 +231,23 @@ function ReadyState() {
       handleOrderDetail(entryContext.order_id);
       return;
     }
-    if ((_a2 = app == null ? void 0 : app.history) == null ? void 0 : _a2.replace) {
-      app.history.replace("/");
-    } else if ((_b2 = app == null ? void 0 : app.history) == null ? void 0 : _b2.push) {
-      app.history.push("/");
-    } else {
-      location.replace("/");
+    if (entryPaxModalWasPresentedRef.current) {
+      void (async () => {
+        const pax = await requestEntryPaxModal();
+        if (pax == null) {
+          navigateToHome();
+          return;
+        }
+        try {
+          await runModuleAction("setEntryPaxNumber", pax);
+          await refreshViewModel();
+        } catch (error) {
+          console.warn("[scanOrder] setEntryPaxNumber on back pax confirm failed", error);
+        }
+      })();
+      return;
     }
+    navigateToHome();
   };
   const enterProductStep = async () => {
     try {
@@ -176,7 +256,9 @@ function ReadyState() {
     } catch (error) {
       console.warn("[scanOrder] applyItemRulePrefill failed", error);
     } finally {
-      if (currentStep !== "check") goToStep("product");
+      const target = resumeStep === "check" ? "check" : "product";
+      if (resumeStep) consumeResumeStep();
+      goToStep(target);
     }
   };
   const runEntryPaxGateThenEnterProduct = async () => {
@@ -188,26 +270,10 @@ function ReadyState() {
       await enterProductStep();
       return;
     }
-    const pax = await new Promise((resolve) => {
-      var _a2;
-      if (typeof (utils == null ? void 0 : utils.action) !== "function") {
-        resolve(null);
-        return;
-      }
-      utils.action({
-        type: "pisell1.handlePaxModal",
-        data: {
-          tableName: getLocalizedName((_a2 = tableFormRecordRef.current) == null ? void 0 : _a2.name),
-          requestPaxMin: requestPaxMinRef.current,
-          requestPaxMax: requestPaxMaxRef.current
-        },
-        callback: (result) => {
-          resolve(extractEntryPaxNumber(result));
-        }
-      });
-    });
+    entryPaxModalWasPresentedRef.current = true;
+    const pax = await requestEntryPaxModal();
     if (pax == null) {
-      location.replace("/");
+      navigateToHome();
       return;
     }
     try {
@@ -277,6 +343,7 @@ function ReadyState() {
   };
   (0, import_react.useEffect)(() => {
     const checkResourceAvailable = async () => {
+      var _a2;
       const hasOrderId = !!(entryContext == null ? void 0 : entryContext.order_id);
       const {
         mode,
@@ -318,19 +385,33 @@ function ReadyState() {
         }
         await runEntryPaxGateThenEnterProduct();
       } else if (isAdditionalOrder) {
-        if (hasOrderId) {
-          await enterProductStep();
-        } else {
-          handleOrderDetail(order_id);
-        }
+        await enterProductStep();
       } else if (mode === "submit_disabled") {
         const tips = resolveLocalizedText(errorTips) || String(import_utils.locales.getText("pisell2.scan.order.submit.disabled.default") || "");
         setSubmitDisabledTips(tips);
         await enterProductStep();
+      } else if (mode === "resource_busy") {
+        if (!isLogin) {
+          (_a2 = scanOrderModule == null ? void 0 : scanOrderModule.setUIState) == null ? void 0 : _a2.call(scanOrderModule, "pendingStep", currentStep);
+          openLoginModal({
+            callback: (status) => {
+              var _a3, _b2;
+              if (status === "success") {
+                (_a3 = scanOrderModule == null ? void 0 : scanOrderModule.deleteUIState) == null ? void 0 : _a3.call(scanOrderModule, "pendingStep");
+                handleOrderDetail(order_id);
+                return;
+              }
+              (_b2 = scanOrderModule == null ? void 0 : scanOrderModule.deleteUIState) == null ? void 0 : _b2.call(scanOrderModule, "pendingStep");
+              location.replace("/");
+            }
+          });
+        } else {
+          handleOrderDetail(order_id);
+        }
       } else {
         let content = resolveLocalizedText(errorTips);
         if (!content) {
-          if (mode === "resource_busy") {
+          if (mode === "resource_block") {
             content = String(
               import_utils.locales.getText("pisell2.scan.order.resource.status.exception") || ""
             );
@@ -342,7 +423,7 @@ function ReadyState() {
         }
         import_antd.Modal.info({
           title: import_utils.locales.getText("pisell2.scan.order.step.error"),
-          content: String(content || "").trim(),
+          content: resolveLocalizedText(content).trim(),
           okText: String(import_utils.locales.getText("pisell2.event.confirm") || "OK"),
           maskClosable: false,
           onOk: () => {
@@ -375,7 +456,14 @@ function ReadyState() {
   }, [currentStep, cartValidation == null ? void 0 : cartValidation.passed]);
   const stepRegistry = {
     init: /* @__PURE__ */ import_react.default.createElement(import_Initializing.default, null),
-    product: /* @__PURE__ */ import_react.default.createElement(import_Menu.default, { onCheckout: () => goToStep("check") }),
+    product: /* @__PURE__ */ import_react.default.createElement(
+      import_Menu.default,
+      {
+        onCheckout: () => goToStep("check"),
+        productList,
+        onEnsureProductList: ensureProductListLoaded
+      }
+    ),
     check: /* @__PURE__ */ import_react.default.createElement(import_Check.default, null),
     error: /* @__PURE__ */ import_react.default.createElement(import_ErrorState.default, { message: import_utils.locales.getText("pisell2.scan.order.store.status.exception") })
   };
@@ -420,6 +508,7 @@ function ReadyState() {
     return highlighted;
   };
   const gotoCheckOrder = async () => {
+    var _a2;
     if (submitDisabledTips) {
       import_antd.message.warning(submitDisabledTips, 2);
       return;
@@ -450,16 +539,17 @@ function ReadyState() {
       return;
     }
     if (!isLogin) {
+      (_a2 = scanOrderModule == null ? void 0 : scanOrderModule.setUIState) == null ? void 0 : _a2.call(scanOrderModule, "pendingStep", "check");
       openLoginModal({
         callback: (status) => {
-          if (status === "success") {
-            goToStep("check");
-          }
+          var _a3;
+          (_a3 = scanOrderModule == null ? void 0 : scanOrderModule.deleteUIState) == null ? void 0 : _a3.call(scanOrderModule, "pendingStep");
+          if (status === "success") goToStep("check");
         }
       });
-    } else {
-      goToStep("check");
+      return;
     }
+    goToStep("check");
   };
   const isMobileView = (0, import_utils.isMobile)();
   const isShowFooter = (0, import_react.useMemo)(() => {

package/lib/components/scanOrder/components/Menu/index.d.ts

@@ -1,6 +1,17 @@
 /// <reference types="react" />
 interface MenuProps {
     onCheckout: () => void;
+    /**
+     * 商品列表（由上层 ReadyState 持有，配合 onEnsureProductList 做幂等拉取与持久化：
+     * 切 step 回到 product 时 Menu 会 remount，但 productList 在 ReadyState 不会丢）
+     */
+    productList: any[];
+    /**
+     * 幂等触发商品列表拉取。Menu mount 时调用：
+     * - 首次：真发请求
+     * - 后续（如从 check 返回 product）：命中缓存，直接短路，不重复发请求
+     */
+    onEnsureProductList: () => Promise<void>;
 }
 export default function Menu(props: MenuProps): JSX.Element;
 export {};