@pisell/private-materials 3.3.85 → 3.3.86

package/es/components/eftposPay/linkly/index.js

@@ -0,0 +1,197 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import React, { useEffect, useRef } from 'react';
+import { Button } from 'antd';
+import { locales } from '@pisell/utils';
+import { useContextData, useDispatch, updateCustom, updateState, updateNextStep } from "../store";
+import { useFail, useStoreRef } from "../hooks";
+import useEngineContext from "../../../hooks/useEngineContext";
+import { request } from "../../../utils";
+import Step from "../component/step/step";
+import { StatusEnum } from "../const";
+import { useLinklyCancel, useLinklyPayOrRefund, useTimeResultQuery, useLinklySignature } from "./hooks";
+import { LinklyActionStatus } from "./const";
+import { getPayParams } from "../helper";
+var Linkly = function Linkly(_ref) {
+  var api = _ref.api,
+    onChange = _ref.onChange;
+  // 设置request
+  var context = useEngineContext();
+  var utils = context.appHelper.utils || {};
+  request.setRequest(utils === null || utils === void 0 ? void 0 : utils.request);
+  var _useContextData = useContextData(),
+    custom = _useContextData.custom,
+    status = _useContextData.status;
+  var _useStoreRef = useStoreRef(),
+    statusRef = _useStoreRef.statusRef,
+    netRef = _useStoreRef.netRef,
+    modeRef = _useStoreRef.modeRef,
+    amountRef = _useStoreRef.amountRef,
+    orderIdRef = _useStoreRef.orderIdRef,
+    numRef = _useStoreRef.numRef,
+    deviceRef = _useStoreRef.deviceRef,
+    payRef = _useStoreRef.payRef;
+  var dispatch = useDispatch();
+  var stepRef = useRef(custom === null || custom === void 0 ? void 0 : custom.step);
+  var fail = useFail(0);
+  var failRef = useRef(fail);
+  var initRef = useRef(false);
+  var controllerRef = useRef();
+  var unloadRef = useRef(false);
+  var clearRef = useRef();
+
+  // 检查是否可以继续处理接口返回结果，无网 或 已卸载 则不进行处理
+  var handleCheck = function handleCheck() {
+    return !(unloadRef.current || !netRef.current);
+  };
+  var handleLinklySuccess = function handleLinklySuccess(res) {
+    var resData = (res === null || res === void 0 ? void 0 : res.data) || {};
+    var receipt = Array.isArray(resData === null || resData === void 0 ? void 0 : resData.receipt) ? resData.receipt : [resData.receipt];
+    receipt = receipt.filter(function (item) {
+      return typeof item === 'string';
+    }).filter(Boolean);
+    dispatch(updateNextStep());
+    // 将所有步骤状态设为完成 resolve
+    dispatch(updateCustom({
+      card_reader_surcharge: (resData === null || resData === void 0 ? void 0 : resData.card_reader_surcharge) || 0,
+      receipt: receipt
+    }));
+
+    // 更新支付状态与文案
+    dispatch(updateState({
+      status: 'success',
+      title: locales.getText('page.eftpos-pay.text.successful')(modeRef.current)
+    }));
+    clearRef.current = setTimeout(function () {
+      var _deviceRef$current;
+      var params = getPayParams({
+        mode: modeRef.current,
+        amount: amountRef.current,
+        order_id: orderIdRef.current,
+        number: numRef.current,
+        device: deviceRef.current,
+        pay: payRef.current,
+        custom: {
+          card_reader_surcharge: (resData === null || resData === void 0 ? void 0 : resData.card_reader_surcharge) || 0,
+          receipt: receipt
+        }
+      }, 'success');
+      onChange('success', _objectSpread(_objectSpread({}, params), {}, {
+        receipt: (_deviceRef$current = deviceRef.current) !== null && _deviceRef$current !== void 0 && (_deviceRef$current = _deviceRef$current.setting) !== null && _deviceRef$current !== void 0 && _deviceRef$current.receipts ? [] : receipt
+      }));
+    }, 1000);
+  };
+  var _useLinklyPayOrRefund = useLinklyPayOrRefund(handleCheck),
+    payOrRefund = _useLinklyPayOrRefund.payOrRefund;
+  var _useLinklyCancel = useLinklyCancel(handleCheck),
+    linklyCancel = _useLinklyCancel.linklyCancel;
+  var _useTimeResultQuery = useTimeResultQuery(api, handleCheck, handleLinklySuccess),
+    resultQuery = _useTimeResultQuery.run,
+    stopResultQuery = _useTimeResultQuery.stop;
+  var _useLinklySignature = useLinklySignature(handleCheck),
+    linklySignature = _useLinklySignature.linklySignature;
+  useEffect(function () {
+    stepRef.current = custom === null || custom === void 0 ? void 0 : custom.step;
+  }, [custom === null || custom === void 0 ? void 0 : custom.step]);
+  useEffect(function () {
+    failRef.current = fail;
+  }, [fail]);
+  useEffect(function () {
+    if (statusRef.current === StatusEnum.Success || statusRef.current === StatusEnum.Fail) {
+      return;
+    }
+    if (initRef.current) {
+      return;
+    }
+    initRef.current = true;
+
+    // 存在支付流水号
+    if (numRef.current) {
+      resultQuery();
+      return;
+    }
+    payOrRefund(resultQuery, handleLinklySuccess);
+  }, []);
+  useEffect(function () {
+    return function () {
+      var _controllerRef$curren;
+      (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 || _controllerRef$curren.abort();
+      unloadRef.current = true;
+      if (clearRef.current) {
+        clearTimeout(clearRef.current);
+      }
+    };
+  }, []);
+
+  /**
+   * 取消支付
+   */
+  var onCancel = function onCancel() {
+    stopResultQuery();
+    linklyCancel(resultQuery);
+  };
+
+  /**
+   * 拒绝签名
+   */
+  var onDecline = function onDecline() {
+    stopResultQuery();
+    linklySignature(2, resultQuery);
+  };
+
+  /**
+   * 接受签名
+   */
+  var onAccept = function onAccept() {
+    stopResultQuery();
+    linklySignature(3, resultQuery);
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-body"
+  }, ((custom === null || custom === void 0 ? void 0 : custom.list) || []).map(function (item) {
+    return /*#__PURE__*/React.createElement(Step, {
+      key: item.index,
+      pedding: item.pedding,
+      resolve: item.resolve,
+      reject: item.reject,
+      status: item.status
+    });
+  }), status === StatusEnum.Loading ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip"
+  }, locales.getText('page.eftpos-pay.text.processing')) : null, status === StatusEnum.Question ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip"
+  }, locales.getText('page.eftpos-pay.text.receipt.again.title')), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip"
+  }, locales.getText('page.eftpos-pay.text.receipt.again.text'))) : null, status === StatusEnum.Success ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip"
+  }, locales.getText('page.eftpos-pay.text.transaction.end')) : null), (custom === null || custom === void 0 ? void 0 : custom.actionStatus) === LinklyActionStatus.Cancel ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-step-item-btns"
+  }, /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    className: "pisell-lowcode__eft-pay-step-item-btn",
+    onClick: onCancel,
+    disabled: !!(custom !== null && custom !== void 0 && custom.buttonDisabled)
+  }, locales.getText('page.eftpos-pay.text.cancel'))) : null, (custom === null || custom === void 0 ? void 0 : custom.actionStatus) === LinklyActionStatus.CancelWaiting || (custom === null || custom === void 0 ? void 0 : custom.actionStatus) === LinklyActionStatus.SignatureWaiting ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-step-item-btns"
+  }, /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    className: "pisell-lowcode__eft-pay-step-item-btn",
+    disabled: true
+  }, locales.getText('page.eftpos-pay.text.leave'))) : null, (custom === null || custom === void 0 ? void 0 : custom.actionStatus) === LinklyActionStatus.Signature ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__eft-pay-step-item-btns"
+  }, /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    className: "pisell-lowcode__eft-pay-step-item-btn",
+    onClick: onDecline
+  }, locales.getText('page.eftpos-pay.text.decline')), /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    type: "primary",
+    className: "pisell-lowcode__eft-pay-step-item-btn",
+    onClick: onAccept
+  }, locales.getText('page.eftpos-pay.text.accept'))) : null);
+};
+export default Linkly;

package/es/components/eftposPay/linkly/service.d.ts

@@ -0,0 +1,32 @@
+/**
+ * linkly支付接口
+ */
+export declare const linklyPayApi: (data: any) => Promise<any>;
+/**
+ * 查询linkly支付结果
+ */
+export declare const linklyPayQueryApi: (param: any) => Promise<any>;
+/**
+ * 取消linkly支付
+ */
+export declare const linklyPayCancelApi: (param: any) => Promise<any>;
+/**
+ * linkly支付签名结果处理
+ */
+export declare const linklyPaySignatureApi: (param: any) => Promise<any>;
+/**
+ * linkly退款接口
+ */
+export declare const linklyRefundApi: (data: any) => Promise<any>;
+/**
+ * 查询linkly退款结果
+ */
+export declare const linklyRefundQueryApi: (param: any) => Promise<any>;
+/**
+ * 取消linkly退款
+ */
+export declare const linklyRefundCancelApi: (param: any) => Promise<any>;
+/**
+ * linkly退款签名结果处理
+ */
+export declare const linklyRefundSignatureApi: (param: any) => Promise<any>;

package/es/components/eftposPay/linkly/service.js

@@ -0,0 +1,73 @@
+import { request } from "../../../utils";
+
+/**
+ * linkly支付接口
+ */
+export var linklyPayApi = function linklyPayApi(data) {
+  return request.getRequest().post('/shop/linkly/pay/apply', data, {
+    customMessage: true
+  });
+};
+
+/**
+ * 查询linkly支付结果
+ */
+export var linklyPayQueryApi = function linklyPayQueryApi(param) {
+  return request.getRequest().get('/shop/linkly/pay/query', param, {
+    customMessage: true
+  });
+};
+
+/**
+ * 取消linkly支付
+ */
+export var linklyPayCancelApi = function linklyPayCancelApi(param) {
+  return request.getRequest().post('/shop/linkly/pay/cancel', param, {
+    customMessage: true
+  });
+};
+
+/**
+ * linkly支付签名结果处理
+ */
+export var linklyPaySignatureApi = function linklyPaySignatureApi(param) {
+  return request.getRequest().post('/shop/linkly/pay/signature', param, {
+    customMessage: true
+  });
+};
+
+/**
+ * linkly退款接口
+ */
+export var linklyRefundApi = function linklyRefundApi(data) {
+  return request.getRequest().post('/shop/linkly/refund/apply', data, {
+    customMessage: true
+  });
+};
+
+/**
+ * 查询linkly退款结果
+ */
+export var linklyRefundQueryApi = function linklyRefundQueryApi(param) {
+  return request.getRequest().get('/shop/linkly/refund/query', param, {
+    customMessage: true
+  });
+};
+
+/**
+ * 取消linkly退款
+ */
+export var linklyRefundCancelApi = function linklyRefundCancelApi(param) {
+  return request.getRequest().post('/shop/linkly/refund/cancel', param, {
+    customMessage: true
+  });
+};
+
+/**
+ * linkly退款签名结果处理
+ */
+export var linklyRefundSignatureApi = function linklyRefundSignatureApi(param) {
+  return request.getRequest().post('/shop/linkly/refund/signature', param, {
+    customMessage: true
+  });
+};

package/es/components/eftposPay/manufacturer.d.ts

@@ -3,4 +3,5 @@ export { getAmonunt } from './helper';
 export { default as Payo } from './payo';
 export { default as Windcave } from './windcave/windcave';
 export { default as Tyro } from './tyro';
+export { default as Linkly } from './linkly';
 export declare const getInitState: (type: string, params?: any) => State;

package/es/components/eftposPay/manufacturer.js

@@ -2,10 +2,12 @@ import { EftposEnum } from "./const";
 import getPayoInitState from "./payo/const";
 import getTyroInitState from "./tyro/const";
 import getWindcaveInitState from "./windcave/const";
+import getLinklyInitState from "./linkly/const";
 export { getAmonunt } from "./helper";
 export { default as Payo } from "./payo";
 export { default as Windcave } from "./windcave/windcave";
 export { default as Tyro } from "./tyro";
+export { default as Linkly } from "./linkly";
 export var getInitState = function getInitState(type, params) {
   switch (type) {
     case EftposEnum.Payo:
@@ -14,6 +16,8 @@ export var getInitState = function getInitState(type, params) {
       return getWindcaveInitState(params);
     case EftposEnum.Tyro:
       return getTyroInitState(params);
+    case EftposEnum.Linkly:
+      return getLinklyInitState(params);
     default:
       throw new Error('未知的厂商类型');
   }

package/es/components/eftposPay/pay.d.ts

@@ -6,7 +6,7 @@ import './index.less';
  * @Author: hongbing.wang
  * @Date: 2024-08-20 14:59
  */
-declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, isMobile, tyroUrl, tyroVersion, formatAmount, client }: PayProps & {
+declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, isMobile, tyroUrl, tyroVersion, formatAmount, client, }: PayProps & {
     terminal: {
         network: boolean;
     };

package/es/components/eftposPay/pay.js

@@ -10,7 +10,7 @@ import { getPayParams } from "./helper";
 import Manual from "./component/manual";
 import Signature from "./component/signature";
 import { StatusEnum, PayRouteEnum, ClientEnum } from "./const";
-import { Payo, Windcave, Tyro } from "./manufacturer";
+import { Payo, Windcave, Tyro, Linkly } from "./manufacturer";
 import { useContextData, useDispatch, updateStatus, backUpProduction, updateComponent, backUpFree, updateState } from "./store";
 import "./index.less";
 
@@ -150,7 +150,7 @@ var Pay = function Pay(_ref) {
       }
     };
   }, []);
-  // console.log("pay2222 = ",'pay 222' , data.render,data.type)
+  console.log('data =>>>>>> ', data);
   return /*#__PURE__*/React.createElement(React.Fragment, null, data.render ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-box ".concat(className),
     style: data.type === 'step' ? {} : {
@@ -178,6 +178,10 @@ var Pay = function Pay(_ref) {
     onChange: onChange,
     key: data.key,
     formatAmount: formatAmount
+  }) : null, data.eftpos === 'linkly' ? /*#__PURE__*/React.createElement(Linkly, {
+    key: data.key,
+    api: api,
+    onChange: onChange
   }) : null) : null, data.type === PayRouteEnum.Unset && Comm ? /*#__PURE__*/React.createElement(Comm, {
     onChange: onChange,
     api: api,

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

@@ -297,7 +297,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | undefined;
+        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/es/components/eventBooking/components/Provider/Event/index.js

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import { isMobile, locales } from '@pisell/utils';
 import { Skeleton } from 'antd';
-import { useEvent, useSales, useEventDetail, useStep } from "../../../../Sales";
+import { useEvent, useSales, useEventDetail, useStep, useCustomer } from "../../../../Sales";
 import BookingServiceList from "../../bookingServiceList";
 import BookingDetailModal from "../../bookingDetailModal";
 import "./index.less";
@@ -31,6 +31,8 @@ var Event = function Event() {
     lists = _useState2[0],
     setLists = _useState2[1];
   var customer = useLoginUser();
+  var _useCustomer = useCustomer(),
+    appUtils = _useCustomer.appUtils;
   useEffect(function () {
     var _data$stepData;
     var eventList = (eventData === null || eventData === void 0 ? void 0 : eventData.eventList) || [];
@@ -45,16 +47,23 @@ var Event = function Event() {
     }
   }, [eventData === null || eventData === void 0 ? void 0 : eventData.eventList]);
   useEffect(function () {
-    var _data$resourceData;
+    var _data$resourceData, _appUtils$getHistory, _history$location;
     var id = data === null || data === void 0 || (_data$resourceData = data.resourceData) === null || _data$resourceData === void 0 || (_data$resourceData = _data$resourceData.currentResourceItem) === null || _data$resourceData === void 0 ? void 0 : _data$resourceData.id;
     if (!id) return;
-    getEventList.run({
+    var history = (appUtils === null || appUtils === void 0 || (_appUtils$getHistory = appUtils.getHistory) === null || _appUtils$getHistory === void 0 ? void 0 : _appUtils$getHistory.call(appUtils)) || {};
+    var query = history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 ? void 0 : _history$location.query;
+    var params = {
       event_item_resource_id: id,
       skip: 1,
       num: 100,
       customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
       open_quotation: 1
-    });
+    };
+    if (query !== null && query !== void 0 && query.ids) {
+      var _query$ids;
+      params.ids = query === null || query === void 0 || (_query$ids = query.ids) === null || _query$ids === void 0 ? void 0 : _query$ids.split(',');
+    }
+    getEventList.run(params);
   }, [data === null || data === void 0 || (_data$resourceData2 = data.resourceData) === null || _data$resourceData2 === void 0 || (_data$resourceData2 = _data$resourceData2.currentResourceItem) === null || _data$resourceData2 === void 0 ? void 0 : _data$resourceData2.id, customer === null || customer === void 0 ? void 0 : customer.id]);
 
   /**

package/es/components/eventBooking/components/bookingDetailModal/index.js

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useRef, useState, useEffect } from 'react';
 import { PisellModal, PisellAnchor, PisellImageCarousels } from '@pisell/materials';
 import EventCard from "../eventCard";
-import { useCart, useEventDetail } from "../../../Sales";
+import { useCart, useEventDetail, useInit } from "../../../Sales";
 import { isMobile, locales } from '@pisell/utils';
 import Schedule from "./components/Schedule";
 import Resource from "./components/Resource";
@@ -25,7 +25,7 @@ import OrderProductModal from "../Provider/OrderProductModal/index";
 import "./index.less";
 import useEngineContext from "../../../../hooks/useEngineContext";
 var BookingDetailModal = function BookingDetailModal(props) {
-  var _detail$introduction2;
+  var _initData$boardSettin2, _detail$introduction2;
   var modalContentRef = useRef(null);
   var context = useEngineContext();
   var _ref = context.appHelper || {},
@@ -43,6 +43,8 @@ var BookingDetailModal = function BookingDetailModal(props) {
     addToCart = _useCart.addToCart,
     checkBeforeAddToCart = _useCart.checkBeforeAddToCart,
     checkBeforeAddToCartResquest = _useCart.checkBeforeAddToCartResquest;
+  var _useInit = useInit(),
+    initData = _useInit.initData;
   var _useState = useState('introduction'),
     _useState2 = _slicedToArray(_useState, 2),
     activeTab = _useState2[0],
@@ -59,6 +61,20 @@ var BookingDetailModal = function BookingDetailModal(props) {
   var isUserClickRef = useRef(false); // 添加用户点击标记
   var scrollTimeoutRef = useRef(null);
 
+  /**
+   * @title: 按钮确认文案
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-06-26 15:34
+   */
+  var buttonText = useMemo(function () {
+    var _initData$boardSettin, _utils$translation;
+    var config = (initData === null || initData === void 0 || (_initData$boardSettin = initData.boardSetting) === null || _initData$boardSettin === void 0 || (_initData$boardSettin = _initData$boardSettin.config) === null || _initData$boardSettin === void 0 ? void 0 : _initData$boardSettin.product_display_setting) || {};
+    return (utils === null || utils === void 0 || (_utils$translation = utils.translation) === null || _utils$translation === void 0 ? void 0 : _utils$translation.call(utils, config === null || config === void 0 ? void 0 : config.booking_event_v2_product_detail_button)) || locales.getText('pisell2.event.add.to.cart');
+  }, [initData === null || initData === void 0 || (_initData$boardSettin2 = initData.boardSetting) === null || _initData$boardSettin2 === void 0 || (_initData$boardSettin2 = _initData$boardSettin2.config) === null || _initData$boardSettin2 === void 0 ? void 0 : _initData$boardSettin2.product_display_setting]);
+
   /**
    * @title: 详情锚点
    * @description:
@@ -377,7 +393,7 @@ var BookingDetailModal = function BookingDetailModal(props) {
     destroyOnClose: true,
     className: "booking-detail-modal",
     onCancel: onCloseEventDetail,
-    okText: locales.getText('pisell2.event.add.to.cart'),
+    okText: buttonText,
     cancelVisible: false,
     onOk: handleOk,
     width: isMobile() ? '100%' : 600,

package/es/components/eventBooking/index.js

@@ -36,14 +36,28 @@ var Content = function Content() {
    * @Author: WangHan
    * @Date: 2025-01-17 14:25
    */
+  // useEffect(() => {
+  //   if (!form_id) return;
+
+  //   getResourceList.run({
+  //     form_id: form_id,
+  //     shop_id: shop_id,
+  //     form_data_status: 'active',
+  //   });
+  // }, [form_id]);
   useEffect(function () {
-    if (!form_id) return;
-    getResourceList.run({
-      form_id: form_id,
-      shop_id: shop_id,
-      form_data_status: 'active'
-    });
-  }, [form_id]);
+    var _utils$getHistory, _history$location;
+    var history = (utils === null || utils === void 0 || (_utils$getHistory = utils.getHistory) === null || _utils$getHistory === void 0 ? void 0 : _utils$getHistory.call(utils)) || {};
+    var query = history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 ? void 0 : _history$location.query;
+    var params = {
+      front_end_cache_id: (query === null || query === void 0 ? void 0 : query.cacheId) || ''
+    };
+    if (query !== null && query !== void 0 && query.ids) {
+      var _query$ids;
+      params.event_item_ids = query === null || query === void 0 || (_query$ids = query.ids) === null || _query$ids === void 0 ? void 0 : _query$ids.split(',');
+    }
+    getResourceList.run(params);
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "event-booking-wrap ".concat(isMobile() ? 'event-booking-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement(Header, null), /*#__PURE__*/React.createElement(EventContent, null), isMobile() && (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key) !== 'select-category' ? /*#__PURE__*/React.createElement(Footer, null) : null);

package/es/components/eventBooking/locales.js

@@ -35,7 +35,7 @@ export default {
     'pisell2.event.campus': 'Campus',
     'pisell2.event.resource': 'Location',
     'pisell2.event.booking.options': 'Booking options',
-    'pisell2.event.add.to.cart': 'Add to cart',
+    'pisell2.event.add.to.cart': 'Add to Cart',
     'pisell2.event.description': 'Description',
     'pisell2.event.view.more': 'View more',
     'pisell2.event.view.less': 'View less',
@@ -120,7 +120,7 @@ export default {
     'pisell2.event.campus': '校区',
     'pisell2.event.resource': '资源',
     'pisell2.event.booking.options': '预约选项',
-    'pisell2.event.add.to.cart': '添加到购物车',
+    'pisell2.event.add.to.cart': '加入购物车',
     'pisell2.event.description': '描述',
     'pisell2.event.view.more': '查看更多',
     'pisell2.event.view.less': '收起',
@@ -205,7 +205,7 @@ export default {
     'pisell2.event.campus': '校區',
     'pisell2.event.resource': '資源',
     'pisell2.event.booking.options': '預約選項',
-    'pisell2.event.add.to.cart': '添加到購物車',
+    'pisell2.event.add.to.cart': '加入購物車',
     'pisell2.event.description': '描述',
     'pisell2.event.view.more': '查看更多',
     'pisell2.event.view.less': '收起',

package/es/components/index.d.ts

@@ -15,4 +15,6 @@ import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
 import PisellSelectCustomerModal from './pisellSelectCustomerModal';
 import SubTotal from './subTotal';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, };
+import StepController from './stepController';
+import EditBookingModal from './booking/editBookingModal';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, StepController, EditBookingModal };

package/es/components/index.js

@@ -15,4 +15,6 @@ import WorkspaceListDetail from "./workSpaceListDetail/";
 import WorkspaceList from "./workSpaceList";
 import PisellSelectCustomerModal from "./pisellSelectCustomerModal";
 import SubTotal from "./subTotal";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal };
+import StepController from "./stepController";
+import EditBookingModal from "./booking/editBookingModal";
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, StepController, EditBookingModal };

package/es/components/listComponent/index.js

@@ -1,9 +1,9 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }

package/es/components/pay/toC/PaymentMethods/index.js

@@ -35,7 +35,7 @@ var isOfflinePayment = function isOfflinePayment(type) {
   return ['pisell.bank_deposit', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_bank_transfer'].includes(type);
 };
 var PaymentMethods = function PaymentMethods(props, ref) {
-  var _context$appHelper;
+  var _context$appHelper, _interaction$utils, _interaction$utils$is;
   var MWCreditCardRef = useRef(null);
   var SuperPayAliPayH5Ref = useRef(null);
   var StripePayRef = useRef(null);
@@ -118,10 +118,11 @@ var PaymentMethods = function PaymentMethods(props, ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils), interaction, context);
   useEffect(function () {
-    var _interaction$utils, _interaction$utils$is, _interaction$utils2, _interaction$utils2$i;
-    console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils));
-    if (interaction !== null && interaction !== void 0 && (_interaction$utils2 = interaction.utils) !== null && _interaction$utils2 !== void 0 && (_interaction$utils2$i = _interaction$utils2.isAppEnv) !== null && _interaction$utils2$i !== void 0 && _interaction$utils2$i.call(_interaction$utils2)) {
+    var _interaction$utils2, _interaction$utils2$i, _interaction$utils3, _interaction$utils3$i;
+    console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$i = _interaction$utils2.isAppEnv) === null || _interaction$utils2$i === void 0 ? void 0 : _interaction$utils2$i.call(_interaction$utils2));
+    if (interaction !== null && interaction !== void 0 && (_interaction$utils3 = interaction.utils) !== null && _interaction$utils3 !== void 0 && (_interaction$utils3$i = _interaction$utils3.isAppEnv) !== null && _interaction$utils3$i !== void 0 && _interaction$utils3$i.call(_interaction$utils3)) {
       interaction.utils.mountFunction('global', 'paymentResult', function (strResult) {
         console.log('paymentResult', strResult);
         if (!isJson(strResult)) return;

package/es/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -28,4 +29,11 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;