@pisell/private-materials 3.3.46 → 3.3.47

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

@@ -33,6 +33,7 @@ __export(utils_exports, {
   checkSubResourcesCapacity: () => checkSubResourcesCapacity,
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
+  formatProductPrice: () => formatProductPrice,
   formatValues: () => formatValues
 });
 module.exports = __toCommonJS(utils_exports);
@@ -70,7 +71,7 @@ var formatProductOption = (option) => {
   return option.map((d) => {
     return {
       "num": d.num,
-      "option_group_item_id": d.product_option_item_id,
+      "option_group_item_id": d.product_option_item_id || d.option_group_item_id,
       "option_group_id": d.option_group_id
       // "add_price": Number(d?.add_price),
     };
@@ -280,6 +281,9 @@ var formatBookings = (data, values) => {
       return (_a = d._extend) == null ? void 0 : _a.holder_id;
     });
   }
+  if (!isDay && !isEvent) {
+    list = list.filter((item) => !(0, import_utils4.isNormalProductByDurationSchedule)(item));
+  }
   let dayParams = {};
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
@@ -343,6 +347,16 @@ var formatRelationProducts = (data) => {
   });
   return relationProducts || [];
 };
+var formatNormalProducts = (data) => {
+  var _a;
+  let list = ((_a = data.service) == null ? void 0 : _a.value) || [];
+  list = list.filter((item) => (0, import_utils4.isNormalProductByDurationSchedule)(item));
+  let relationProducts = [];
+  relationProducts = list.map((item) => {
+    return formatProducts(item);
+  });
+  return relationProducts || [];
+};
 var formatHolder = (state, values) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const form_id = ((_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id) || 0;
@@ -361,7 +375,7 @@ var formatHolder = (state, values) => {
   return obj;
 };
 var formatValues = (state) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   let values = {
     type: state.renderType === "eventBooking" ? "event_booking_v2" : "appointment_booking",
     platform: "shop",
@@ -391,11 +405,10 @@ var formatValues = (state) => {
     ...customer
   };
   values.holder = formatHolder(state, values);
-  if (isDay) {
-    values.relation_products = formatRelationProducts(state);
-  }
-  if (isEvent) {
+  if (isDay || isEvent) {
     values.relation_products = formatRelationProducts(state);
+  } else {
+    values.relation_products = formatNormalProducts(state);
   }
   values.bookings = formatBookings(state, values);
   if (((_c = (_b = values == null ? void 0 : values.bookings) == null ? void 0 : _b[0]) == null ? void 0 : _c.select_date) && !(state == null ? void 0 : state.bookingId)) {
@@ -406,12 +419,15 @@ var formatValues = (state) => {
   if (isDay) {
     values.metadata.is_multiday_appointment = 1;
   }
+  if (!((_f = values == null ? void 0 : values.bookings) == null ? void 0 : _f.length)) {
+    values.type = "virtual";
+  }
   return values;
 };
 var checkHolderIsError = (state) => {
   var _a, _b;
   const holderError = state.service.value.some((item) => {
-    return !item._extend.holder_id;
+    return !item._extend.holder_id && !(0, import_utils4.isNormalProductByDurationSchedule)(item);
   });
   const clientId = (_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id;
   if (holderError && (!clientId || clientId === 0 || clientId === 1)) {
@@ -427,5 +443,6 @@ var checkHolderIsError = (state) => {
   checkSubResourcesCapacity,
   formatProductBundle,
   formatProductOption,
+  formatProductPrice,
   formatValues
 });

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/lib/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

package/lib/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/lib/components/booking/forms/table/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/lib/components/booking/info/addServiceVariant/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/lib/components/booking/info/date/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

package/lib/components/booking/info/header/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const header: ({ state, dispatch }: any) => JSX.Element;
 export default header;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

package/lib/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/info/notes/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Notes: () => JSX.Element | null;
 export default Notes;

package/lib/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

package/lib/components/booking/info/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

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

@@ -228,7 +228,7 @@ var Info = (props) => {
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(
     (item, type) => {
       const isSession = (0, import_utils2.isSessionProduct)(item);
-      let isEject = type === "detail" || item.bundle_group_count > 0 || isSession;
+      let isEject = (0, import_utils2.getIsEject)(item, type);
       if (isDay) {
         isEject = type === "detail" || item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0;
       }

package/lib/components/booking/info/service/like/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/lib/components/booking/info/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/info/service2/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

package/lib/components/booking/info/service2/utils.d.ts

@@ -55,6 +55,9 @@ export declare const handleChangeHolder: (products: any[], currentItem: any, oth
 export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any, actions?: any) => any;
 export declare const formItems: (items: any[]) => any[];
 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;
 /**
  * @title: 格式化商品数据
  * @description:
@@ -241,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

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

@@ -46,6 +46,8 @@ __export(utils_exports, {
   handleChangeHolder: () => handleChangeHolder,
   holderId: () => holderId,
   initDate: () => initDate,
+  isAllNormalProduct: () => isAllNormalProduct,
+  isAllNormalProductByState: () => isAllNormalProductByState,
   isAppointmentProduct: () => isAppointmentProduct,
   isBookingProduct: () => isBookingProduct,
   isDayBooking: () => isDayBooking,
@@ -53,6 +55,7 @@ __export(utils_exports, {
   isDaysBooking: () => isDaysBooking,
   isEventBooking: () => isEventBooking,
   isHasDayAppointmentProduct: () => isHasDayAppointmentProduct,
+  isNormalProductByDurationSchedule: () => isNormalProductByDurationSchedule,
   isOpenDeletePet: () => isOpenDeletePet,
   isTerminalDayBooking: () => isTerminalDayBooking,
   updateAppointmentServicePrice: () => updateAppointmentServicePrice,
@@ -440,6 +443,16 @@ var getIsSubjectRequire = (state) => {
   var _a, _b, _c, _d, _e, _f, _g;
   return ((_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.type) === "form" && ((_g = (_f = (_e = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.basic) == null ? void 0 : _g.subject_require) === "require";
 };
+var isNormalProductByDurationSchedule = (item) => {
+  var _a, _b;
+  return !(item == null ? void 0 : item.duration) && !((_a = item == null ? void 0 : item.schedules) == null ? void 0 : _a.length) && !((_b = item["schedule.ids"]) == null ? void 0 : _b.length);
+};
+var isAllNormalProduct = (items) => {
+  return items.every((item) => isNormalProductByDurationSchedule(item));
+};
+var isAllNormalProductByState = (state) => {
+  return isAllNormalProduct(state.service.value);
+};
 var getGeneralParams = (item, state, isParallelResource) => {
   var _a, _b, _c, _d, _e, _f, _g;
   const { pet, service } = state;
@@ -489,12 +502,14 @@ var getGeneralParams = (item, state, isParallelResource) => {
       }
     ];
   }
+  const isNormalProduct = isNormalProductByDurationSchedule(item);
   return {
     format: ["HH:mm", "HH:mm"],
     show_time: true,
     duration_type: "minutes",
     // 当前可选择holder列表
     holders: formatHolders(holders),
+    isShowChangeHolder: !isNormalProduct,
     isShowAction: (0, import_utils4.isShowAddTime)(state, item),
     actionText: import_utils2.locales.getText("page.booking.text.add-time"),
     isMultipleResource: true,
@@ -502,8 +517,8 @@ var getGeneralParams = (item, state, isParallelResource) => {
     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: (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.startDate,
-    end_date: ((_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),
+    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) : "",
     ...parallelResourceOtherParams
   };
 };
@@ -528,6 +543,7 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
     const generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
+    console.log(isNormalProduct, "isNormalProduct");
     return {
       id: item == null ? void 0 : item.id,
       _id: item == null ? void 0 : item._id,
@@ -961,6 +977,8 @@ var updateServicePrice = (state) => {
   handleChangeHolder,
   holderId,
   initDate,
+  isAllNormalProduct,
+  isAllNormalProductByState,
   isAppointmentProduct,
   isBookingProduct,
   isDayBooking,
@@ -968,6 +986,7 @@ var updateServicePrice = (state) => {
   isDaysBooking,
   isEventBooking,
   isHasDayAppointmentProduct,
+  isNormalProductByDurationSchedule,
   isOpenDeletePet,
   isTerminalDayBooking,
   updateAppointmentServicePrice,

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

@@ -104,7 +104,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782, 1285, 6124, 8727, 5538];
+  const booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 6813, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

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

@@ -47,6 +47,7 @@ var import_utils2 = require("./utils");
 var import_utils3 = require("../../../utils");
 var import_utils4 = require("@pisell/utils");
 var import_ahooks = require("ahooks");
+var import_utils5 = require("../../../info/service2/utils");
 var shopList = [
   2886,
   4422,
@@ -188,7 +189,7 @@ var Info = (props) => {
   const handleSelectProduct = (item, type) => {
     var _a2, _b2;
     const isSession = (0, import_utils3.isSessionProduct)(item);
-    const isEject = type === "detail" || item.bundle_group_count > 0 || isSession;
+    const isEject = (0, import_utils3.getIsEject)(item, type);
     let lock = false;
     state.action({
       type: "pisell1.handleOpenProductModal",
@@ -196,10 +197,11 @@ var Info = (props) => {
         id: item.id,
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: (0, import_utils5.isNormalProductByDurationSchedule)(item)
         },
         is_eject: isEject ? 1 : 0,
         isOS: isSession,
@@ -224,13 +226,14 @@ var Info = (props) => {
           _key: e.key,
           _extend: {
             start_date: state.date.value,
-            quantity: 1,
+            quantity: (e == null ? void 0 : e.quantity) || 1,
             price: _detail.price,
             product_name: item.title,
             other
           },
           new: 1
         };
+        console.log(cacheItem, "cacheItem", e);
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/addTimeModal/index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

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

@@ -50,9 +50,10 @@ var import_utilsByBooking = require("../../utilsByBooking");
 var import_utils4 = require("../addService/utils");
 var import_materials = require("@pisell/materials");
 var import_utils5 = require("../../../info/utils");
+var import_utils6 = require("../../../info/service2/utils");
 var submitLock = false;
 var Info = (_, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -61,6 +62,10 @@ var Info = (_, ref) => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const resourcesRef = (0, import_react.useRef)(null);
   const isChangeTotal = (0, import_react.useRef)(false);
+  const isNormalProduct = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
+    return ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.cacheItem) && (0, import_utils6.isNormalProductByDurationSchedule)((_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.cacheItem);
+  }, [(_a = state == null ? void 0 : state.service) == null ? void 0 : _a.cacheItem]);
   const getCurrentCacheItem = (_cacheItem) => {
     let values = form.getFieldsValue();
     let _item = _cacheItem || state.service.cacheItem;
@@ -89,7 +94,7 @@ var Info = (_, ref) => {
     state.service.cacheItem,
     useStartTime,
     useResource,
-    (_c = (_b = (_a = state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time
+    (_d = (_c = (_b = state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.service_time
   ]);
   const flexibleOption = (0, import_react.useMemo)(() => {
     return (0, import_utils4.getFlexibleOption)({
@@ -155,7 +160,7 @@ var Info = (_, ref) => {
   const onFinish = (values) => {
     var _a2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
-    if (!isSuccess) {
+    if (isShowTimeAndResource && !isSuccess) {
       return;
     }
     if (submitLock) {
@@ -225,7 +230,7 @@ var Info = (_, ref) => {
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     return cPrice !== oPrice;
-  }, [useTotal, (_e = (_d = state.service.cacheItem) == null ? void 0 : _d._extend) == null ? void 0 : _e.origin_total]);
+  }, [useTotal, (_f = (_e = state.service.cacheItem) == null ? void 0 : _e._extend) == null ? void 0 : _f.origin_total]);
   const getResources = () => {
     let res = (0, import_utils4.formatResources)({
       cacheItem: getCurrentCacheItem(),
@@ -288,18 +293,18 @@ var Info = (_, ref) => {
   }, [state.service.editModal, state.isBookingCreatePage]);
   (0, import_react.useEffect)(() => {
     getDiscount();
-  }, [useTotal, (_g = (_f = state.service.cacheItem) == null ? void 0 : _f._extend) == null ? void 0 : _g.origin_total]);
+  }, [useTotal, (_h = (_g = state.service.cacheItem) == null ? void 0 : _g._extend) == null ? void 0 : _h.origin_total]);
   const isDiscount = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     if (!((_a2 = state.service) == null ? void 0 : _a2.cacheItem)) {
       return false;
     }
     return useTotal != ((_c2 = (_b2 = state.service) == null ? void 0 : _b2.cacheItem) == null ? void 0 : _c2._extend.origin_total);
-  }, [useTotal, (_i = (_h = state.service) == null ? void 0 : _h.cacheItem) == null ? void 0 : _i._extend.origin_total]);
+  }, [useTotal, (_j = (_i = state.service) == null ? void 0 : _i.cacheItem) == null ? void 0 : _j._extend.origin_total]);
   const bundles = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
-  }, [(_m = (_l = (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.other) == null ? void 0 : _m.bundle]);
+  }, [(_n = (_m = (_l = (_k = state.service) == null ? void 0 : _k.cacheItem) == null ? void 0 : _l._extend) == null ? void 0 : _m.other) == null ? void 0 : _n.bundle]);
   const handleEdit = (e) => {
     var _a2, _b2, _c2, _d2, _e2;
     const item = state.service.cacheItem;
@@ -319,14 +324,16 @@ var Info = (_, ref) => {
         id: item.id,
         date: state.date.value.format("YYYY-MM-DD"),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: (0, import_utils6.isNormalProductByDurationSchedule)(item)
         },
         isOS: isSession,
         customer_id: (_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
         value: {
+          quantity: item._extend.quantity,
           ...item._extend.other,
           ...sessionValue
         }
@@ -346,6 +353,7 @@ var Info = (_, ref) => {
             ...item._extend,
             // 将当前表单的值覆盖进去
             ...values,
+            quantity: (e2 == null ? void 0 : e2.quantity) || (values == null ? void 0 : values.quantity) || 1,
             // 覆盖选择的规格和套餐
             other
           },
@@ -378,7 +386,8 @@ var Info = (_, ref) => {
         });
         form.setFieldsValue({
           total: _total,
-          capacity: (_a3 = cacheItem._extend) == null ? void 0 : _a3.capacity
+          capacity: (_a3 = cacheItem._extend) == null ? void 0 : _a3.capacity,
+          quantity: (e2 == null ? void 0 : e2.quantity) || (values == null ? void 0 : values.quantity) || 1
         });
       }
     });
@@ -406,15 +415,20 @@ var Info = (_, ref) => {
   const handleTotalChange = (number) => {
     isChangeTotal.current = true;
   };
-  console.log("state.service.value", state.service.value);
-  const SelectTime = (_n = window.BaseMaterials) == null ? void 0 : _n.SelectTime;
+  const isShowTimeAndResource = (0, import_react.useMemo)(() => {
+    if (state.renderType !== "eventBooking" && !isNormalProduct) {
+      return true;
+    }
+    return false;
+  }, [state.renderType, isNormalProduct]);
+  const SelectTime = (_o = window.BaseMaterials) == null ? void 0 : _o.SelectTime;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
       titleNoWrap: true,
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
-      open: state.service.editModal && !((_o = state.service.cacheItem) == null ? void 0 : _o.autoClose),
+      open: state.service.editModal && !((_p = state.service.cacheItem) == null ? void 0 : _p.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         dispatch({
@@ -427,7 +441,7 @@ var Info = (_, ref) => {
         });
       }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__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" }, ((_r = (_q = (_p = state.service) == null ? void 0 : _p.cacheItem) == null ? void 0 : _q._extend) == null ? void 0 : _r.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(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__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" }, ((_s = (_r = (_q = state.service) == null ? void 0 : _q.cacheItem) == null ? void 0 : _r._extend) == null ? void 0 : _s.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(
       import_collapsibleList.default,
       {
         style: { marginTop: bundles.length ? "8px" : 0 },
@@ -440,9 +454,9 @@ var Info = (_, ref) => {
         label: import_utils.locales.getText("pisell2.text.price"),
         name: "total",
         rules: [{ required: true }],
-        extra: useTotal !== ((_t = (_s = state.service.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.origin_total) && import_utils.locales.getText("page.booking.text.price-extra")(
+        extra: useTotal !== ((_u = (_t = state.service.cacheItem) == null ? void 0 : _t._extend) == null ? void 0 : _u.origin_total) && import_utils.locales.getText("page.booking.text.price-extra")(
           (0, import_utils.formatAmount)(
-            (_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total,
+            (_w = (_v = state.service.cacheItem) == null ? void 0 : _v._extend) == null ? void 0 : _w.origin_total,
             2,
             state.amountSymbol
           ),
@@ -458,8 +472,8 @@ var Info = (_, ref) => {
           prefix: state.amountSymbol,
           onChange: handleTotalChange,
           disabled: state.channelDisabledEdit,
-          originValue: ((_x = (_w = state.service.cacheItem) == null ? void 0 : _w._extend) == null ? void 0 : _x.origin_total) || 0,
-          placeholder: ((_z = (_y = state.service.cacheItem) == null ? void 0 : _y._extend) == null ? void 0 : _z.origin_total) || "0"
+          originValue: ((_y = (_x = state.service.cacheItem) == null ? void 0 : _x._extend) == null ? void 0 : _y.origin_total) || 0,
+          placeholder: ((_A = (_z = state.service.cacheItem) == null ? void 0 : _z._extend) == null ? void 0 : _A.origin_total) || "0"
         }
       )
     )), isReason ? /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(
@@ -469,7 +483,7 @@ var Info = (_, ref) => {
         name: "discount_reason"
       },
       /* @__PURE__ */ import_react.default.createElement(import_antd.Input.TextArea, { size: "large" })
-    )) : null, state.renderType !== "eventBooking" && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
+    )) : null, isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 12 }, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form.Item,
       {
         label: import_utils.locales.getText("pisell2.text.start_time"),
@@ -479,7 +493,7 @@ var Info = (_, ref) => {
       SelectTime ? /* @__PURE__ */ import_react.default.createElement(
         SelectTime,
         {
-          slice: (_D = (_C = (_B = (_A = state.bookingConfig) == null ? void 0 : _A.config) == null ? void 0 : _B.basic) == null ? void 0 : _C.service_time) == null ? void 0 : _D.value,
+          slice: (_E = (_D = (_C = (_B = state.bookingConfig) == null ? void 0 : _B.config) == null ? void 0 : _C.basic) == null ? void 0 : _D.service_time) == null ? void 0 : _E.value,
           timePickerProps: {
             style: { width: "100%" }
           },
@@ -512,7 +526,29 @@ var Info = (_, ref) => {
         state,
         cacheItem: state.service.cacheItem
       }
-    )), /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "quantity" }, /* @__PURE__ */ import_react.default.createElement(import_antd.InputNumber, null))))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit-footer" }, /* @__PURE__ */ import_react.default.createElement(
+    )), /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "quantity" }, /* @__PURE__ */ import_react.default.createElement(import_antd.InputNumber, null))), isNormalProduct && /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Form.Item,
+      {
+        label: import_utils.locales.getText("pisell2.text.quantity"),
+        name: "quantity",
+        rules: [{ required: true }]
+      },
+      /* @__PURE__ */ import_react.default.createElement(
+        import_antd.InputNumber,
+        {
+          size: "large",
+          style: { width: "100%" },
+          min: 1,
+          max: 999999,
+          formatter: (value) => {
+            if (value !== void 0) {
+              return Math.floor(value);
+            }
+            return value;
+          }
+        }
+      )
+    )))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit-footer" }, /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "pisell-lowcode__booking-service-delete-wrap",
@@ -524,7 +560,7 @@ var Info = (_, ref) => {
       {
         type: "primary",
         className: "pisell-lowcode__booking-service-body-edit-footer-apple",
-        disabled: !((_E = state.service.resourcesOrigin) == null ? void 0 : _E.length),
+        disabled: !((_F = state.service.resourcesOrigin) == null ? void 0 : _F.length),
         onClick: () => {
           form.submit();
         }