@pisell/private-materials 6.2.24 → 6.2.26

package/lib/components/booking/hooks/useClearCart.js

@@ -37,7 +37,7 @@ var import_classnames = __toESM(require("classnames"));
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var useClearCart = (state, dispatch) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const handleClear = () => {
     dispatch({
       type: "setService",
@@ -46,17 +46,20 @@ var useClearCart = (state, dispatch) => {
       }
     });
   };
-  return !!((_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
-    "span",
-    {
-      className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {
-        ["pisell-lowcode__booking-service-clear-btn-disabled"]: !((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length)
-      }),
-      onClick: handleClear
-    },
-    /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
-    " ",
-    /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
-  );
+  return (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c, _d;
+    return !!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
+      "span",
+      {
+        className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {
+          ["pisell-lowcode__booking-service-clear-btn-disabled"]: !((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length)
+        }),
+        onClick: handleClear
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
+      " ",
+      /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
+    );
+  }, [(_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length, state.channelDisabledEdit]);
 };
 var useClearCart_default = useClearCart;

package/lib/components/booking/hooks/useQuotation.js

@@ -145,8 +145,10 @@ var useQuotation = (state, dispatch) => {
   cartValueRef.current = state.service.value;
   const getCartQuotation = async (params) => {
     if (!cartValueRef.current.length) return;
+    const ids = cartValueRef.current.filter((item) => !item.isCustomItem).map((item) => item.product_id);
+    if (!ids.length) return;
     const data = await (0, import_serve.getProductPrice)({
-      ids: cartValueRef.current.map((item) => item.product_id),
+      ids,
       schedule_date: params == null ? void 0 : params.schedule_date,
       customer_id: params == null ? void 0 : params.customer_id
     });

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;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const modalRef = (0, import_react.useRef)();
   const [loadLoading, setLoadLoading] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
@@ -298,6 +298,7 @@ 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,
       {
@@ -340,7 +341,7 @@ var Client = () => {
         }
       }
     );
-  }, [state, renderList, loading, franchiseeLoading, params.search, loadMore]);
+  }, [state.isTerminal, state.modalOpen, (_b = state.client) == null ? void 0 : _b.value, state.drawerMask, renderList, loading, franchiseeLoading, params.search, loadMore]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -357,11 +358,11 @@ var Client = () => {
       import_antd.Avatar,
       {
         className: "pisell-lowcode__booking-client-list-item-avatar",
-        src: import_utils.image.ali((_b = state.client.value) == null ? void 0 : _b.cover, 100),
+        src: import_utils.image.ali((_c = state.client.value) == null ? void 0 : _c.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, ((_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) => {
+    /* @__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) => {
       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/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

@@ -5,5 +5,6 @@ declare const useInfoHolder: (state: any, dispatch: any) => {
     dispatchService: (type: string, payload: any) => void;
     handleAction: (dataSource: any) => void;
     showAddTimeModal: boolean;
+    editNormalServiceRef: import("react").MutableRefObject<any>;
 };
 export default useInfoHolder;

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

@@ -32,14 +32,17 @@ __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");
 var import_useGetHolderList = __toESM(require("./useGetHolderList"));
 var import_utils2 = require("../../info2/service/addService/utils");
+var import_utilsByBooking = require("../../info2/utilsByBooking");
 var useInfoHolder = (state, dispatch) => {
   var _a, _b, _c, _d;
   const detailRef = (0, import_react.useRef)();
+  const editNormalServiceRef = (0, import_react.useRef)(null);
   const { holder, isFormSubject, appointment_subject } = (0, import_useHolderConfig.default)(state);
   const getHolders = (0, import_useGetHolderList.default)(state, dispatch);
   (0, import_react.useEffect)(() => {
@@ -56,19 +59,22 @@ var useInfoHolder = (state, dispatch) => {
   const showAddTimeModal = (0, import_react.useMemo)(() => {
     return (0, import_utils.isOpenAddTime)(state);
   }, [state, appointment_card.quick_time]);
-  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 handleEdit = (0, import_ahooks.useMemoizedFn)((cacheItem, type) => {
+    var _a2, _b2, _c2;
+    const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(cacheItem);
+    if (isNoSpecAndPackage) {
+      (_a2 = editNormalServiceRef.current) == null ? void 0 : _a2.init(cacheItem);
+    } else {
+      (_c2 = (_b2 = detailRef.current) == null ? void 0 : _b2.init) == null ? void 0 : _c2.call(_b2, cacheItem, false, type === "edit_product");
+    }
+  });
   const dispatchService = (type, payload) => {
     dispatch({
       type,
       payload: { ...payload }
     });
   };
-  const handleAction = (dataSource) => {
+  const handleAction = (0, import_ahooks.useMemoizedFn)((dataSource) => {
     const cacheItem = (0, import_utils2.getProductExtend)({
       cacheItem: { ...dataSource._origin, new: 0 },
       state
@@ -80,13 +86,14 @@ var useInfoHolder = (state, dispatch) => {
         cacheItem
       }
     });
-  };
+  });
   return {
     detailRef,
     handleEdit,
     dispatchService,
     handleAction,
-    showAddTimeModal
+    showAddTimeModal,
+    editNormalServiceRef
   };
 };
 var useInfoHolder_default = useInfoHolder;

package/lib/components/booking/info/index.less

@@ -4,6 +4,22 @@
   .booking-info {
     padding-bottom: 16px;
 
+    .booking-info-client-line {
+      display: flex;
+      flex-direction: row;
+      gap: 10px;
+
+      .booking-info-client-line-code {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 64px;
+        height: 64px;
+        border-radius: 8px;
+        background: #5d3f9f;
+        cursor: pointer;
+      }
+    }
   }
 
   // &::before {
@@ -22,7 +38,7 @@
   }
 }
 .create-booking-page-info-wrap-create {
-  background: var(--Success-50, #ECFDF3);
+  background: var(--Success-50, #ecfdf3);
 }
 .create-booking-page-info-wrap {
   position: initial !important;
@@ -34,4 +50,4 @@
     font-weight: 600;
     line-height: 32px;
   }
-}
+}

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

@@ -37,7 +37,6 @@ var import_react = __toESM(require("react"));
 var import_footer = __toESM(require("../components/footer"));
 var import_tabPane = __toESM(require("../components/tabPane"));
 var import_locales = __toESM(require("../locales"));
-var import_addNote = __toESM(require("../notes/addNote"));
 var import_client = __toESM(require("./client"));
 var import_date = __toESM(require("./date"));
 var import_header = __toESM(require("./header"));
@@ -126,7 +125,6 @@ var Info = (0, import_model.Provider)((props) => {
     globalState == null ? void 0 : globalState.renderType
   ]);
   const notes = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2;
     if (!modules.note) {
       return null;
     }
@@ -134,9 +132,15 @@ var Info = (0, import_model.Provider)((props) => {
       return null;
     }
     if ((0, import_utils3.isDayBooking)(globalState)) {
-      return /* @__PURE__ */ import_react.default.createElement(import_addNote.default, { value: (_b2 = (_a2 = modal.state) == null ? void 0 : _a2.notes) == null ? void 0 : _b2.orderNote, onChange: addNote });
+      return (
+        // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
+        null
+      );
     }
-    return (globalState == null ? void 0 : globalState.bookingId) ? globalState.renderType === "eventBooking" || globalState.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(import_notes.default, null) : null : /* @__PURE__ */ import_react.default.createElement(import_addNote.default, { value: (_d2 = (_c2 = modal.state) == null ? void 0 : _c2.notes) == null ? void 0 : _d2.orderNote, onChange: addNote });
+    return (globalState == null ? void 0 : globalState.bookingId) ? globalState.renderType === "eventBooking" || globalState.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(import_notes.default, null) : null : (
+      // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
+      null
+    );
   }, [
     modules.note,
     globalState == null ? void 0 : globalState.bookingId,
@@ -162,7 +166,10 @@ var Info = (0, import_model.Provider)((props) => {
       bodyClassName: (0, import_classnames.default)("booking-info-warp", {
         ["create-booking-page-info-wrap"]: isBookingCreatePage,
         ["create-booking-page-info-wrap-create"]: isBookingCreatePageCreateMode && !(0, import_utils3.isTerminalDayBooking)(modal.state)
-      })
+      }),
+      state: modal.state,
+      dispatch: modal.dispatch,
+      source: "info"
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_i = modal.state) == null ? void 0 : _i.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Skeleton,

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

@@ -48,10 +48,12 @@ 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 products = (0, import_utils.updateServices)(state, currentItem, type, other, {
+      let products2 = (0, import_utils.updateServices)(state, currentItem, type, other, {
         handleAddHolder
       });
       if (type === "view" || type === "edit_product") {
@@ -64,11 +66,11 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
           });
         }
         onChange({ editModal: true, cacheItem });
-        return onEdit == null ? void 0 : onEdit({ ...product, new: 0 }, type);
+        return onEdit == null ? void 0 : onEdit(cacheItem, type);
       }
       const params = {
         editModal: false,
-        value: products,
+        value: products2,
         edit: true,
         cacheItem: null
       };
@@ -76,6 +78,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     }
   );
   const productParams = (0, import_react.useMemo)(() => {
+    var _a2, _b;
     return {
       hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
       isShowNote: (0, import_utils.isEventBooking)(state),
@@ -87,34 +90,47 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
       isShowChangeHolder,
       isShowChangeResource: true,
       isShowAddHolderButton: true,
-      isShowEditProduct: !state.isBookingCreatePage
+      isShowEditProduct: !state.isBookingCreatePage,
+      productCardStyleConfig: (_b = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b.cart_settings_tab
     };
   }, [
     state == null ? void 0 : state.bookingId,
     state == null ? void 0 : state.disabledEdit,
     isShowChangeHolder,
-    state.isBookingCreatePage
+    state.isBookingCreatePage,
+    state.bookingConfig
   ]);
-  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
-        )
+  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,
+      {
+        scenario: state.isBookingTicket2 ? "booking2" : void 0,
+        isParallelResource,
+        onAction,
+        onChange: handleChange,
+        isOpenGroup: false,
+        isHideClearCart: true,
+        onAddProduct: () => onChange({ addModal: true }),
+        productParams: {
+          ...productParams,
+          products
+        }
       }
-    }
-  ));
+    ));
+  }, [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/constants.d.ts

@@ -0,0 +1 @@
+export declare const getIsPartyRoomResourceShop: (id: number) => boolean;

package/lib/components/booking/info/service/editService/constants.js

@@ -0,0 +1,31 @@
+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/booking/info/service/editService/constants.ts
+var constants_exports = {};
+__export(constants_exports, {
+  getIsPartyRoomResourceShop: () => getIsPartyRoomResourceShop
+});
+module.exports = __toCommonJS(constants_exports);
+var getIsPartyRoomResourceShop = (id) => {
+  return [2155, 9].includes(id);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getIsPartyRoomResourceShop
+});

package/lib/components/booking/info/service/editService/index.js

@@ -57,10 +57,13 @@ 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);
@@ -354,6 +357,7 @@ 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 = {};
@@ -373,10 +377,12 @@ 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: ["resources", "therapist", "table"],
+        codes,
         _config: { abort: true },
         ...params
       });

package/lib/components/booking/info/service/serviceItem/index.js

@@ -77,7 +77,7 @@ var ServiceItem = ({
       },
       /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "text", icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }) })
     ),
-    d.id ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, d.title) : null,
+    d.id || d.isCustomItem ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, d.title) : null,
     d._extend ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, state.renderType !== "eventBooking" && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-date" }, (0, import_utils.getServiceTime)(d, state.date.value)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-technician" }, d._extend.resource ? /* @__PURE__ */ import_react.default.createElement(
       import_like.default,
       {
@@ -96,7 +96,7 @@ var ServiceItem = ({
         renderItem: (item) => (0, import_utils3.renderBundles)(item, state.amountSymbol)
       }
     ) : null,
-    d.id ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-price-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-service-item-price" }, (0, import_utils2.formatAmount)((_g = d._extend) == null ? void 0 : _g.total, 2, state.amountSymbol)), isDiscount ? /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-service-item-original-price" }, (0, import_utils2.formatAmount)(d._extend.origin_total, 2, state.amountSymbol)) : null)) : null,
+    d.id || d.isCustomItem ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-price-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-service-item-price" }, (0, import_utils2.formatAmount)((_g = d._extend) == null ? void 0 : _g.total, 2, state.amountSymbol)), isDiscount ? /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-service-item-original-price" }, (0, import_utils2.formatAmount)(d._extend.origin_total, 2, state.amountSymbol)) : null)) : null,
     isDiscount && ((_h = d._extend) == null ? void 0 : _h.discount_reason) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-discount-reason" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils2.locales.getText("pisell2.text.discount-reason"), ":"), " ", (_i = d._extend) == null ? void 0 : _i.discount_reason) : null,
     ((_j = d._extend.relation_details) == null ? void 0 : _j.length) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-relation-details" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, import_utils2.locales.getText("page.booking.text.sales")), d._extend.relation_details.map((item, index) => {
       return /* @__PURE__ */ import_react.default.createElement(

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

@@ -58,6 +58,7 @@ 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;
+export declare const genRowKey: (key: string) => string;
 /**
  * @title: 格式化商品数据
  * @description:
@@ -71,6 +72,7 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     id: any;
     _id: any;
     name: any;
+    title: any;
     price: any;
     total: number;
     origin_total: number;
@@ -91,6 +93,8 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     end_date: any;
     holder_id: any;
     isNormalProduct: boolean;
+    isCustomItem: any;
+    vouchersApplicable: any;
     locale: any;
     symbol: any;
     relation_products: any;

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

@@ -37,6 +37,7 @@ __export(utils_exports, {
   formatDayTime: () => formatDayTime,
   formatHolderLists: () => formatHolderLists,
   formatProducts: () => formatProducts,
+  genRowKey: () => genRowKey,
   getAppointmentService: () => getAppointmentService,
   getDayProducts: () => getDayProducts,
   getErrorMessage: () => getErrorMessage,
@@ -364,6 +365,7 @@ var formatBundle = (bundle) => {
     return {
       id: item == null ? void 0 : item.id,
       title: item == null ? void 0 : item.title,
+      cover: item == null ? void 0 : item.cover,
       num: item == null ? void 0 : item.num,
       price: item == null ? void 0 : item.price,
       total: item == null ? void 0 : item.price,
@@ -446,7 +448,7 @@ var getIsSubjectRequire = (state) => {
 };
 var isNormalProductByDurationSchedule = (item) => {
   var _a, _b;
-  return !(item == null ? void 0 : item.duration) && !((_a = item == null ? void 0 : item.schedules) == null ? void 0 : _a.length) && !((_b = item["schedule.ids"]) == null ? void 0 : _b.length);
+  return !(item == null ? void 0 : item.duration) && !((_a = item == null ? void 0 : item.schedules) == null ? void 0 : _a.length) && !((_b = item == null ? void 0 : item["schedule.ids"]) == null ? void 0 : _b.length);
 };
 var isAllNormalProduct = (items) => {
   return items.every((item) => isNormalProductByDurationSchedule(item));
@@ -454,6 +456,9 @@ var isAllNormalProduct = (items) => {
 var isAllNormalProductByState = (state) => {
   return isAllNormalProduct(state.service.value);
 };
+var genRowKey = (key) => {
+  return `rowKey-${key}`;
+};
 var getGeneralParams = (item, state, isParallelResource) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const { pet, service } = state;
@@ -522,7 +527,7 @@ var getGeneralParams = (item, state, isParallelResource) => {
     holder_id: (_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.holder_id,
     start_date: !isNormalProduct ? (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.startDate : "",
     end_date: !isNormalProduct ? ((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.endDate) || ((_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.end_date) : "",
-    rowKey: `rowKey-${(_i = (_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.rowKey}`,
+    rowKey: genRowKey((_i = (_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.rowKey),
     ...parallelResourceOtherParams
   };
 };
@@ -551,6 +556,8 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       id: item == null ? void 0 : item.id,
       _id: item == null ? void 0 : item._id,
       name: item == null ? void 0 : item.title,
+      title: item == null ? void 0 : item.title,
+      // 购物车显示需要 title 字段
       price: (_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.price,
       total: calcAddTimeTotalPrice((_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.total, (_i = item == null ? void 0 : item._extend) == null ? void 0 : _i.relation_details),
       origin_total: calcAddTimeTotalPrice((_j = item == null ? void 0 : item._extend) == null ? void 0 : _j.origin_total, (_k = item == null ? void 0 : item._extend) == null ? void 0 : _k.relation_details),
@@ -571,6 +578,10 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       end_date: !isNormalProduct ? (_r = item == null ? void 0 : item._extend) == null ? void 0 : _r.end_date : "",
       holder_id: ((_s = item == null ? void 0 : item._extend) == null ? void 0 : _s.holder_id) || 0,
       isNormalProduct,
+      isCustomItem: item == null ? void 0 : item.isCustomItem,
+      // 添加自定义商品标识
+      vouchersApplicable: item == null ? void 0 : item.vouchersApplicable,
+      // 是否适用优惠券/折扣
       locale: state.locale,
       symbol: state.amountSymbol,
       relation_products: ((_t = item == null ? void 0 : item._extend) == null ? void 0 : _t.relation_details) || [],
@@ -579,25 +590,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));
@@ -971,6 +982,7 @@ var updateServicePrice = (state) => {
   formatDayTime,
   formatHolderLists,
   formatProducts,
+  genRowKey,
   getAppointmentService,
   getDayProducts,
   getErrorMessage,