@pisell/private-materials 3.0.203 → 3.0.205

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

@@ -51,16 +51,13 @@ var import_notes = __toESM(require("./notes"));
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var import_antd = require("antd");
-var import_service2 = require("./service2");
-var import_utils3 = require("./service2/utils");
 var import_useCreateBookingPageHeader = __toESM(require("../hooks/useCreateBookingPageHeader"));
 var defaultModules = {
   client: 1,
   date: 1,
   service: 1,
   holder: 1,
-  note: 1,
-  service2: 0
+  note: 1
 };
 import_utils.locales.init(import_locales.default, localStorage.getItem("umi_locale") || "en");
 var Info = (0, import_model.Provider)((props) => {
@@ -99,8 +96,7 @@ var Info = (0, import_model.Provider)((props) => {
         ...globalState,
         isTerminal: (_g2 = (_f2 = (_e2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _e2.utils) == null ? void 0 : _f2.isTerminal) == null ? void 0 : _g2.call(_f2),
         isFranchisee,
-        timezone: (_m = (_l = (_k = (_j = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j.getState()) == null ? void 0 : _k.global) == null ? void 0 : _l.globalConfig) == null ? void 0 : _m.timezone,
-        isDayBooking: (globalState == null ? void 0 : globalState.renderType) === "dayBooking"
+        timezone: (_m = (_l = (_k = (_j = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j.getState()) == null ? void 0 : _k.global) == null ? void 0 : _l.globalConfig) == null ? void 0 : _m.timezone
       }
     });
   }, [JSON.stringify(globalState)]);
@@ -125,14 +121,11 @@ var Info = (0, import_model.Provider)((props) => {
     globalState == null ? void 0 : globalState.renderType
   ]);
   const notes = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2;
+    var _a2, _b2;
     if (!modules.note) {
       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 (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 : /* @__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,
@@ -142,10 +135,7 @@ var Info = (0, import_model.Provider)((props) => {
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !!modal.state.setGlobalState ? /* @__PURE__ */ import_react.default.createElement(
     import_tabPane.default,
     {
-      style: {
-        ...style,
-        height: ((_h = (_g = context == null ? void 0 : context.appHelper) == null ? void 0 : _g.utils) == null ? void 0 : _h.isMobile) ? "100%" : "100vh"
-      },
+      style,
       header,
       footer: /* @__PURE__ */ import_react.default.createElement(
         import_footer.default,
@@ -155,9 +145,12 @@ var Info = (0, import_model.Provider)((props) => {
           source: "info"
         }
       ),
+      style: {
+        height: ((_h = (_g = context == null ? void 0 : context.appHelper) == null ? void 0 : _g.utils) == null ? void 0 : _h.isMobile) ? "100%" : "100vh"
+      },
       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)
+        ["create-booking-page-info-wrap-create"]: isBookingCreatePageCreateMode
       })
     },
     /* @__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(
@@ -170,7 +163,6 @@ var Info = (0, import_model.Provider)((props) => {
         style: { paddingTop: 20 }
       },
       modules.service ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, modal.state.date.value ? /* @__PURE__ */ import_react.default.createElement(import_service.default, null) : null) : null,
-      modules.service2 ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, modal.state.date.value ? /* @__PURE__ */ import_react.default.createElement(import_service2.Service2Cart, null) : null) : null,
       notes,
       slot ? slot : null
     ))

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

@@ -76,9 +76,6 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
         _val.disabledEdit = false;
       }
       state.setGlobalState(_val);
-    },
-    setActiveCartId(state, payload) {
-      state.setGlobalState(payload);
     }
   },
   reducers: {

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

@@ -43,8 +43,6 @@ var import_format = require("../../forms/format");
 var import_utils2 = require("../../utils");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_ahooks = require("ahooks");
-var import_utils3 = require("../../info/service2/utils");
-var import_ChangePetModal = __toESM(require("./ChangePetModal"));
 var defaultParams = {
   skip: 1,
   num: 20,
@@ -67,7 +65,6 @@ var Pet = (props) => {
   const context = (0, import_useEngineContext.default)();
   const { isTerminal } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const [params, setParams] = (0, import_react.useState)(defaultParams);
-  const changePetRef = (0, import_react.useRef)(null);
   state = state || (props == null ? void 0 : props.state);
   dispatch = dispatch || (props == null ? void 0 : props.dispatch);
   const boardParams = (0, import_react.useMemo)(() => {
@@ -211,14 +208,10 @@ var Pet = (props) => {
     let cur = [...state.pet.value[petForm.form_id] || []];
     let options = ((_c2 = (_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.options) || [];
     if (res.type === "delete") {
-      const isDay = (0, import_utils3.isDayBooking)(state);
-      if (isDay && state.disabledEdit)
-        return cur;
-      cur = cur.filter((d) => d.form_record_id !== item.form_record_id);
+      cur = cur.filter(
+        (d) => d.form_record_id !== item.form_record_id
+      );
       addCallback();
-      if (isDay) {
-        handleDayChange(item);
-      }
     } else {
       let obj = {
         customer: item == null ? void 0 : item.customer,
@@ -279,29 +272,27 @@ var Pet = (props) => {
       }
     });
   });
-  const onValueChange = (0, import_ahooks.useMemoizedFn)(
-    ({ values, edit = true, options }) => {
-      var _a2, _b2;
-      const updateObj = {};
-      if (options) {
-        updateObj.formData = [
-          {
-            ...(_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0],
-            options
-          }
-        ];
-        updateObj.pets = options;
-      }
-      dispatch({
-        type: "setPet",
-        payload: {
-          edit,
-          value: values,
-          ...updateObj
+  const onValueChange = (0, import_ahooks.useMemoizedFn)(({ values, edit = true, options }) => {
+    var _a2, _b2;
+    const updateObj = {};
+    if (options) {
+      updateObj.formData = [
+        {
+          ...(_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0],
+          options
         }
-      });
+      ];
+      updateObj.pets = options;
     }
-  );
+    dispatch({
+      type: "setPet",
+      payload: {
+        edit,
+        value: values,
+        ...updateObj
+      }
+    });
+  });
   (0, import_react.useEffect)(() => {
     var _a2, _b2, _c2, _d2;
     if (clientChangeNotSetPet)
@@ -372,29 +363,6 @@ var Pet = (props) => {
       import_utils.locales.getText("pisell2.text.load-more")
     )) : null;
   }, [loadLoading, params, (_l = (_k = (_j = (_i = state.pet) == null ? void 0 : _i.formData) == null ? void 0 : _j[0]) == null ? void 0 : _k.options) == null ? void 0 : _l.length]);
-  const handleDayChange = (e) => {
-    var _a2, _b2;
-    const id = e == null ? void 0 : e.form_record_id;
-    const service = (_a2 = state.service.value) == null ? void 0 : _a2.filter(
-      (item) => item._extend.holder_id === id
-    );
-    if (id && (service == null ? void 0 : service.length)) {
-      changePetRef == null ? void 0 : changePetRef.current.open({
-        ids: [id],
-        dispatch,
-        service: ((_b2 = state.service) == null ? void 0 : _b2.value) || []
-      });
-    }
-  };
-  const dayCustomSelect = (0, import_react.useMemo)(() => {
-    const isDay = (0, import_utils3.isDayBooking)(state);
-    if (isDay) {
-      return {
-        handleDayChange
-      };
-    }
-    return {};
-  }, [state.renderType, state.service.value]);
   return (0, import_react.useMemo)(() => {
     var _a2;
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-wraps" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: valueLoading, active: true, round: true }, /* @__PURE__ */ import_react.default.createElement(
@@ -404,10 +372,7 @@ var Pet = (props) => {
         watch: { value: state.pet.value },
         addCallback: (formDataConfig, data) => {
           var _a3, _b2, _c2;
-          setPetOptions([
-            { ...data, form_id: formDataConfig == null ? void 0 : formDataConfig.form_id },
-            ...((_c2 = (_b2 = (_a3 = state.pet) == null ? void 0 : _a3.formData) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.options) || []
-          ]);
+          setPetOptions([{ ...data, form_id: formDataConfig == null ? void 0 : formDataConfig.form_id }, ...((_c2 = (_b2 = (_a3 = state.pet) == null ? void 0 : _a3.formData) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.options) || []]);
         },
         loading: valueLoading,
         forms: state.pet.formData,
@@ -433,8 +398,7 @@ var Pet = (props) => {
             return true;
           },
           handleOpenModal,
-          previewItemTitleRender,
-          ...dayCustomSelect
+          previewItemTitleRender
         },
         optionRender: (item) => {
           return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
@@ -478,7 +442,7 @@ var Pet = (props) => {
           ...addButtonProps
         }
       }
-    )), /* @__PURE__ */ import_react.default.createElement(import_ChangePetModal.default, { ref: changePetRef }));
+    )));
   }, [
     valueLoading,
     hideTitle,

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

@@ -43,14 +43,10 @@ var import_index = require("./index.less");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_serve = require("../serve");
 var import_utils = require("../../utils");
-var import_dateRange = __toESM(require("../../dateRange"));
-var import_utils2 = require("../../../utils");
-var import_utils3 = require("../../service2/utils");
-var import_status = require("../../service2/status");
+var import_utils2 = require("./utils");
+var import_utils3 = require("../../../utils");
 var import_utils4 = require("@pisell/utils");
 var import_ahooks = require("ahooks");
-var import_debounce = __toESM(require("lodash/debounce"));
-var import_serviceManager = require("../serviceManager");
 var shopList = [
   2886,
   4422,
@@ -68,49 +64,16 @@ var shopList = [
   6305
 ];
 var Info = (props) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d;
   const { onEdit, drawerProps, renderMode } = props;
   const [search, setSearch] = (0, import_react.useState)("");
   let { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const searchRef = (0, import_react.useRef)();
-  const headerRef = (0, import_react.useRef)(null);
-  const [headerHeight, setHeaderHeight] = (0, import_react.useState)(0);
   const context = (0, import_useEngineContext.default)();
   state = state || (props == null ? void 0 : props.state);
   dispatch = dispatch || (props == null ? void 0 : props.dispatch);
-  import_utils2.request.setRequest(context.appHelper.utils.request);
-  const { createBookingData, createBooking } = (0, import_serviceManager.useService)({
-    renderMode,
-    onEdit,
-    state,
-    dispatch
-  });
-  const isDay = (0, import_react.useMemo)(() => {
-    return (0, import_utils3.isDayBooking)(state);
-  }, [state.renderType]);
-  const handleResize = () => {
-    var _a2;
-    if (headerRef == null ? void 0 : headerRef.current) {
-      setHeaderHeight((_a2 = headerRef.current) == null ? void 0 : _a2.offsetHeight);
-    }
-  };
-  const debouncedHandleResize = (0, import_debounce.default)(handleResize, 100);
-  (0, import_react.useEffect)(() => {
-    if (isDay && state.isTerminalDayBookingPage) {
-      handleResize();
-      window.addEventListener("resize", debouncedHandleResize);
-    }
-    return () => {
-      window.removeEventListener("resize", debouncedHandleResize);
-    };
-  }, [debouncedHandleResize]);
-  const customerId = (0, import_react.useMemo)(() => {
-    var _a2, _b2;
-    if (!isDay)
-      return void 0;
-    return ((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) || 1;
-  }, [(_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id, isDay]);
+  import_utils3.request.setRequest(context.appHelper.utils.request);
   const setDefaultService = async (list) => {
     if (state.renderType !== "eventBooking") {
       return;
@@ -128,8 +91,7 @@ var Info = (props) => {
     setLoading(true);
     let product = list[0];
     const detail = await (0, import_serve.getProductDetail)(product.id, {
-      schedule_date: state.date.value.format("YYYY-MM-DD"),
-      customer_id: customerId
+      schedule_date: state.date.value.format("YYYY-MM-DD")
     });
     const isBundleOrCombination = (0, import_utils.getIsBundleOrCombination)(detail.data);
     setLoading(false);
@@ -142,7 +104,7 @@ var Info = (props) => {
       _extend: {
         start_date: state.date.value,
         startDate: state.date.value,
-        endDate: isDay ? state.date.end_date : state.date.value,
+        endDate: state.date.value,
         start_time: "00:00:00",
         duration: 10,
         quantity: 1,
@@ -174,11 +136,6 @@ var Info = (props) => {
       setLoading(false);
       return;
     }
-    let dayParams = {};
-    if (isDay) {
-      dayParams.extension_type = ["normal", "product_appointment"];
-      dayParams.customer_id = customerId;
-    }
     let data = await state.apis.getServices({
       skip: 1,
       num: 500,
@@ -194,22 +151,16 @@ var Info = (props) => {
         _config: {
           useCache: true
         }
-      },
-      ...dayParams
+      }
     });
     setLoading(false);
-    let lists = (data == null ? void 0 : data.list) || [];
-    if (isDay) {
-      const id = (0, import_utils3.holderId)(state);
-      lists = (0, import_utils3.getDayProducts)(id, lists, state == null ? void 0 : state.isTerminalDayBookingPage);
-    }
     if (!state.service.addModal) {
-      setDefaultService(lists);
+      setDefaultService(data == null ? void 0 : data.list);
     }
     dispatch({
       type: "setService",
       payload: {
-        services: lists
+        services: (data == null ? void 0 : data.list) || []
       }
     });
   };
@@ -229,29 +180,71 @@ var Info = (props) => {
   };
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(
     (item, type) => {
-      let isEject = type === "detail" || item.bundle_group_count > 0;
-      if (isDay) {
-        isEject = type === "detail" || item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0;
-      }
+      const isEject = type === "detail" || item.bundle_group_count > 0;
+      let lock = false;
       state.action({
         type: "pisell1.handleOpenProductModal",
         data: {
           id: item.id,
           date: state.date.value.format("YYYY-MM-DD"),
           showConfig: {
-            option: isDay ? true : false,
+            option: false,
             session: false,
-            variant: isDay ? true : false,
+            variant: false,
             package: true
           },
-          is_eject: isEject ? 1 : 0,
-          customer_id: customerId
+          is_eject: isEject ? 1 : 0
         },
-        callback: async (e) => {
-          const data = await createBookingData({
-            product: { ...item, _params: e }
+        callback: (e) => {
+          var _a2, _b2;
+          if (lock) {
+            return;
+          }
+          lock = true;
+          setTimeout(() => {
+            lock = false;
+          }, 2e3);
+          let cacheItem = {
+            ...item,
+            product_id: item.id,
+            _id: (0, import_utils4.getUniqueId)(),
+            _key: e.key,
+            _extend: {
+              start_date: state.date.value,
+              quantity: 1,
+              price: item.price,
+              product_name: item.title,
+              other: JSON.parse(JSON.stringify(e))
+            },
+            new: 1
+          };
+          let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
+          cacheItem._extend.total = _total;
+          cacheItem._extend.origin_total = _total;
+          const _isEdit = !!state.service.cacheItem;
+          if (_isEdit) {
+            cacheItem._id = (_a2 = state.service.cacheItem) == null ? void 0 : _a2._id;
+            cacheItem.new = 0;
+          }
+          if (renderMode === "current") {
+            cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
+          }
+          cacheItem._extend = (0, import_utils2.getProductExtend)({ cacheItem, state });
+          if (state.renderType === "eventBooking") {
+            cacheItem.autoClose = false;
+          } else {
+            cacheItem.autoClose = !_isEdit && (cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_b2 = state.service) == null ? void 0 : _b2.resourcesOrigin) || []).length === 1);
+          }
+          dispatch({
+            type: "setService",
+            payload: {
+              editModal: true,
+              cacheItem,
+              addModal: !cacheItem.autoClose,
+              changeService: false
+            }
           });
-          createBooking({ booking: data });
+          onEdit == null ? void 0 : onEdit(cacheItem);
         }
       });
     }
@@ -259,38 +252,32 @@ var Info = (props) => {
   const renderList = (0, import_react.useMemo)(() => {
     var _a2;
     let _list = ((_a2 = state.service) == null ? void 0 : _a2.services) || [];
-    if (isDay) {
-      if (!(0, import_utils3.holderId)(state)) {
-        _list = _list.filter(
-          (item) => !import_status.appointmentTypes.includes(item.extension_type)
-        );
-      }
-    }
     const isIncludes = (str) => {
       return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
     };
-    return (0, import_utils2.formatProductListByCategory)(
+    return (0, import_utils3.formatProductListByCategory)(
       _list,
       search ? (item) => isIncludes(item.title) : void 0
     );
-  }, [search, (_c = state.service) == null ? void 0 : _c.services, state == null ? void 0 : state.activeCartId]);
+  }, [search, (_a = state.service) == null ? void 0 : _a.services]);
+  console.log("state.service.renderList", renderList);
   const isService = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     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, _e, _f, _g;
     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
+      (_e = (_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 : _e.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" && ((_g = (_f = state.service) == null ? void 0 : _f.value) == null ? void 0 : _g.length) === 0) {
       setTimeout(() => {
         handleSelectService();
       }, 10);
     }
-  }, [state.modalOpen, state.bookingId, (_d = state.service) == null ? void 0 : _d.value]);
+  }, [state.modalOpen, state.bookingId, (_b = state.service) == null ? void 0 : _b.value]);
   const showAddButton = (0, import_react.useMemo)(() => {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
@@ -315,9 +302,6 @@ var Info = (props) => {
     }
   }, [state.renderType, state.modalOpen]);
   const addButton = (0, import_react.useMemo)(() => {
-    if (isDay) {
-      return;
-    }
     if (state.isBookingCreatePage) {
       return /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } });
     }
@@ -352,14 +336,9 @@ var Info = (props) => {
   const isRenderCurrent = (0, import_react.useMemo)(() => {
     return renderMode === "current";
   }, [renderMode]);
-  const colSpan = (0, import_react.useMemo)(() => {
-    const isTerminal = state.isTerminalDayBookingPage;
-    const showDate = !!(isDay && (0, import_utils3.holderId)(state));
-    return (0, import_status.inputDateCol)(showDate, isTerminal);
-  }, [state.isTerminalDayBookingPage, isDay, (0, import_utils3.holderId)(state)]);
   return (0, import_react.useMemo)(() => {
     var _a2, _b2;
-    const header = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-header", ref: headerRef }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { gutter: [16, 16] }, isDay && (0, import_utils3.holderId)(state) ? /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { ...colSpan.date }, /* @__PURE__ */ import_react.default.createElement(import_dateRange.default, { state, dispatch })) : null, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { ...colSpan.input }, /* @__PURE__ */ import_react.default.createElement(
+    const header = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-header" }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Input,
       {
         ref: searchRef,
@@ -372,22 +351,16 @@ var Info = (props) => {
           setSearch(e.target.value);
         }
       }
-    ))));
-    const content = /* @__PURE__ */ import_react.default.createElement(
-      "div",
+    ));
+    const content = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body" }, /* @__PURE__ */ import_react.default.createElement(
+      import_TabProduct.default,
       {
-        className: isDay && headerHeight > 76 ? "pisell-lowcode__booking-service-date-body" : "pisell-lowcode__booking-service-body"
-      },
-      /* @__PURE__ */ import_react.default.createElement(
-        import_TabProduct.default,
-        {
-          list: renderList,
-          amountSymbol: state.amountSymbol,
-          onChange: handleSelectProduct,
-          scrollDom: isRenderCurrent ? ".pisell-lowcode__booking-vertical-add-service-wrap" : ".booking-server-wrap .pisell-lowcode-drawer-body "
-        }
-      )
-    );
+        list: renderList,
+        amountSymbol: state.amountSymbol,
+        onChange: handleSelectProduct,
+        scrollDom: isRenderCurrent ? ".pisell-lowcode__booking-vertical-add-service-wrap" : ".booking-server-wrap .pisell-lowcode-drawer-body "
+      }
+    ));
     if (renderMode === "current") {
       return /* @__PURE__ */ import_react.default.createElement(
         "div",
@@ -403,8 +376,8 @@ var Info = (props) => {
       import_drawer.default,
       {
         titleNoWrap: true,
-        open: state.service.addModal && !state.isBookingCreatePage && !state.isTerminalDayBookingPage,
-        title: isDay ? import_utils4.locales.getText("pisell2.text.select.items") : import_utils4.locales.getText("pisell2.text.select-service"),
+        open: state.service.addModal && !state.isBookingCreatePage,
+        title: import_utils4.locales.getText("pisell2.text.select-service"),
         rootClassName: "booking-server-wrap",
         onClose: () => {
           dispatch({
@@ -421,17 +394,13 @@ var Info = (props) => {
       content
     ));
   }, [
-    (_f = (_e = state.service) == null ? void 0 : _e.cacheItem) == null ? void 0 : _f.autoClose,
+    (_d = (_c = state.service) == null ? void 0 : _c.cacheItem) == null ? void 0 : _d.autoClose,
     addButton,
     state.service.addModal,
     import_utils4.locales,
     search,
     renderList,
-    state.amountSymbol,
-    state.renderType,
-    state == null ? void 0 : state.activeCartId,
-    headerHeight,
-    (0, import_utils3.holderId)(state)
+    state.amountSymbol
   ]);
 };
 var addService_default = Info;

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

@@ -3,9 +3,8 @@
   // border-bottom: 1px solid var(--gray-300, #D0D5DD);
 }
 
-.pisell-lowcode__booking-service-body,
-.pisell-lowcode__booking-service-date-body {
-  background: var(--gray-50, #f9fafb);
+.pisell-lowcode__booking-service-body {
+  background: var(--gray-50, #F9FAFB);
 }
 
 .pisell-lowcode__booking-vertical-add-service-wrap {
@@ -26,7 +25,6 @@
   .booking-category-list {
     padding: 0 16px !important;
   }
-
   .pisell-lowcode__booking-service-body {
     .booking-tab-product {
       .booking-tabs-wrap {
@@ -34,12 +32,4 @@
       }
     }
   }
-
-  .pisell-lowcode__booking-service-date-body {
-    .booking-tab-product {
-      .booking-tabs-wrap {
-        top: 136px !important;
-      }
-    }
-  }
-}
+}

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

@@ -1,4 +1,4 @@
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 export declare const getDurationProps: ({ cacheItem, useStartTime, currentResource, slice, }: any) => {
     startDate: dayjs.Dayjs;
     usableTime: any;
@@ -48,7 +48,7 @@ export declare const getTimeObj: ({ cacheItem, useStartTime, currentResource, st
  * @Author: zhiwei.Wang
  * @Date: 2024-01-09 13:38
  */
-export declare const formatResources: ({ cacheItem, resourcesOrigin, isDay }: any) => any[];
+export declare const formatResources: ({ cacheItem, resourcesOrigin }: any) => any[];
 export declare const checkCacheItemResource: ({ cacheItem, resources }: any) => any;
 /**
  * @title: 预生成服务的 extend
@@ -59,13 +59,3 @@ export declare const checkCacheItemResource: ({ cacheItem, resources }: any) =>
  * @Date: 2024-06-01 13:25
  */
 export declare const getProductExtend: ({ cacheItem, state }: any) => any;
-/**
- * @title: 获取资源标题
- * @description:
- * @param {any} param1
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-09 15:53
- */
-export declare const getResourceTitle: ({ state, id }: any) => any;
-export declare const getMultiDay: ({ start_date, end_date, state, cacheItem, }: any) => Promise<any>;