@pisell/private-materials 6.2.32 → 6.3.2

package/es/components/booking/info/hooks/useInfoHolder.js

@@ -10,11 +10,9 @@ import useHolderConfig from "./useHolderConfig";
 import { isOpenAddTime } from "../utils";
 import useGetHolderList from "./useGetHolderList";
 import { getProductExtend } from "../../info2/service/addService/utils";
-import { getIsNoSpecAndPackage } from "../../info2/utilsByBooking";
 var useInfoHolder = function useInfoHolder(state, dispatch) {
   var _state$client, _state$bookingConfig2;
   var detailRef = useRef();
-  var editNormalServiceRef = useRef(null);
   var _useHolderConfig = useHolderConfig(state),
     holder = _useHolderConfig.holder,
     isFormSubject = _useHolderConfig.isFormSubject,
@@ -32,17 +30,19 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
     };
   }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.information_tab]);
   var showAddTimeModal = useMemo(function () {
-    return isOpenAddTime(state);
+    return isOpenAddTime(state) && !state.isBookingTicket2;
   }, [state, appointment_card.quick_time]);
   var handleEdit = useMemoizedFn(function (cacheItem, type) {
-    var isNoSpecAndPackage = getIsNoSpecAndPackage(cacheItem);
-    if (isNoSpecAndPackage) {
-      var _editNormalServiceRef;
-      (_editNormalServiceRef = editNormalServiceRef.current) === null || _editNormalServiceRef === void 0 || _editNormalServiceRef.init(cacheItem);
-    } else {
-      var _detailRef$current, _detailRef$current$in;
-      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
-    }
+    var _detailRef$current, _detailRef$current$in;
+    // console.timeEnd('handleChange');
+    console.time('handleEdit');
+    console.log(performance.now() - window.pp1, '打开商品4');
+    (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
+    // setTimeout(() => {
+    //   console.log(performance.now() - window.pp1, '打开商品5');
+    //   console.timeEnd('handleEdit')
+    //   detailRef.current?.init?.(cacheItem, false, type === 'edit_product');
+    // }, );
   });
   var dispatchService = function dispatchService(type, payload) {
     dispatch({
@@ -70,8 +70,7 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
     handleEdit: handleEdit,
     dispatchService: dispatchService,
     handleAction: handleAction,
-    showAddTimeModal: showAddTimeModal,
-    editNormalServiceRef: editNormalServiceRef
+    showAddTimeModal: showAddTimeModal
   };
 };
 export default useInfoHolder;

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

@@ -4,22 +4,6 @@
   .booking-info {
     padding-bottom: 16px;
 
-    .booking-info-client-line {
-      display: flex;
-      flex-direction: row;
-      gap: 10px;
-
-      .booking-info-client-line-code {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 64px;
-        height: 64px;
-        border-radius: 8px;
-        background: #5d3f9f;
-        cursor: pointer;
-      }
-    }
   }
 
   // &::before {
@@ -38,11 +22,11 @@
   }
 }
 .create-booking-page-info-wrap-create {
-  background: var(--Success-50, #ecfdf3);
+  background: var(--Success-50, #ECFDF3);
 }
 .create-booking-page-info-wrap {
   position: initial !important;
-  padding: 0 10px !important;
+  padding: 0 16px !important;
   .booking-info-create-new {
     margin-top: 10px;
     color: var(--Base-Black, #000);
@@ -50,4 +34,4 @@
     font-weight: 600;
     line-height: 32px;
   }
-}
+}

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

@@ -9,6 +9,7 @@ import React, { useContext, useEffect, useMemo } from 'react';
 import Footer from "../components/footer";
 import TabPane from "../components/tabPane";
 import localeTexts from "../locales";
+import AddNote from "../notes/addNote";
 import Client from "./client";
 import DateCom from "./date";
 import Header from "./header";
@@ -36,7 +37,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state3, _context$appHelper4, _modal$state4;
+  var _modal$state2, _modal$state5, _context$appHelper4, _modal$state6;
   var style = props.style,
     globalState = props.globalState,
     _props$modules = props.modules,
@@ -108,6 +109,7 @@ var Info = Provider(function (props) {
     });
   }, [globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, modal.state, modal.dispatch, globalState === null || globalState === void 0 ? void 0 : globalState.renderType]);
   var notes = useMemo(function () {
+    var _modal$state4;
     if (!modules.note) {
       return null;
     }
@@ -117,15 +119,17 @@ var Info = Provider(function (props) {
 
     // 跨日预约一直显示备注
     if (isDayBooking(globalState)) {
-      return (
-        // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
-        null
-      );
+      var _modal$state3;
+      return /*#__PURE__*/React.createElement(AddNote, {
+        value: (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote,
+        onChange: addNote
+      });
     }
-    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' || globalState.isBookingCreatePage ? /*#__PURE__*/React.createElement(Notes, null) : null :
-    // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
-    null;
-  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote]);
+    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' || globalState.isBookingCreatePage ? /*#__PURE__*/React.createElement(Notes, null) : null : /*#__PURE__*/React.createElement(AddNote, {
+      value: (_modal$state4 = modal.state) === null || _modal$state4 === void 0 || (_modal$state4 = _modal$state4.notes) === null || _modal$state4 === void 0 ? void 0 : _modal$state4.orderNote,
+      onChange: addNote
+    });
+  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state5 = modal.state) === null || _modal$state5 === void 0 || (_modal$state5 = _modal$state5.notes) === null || _modal$state5 === void 0 ? void 0 : _modal$state5.orderNote]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
     style: _objectSpread(_objectSpread({}, style), {}, {
       height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
@@ -136,13 +140,10 @@ var Info = Provider(function (props) {
       dispatch: modal.dispatch,
       source: "info"
     }),
-    bodyClassName: classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode && !isTerminalDayBooking(modal.state))),
-    state: modal.state,
-    dispatch: modal.dispatch,
-    source: "info"
+    bodyClassName: classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode && !isTerminalDayBooking(modal.state)))
   }, /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state4 = modal.state) !== null && _modal$state4 !== void 0 && _modal$state4.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state6 = modal.state) !== null && _modal$state6 !== void 0 && _modal$state6.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,

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

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

package/es/components/booking/info/pet/index.less

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

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

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

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

@@ -81,7 +81,6 @@ var Lists = function Lists(_ref) {
    * @Date: 2024-12-09 16:07
    */
   var productParams = useMemo(function () {
-    var _state$bookingConfig;
     return {
       hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
       isShowNote: isEventBooking(state),
@@ -93,10 +92,9 @@ var Lists = function Lists(_ref) {
       isShowChangeHolder: isShowChangeHolder,
       isShowChangeResource: true,
       isShowAddHolderButton: true,
-      isShowEditProduct: !state.isBookingCreatePage,
-      productCardStyleConfig: (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.cart_settings_tab
+      isShowEditProduct: !state.isBookingCreatePage
     };
-  }, [state === null || state === void 0 ? void 0 : state.bookingId, state === null || state === void 0 ? void 0 : state.disabledEdit, isShowChangeHolder, state.isBookingCreatePage, state.bookingConfig]);
+  }, [state === null || state === void 0 ? void 0 : state.bookingId, state === null || state === void 0 ? void 0 : state.disabledEdit, isShowChangeHolder, state.isBookingCreatePage]);
   var products = useMemo(function () {
     var _state$service;
     console.time('products');
@@ -111,7 +109,6 @@ var Lists = function Lists(_ref) {
         state: state
       }
     }, /*#__PURE__*/React.createElement(ShoppingCart, {
-      scenario: state.isBookingTicket2 ? 'booking2' : undefined,
       isParallelResource: isParallelResource,
       onAction: onAction,
       onChange: handleChange,

package/es/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/es/components/booking/info/service/addService/utils.d.ts

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

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

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

package/es/components/booking/info/service/serviceItem/index.js

@@ -39,7 +39,7 @@ var ServiceItem = function ServiceItem(_ref) {
     icon: /*#__PURE__*/React.createElement(Iconfont, {
       type: "pisell2-trash-01"
     })
-  })), d.id || d.isCustomItem ? /*#__PURE__*/React.createElement("div", {
+  })), d.id ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-title"
   }, d.title) : null, d._extend ? /*#__PURE__*/React.createElement(React.Fragment, null, state.renderType !== 'eventBooking' && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-date"
@@ -59,7 +59,7 @@ var ServiceItem = function ServiceItem(_ref) {
     renderItem: function renderItem(item) {
       return renderBundles(item, state.amountSymbol);
     }
-  }) : null, d.id || d.isCustomItem ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }) : null, d.id ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-price-wrap"
   }, /*#__PURE__*/React.createElement("span", {
     className: "pisell-lowcode__booking-service-item-price"

package/es/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/es/components/booking/info/service2/utils.d.ts

@@ -58,7 +58,6 @@ export declare const getIsSubjectRequire: (state: any) => boolean;
 export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
 export declare const isAllNormalProduct: (items: any[]) => boolean;
 export declare const isAllNormalProductByState: (state: any) => boolean;
-export declare const genRowKey: (key: string) => string;
 /**
  * @title: 格式化商品数据
  * @description:
@@ -72,7 +71,6 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     id: any;
     _id: any;
     name: any;
-    title: any;
     price: any;
     total: number;
     origin_total: number;
@@ -93,8 +91,6 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     end_date: any;
     holder_id: any;
     isNormalProduct: boolean;
-    isCustomItem: any;
-    vouchersApplicable: any;
     locale: any;
     symbol: any;
     relation_products: any;
@@ -248,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/es/components/booking/info/service2/utils.js

@@ -365,15 +365,6 @@ export var updateServices = function updateServices(state, currentItem, type, ot
     products = handleChangeResource(products, currentItem, other, state);
     return products;
   }
-  if (type === 'num') {
-    return products.map(function (product) {
-      if (product._id === currentItem._id) {
-        product._extend.quantity = other.num;
-        return product;
-      }
-      return product;
-    });
-  }
 
   // 更新商品的holder_id
   if (type === 'update_holders') {
@@ -438,7 +429,6 @@ var formatBundle = function formatBundle(bundle) {
     return {
       id: item === null || item === void 0 ? void 0 : item.id,
       title: item === null || item === void 0 ? void 0 : item.title,
-      cover: item === null || item === void 0 ? void 0 : item.cover,
       num: item === null || item === void 0 ? void 0 : item.num,
       price: item === null || item === void 0 ? void 0 : item.price,
       total: item === null || item === void 0 ? void 0 : item.price,
@@ -541,7 +531,7 @@ export var getIsSubjectRequire = function getIsSubjectRequire(state) {
 // 非预约商品 通过时长和日程判断是否是普通商品
 export var isNormalProductByDurationSchedule = function isNormalProductByDurationSchedule(item) {
   var _item$schedules, _item$scheduleIds;
-  return !(item !== null && item !== void 0 && item.duration) && !(item !== null && item !== void 0 && (_item$schedules = item.schedules) !== null && _item$schedules !== void 0 && _item$schedules.length) && !(item !== null && item !== void 0 && (_item$scheduleIds = item['schedule.ids']) !== null && _item$scheduleIds !== void 0 && _item$scheduleIds.length);
+  return !(item !== null && item !== void 0 && item.duration) && !(item !== null && item !== void 0 && (_item$schedules = item.schedules) !== null && _item$schedules !== void 0 && _item$schedules.length) && !((_item$scheduleIds = item['schedule.ids']) !== null && _item$scheduleIds !== void 0 && _item$scheduleIds.length);
 };
 
 // 是否全部是普通商品
@@ -553,9 +543,6 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
 export var isAllNormalProductByState = function isAllNormalProductByState(state) {
   return isAllNormalProduct(state.service.value);
 };
-export var genRowKey = function genRowKey(key) {
-  return "rowKey-".concat(key);
-};
 var getGeneralParams = function getGeneralParams(item, state, isParallelResource) {
   var _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9;
   var pet = state.pet,
@@ -634,7 +621,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     holder_id: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id,
     start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate : "",
     end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date) : "",
-    rowKey: genRowKey(item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 || (_item$_extend9 = _item$_extend9.other) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.rowKey)
+    rowKey: "rowKey-".concat(item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 || (_item$_extend9 = _item$_extend9.other) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.rowKey)
   }, parallelResourceOtherParams);
 };
 var calcAddTimeTotalPrice = function calcAddTimeTotalPrice(total, addTimeProducts) {
@@ -676,8 +663,6 @@ export var formatProducts = function formatProducts(lists, state) {
       id: item === null || item === void 0 ? void 0 : item.id,
       _id: item === null || item === void 0 ? void 0 : item._id,
       name: item === null || item === void 0 ? void 0 : item.title,
-      title: item === null || item === void 0 ? void 0 : item.title,
-      // 购物车显示需要 title 字段
       price: item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price,
       total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.total, item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.relation_details),
       origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.origin_total, item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.relation_details),
@@ -698,10 +683,6 @@ export var formatProducts = function formatProducts(lists, state) {
       end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date : '',
       holder_id: (item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id) || 0,
       isNormalProduct: isNormalProduct,
-      isCustomItem: item === null || item === void 0 ? void 0 : item.isCustomItem,
-      // 添加自定义商品标识
-      vouchersApplicable: item === null || item === void 0 ? void 0 : item.vouchersApplicable,
-      // 是否适用优惠券/折扣
       locale: state.locale,
       symbol: state.amountSymbol,
       relation_products: (item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.relation_details) || [],

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

@@ -15,6 +15,7 @@ import Pet from "../info/pet";
 import DateCom from "../info/date";
 import Footer from "../components/footer";
 import TabPane from "../components/tabPane";
+import AddNote from "../notes/addNote";
 import Header from "../info/header";
 import localeTexts from "../locales";
 import { locales } from '@pisell/utils';
@@ -33,8 +34,6 @@ import classNames from 'classnames';
 import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 import { getLocale } from "../../../utils/locales";
 import { useDebounceEffect } from 'ahooks';
-import CartClientCard from "./cartClientCard";
-import { Iconfont } from '@pisell/materials';
 var defaultModules = {
   client: 1,
   date: 1,
@@ -44,7 +43,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state3, _modal$state5, _context$appHelper4, _modal$state6;
+  var _modal$state2, _modal$state4, _modal$state6, _context$appHelper4, _modal$state7;
   // return <Payments {...props} />;
   var style = props.style,
     globalState = props.globalState,
@@ -119,20 +118,22 @@ var Info = Provider(function (props) {
     });
   }, [globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, modal.state, modal.dispatch, globalState === null || globalState === void 0 ? void 0 : globalState.renderType]);
   var notes = useMemo(function () {
+    var _modal$state3;
     if (!modules.note) {
       return null;
     }
-    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' ? /*#__PURE__*/React.createElement(Notes, null) : null :
-    // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
-    null;
-  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote]);
+    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' ? /*#__PURE__*/React.createElement(Notes, null) : null : /*#__PURE__*/React.createElement(AddNote, {
+      value: (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote,
+      onChange: addNote
+    });
+  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state4 = modal.state) === null || _modal$state4 === void 0 || (_modal$state4 = _modal$state4.notes) === null || _modal$state4 === void 0 ? void 0 : _modal$state4.orderNote]);
   var currentDate = useMemo(function () {
-    var _modal$state4;
-    if ((_modal$state4 = modal.state) !== null && _modal$state4 !== void 0 && (_modal$state4 = _modal$state4.date) !== null && _modal$state4 !== void 0 && _modal$state4.value) {
+    var _modal$state5;
+    if ((_modal$state5 = modal.state) !== null && _modal$state5 !== void 0 && (_modal$state5 = _modal$state5.date) !== null && _modal$state5 !== void 0 && _modal$state5.value) {
       return modal.state.date.value.format('YYYY-MM-DD');
     }
     return null;
-  }, [(_modal$state5 = modal.state) === null || _modal$state5 === void 0 || (_modal$state5 = _modal$state5.date) === null || _modal$state5 === void 0 || (_modal$state5 = _modal$state5.value) === null || _modal$state5 === void 0 ? void 0 : _modal$state5.format('YYYY-MM-DD')]);
+  }, [(_modal$state6 = modal.state) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.date) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.value) === null || _modal$state6 === void 0 ? void 0 : _modal$state6.format('YYYY-MM-DD')]);
 
   /**
    * @title: 获取资源列表数据
@@ -265,42 +266,19 @@ var Info = Provider(function (props) {
         })
       });
     }
-  }), !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
-    style: {
-      height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
-    },
+  }), !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
+    style: style,
     header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {
       state: modal.state,
       dispatch: modal.dispatch,
       source: "info"
-    }),
-    bodyClassName: classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode)),
-    state: modal.state,
-    dispatch: modal.dispatch,
-    source: "info"
-  }, /*#__PURE__*/React.createElement("div", {
+    })
+  }, "style", {
+    height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
+  }), "bodyClassName", classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode))), /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, createHeader, /*#__PURE__*/React.createElement("div", {
-    className: "booking-info-client-line"
-  }, modules.client ? globalState !== null && globalState !== void 0 && globalState.isBookingTicket2 ? /*#__PURE__*/React.createElement("div", {
-    style: {
-      flex: 1,
-      overflow: 'hidden'
-    }
-  }, /*#__PURE__*/React.createElement(CartClientCard, null)) : /*#__PURE__*/React.createElement(Client, null) : null, globalState !== null && globalState !== void 0 && globalState.isBookingTicket2 ? /*#__PURE__*/React.createElement("div", {
-    className: "booking-info-client-line-code",
-    onClick: function onClick() {
-      var _globalState$onQrCode;
-      globalState === null || globalState === void 0 || (_globalState$onQrCode = globalState.onQrCodeClick) === null || _globalState$onQrCode === void 0 || _globalState$onQrCode.call(globalState);
-    }
-  }, /*#__PURE__*/React.createElement(Iconfont, {
-    type: "pisell2-a-qr-code-02",
-    style: {
-      color: '#fff',
-      fontSize: 42
-    }
-  })) : null), modules.holder && !((_modal$state6 = modal.state) !== null && _modal$state6 !== void 0 && _modal$state6.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,

package/es/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/es/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/es/components/booking/info2/service/addService/utils.d.ts

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

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

@@ -584,7 +584,8 @@ export var getProductExtend = function getProductExtend(_ref11) {
         state: state
       });
       if (getDuration(_cacheItem === null || _cacheItem === void 0 ? void 0 : _cacheItem.duration) === 'flexible') {
-        _cacheItem._extend.duration = _cacheItem._data.timeObj.durationSlicesBasedOnTime[0].value;
+        var _cacheItem$_data$time;
+        _cacheItem._extend.duration = (_cacheItem$_data$time = _cacheItem._data.timeObj) === null || _cacheItem$_data$time === void 0 || (_cacheItem$_data$time = _cacheItem$_data$time.durationSlicesBasedOnTime) === null || _cacheItem$_data$time === void 0 || (_cacheItem$_data$time = _cacheItem$_data$time[0]) === null || _cacheItem$_data$time === void 0 ? void 0 : _cacheItem$_data$time.value;
 
         // 计算服务的开始和结束时间
         var _getServiceTimes = getServiceTimes({

package/es/components/booking/info2/service/addTimeModal/index.js

@@ -555,8 +555,7 @@ var AddTimeModal = function AddTimeModal() {
           case 22:
             // 回调关闭弹窗
             state === null || state === void 0 || state.action('init');
-            state === null || state === void 0 || state.callback({}, "save");
-          case 24:
+          case 23:
           case "end":
             return _context5.stop();
         }

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

@@ -30,7 +30,7 @@ import { renderBundles } from "../../../components/collapsibleList/utils";
 import { useUpdateEffect, useMemoizedFn, useDebounceFn } from 'ahooks';
 // import SelectTime from "../../../../../../../materials/src/components/select-time";
 import { getServiceTimes, deleteCacheParams, getProductTotalPrice, isSessionProduct } from "../../../utils";
-import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
+import { getErrorList } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
 import { PisellAdjustPriceInputNumber } from '@pisell/materials';
 import { editSessionProduct } from "../../../info/utils";
@@ -581,7 +581,7 @@ var Info = function Info(_, ref) {
     return false;
   }, [state.renderType, isNormalProduct]);
   var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
-  var isNoSpecAndPackage = getIsNoSpecAndPackage(state.service.cacheItem);
+  console.log(isShowTimeAndResource, 'isShowTimeAndResource');
   var productName = useMemo(function () {
     var _state$service7;
     return /*#__PURE__*/React.createElement(Col, {
@@ -754,7 +754,7 @@ var Info = function Info(_, ref) {
         form.submit();
       }
     }, locales.getText('pisell2.text.apply')));
-  }, [(_state$service$resour2 = state.service.resourcesOrigin) === null || _state$service$resour2 === void 0 ? void 0 : _state$service$resour2.length]);
+  }, [(_state$service$resour2 = state.service.resourcesOrigin) === null || _state$service$resour2 === void 0 ? void 0 : _state$service$resour2.length, isNormalProduct]);
   console.log('render edit');
   console.log(state.service.editModal && !((_state$service$cacheI13 = state.service.cacheItem) !== null && _state$service$cacheI13 !== void 0 && _state$service$cacheI13.autoClose), performance.now() - window.pp1, '打开商品1');
   var _useState = useState(false),
@@ -777,7 +777,7 @@ var Info = function Info(_, ref) {
     zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
     mask: state.drawerMask,
-    open: !isNoSpecAndPackage && state.service.editModal && !((_state$service$cacheI14 = state.service.cacheItem) !== null && _state$service$cacheI14 !== void 0 && _state$service$cacheI14.autoClose),
+    open: state.service.editModal && !((_state$service$cacheI14 = state.service.cacheItem) !== null && _state$service$cacheI14 !== void 0 && _state$service$cacheI14.autoClose),
     title: locales.getText('pisell2.text.edit-service'),
     onClose: function onClose() {
       dispatch({

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

@@ -6,7 +6,7 @@ import "../../info/service/index.less";
 import AddTimeModal from "./addTimeModal";
 import useInfoHolder from "../../info/hooks/useInfoHolder";
 import Lists from "../../info/service/Lists";
-import EditNormalService from "./editNormalService";
+import useClearCart from "../../hooks/useClearCart";
 import useQuotation from "../../hooks/useQuotation";
 var Service = function Service() {
   var _useContext = useContext(Context),
@@ -17,21 +17,18 @@ var Service = function Service() {
     handleEdit = _useInfoHolder.handleEdit,
     handleAction = _useInfoHolder.handleAction,
     dispatchService = _useInfoHolder.dispatchService,
-    showAddTimeModal = _useInfoHolder.showAddTimeModal,
-    editNormalServiceRef = _useInfoHolder.editNormalServiceRef;
+    showAddTimeModal = _useInfoHolder.showAddTimeModal;
   useEffect(function () {
     document.body.id = 'body';
   }, []);
-
-  // const clearCart = useClearCart(state, dispatch);
-
+  var clearCart = useClearCart(state, dispatch);
   var _useQuotation = useQuotation(state, dispatch),
     dom = _useQuotation.dom;
   var renderMemo = useMemo(function () {
     console.log('render info22222');
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-service-wrap"
-    }, /*#__PURE__*/React.createElement(Lists, {
+    }, clearCart, /*#__PURE__*/React.createElement(Lists, {
       isParallelResource: true,
       onEdit: handleEdit,
       onAction: handleAction,
@@ -42,10 +39,8 @@ var Service = function Service() {
       onEdit: handleEdit
     }) : null), /*#__PURE__*/React.createElement(EditService, {
       ref: detailRef
-    }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), /*#__PURE__*/React.createElement(EditNormalService, {
-      ref: editNormalServiceRef
-    }), dom);
-  }, [dom, showAddTimeModal]);
+    }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), dom);
+  }, [clearCart, dom, showAddTimeModal, clearCart]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, renderMemo);
 };
 export default /*#__PURE__*/React.memo(Service);

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

@@ -139,7 +139,7 @@ var ServiceItem = function ServiceItem(_ref) {
     icon: /*#__PURE__*/React.createElement(Iconfont, {
       type: "pisell2-trash-01"
     })
-  })), d.id || d.isCustomItem ? /*#__PURE__*/React.createElement("div", {
+  })), d.id ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-title"
   }, d.title) : null, d._extend && state.renderType !== 'eventBooking' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-date"
@@ -149,7 +149,7 @@ var ServiceItem = function ServiceItem(_ref) {
     renderItem: function renderItem(item) {
       return renderBundles(item, state.amountSymbol);
     }
-  }) : null, d.id || d.isCustomItem ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }) : null, d.id ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-price-wrap"
   }, /*#__PURE__*/React.createElement("span", {
     className: "pisell-lowcode__booking-service-item-price"

package/es/components/booking/info2/service/serviceList/index.d.ts

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