@pisell/private-materials 6.7.7 → 6.7.8

package/lib/components/eftposPay/payo/config.js

@@ -42,7 +42,6 @@ var import_helper = require("../helper");
 var import_hooks = require("../hooks");
 var import_store = require("../store");
 var import_hooks2 = require("./hooks");
-var import_payment = require("./payment");
 var POS = ({
   api,
   onChange
@@ -69,13 +68,6 @@ var POS = ({
   const initRef = (0, import_react.useRef)(false);
   const unloadRef = (0, import_react.useRef)(false);
   const [check] = (0, import_hooks2.useValidate)(1e3 * 60);
-  const { run: paymentRun, clean: paymentClean } = (0, import_payment.usePayment)({
-    payApi: api.pay,
-    checkApi: api.check,
-    shouldContinue: () => {
-      return !(unloadRef.current || !netRef.current);
-    }
-  });
   (0, import_react.useEffect)(() => {
     failRef.current = fail;
   }, [fail]);
@@ -134,7 +126,7 @@ var POS = ({
     );
   };
   (0, import_react.useEffect)(() => {
-    var _a, _b, _c;
+    var _a, _b;
     if (statusRef.current === import_const.StatusEnum.Success || statusRef.current === import_const.StatusEnum.Fail) {
       return;
     }
@@ -153,98 +145,82 @@ var POS = ({
       })
     );
     controllerRef.current = new AbortController();
-    const isPay = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay;
-    const apiParams = isPay ? {
-      ...(custom == null ? void 0 : custom.platform) ? {
-        operator_id: custom.operator_id,
-        operator_type: custom.operator_type,
-        platform: custom.platform,
-        custom_payment_id: custom.custom_payment_id
-      } : {},
-      original_amount: payRef.current.amount,
-      service_charge: {
-        amount: payRef.current.surMoney,
-        percentage: payRef.current.surPercentRate
-      },
-      order_id: orderIdRef.current,
-      amount: payRef.current.total,
-      card_reader_type: eftposRef.current,
-      card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
-      number: numRef.current,
-      pay_param_base64: encodeURIComponent(
-        btoa(
-          encodeURIComponent(
-            JSON.stringify({
-              ...dataRef.current,
-              number: numRef.current
-            })
+    const resultPromise = modeRef.current === import_const.ModeEnum.Pay || modeRef.current === import_const.ModeEnum.FullPay ? api.pay(
+      {
+        ...(custom == null ? void 0 : custom.platform) ? {
+          operator_id: custom.operator_id,
+          operator_type: custom.operator_type,
+          platform: custom.platform,
+          custom_payment_id: custom.custom_payment_id,
+          service_charge: {
+            amount: payRef.current.surMoney,
+            percentage: payRef.current.surPercentRate
+          },
+          original_amount: payRef.current.amount
+        } : {},
+        order_id: orderIdRef.current,
+        amount: payRef.current.total,
+        card_reader_type: eftposRef.current,
+        card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
+        number: numRef.current,
+        pay_param_base64: encodeURIComponent(
+          btoa(
+            encodeURIComponent(
+              JSON.stringify({
+                ...dataRef.current,
+                number: numRef.current
+              })
+            )
           )
         )
-      )
-    } : {
-      order_id: orderIdRef.current,
-      amount: amountRef.current,
-      card_reader_type: eftposRef.current,
-      card_reader_id: (_b = deviceRef.current) == null ? void 0 : _b.id,
-      number: numRef.current,
-      pay_param_base64: encodeURIComponent(
-        btoa(
-          encodeURIComponent(
-            JSON.stringify({
-              ...dataRef.current,
-              number: numRef.current
-            })
+      },
+      { signal: controllerRef.current.signal }
+    ) : api.refund(
+      {
+        order_id: orderIdRef.current,
+        amount: amountRef.current,
+        card_reader_type: eftposRef.current,
+        card_reader_id: (_b = deviceRef.current) == null ? void 0 : _b.id,
+        number: numRef.current,
+        pay_param_base64: encodeURIComponent(
+          btoa(
+            encodeURIComponent(
+              JSON.stringify({
+                ...dataRef.current,
+                number: numRef.current
+              })
+            )
           )
         )
-      )
-    };
-    if (isPay) {
-      paymentRun({
-        paymentType: import_payment.ActionType.Pay,
-        paymentNum: numRef.current,
-        orderId: orderIdRef.current,
-        deviceId: (_c = deviceRef.current) == null ? void 0 : _c.id,
-        params: apiParams,
-        callbacks: {
-          onSuccess: (res) => {
-            success(res);
-          },
-          onError: (err) => {
-            console.log("err = >>>>>", err);
-            failRef.current(err, true);
-          }
-        }
-      });
-      return;
-    } else {
-      const resultPromise = api.refund(apiParams, { signal: controllerRef.current.signal });
-      resultPromise.then((res) => {
-        console.log("netRef.current111 = ", netRef.current);
-        if (unloadRef.current || !netRef.current) {
-          return;
-        }
-        if (res && `${res.code}` === "200") {
-          success(res);
-          return;
-        }
-        return Promise.reject(res);
-      }).catch((err) => {
-        console.log(
-          "netRef.current222 = ",
-          netRef.current,
-          unloadRef.current,
-          err
-        );
-        if (unloadRef.current || !netRef.current) {
-          return;
-        }
-        if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
-          checkApi();
-          return;
-        }
-        failRef.current(err, true);
-      });
-    }
+      },
+      { signal: controllerRef.current.signal }
+    );
+    resultPromise.then((res) => {
+      console.log("netRef.current111 = ", netRef.current);
+      if (unloadRef.current || !netRef.current) {
+        return;
+      }
+      if (res && `${res.code}` === "200") {
+        success(res);
+        return;
+      }
+      return Promise.reject(res);
+    }).catch((err) => {
+      console.log(
+        "netRef.current222 = ",
+        netRef.current,
+        unloadRef.current,
+        err
+      );
+      if (unloadRef.current || !netRef.current) {
+        return;
+      }
+      if (!(err == null ? void 0 : err.code) || `${err.code}` === import_const.PayStatus.Timeout) {
+        checkApi();
+        return;
+      }
+      failRef.current(err, true);
+    });
   }, [api, check, dispatch, onChange]);
   (0, import_react.useEffect)(
     () => () => {
@@ -254,7 +230,6 @@ var POS = ({
       if (clearRef.current) {
         clearTimeout(clearRef.current);
       }
-      paymentClean();
     },
     []
   );

package/lib/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -295,10 +295,10 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "deviceList" | "amount" | "pay" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/eftposPay/tyro/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/lib/components/eftposPay/tyro/index.js

@@ -158,12 +158,6 @@ var tyro_default = ({
       response: {},
       metadata: {
         receipt: []
-      },
-      _config: {
-        retry: {
-          count: 10,
-          delay: 500
-        }
       }
     }).then((res) => {
       requestIdRef.current = res.data.id;
@@ -235,12 +229,6 @@ var tyro_default = ({
       response: {},
       metadata: {
         receipt: []
-      },
-      _config: {
-        retry: {
-          count: 10,
-          delay: 500
-        }
       }
     }).then((res) => {
       requestIdRef.current = res.data.id;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => import("react").JSX.Element;
 export default Status;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const DayItem: (props: any) => import("react").JSX.Element;
 export default DayItem;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => import("react").JSX.Element;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Status: (props: any) => import("react").JSX.Element;
 export default Status;

package/lib/components/index.d.ts

@@ -20,5 +20,4 @@ import StepController from './stepController';
 import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
 import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
-import Registry from './systemSettings/registry';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry, };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, };

package/lib/components/index.js

@@ -47,7 +47,6 @@ __export(components_exports, {
   PinVerifyModal: () => import_pinVerifyModal.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
   ProductExtension: () => import_productExtension.default,
-  Registry: () => import_registry.default,
   RuleSetting: () => import_ruleSetting.default,
   SaaSAdminAuth: () => import_admin.SaaSAdminAuth,
   SaaSManagermentAuth: () => import_admin.SaaSManagermentAuth,
@@ -84,7 +83,6 @@ var import_stepController = __toESM(require("./stepController"));
 var import_pinModal = __toESM(require("./pinModal"));
 var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
 var import_admin = require("./authentication/admin");
-var import_registry = __toESM(require("./systemSettings/registry"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Booking,
@@ -105,7 +103,6 @@ var import_registry = __toESM(require("./systemSettings/registry"));
   PinVerifyModal,
   PisellSelectCustomerModal,
   ProductExtension,
-  Registry,
   RuleSetting,
   SaaSAdminAuth,
   SaaSManagermentAuth,

package/lib/components/list/List.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(List_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_classnames = __toESM(require("classnames"));
+var import_Tab = __toESM(require("./components/Tab"));
 var import_Pagination = __toESM(require("./components/Pagination"));
 var import_EmptyState = __toESM(require("./components/EmptyState"));
 var import_ScrollLoader = __toESM(require("./components/ScrollLoader"));
@@ -47,7 +48,6 @@ var import_locales = __toESM(require("./locales"));
 var import_useWaterfall = __toESM(require("./hooks/useWaterfall"));
 var import_useListState = require("./hooks/useListState");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
-var import_utils = require("./utils");
 var MOCK_LIST_DATA = (() => {
   const mockData = [];
   for (let i = 0; i < 8; i++) {
@@ -131,7 +131,6 @@ var List = (props) => {
     externalCurrentPage: pagination == null ? void 0 : pagination.current,
     tabItems,
     defaultPageSize,
-    tabStyle,
     onLoadData
   });
   const { activeTab, isStickyActive } = listState;
@@ -144,14 +143,6 @@ var List = (props) => {
     }
     return fieldValue === targetValue;
   };
-  const dataIdMap = (0, import_react.useMemo)(() => {
-    return data.reduce((pre, cur) => {
-      return {
-        ...pre,
-        [cur.id]: cur
-      };
-    }, {});
-  }, [data]);
   const processedData = (0, import_react.useMemo)(() => {
     const sourceData = loading ? MOCK_LIST_DATA : data || [];
     if (tabStyle === "anchor" && tabItems.length > 0) {
@@ -201,30 +192,20 @@ var List = (props) => {
       if (!activeTab || activeTab === "all") {
         return [{ tabKey: "all", tabLabel: "", items: filteredData }];
       }
-      if (Array.isArray(activeTab)) {
-        const productIds = (0, import_utils.findProductIdsByPath)(tabItems, activeTab, 0);
-        const items = productIds.map((id) => dataIdMap[id]);
-        return [{
-          tabKey: activeTab,
-          tabLabel: "",
-          items
-        }];
-      } else {
-        const currentTab = tabItems.find((tab) => tab.key === activeTab);
-        if (currentTab && currentTab.group) {
-          const filterField = "category";
-          filteredData = filteredData.filter((item) => matchesFieldValue(item[filterField], currentTab.group));
-        } else if (currentTab) {
-          const possibleFields = ["category", "status", "type", tabGroup];
-          for (const field of possibleFields) {
-            if (field && field !== "字段" && filteredData.some((item) => matchesFieldValue(item[field], activeTab))) {
-              filteredData = filteredData.filter((item) => matchesFieldValue(item[field], activeTab));
-              break;
-            }
+      const currentTab = tabItems.find((tab) => tab.key === activeTab);
+      if (currentTab && currentTab.group) {
+        const filterField = "category";
+        filteredData = filteredData.filter((item) => matchesFieldValue(item[filterField], currentTab.group));
+      } else if (currentTab) {
+        const possibleFields = ["category", "status", "type", tabGroup];
+        for (const field of possibleFields) {
+          if (field && field !== "字段" && filteredData.some((item) => matchesFieldValue(item[field], activeTab))) {
+            filteredData = filteredData.filter((item) => matchesFieldValue(item[field], activeTab));
+            break;
           }
         }
-        return [{ tabKey: activeTab, tabLabel: (currentTab == null ? void 0 : currentTab.label) || "", items: filteredData }];
       }
+      return [{ tabKey: activeTab, tabLabel: (currentTab == null ? void 0 : currentTab.label) || "", items: filteredData }];
     }
   }, [data, activeTab, tabItems, tabGroup, tabStyle, loading]);
   const totalDataLength = (0, import_react.useMemo)(() => {
@@ -521,10 +502,11 @@ var List = (props) => {
         className: headerClasses
       },
       /* @__PURE__ */ import_react.default.createElement(
-        import_materials.PisellTabbar,
+        import_Tab.default,
         {
-          dataSource: tabItems,
-          value: activeTab,
+          className: (0, import_classnames.default)("pisell-list-tabs", `pisell-list-tabs-${tabStyle}`),
+          activeKey: activeTab,
+          items: tabItems,
           onChange: handleTabChangeWithScroll
         }
       )

package/lib/components/list/hooks/useListState.d.ts

@@ -6,7 +6,7 @@ export interface ListState {
 }
 export declare type ListAction = {
     type: 'SET_ACTIVE_TAB';
-    payload: string[] | string;
+    payload: string;
 } | {
     type: 'SET_CURRENT_PAGE';
     payload: number;
@@ -25,8 +25,6 @@ export interface UseListStateProps {
     defaultPageSize: number;
     /** 数据加载回调 */
     onLoadData?: (params: LoadDataParams) => void;
-    /** tab样式 */
-    tabStyle: 'anchor' | 'switch' | 'none';
 }
 export interface UseListStateReturn {
     state: ListState;
@@ -34,7 +32,7 @@ export interface UseListStateReturn {
     setCurrentPage: (page: number) => void;
     setStickyActive: (active: boolean) => void;
     resetPage: () => void;
-    handleTabChange: (key: string[] | string) => void;
+    handleTabChange: (key: string) => void;
     handlePageChange: (page: number, size?: number) => void;
     handleShowSizeChange: (current: number, size: number) => void;
     handleLoadMore: () => void;
@@ -42,4 +40,4 @@ export interface UseListStateReturn {
     handleScrollLoad: () => void;
     actualCurrentPage: number;
 }
-export declare const useListState: ({ externalCurrentPage, tabItems, defaultPageSize, onLoadData, tabStyle, }: UseListStateProps) => UseListStateReturn;
+export declare const useListState: ({ externalCurrentPage, tabItems, defaultPageSize, onLoadData, }: UseListStateProps) => UseListStateReturn;

package/lib/components/list/hooks/useListState.js

@@ -41,27 +41,14 @@ var useListState = ({
   externalCurrentPage,
   tabItems,
   defaultPageSize,
-  onLoadData,
-  tabStyle
+  onLoadData
 }) => {
   const initialState = {
     activeTab: tabItems.length > 0 ? tabItems[0].key : "all",
     currentPage: 1,
     isStickyActive: false
   };
-  const isSetDefaultTabRef = (0, import_react.useRef)(false);
   const [state, dispatch] = (0, import_react.useReducer)(listStateReducer, initialState);
-  (0, import_react.useEffect)(() => {
-    var _a, _b;
-    if (tabStyle === "switch" && tabItems.length > 0 && !isSetDefaultTabRef.current) {
-      isSetDefaultTabRef.current = true;
-      const defaultTab = [tabItems[0].key];
-      if (((_b = (_a = tabItems[0]) == null ? void 0 : _a.children) == null ? void 0 : _b.length) > 0) {
-        defaultTab.push("0");
-      }
-      setActiveTab(defaultTab);
-    }
-  }, [tabItems, tabStyle]);
   const actualCurrentPage = externalCurrentPage || state.currentPage;
   const setActiveTab = (0, import_react.useCallback)((tab) => {
     dispatch({ type: "SET_ACTIVE_TAB", payload: tab });

package/lib/components/list/styles/header.less

@@ -58,12 +58,12 @@
       top: 0;
       z-index: 10;
       /* 毛玻璃效果 */
-      background: transparent;
+      background: rgba(255, 255, 255, 0.80);
       backdrop-filter: blur(12px);
-      padding: 0;
+      border-bottom: 1px solid #D0D5DD;
+      padding-bottom: 12px;
       box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
       transition: box-shadow 0.2s ease, backdrop-filter 0.2s ease, background 0.2s ease;
-      border: none;
     }
 
   }

package/lib/components/list/utils/index.d.ts

@@ -1,16 +1,4 @@
 /**
  * List 组件工具函数导出
  */
-export { useGetText, createGetText, default as createGetTextDefault, type SupportedLanguage, type LocalesObject, type GetTextFunctions, } from './getText';
-/**
- * 根据层级路径数组递归查找对应节点的 productIds
- * @param nodes 当前层级的节点列表
- * @param levelPath 层级路径数组，每个元素是对应层级的分类 ID
- * @param currentLevel 当前遍历的层级索引
- * @returns 找到的节点的 productIds，找不到返回空数组
- *
- * @description
- * 特殊逻辑：如果 levelPath 最后一位是 0，则取倒数第二层节点的 productIds
- * 例如：[1, 2, 0] -> 取 id=2 节点的 productIds
- */
-export declare const findProductIdsByPath: (nodes: any[], levelPath: (string | number)[], currentLevel?: number) => number[];
+export { useGetText, createGetText, default as createGetTextDefault, type SupportedLanguage, type LocalesObject, type GetTextFunctions } from './getText';

package/lib/components/list/utils/index.js

@@ -31,40 +31,13 @@ var utils_exports = {};
 __export(utils_exports, {
   createGetText: () => import_getText.createGetText,
   createGetTextDefault: () => import_getText.default,
-  findProductIdsByPath: () => findProductIdsByPath,
   useGetText: () => import_getText.useGetText
 });
 module.exports = __toCommonJS(utils_exports);
 var import_getText = __toESM(require("./getText"));
-var findProductIdsByPath = (nodes, levelPath, currentLevel = 0) => {
-  const lastItem = levelPath[levelPath.length - 1];
-  const effectivePath = (lastItem === 0 || lastItem === "0") && levelPath.length > 1 ? levelPath.slice(0, -1) : levelPath;
-  if (!nodes || nodes.length === 0 || currentLevel >= effectivePath.length) {
-    return [];
-  }
-  const targetId = effectivePath[currentLevel];
-  const targetNode = nodes.find(
-    (node) => String(node.id) === String(targetId) || String(node.key) === String(targetId)
-  );
-  if (!targetNode) {
-    return [];
-  }
-  if (currentLevel === effectivePath.length - 1) {
-    return targetNode.productIds || [];
-  }
-  if (targetNode.children && targetNode.children.length > 0) {
-    return findProductIdsByPath(
-      targetNode.children,
-      effectivePath,
-      currentLevel + 1
-    );
-  }
-  return targetNode.productIds || [];
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createGetText,
   createGetTextDefault,
-  findProductIdsByPath,
   useGetText
 });

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -258,7 +258,7 @@ var checkTDSAuth = async (step2, step3, callback) => {
         billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
         billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
         billAddrState: paymentInfo.billingAddress.billAddrState,
-        threeDSCompInd: isPre ? "" : threeDSCompInd || "N",
+        threeDSCompInd: isPre ? "" : threeDSCompInd,
         threeDSServerTransID: isPre ? "" : threeDSServerTransID,
         threeDSRequestorAuthenticationInd: "01",
         threeDSRequestorURL: window.location.href,
@@ -311,28 +311,26 @@ var createChallengeIframe = (challengeData, callback) => {
   };
   return new Promise((res, rej) => {
     let timer = null;
-    const handleMessage = (event) => {
-      if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf("securesuite") !== -1) {
-        if (typeof event.data.cres == "string") {
-          if (timer) {
-            clearTimeout(timer);
-          }
-          res(event.data.cres);
-          closeIframe();
-        }
-      }
-    };
     timer = setTimeout(() => {
       log({
         msg: "第五步: 60秒超时则走N逻辑",
         data: challengeData
       });
-      window.removeEventListener("message", handleMessage);
       rej("time out");
     }, 2 * 60 * 1e3);
     window.addEventListener(
       "message",
-      handleMessage,
+      (event) => {
+        if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf("securesuite") !== -1) {
+          if (typeof event.data.cres == "string") {
+            if (timer) {
+              clearTimeout(timer);
+            }
+            res(event.data.cres);
+            closeIframe();
+          }
+        }
+      },
       false
     );
   });

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const StripePayment: () => import("react").JSX.Element;
 export default StripePayment;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const PageLoading: () => import("react").JSX.Element;
 export default PageLoading;

package/lib/components/pay/toC/PaymentMethods/WalletPass/serve.d.ts

@@ -50,12 +50,6 @@ export declare type WalletPassDataType = {
     shop: Shop;
     wallet_pass_usage?: any;
     balance_par_value: string;
-    custom_schedule_snapshot?: {
-        data: any[];
-    };
-    metadata?: {
-        validity_type: string;
-    };
 };
 declare type Shop = {
     id: number;