@pisell/private-materials 3.3.38 → 3.3.40

package/es/components/wallet/Voucher/model.d.ts

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IWalletListItemProps } from './serve';
 export interface WalletCardItemProps {
     id: string;
@@ -27,11 +26,4 @@ export interface WalletListProps {
     currentSearchListItemCode?: string;
     [key: string]: any;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    global_wallet: WalletListProps;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/workSpaceList/components/Modal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

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

package/es/hooks/useComponents.js

@@ -8,7 +8,7 @@ var useComponents = function useComponents(params) {
     var _utils$getComponents;
     var _ref = appHelper || {},
       utils = _ref.utils;
-    return (utils === null || utils === void 0 ? void 0 : (_utils$getComponents = utils.getComponents) === null || _utils$getComponents === void 0 ? void 0 : _utils$getComponents.call(utils, components)) || [];
+    return (utils === null || utils === void 0 || (_utils$getComponents = utils.getComponents) === null || _utils$getComponents === void 0 ? void 0 : _utils$getComponents.call(utils, components)) || [];
   }, [components]);
   return Cpt;
 };

package/lib/components/Sales/Summary/utils.d.ts

@@ -25,7 +25,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts

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

package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts

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

package/lib/components/appointmentBooking/components/Cart/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel, onNext }: any) => JSX.Element;
 export default Cart;

package/lib/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -80,12 +80,15 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
       data: params,
       callback: async (e) => {
         var _a3;
-        await appointmentBooking.updateCart({
-          _id: (_a3 = carts == null ? void 0 : carts[0]) == null ? void 0 : _a3._id,
-          relationForms: e
-        });
-        appointmentBooking.setOtherData(key, true);
-        callback();
+        if ((e == null ? void 0 : e.type) !== "close") {
+          await appointmentBooking.updateCart({
+            _id: (_a3 = carts == null ? void 0 : carts[0]) == null ? void 0 : _a3._id,
+            relationForms: e
+          });
+          appointmentBooking.setOtherData(key, true);
+          callback();
+        }
+        setLoading(false);
       }
     });
   };
@@ -95,6 +98,7 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
     if ((deposit == null ? void 0 : deposit.hasDeposit) && ((_a2 = deposit == null ? void 0 : deposit.protocols) == null ? void 0 : _a2.length) > 0 && !isAgreeDepositPolicy) {
       return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.deposit.agree.policy"));
     }
+    setLoading(true);
     if (isRetailTemplate) {
       handleForm(true);
       return;
@@ -102,7 +106,6 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
     onCheckout();
   };
   const onCheckout = async () => {
-    setLoading(true);
     try {
       const { deposit } = summary;
       const { data } = await appointmentBooking.submitOrder();

package/lib/components/appointmentBooking/components/Content/index.d.ts

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

package/lib/components/appointmentBooking/components/Deposit/index.d.ts

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

package/lib/components/appointmentBooking/components/Footer/index.d.ts

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

package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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

package/lib/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/lib/components/appointmentBooking/components/Resource/index.js

@@ -83,6 +83,7 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
       const stepList = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList) || [];
       const accountLists = await appointmentBooking.getAccounts();
       const checkResult = (0, import_utils.checkHasFormStep)({
+        setIsErrorHolder,
         nextStep,
         hasResourceFormId: (resultCarts == null ? void 0 : resultCarts.length) > 0,
         currentStep,

package/lib/components/appointmentBooking/components/Services/index.js

@@ -48,22 +48,26 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
   const { isDateSelectedFirst, isRetailTemplate } = (0, import_hooks.useAppointmentBookingSetting)();
   const { getProducts, checkProductType } = (0, import_hooks.useAppointmentBookingProduct)();
   const { removeStep, nextStep } = (0, import_hooks.useAppointmentBookingStep)();
-  const { currentStep } = (0, import_context.useAppointmentBookingContext)();
+  const { currentStep, setLoading } = (0, import_context.useAppointmentBookingContext)();
   const [products, setProducts] = (0, import_react.useState)(null);
-  const [loading, setLoading] = (0, import_react.useState)(false);
+  const [productLoading, setProductLoading] = (0, import_react.useState)(false);
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: () => {
-      nextStep();
+      setLoading(true);
+      setTimeout(() => {
+        nextStep();
+        setLoading(false);
+      }, 200);
     }
   }));
   (0, import_react.useEffect)(() => {
-    setLoading(true);
+    setProductLoading(true);
     getProducts().then((res) => {
       setProducts(res || []);
-      setLoading(false);
+      setProductLoading(false);
     }).catch(() => {
       setProducts([]);
-      setLoading(false);
+      setProductLoading(false);
     });
   }, [isDateSelectedFirst]);
   const handleSelectProduct = async (item) => {
@@ -155,7 +159,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       dataSource: products,
       onChange: handleSelectProduct,
       scrollDom: (0, import_utils.isMobile)() ? ".parallel-content-wrap" : ".parallel-booking-wrap",
-      loading,
+      loading: productLoading,
       emptyDescription: import_utils.locales.getText(
         "pisell2.appointment.booking.empty.service"
       ),

package/lib/components/appointmentBooking/components/Voucher/index.d.ts

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

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

package/lib/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/lib/components/appointmentBooking/hooks.js

@@ -312,7 +312,7 @@ var useAppointmentBookingResource = () => {
 };
 var useIsSkipResourceStep = () => {
   var _a, _b, _c;
-  const { currentStep, setCarts, setPolicyIds } = (0, import_context.useAppointmentBookingContext)();
+  const { currentStep, setCarts, setPolicyIds, setIsErrorHolder } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceList, autoSelectAllProductResources } = useAppointmentBookingResource();
   const { isFormSubject } = useAppointmentBookingSetting();
   const appointmentBooking = useAppointmentBooking();
@@ -332,7 +332,7 @@ var useIsSkipResourceStep = () => {
         if (!((_a2 = res == null ? void 0 : res.errorList) == null ? void 0 : _a2.length) && ((_e = (_d = (_c2 = (_b2 = resources == null ? void 0 : resources[0]) == null ? void 0 : _b2.resources) == null ? void 0 : _c2[0]) == null ? void 0 : _d.renderList) == null ? void 0 : _e.length) === 1) {
           if (!isSkipUpdateFormStep) {
             const resultCarts = (0, import_utils2.formatCartsResources)(carts, resources, setPolicyIds);
-            (0, import_utils2.checkHasFormStep)({ nextStep, isSkip: true, openLoginModal, utils, accountLists, getHolders, checkHolder: import_utils3.checkHolder, setCarts, checkAccount, carts, isFormSubject, hasResourceFormId: (resultCarts == null ? void 0 : resultCarts.length) > 0, currentStep, stepList, appointmentBooking, locales: import_utils.locales, isLogin });
+            (0, import_utils2.checkHasFormStep)({ setIsErrorHolder, nextStep, isSkip: true, openLoginModal, utils, accountLists, getHolders, checkHolder: import_utils3.checkHolder, setCarts, checkAccount, carts, isFormSubject, hasResourceFormId: (resultCarts == null ? void 0 : resultCarts.length) > 0, currentStep, stepList, appointmentBooking, locales: import_utils.locales, isLogin });
           }
           return true;
         } else {

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

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

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

@@ -111,4 +111,4 @@ export declare const Toast: (text: string) => void;
  * @Author: WangHan
  * @Date: 2025-05-06 21:51
  */
-export declare const checkHasFormStep: ({ nextStep, isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId, currentStep, stepList, appointmentBooking, locales, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }: any) => true | undefined;
+export declare const checkHasFormStep: ({ setIsErrorHolder, nextStep, isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId, currentStep, stepList, appointmentBooking, locales, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }: any) => true | undefined;

package/lib/components/appointmentBooking/utils.js

@@ -273,7 +273,7 @@ var Toast = (text) => {
     window == null ? void 0 : window.alert(text);
   }
 };
-var checkHasFormStep = ({ nextStep, isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId: hasResourceFormId2, currentStep, stepList, appointmentBooking, locales: locales2, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }) => {
+var checkHasFormStep = ({ setIsErrorHolder, nextStep, isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId: hasResourceFormId2, currentStep, stepList, appointmentBooking, locales: locales2, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }) => {
   var _a, _b, _c;
   let isNext = false;
   if (hasResourceFormId2) {
@@ -295,6 +295,7 @@ var checkHasFormStep = ({ nextStep, isSkip, checkHolder, checkAccount, carts, se
       if (result) {
         setCarts(result);
       }
+      setIsErrorHolder(!!result);
       if (!!result) return true;
     };
     if (!isLogin) {

package/lib/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/lib/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/lib/components/booking/forms/footer.d.ts

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

package/lib/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/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/lib/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/lib/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/lib/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/lib/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/lib/components/booking/info/service/addTimeModal/index.d.ts

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

package/lib/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/lib/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/lib/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/lib/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -105,11 +104,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/lib/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/lib/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/lib/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/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/lib/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/lib/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

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

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ 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<"warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/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/lib/components/eftposPay/pay.d.ts

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

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

package/lib/components/eftposPay/windcave/windcave.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

package/lib/components/eventBooking/components/ErrorTip/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts

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

package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -69,6 +69,9 @@ var ContinueButton = () => {
       data: params,
       callback: async (e) => {
         var _a2;
+        if ((e == null ? void 0 : e.type) === "close") {
+          return;
+        }
         const value = (0, import_utils2.formatValues)(data, false, {
           relation_forms: e
         });
@@ -103,16 +106,8 @@ var ContinueButton = () => {
           return item;
         }
         const { bundle = [], options } = item._productDetail;
-        if (product == null ? void 0 : product.product_variant_id) {
-          const { variant = [] } = newProduct;
-          const _variant = variant.find(
-            (v) => v.id === product.product_variant_id
-          );
-          if (_variant) {
-            _totalPrice = Number(_variant.price);
-          }
-        } else if (
-          // 2. 套餐商品
+        if (
+          // 1. 套餐商品
           Array.isArray(product == null ? void 0 : product.product_bundle) && product.product_bundle.length > 0
         ) {
           const { bundle_group = [] } = newProduct;
@@ -132,7 +127,7 @@ var ContinueButton = () => {
               if ((_originBundleItemInfo == null ? void 0 : _originBundleItemInfo._bundle_product_id) === (_newBundleItemInfo == null ? void 0 : _newBundleItemInfo.bundle_product_id)) {
                 const {
                   price_type,
-                  num = 0,
+                  num = 1,
                   option: _originBundleItemOptions
                 } = _originBundleItemInfo;
                 const _bundleItemPrice = Number(_newBundleItemInfo.price);
@@ -150,7 +145,7 @@ var ContinueButton = () => {
                       (op) => op.product_option_item_id === option_group_item_id
                     );
                     if (_originOptionItem) {
-                      const { price, num: _optionNum = 0 } = _originOptionItem;
+                      const { price, num: _optionNum = 1 } = _originOptionItem;
                       _totalPrice += Number(price) * _optionNum;
                     }
                   }
@@ -158,18 +153,26 @@ var ContinueButton = () => {
               }
             }
           }
-        } else if (
-          // 3. 单规格商品
-          Array.isArray(product == null ? void 0 : product.product_option_item) && product.product_option_item.length > 0
-        ) {
-          for (let i = 0; i < product.product_option_item.length; i++) {
-            const { option_group_item_id } = product.product_option_item[i];
-            const _originOptionItem = options.find(
-              (op) => op.product_option_item_id === option_group_item_id
+        } else {
+          if (product == null ? void 0 : product.product_variant_id) {
+            const { variant = [] } = newProduct;
+            const _variant = variant.find(
+              (v) => v.id === product.product_variant_id
             );
-            if (_originOptionItem) {
-              const { price, num = 0 } = _originOptionItem;
-              _totalPrice += Number(price) * num;
+            if (_variant) {
+              _totalPrice = Number(_variant.price);
+            }
+          }
+          if (Array.isArray(product == null ? void 0 : product.product_option_item) && product.product_option_item.length > 0) {
+            for (let i = 0; i < product.product_option_item.length; i++) {
+              const { option_group_item_id } = product.product_option_item[i];
+              const _originOptionItem = options.find(
+                (op) => op.product_option_item_id === option_group_item_id
+              );
+              if (_originOptionItem) {
+                const { price, num = 1 } = _originOptionItem;
+                _totalPrice += Number(price) * num;
+              }
             }
           }
         }