@pisell/private-materials 3.3.18 → 3.3.20

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useEffect } from 'react';
 import { Spin } from 'antd';
-import { PisellModal, PisellEmpty } from '@pisell/materials';
+import { PisellModal, PisellEmpty, Button, Checkbox } from '@pisell/materials';
 import { locales, isMobile } from '@pisell/utils';
 import { useAppointmentBookingContext } from "../../../context";
 import "./index.less";
@@ -18,7 +18,10 @@ var DepositModal = function DepositModal(props) {
   var open = props.open,
     onCancel = props.onCancel,
     item = props.item,
-    onChange = props.onChange;
+    onChange = props.onChange,
+    onConfirm = props.onConfirm,
+    _props$isHideCheckout = props.isHideCheckout,
+    isHideCheckout = _props$isHideCheckout === void 0 ? true : _props$isHideCheckout;
   var _useAppointmentBookin = useAppointmentBookingContext(),
     appointmentBooking = _useAppointmentBookin.appointmentBooking;
   var _useState = useState(null),
@@ -29,6 +32,13 @@ var DepositModal = function DepositModal(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    disabled = _useState6[0],
+    setDisabled = _useState6[1];
+  useEffect(function () {
+    setDisabled(!isHideCheckout);
+  }, [isHideCheckout]);
 
   /**
    * @title: 获取协议内容
@@ -52,23 +62,24 @@ var DepositModal = function DepositModal(props) {
             _yield$appointmentBoo = _context.sent;
             data = _yield$appointmentBoo.data;
             setPolicy(data);
-            onChange(data);
-            _context.next = 14;
+            onChange && onChange(data);
+            _context.next = 15;
             break;
           case 10:
             _context.prev = 10;
             _context.t0 = _context["catch"](1);
             console.log(_context.t0);
-            onChange(_context.t0);
-          case 14:
-            _context.prev = 14;
+            onChange && onChange(_context.t0);
+            debugger;
+          case 15:
+            _context.prev = 15;
             setLoading(false);
-            return _context.finish(14);
-          case 17:
+            return _context.finish(15);
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 10, 14, 17]]);
+      }, _callee, null, [[1, 10, 15, 18]]);
     }));
     return function getPolicy(_x) {
       return _ref.apply(this, arguments);
@@ -93,7 +104,20 @@ var DepositModal = function DepositModal(props) {
     className: 'policy-modal-wrap',
     cancelVisible: false,
     okText: locales.getText('pisell2.appointment.deposit.close'),
-    onOk: onCancel
+    footer: [/*#__PURE__*/React.createElement("div", {
+      className: "policy-modal-footer"
+    }, !isHideCheckout ? /*#__PURE__*/React.createElement(Checkbox, {
+      className: "policy-modal-checkbox",
+      onChange: function onChange(e) {
+        var _e$target;
+        return setDisabled(!((_e$target = e.target) !== null && _e$target !== void 0 && _e$target.checked));
+      }
+    }, locales.getText('pisell2.appointment.policy')) : null, /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      size: "large",
+      onClick: isHideCheckout ? onCancel : onConfirm,
+      disabled: disabled
+    }, locales.getText(isHideCheckout ? 'pisell2.appointment.deposit.close' : 'pisell2.appointment.policy.confirm')))]
   }, /*#__PURE__*/React.createElement(Spin, {
     style: {
       minHeight: '200px'

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.less

@@ -6,4 +6,13 @@
   .ant-empty-image {
     height: auto !important;
   }
+
+  .policy-modal-footer {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    .policy-modal-checkbox {
+      margin-bottom: 20px;
+    }
+  }
 }

package/es/components/appointmentBooking/deposit/index.d.ts

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

package/es/components/appointmentBooking/hooks.d.ts

@@ -14,6 +14,7 @@ export declare const useAppointmentBookingStep: () => {
     removeStep: (key: string) => any;
     addStep: (props: any, stepKey?: string) => any;
     updateStep: (key: string, step: any) => void;
+    nextStep: () => void;
 };
 /**
  * @title: 获取商品数据

package/es/components/appointmentBooking/hooks.js

@@ -47,7 +47,9 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
   var pisellOS = usePisellOS();
   var _useAppointmentBookin = useAppointmentBookingContext(),
     appointmentBooking = _useAppointmentBookin.appointmentBooking,
-    setCurrentStep = _useAppointmentBookin.setCurrentStep;
+    setCurrentStep = _useAppointmentBookin.setCurrentStep,
+    policyIdsRef = _useAppointmentBookin.policyIdsRef,
+    openPolicy = _useAppointmentBookin.openPolicy;
   var stepList = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s = appointmentBooking.store) === null || _appointmentBooking$s === void 0 || (_appointmentBooking$s = _appointmentBooking$s.step) === null || _appointmentBooking$s === void 0 || (_appointmentBooking$s = _appointmentBooking$s.store) === null || _appointmentBooking$s === void 0 ? void 0 : _appointmentBooking$s.stepList) || [];
 
   // 判断是否是最后一步
@@ -117,12 +119,46 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
       isSkip: (step === null || step === void 0 ? void 0 : step.isSkip) || false
     });
   };
+
+  // 下一步
+  var nextStep = function nextStep() {
+    var _appointmentBooking$s2;
+    var currentStep = appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.getCurrentStep();
+    var stepList = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s2 = appointmentBooking.store) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.step) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.store) === null || _appointmentBooking$s2 === void 0 ? void 0 : _appointmentBooking$s2.stepList) || [];
+
+    // 倒数第二步
+    if ((currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2 === (stepList === null || stepList === void 0 ? void 0 : stepList.length)) {
+      var _policyIdsRef$current;
+      // 如果没有同意资源上挂接的协议，则打开协议弹窗
+      if (policyIdsRef !== null && policyIdsRef !== void 0 && (_policyIdsRef$current = policyIdsRef.current) !== null && _policyIdsRef$current !== void 0 && _policyIdsRef$current.length) {
+        // 依次弹出所有协议
+        var idx = 0;
+        var showNextPolicy = function showNextPolicy() {
+          if (idx < policyIdsRef.current.length) {
+            openPolicy({
+              id: policyIdsRef.current[idx]
+            }, function () {
+              idx++;
+              showNextPolicy();
+            });
+          } else {
+            // 全部同意后，进入下一步
+            appointmentBooking.next();
+          }
+        };
+        showNextPolicy();
+        return;
+      }
+    }
+    appointmentBooking.next();
+  };
   return {
     getStepIndex: getStepIndex,
     stepList: stepList,
     removeStep: removeStep,
     addStep: addStep,
-    updateStep: updateStep
+    updateStep: updateStep,
+    nextStep: nextStep
   };
 };
 
@@ -575,23 +611,26 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
  * @Date: 2025-04-21 11:47
  */
 export var useIsSkipResourceStep = function useIsSkipResourceStep() {
-  var _appointmentBooking$s2;
+  var _appointmentBooking$s3;
   var _useAppointmentBookin5 = useAppointmentBookingContext(),
     currentStep = _useAppointmentBookin5.currentStep,
-    setCarts = _useAppointmentBookin5.setCarts;
+    setCarts = _useAppointmentBookin5.setCarts,
+    setPolicyIds = _useAppointmentBookin5.setPolicyIds;
   var _useAppointmentBookin6 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin6.getResourceList,
     autoSelectAllProductResources = _useAppointmentBookin6.autoSelectAllProductResources;
   var _useAppointmentBookin7 = useAppointmentBookingSetting(),
     isFormSubject = _useAppointmentBookin7.isFormSubject;
   var appointmentBooking = useAppointmentBooking();
-  var stepList = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s2 = appointmentBooking.store) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.step) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.store) === null || _appointmentBooking$s2 === void 0 ? void 0 : _appointmentBooking$s2.stepList) || [];
+  var stepList = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s3 = appointmentBooking.store) === null || _appointmentBooking$s3 === void 0 || (_appointmentBooking$s3 = _appointmentBooking$s3.step) === null || _appointmentBooking$s3 === void 0 || (_appointmentBooking$s3 = _appointmentBooking$s3.store) === null || _appointmentBooking$s3 === void 0 ? void 0 : _appointmentBooking$s3.stepList) || [];
   var _useAppointmentBookin8 = useAppointmentBookingLogin(),
     isLogin = _useAppointmentBookin8.isLogin,
     openLoginModal = _useAppointmentBookin8.openLoginModal;
   var _useAppointmentBookin9 = useAppointmentBookingAccount(),
     getHolders = _useAppointmentBookin9.getHolders,
     checkAccount = _useAppointmentBookin9.checkAccount;
+  var _useAppointmentBookin10 = useAppointmentBookingStep(),
+    nextStep = _useAppointmentBookin10.nextStep;
   var utils = contextUtils();
   var checkSkipResourceStep = /*#__PURE__*/function () {
     var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(isSkipUpdateFormStep) {
@@ -622,8 +661,9 @@ export var useIsSkipResourceStep = function useIsSkipResourceStep() {
               break;
             }
             if (!isSkipUpdateFormStep) {
-              resultCarts = formatCartsResources(carts, resources); // 如果当前资源有表单，则添加表单步骤，否则删除表单步骤
+              resultCarts = formatCartsResources(carts, resources, setPolicyIds); // 如果当前资源有表单，则添加表单步骤，否则删除表单步骤
               checkHasFormStep({
+                nextStep: nextStep,
                 isSkip: true,
                 openLoginModal: openLoginModal,
                 utils: utils,
@@ -683,8 +723,8 @@ export var useIsSkipResourceStep = function useIsSkipResourceStep() {
 export var useAppointmentBookingSetting = function useAppointmentBookingSetting() {
   var _appointmentBooking$o3;
   var utils = contextUtils();
-  var _useAppointmentBookin10 = useAppointmentBookingContext(),
-    appointmentBooking = _useAppointmentBookin10.appointmentBooking;
+  var _useAppointmentBookin11 = useAppointmentBookingContext(),
+    appointmentBooking = _useAppointmentBookin11.appointmentBooking;
   var _ref21 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o3 = appointmentBooking.otherParams) === null || _appointmentBooking$o3 === void 0 ? void 0 : _appointmentBooking$o3.productModuleParams) || {},
     bookingProcess = _ref21.bookingProcess,
     bookingSubject = _ref21.bookingSubject,

package/es/components/appointmentBooking/index.d.ts

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

package/es/components/appointmentBooking/locales.d.ts

@@ -104,6 +104,8 @@ declare const _default: {
         'pisell2.appointment.unselect.date': string;
         'pisell2.appointment.unuse.date': string;
         'pisell2.appointment.add-guests': string;
+        'pisell2.appointment.policy': string;
+        'pisell2.appointment.policy.confirm': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -219,6 +221,8 @@ declare const _default: {
         'pisell2.appointment.unselect.date': string;
         'pisell2.appointment.unuse.date': string;
         'pisell2.appointment.add-guests': string;
+        'pisell2.appointment.policy': string;
+        'pisell2.appointment.policy.confirm': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -334,6 +338,8 @@ declare const _default: {
         'pisell2.appointment.unselect.date': string;
         'pisell2.appointment.unuse.date': string;
         'pisell2.appointment.add-guests': string;
+        'pisell2.appointment.policy': string;
+        'pisell2.appointment.policy.confirm': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;

package/es/components/appointmentBooking/locales.js

@@ -120,6 +120,8 @@ export default {
     'pisell2.appointment.unselect.date': 'Please select date',
     'pisell2.appointment.unuse.date': 'This date is not available, please change the date.',
     'pisell2.appointment.add-guests': 'Add guests',
+    'pisell2.appointment.policy': 'You have read and agreed to this policy',
+    'pisell2.appointment.policy.confirm': 'Confirm',
     'pisell2.text.apply': 'Apply',
     'pisell2.text.goodpass': 'GoodPass',
     'pisell2.text.goodpass.product-vouchers': 'Product Vouchers',
@@ -251,6 +253,8 @@ export default {
     'pisell2.appointment.unselect.date': '请选择日期',
     'pisell2.appointment.unuse.date': '此日期不可用，请更换日期。',
     'pisell2.appointment.add-guests': '添加预约人',
+    'pisell2.appointment.policy': '您已仔细阅读并同意此协议',
+    'pisell2.appointment.policy.confirm': '确定',
     'pisell2.text.apply': '应用',
     'pisell2.text.goodpass': '商品券',
     'pisell2.text.goodpass.product-vouchers': '商品兑换券',
@@ -382,6 +386,8 @@ export default {
     'pisell2.appointment.unselect.date': '請選擇日期',
     'pisell2.appointment.unuse.date': '此日期不可用，請更換日期。',
     'pisell2.appointment.add-guests': '添加預約人',
+    'pisell2.appointment.policy': '您已仔細閱讀並同意此協議',
+    'pisell2.appointment.policy.confirm': '確定',
     'pisell2.text.apply': '應用',
     'pisell2.text.goodpass': '商品券',
     'pisell2.text.goodpass.product-vouchers': '商品兌換券',

package/es/components/appointmentBooking/utils.d.ts

@@ -17,7 +17,7 @@ export declare const formatGuest: (data: any[], products: any) => any[];
  * @Author: WangHan
  * @Date: 2025-05-06 22:22
  */
-export declare const formatCartsResources: (carts: any[], resources: any[]) => any[];
+export declare const formatCartsResources: (carts: any[], resources: any[], setPolicyIds: any) => any[];
 /**
  * @title: 格式化购物车数据
  * @description:
@@ -111,4 +111,4 @@ export declare const Toast: (text: string) => void;
  * @Author: WangHan
  * @Date: 2025-05-06 21:51
  */
-export declare const checkHasFormStep: ({ isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId, currentStep, stepList, appointmentBooking, locales, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }: any) => true | undefined;
+export declare const checkHasFormStep: ({ nextStep, isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId, currentStep, stepList, appointmentBooking, locales, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }: any) => true | undefined;

package/es/components/appointmentBooking/utils.js

@@ -57,8 +57,9 @@ export var formatGuest = function formatGuest(data, products) {
  * @Author: WangHan
  * @Date: 2025-05-06 22:22
  */
-export var formatCartsResources = function formatCartsResources(carts, resources) {
+export var formatCartsResources = function formatCartsResources(carts, resources, setPolicyIds) {
   try {
+    var policyIds = [];
     var newCarts = carts === null || carts === void 0 ? void 0 : carts.map(function (d) {
       var _currentResource$reso;
       var currentResource = resources === null || resources === void 0 ? void 0 : resources.find(function (r) {
@@ -77,9 +78,13 @@ export var formatCartsResources = function formatCartsResources(carts, resources
         return _objectSpread(_objectSpread({}, d), {}, {
           resource_form_id: foundResource === null || foundResource === void 0 ? void 0 : foundResource.resource_form_id
         });
+      } else if (foundResource !== null && foundResource !== void 0 && foundResource.policy_id && !policyIds.includes(foundResource === null || foundResource === void 0 ? void 0 : foundResource.policy_id)) {
+        // 资源上没有挂接表单，但是有协议，则在触发按钮的时候需要同意协议才能继续
+        policyIds.push(foundResource === null || foundResource === void 0 ? void 0 : foundResource.policy_id);
       }
       return false;
     }).filter(Boolean);
+    setPolicyIds(policyIds);
     return newCarts || [];
   } catch (error) {
     console.log(error, 'formatCarts');
@@ -371,7 +376,8 @@ export var Toast = function Toast(text) {
  */
 export var checkHasFormStep = function checkHasFormStep(_ref2) {
   var _appointmentBooking$s;
-  var isSkip = _ref2.isSkip,
+  var nextStep = _ref2.nextStep,
+    isSkip = _ref2.isSkip,
     checkHolder = _ref2.checkHolder,
     checkAccount = _ref2.checkAccount,
     carts = _ref2.carts,
@@ -453,14 +459,14 @@ export var checkHasFormStep = function checkHasFormStep(_ref2) {
       isNext = true;
     }
     if (isNext && !_checkHolder()) {
-      appointmentBooking.next();
+      nextStep();
     } else {
       return true;
     }
   } else {
     // 如果只有一个资源执行跳过
     if (isSkip) {
-      appointmentBooking.next();
+      nextStep();
     }
   }
 };

package/es/components/booking/components/footer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

package/es/components/booking/components/voucher/index.d.ts

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

package/es/components/booking/deposit/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/es/components/booking/deposit/index.js

@@ -97,7 +97,7 @@ var Deposit = function Deposit(props) {
   }, [globalState]);
   var depositList = useMemo(function () {
     if (!bookingId) return [];
-    if (Number(bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.deposit_amount) === 0) return [];
+    if ((bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.is_deposit) === 0) return [];
     return [{
       customer: bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.customer,
       status: bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.deposit_payment_status,

package/es/components/booking/forms/footer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

package/es/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/es/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

package/es/components/booking/info/addServiceVariant/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/es/components/booking/info/dateRange/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/es/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

package/es/components/booking/info/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

package/es/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

package/es/components/booking/info/service/serviceItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/es/components/booking/info/service/serviceList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/es/components/booking/info/service2/utils.d.ts

@@ -240,4 +240,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

package/es/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PosProps, RouteType } from './const';
 declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;

package/es/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps, PosProps } from './const';
 import './device.less';
 /**

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

@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/es/components/eftposPay/payo/config.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {

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

@@ -33,7 +33,8 @@ export var POS = function POS(_ref) {
   var api = _ref.api,
     onChange = _ref.onChange;
   var _useContextData = useContextData(),
-    steps = _useContextData.steps;
+    steps = _useContextData.steps,
+    custom = _useContextData.custom;
   var _useStoreRef = useStoreRef(),
     deviceRef = _useStoreRef.deviceRef,
     payRef = _useStoreRef.payRef,
@@ -150,7 +151,17 @@ export var POS = function POS(_ref) {
     }));
     controllerRef.current = new AbortController();
     // 支付 or 退款
-    var resultPromise = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay ? api.pay({
+    var resultPromise = modeRef.current === ModeEnum.Pay || modeRef.current === ModeEnum.FullPay ? api.pay(_objectSpread(_objectSpread({}, custom !== null && custom !== 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,
@@ -159,7 +170,7 @@ export var POS = function POS(_ref) {
       pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
         number: numRef.current
       })))))
-    }, {
+    }), {
       signal: controllerRef.current.signal
     }) : api.refund({
       order_id: orderIdRef.current,

package/es/components/eftposPay/payo/hooks.js

@@ -12,6 +12,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useCallback, useEffect, useRef } from 'react';
 import { PayStatus } from "../const";
 import { sleep } from "../helper";
+import { sendWarningLog } from '@pisell/utils';
 
 /**
  * @title: 循环查询 接口状态
@@ -111,14 +112,24 @@ export var useValidate = function useValidate(timeout) {
     (_controllerRef$curren = controllerRef.current) === null || _controllerRef$curren === void 0 || _controllerRef$curren.abort();
   }, []);
   var run = function run() {
+    for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+      params[_key] = arguments[_key];
+    }
     isTimeoutCloseRef.current = false;
     TimeoutRef.current && clearTimeout(TimeoutRef.current);
     // 开启计时
     TimeoutRef.current = setTimeout(function () {
       isTimeoutCloseRef.current = true;
+      sendWarningLog({
+        title: '支付状态查询超时',
+        content: [{
+          key: 'params',
+          value: JSON.stringify(params)
+        }]
+      });
       close();
     }, timeout);
-    return checkApi.apply(void 0, arguments);
+    return checkApi.apply(void 0, params);
   };
   useEffect(function () {
     return function () {