@pisell/private-materials 6.3.138 → 6.3.140

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

@@ -6,10 +6,12 @@
   justify-content: space-between;
   align-items: center;
   gap: 12px;
-  padding: 16px;
+  box-sizing: border-box;
+  height: 70px;
+  padding: 0 16px;
   border-top: 1px solid #eaecf0;
   background: #f9fafb;
-  border-radius: 16px 16px 0 0;
+  border-radius: 0;
 }
 
 .pisell-scan-order-footer-left {
@@ -33,8 +35,13 @@
 
 .pisell-scan-order-footer-btn {
   min-width: 128px;
-  height: 56px;
-  border-radius: 18px;
+  height: 48px;
+  border-radius: 12px;
+}
+
+.pisell-scan-order-footer-btn-disabled {
+  opacity: 0.45;
+  cursor: not-allowed;
 }
 
 .pisell-scan-order-footer-right {
@@ -57,8 +64,10 @@
     right: 0;
     bottom: 0;
     z-index: 30;
-    border-radius: 16px 16px 0 0;
-    padding-bottom: calc(16px + constant(safe-area-inset-bottom));
-    padding-bottom: calc(16px + env(safe-area-inset-bottom, 0px));
+    height: calc(70px + constant(safe-area-inset-bottom));
+    height: calc(70px + env(safe-area-inset-bottom, 0px));
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom, 0px);
+    border-radius: 0;
   }
 }

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

@@ -0,0 +1,11 @@
+/// <reference types="react" />
+import './index.less';
+/**
+ * FulfillmentMode
+ *
+ * 通过 scanOrder module 读取 getFulfillmentModes() 返回的 { enableTableService, enablePickup }：
+ * - 两个都开启：渲染可切换的 Radio.Group，默认 Table service，挂载即同步一次 setPickupReferenceMode。
+ * - 只开启一个：仅渲染单行文案提示当前取餐方式，并同步一次 setPickupReferenceMode。
+ * - 都未开启：不渲染。
+ */
+export default function FulfillmentMode(): JSX.Element | null;

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

@@ -0,0 +1,96 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/scanOrder/components/FulfillmentMode/index.tsx
+var FulfillmentMode_exports = {};
+__export(FulfillmentMode_exports, {
+  default: () => FulfillmentMode
+});
+module.exports = __toCommonJS(FulfillmentMode_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_utils = require("@pisell/utils");
+var import_context = require("../../context");
+var import_index = require("./index.less");
+function FulfillmentMode() {
+  const { scanOrderModule } = (0, import_context.useScanOrderContext)();
+  const [modes, setModes] = (0, import_react.useState)({});
+  const [mode, setMode] = (0, import_react.useState)("table_service");
+  (0, import_react.useEffect)(() => {
+    if (!scanOrderModule) return;
+    const next = (typeof scanOrderModule.getFulfillmentModes === "function" ? scanOrderModule.getFulfillmentModes() : void 0) || {};
+    setModes(next);
+    const onlyTable = !!next.enableTableService && !next.enablePickup;
+    const onlyPickup = !next.enableTableService && !!next.enablePickup;
+    const initial = onlyPickup ? "counter_pickup" : onlyTable ? "table_service" : "table_service";
+    setMode(initial);
+    if ((next.enableTableService || next.enablePickup) && typeof scanOrderModule.setPickupReferenceMode === "function") {
+      scanOrderModule.setPickupReferenceMode(initial);
+    }
+  }, [scanOrderModule]);
+  const { enableTableService, enablePickup } = modes;
+  const labelTitle = (0, import_react.useMemo)(
+    () => String(import_utils.locales.getText("pisell2.scan.order.fulfillment.title")),
+    []
+  );
+  const tableServiceText = (0, import_react.useMemo)(
+    () => String(import_utils.locales.getText("pisell2.scan.order.fulfillment.table_service")),
+    []
+  );
+  const pickupText = (0, import_react.useMemo)(
+    () => String(import_utils.locales.getText("pisell2.scan.order.fulfillment.pickup")),
+    []
+  );
+  if (!enableTableService && !enablePickup) return null;
+  if (!enableTableService || !enablePickup) {
+    const singleLabel = enablePickup ? pickupText : tableServiceText;
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-fulfillment pisell-scan-order-fulfillment-single" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-scan-order-fulfillment-title" }, labelTitle), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-scan-order-fulfillment-value" }, singleLabel));
+  }
+  const handleChange = (next) => {
+    if (next === mode) return;
+    setMode(next);
+    if (typeof (scanOrderModule == null ? void 0 : scanOrderModule.setPickupReferenceMode) === "function") {
+      scanOrderModule.setPickupReferenceMode(next);
+    }
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-fulfillment" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-fulfillment-title" }, labelTitle), /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Radio.Group,
+    {
+      className: "pisell-scan-order-fulfillment-group",
+      optionType: "button",
+      buttonStyle: "solid",
+      value: mode,
+      onChange: (event) => {
+        var _a;
+        return handleChange((_a = event == null ? void 0 : event.target) == null ? void 0 : _a.value);
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Button, { value: "table_service" }, tableServiceText),
+    /* @__PURE__ */ import_react.default.createElement(import_antd.Radio.Button, { value: "counter_pickup" }, pickupText)
+  ));
+}

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

@@ -0,0 +1,40 @@
+.pisell-scan-order-fulfillment {
+  padding: 4px 16px;
+  margin-bottom: 12px;
+  background: #fff;
+  border-radius: 12px;
+
+  .pisell-scan-order-fulfillment-title {
+    color: #101828;
+    font-size: 16px;
+    font-weight: 500;
+    margin-bottom: 8px;
+  }
+
+  .pisell-scan-order-fulfillment-group {
+    display: flex;
+    width: 100%;
+
+    .pisell-lowcode-radio-button-wrapper {
+      flex: 1;
+      text-align: center;
+    }
+  }
+}
+
+.pisell-scan-order-fulfillment-single {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+
+  .pisell-scan-order-fulfillment-title {
+    margin-bottom: 0;
+  }
+
+  .pisell-scan-order-fulfillment-value {
+    color: #344054;
+    font-size: 14px;
+    font-weight: 500;
+  }
+}

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

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import './index.less';
+interface ManualPickupRefModalProps {
+    open: boolean;
+    confirmLoading?: boolean;
+    onCancel: () => void;
+    onConfirm: (value: string) => void;
+}
+/**
+ * ManualPickupRefModal
+ *
+ * 当 scanOrder.checkManualPickupRef() 返回 enabled=true 时，弹出让用户输入
+ * 昵称/buzzer 的弹窗。确认时回调 onConfirm(value)，由外部负责 setPickupRef 与下单。
+ */
+export default function ManualPickupRefModal({ open, confirmLoading, onCancel, onConfirm, }: ManualPickupRefModalProps): JSX.Element;
+export {};

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

@@ -0,0 +1,116 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/scanOrder/components/ManualPickupRefModal/index.tsx
+var ManualPickupRefModal_exports = {};
+__export(ManualPickupRefModal_exports, {
+  default: () => ManualPickupRefModal
+});
+module.exports = __toCommonJS(ManualPickupRefModal_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
+var import_index = require("./index.less");
+function ManualPickupRefModal({
+  open,
+  confirmLoading = false,
+  onCancel,
+  onConfirm
+}) {
+  const [value, setValue] = (0, import_react.useState)("");
+  (0, import_react.useEffect)(() => {
+    if (open) setValue("");
+  }, [open]);
+  const title = (0, import_react.useMemo)(
+    () => String(import_utils.locales.getText("pisell2.scan.order.pickup.ref.title")),
+    []
+  );
+  const heading = (0, import_react.useMemo)(
+    () => String(import_utils.locales.getText("pisell2.scan.order.pickup.ref.heading")),
+    []
+  );
+  const description = (0, import_react.useMemo)(
+    () => String(import_utils.locales.getText("pisell2.scan.order.pickup.ref.description")),
+    []
+  );
+  const placeholder = (0, import_react.useMemo)(
+    () => String(import_utils.locales.getText("pisell2.scan.order.pickup.ref.placeholder")),
+    []
+  );
+  const confirmText = (0, import_react.useMemo)(
+    () => String(import_utils.locales.getText("pisell2.event.confirm") || "Confirm"),
+    []
+  );
+  const trimmed = value.trim();
+  const canConfirm = !!trimmed && !confirmLoading;
+  const handleConfirm = () => {
+    if (!canConfirm) return;
+    onConfirm(trimmed);
+  };
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Modal,
+    {
+      open,
+      title,
+      footer: null,
+      onCancel,
+      maskClosable: false,
+      destroyOnClose: true,
+      centered: true,
+      className: "pisell-scan-order-pickup-ref-modal"
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-pickup-ref-body" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-pickup-ref-heading" }, heading), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-order-pickup-ref-desc" }, description), /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Input,
+      {
+        size: "large",
+        placeholder,
+        value,
+        onChange: (event) => {
+          var _a;
+          return setValue(((_a = event == null ? void 0 : event.target) == null ? void 0 : _a.value) || "");
+        },
+        onPressEnter: handleConfirm,
+        className: "pisell-scan-order-pickup-ref-input",
+        maxLength: 32,
+        allowClear: true
+      }
+    ), /* @__PURE__ */ import_react.default.createElement(
+      import_materials.Button,
+      {
+        type: "primary",
+        block: true,
+        size: "large",
+        disabled: !canConfirm,
+        loading: confirmLoading,
+        onClick: handleConfirm
+      },
+      confirmText
+    ))
+  );
+}

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

@@ -0,0 +1,61 @@
+.pisell-scan-order-pickup-ref-modal {
+  .pisell-lowcode-modal-content {
+    border-radius: 16px;
+    padding: 0;
+  }
+
+  .pisell-lowcode-modal-header {
+    padding: 16px 20px;
+    border-bottom: 1px solid #eaecf0;
+    margin-bottom: 0;
+  }
+
+  .pisell-lowcode-modal-title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #101828;
+  }
+
+  .pisell-lowcode-modal-body {
+    padding: 24px 20px 28px;
+  }
+
+  .pisell-lowcode-modal-close {
+    top: 14px;
+    inset-inline-end: 16px;
+  }
+}
+
+.pisell-scan-order-pickup-ref-body {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  align-items: stretch;
+
+  .pisell-scan-order-pickup-ref-heading {
+    text-align: center;
+    color: #101828;
+    font-size: 24px;
+    font-weight: 700;
+    line-height: 1.3;
+    margin-top: 4px;
+  }
+
+  .pisell-scan-order-pickup-ref-desc {
+    text-align: center;
+    color: #667085;
+    font-size: 14px;
+    font-weight: 400;
+    margin-bottom: 12px;
+  }
+
+  .pisell-scan-order-pickup-ref-input {
+    height: 48px;
+    border-radius: 10px;
+
+    input {
+      text-align: center;
+      font-size: 16px;
+    }
+  }
+}

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 {};

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

@@ -37,12 +37,11 @@ var import_productSelect = __toESM(require("../../../../plus/productSelect"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_context = require("../../context");
 var import_utils = require("@pisell/utils");
-var import_antd = require("antd");
 var import_materials = require("@pisell/materials");
 var import_transformProductDetail = require("../../utils/transformProductDetail");
 function Menu(props) {
   var _a;
-  const { onCheckout } = props;
+  const { onCheckout, productList, onEnsureProductList } = props;
   const context = (0, import_useEngineContext.default)();
   const { utils } = context.appHelper || {};
   const {
@@ -51,34 +50,18 @@ function Menu(props) {
     viewModel
   } = (0, import_context.useScanOrderContext)();
   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();
-  const [productList, setProductList] = (0, import_react.useState)([]);
+  }, [runModuleAction]);
   (0, import_react.useEffect)(() => {
-    const fetchProductList = async () => {
-      const res = await runModuleAction("getProductList");
-      console.log("getProductList >>>>> ", res);
-      if (Array.isArray(res)) {
-        setProductList(res);
-      } else {
-        import_antd.Modal.confirm({
-          title: res.message,
-          okText: String(import_utils.locales.getText("pisell2.event.confirm") || "OK"),
-          cancelButtonProps: { style: { display: "none" } },
-          maskClosable: false,
-          onOk: () => {
-            location.replace("/");
-          }
-        });
-      }
-    };
-    fetchProductList();
+    getConfig();
   }, []);
+  (0, import_react.useEffect)(() => {
+    void onEnsureProductList();
+  }, [onEnsureProductList]);
   const scrollRef = (0, import_react.useRef)(null);
   const isMobileView = (0, import_utils.isMobile)();
   const height = window.innerHeight - 100;
@@ -96,11 +79,12 @@ function Menu(props) {
     }
   };
   const removeOrderProduct = async (params) => {
-    const { product_id, product_variant_id, sourceData } = params;
+    const { product_id, product_variant_id, identity_key, sourceData } = params;
     try {
       await runModuleAction("removeProductFromOrder", {
         product_id,
-        product_variant_id
+        product_variant_id,
+        ...identity_key ? { identity_key } : {}
       });
       await refreshViewModel();
     } catch (error) {
@@ -108,16 +92,18 @@ function Menu(props) {
         error,
         sourceData,
         product_id,
-        product_variant_id
+        product_variant_id,
+        identity_key
       });
     }
   };
   const updateOrderProduct = async (params) => {
-    const { product_id, product_variant_id, updates, sourceData } = params;
+    const { product_id, product_variant_id, identity_key, updates, sourceData } = params;
     try {
       await runModuleAction("updateProductInOrder", {
         product_id,
         product_variant_id,
+        ...identity_key ? { identity_key } : {},
         updates
       });
       await refreshViewModel();
@@ -127,6 +113,7 @@ function Menu(props) {
         sourceData,
         product_id,
         product_variant_id,
+        identity_key,
         updates
       });
     }
@@ -162,18 +149,20 @@ function Menu(props) {
         return;
       }
       const normalizedQuantity = Number.isNaN(nextQuantity) ? 0 : Math.max(0, Math.floor(nextQuantity));
+      const cartItems = Array.isArray(viewModel == null ? void 0 : viewModel.cartItems) ? viewModel.cartItems : [];
+      const existedCartItem = cartItems.find((cartItem) => {
+        return String((cartItem == null ? void 0 : cartItem.product_id) ?? null) === String((orderProduct == null ? void 0 : orderProduct.product_id) ?? null) && Number((cartItem == null ? void 0 : cartItem.product_variant_id) ?? 0) === productVariantId;
+      });
+      const existedIdentityKey = typeof (existedCartItem == null ? void 0 : existedCartItem.identity_key) === "string" && existedCartItem.identity_key.length > 0 ? existedCartItem.identity_key : void 0;
       if (normalizedQuantity <= 0) {
         await removeOrderProduct({
           product_id: (orderProduct == null ? void 0 : orderProduct.product_id) ?? null,
           product_variant_id: productVariantId,
+          identity_key: existedIdentityKey,
           sourceData: quantityData
         });
         return;
       }
-      const cartItems = Array.isArray(viewModel == null ? void 0 : viewModel.cartItems) ? viewModel.cartItems : [];
-      const existedCartItem = cartItems.find((cartItem) => {
-        return String((cartItem == null ? void 0 : cartItem.product_id) ?? null) === String((orderProduct == null ? void 0 : orderProduct.product_id) ?? null) && Number((cartItem == null ? void 0 : cartItem.product_variant_id) ?? 0) === productVariantId;
-      });
       if (!existedCartItem) {
         await addOrderProduct({
           orderProduct: {
@@ -187,6 +176,7 @@ function Menu(props) {
       await updateOrderProduct({
         product_id: (orderProduct == null ? void 0 : orderProduct.product_id) ?? null,
         product_variant_id: productVariantId,
+        identity_key: existedIdentityKey,
         updates: {
           num: normalizedQuantity,
           _origin: orderProduct == null ? void 0 : orderProduct._origin
@@ -198,7 +188,7 @@ function Menu(props) {
         type: "pisell1.productDetail",
         data: {
           detail: { ...sourceItem, open_deposit: 1 },
-          setting: { can_input: true, item_max_length: 1, is_detail_open: true }
+          setting: { can_input: true, item_max_length: 1, is_detail_open: false }
         },
         callback: async (data) => {
           if (data == null ? void 0 : data.isCancel) return;
@@ -248,8 +238,5 @@ function Menu(props) {
       cartElementId: "#scan-order-v2-cart-btn"
     }
   );
-  if (isMobileView) {
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-menu pisell-scan-menu-mobile" }, productSelectNode);
-  }
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-scan-menu" }, /* @__PURE__ */ import_react.default.createElement(import_materials.PisellScrollView, { height, overflow: "y", ref: scrollRef }, productSelectNode));
 }

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import '../../../booking/components/voucher/index.less';
+import '../../../appointmentBooking/components/Voucher/index.less';
+/**
+ * VoucherCard -- 优惠券/Promotion 区块
+ * 嵌入购物车底部，提供券列表展示、勾选、扫码兑码、未登录引导等能力
+ */
+export default function VoucherCard(): JSX.Element;