@pisell/private-materials 6.0.25 → 6.1.1

package/lib/components/Sales/Cart/index.js

@@ -43,6 +43,7 @@ var import_serve = require("./serve");
 var import_Customer = require("../Customer");
 var import_ahooks = require("ahooks");
 var import_utils2 = require("../Checkout/utils");
+var import_utils3 = require("./utils");
 var defaultState = {
   cartItems: [],
   currentCartItem: null
@@ -156,6 +157,7 @@ var CartProvider = ({ children }) => {
     return cartItem;
   };
   const createCartItemFromEvent = (eventItem) => {
+    console.log("eventItem>>>>>>", eventItem);
     const { resourceData, holderData } = getCurrentData();
     let cartItem = {
       _id: (0, import_utils.getUniqueId)(),
@@ -219,7 +221,7 @@ var CartProvider = ({ children }) => {
     });
   };
   const createCartItemData = () => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const _cartData = getCurrentData().cartData;
     if (_cartData.currentCartItem) {
       const {
@@ -227,21 +229,28 @@ var CartProvider = ({ children }) => {
         eventItem = {},
         holderItem = {}
       } = _cartData.currentCartItem || {};
-      const bookingOptionData = (_b = (_a = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _a.bookingOptionItem) == null ? void 0 : _b._originData;
-      const startDateInfo = (_d = (_c = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _c.selectDate) == null ? void 0 : _d.startDateInfo;
-      const startTime = (_f = (_e = startDateInfo == null ? void 0 : startDateInfo.times) == null ? void 0 : _e[0]) == null ? void 0 : _f.start_at;
-      const endDateInfo = (_h = (_g = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _g.selectDate) == null ? void 0 : _h.endDateInfo;
-      const endTime = (_k = (_j = (_i = endDateInfo == null ? void 0 : endDateInfo.times) == null ? void 0 : _i.slice(-1)) == null ? void 0 : _j[0]) == null ? void 0 : _k.end_at;
-      const originTotal = Number((bookingOptionData == null ? void 0 : bookingOptionData.original_price) || "");
+      const eventDetail = eventItem == null ? void 0 : eventItem.eventDetail;
+      const bookingOptionData = (_a = eventDetail == null ? void 0 : eventDetail.bookingOptionItem) == null ? void 0 : _a._originData;
+      console.log("eventDetail>>>>>>", eventDetail);
+      const startDateInfo = (_c = (_b = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _b.selectDate) == null ? void 0 : _c.startDateInfo;
+      const startTime = (_e = (_d = startDateInfo == null ? void 0 : startDateInfo.times) == null ? void 0 : _d[0]) == null ? void 0 : _e.start_at;
+      const endDateInfo = (_g = (_f = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _f.selectDate) == null ? void 0 : _g.endDateInfo;
+      const endTime = (_j = (_i = (_h = endDateInfo == null ? void 0 : endDateInfo.times) == null ? void 0 : _h.slice(-1)) == null ? void 0 : _i[0]) == null ? void 0 : _j.end_at;
+      const num = 1;
+      const { totalPrice, originTotal, is_charge_tax } = (0, import_utils3.handleProductInfo)(
+        eventDetail,
+        num
+      );
       const newCartItem = {
         _id,
         id: eventItem.id,
         name: eventItem.title,
-        price: bookingOptionData == null ? void 0 : bookingOptionData.price,
-        total: bookingOptionData == null ? void 0 : bookingOptionData.price,
+        price: totalPrice,
+        // eventBooking中售价和总价保持一致，因为数量为1
+        total: totalPrice,
         // 排除原始价格为0的场景
-        origin_total: isNaN(originTotal) || originTotal === 0 ? void 0 : bookingOptionData == null ? void 0 : bookingOptionData.original_price,
-        num: 1,
+        origin_total: isNaN(originTotal) || originTotal === 0 ? void 0 : originTotal,
+        num,
         image: eventItem.image,
         isShowNote: true,
         note: "",
@@ -256,13 +265,13 @@ var CartProvider = ({ children }) => {
         // 是否显示时间
         show_time: true,
         end_time: endTime ? (0, import_dayjs.default)(endTime || "").format("HH:mm") : "",
-        custom_day_count: ((_n = (_m = (_l = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _l.selectDate) == null ? void 0 : _m.dates) == null ? void 0 : _n.length) || 0,
-        is_charge_tax: bookingOptionData == null ? void 0 : bookingOptionData.is_charge_tax,
+        custom_day_count: ((_m = (_l = (_k = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _k.selectDate) == null ? void 0 : _l.dates) == null ? void 0 : _m.length) || 0,
+        is_charge_tax,
         _originData: {
           ..._cartData.currentCartItem._originData,
           product: {
             num: 1,
-            product_id: bookingOptionData.id,
+            product_id: bookingOptionData == null ? void 0 : bookingOptionData.id,
             note: "",
             // eventdetail 获取
             product_bundle: [],
@@ -279,13 +288,16 @@ var CartProvider = ({ children }) => {
           },
           event_unique_identifier: _id
           // 传递给接口用于商品可用性检测的比对
-        }
+        },
+        _productDetail: eventDetail.productDetail
       };
+      const originData = (0, import_utils3.handleCartItemOrigin)(newCartItem, eventDetail);
+      newCartItem._originData = originData;
       if (holderItem == null ? void 0 : holderItem._originData) {
         newCartItem._originData.holder = {
-          customer_id: (_o = getUserInfo()) == null ? void 0 : _o.id,
-          form_id: (_p = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _p.form_id,
-          form_record: ((_q = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _q.form_record_id) ? [(_r = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _r.form_record_id] : null
+          customer_id: (_n = getUserInfo()) == null ? void 0 : _n.id,
+          form_id: (_o = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _o.form_id,
+          form_record: ((_p = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _p.form_record_id) ? [(_q = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _q.form_record_id] : null
         };
       }
       return newCartItem;

package/lib/components/Sales/Cart/types.d.ts

@@ -17,3 +17,15 @@ export interface IUnavailableResult {
  * 更新失效的购物车商品
  */
 export declare type TUpdateDisabledCartItem = (list: Array<IUnavailableResult>) => void;
+export interface ICalculatePriceParams {
+    /** 商品 */
+    product: any;
+    /** 规格 */
+    variant?: any;
+    /** 套餐 */
+    bundle?: any[];
+    /** 规格 */
+    options?: any[];
+    /** 数量 */
+    num?: number;
+}

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

@@ -0,0 +1,23 @@
+import { ICalculatePriceParams } from './types';
+export declare const handleProductInfo: (eventDetail: any, num: number) => {
+    totalPrice: number;
+    originTotal: any;
+    is_charge_tax: any;
+};
+/**
+ * 获取商品总价
+ * @description 当前总价计算基于商品数量为1
+ * @param item 商品
+ * @returns 商品总价
+ */
+export declare const getTotalPrice: (params: ICalculatePriceParams) => number;
+/**
+ * 获取商品原始总价
+ * @description 当前总价计算基于商品数量为1
+ * @param item 商品
+ * @returns 商品原始总价
+ */
+export declare const getOriginTotalPrice: (params: ICalculatePriceParams) => number | undefined;
+export declare const handleCartItemOrigin: (cartItem: any, eventDetail: any) => any;
+export declare const formatBundleToOrigin: (bundle: any) => any;
+export declare const formatOptionsToOrigin: (options: any) => any;

package/lib/components/Sales/Cart/utils.js

@@ -0,0 +1,149 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/Sales/Cart/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  formatBundleToOrigin: () => formatBundleToOrigin,
+  formatOptionsToOrigin: () => formatOptionsToOrigin,
+  getOriginTotalPrice: () => getOriginTotalPrice,
+  getTotalPrice: () => getTotalPrice,
+  handleCartItemOrigin: () => handleCartItemOrigin,
+  handleProductInfo: () => handleProductInfo
+});
+module.exports = __toCommonJS(utils_exports);
+var handleProductInfo = (eventDetail, num) => {
+  var _a;
+  const { productDetail, bookingOptionItem } = eventDetail;
+  const normalProduct = bookingOptionItem == null ? void 0 : bookingOptionItem._originData;
+  let totalPrice = Number((normalProduct == null ? void 0 : normalProduct.price) || "");
+  let originTotal = Number((normalProduct == null ? void 0 : normalProduct.original_price) || "");
+  let is_charge_tax = normalProduct == null ? void 0 : normalProduct.is_charge_tax;
+  if (productDetail) {
+    const { origin, bundle, options, product_variant_id } = productDetail;
+    let variant = null;
+    if (product_variant_id) {
+      variant = (_a = origin == null ? void 0 : origin.variant) == null ? void 0 : _a.find(
+        (item) => (item == null ? void 0 : item.id) === product_variant_id
+      );
+      is_charge_tax = variant == null ? void 0 : variant.is_charge_tax;
+    }
+    const params = { product: origin, variant, bundle, options, num };
+    totalPrice = getTotalPrice(params);
+    originTotal = getOriginTotalPrice(params);
+  }
+  return { totalPrice, originTotal, is_charge_tax };
+};
+var getTotalPrice = (params) => {
+  const { product, bundle, options, variant } = params;
+  const num = params.num || 1;
+  let price = Number(product.price);
+  if (variant) {
+    price = Number(variant == null ? void 0 : variant.price);
+  }
+  if (bundle == null ? void 0 : bundle.length) {
+    price = bundle.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
+  if (options == null ? void 0 : options.length) {
+    price = options.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
+  return price * num;
+};
+var getOriginTotalPrice = (params) => {
+  const { product, bundle, options, variant } = params;
+  const num = (params == null ? void 0 : params.num) || 1;
+  let price = Number(product.original_price);
+  if (variant) {
+    price = Number(variant == null ? void 0 : variant.original_price);
+  }
+  if (isNaN(price) || price === 0) {
+    return void 0;
+  }
+  if (bundle == null ? void 0 : bundle.length) {
+    price = bundle.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
+  if (options == null ? void 0 : options.length) {
+    price = options.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
+  return price * num;
+};
+var handleCartItemOrigin = (cartItem, eventDetail) => {
+  const { productDetail } = eventDetail;
+  const originData = (cartItem == null ? void 0 : cartItem._originData) || {};
+  if (productDetail) {
+    const { bundle, options, product_variant_id } = productDetail;
+    if (!originData.product) {
+      originData.product = {};
+    }
+    if (product_variant_id) {
+      originData.product.product_variant_id = product_variant_id;
+    }
+    if (bundle == null ? void 0 : bundle.length) {
+      originData.product.product_bundle = formatBundleToOrigin(bundle);
+    }
+    if (options == null ? void 0 : options.length) {
+      originData.product.product_option_item = formatOptionsToOrigin(options);
+    }
+  }
+  console.log("originData>>>>>>", originData);
+  return originData;
+};
+var formatBundleToOrigin = (bundle) => {
+  if (!(bundle == null ? void 0 : bundle.length)) return [];
+  return bundle.map((d) => {
+    return {
+      bundle_group_id: d.group_id,
+      bundle_id: d.id,
+      bundle_product_id: (d == null ? void 0 : d._bundle_product_id) || (d == null ? void 0 : d.product_id),
+      bundle_variant_id: d.bundle_variant_id,
+      num: d.num,
+      extension_id: d.extension_id,
+      extension_type: d.extension_type,
+      option: formatOptionsToOrigin(d.option)
+    };
+  });
+};
+var formatOptionsToOrigin = (options) => {
+  if (!(options == null ? void 0 : options.length)) {
+    return [];
+  }
+  return options.map((d) => {
+    return {
+      num: d.num,
+      option_group_item_id: d.product_option_item_id,
+      option_group_id: d.option_group_id
+    };
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatBundleToOrigin,
+  formatOptionsToOrigin,
+  getOriginTotalPrice,
+  getTotalPrice,
+  handleCartItemOrigin,
+  handleProductInfo
+});

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

@@ -24,4 +24,12 @@ export declare const formatProductBundle: (bundle: any) => any;
  * @Author: xiangfeng.xue
  * @Date: 2025-01-21 17:57
  */
-export declare const formatValues: (state: any, excludeDisabled?: boolean) => any;
+export declare const formatValues: (state: any, excludeDisabled?: boolean, otherValue?: Record<string, any>) => any;
+/**
+ * @title: 获取拉开表单弹窗参数
+ * @param state
+ */
+export declare const getFormParams: (state: any) => {
+    product_id: any;
+    appointment_type: string;
+};

package/lib/components/Sales/Checkout/utils.js

@@ -21,7 +21,8 @@ var utils_exports = {};
 __export(utils_exports, {
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
-  formatValues: () => formatValues
+  formatValues: () => formatValues,
+  getFormParams: () => getFormParams
 });
 module.exports = __toCommonJS(utils_exports);
 var formatProductOption = (option) => {
@@ -60,7 +61,7 @@ var formatBookings = (list) => {
   });
   return bookings;
 };
-var formatValues = (state, excludeDisabled) => {
+var formatValues = (state, excludeDisabled, otherValue) => {
   var _a, _b;
   let values = {
     type: "event_booking_v2",
@@ -69,7 +70,8 @@ var formatValues = (state, excludeDisabled) => {
     order_sales_channel: "online_store",
     bookings: [],
     shop_note: "",
-    schedule_date: ""
+    schedule_date: "",
+    ...otherValue || {}
   };
   let data = [];
   if (excludeDisabled) {
@@ -80,9 +82,21 @@ var formatValues = (state, excludeDisabled) => {
   values.bookings = formatBookings(data);
   return values;
 };
+var getFormParams = (state) => {
+  var _a;
+  const product_id = (((_a = state == null ? void 0 : state.cartData) == null ? void 0 : _a.cartItems) || []).map((item) => {
+    var _a2, _b;
+    return (_b = (_a2 = item._originData) == null ? void 0 : _a2.product) == null ? void 0 : _b.product_id;
+  });
+  return {
+    product_id,
+    appointment_type: "event_booking_v2"
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formatProductBundle,
   formatProductOption,
-  formatValues
+  formatValues,
+  getFormParams
 });

package/lib/components/Sales/Customer/index.js

@@ -54,7 +54,9 @@ var CustomerProvider = ({
     const { callback } = params || {};
     utils.action({
       type: "pisell1.login",
-      data: {},
+      data: {
+        type: "plugin"
+      },
       callback
     });
   };

package/lib/components/Sales/Event/Detail.d.ts

@@ -12,6 +12,8 @@ interface EventDetailContextType {
         data?: any;
     };
     currentBookingOption: any;
+    selectEventDetailProductDetail: (productDetail: any) => void;
+    checkBeforeSelectEventDetail: () => boolean;
 }
 interface EventDetailProviderProps {
     children: React.ReactNode;

package/lib/components/Sales/Event/Detail.js

@@ -39,6 +39,7 @@ var import_serve = require("./serve");
 var import_ahooks = require("ahooks");
 var import_index = require("./index");
 var import_utils = require("../utils");
+var import_useLoginUser = __toESM(require("../../../hooks/useLoginUser"));
 var EventDetailContext = (0, import_react.createContext)(void 0);
 var EventDetailProvider = ({
   children
@@ -49,11 +50,16 @@ var EventDetailProvider = ({
   const [open, setOpen] = (0, import_react.useState)(false);
   const [currentBookingOption, setCurrentBookingOption] = (0, import_react.useState)(null);
   const { selectEvent } = (0, import_index.useEvent)();
+  const customer = (0, import_useLoginUser.default)();
+  const currentBookingOptionRef = (0, import_react.useRef)(null);
   const _setDetail = (detailData) => {
     detailRef.current = { ...detailRef.current || {}, ...detailData || {} };
-    console.log(detailRef.current, "55555555");
     setDetail({ ...detailRef.current });
   };
+  const _setCurrentBookingOption = (id) => {
+    currentBookingOptionRef.current = id;
+    setCurrentBookingOption(id);
+  };
   const onOpenEventDetail = (eventItem) => {
     var _a;
     setOpen(true);
@@ -69,7 +75,10 @@ var EventDetailProvider = ({
     getEventDetailBookingOptions.run({
       ids: ((_a = eventItem._originData) == null ? void 0 : _a.relation_product_ids) || [],
       num: 100,
-      skip: 1
+      skip: 1,
+      customer_id: customer == null ? void 0 : customer.id,
+      open_quotation: 1,
+      is_eject: 1
     });
     getEventDetailSelectDate.run(eventItem.id, {
       days: 366
@@ -79,16 +88,19 @@ var EventDetailProvider = ({
     setOpen(false);
     _setDetail(null);
     detailRef.current = null;
+    setCurrentBookingOption(null);
+    currentBookingOptionRef.current = null;
   };
   const onSelectEventDetail = () => {
-    var _a, _b;
+    var _a, _b, _c;
     selectEvent({
       ...eventRef.current,
       eventDetail: {
-        ...detail,
+        ...detailRef.current || {},
         bookingOptionItem: (_b = (_a = detail.bookingOptions) == null ? void 0 : _a.filter(
-          (v) => v.value === currentBookingOption
-        )) == null ? void 0 : _b[0]
+          (v) => v.value === currentBookingOptionRef.current
+        )) == null ? void 0 : _b[0],
+        productDetail: (_c = detailRef.current) == null ? void 0 : _c.productDetail
       }
     });
     onCloseEventDetail();
@@ -174,7 +186,7 @@ var EventDetailProvider = ({
             price: v.price,
             _originData: v
           };
-          if (!current || current.price > v.price) {
+          if (!current || Number((current == null ? void 0 : current.price) || 0) > Number(v.price || 0)) {
             current = { ...option };
           }
           return option;
@@ -193,9 +205,23 @@ var EventDetailProvider = ({
         ...introduction,
         price: option.price,
         origin_price: option.original_price
-      }
+      },
+      selectedProduct: option
+      // 选中的活动关联的商品
     });
-    setCurrentBookingOption(id);
+    _setCurrentBookingOption(id);
+  };
+  const selectEventDetailProductDetail = (productDetail) => {
+    _setDetail({ productDetail });
+  };
+  const checkBeforeSelectEventDetail = () => {
+    var _a;
+    const { selectedProduct, productDetail } = detailRef.current || {};
+    console.log("selectedProduct", selectedProduct, productDetail);
+    if (((_a = selectedProduct == null ? void 0 : selectedProduct._originData) == null ? void 0 : _a.is_eject) === 1 && !productDetail) {
+      return false;
+    }
+    return true;
   };
   const contextValue = {
     detail,
@@ -205,7 +231,9 @@ var EventDetailProvider = ({
     onSelectEventDetail,
     selectEventDetailBookingOptions,
     getEventDetailSelectDate,
-    currentBookingOption
+    currentBookingOption,
+    selectEventDetailProductDetail,
+    checkBeforeSelectEventDetail
   };
   return /* @__PURE__ */ import_react.default.createElement(EventDetailContext.Provider, { value: contextValue }, children);
 };

package/lib/components/Sales/Event/index.js

@@ -104,11 +104,7 @@ var EventProvider = ({ children }) => {
     setEventData({
       currentEventItem: eventItem
     });
-    if (currentCartItem) {
-      updateCurrentCartItem({ eventItem });
-    } else {
-      createCartItemFromEvent(eventItem);
-    }
+    createCartItemFromEvent(eventItem);
   };
   const contextValue = {
     eventData,

package/lib/components/Sales/Event/serve.d.ts

@@ -10,6 +10,7 @@ export declare const getEventListApi: (params: {
     title?: string;
     skip?: number;
     num?: number;
+    open_quotation: number;
 }) => Promise<any>;
 export declare const getEventDetailIntroductionApi: (eventItemId: number | string) => Promise<any>;
 export declare const getEventDetailTeacherApi: (params: {
@@ -19,8 +20,20 @@ export declare const getEventDetailBookingOptionsApi: (params: {
     ids: number | string;
     num: number;
     skip: number;
+    customer_id?: number;
+    open_quotation?: number;
+    is_eject?: number;
 }) => Promise<any>;
 export declare const getEventDetailSelectDateApi: (id: number | string, params: {
     days: number;
     start_date?: string;
 }) => Promise<any>;
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export declare const getProductPrice: (params: {
+    ids: number[];
+    customer_id: number;
+    schedule_date?: string;
+}) => Promise<any>;

package/lib/components/Sales/Event/serve.js

@@ -23,7 +23,8 @@ __export(serve_exports, {
   getEventDetailIntroductionApi: () => getEventDetailIntroductionApi,
   getEventDetailSelectDateApi: () => getEventDetailSelectDateApi,
   getEventDetailTeacherApi: () => getEventDetailTeacherApi,
-  getEventListApi: () => getEventListApi
+  getEventListApi: () => getEventListApi,
+  getProductPrice: () => getProductPrice
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
@@ -44,11 +45,13 @@ var getEventDetailSelectDateApi = (id, params) => {
     useCache: true
   });
 };
+var getProductPrice = async (params) => import_utils.request.getRequest().post(`/h5/product/query/price`, params);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getEventDetailBookingOptionsApi,
   getEventDetailIntroductionApi,
   getEventDetailSelectDateApi,
   getEventDetailTeacherApi,
-  getEventListApi
+  getEventListApi,
+  getProductPrice
 });

package/lib/components/Sales/Init/index.d.ts

@@ -4,6 +4,7 @@ interface InitData {
     form_id?: number;
     shop_id?: number;
     shop?: any;
+    scheduleDisplayType?: 'calendarView' | 'textList';
 }
 interface InitContextType {
     getBoardSetting: any;

package/lib/components/Sales/Init/index.js

@@ -97,12 +97,13 @@ var InitProvider = ({ children }) => {
   const getBoardSetting = (0, import_ahooks.useRequest)(import_serve.getBoardSettingApi, {
     manual: true,
     onSuccess: (res) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
       setInitData({
         boardSetting: res == null ? void 0 : res.data,
         form_id: (_d = (_c = (_b = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.config) == null ? void 0 : _b.resource) == null ? void 0 : _c.booking_event_v2_resource) == null ? void 0 : _d.form_id,
         shop_id: (_e = res == null ? void 0 : res.data) == null ? void 0 : _e.shop_id,
-        shop: (_i = (_h = (_g = (_f = appUtils.getStore()) == null ? void 0 : _f.getState()) == null ? void 0 : _g.core) == null ? void 0 : _h.core) == null ? void 0 : _i.shop
+        shop: (_i = (_h = (_g = (_f = appUtils.getStore()) == null ? void 0 : _f.getState()) == null ? void 0 : _g.core) == null ? void 0 : _h.core) == null ? void 0 : _i.shop,
+        scheduleDisplayType: (_m = (_l = (_k = (_j = res == null ? void 0 : res.data) == null ? void 0 : _j.config) == null ? void 0 : _k.product_display_setting) == null ? void 0 : _l.booking_event_v2_schedule_display_format) == null ? void 0 : _m.value
       });
     }
   });

package/lib/components/Sales/Step/index.d.ts

@@ -7,6 +7,7 @@ interface Step {
 declare type StepKey = 'select-category' | 'select-event' | 'confirm-information';
 interface StepData {
     currentStep: StepKey;
+    isAutoOperate?: boolean;
 }
 interface StepContextType {
     setStepData: (data: Partial<StepData>) => void;
@@ -18,6 +19,7 @@ interface StepContextType {
     isLastStep: boolean;
     isFirstStep: boolean;
     isTwoStep: boolean;
+    changeAutoOperate: (newAutoOperate: boolean) => void;
 }
 interface StepProviderProps {
     children: React.ReactNode;

package/lib/components/Sales/Step/index.js

@@ -61,7 +61,8 @@ var stepMaps = steps.reduce((acc, step) => {
   return acc;
 }, {});
 var defaultState = {
-  currentStep: steps[0].key
+  currentStep: steps[0].key,
+  isAutoOperate: true
 };
 var StepContext = (0, import_react.createContext)(
   void 0
@@ -106,7 +107,8 @@ var StepProvider = ({ children }) => {
     const nextStep2 = getNextStep();
     if (nextStep2) {
       setStepData({
-        currentStep: nextStep2
+        currentStep: nextStep2,
+        isAutoOperate: true
       });
     }
   };
@@ -114,7 +116,8 @@ var StepProvider = ({ children }) => {
     const prevStep2 = getPrevStep();
     if (prevStep2) {
       setStepData({
-        currentStep: prevStep2
+        currentStep: prevStep2,
+        isAutoOperate: false
       });
     } else {
       closePage();
@@ -138,6 +141,11 @@ var StepProvider = ({ children }) => {
   const isTwoStep = (0, import_react.useMemo)(() => {
     return (currentStepData == null ? void 0 : currentStepData.key) === steps[1].key;
   }, [currentStepData == null ? void 0 : currentStepData.key]);
+  const changeAutoOperate = (newAutoOperate) => {
+    setStepData({
+      isAutoOperate: newAutoOperate
+    });
+  };
   const contextValue = {
     setStepData,
     currentStepData,
@@ -147,7 +155,8 @@ var StepProvider = ({ children }) => {
     toFirstStep,
     isFirstStep,
     isLastStep,
-    isTwoStep
+    isTwoStep,
+    changeAutoOperate
   };
   return /* @__PURE__ */ import_react.default.createElement(StepContext.Provider, { value: contextValue }, children);
 };

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/Sales/Summary/utils.js

@@ -51,6 +51,7 @@ var calculateTaxFee = (shopInfo, items) => {
     return "0.00";
   }
   const { is_price_include_tax, tax_rate } = shopInfo || {};
+  console.log("shopInfo>>>", is_price_include_tax, tax_rate);
   const totalTaxFee = items.reduce((sum, item) => {
     const price = new import_decimal.default(item.price || 0);
     const taxRate = new import_decimal.default(tax_rate || 0).div(100);