@pisell/private-materials 6.9.1 → 6.9.3

package/lib/components/kioskSkuDetail/index.js

@@ -39,7 +39,6 @@ var import_materials = require("@pisell/materials");
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
 var import_skuOptionsSelection = __toESM(require("../../plus/skuOptionsSelection"));
-var import_pisellNumberSelector = __toESM(require("../../pro/pisellNumberSelector"));
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_serve = require("../booking/info/service/serve");
 var import_locales = __toESM(require("./locales"));
@@ -47,41 +46,21 @@ var import_index = require("./index.less");
 var import_utils2 = require("../booking/utils");
 function KioskSkuDetail(props) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-  const { className, style, onBack, onAddToCart } = props;
+  const { className, style, onAddToCart } = props;
   const productIdFromUrl = (0, import_react.useMemo)(() => {
     return getQueryFirstMatch({ keys: ["productId", "product_id", "id"] });
   }, []);
-  const resolvedProductId = productIdFromUrl ?? props.productId;
+  const initialProductId = productIdFromUrl ?? props.productId ?? null;
   const scheduleDate = (0, import_react.useMemo)(() => (0, import_dayjs.default)().format("YYYY-MM-DD"), []);
+  const stageScale = useDesignStageScale({ designWidth: 1080, designHeight: 1800 });
   const context = (0, import_useEngineContext.default)();
   const { interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   import_utils.locales.init(import_locales.default, ((_c = (_b = context == null ? void 0 : context.engine) == null ? void 0 : _b.props) == null ? void 0 : _c.locale) || "en");
   import_utils2.request.setRequest(context.appHelper.utils.request);
-  const { store, getData } = ((_d = context.appHelper) == null ? void 0 : _d.utils) || {};
+  const { store, getData, Toast } = ((_d = context.appHelper) == null ? void 0 : _d.utils) || {};
   const state = (_e = store == null ? void 0 : store.getState) == null ? void 0 : _e.call(store);
   const symbol = ((_h = (_g = (_f = store == null ? void 0 : store.getState) == null ? void 0 : _f.call(store)) == null ? void 0 : _g.global) == null ? void 0 : _h.symbol) || "$";
   const currency_code = ((_k = (_j = (_i = store == null ? void 0 : store.getState) == null ? void 0 : _i.call(store)) == null ? void 0 : _j.global) == null ? void 0 : _k.currency_code) || "AUD";
-  (0, import_react.useEffect)(() => {
-    var _a2, _b2;
-    (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
-      module: "tickets",
-      key: "page_load"
-    });
-    interaction.utils.mountFunction(
-      "tickets",
-      "restore_buy_wallet_pass",
-      (data) => {
-        console.log("重置状态", data);
-      }
-    );
-    interaction.utils.mountFunction(
-      "tickets",
-      "edit_buy_wallet_pass",
-      (data) => {
-        console.log("编辑状态", data);
-      }
-    );
-  }, []);
   const [isLoading, setIsLoading] = (0, import_react.useState)(false);
   const [errorText, setErrorText] = (0, import_react.useState)(null);
   const [productData, setProductData] = (0, import_react.useState)(null);
@@ -98,47 +77,130 @@ function KioskSkuDetail(props) {
     bundle: [],
     option: []
   });
-  (0, import_react.useEffect)(() => {
-    let isCancelled = false;
-    async function load() {
-      if (!resolvedProductId) return;
-      setIsLoading(true);
-      setErrorText(null);
-      try {
-        const open_deposit = (getData == null ? void 0 : getData("bookingv2_deposit")) || 0;
-        const params = { open_deposit };
-        params.schedule_date = scheduleDate;
-        const res = await (0, import_serve.getProductDetail)(String(resolvedProductId), params);
-        const apiData = (res == null ? void 0 : res.data) || {};
-        if (isCancelled) return;
-        setProductData(apiData);
-        const normalizedProductId = Number(
-          (apiData == null ? void 0 : apiData.product_id) || (apiData == null ? void 0 : apiData.id) || resolvedProductId || 0
-        );
-        const minNumUnit = Number((apiData == null ? void 0 : apiData.min_num_unit) || 1);
+  const [isEdit, setIsEdit] = (0, import_react.useState)(false);
+  const skuOptionsSelectionRef = (0, import_react.useRef)(null);
+  const requestSeqRef = (0, import_react.useRef)(0);
+  const resetForInit = (0, import_react.useCallback)(() => {
+    setProductData(null);
+    setErrorText(null);
+    setQuantity(1);
+    setSkuValue({
+      product_id: 0,
+      product_variant_id: 0,
+      bundle: [],
+      option: []
+    });
+    setSkuDefaultValue({
+      product_id: 0,
+      product_variant_id: 0,
+      bundle: [],
+      option: []
+    });
+  }, []);
+  const loadByProductId = (0, import_react.useCallback)(async (productId, options = {}) => {
+    var _a2, _b2;
+    console.log("准备 load", productId);
+    if (productId === null || typeof productId === "undefined" || productId === "") return;
+    const reqId = ++requestSeqRef.current;
+    setIsLoading(true);
+    setErrorText(null);
+    try {
+      const open_deposit = (getData == null ? void 0 : getData("bookingv2_deposit")) || 0;
+      const params = { open_deposit, "translate-locale": ((_b2 = (_a2 = context == null ? void 0 : context.engine) == null ? void 0 : _a2.props) == null ? void 0 : _b2.locale) || "en" };
+      params.schedule_date = scheduleDate;
+      const res = await (0, import_serve.getProductDetail)(String(productId), params);
+      console.log("详情接口");
+      console.log(JSON.stringify(res));
+      const apiData = ((res == null ? void 0 : res.id) ? res : res == null ? void 0 : res.data) || {};
+      if (reqId !== requestSeqRef.current) return;
+      setProductData(apiData);
+      console.log("已设置 productData");
+      const normalizedProductId = Number(
+        (apiData == null ? void 0 : apiData.product_id) || (apiData == null ? void 0 : apiData.id) || productId || 0
+      );
+      const minNumUnit = Number((apiData == null ? void 0 : apiData.min_num_unit) || 1);
+      if (options.shouldInitQuantity !== false) {
         setQuantity(minNumUnit > 0 ? minNumUnit : 1);
-        const initialSkuValue = {
-          product_id: normalizedProductId,
-          product_variant_id: 0,
-          bundle: [],
-          option: []
-        };
+      }
+      const defaultVariantId = (() => {
+        var _a3, _b3;
+        const firstVariantId = Array.isArray(apiData == null ? void 0 : apiData.variant) ? Number(((_b3 = (_a3 = apiData == null ? void 0 : apiData.variant) == null ? void 0 : _a3[0]) == null ? void 0 : _b3.id) || 0) : 0;
+        return Number.isFinite(firstVariantId) ? firstVariantId : 0;
+      })();
+      const initialSkuValue = {
+        product_id: normalizedProductId,
+        product_variant_id: defaultVariantId,
+        bundle: [],
+        option: []
+      };
+      if (options.shouldInitSku !== false) {
         setSkuValue(initialSkuValue);
         setSkuDefaultValue(initialSkuValue);
-      } catch (error) {
-        console.error(error);
-        if (isCancelled) return;
-        setErrorText("Failed to load product detail");
-      } finally {
-        if (isCancelled) return;
-        setIsLoading(false);
+        setTimeout(() => {
+          var _a3;
+          if (initialSkuValue.product_variant_id) {
+            (_a3 = skuOptionsSelectionRef.current) == null ? void 0 : _a3.validate();
+          }
+        }, 0);
       }
+    } catch (error) {
+      console.error(error);
+      setErrorText("Failed to load product detail");
+    } finally {
+      if (reqId !== requestSeqRef.current) return;
+      setIsLoading(false);
     }
-    load();
-    return () => {
-      isCancelled = true;
-    };
-  }, [getData, resolvedProductId, scheduleDate]);
+  }, [getData, scheduleDate]);
+  const loadRef = (0, import_react.useRef)(loadByProductId);
+  loadRef.current = loadByProductId;
+  (0, import_react.useEffect)(() => {
+    var _a2, _b2, _c2, _d2, _e2, _f2;
+    (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
+      module: "wallet_pass",
+      key: "page_load"
+    });
+    (_d2 = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.mountFunction) == null ? void 0 : _d2.call(
+      _c2,
+      "wallet_pass",
+      "restore_buy_wallet_pass",
+      (id) => {
+        console.log("重置状态", id);
+        console.log("宽", window.innerWidth);
+        console.log("高", window.innerHeight);
+        console.log("设备像素比", window.devicePixelRatio);
+        resetForInit();
+        if (id || id === 0) loadRef.current(id);
+        setIsEdit(false);
+      }
+    );
+    (_f2 = (_e2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e2.mountFunction) == null ? void 0 : _f2.call(
+      _e2,
+      "wallet_pass",
+      "edit_buy_wallet_pass",
+      (data) => {
+        console.log("编辑状态", data);
+        const productData2 = JSON.parse(data);
+        loadRef.current(productData2.productId, {
+          shouldInitSku: false,
+          shouldInitQuantity: false
+        });
+        setSkuValue({
+          product_id: productData2.productId,
+          product_variant_id: Number(productData2.variantId),
+          bundle: [],
+          option: []
+        });
+        setSkuDefaultValue({
+          product_id: productData2.productId,
+          product_variant_id: Number(productData2.variantId),
+          bundle: [],
+          option: []
+        });
+        setIsEdit(true);
+      }
+    );
+    if (initialProductId || initialProductId === 0) loadRef.current(initialProductId);
+  }, []);
   const coverUrl = (0, import_react.useMemo)(() => {
     return (productData == null ? void 0 : productData.cover) || (productData == null ? void 0 : productData.image) || "";
   }, [productData]);
@@ -182,55 +244,51 @@ function KioskSkuDetail(props) {
     return `${priceSign}${symbol}${deTotal.abs().toNumber().toFixed(2)}`;
   }, [itemTotal, symbol]);
   const handleAddToCart = () => {
+    var _a2;
     if (!productData) return;
-    const productBundle = [];
-    skuValue.bundle.forEach((item) => {
-      if (!item.num || item.num < 1) return;
-      let targetBundleData;
-      let bundle_group_id;
-      for (let i = 0; i < productData.bundle_group.length; i++) {
-        const { id, bundle_item = [] } = productData.bundle_group[i];
-        for (let j = 0; j < bundle_item.length; j++) {
-          if (item.id === bundle_item[j].bundle_product_id) {
-            bundle_group_id = id;
-            targetBundleData = bundle_item[j];
-            break;
-          }
-        }
-      }
-      productBundle.push({
-        bundle_group_id,
-        bundle_id: targetBundleData.id,
-        bundle_product_id: item.id,
-        bundle_variant_id: targetBundleData.bundle_variant_id,
-        num: item.num,
-        extension_id: targetBundleData.extension_id,
-        extension_type: targetBundleData.extension_type
-      });
-    });
-    productData.option_group = [];
-    productData.variant_group = [];
+    (_a2 = skuOptionsSelectionRef.current) == null ? void 0 : _a2.validate();
+    if (!skuValue.product_variant_id) {
+      Toast.info(import_utils.locales.getText("pisell2.text.kiosk.sku.detail.toast.select.variant"));
+      return;
+    }
+    ;
     const obj = {
       productDetail: productData,
       quantity,
+      variantId: skuValue.product_variant_id,
       pricePerUnit: unitPrice,
-      bundlePrice: productData.price,
-      productBundle
+      isWebBuyWalletPass: true
     };
     interaction.utils.postMessageToApp({
-      module: "tickets",
+      module: "wallet_pass",
       key: "buy_wallet_pass",
       data: {
         // 把洗好的数据放这里
-        productData: [obj]
+        productData: obj,
+        isEdit
       }
     });
   };
-  return /* @__PURE__ */ import_react.default.createElement(
+  const onBack = () => {
+    interaction.utils.postMessageToApp({
+      module: "wallet_pass",
+      key: "back"
+    });
+  };
+  const stageStyle = (0, import_react.useMemo)(() => {
+    return {
+      ...style || {},
+      width: 1080,
+      height: 1800,
+      transform: `translateX(-50%) scale(${stageScale})`,
+      transformOrigin: "top center"
+    };
+  }, [stageScale, style]);
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail-viewport" }, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: (0, import_classnames.default)("pisell-kiosk-sku-detail", className),
-      style
+      style: stageStyle
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__hero" }, coverUrl ? /* @__PURE__ */ import_react.default.createElement(
       "img",
@@ -246,9 +304,10 @@ function KioskSkuDetail(props) {
           __html: descriptionText
         }
       }
-    )), !!priceRangeText && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__price-range" }, priceRangeText, " ", currency_code), !!errorText && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__error" }, errorText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__options-card" }, productData ? /* @__PURE__ */ import_react.default.createElement(
+    )), !!priceRangeText && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__price-range" }, priceRangeText, " ", currency_code), !!errorText && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__error" }, errorText)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__options-card" }, productData && Array.isArray(productData == null ? void 0 : productData.variant) && productData.variant.length > 0 ? /* @__PURE__ */ import_react.default.createElement(
       import_skuOptionsSelection.default,
       {
+        ref: skuOptionsSelectionRef,
         dataSource: productData,
         value: skuDefaultValue,
         skuCardConfig: {
@@ -273,22 +332,7 @@ function KioskSkuDetail(props) {
         onClick: onBack
       },
       import_utils.locales.getText("pisell2.text.kiosk.sku.detail.btn.back")
-    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__footer-center" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__item-total" }, import_utils.locales.getText("pisell2.text.kiosk.sku.detail.item.total"), ":", " ", itemTotalText), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__qty" }, /* @__PURE__ */ import_react.default.createElement(
-      import_pisellNumberSelector.default,
-      {
-        value: quantity,
-        width: "140px",
-        onChange: (v) => {
-          if (!v) return;
-          setQuantity(v);
-        },
-        min: 1,
-        max: 99999,
-        step: 1,
-        size: "large",
-        enablePriceAdjust: false
-      }
-    ))), /* @__PURE__ */ import_react.default.createElement(
+    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__footer-center" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-kiosk-sku-detail__item-total" }, import_utils.locales.getText("pisell2.text.kiosk.sku.detail.item.total"), ":", " ", itemTotalText)), /* @__PURE__ */ import_react.default.createElement(
       import_materials.Button,
       {
         type: "primary",
@@ -297,9 +341,11 @@ function KioskSkuDetail(props) {
         onClick: handleAddToCart,
         disabled: !productData || isLoading
       },
-      import_utils.locales.getText("pisell2.text.kiosk.sku.detail.btn.add.to.cart")
+      import_utils.locales.getText(
+        isEdit ? "pisell2.text.kiosk.sku.detail.btn.update" : "pisell2.text.kiosk.sku.detail.btn.add.to.cart"
+      )
     ))
-  );
+  ));
 }
 var kioskSkuDetail_default = KioskSkuDetail;
 function getQueryFirstMatch(params) {
@@ -324,3 +370,24 @@ function getQueryFirstMatch(params) {
   if (queryIndex === -1) return null;
   return tryRead(hash.slice(queryIndex + 1));
 }
+function useDesignStageScale(params) {
+  const designWidth = params.designWidth;
+  const designHeight = params.designHeight;
+  const [scale, setScale] = (0, import_react.useState)(1);
+  (0, import_react.useEffect)(() => {
+    const update = () => {
+      const viewportWidth = window.innerWidth || designWidth;
+      const viewportHeight = window.innerHeight || designHeight;
+      const nextScale = Math.min(
+        viewportWidth / designWidth,
+        viewportHeight / designHeight,
+        1
+      );
+      setScale(nextScale);
+    };
+    update();
+    window.addEventListener("resize", update);
+    return () => window.removeEventListener("resize", update);
+  }, [designHeight, designWidth]);
+  return scale;
+}

package/lib/components/kioskSkuDetail/index.less

@@ -1,7 +1,17 @@
-.pisell-kiosk-sku-detail {
+.pisell-kiosk-sku-detail-viewport {
   position: relative;
-  width: 100%;
+  width: 100vw;
   height: 100vh;
+  overflow: hidden;
+  background: #f2f4f7;
+}
+
+.pisell-kiosk-sku-detail {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  width: 1080px;
+  height: 1800px;
   overflow-y: auto;
   background: #f2f4f7;
   background-size: cover;
@@ -11,12 +21,40 @@
 }
 
 .pisell-kiosk-sku-detail__content {
-  max-width: 1000px;
+  width: 100%;
   margin: 0 auto;
   display: flex;
   flex-direction: column;
   gap: 40px;
   padding-bottom: 220px; // avoid overlap with footer
+  .pisell-pro-selector_header-content {
+    .pisell-pro-selector_header-content-title {
+      color: #101828;
+      font-size: 36px !important;
+    }
+    .pisell-lowcode-tag {
+      font-size: 22px !important;
+      margin-left: 20px !important;
+      padding-top: 5px !important;
+      padding-bottom: 5px !important;
+    }
+  }
+  .pisell-pro-selector_tip {
+    font-size: 36px !important;
+    color: #667085;
+  }
+  .pisell-sku-options-selection-variant-card__title {
+    font-size: 36px !important;
+    font-weight: 600 !important;
+    color: #101828;
+  }
+  .pisell-sku-options-selection-variant-card__price {
+    font-size: 30px !important;
+  }
+  .pisell-sku-options-selection-variant-card {
+    padding-top: 30px !important;
+    padding-bottom: 30px !important;
+  }
 }
 
 .pisell-kiosk-sku-detail__hero {
@@ -55,7 +93,6 @@
 }
 
 .pisell-kiosk-sku-detail__desc {
-  max-width: 860px;
   font-size: 36px;
   line-height: 44px;
   font-weight: 400;
@@ -91,11 +128,13 @@
 }
 
 .pisell-kiosk-sku-detail__footer {
+  // 注意：父容器有 transform(scale)，fixed 会相对该容器定位（适配小分辨率缩放舞台）
   position: fixed;
-  left: 50%;
+  left: 30px;
+  right: 30px;
   bottom: 30px;
-  transform: translateX(-50%);
-  width: min(1020px, calc(100% - 60px));
+  transform: none;
+  width: auto;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -125,6 +164,9 @@
   display: flex;
   align-items: center;
   gap: 20px;
+  // 靠右，并与右侧主按钮保持 20px 间距
+  margin-left: auto;
+  margin-right: 20px;
 }
 
 .pisell-kiosk-sku-detail__item-total {

package/lib/components/kioskSkuDetail/locales.d.ts

@@ -3,19 +3,25 @@ declare const _default: {
         'pisell2.text.kiosk.sku.detail.btn.back': string;
         'pisell2.text.kiosk.sku.detail.item.total': string;
         'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
         'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
     };
     'zh-CN': {
         'pisell2.text.kiosk.sku.detail.btn.back': string;
         'pisell2.text.kiosk.sku.detail.item.total': string;
         'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
         'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
     };
     'zh-TW': {
         'pisell2.text.kiosk.sku.detail.btn.back': string;
         'pisell2.text.kiosk.sku.detail.item.total': string;
         'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
         'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
     };
 };
 export default _default;

package/lib/components/kioskSkuDetail/locales.js

@@ -27,18 +27,24 @@ var locales_default = {
     "pisell2.text.kiosk.sku.detail.btn.back": "Back",
     "pisell2.text.kiosk.sku.detail.item.total": "Item total",
     "pisell2.text.kiosk.sku.detail.btn.add.to.cart": "Add to cart",
-    "pisell2.text.kiosk.sku.detail.loading.options": "Loading options…"
+    "pisell2.text.kiosk.sku.detail.btn.update": "Update",
+    "pisell2.text.kiosk.sku.detail.loading.options": "Loading options…",
+    "pisell2.text.kiosk.sku.detail.toast.select.variant": "Please select a top-up option"
   },
   "zh-CN": {
     "pisell2.text.kiosk.sku.detail.btn.back": "返回",
     "pisell2.text.kiosk.sku.detail.item.total": "小计",
     "pisell2.text.kiosk.sku.detail.btn.add.to.cart": "加入购物车",
-    "pisell2.text.kiosk.sku.detail.loading.options": "正在加载选项…"
+    "pisell2.text.kiosk.sku.detail.btn.update": "更新",
+    "pisell2.text.kiosk.sku.detail.loading.options": "正在加载选项…",
+    "pisell2.text.kiosk.sku.detail.toast.select.variant": "请选择充值选项"
   },
   "zh-TW": {
     "pisell2.text.kiosk.sku.detail.btn.back": "返回",
     "pisell2.text.kiosk.sku.detail.item.total": "小計",
     "pisell2.text.kiosk.sku.detail.btn.add.to.cart": "加入購物車",
-    "pisell2.text.kiosk.sku.detail.loading.options": "正在載入選項…"
+    "pisell2.text.kiosk.sku.detail.btn.update": "更新",
+    "pisell2.text.kiosk.sku.detail.loading.options": "正在載入選項…",
+    "pisell2.text.kiosk.sku.detail.toast.select.variant": "請選擇充值選項"
   }
 };

package/lib/components/pay/toB/components/EFTPOS/index.js

@@ -97,7 +97,14 @@ var EFTPOS = (props, ref) => {
         name: payMethod.name,
         symbol: params.symbol,
         amount: params.amount,
-        device_number
+        device_number,
+        custom_payment_id: payMethod == null ? void 0 : payMethod.id,
+        custom_payment_code: payMethod == null ? void 0 : payMethod.code,
+        custom_payment_name: payMethod == null ? void 0 : payMethod.name,
+        custom_payment_type: payMethod == null ? void 0 : payMethod.type,
+        operator_type: params == null ? void 0 : params.operator_type,
+        operator_id: params == null ? void 0 : params.operator_id,
+        platform: params == null ? void 0 : params.platform
       },
       mode
     };

package/lib/components/pay/toB/components/MX51/index.js

@@ -84,7 +84,8 @@ var MX51 = (props, ref) => {
             msg: _res == null ? void 0 : _res.msg,
             amount: (_a2 = _res == null ? void 0 : _res.data) == null ? void 0 : _a2.amount,
             surcharge: (_b2 = _res == null ? void 0 : _res.data) == null ? void 0 : _b2.surcharge,
-            uniquePaymentNumber: _res == null ? void 0 : _res.uuid
+            uniquePaymentNumber: _res == null ? void 0 : _res.uuid,
+            action: _res == null ? void 0 : _res.action
           };
           isSame = (_res == null ? void 0 : _res.uuid) === uniquePaymentNumber;
           if (isSame) {

package/lib/components/pay/toB/paymentMethods/index.js

@@ -76,7 +76,8 @@ var PaymentMethods = (props, ref) => {
       data: {
         amount: res.amount,
         surcharge: res.surcharge,
-        uniquePaymentNumber: res.uniquePaymentNumber
+        uniquePaymentNumber: res.uniquePaymentNumber,
+        action: res.action
       },
       msg: res.msg
     };

package/lib/components/pay/toB/types/index.d.ts

@@ -14,6 +14,7 @@ export interface ToBPayParams {
             symbol?: string;
             amount: string;
             surcharge?: string;
+            [key: string]: any;
         };
         mode: 'pay' | 'refund';
     };
@@ -27,6 +28,12 @@ export declare type ToBPayCallback = (res: {
         surMoney?: number;
         surcharge?: number;
         uniquePaymentNumber?: string;
+        /**
+         * @description
+         * 支付组件返回的额外动作指令（例如：取消订单并开始新订单）
+         * PaymentModal 里会根据该字段执行对应流程。
+         */
+        action?: 'cancel_order' | string;
     };
     msg?: string;
 }) => void;
@@ -57,11 +64,13 @@ export interface MX51PayResult {
     amount: number;
     surcharge: number;
     uniquePaymentNumber: string;
+    action?: 'cancel_order' | string;
 }
 /**
  * @title 原生MX51支付结果
  */
 export interface NativeMX51PayResult {
+    action?: 'cancel_order' | string;
     code: string;
     msg?: string;
     data: {

package/lib/components/pay/toC/PaymentList/index.d.ts

@@ -12,7 +12,7 @@ export interface PaymentListProps {
     renderTitle?: () => React.ReactNode;
 }
 export interface PaymentListRef {
-    init: (props: any) => {};
+    init: (props: any, amount?: number) => {};
     calculateSurcharge: (amount: number) => any;
 }
 declare const _default: React.ForwardRefExoticComponent<PaymentListProps & React.RefAttributes<unknown>>;