@pisell/private-materials 6.3.14 → 6.4.1

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/pet/index.less

@@ -146,5 +146,5 @@
 }
 
 .pisell-lowcode__booking-pet-wraps {
-  margin-top: 16px;
+  margin-top: 12px;
 }

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

@@ -48,6 +48,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
   const { handleAddHolder } = (0, import_useAddHolder.default)(state, dispatch);
   const handleChange = (0, import_ahooks.useMemoizedFn)(
     (currentItem, type, other) => {
+      var _a2, _b;
       console.time("handleChange");
       console.log(window.pp1 = performance.now(), "打开商品");
       if (state.disabledEdit || state.disableEventBookingEdit) {
@@ -65,9 +66,11 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
             state
           });
         }
+        (_a2 = window.openBookingEditModal) == null ? void 0 : _a2.call(window);
         onChange({ editModal: true, cacheItem });
         return onEdit == null ? void 0 : onEdit(cacheItem, type);
       }
+      (_b = window.closeBookingEditModal) == null ? void 0 : _b.call(window);
       const params = {
         editModal: false,
         value: products2,
@@ -78,9 +81,10 @@ 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),
+      isShowNote: state.isBookingTicket2 ? true : (0, import_utils.isEventBooking)(state),
       isShowPackageNote: false,
       accounts: [],
       isEdit: !!(state == null ? void 0 : state.bookingId),
@@ -89,13 +93,15 @@ 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
   ]);
   const products = (0, import_react.useMemo)(() => {
     var _a2;
@@ -115,6 +121,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     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,

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

@@ -281,13 +281,13 @@ var Info = (props) => {
     return ((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) > 0;
   }, [state.service.value]);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i, _j;
     if (shopList.includes(
-      (_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
+      ((_c2 = (_b2 = (_a2 = context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.getData) == null ? void 0 : _c2.call(_b2, "shop_id")) || ((_h = (_g = (_f2 = (_e2 = (_d2 = context.appHelper.utils.store) == null ? void 0 : _d2.getState) == null ? void 0 : _e2.call(_d2)) == null ? void 0 : _f2.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id)
     ) || state.closeAutoOpenService) {
       return;
     }
-    if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking" && ((_g = (_f2 = state.service) == null ? void 0 : _f2.value) == null ? void 0 : _g.length) === 0) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking" && ((_j = (_i = state.service) == null ? void 0 : _i.value) == null ? void 0 : _j.length) === 0) {
       setTimeout(() => {
         handleSelectService();
       }, 10);

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

@@ -182,7 +182,7 @@ var Info = (_, ref) => {
     }
   };
   const handleDeleteProduct = (0, import_ahooks.useMemoizedFn)(() => {
-    var _a2;
+    var _a2, _b2;
     if (state.channelDisabledEdit) {
       return;
     }
@@ -193,6 +193,7 @@ var Info = (_, ref) => {
     } else {
       _list = _list.filter((d) => d._id !== _id);
     }
+    (_b2 = window.closeBookingEditModal) == null ? void 0 : _b2.call(window);
     dispatch({
       type: "setService",
       payload: {
@@ -377,7 +378,9 @@ 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 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,
@@ -508,9 +511,11 @@ var Info = (_, ref) => {
     });
   });
   const handleChange = (0, import_ahooks.useMemoizedFn)((e) => {
+    var _a2;
     if (state.channelDisabledEdit) {
       return;
     }
+    (_a2 = window.openBookingEditModal) == null ? void 0 : _a2.call(window);
     dispatch({
       type: "setService",
       payload: {
@@ -639,6 +644,8 @@ var Info = (_, ref) => {
         open: state.service.editModal && !((_a2 = state.service.cacheItem) == null ? void 0 : _a2.autoClose),
         title: isDayBookingMode ? import_utils.locales.getText("pisell2.text.edit-select-service") : import_utils.locales.getText("pisell2.text.edit-service"),
         onClose: () => {
+          var _a3;
+          (_a3 = window.closeBookingEditModal) == null ? void 0 : _a3.call(window);
           dispatch({
             type: "setService",
             payload: {

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

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-service-wrap {
-  margin-top: 16px;
+  margin-top: 12px;
   .pisell-lowcode__booking-service-clear-btn {
     cursor: pointer;
     margin-top: -12px;

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

@@ -49,9 +49,11 @@ var ServiceList = ({ onEdit }) => {
     maxLimit: import_utils.locales.getText("pisell2.text.status.service-error-3")
   };
   const handleEditService = (item) => {
+    var _a2;
     if (state.disabledEdit || state.disableEventBookingEdit) {
       return;
     }
+    (_a2 = window.openBookingEditModal) == null ? void 0 : _a2.call(window);
     dispatch({
       type: "setService",
       payload: {
@@ -62,11 +64,13 @@ var ServiceList = ({ onEdit }) => {
     onEdit == null ? void 0 : onEdit({ ...item, new: 0 });
   };
   const handleDeleteService = (item) => {
+    var _a2;
     if (state.disabledEdit || state.disableEventBookingEdit || state.channelDisabledEdit) {
       return;
     }
     let _list = [...state.service.value];
     _list = _list.filter((d) => d._id !== item._id);
+    (_a2 = window.closeBookingEditModal) == null ? void 0 : _a2.call(window);
     dispatch({
       type: "setService",
       payload: {

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

@@ -157,7 +157,7 @@ var useService = ({
     goEditPanel({ booking });
   };
   const editBooking = async ({ booking }) => {
-    var _a2;
+    var _a2, _b;
     let _list = state.service.value;
     let _id = booking == null ? void 0 : booking._id;
     let groupId = (_a2 = booking == null ? void 0 : booking._extend) == null ? void 0 : _a2.groupId;
@@ -178,6 +178,7 @@ var useService = ({
       }
     }
     (0, import_utils2.deleteCacheParams)();
+    (_b = window.closeBookingEditModal) == null ? void 0 : _b.call(window);
     dispatch({
       type: "setService",
       payload: {
@@ -191,6 +192,8 @@ var useService = ({
     });
   };
   const goEditPanel = ({ booking }) => {
+    var _a2;
+    (_a2 = window.openBookingEditModal) == null ? void 0 : _a2.call(window);
     dispatch({
       type: "setService",
       payload: {

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

@@ -57,12 +57,14 @@ var Lists = ({ onEdit, onChange }) => {
     });
   }, [holderLists, params == null ? void 0 : params.platform]);
   const handleChange = (currentItem, type, other) => {
+    var _a2;
     if (state.disabledEdit || state.disableEventBookingEdit) {
       return;
     }
     let products = (0, import_utils.updateServices)(state, currentItem, type, other);
     if (type === "view") {
       let product = currentItem._origin;
+      (_a2 = window.openBookingEditModal) == null ? void 0 : _a2.call(window);
       onChange({ editModal: true, cacheItem: { ...product, new: 0 } });
       return onEdit == null ? void 0 : onEdit({ ...product, new: 0 });
     }

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,
@@ -316,6 +317,15 @@ var updateServices = (state, currentItem, type, other, actions) => {
     products = handleChangeResource(products, currentItem, other, state);
     return products;
   }
+  if (type === "num") {
+    return products.map((product) => {
+      if (product._id === currentItem._id) {
+        product._extend.quantity = other.num;
+        return product;
+      }
+      return product;
+    });
+  }
   if (type === "update_holders") {
     products = products == null ? void 0 : products.map((item) => {
       var _a2;
@@ -364,6 +374,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 +457,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 +465,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;
@@ -513,6 +527,7 @@ var getGeneralParams = (item, state, isParallelResource) => {
     isShowChangeHolder: !isNormalProduct,
     isShowAction: (0, import_utils4.isShowAddTime)(state, item),
     actionText: import_utils2.locales.getText("page.booking.text.add-time"),
+    actionIcon: "pisell2-clock-plus",
     isMultipleResource: true,
     multiResources,
     holderMaxCount: item == null ? void 0 : item._extend.quantity,
@@ -522,7 +537,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
   };
 };
@@ -534,7 +549,7 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
   const normalList = [];
   const groupList = [];
   const formItem = (item) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
     const _isDayBookingProduct = isDayBookingProduct(item, state);
     const clientTitle = getHolderName(state, (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.holder_id);
     const options = formatOptions((_c = (_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.option);
@@ -551,30 +566,36 @@ 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),
       num: item == null ? void 0 : item._extend.quantity,
       image: item == null ? void 0 : item.cover,
       isShowNote: true,
-      note: item == null ? void 0 : item.note,
-      like_status: (_l = item == null ? void 0 : item._extend) == null ? void 0 : _l.like_status,
+      note: (item == null ? void 0 : item.note) || ((_l = item == null ? void 0 : item._extend) == null ? void 0 : _l.note),
+      like_status: (_m = item == null ? void 0 : item._extend) == null ? void 0 : _m.like_status,
       bundle,
       options,
       errorMessage,
-      product_option_string: (_n = (_m = item == null ? void 0 : item._extend) == null ? void 0 : _m.other) == null ? void 0 : _n.product_option_string,
-      discount_reason: (_o = item == null ? void 0 : item._extend) == null ? void 0 : _o.discount_reason,
-      resource_id: isNormalProduct ? 0 : (_p = item == null ? void 0 : item._extend) == null ? void 0 : _p.resource,
+      product_option_string: (_o = (_n = item == null ? void 0 : item._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.product_option_string,
+      discount_reason: (_p = item == null ? void 0 : item._extend) == null ? void 0 : _p.discount_reason,
+      resource_id: isNormalProduct ? 0 : (_q = item == null ? void 0 : item._extend) == null ? void 0 : _q.resource,
       relation_form_name: isNormalProduct ? "" : (resourceItem == null ? void 0 : resourceItem.labelText) || item.relation_form_name,
       holder_title: clientTitle,
-      start_date: !isNormalProduct ? (_q = item == null ? void 0 : item._extend) == null ? void 0 : _q.start_date : "",
-      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,
+      start_date: !isNormalProduct ? (_r = item == null ? void 0 : item._extend) == null ? void 0 : _r.start_date : "",
+      end_date: !isNormalProduct ? (_s = item == null ? void 0 : item._extend) == null ? void 0 : _s.end_date : "",
+      holder_id: ((_t = item == null ? void 0 : item._extend) == null ? void 0 : _t.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) || [],
-      items: isEventBooking(state) ? [] : formItems(((_u = item == null ? void 0 : item._extend) == null ? void 0 : _u.items) || []),
+      relation_products: ((_u = item == null ? void 0 : item._extend) == null ? void 0 : _u.relation_details) || [],
+      items: isEventBooking(state) ? [] : formItems(((_v = item == null ? void 0 : item._extend) == null ? void 0 : _v.items) || []),
       ...generalParams,
       _origin: item
     };
@@ -971,6 +992,7 @@ var updateServicePrice = (state) => {
   formatDayTime,
   formatHolderLists,
   formatProducts,
+  genRowKey,
   getAppointmentService,
   getDayProducts,
   getErrorMessage,

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

@@ -0,0 +1,6 @@
+import React from 'react';
+import type { ClientCardRef, CartClientCardProps } from './types';
+import './index.less';
+export type { ClientData } from './types';
+declare const CartClientCard: React.ForwardRefExoticComponent<CartClientCardProps & React.RefAttributes<ClientCardRef>>;
+export default CartClientCard;