@pisell/private-materials 6.2.30 → 6.3.1

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

@@ -16,5 +16,5 @@ export interface BookingDashboardProps extends React.HTMLAttributes<HTMLDivEleme
         departed: string | number;
     }, dataList: string[]) => void;
 }
-declare const BookingDashboard: React.ForwardRefExoticComponent<BookingDashboardProps & React.RefAttributes<unknown>>;
+declare const BookingDashboard: (props: BookingDashboardProps) => JSX.Element;
 export default BookingDashboard;

package/lib/components/booking/dashboard/index.js

@@ -57,7 +57,7 @@ var formatCapacityToChildrenData = (data) => {
   return Object.values(map).filter((item) => !!item.value).sort((a, b) => b.label.localeCompare(a.label));
 };
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
-var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
+var BookingDashboard = (props) => {
   const {
     otherParams = {},
     backgroundColors,
@@ -267,11 +267,6 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
       clearInterval(timer);
     };
   }, [JSON.stringify(otherParams), refreshKey]);
-  (0, import_react.useImperativeHandle)(ref, () => ({
-    refresh: () => {
-      getData();
-    }
-  }));
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellStatisticList,
     {
@@ -282,5 +277,5 @@ var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
       valueColor
     }
   );
-});
+};
 var dashboard_default = BookingDashboard;

package/lib/components/booking/forms/forms.js

@@ -147,7 +147,7 @@ var Forms = (0, import_model.Provider)((props) => {
         "div",
         {
           className: "pisell-lowcode__booking-field-wrap",
-          style: { padding: hideTitle ? 0 : "0" },
+          style: { padding: hideTitle ? 0 : "12px 0 0" },
           key: d.form_id
         },
         hideTitle ? null : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-field-title" }, d.form.title),

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

@@ -35,7 +35,7 @@ __export(useQuotation_exports, {
 module.exports = __toCommonJS(useQuotation_exports);
 var import_react = __toESM(require("react"));
 var import_utils = require("../utils");
-var import_useEngineContext = __toESM(require("../../../../es/hooks/useEngineContext"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_serve = require("../info/service/serve");
@@ -145,10 +145,8 @@ 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,
+      ids: cartValueRef.current.map((item) => item.product_id),
       schedule_date: params == null ? void 0 : params.schedule_date,
       customer_id: params == null ? void 0 : params.customer_id
     });

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -5,6 +5,5 @@ 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

@@ -38,11 +38,9 @@ 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)(() => {
@@ -57,16 +55,13 @@ 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);
+    return (0, import_utils.isOpenAddTime)(state) && !state.isBookingTicket2;
   }, [state, appointment_card.quick_time]);
   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");
-    }
+    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 dispatchService = (type, payload) => {
     dispatch({
@@ -92,8 +87,7 @@ var useInfoHolder = (state, dispatch) => {
     handleEdit,
     dispatchService,
     handleAction,
-    showAddTimeModal,
-    editNormalServiceRef
+    showAddTimeModal
   };
 };
 var useInfoHolder_default = useInfoHolder;

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

@@ -4,22 +4,6 @@
   .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 {
@@ -38,11 +22,11 @@
   }
 }
 .create-booking-page-info-wrap-create {
-  background: var(--Success-50, #ecfdf3);
+  background: var(--Success-50, #ECFDF3);
 }
 .create-booking-page-info-wrap {
   position: initial !important;
-  padding: 0 10px !important;
+  padding: 0 16px !important;
   .booking-info-create-new {
     margin-top: 10px;
     color: var(--Base-Black, #000);
@@ -50,4 +34,4 @@
     font-weight: 600;
     line-height: 32px;
   }
-}
+}

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

@@ -37,6 +37,7 @@ 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"));
@@ -125,6 +126,7 @@ 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;
     }
@@ -132,15 +134,9 @@ var Info = (0, import_model.Provider)((props) => {
       return null;
     }
     if ((0, import_utils3.isDayBooking)(globalState)) {
-      return (
-        // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
-        null
-      );
+      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 (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
-    );
+    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 });
   }, [
     modules.note,
     globalState == null ? void 0 : globalState.bookingId,
@@ -166,10 +162,7 @@ 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: 12px;
+  margin-top: 16px;
 }

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

@@ -78,7 +78,6 @@ 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),
@@ -90,15 +89,13 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
       isShowChangeHolder,
       isShowChangeResource: true,
       isShowAddHolderButton: true,
-      isShowEditProduct: !state.isBookingCreatePage,
-      productCardStyleConfig: (_b = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b.cart_settings_tab
+      isShowEditProduct: !state.isBookingCreatePage
     };
   }, [
     state == null ? void 0 : state.bookingId,
     state == null ? void 0 : state.disabledEdit,
     isShowChangeHolder,
-    state.isBookingCreatePage,
-    state.bookingConfig
+    state.isBookingCreatePage
   ]);
   const products = (0, import_react.useMemo)(() => {
     var _a2;
@@ -118,7 +115,6 @@ 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/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/index.less

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-service-wrap {
-  margin-top: 12px;
+  margin-top: 16px;
   .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 || d.isCustomItem ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, d.title) : null,
+    d.id ? /* @__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 || 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,
+    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,
     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/utils.d.ts

@@ -58,7 +58,6 @@ 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:
@@ -72,7 +71,6 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     id: any;
     _id: any;
     name: any;
-    title: any;
     price: any;
     total: number;
     origin_total: number;
@@ -93,8 +91,6 @@ 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,7 +37,6 @@ __export(utils_exports, {
   formatDayTime: () => formatDayTime,
   formatHolderLists: () => formatHolderLists,
   formatProducts: () => formatProducts,
-  genRowKey: () => genRowKey,
   getAppointmentService: () => getAppointmentService,
   getDayProducts: () => getDayProducts,
   getErrorMessage: () => getErrorMessage,
@@ -317,15 +316,6 @@ 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;
@@ -374,7 +364,6 @@ 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,
@@ -457,7 +446,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 == null ? void 0 : 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["schedule.ids"]) == null ? void 0 : _b.length);
 };
 var isAllNormalProduct = (items) => {
   return items.every((item) => isNormalProductByDurationSchedule(item));
@@ -465,9 +454,6 @@ 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;
@@ -536,7 +522,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: genRowKey((_i = (_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.rowKey),
+    rowKey: `rowKey-${(_i = (_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.rowKey}`,
     ...parallelResourceOtherParams
   };
 };
@@ -565,8 +551,6 @@ 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),
@@ -587,10 +571,6 @@ 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) || [],
@@ -991,7 +971,6 @@ var updateServicePrice = (state) => {
   formatDayTime,
   formatHolderLists,
   formatProducts,
-  genRowKey,
   getAppointmentService,
   getDayProducts,
   getErrorMessage,

package/lib/components/booking/info2/index.js

@@ -40,6 +40,7 @@ var import_pet = __toESM(require("../info/pet"));
 var import_date = __toESM(require("../info/date"));
 var import_footer = __toESM(require("../components/footer"));
 var import_tabPane = __toESM(require("../components/tabPane"));
+var import_addNote = __toESM(require("../notes/addNote"));
 var import_header = __toESM(require("../info/header"));
 var import_locales = __toESM(require("../locales"));
 var import_utils = require("@pisell/utils");
@@ -58,8 +59,6 @@ var import_classnames = __toESM(require("classnames"));
 var import_useCreateBookingPageHeader = __toESM(require("../hooks/useCreateBookingPageHeader"));
 var import_locales2 = require("../../../utils/locales");
 var import_ahooks = require("ahooks");
-var import_cartClientCard = __toESM(require("./cartClientCard"));
-var import_materials = require("@pisell/materials");
 var defaultModules = {
   client: 1,
   date: 1,
@@ -131,13 +130,11 @@ var Info = (0, import_model.Provider)((props) => {
     globalState == null ? void 0 : globalState.renderType
   ]);
   const notes = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
     if (!modules.note) {
       return null;
     }
-    return (globalState == null ? void 0 : globalState.bookingId) ? globalState.renderType === "eventBooking" ? /* @__PURE__ */ import_react.default.createElement(import_notes.default, null) : null : (
-      // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
-      null
-    );
+    return (globalState == null ? void 0 : globalState.bookingId) ? globalState.renderType === "eventBooking" ? /* @__PURE__ */ import_react.default.createElement(import_notes.default, null) : null : /* @__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 });
   }, [
     modules.note,
     globalState == null ? void 0 : globalState.bookingId,
@@ -261,9 +258,7 @@ var Info = (0, import_model.Provider)((props) => {
   ), !!modal.state.setGlobalState ? /* @__PURE__ */ import_react.default.createElement(
     import_tabPane.default,
     {
-      style: {
-        height: ((_k = (_j = context == null ? void 0 : context.appHelper) == null ? void 0 : _j.utils) == null ? void 0 : _k.isMobile) ? "100%" : "100vh"
-      },
+      style,
       header,
       footer: /* @__PURE__ */ import_react.default.createElement(
         import_footer.default,
@@ -273,31 +268,15 @@ var Info = (0, import_model.Provider)((props) => {
           source: "info"
         }
       ),
+      style: {
+        height: ((_k = (_j = context == null ? void 0 : context.appHelper) == null ? void 0 : _j.utils) == null ? void 0 : _k.isMobile) ? "100%" : "100vh"
+      },
       bodyClassName: (0, import_classnames.default)("booking-info-warp", {
         ["create-booking-page-info-wrap"]: isBookingCreatePage,
         ["create-booking-page-info-wrap-create"]: isBookingCreatePageCreateMode
-      }),
-      state: modal.state,
-      dispatch: modal.dispatch,
-      source: "info"
+      })
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info-client-line" }, modules.client ? (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1, overflow: "hidden" } }, /* @__PURE__ */ import_react.default.createElement(import_cartClientCard.default, null)) : /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement(
-      "div",
-      {
-        className: "booking-info-client-line-code",
-        onClick: () => {
-          var _a2;
-          (_a2 = globalState == null ? void 0 : globalState.onQrCodeClick) == null ? void 0 : _a2.call(globalState);
-        }
-      },
-      /* @__PURE__ */ import_react.default.createElement(
-        import_materials.Iconfont,
-        {
-          type: "pisell2-a-qr-code-02",
-          style: { color: "#fff", fontSize: 42 }
-        }
-      )
-    ) : null), modules.holder && !((_l = modal.state) == null ? void 0 : _l.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(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_l = modal.state) == null ? void 0 : _l.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,
       {
         loading: globalState.loading,

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

@@ -7,7 +7,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/info2/service/addTimeModal/index.js

@@ -425,7 +425,6 @@ var AddTimeModal = () => {
       return;
     }
     state == null ? void 0 : state.action("init");
-    state == null ? void 0 : state.callback({}, "save");
   };
   (0, import_react.useEffect)(() => {
     if (!state.modalOpen) {

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

@@ -447,7 +447,7 @@ var Info = (_, ref) => {
     return false;
   }, [state.renderType, isNormalProduct]);
   const SelectTime = (_p = window.BaseMaterials) == null ? void 0 : _p.SelectTime;
-  const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(state.service.cacheItem);
+  console.log(isShowTimeAndResource, "isShowTimeAndResource");
   const productName = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), !state.isBookingCreatePage && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
@@ -606,7 +606,7 @@ var Info = (_, ref) => {
       },
       import_utils.locales.getText("pisell2.text.apply")
     ));
-  }, [(_G = state.service.resourcesOrigin) == null ? void 0 : _G.length]);
+  }, [(_G = state.service.resourcesOrigin) == null ? void 0 : _G.length, isNormalProduct]);
   console.log("render edit");
   console.log(state.service.editModal && !((_H = state.service.cacheItem) == null ? void 0 : _H.autoClose), performance.now() - window.pp1, "打开商品1");
   const [val, setVal] = (0, import_react.useState)(false);
@@ -626,7 +626,7 @@ var Info = (_, ref) => {
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
       mask: state.drawerMask,
-      open: !isNoSpecAndPackage && state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
+      open: state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         dispatch({

package/lib/components/booking/info2/service/index.js

@@ -40,7 +40,7 @@ var import_service = require("../../info/service/index.less");
 var import_addTimeModal = __toESM(require("./addTimeModal"));
 var import_useInfoHolder = __toESM(require("../../info/hooks/useInfoHolder"));
 var import_Lists = __toESM(require("../../info/service/Lists"));
-var import_editNormalService = __toESM(require("./editNormalService"));
+var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
 var import_useQuotation = __toESM(require("../../hooks/useQuotation"));
 var Service = () => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
@@ -49,16 +49,16 @@ var Service = () => {
     handleEdit,
     handleAction,
     dispatchService,
-    showAddTimeModal,
-    editNormalServiceRef
+    showAddTimeModal
   } = (0, import_useInfoHolder.default)(state, dispatch);
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
   }, []);
+  const clearCart = (0, import_useClearCart.default)(state, dispatch);
   const { dom } = (0, import_useQuotation.default)(state, dispatch);
   const renderMemo = (0, import_react.useMemo)(() => {
     console.log("render info22222");
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, clearCart, /* @__PURE__ */ import_react.default.createElement(
       import_Lists.default,
       {
         isParallelResource: true,
@@ -66,8 +66,8 @@ var Service = () => {
         onAction: handleAction,
         onChange: (e, type) => dispatchService(type || "setService", e)
       }
-    ), !state.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit }) : null), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null), /* @__PURE__ */ import_react.default.createElement(import_editNormalService.default, { ref: editNormalServiceRef }), dom);
-  }, [dom, showAddTimeModal]);
+    ), !state.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit }) : null), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null), dom);
+  }, [clearCart, dom, showAddTimeModal, clearCart]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, renderMemo);
 };
 var service_default = import_react.default.memo(Service);

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

@@ -158,7 +158,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 || d.isCustomItem ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, d.title) : null,
+    d.id ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-title" }, d.title) : null,
     d._extend && state.renderType !== "eventBooking" ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-item-date" }, (0, import_utils.getServiceTime)(d, state.date.value)), renderResources) : null,
     (((_d = (_c = d._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle) || []).length ? /* @__PURE__ */ import_react.default.createElement(
       import_collapsibleList.default,
@@ -168,7 +168,7 @@ var ServiceItem = ({
         renderItem: (item) => (0, import_utils3.renderBundles)(item, state.amountSymbol)
       }
     ) : 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,
+    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,
     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,
     renderUser,
     ((_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) => {

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

@@ -33,4 +33,3 @@ export declare const getAppointmentTimingPreference: (state: any) => any;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServiceStartTimeAndEndTime: (state: any, cacheItem: any, timeObj: any) => any;
-export declare const getIsNoSpecAndPackage: (product: any) => boolean;