@pisell/private-materials 6.11.65 → 6.11.66

package/es/pro/skuDetailModal/index.js

@@ -262,7 +262,7 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
     return {
       open: function () {
         var _open = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data) {
-          var _skuDetailConfig$isSh, _skuDetailConfig$isSh2, _skuDetailConfig$exte, _skuDetailConfig$useC, _skuDetailConfig$cust, _skuDetailConfig$isCa, _data$_extend, _data$_extend2, _data$_extend3, _data$_extend4, _data$_extend5;
+          var _skuDetailConfig$isSh, _skuDetailConfig$isSh2, _skuDetailConfig$exte, _skuDetailConfig$useC, _skuDetailConfig$cust, _skuDetailConfig$isCa, _data$_extend, _data$_extend2, _data$_extend3, _data$_extend4, _data$_extend$priceOv, _data$_extend5;
           var dataWithConfig, skuDetailConfig, config, _apiData, _data$productData, _apiData2, _apiData3, _apiData4, _apiData5, _apiData6, _apiData7, _ref5, _is_eject, _apiData8, _apiData9, _hydratedData$_extend2, open_deposit, productDetail, apiData, basePrice, _variantData, hydratedData, isEject, _hydratedData$_extend, _bookingState$booking7, stockResult, hydratedAny, _initialHasSkuOptions, _data, variantData, recordSkuValue, dataAny, initialHasSkuOptions;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
@@ -416,7 +416,7 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
                 console.log(recordSkuValue, 'skuValue');
                 setSkuValue(recordSkuValue);
                 setSkuDefaultValue(recordSkuValue);
-                setPriceOverride((_data === null || _data === void 0 || (_data$_extend5 = _data._extend) === null || _data$_extend5 === void 0 ? void 0 : _data$_extend5.priceOverride) || null);
+                setPriceOverride((_data$_extend$priceOv = _data === null || _data === void 0 || (_data$_extend5 = _data._extend) === null || _data$_extend5 === void 0 ? void 0 : _data$_extend5.priceOverride) !== null && _data$_extend$priceOv !== void 0 ? _data$_extend$priceOv : null);
                 // setPriceOverride(getInitialPriceOverrideFromProductData({ productData: _data }))
                 setShowPriceAdjustModal(false);
                 // 默认进入：有 SKU 选择则从 step1 开始；否则从 step0（详情）开始

package/lib/pro/skuDetailModal/index.js

@@ -310,7 +310,9 @@ var SkuDetailModal = ({ onConfirm, onRemove, onClose }, ref) => {
       );
       setSkuValue(recordSkuValue);
       setSkuDefaultValue(recordSkuValue);
-      setPriceOverride(((_i2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _i2.priceOverride) || null);
+      setPriceOverride(
+        ((_i2 = _data == null ? void 0 : _data._extend) == null ? void 0 : _i2.priceOverride) ?? null
+      );
       setShowPriceAdjustModal(false);
       const dataAny = _data;
       const initialHasSkuOptions = Array.isArray(dataAny == null ? void 0 : dataAny.variant_group) && dataAny.variant_group.length > 0 || Array.isArray(dataAny == null ? void 0 : dataAny.option_group) && dataAny.option_group.length > 0 || Array.isArray(dataAny == null ? void 0 : dataAny.bundle_group) && dataAny.bundle_group.length > 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.65",
+  "version": "6.11.66",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",

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

@@ -1,38 +0,0 @@
-export declare const getRelationDetailsTotal: (relation_details: any) => number;
-export declare const getProductDiscountProductDiscountDifference: (product: any) => any;
-export declare const getIsPriceIncludeTax: (state: any) => any;
-/**
- * 总金额
- * @param state
- * @param options isEdit: 预约信息是否发生变动
- * @returns
- */
-export declare const getSumTotal: (state: any, options: {
-    [key: string]: any;
-    isEdit: boolean;
-    ScheduleModule: any;
-}) => {
-    productAmount: number;
-    duration: string;
-    tax: number;
-    taxInfo: {
-        title: any;
-        rate: any;
-        is_price_include_tax: any;
-    };
-    shopDiscount: number;
-    surcharge: any;
-    otherAmount: any;
-    sumTotalAmount: number;
-    paidAmount: any;
-    notPaidAmount: number;
-    paySurchargeFee: number;
-    expectAmount: number;
-    actualPaidAmount: any;
-    orderPaidAmount: any;
-    totalRefundAmount: number;
-    dueAmount: number;
-    roundingAmount: number;
-    originExpectAmount: number;
-    originExpectAmountWithoutDiscount: number;
-};

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

@@ -1,301 +0,0 @@
-/**
- * 赠品信息（evaluator 返回）
- */
-interface GiftInfo {
-    strategyId: string;
-    strategyName: string | Record<string, string>;
-    giftCount: number;
-    giftOptions: Array<{
-        product_id: number;
-        product_variant_id: number;
-    }>;
-}
-/**
- * 扩展的赠品信息（包含触发赠品的主商品ID）
- */
-interface ExtendedGiftInfo extends GiftInfo {
-    /** 触发此赠品的主商品 _id 列表 */
-    sourceProductIds: string[];
-}
-/**
- * 赠品详情信息（放在 _extend._promotion.giftInfo）
- */
-interface PromotionGiftDetail {
-    strategyName: string | Record<string, string>;
-    giftCount: number;
-    giftOptions: Array<{
-        product_id: number;
-        product_variant_id: number;
-    }>;
-}
-/**
- * 商品促销信息（整合后，放在 _extend._promotion）
- */
-interface ProductPromotionInfo {
-    /** 策略ID */
-    strategyId: string;
-    /** 策略元数据 */
-    strategyMetadata?: any;
-    /** 是否参与促销 */
-    inPromotion: boolean;
-    /** 原始价格 */
-    originalPrice: number;
-    /** 最终价格 */
-    finalPrice: number;
-    /** 赠品信息（仅"买X送Y"促销的第一个商品有） */
-    giftInfo?: PromotionGiftDetail;
-}
-/**
- * 赠品商品上的标记信息（放在 _giftInfo）
- */
-interface GiftProductInfo {
-    /** 关联策略ID */
-    strategyId: string;
-    /** 策略名称 */
-    strategyName: string | Record<string, string>;
-    /** 触发此赠品的主商品 _id 列表 */
-    sourceProductIds: string[];
-}
-/**
- * 赠品减少操作项
- */
-interface GiftReduceItem {
-    /** 赠品的 _id */
-    _id: string;
-    /** 当前数量 */
-    currentQuantity: number;
-    /** 目标数量（减少后的数量，不会是0，0的情况在toRemove处理） */
-    newQuantity: number;
-}
-/**
- * 赠品操作类型
- */
-interface GiftAction {
-    /** 需要添加的赠品 */
-    toAdd: Array<{
-        strategyId: string;
-        strategyName: string | Record<string, string>;
-        giftCount: number;
-        giftOptions: Array<{
-            product_id: number;
-            product_variant_id: number;
-        }>;
-        /** 触发此赠品的主商品 _id 列表 */
-        sourceProductIds: string[];
-    }>;
-    /** 需要减少数量的赠品（数量减少但不删除） */
-    toReduce: Array<{
-        strategyId: string;
-        /** 具体要操作的赠品列表 */
-        items: GiftReduceItem[];
-    }>;
-    /** 需要完全删除的赠品 _id 列表 */
-    toRemove: string[];
-}
-/**
- * 促销计算结果
- */
-/**
- * 未满足促销条件的信息
- */
-interface UnfulfilledPromotion {
-    /** 策略ID */
-    strategyId: string;
-    /** 活动名称 */
-    strategyName: string | Record<string, string>;
-    /** 促销类型（X_ITEMS_FOR_Y_PRICE / BUY_X_GET_Y_FREE） */
-    actionType: string;
-    /** 还需要买几件 */
-    needQuantity: number;
-    /** 当前已有几件 */
-    currentQuantity: number;
-    /** 促销需要的总件数 */
-    requiredQuantity: number;
-    /** 可以参与此促销的商品列表 */
-    eligibleProducts: Array<{
-        product_id: number;
-        product_variant_id: number;
-    }>;
-    /** 策略元数据 */
-    strategyMetadata?: any;
-    /** 展示配置 */
-    display?: {
-        text: string | Record<string, string>;
-        type: string;
-    };
-}
-interface PromotionResult {
-    /** 处理后的商品列表（不含赠品） */
-    products: any[];
-    /** 总优惠金额 */
-    totalDiscount: number;
-    /** 扩展的赠品信息（包含 sourceProductIds） */
-    gifts: ExtendedGiftInfo[];
-    /** 赠品操作（需要添加/减少/删除的赠品） */
-    giftActions: GiftAction;
-    /** 未满足促销条件的信息（用于展示"再买X件"提示） */
-    unfulfilledPromotions: UnfulfilledPromotion[];
-}
-/**
- * 赠品选择回调参数
- */
-interface GiftSelectionCallbackParams {
-    /** 策略ID */
-    strategyId: string;
-    /** 策略名称 */
-    strategyName: string | Record<string, string>;
-    /** 可选赠品列表 */
-    giftOptions: Array<{
-        product_id: number;
-        product_variant_id: number;
-    }>;
-    /** 可选数量 */
-    giftCount: number;
-    /** 触发此赠品的主商品 _id 列表 */
-    sourceProductIds: string[];
-}
-/**
- * usePromotion 配置选项
- */
-interface UsePromotionOptions {
-    /** 需要选择赠品时的回调 */
-    onGiftSelection?: (params: GiftSelectionCallbackParams) => void;
-}
-declare const usePromotion: (state?: any, dispatch?: any, options?: UsePromotionOptions) => {
-    run: () => void;
-    formatProductList: (list: any[]) => any[];
-    processPromotion: (list: any[]) => PromotionResult;
-};
-export default usePromotion;
-/**
- * 主商品的 _extend._promotion 结构示例
- *
- * @example
- * ```typescript
- * // 1. X件Y元促销 - 已满足条件
- * {
- *   _extend: {
- *     _promotion: {
- *       strategyId: "strategy_1",
- *       strategyMetadata: { ... },
- *       inPromotion: true,
- *       originalPrice: 100,
- *       finalPrice: 80,
- *     }
- *   }
- * }
- *
- * // 2. X件Y元促销 - 未满足条件（如买2件享优惠，当前只买了1件）
- * // UI 可以展示"再买1件即可享受2件80元"等提示
- * {
- *   _extend: {
- *     _promotion: {
- *       strategyId: "strategy_1",
- *       strategyMetadata: { ... },
- *       inPromotion: false,        // 未满足条件
- *       originalPrice: 100,
- *       finalPrice: 100,           // 价格不变
- *     }
- *   }
- * }
- *
- * // 3. 买X送Y促销的第一个商品（有 giftInfo）
- * {
- *   _extend: {
- *     _promotion: {
- *       strategyId: "strategy_2",
- *       strategyMetadata: { ... },
- *       inPromotion: true,
- *       originalPrice: 100,
- *       finalPrice: 100,
- *       giftInfo: {
- *         strategyName: "买3送1",
- *         giftCount: 1,
- *         giftOptions: [{ product_id: 123, product_variant_id: 0 }]
- *       }
- *     }
- *   }
- * }
- *
- * // 4. 买X送Y促销的其他商品（无 giftInfo）
- * {
- *   _extend: {
- *     _promotion: {
- *       strategyId: "strategy_2",
- *       strategyMetadata: { ... },
- *       inPromotion: true,
- *       originalPrice: 100,
- *       finalPrice: 100,
- *     }
- *   }
- * }
- *
- * // 5. 无适用促销的商品
- * // 没有 _promotion 字段
- * {
- *   _extend: {
- *     // 无 _promotion 字段
- *   }
- * }
- * ```
- */
-/**
- * onGiftSelection 回调中如何构建赠品商品的示例
- *
- * @example
- * ```tsx
- * const { run, formatProductList, processPromotion } = usePromotion(state, dispatch, {
- *   onGiftSelection: async ({ strategyId, strategyName, giftOptions, giftCount, sourceProductIds }) => {
- *     // giftOptions 只包含 product_id 和 product_variant_id
- *     // 需要自行获取完整商品信息
- *
- *     let selectedGiftOption = giftOptions[0]; // 默认选第一个
- *
- *     // 如果有多个赠品选项，弹出选择弹窗
- *     if (giftOptions.length > 1) {
- *       selectedGiftOption = await showGiftSelectionModal(giftOptions);
- *     }
- *
- *     // 获取完整商品信息（根据 product_id 和 product_variant_id）
- *     const productDetail = await fetchProductDetail(
- *       selectedGiftOption.product_id,
- *       selectedGiftOption.product_variant_id
- *     );
- *
- *     // 构建赠品商品对象
- *     const giftProduct = {
- *       _id: generateStringId(), // 唯一标识
- *       _isGift: true,           // 标记为赠品
- *       _giftInfo: {             // 赠品关联信息（注意：赠品用 _giftInfo，主商品用 _extend._promotion）
- *         strategyId,            // 策略ID
- *         strategyName,          // 策略名称
- *         sourceProductIds,      // 触发此赠品的主商品 _id 列表
- *       } as GiftProductInfo,
- *       _extend: {
- *         price: 0,              // 赠品价格为0
- *         main_product_selling_price: 0,
- *         quantity: giftCount,   // 赠品数量
- *         total: 0,
- *         origin_total: 0,
- *         product_name: productDetail.title,
- *         other: {
- *           product_id: selectedGiftOption.product_id,
- *           product_variant_id: selectedGiftOption.product_variant_id,
- *         },
- *       },
- *       // ... 其他商品基础信息从 productDetail 获取
- *       title: productDetail.title,
- *       price: productDetail.price, // 原价（用于展示划线价）
- *       // ...
- *     };
- *
- *     // 添加到购物车
- *     dispatch({
- *       type: 'addService',
- *       payload: { value: giftProduct },
- *     });
- *   },
- * });
- * ```
- */
-export type { GiftInfo, ExtendedGiftInfo, PromotionGiftDetail, ProductPromotionInfo, GiftProductInfo, GiftAction, GiftReduceItem, GiftSelectionCallbackParams, UsePromotionOptions, PromotionResult, UnfulfilledPromotion, };

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

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

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

@@ -1,3 +0,0 @@
-import React from 'react';
-declare const EditNormalService: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
-export default EditNormalService;

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

@@ -1,40 +0,0 @@
-import React from 'react';
-import './index.less';
-interface PaymentModalData {
-    order_info: any;
-    subtotal_info: {
-        subTotalList: any[];
-        orderTotalList: any[];
-        total: number;
-        showDetail: boolean;
-    };
-    total: any;
-}
-interface PaymentModalProps {
-    open?: boolean;
-    data?: PaymentModalData;
-    callback?: (result: any) => void;
-    onClose?: (reset?: boolean) => void;
-    paymentResultDisplayMode?: string;
-    shopDiscount?: number;
-    client?: any;
-    currentTotalPrice?: number;
-    config?: any;
-    onChangeShopDiscount?: (discount: string) => void;
-    onChangeOrderNote?: (note: string) => void;
-    onDeleteOrderNote?: () => void;
-}
-interface PaymentModalMainProps extends PaymentModalProps {
-    onClose?: (reset?: boolean) => void;
-    onSetLocalOrderId?: (order_id: number) => void;
-    setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
-    editOrderId?: number;
-    config?: {
-        showHeaderCenter?: boolean;
-        showHeaderRightButton?: boolean;
-        disabledSwitchClient?: boolean;
-    };
-}
-declare const PaymentModal: React.FC<PaymentModalMainProps>;
-export type { PaymentModalData, PaymentModalProps };
-export default PaymentModal;

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

@@ -1,2 +0,0 @@
-declare const PaymentModalPlugin: any;
-export default PaymentModalPlugin;

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

@@ -1,46 +0,0 @@
-import { TabItem, LoadDataParams } from '../types';
-export interface ListState {
-    activeTab: string;
-    currentPage: number;
-    isStickyActive: boolean;
-}
-export declare type ListAction = {
-    type: 'SET_ACTIVE_TAB';
-    payload: string[] | string;
-} | {
-    type: 'SET_CURRENT_PAGE';
-    payload: number;
-} | {
-    type: 'SET_STICKY_ACTIVE';
-    payload: boolean;
-} | {
-    type: 'RESET_PAGE';
-};
-export interface UseListStateProps {
-    /** 外部传入的当前页码 */
-    externalCurrentPage?: number;
-    /** tab数据 */
-    tabItems: TabItem[];
-    /** 默认页面大小 */
-    defaultPageSize: number;
-    /** 数据加载回调 */
-    onLoadData?: (params: LoadDataParams) => void;
-    /** tab样式 */
-    tabStyle: 'anchor' | 'switch' | 'none';
-    isTreeTab: boolean;
-}
-export interface UseListStateReturn {
-    state: ListState;
-    setActiveTab: (tab: string) => void;
-    setCurrentPage: (page: number) => void;
-    setStickyActive: (active: boolean) => void;
-    resetPage: () => void;
-    handleTabChange: (key: string[] | string) => void;
-    handlePageChange: (page: number, size?: number) => void;
-    handleShowSizeChange: (current: number, size: number) => void;
-    handleLoadMore: () => void;
-    handleViewLess: () => void;
-    handleScrollLoad: () => void;
-    actualCurrentPage: number;
-}
-export declare const useListState: ({ externalCurrentPage, tabItems, defaultPageSize, onLoadData, tabStyle, isTreeTab, }: UseListStateProps) => UseListStateReturn;

package/es/components/shoppingCart/components/Cart/Product.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="react" />
-import { ProductProps } from '../../type';
-declare const Product: (props: ProductProps) => JSX.Element;
-export default Product;

package/es/components/shoppingCart/components/Cart/index.d.ts

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

package/es/components/shoppingCart/hooks/usePromotionModal.d.ts

@@ -1,21 +0,0 @@
-/// <reference types="react" />
-export interface UsePromotionModalOptions {
-    /** 确认回调 */
-    onConfirm?: (selectedProduct: any) => void;
-    /** 取消回调 */
-    onCancel?: () => void;
-}
-export declare const usePromotionModal: (options?: UsePromotionModalOptions) => {
-    /** 打开弹窗方法 */
-    openModal: (item: any) => void;
-    /** 关闭弹窗方法 */
-    closeModal: () => void;
-    /** Modal 组件 */
-    MarketingModal: JSX.Element;
-    /** 规格选择弹窗组件 */
-    SkuModal: JSX.Element;
-    /** 当前选中的商品 ID */
-    selected: any;
-    /** 弹窗是否打开 */
-    isOpen: boolean;
-};

package/es/components/shoppingCart/type.d.ts

@@ -1,59 +0,0 @@
-import { CollapseProps } from 'antd';
-export interface productProps {
-    hideAddBtn?: boolean;
-    isShowNote?: boolean;
-    isShowPackageNote?: boolean;
-    products?: any[];
-    holders?: any[];
-    isEdit?: boolean;
-    disabledEdit?: boolean;
-    isShowChangeResource?: boolean;
-    isShowDelete?: boolean;
-    isShowChangeHolder?: boolean;
-    isShowHolder?: boolean;
-    isShowAddHolderButton?: boolean;
-}
-interface cartInfoProps {
-    promotions?: any[];
-    isShowPromotionAlert?: boolean;
-}
-export interface shoppingCartProps {
-    isOpenGroup?: boolean;
-    carts?: any[];
-    platform?: 'shop' | 'h5';
-    emptyText?: string;
-    activeKey?: string[] | number[];
-    defaultActiveKey?: string[] | number[];
-    className?: string;
-    onCard?: (e: any) => void;
-    onAction?: (e: any) => void;
-    onChange?: (items: any, type?: string, other?: any) => void;
-    onAddProduct?: (e?: any) => void;
-    onActiveKey?: (e: any) => void;
-    isShowImage?: boolean;
-    isShowHolder?: boolean;
-    isShowDelete?: boolean;
-    isShowAmountFooter?: boolean;
-    collapseParams?: CollapseProps;
-    productParams?: productProps;
-    isHideClearCart?: boolean;
-    isParallelResource?: boolean;
-    scenario?: 'booking2';
-    cartInfo?: cartInfoProps;
-}
-/**
- * @title: 商品卡片
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-11-29 09:52
- */
-export interface ProductProps {
-    id?: any;
-    lists: any[];
-    isAdd?: boolean;
-    openPromotionModal?: (products: any[]) => void;
-    promotionProducts?: any[];
-    isShowPromotionAlert?: boolean;
-}
-export {};