@pisell/private-materials 6.2.20 → 6.2.21

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

@@ -0,0 +1,6 @@
+interface AddServiceVariantProps {
+    globalState: any;
+    setGlobalState: any;
+}
+declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
+export default AddServiceVariant;

package/lib/components/booking/info/client/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import './index.less';
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+export default _default;

package/lib/components/booking/info/client/index.js

@@ -48,7 +48,7 @@ var import_utils3 = require("../clientVariant/utils");
 var import_useGetHolderList = __toESM(require("../hooks/useGetHolderList"));
 var isLoadClient = false;
 var Client = () => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const modalRef = (0, import_react.useRef)();
   const [loadLoading, setLoadLoading] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
@@ -298,7 +298,6 @@ var Client = () => {
     )) : null;
   }, [loadLoading, params, state.client.clients.length]);
   const customSelect = (0, import_react.useMemo)(() => {
-    console.log("render customSelect");
     return /* @__PURE__ */ import_react.default.createElement(
       import_customSelect.default,
       {
@@ -341,7 +340,7 @@ var Client = () => {
         }
       }
     );
-  }, [state.isTerminal, state.modalOpen, (_b = state.client) == null ? void 0 : _b.value, state.drawerMask, renderList, loading, franchiseeLoading, params.search, loadMore]);
+  }, [state, renderList, loading, franchiseeLoading, params.search, loadMore]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -358,11 +357,11 @@ var Client = () => {
       import_antd.Avatar,
       {
         className: "pisell-lowcode__booking-client-list-item-avatar",
-        src: import_utils.image.ali((_c = state.client.value) == null ? void 0 : _c.cover, 100),
+        src: import_utils.image.ali((_b = state.client.value) == null ? void 0 : _b.cover, 100),
         icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
       }
     ),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_d = state.client.value) == null ? void 0 : _d.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_e = state.client.value) == null ? void 0 : _e.email) : null, ((_f = state.client.value) == null ? void 0 : _f.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_g = state.client.value) == null ? void 0 : _g.phone) : null, !!((_i = (_h = state.client.value) == null ? void 0 : _h.waiver_form) == null ? void 0 : _i.length) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-waiver", title: (0, import_utils3.getWaiverTitle)((_j = state.client.value) == null ? void 0 : _j.waiver_form) }, (_m = (_l = (_k = state.client.value) == null ? void 0 : _k.waiver_form) == null ? void 0 : _l.map) == null ? void 0 : _m.call(_l, (item) => {
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_c = state.client.value) == null ? void 0 : _c.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_d = state.client.value) == null ? void 0 : _d.email) : null, ((_e = state.client.value) == null ? void 0 : _e.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_f = state.client.value) == null ? void 0 : _f.phone) : null, !!((_h = (_g = state.client.value) == null ? void 0 : _g.waiver_form) == null ? void 0 : _h.length) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-waiver", title: (0, import_utils3.getWaiverTitle)((_i = state.client.value) == null ? void 0 : _i.waiver_form) }, (_l = (_k = (_j = state.client.value) == null ? void 0 : _j.waiver_form) == null ? void 0 : _k.map) == null ? void 0 : _l.call(_k, (item) => {
       return /* @__PURE__ */ import_react.default.createElement("span", null, item.form_title, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-waiver-colon" }, ":"), item.is_filled ? /* @__PURE__ */ import_react.default.createElement(
         "span",
         {

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

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

@@ -0,0 +1,9 @@
+import { EditServiceRef } from "../service/editService";
+declare const useInfoHolder: (state: any, dispatch: any) => {
+    detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;
+    handleEdit: (cacheItem: any, type?: string) => void;
+    dispatchService: (type: string, payload: any) => void;
+    handleAction: (dataSource: any) => void;
+    showAddTimeModal: boolean;
+};
+export default useInfoHolder;

package/lib/components/booking/info/hooks/useInfoHolder.js

@@ -32,7 +32,6 @@ __export(useInfoHolder_exports, {
   default: () => useInfoHolder_default
 });
 module.exports = __toCommonJS(useInfoHolder_exports);
-var import_ahooks = require("ahooks");
 var import_react = require("react");
 var import_useHolderConfig = __toESM(require("./useHolderConfig"));
 var import_utils = require("../utils");
@@ -55,21 +54,21 @@ var useInfoHolder = (state, dispatch) => {
     };
   }, [(_d = (_c = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.information_tab]);
   const showAddTimeModal = (0, import_react.useMemo)(() => {
-    return (0, import_utils.isOpenAddTime)(state) && !state.isBookingTicket2;
+    return (0, import_utils.isOpenAddTime)(state);
   }, [state, appointment_card.quick_time]);
-  const handleEdit = (0, import_ahooks.useMemoizedFn)((cacheItem, type) => {
-    var _a2, _b2;
-    console.time("handleEdit");
-    console.log(performance.now() - window.pp1, "打开商品4");
-    (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem, false, type === "edit_product");
-  });
+  const handleEdit = (cacheItem, type) => {
+    setTimeout(() => {
+      var _a2, _b2;
+      (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem, false, type === "edit_product");
+    }, 100);
+  };
   const dispatchService = (type, payload) => {
     dispatch({
       type,
       payload: { ...payload }
     });
   };
-  const handleAction = (0, import_ahooks.useMemoizedFn)((dataSource) => {
+  const handleAction = (dataSource) => {
     const cacheItem = (0, import_utils2.getProductExtend)({
       cacheItem: { ...dataSource._origin, new: 0 },
       state
@@ -81,7 +80,7 @@ var useInfoHolder = (state, dispatch) => {
         cacheItem
       }
     });
-  });
+  };
   return {
     detailRef,
     handleEdit,

package/lib/components/booking/info/index.d.ts

@@ -0,0 +1,3 @@
+import { InfoProps } from './main';
+declare const APP: (props: InfoProps) => JSX.Element;
+export default APP;

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

@@ -0,0 +1,2 @@
+declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
+export default Lists;

package/lib/components/booking/info/service/Lists.js

@@ -48,12 +48,10 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
   const { handleAddHolder } = (0, import_useAddHolder.default)(state, dispatch);
   const handleChange = (0, import_ahooks.useMemoizedFn)(
     (currentItem, type, other) => {
-      console.time("handleChange");
-      console.log(window.pp1 = performance.now(), "打开商品");
       if (state.disabledEdit || state.disableEventBookingEdit) {
         return;
       }
-      let products2 = (0, import_utils.updateServices)(state, currentItem, type, other, {
+      let products = (0, import_utils.updateServices)(state, currentItem, type, other, {
         handleAddHolder
       });
       if (type === "view" || type === "edit_product") {
@@ -66,11 +64,11 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
           });
         }
         onChange({ editModal: true, cacheItem });
-        return onEdit == null ? void 0 : onEdit(cacheItem, type);
+        return onEdit == null ? void 0 : onEdit({ ...product, new: 0 }, type);
       }
       const params = {
         editModal: false,
-        value: products2,
+        value: products,
         edit: true,
         cacheItem: null
       };
@@ -97,36 +95,26 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     isShowChangeHolder,
     state.isBookingCreatePage
   ]);
-  const products = (0, import_react.useMemo)(() => {
-    var _a2;
-    console.time("products");
-    const p = (0, import_utils.formatProducts)(
-      ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) || [],
-      state,
-      false,
-      true,
-      isParallelResource
-    );
-    console.timeEnd("products");
-    return p;
-  }, [(_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value, state]);
-  return (0, import_react.useMemo)(() => {
-    console.log("render List");
-    return /* @__PURE__ */ import_react.default.createElement(import_Provider.CartContext.Provider, { value: { state } }, /* @__PURE__ */ import_react.default.createElement(
-      import_shoppingCart.default,
-      {
-        isParallelResource,
-        onAction,
-        onChange: handleChange,
-        isOpenGroup: false,
-        isHideClearCart: true,
-        onAddProduct: () => onChange({ addModal: true }),
-        productParams: {
-          ...productParams,
-          products
-        }
+  return /* @__PURE__ */ import_react.default.createElement(import_Provider.CartContext.Provider, { value: { state } }, /* @__PURE__ */ import_react.default.createElement(
+    import_shoppingCart.default,
+    {
+      isParallelResource,
+      onAction,
+      onChange: handleChange,
+      isOpenGroup: false,
+      isHideClearCart: true,
+      onAddProduct: () => onChange({ addModal: true }),
+      productParams: {
+        ...productParams,
+        products: (0, import_utils.formatProducts)(
+          ((_a = state == null ? void 0 : state.service) == null ? void 0 : _a.value) || [],
+          state,
+          false,
+          true,
+          isParallelResource
+        )
       }
-    ));
-  }, [products, state, productParams]);
+    }
+  ));
 };
 var Lists_default = Lists;

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/editService/index.js

@@ -57,13 +57,10 @@ var import_like = __toESM(require("../like"));
 var import_utils7 = require("../../utils");
 var import_serviceManager = require("../serviceManager");
 var import_EditTabs = __toESM(require("./EditTabs"));
-var import_constants = require("./constants");
-var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var submitLock = false;
 var Info = (_, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F;
   const [form] = import_antd.Form.useForm();
-  const context = (0, import_useEngineContext.default)();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useLikeStatus = import_antd.Form.useWatch("like_status", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -357,7 +354,6 @@ var Info = (_, ref) => {
     });
   }, [(_q = (_p = (_o = state.service) == null ? void 0 : _o.cacheItem) == null ? void 0 : _p._extend) == null ? void 0 : _q.multi_day]);
   const getResourcesData = async () => {
-    var _a2, _b2, _c2, _d2, _e2;
     setResourceLoading(true);
     try {
       let params = {};
@@ -377,12 +373,10 @@ var Info = (_, ref) => {
       } else {
         params.with_date_times = state.date.value.format("YYYY-MM-DD");
       }
-      const isPartyRoomResourceShop = (0, import_constants.getIsPartyRoomResourceShop)((_e2 = (_d2 = (_c2 = (_b2 = (_a2 = context.appHelper.utils.store) == null ? void 0 : _a2.getState) == null ? void 0 : _b2.call(_a2)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id);
-      const codes = isPartyRoomResourceShop ? ["resources", "therapist", "table", "party_room"] : ["resources", "therapist", "table"];
       let data = await state.apis.getResources({
         skip: 1,
         num: 1e3,
-        codes,
+        codes: ["resources", "therapist", "table"],
         _config: { abort: true },
         ...params
       });

package/lib/components/booking/info/service/like/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/lib/components/booking/info/service/serviceManager/index.d.ts

@@ -0,0 +1,20 @@
+export declare const useService: ({ renderMode, onEdit, state, dispatch, }: {
+    renderMode?: any;
+    onEdit?: any;
+    state?: any;
+    dispatch?: any;
+}) => {
+    createBookingData: ({ product }: any) => Promise<any>;
+    editBookingData: ({ changeValues }: {
+        changeValues: any;
+    }) => Promise<any>;
+    createBooking: ({ booking }: {
+        booking: any;
+    }) => Promise<void>;
+    editBooking: ({ booking }: {
+        booking: any;
+    }) => Promise<void>;
+    goEditPanel: ({ booking }: {
+        booking: any;
+    }) => void;
+};

package/lib/components/booking/info/service2/Lists.d.ts

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

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

@@ -0,0 +1,247 @@
+import dayjs from 'dayjs';
+export declare const formatActiveKey: (lists: any[], platform: string, isEdit: boolean) => any[];
+/**
+ * @title: 获取资源名称
+ * @description:
+ * @param {any} id
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-11-29 18:02
+ */
+export declare const getResourceItem: (id: any, state: any) => any;
+/**
+ * @title: 错误提示
+ * @description:
+ * @param {any} service
+ * @param {any} resourceItem
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-11-29 18:41
+ */
+export declare const getErrorMessage: (service: any, resourceItem: any, isDay?: boolean) => any;
+/**
+ * @title: 格式化主体列表
+ * @description:
+ * @param {any} lists
+ * @param {boolean} isOpenGroup
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 11:27
+ */
+export declare const formatHolderLists: (lists: any) => any;
+export declare const isBookingProduct: (extension_type: any, bol?: boolean) => boolean | undefined;
+/**
+ * @title: 是否是预约商品
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-06 11:24
+ */
+export declare const isDayBookingProduct: (item: any, state: any) => boolean | undefined;
+export declare const handleChangeHolder: (products: any[], currentItem: any, other: any) => any[];
+/**
+ * @title: 更新商品数据
+ * @description:
+ * @param {any} state
+ * @param currentItem
+ * @param {string} type
+ * @param {any} other
+ * @param actions
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-03 15:00
+ */
+export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any, actions?: any) => any;
+export declare const formItems: (items: any[]) => any[];
+export declare const getIsSubjectRequire: (state: any) => boolean;
+export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
+export declare const isAllNormalProduct: (items: any[]) => boolean;
+export declare const isAllNormalProductByState: (state: any) => boolean;
+/**
+ * @title: 格式化商品数据
+ * @description:
+ * @param {any} lists
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-11-29 17:36
+ */
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => {
+    _origin: any;
+    id: any;
+    _id: any;
+    name: any;
+    price: any;
+    total: number;
+    origin_total: number;
+    num: any;
+    image: any;
+    isShowNote: boolean;
+    note: any;
+    like_status: any;
+    bundle: any;
+    options: any;
+    errorMessage: string;
+    product_option_string: any;
+    discount_reason: any;
+    resource_id: any;
+    relation_form_name: any;
+    holder_title: any;
+    start_date: any;
+    end_date: any;
+    holder_id: any;
+    isNormalProduct: boolean;
+    locale: any;
+    symbol: any;
+    relation_products: any;
+    items: any[];
+}[];
+/**
+ * @title: 禁用日期
+ * @description:
+ * @param {any} current
+ * @param {string} position
+ * @param {any} startDate
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-03 17:51
+ */
+export declare const disabledDate: (current: any, position: string, currentDate: any) => any;
+/**
+ * @title: 是否是跨日预约
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 09:49
+ */
+export declare const isDayBooking: (state: any) => boolean;
+export declare const isDaysBooking: (state: any) => boolean;
+export declare const isEventBooking: (state: any) => boolean;
+export declare const isAppointmentProduct: (item: any) => boolean;
+/**
+ * @title: 是否是terminal上的跨日预约
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 15:31
+ */
+export declare const isTerminalDayBooking: (state: any) => any;
+export declare const formatDayDate: (_extend: any) => any;
+/**
+ * @title: 根据营业日时间格式化时间
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-04 12:07
+ */
+export declare const formatDayTime: ({ startDate, endDate }: any) => {
+    startDateTime: dayjs.Dayjs;
+    endDateTime: dayjs.Dayjs;
+};
+export declare const formatDateTime: (start_date: any, end_date: any) => {
+    value: dayjs.Dayjs;
+    end_date: dayjs.Dayjs;
+};
+/**
+ * @title: 初始化日期
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-06 17:24
+ */
+export declare const initDate: () => {
+    value: dayjs.Dayjs;
+    end_date: dayjs.Dayjs;
+};
+/**
+ * @title: 是否有预约商品
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-12 15:47
+ */
+export declare const isHasDayAppointmentProduct: (state: any) => boolean;
+/**
+ * @title: 过滤出如果是预约商品，则只获取跨日的预约商品
+ * @description:
+ * @param {any} lists
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-13 16:44
+ */
+export declare const getDayProducts: (holderId: number, lists: any, isTerminal?: boolean) => any;
+/**
+ * @title: 格式化表单数据
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-30 22:19
+ */
+export declare const getPets: (state: any) => any;
+/**
+ * @title: 得出预约商品
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-30 22:26
+ */
+export declare const getAppointmentService: (state: any) => any;
+/**
+ * @title: 判断是否打开删除宠物弹窗
+ * @description:
+ * @param {any} state
+ * @param {any} newVal
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-16 16:12
+ */
+export declare const isOpenDeletePet: (state: any, newVal: any) => {
+    ids: any;
+    lists: any;
+};
+/**
+ * @title: 当前选中的表单id
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-17 14:40
+ */
+export declare const holderId: (state: any) => number;
+/**
+ * @title: 更新套餐的价格
+ * @description:
+ * @param {any} currentValue
+ * @param {any} newBundleData
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-31 15:16
+ */
+export declare function updateNormalBundlePrice(currentValue: any, newBundleData: any): any[];
+/**
+ * @title: 更新预约商品报价单
+ * @description:
+ * @param {any} state
+ * @param {any} cacheItem
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-25 16:41
+ */
+export declare const updateAppointmentServicePrice: (state: any, { start_date, end_date, product_id }: any) => Promise<{
+    multiDayPrices: any;
+    price: number;
+}>;
+/**
+ * @title: 更新普通商品报价单价格
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-24 11:32
+ */
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

package/lib/components/booking/info/service2/utils.js

@@ -579,25 +579,25 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       _origin: item
     };
   };
+  lists.forEach((item) => {
+    var _a;
+    if (!((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId)) {
+      normalList.push(formItem(item));
+    } else {
+      groupList.push(item);
+    }
+  });
+  let groups = groupList.reduce((prev, item) => {
+    var _a;
+    const groupId = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId;
+    if (!prev[groupId]) {
+      prev[groupId] = [];
+    }
+    prev[groupId].push(item);
+    return prev;
+  }, {});
   console.log(normalList, "normalList");
   if (isRenderGroup) {
-    lists.forEach((item) => {
-      var _a;
-      if (!((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId)) {
-        normalList.push(formItem(item));
-      } else {
-        groupList.push(item);
-      }
-    });
-    let groups = groupList.reduce((prev, item) => {
-      var _a;
-      const groupId = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId;
-      if (!prev[groupId]) {
-        prev[groupId] = [];
-      }
-      prev[groupId].push(item);
-      return prev;
-    }, {});
     return Object.values(groups).map((d) => formItem((0, import_utils3.concatBookings)(d))).concat(normalList);
   } else {
     return lists == null ? void 0 : lists.map((item) => formItem(item));

package/lib/components/booking/info/utils.js

@@ -144,8 +144,7 @@ var isBooking4Shop = (shopId, renderType, businessUtils) => {
     6930,
     8824,
     8913,
-    8918,
-    6413
+    8918
   ];
   return booking4Shops.includes(shopId) || (businessUtils == null ? void 0 : businessUtils.getAppByModal("resourcekit"));
 };

package/lib/components/booking/info2/index.d.ts

@@ -0,0 +1,12 @@
+import '../info/index.less';
+export interface InfoProps {
+    style: any;
+    globalState: any;
+    callback: any;
+    setGlobalState: any;
+    modules: any;
+    slot: any;
+    setState: any;
+}
+declare const Info: any;
+export default Info;

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

@@ -0,0 +1,11 @@
+import { PisellDrawerProps } from '../../../components/drawer';
+import '../../../info/service/addService/index.less';
+interface AddServiceProps {
+    onEdit: any;
+    dispatch?: any;
+    state?: any;
+    drawerProps?: PisellDrawerProps;
+    renderMode?: 'current' | 'drawer';
+}
+declare const Info: (props: AddServiceProps) => JSX.Element;
+export default Info;