@pisell/private-materials 6.5.27 → 6.6.1

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

@@ -469,19 +469,16 @@ var genRowKey = (key) => {
   return `rowKey-${key}`;
 };
 var getGeneralParams = (item, state, isParallelResource) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const { pet, service } = state;
   const { holders = [], formData } = pet || {};
   const parallelResourceOtherParams = {};
   let multiResources;
   if (isParallelResource) {
-    let hasDataItem = item;
-    if (!isNormalProductByDurationSchedule(hasDataItem) && !hasDataItem._data) {
-      hasDataItem = (0, import_utils6.getProductExtend)({
-        cacheItem: { ...item, new: 0 },
-        state
-      });
-    }
+    const hasDataItem = (0, import_utils6.getProductExtend)({
+      cacheItem: { ...item, new: 0 },
+      state
+    });
     const { resourceMaps, resources } = hasDataItem._data || {};
     parallelResourceOtherParams.errorMessage = getErrorMessageInfo2(getAllErrorList(hasDataItem));
     multiResources = resources.map((resource) => {
@@ -521,10 +518,11 @@ var getGeneralParams = (item, state, isParallelResource) => {
     ];
   }
   const isNormalProduct = isNormalProductByDurationSchedule(item);
+  const isMultiDay = (0, import_utils6.isMultiDayProduct)(item);
   return {
     format: ["HH:mm", "HH:mm"],
     show_time: true,
-    duration_type: "minutes",
+    duration_type: isMultiDay ? "days" : "minutes",
     // 当前可选择holder列表
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
@@ -532,15 +530,17 @@ var getGeneralParams = (item, state, isParallelResource) => {
     actionText: import_utils2.locales.getText("page.booking.text.add-time"),
     actionIcon: "pisell2-clock-plus",
     isMultipleResource: true,
+    isFormSubject: ((_e = (_d = (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.appointment_subject) == null ? void 0 : _e.type) === "form",
+    holderType: ((_h = (_g = (_f = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f.holder) == null ? void 0 : _g.form) == null ? void 0 : _h.form_type) || "minors",
     multiResources,
     holderMaxCount: item == null ? void 0 : item._extend.quantity,
     holderMode: (item == null ? void 0 : item._extend.quantity) > 1 ? "multiple" : void 0,
     isErrorHolder: getIsSubjectRequire(state),
-    addHolderButtonText: ((_c = (_b = formData == null ? void 0 : formData[0]) == null ? void 0 : _b.form) == null ? void 0 : _c.title) || "",
-    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),
+    addHolderButtonText: ((_j = (_i = formData == null ? void 0 : formData[0]) == null ? void 0 : _i.form) == null ? void 0 : _j.title) || "",
+    holder_id: (_k = item == null ? void 0 : item._extend) == null ? void 0 : _k.holder_id,
+    start_date: !isNormalProduct ? (_l = item == null ? void 0 : item._extend) == null ? void 0 : _l.startDate : "",
+    end_date: !isNormalProduct ? ((_m = item == null ? void 0 : item._extend) == null ? void 0 : _m.endDate) || ((_n = item == null ? void 0 : item._extend) == null ? void 0 : _n.end_date) : "",
+    rowKey: genRowKey((_p = (_o = item == null ? void 0 : item._extend) == null ? void 0 : _o.other) == null ? void 0 : _p.rowKey),
     ...parallelResourceOtherParams
   };
 };
@@ -549,8 +549,6 @@ var calcAddTimeTotalPrice = (total, addTimeProducts) => {
 };
 var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelResource) => {
   if (!(lists == null ? void 0 : lists.length)) return [];
-  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, _v;
     const _isDayBookingProduct = isDayBookingProduct(item, state);
@@ -558,17 +556,13 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
     const options = formatOptions((_c = (_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.option);
     const bundle = formatBundle((_e = (_d = item == null ? void 0 : item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle);
     const isNormalProduct = !import_status.appointmentTypes.includes(item == null ? void 0 : item.extension_type) || (state == null ? void 0 : state.renderType) === "eventBooking";
-    const isNormalProductByDurationScheduleVal = isNormalProductByDurationSchedule(item);
     let resourceItem = {};
     let errorMessage = "";
-    if ((_isDayBookingProduct || isGeneral) && !isNormalProductByDurationScheduleVal) {
+    if (_isDayBookingProduct || isGeneral) {
       resourceItem = getResourceItem((_f = item == null ? void 0 : item._extend) == null ? void 0 : _f.resource, state);
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
-    let generalParams = {};
-    if (isGeneral && !isNormalProductByDurationScheduleVal) {
-      generalParams = getGeneralParams(item, state, !!isParallelResource);
-    }
+    const generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
     return {
       id: item == null ? void 0 : item.id,
       _id: item == null ? void 0 : item._id,
@@ -607,17 +601,23 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       _origin: item
     };
   };
-  console.log(normalList, "normalList");
   if (isRenderGroup) {
-    lists.forEach((item) => {
-      var _a;
+    const normalItemsWithIndex = [];
+    const groupItemsWithIndex = [];
+    const groupFirstIndexMap = {};
+    lists.forEach((item, index) => {
+      var _a, _b;
       if (!((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId)) {
-        normalList.push(formItem(item));
+        normalItemsWithIndex.push({ item, index });
       } else {
-        groupList.push(item);
+        const groupId = (_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.groupId;
+        groupItemsWithIndex.push({ item, index });
+        if (groupFirstIndexMap[groupId] === void 0) {
+          groupFirstIndexMap[groupId] = index;
+        }
       }
     });
-    let groups = groupList.reduce((prev, item) => {
+    const groups = groupItemsWithIndex.reduce((prev, { item }) => {
       var _a;
       const groupId = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.groupId;
       if (!prev[groupId]) {
@@ -626,7 +626,16 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       prev[groupId].push(item);
       return prev;
     }, {});
-    return Object.values(groups).map((d) => formItem((0, import_utils3.concatBookings)(d))).concat(normalList);
+    const mergedGroupItems = Object.entries(groups).map(([groupId, items]) => ({
+      item: formItem((0, import_utils3.concatBookings)(items)),
+      index: groupFirstIndexMap[groupId]
+    }));
+    const formattedNormalItems = normalItemsWithIndex.map(({ item, index }) => ({
+      item: formItem(item),
+      index
+    }));
+    const allItems = [...mergedGroupItems, ...formattedNormalItems].sort((a, b) => a.index - b.index);
+    return allItems.map(({ item }) => item);
   } else {
     return lists == null ? void 0 : lists.map((item) => formItem(item));
   }

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

@@ -45,6 +45,7 @@ module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("../utils");
 var import_utils2 = require("../info2/service/addTimeModal/utils");
+var import_utils3 = require("../info2/service/addService/utils");
 var getIsBundleOrCombination = (productDetail) => {
   var _a;
   if ((_a = productDetail == null ? void 0 : productDetail.bundle_group) == null ? void 0 : _a.length) {
@@ -195,6 +196,9 @@ var isOpenAddTime = (state) => {
   return true;
 };
 var isShowAddTime = (state, currentService) => {
+  if ((0, import_utils3.isMultiDayProduct)(currentService)) {
+    return false;
+  }
   if (!isOpenAddTime(state)) {
     return false;
   }

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

@@ -36,6 +36,7 @@ var import_react = __toESM(require("react"));
 var import_ahooks = require("ahooks");
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
+var import_lodash = require("lodash");
 var import_locales = __toESM(require("./locales"));
 var import_clientCard = __toESM(require("../../../../plus/clientCard"));
 var import_clinetSearch = __toESM(require("../../../../plus/clinetSearch"));
@@ -75,6 +76,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
     ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.storage) == null ? void 0 : _c.get("umi_locale")) || "en"
   );
   const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
+    var _a2, _b2;
     dispatch({
       type: "setClient",
       payload: {
@@ -82,6 +84,14 @@ var CartClientCard = (0, import_react.forwardRef)(({
         edit: true
       }
     });
+    if ((_b2 = (_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) {
+      dispatch({
+        type: "setService",
+        payload: {
+          value: state.service.value.map((item) => ({ ...item, _extend: { ...item._extend, holder_id: [] } }))
+        }
+      });
+    }
   });
   const {
     customers,
@@ -148,10 +158,34 @@ var CartClientCard = (0, import_react.forwardRef)(({
     selectCustomer(null);
   };
   const handleViewClient = (data) => {
+    const newSelectedCustomer = (0, import_lodash.cloneDeep)(selectedCustomer);
     state.action({
       type: "pisell1.handleOpenCustomerModal",
       data: { id: state.client.value.id },
       callback: (data2) => {
+        console.log("data>>>>>", data2);
+        const _selectedCustomer = {
+          ...newSelectedCustomer || {},
+          display_name: (data2 == null ? void 0 : data2.display_name) || "",
+          email: (data2 == null ? void 0 : data2.email) || "",
+          phone: (data2 == null ? void 0 : data2.phone) || "",
+          nickname: (data2 == null ? void 0 : data2.nickname) || "",
+          country_calling_code: (data2 == null ? void 0 : data2.country_calling_code) || "",
+          first_name: (data2 == null ? void 0 : data2.first_name) || "",
+          last_name: (data2 == null ? void 0 : data2.last_name) || "",
+          contacts_info: (data2 == null ? void 0 : data2.contacts_info) || null
+        };
+        selectCustomer(_selectedCustomer);
+        if (JSON.stringify((newSelectedCustomer == null ? void 0 : newSelectedCustomer.contacts_info) || {}) !== JSON.stringify((data2 == null ? void 0 : data2.contacts_info) || {})) {
+          dispatch({
+            type: "setContactsInfo",
+            payload: {
+              value: (data2 == null ? void 0 : data2.contacts_info) || {},
+              client_id: data2 == null ? void 0 : data2.id
+            }
+          });
+        }
+        handleSearchClient("");
       }
     });
   };
@@ -237,11 +271,6 @@ var CartClientCard = (0, import_react.forwardRef)(({
       (0, import_utils3.setHandleSetClient)(handleSetClient);
     }
   }, [isActive]);
-  (0, import_react.useEffect)(() => {
-    return () => {
-      (0, import_utils3.setHandleSetClient)(null);
-    };
-  }, [isActive]);
   const tags = (0, import_react.useMemo)(() => {
     var _a2;
     if (!selectedCustomer) return;

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

@@ -60,6 +60,7 @@ var import_locales2 = require("../../../utils/locales");
 var import_ahooks = require("ahooks");
 var import_cartClientCard = __toESM(require("./cartClientCard"));
 var import_materials = require("@pisell/materials");
+var import_contactInfoMode = __toESM(require("./service/contactInfoMode"));
 var defaultModules = {
   client: 1,
   date: 1,
@@ -69,7 +70,7 @@ var defaultModules = {
 };
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
 var Info = (0, import_model.Provider)((props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
   const { style, globalState, modules = defaultModules, slot } = props;
   const modal = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
@@ -98,7 +99,7 @@ var Info = (0, import_model.Provider)((props) => {
   }, []);
   const Toast = (0, import_materials.useToast)();
   (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k, _l, _m;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2;
     const isFranchisee = (_d2 = (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c2.getAppByModal) == null ? void 0 : _d2.call(_c2, "franchisee");
     modal.dispatch({
       type: "setState",
@@ -107,7 +108,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 = (_j2 = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j2.getState()) == null ? void 0 : _k.global) == null ? void 0 : _l.globalConfig) == null ? void 0 : _m.timezone
+        timezone: (_m2 = (_l2 = (_k2 = (_j2 = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j2.getState()) == null ? void 0 : _k2.global) == null ? void 0 : _l2.globalConfig) == null ? void 0 : _m2.timezone
       }
     });
   }, [globalState]);
@@ -298,7 +299,12 @@ var Info = (0, import_model.Provider)((props) => {
       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, { clientCardProps: { dropdown: dropdownProps } })) : /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, (globalState == null ? void 0 : globalState.isBookingTicket2) ? /* @__PURE__ */ import_react.default.createElement(
+    /* @__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,
+      {
+        clientCardProps: { dropdown: dropdownProps }
+      }
+    )) : /* @__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",
@@ -314,7 +320,7 @@ var Info = (0, import_model.Provider)((props) => {
           style: { color: "#fff", fontSize: 42 }
         }
       )
-    ) : null), modules.holder && !((_j = modal.state) == null ? void 0 : _j.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(
+    ) : null), ((_n = (_m = (_l = (_k = (_j = modal == null ? void 0 : modal.state) == null ? void 0 : _j.bookingConfig) == null ? void 0 : _k.config) == null ? void 0 : _l.cart_settings_tab) == null ? void 0 : _m.display_contact_info) == null ? void 0 : _n.show_contact_info) === true ? /* @__PURE__ */ import_react.default.createElement(import_contactInfoMode.default, null) : null, modules.holder && !((_o = modal.state) == null ? void 0 : _o.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/serve.js

@@ -27,12 +27,7 @@ module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../utils");
 var import_utils2 = require("./utils");
 var getResourceList = async (params, bookingId = []) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/resource/list`, params, {
-    cache: {
-      mode: "remote_local",
-      type: "indexDB"
-    }
-  });
+  let { data } = await import_utils.request.getRequest().get(`/shop/schedule/resource/list`, params);
   return (0, import_utils2.getFormatResourceListAndMap)(data, bookingId);
 };
 var createBookings = async (params) => {

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

@@ -49,6 +49,7 @@ var import_utils4 = require("@pisell/utils");
 var import_ahooks = require("ahooks");
 var import_utils5 = require("../../../info/service2/utils");
 var import_utils6 = require("../../../../ticketBooking/utils");
+var import_utils7 = require("../../../info/service2/Group/utils");
 var shopList = [
   2886,
   4422,
@@ -223,7 +224,7 @@ var Info = (props) => {
         isOS: isSession,
         customer_id: (_c2 = (_b2 = state.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id
       },
-      callback: (e, extension_type, detail) => {
+      callback: async (e, extension_type, detail) => {
         var _a3, _b3;
         if (lock) {
           return;
@@ -249,7 +250,10 @@ var Info = (props) => {
           },
           new: 1
         };
-        console.log(cacheItem, "cacheItem", e);
+        const isMultiDay = (0, import_utils2.isMultiDayProduct)(cacheItem);
+        if (isMultiDay) {
+          cacheItem._extend.end_date = state.date.value.add(1, "day");
+        }
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;
@@ -262,7 +266,19 @@ var Info = (props) => {
           cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
         }
         cacheItem = (0, import_utils2.getProductExtend)({ cacheItem, state });
-        if (state.renderType === "eventBooking") {
+        const getMultiDayCacheItem = async (isConcatBookings) => {
+          cacheItem = await (0, import_utils2.getMultiDay)({
+            start_date: cacheItem._extend.start_date,
+            end_date: cacheItem._extend.end_date,
+            state,
+            cacheItem
+          });
+          cacheItem = (0, import_utils7.createBookingItemsByGroup)(cacheItem);
+          if (isConcatBookings) {
+            cacheItem = (0, import_utils7.concatBookings)(cacheItem);
+          }
+        };
+        if (state.renderType === "eventBooking" || isMultiDay) {
           cacheItem.autoClose = false;
         }
         if (cacheItem.autoClose) {
@@ -289,6 +305,9 @@ var Info = (props) => {
           });
         } else {
           (_b3 = window.openBookingEditModal) == null ? void 0 : _b3.call(window);
+          if (isMultiDay) {
+            await getMultiDayCacheItem(true);
+          }
           dispatch({
             type: "setService",
             payload: {

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

@@ -79,6 +79,14 @@ export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any
  * @Date: 2024-09-19 20:23
  */
 export declare const getResourceByIds: (resourcesOriginMap: any, cacheItem: any, extraParams?: any) => any[];
+/**
+ * @title: 是否是跨日商品
+ * @description:
+ * @param {any} cacheItem
+ * @return {*}
+ */
+export declare const isMultiDayProduct: (product: any) => boolean;
+export declare const getMultiDay: ({ start_date, end_date, state, cacheItem, }: any) => Promise<any>;
 /**
  * @title: 预生成服务的 extend
  * @description:

package/lib/components/booking/info2/service/addService/utils.js

@@ -32,11 +32,13 @@ __export(utils_exports, {
   formatResources: () => formatResources,
   getDurationProps: () => getDurationProps,
   getFlexibleOption: () => getFlexibleOption,
+  getMultiDay: () => getMultiDay,
   getProductExtend: () => getProductExtend,
   getResourceByIds: () => getResourceByIds,
   getTimeObj: () => getTimeObj,
   getTimeSlices: () => getTimeSlices,
   getUsableTime: () => getUsableTime,
+  isMultiDayProduct: () => isMultiDayProduct,
   setDefaultCapacitys: () => setDefaultCapacitys,
   setDefaultResource: () => setDefaultResource,
   transServiceList: () => transServiceList
@@ -51,6 +53,8 @@ var import_AlertTriangle = __toESM(require("@pisell/icon/es/AlertTriangle"));
 var import_utils3 = require("../editService/utils");
 var import_mock = require("../../../mock");
 var import_lodash = require("lodash");
+var import_utils4 = require("../../../info/service2/utils");
+var import_utils5 = require("../../../info/utils");
 var getUsableTime = (cacheItem) => {
   try {
     let items = [];
@@ -138,6 +142,7 @@ var getTimeObj = ({
   durationProps
 }) => {
   var _a, _b, _c;
+  const isMultiDay = isMultiDayProduct(cacheItem);
   const flexibleOption = getFlexibleOption({
     cacheItem,
     useStartTime,
@@ -148,7 +153,8 @@ var getTimeObj = ({
   });
   let obj = (0, import_utils.sliceDayIntoFiveMinutes)(
     (_c = (_b = (_a = state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time,
-    import_utils2.locales.locale
+    import_utils2.locales.locale,
+    isMultiDay
   );
   let timeSlices = [...obj.timeSlices];
   let durationSlicesBasedOnTime = [...obj.durationSlicesBasedOnTime];
@@ -157,7 +163,7 @@ var getTimeObj = ({
   }
   if (useDuration && !durationSlicesBasedOnTime.some((d) => d.value === useDuration)) {
     durationSlicesBasedOnTime.unshift({
-      label: (0, import_utils.getDiscountTime)(useDuration),
+      label: (0, import_utils.getDiscountTime)(useDuration, isMultiDay),
       value: useDuration,
       //@ts-ignore
       disabled: true
@@ -395,13 +401,44 @@ var getIsAutoClose = (cacheItem) => {
     }
   );
 };
+var isMultiDayProduct = (product) => {
+  var _a;
+  return ((_a = product == null ? void 0 : product.duration) == null ? void 0 : _a.type) === "days";
+};
+var getMultiDay = async ({
+  start_date,
+  end_date,
+  state,
+  cacheItem
+}) => {
+  let _cacheItem = cacheItem || state.service.cacheItem;
+  if (isMultiDayProduct(_cacheItem)) {
+    const { multiDayPrices, price } = await (0, import_utils4.updateAppointmentServicePrice)(
+      state,
+      {
+        start_date,
+        end_date,
+        product_id: _cacheItem.product_id
+      }
+    );
+    _cacheItem._extend.multiDayPrices = (0, import_utils5.getMultiDayPrices)(multiDayPrices || []);
+    if (!(multiDayPrices == null ? void 0 : multiDayPrices.length)) {
+      _cacheItem._extend.price = price;
+    }
+    return _cacheItem;
+  }
+  return _cacheItem;
+};
 var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
-  var _a, _b, _c, _d, _e, _f, _g;
-  console.time("console.time getProductExtend");
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const isNew = cacheItem.new || !cacheItem._extend.endDate;
   let _cacheItem = { ...cacheItem };
   const resourcesOriginMap = state.service.resourcesOriginMap || {};
   _cacheItem._data = {};
+  if (isMultiDayProduct(cacheItem)) {
+    _cacheItem._extend.holder_id = ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.holder_id) || [];
+    _cacheItem._extend.sub_type = "days";
+  }
   if (isNew) {
     _cacheItem._data.timeObj = getTimeObj({
       cacheItem,
@@ -419,7 +456,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
       cacheItem,
       {
         //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
-        resourceTab: (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.resource_tab,
+        resourceTab: (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.resource_tab,
         resourcesOrigin: state.service.resourcesOrigin
       }
     );
@@ -445,10 +482,8 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
         state
       });
       if ((0, import_utils.getDuration)(_cacheItem == null ? void 0 : _cacheItem.duration) === "flexible") {
-        _cacheItem._extend.duration = (_e = (_d = (_c = _cacheItem._data.timeObj) == null ? void 0 : _c.durationSlicesBasedOnTime) == null ? void 0 : _d[0]) == null ? void 0 : _e.value;
-        const { startDate, endDate } = (0, import_utils.getServiceTimes)({
-          _extend: _cacheItem._extend
-        });
+        _cacheItem._extend.duration = (_f = (_e = (_d = _cacheItem._data.timeObj) == null ? void 0 : _d.durationSlicesBasedOnTime) == null ? void 0 : _e[0]) == null ? void 0 : _f.value;
+        const { startDate, endDate } = (0, import_utils.getServiceTimes)(_cacheItem);
         _cacheItem._extend.endDate = endDate;
       }
     }
@@ -479,7 +514,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
         {
           extraResources,
           //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
-          resourceTab: (_g = (_f = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f.config) == null ? void 0 : _g.resource_tab,
+          resourceTab: (_h = (_g = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _g.config) == null ? void 0 : _h.resource_tab,
           resourcesOrigin: state.service.resourcesOrigin
         }
       );
@@ -499,7 +534,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
       state
     });
   }
-  console.timeEnd("console.time getProductExtend");
+  console.log("_cacheItem_cacheItem", _cacheItem);
   return _cacheItem;
 };
 var transServiceList = (list) => {
@@ -519,11 +554,13 @@ var transServiceList = (list) => {
   formatResources,
   getDurationProps,
   getFlexibleOption,
+  getMultiDay,
   getProductExtend,
   getResourceByIds,
   getTimeObj,
   getTimeSlices,
   getUsableTime,
+  isMultiDayProduct,
   setDefaultCapacitys,
   setDefaultResource,
   transServiceList

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

@@ -0,0 +1,2 @@
+declare const ContactInfoMode: () => JSX.Element;
+export default ContactInfoMode;

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

@@ -0,0 +1,111 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info2/service/contactInfoMode/index.tsx
+var contactInfoMode_exports = {};
+__export(contactInfoMode_exports, {
+  default: () => contactInfoMode_default
+});
+module.exports = __toCommonJS(contactInfoMode_exports);
+var import_react = __toESM(require("react"));
+var import_utils = require("@pisell/utils");
+var import_contactInfo = __toESM(require("../../../../../plus/contactInfo"));
+var import_model = require("../../../info/model");
+var ContactInfoMode = () => {
+  var _a, _b, _c;
+  const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
+  console.log("state>>>>>>>>>", state);
+  (0, import_react.useEffect)(() => {
+    var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i;
+    console.log("state>>>>>>>>>111", (_a2 = state == null ? void 0 : state.contacts_info) == null ? void 0 : _a2.client_id);
+    console.log("state>>>>>>>>>222", (_b2 = state.client.value) == null ? void 0 : _b2.id);
+    if (((_c2 = state.client.value) == null ? void 0 : _c2.id) != ((_d = state == null ? void 0 : state.contacts_info) == null ? void 0 : _d.client_id)) {
+      const contactInfo = (_f = (_e = state.client.value) == null ? void 0 : _e.contacts_info) == null ? void 0 : _f.value;
+      if (!contactInfo) {
+        const {
+          first_name,
+          last_name,
+          phone,
+          country_calling_code,
+          country_code,
+          email
+        } = ((_g = state.client) == null ? void 0 : _g.value) || {};
+        dispatch({
+          type: "setContactsInfo",
+          payload: {
+            value: {
+              first_name: first_name || "",
+              last_name: last_name || "",
+              phone: {
+                phone: phone || "",
+                country_calling_code: country_calling_code || "",
+                country_code: country_code || ""
+              },
+              email: email || ""
+            },
+            client_id: (_h = state.client.value) == null ? void 0 : _h.id
+          }
+        });
+      } else {
+        dispatch({
+          type: "setContactsInfo",
+          payload: {
+            value: { ...contactInfo || {} },
+            client_id: (_i = state.client.value) == null ? void 0 : _i.id
+          }
+        });
+      }
+    }
+  }, [(_a = state.client.value) == null ? void 0 : _a.id, (_b = state == null ? void 0 : state.contacts_info) == null ? void 0 : _b.client_id]);
+  const handleSave = (value) => {
+    dispatch({
+      type: "setContactsInfo",
+      payload: { value, edit: true }
+    });
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { style: { marginTop: "24px" } }, /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      className: "pisell-lowcode__booking-contact-info-title",
+      style: { fontSize: "16px", fontWeight: 500, marginBottom: "8px" }
+    },
+    import_utils.locales.getText("pisell2.booking.text.contact-info.title")
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_contactInfo.default,
+    {
+      dataSource: ((_c = state.contacts_info) == null ? void 0 : _c.value) || null,
+      isShowDelete: false,
+      isShowAvatar: false,
+      isShowPhone: true,
+      isShowEmail: true,
+      style: { padding: "14px 0 14px 14px" },
+      onSave: handleSave
+    }
+  ));
+};
+var contactInfoMode_default = ContactInfoMode;

package/lib/components/booking/info2/service/editService/Holder/index.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+import './index.less';
+declare type HolderValue = string | number;
+interface HolderProps {
+    state: any;
+    cacheItem?: any;
+    value?: HolderValue | HolderValue[] | null;
+    onChange?: (val: HolderValue | HolderValue[] | null) => void;
+    dispatch?: any;
+}
+declare const Holder: React.FC<HolderProps>;
+export default Holder;