@pisell/private-materials 6.4.31 → 6.4.33

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

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

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/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/es/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

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

@@ -45,6 +45,8 @@ import { Iconfont } from '@pisell/materials';
 import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useDebounceEffect, useMemoizedFn } from 'ahooks';
 import { cloneDeep } from 'lodash';
+import { useShopDiscount } from "../../../appointmentBooking/hooks";
+
 /**
  * @title: 底部
  * @description:
@@ -654,12 +656,12 @@ var Footer = function Footer(props) {
             setPaymentCallback(function () {
               return function (paymentResult) {
                 console.log('Payment result:', paymentResult);
+                setIsPaymentModalOpen(false);
                 if ((paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status) === 'success') {
                   var _window5;
                   console.log('Payment completed successfully');
                   (_window5 = window) === null || _window5 === void 0 || (_window5 = _window5.shopApi) === null || _window5 === void 0 || (_window5 = _window5.bookingTicket) === null || _window5 === void 0 || _window5.clearAllCart();
                   // 支付成功后关闭弹窗
-                  setIsPaymentModalOpen(false);
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 } else if ((paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status) === 'cancelled') {
@@ -669,13 +671,11 @@ var Footer = function Footer(props) {
                     (_window6 = window) === null || _window6 === void 0 || (_window6 = _window6.shopApi) === null || _window6 === void 0 || (_window6 = _window6.booking) === null || _window6 === void 0 || _window6.voidBooking(res.order_id);
                   }
                   // 支付取消后关闭弹窗
-                  setIsPaymentModalOpen(false);
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 } else {
                   console.log('Payment status:', paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status);
                   // 其他状态也关闭弹窗
-                  setIsPaymentModalOpen(false);
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 }
@@ -1656,12 +1656,15 @@ var Footer = function Footer(props) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
+  var shopDiscount = useShopDiscount();
   var _useScanManager2 = useScanManager(),
     clearAllScanListenersTaskQueue = _useScanManager2.clearAllScanListenersTaskQueue;
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _window7;
-    (_window7 = window) === null || _window7 === void 0 || (_window7 = _window7.shopApi) === null || _window7 === void 0 || (_window7 = _window7.bookingTicket) === null || _window7 === void 0 || _window7.clearAllCart();
+    var _shopDiscount$clear;
+    // setTimeout(() => {
+    //   (window as any)?.shopApi?.bookingTicket?.clearAllCart();
+    // }, 0);
     clearAllScanListenersTaskQueue();
     // 清空服务项目
     dispatch({
@@ -1716,6 +1719,9 @@ var Footer = function Footer(props) {
         orderNote: ''
       }
     });
+
+    // 清空商品券
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
   };
   return /*#__PURE__*/React.createElement(Skeleton, {
     title: false,
@@ -1800,13 +1806,23 @@ var Footer = function Footer(props) {
     state: state,
     dispatch: dispatch,
     onClose: function onClose(reset) {
-      console.log('🔄 Footer: Closing PaymentModal');
+      // console.log('🔄 Footer: Closing PaymentModal');
       setIsPaymentModalOpen(false);
       setPaymentModalData(null);
       setPaymentCallback(null);
+      // if (reset) {
+      //   handleClearAllAndReset();
+      // }
       if (reset) {
-        handleClearAllAndReset();
+        setTimeout(function () {
+          handleClearAllAndReset();
+        }, 0);
       }
+      // setPaymentModalData(null);
+      // setPaymentCallback(null);
+      // if (reset) {
+      //   handleClearAllAndReset();
+      // }
     }
   }));
 };

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/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

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

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

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

package/es/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -106,11 +105,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/notes/NoteBlock/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;

package/es/components/booking/notes/addNote/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const AddNote: ({ value, onChange, title, placeholder }: any) => JSX.Element;
 export default AddNote;

package/es/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/checkout/PaymentModal.js

@@ -16,7 +16,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useRef, useState, useEffect, useCallback, useMemo, useImperativeHandle, forwardRef } from 'react';
-import { locales } from '@pisell/utils';
+import { locales, webPrint } from '@pisell/utils';
 import { getLocale } from "../../utils/locales";
 import { useMemoizedFn } from 'ahooks';
 import { createPortal } from 'react-dom';
@@ -47,7 +47,6 @@ import { cloneDeep } from 'lodash';
 import { getShopWalletPassId, reorderPaymentMethodList } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
-import usePrinter from "../../hooks/printer";
 
 // Checkout 模块的事件常量
 var CheckoutHooks = {
@@ -140,8 +139,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState16 = _slicedToArray(_useState15, 2),
     walletPassData = _useState16[0],
     setWalletPassData = _useState16[1];
-  var _usePrinter = usePrinter(),
-    nativePrint = _usePrinter.nativePrint;
   var isOrderFree = useMemo(function () {
     if (!customAmount) return false;
     var amount = parseFloat(customAmount);
@@ -678,12 +675,11 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                   data: {
                     order_id: responseData.order_id,
                     machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                    small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.small_ticket_data,
-                    machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
+                    small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.small_ticket_data
                   }
                 };
                 console.log('print_order_onOrderSynced_params>>>>', params);
-                nativePrint(params, function (res) {
+                webPrint(params, function (res) {
                   console.log('print_order_onOrderSynced_res>>>>', res);
                 });
               } catch (error) {
@@ -973,7 +969,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 }
               };
               try {
-                nativePrint(params, function (res) {
+                webPrint(params, function (res) {
                   console.log('handleButtonClick_print-receipt_res>>>>', res);
                   if (!(res !== null && res !== void 0 && res.result)) {
                     Toast === null || Toast === void 0 || Toast.error((res === null || res === void 0 ? void 0 : res.msg) || '');
@@ -1288,8 +1284,6 @@ var PaymentModal = function PaymentModal(_ref17) {
     showRetryModal = _useState30[0],
     setShowRetryModal = _useState30[1];
   var Toast = useToast();
-  var _usePrinter2 = usePrinter(),
-    nativePrint = _usePrinter2.nativePrint;
 
   // 重试处理函数（逻辑由用户自己实现）
   var handleRetry = /*#__PURE__*/function () {
@@ -1619,7 +1613,7 @@ var PaymentModal = function PaymentModal(_ref17) {
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (!(checkout && data && !isLocalOrderCreated.current)) {
-                _context17.next = 20;
+                _context17.next = 18;
                 break;
               }
               isLocalOrderCreated.current = true;
@@ -1639,19 +1633,16 @@ var PaymentModal = function PaymentModal(_ref17) {
                 order_rounding_setting: getData('order_rounding_setting'),
                 shop_wallet_pass_id: shop_wallet_pass_id
               });
-              console.time('initCheckoutData');
               newData = cloneDeep(data); // setTotalAmount(newData.total.expectAmount);
               // 先往 checkout 解决方案推送一条 local 数据
-              _context17.next = 12;
+              _context17.next = 11;
               return checkout.createLocalOrderAsync({
                 orderData: newData.order_info,
                 cartSummary: (_newData$subtotal_inf = newData.subtotal_info) === null || _newData$subtotal_inf === void 0 ? void 0 : _newData$subtotal_inf.subTotalList,
                 autoPayment: true,
                 totalInfo: newData.subtotal_info
               });
-            case 12:
-              console.timeEnd('initCheckoutData');
-
+            case 11:
               // 获取订单总金额
               _orderInfo2 = checkout.getCurrentOrderInfo();
               if (_orderInfo2 && _orderInfo2.totalAmount) {
@@ -1708,8 +1699,7 @@ var PaymentModal = function PaymentModal(_ref17) {
                       data: {
                         order_id: responseData.order_id,
                         machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                        small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data,
-                        machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
+                        small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data
                       }
                     };
                     console.log('print_order_onOrderSynced_params>>>>', params);
@@ -1720,7 +1710,7 @@ var PaymentModal = function PaymentModal(_ref17) {
                         params: params
                       }
                     });
-                    nativePrint(params, function (res) {
+                    webPrint(params, function (res) {
                       console.log('print_order_onOrderSynced_res>>>>', res);
                       logger === null || logger === void 0 || logger.addLog({
                         type: 'info',
@@ -1771,27 +1761,27 @@ var PaymentModal = function PaymentModal(_ref17) {
                 // 可以在这里执行同步完成后的业务逻辑
                 // 比如：通知其他系统、更新UI状态等
               });
-              _context17.next = 31;
+              _context17.next = 29;
               break;
-            case 20:
+            case 18:
               if (!isLocalOrderCreated.current) {
-                _context17.next = 31;
+                _context17.next = 29;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               isLocalOrderCreated.current = false;
-              _context17.next = 25;
+              _context17.next = 23;
               return checkout.cancelCurrentOrderAsync();
-            case 25:
-              _context17.next = 27;
+            case 23:
+              _context17.next = 25;
               return checkout.createLocalOrderAsync({
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info = data.subtotal_info) === null || _data$subtotal_info === void 0 ? void 0 : _data$subtotal_info.subTotalList,
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 27:
+            case 25:
               // 获取订单总金额
               _orderInfo3 = checkout.getCurrentOrderInfo();
               if (_orderInfo3 && _orderInfo3.totalAmount) {
@@ -1799,11 +1789,11 @@ var PaymentModal = function PaymentModal(_ref17) {
               }
               setOrderInfo(_orderInfo3);
               isLocalOrderCreated.current = true;
-            case 31:
-              _context17.next = 37;
+            case 29:
+              _context17.next = 35;
               break;
-            case 33:
-              _context17.prev = 33;
+            case 31:
+              _context17.prev = 31;
               _context17.t0 = _context17["catch"](0);
               console.error('Failed to initialize checkout data:', _context17.t0);
               logger === null || logger === void 0 || logger.addLog({
@@ -1813,11 +1803,11 @@ var PaymentModal = function PaymentModal(_ref17) {
                   error: _context17.t0
                 }
               });
-            case 37:
+            case 35:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, null, [[0, 33]]);
+        }, _callee17, null, [[0, 31]]);
       }));
       return function initCheckoutData() {
         return _ref22.apply(this, arguments);
@@ -1941,7 +1931,7 @@ var PaymentModal = function PaymentModal(_ref17) {
                   }
                 };
                 try {
-                  nativePrint(params, function (res) {
+                  webPrint(params, function (res) {
                     console.log('handleButtonClick_print-receipt_res>>>>', res);
                     if (!(res !== null && res !== void 0 && res.result)) {
                       Toast === null || Toast === void 0 || Toast.error((res === null || res === void 0 ? void 0 : res.msg) || '');

package/es/components/checkout/PaymentPlugin.d.ts

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

package/es/components/checkout/components/PaymentResultToast/PaymentResultToastProvider.js

@@ -27,7 +27,7 @@ var globalPaymentResultToastContext = null;
 var DEFAULT_TOAST_CONFIG = {
   width: 680,
   mask: true,
-  maskClosable: false,
+  maskClosable: true,
   closable: true,
   zIndex: 2000
 };

package/es/components/checkout/components/PaymentResultToast/index.js

@@ -51,7 +51,7 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
     _props$mask = props.mask,
     mask = _props$mask === void 0 ? true : _props$mask,
     _props$maskClosable = props.maskClosable,
-    maskClosable = _props$maskClosable === void 0 ? false : _props$maskClosable,
+    maskClosable = _props$maskClosable === void 0 ? true : _props$maskClosable,
     _props$closable = props.closable,
     closable = _props$closable === void 0 ? true : _props$closable,
     zIndex = props.zIndex;

package/es/components/checkout/components/ScrollableList/index.js

@@ -241,7 +241,6 @@ var ScrollableList = function ScrollableList(_ref) {
     style: getGridStyle()
   }, children)), isScrollable && /*#__PURE__*/React.createElement("button", {
     style: _objectSpread(_objectSpread({}, bottomGradientStyle), {}, {
-      width: '100%',
       border: 'none',
       background: 'linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #A78BE1 100%)'
     }, gradientStyle),

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/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/pay/toB/components/CardGroup/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PayMethod, PayMethodGroup } from '../../types';
 import './index.less';
 declare const ToBPayCardGroup: (props: {

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

@@ -1,6 +1,6 @@
 import { forwardRef, useImperativeHandle } from 'react';
+import { webPayment } from '@pisell/utils';
 import useLogger from "../../../../../hooks/useLogger";
-import useEngineContext from "../../../../../hooks/useEngineContext";
 var getUuid = function getUuid() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxx'.replace(/[xy]/g, function (c) {
     var r = Math.random() * 16 | 0;
@@ -9,10 +9,7 @@ var getUuid = function getUuid() {
   });
 };
 var MX51 = function MX51(props, ref) {
-  var _context$appHelper;
   var logger = useLogger();
-  var context = useEngineContext();
-  var action = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.action;
   var onOpen = function onOpen(_ref) {
     var data = _ref.data,
       payCallback = _ref.payCallback;
@@ -36,47 +33,20 @@ var MX51 = function MX51(props, ref) {
         params: newData
       }
     });
-
-    // 通过action调用mx51支付
-    action({
-      type: 'webpos.handleMX51Pay',
-      data: newData,
-      callback: function callback(res) {
-        var isSame = false;
-        if (res !== null && res !== void 0 && res.uniquePaymentNumber) {
-          // jsbridge调用场景结果
-          var _res = res;
-          // 判断是否是同一个支付
-          isSame = (_res === null || _res === void 0 ? void 0 : _res.uniquePaymentNumber) === uniquePaymentNumber;
-          if (isSame) {
-            payCallback === null || payCallback === void 0 || payCallback(_res);
-          }
-        } else {
-          var _res2$data, _res2$data2;
-          // 原生调用场景结果
-          var _res2 = res;
-          // 转换为MX51PayResult类型，上层调用需要
-          var newRes = {
-            result: (_res2 === null || _res2 === void 0 ? void 0 : _res2.code) == '200' ? true : false,
-            msg: _res2 === null || _res2 === void 0 ? void 0 : _res2.msg,
-            amount: _res2 === null || _res2 === void 0 || (_res2$data = _res2.data) === null || _res2$data === void 0 ? void 0 : _res2$data.amount,
-            surcharge: _res2 === null || _res2 === void 0 || (_res2$data2 = _res2.data) === null || _res2$data2 === void 0 ? void 0 : _res2$data2.surcharge,
-            uniquePaymentNumber: _res2 === null || _res2 === void 0 ? void 0 : _res2.uuid
-          };
-          // 判断是否是同一个支付
-          isSame = (_res2 === null || _res2 === void 0 ? void 0 : _res2.uuid) === uniquePaymentNumber;
-          if (isSame) {
-            payCallback === null || payCallback === void 0 || payCallback(newRes);
-          }
+    // 通过jsbridge调用mx51支付
+    webPayment(newData, function (res) {
+      // 判断是否是同一个支付
+      var isSame = (res === null || res === void 0 ? void 0 : res.uniquePaymentNumber) === uniquePaymentNumber;
+      logger === null || logger === void 0 || logger.addLog({
+        type: 'info',
+        title: 'ToB_MX51_onOpen_callback',
+        metadata: {
+          msg: isSame ? 'uniquePaymentNumber一致' : 'uniquePaymentNumber不一致',
+          res: res
         }
-        logger === null || logger === void 0 || logger.addLog({
-          type: 'info',
-          title: 'ToB_MX51_onOpen_callback',
-          metadata: {
-            msg: isSame ? '交易流水号一致' : '交易流水号不一致',
-            res: res
-          }
-        });
+      });
+      if (isSame) {
+        payCallback === null || payCallback === void 0 || payCallback(res);
       }
     });
   };

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

@@ -58,15 +58,3 @@ export interface MX51PayResult {
     surcharge: number;
     uniquePaymentNumber: string;
 }
-/**
- * @title 原生MX51支付结果
- */
-export interface NativeMX51PayResult {
-    code: string;
-    msg?: string;
-    data: {
-        amount: number;
-        surcharge: number;
-    };
-    uuid: string;
-}

package/es/components/pay/toB/types/index.js

@@ -11,8 +11,4 @@ export * from "./storeTypes";
 /**
  * @title: MX51支付结果
  */
-
-/**
- * @title 原生MX51支付结果
- */
 export {};

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

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

package/es/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/es/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;