@pisell/private-materials 6.3.14 → 6.4.1

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

@@ -70,7 +70,6 @@ var AddTimeModal = function AddTimeModal() {
     _useState10 = _slicedToArray(_useState9, 2),
     renderList = _useState10[0],
     setRenderList = _useState10[1];
-  console.log(renderList, 'renderListrenderList');
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     interaction = _context$appHelper$ut.interaction;
@@ -122,7 +121,6 @@ var AddTimeModal = function AddTimeModal() {
       return d.id == currentProductId;
     });
   }, [renderList, currentProductId]);
-  console.log('renderList', renderList);
   var currentTimeItem = useMemo(function () {
     var _currentProduct$times;
     return (currentProduct === null || currentProduct === void 0 || (_currentProduct$times = currentProduct.times) === null || _currentProduct$times === void 0 ? void 0 : _currentProduct$times.find(function (d) {
@@ -500,7 +498,7 @@ var AddTimeModal = function AddTimeModal() {
   }();
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4;
+      var _context$appHelper2, _context$appHelper2$g, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4;
       var loadingType,
         api,
         _args5 = arguments;
@@ -522,7 +520,7 @@ var AddTimeModal = function AddTimeModal() {
           case 5:
             loadingRef.current = true;
             setLoading(loadingType);
-            api = isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id, state.renderType, (_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.businessUtils) ? saveAddTimeProduct2 : saveAddTimeProduct;
+            api = isBooking4Shop(((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getData) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2, 'shop_id')) || ((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id), state.renderType, (_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.businessUtils) ? saveAddTimeProduct2 : saveAddTimeProduct;
             _context5.prev = 8;
             _context5.next = 11;
             return api({
@@ -554,7 +552,8 @@ var AddTimeModal = function AddTimeModal() {
           case 22:
             // 回调关闭弹窗
             state === null || state === void 0 || state.action('init');
-          case 23:
+            state === null || state === void 0 || state.callback({}, 'save');
+          case 24:
           case "end":
             return _context5.stop();
         }
@@ -703,4 +702,4 @@ var AddTimeModal = function AddTimeModal() {
     className: ""
   })));
 };
-export default AddTimeModal;
+export default /*#__PURE__*/React.memo(AddTimeModal);

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

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const EditNormalService: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
+export default EditNormalService;

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

@@ -0,0 +1,67 @@
+import React, { forwardRef, useContext, useImperativeHandle, useRef } from 'react';
+import { useMemoizedFn } from 'ahooks';
+import SkuDetailModal from "../../../../../pro/skuDetailModal";
+import { Context } from "../../../info/model";
+var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _useContext = useContext(Context),
+    state = _useContext.state,
+    dispatch = _useContext.dispatch;
+  var modalRef = useRef(null);
+  useImperativeHandle(ref, function () {
+    return {
+      init: function init(cacheItem) {
+        modalRef.current.open(cacheItem);
+      }
+    };
+  });
+  var handleRemove = useMemoizedFn(function (productData) {
+    var _ref, _state$service;
+    var newProducts = (_ref = (state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []) === null || _ref === void 0 ? void 0 : _ref.filter(function (item) {
+      return item._id !== productData._id;
+    });
+    dispatch({
+      type: 'setService',
+      payload: {
+        editModal: false,
+        value: newProducts,
+        edit: true,
+        cacheItem: null
+      }
+    });
+  });
+  var handleConfirm = useMemoizedFn(function (data) {
+    var _ref2, _state$service2;
+    var newProducts = (_ref2 = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (item) {
+      if (item._id == data._id) {
+        return data;
+      }
+      return item;
+    });
+    dispatch({
+      type: 'setService',
+      payload: {
+        editModal: false,
+        value: newProducts,
+        edit: true,
+        cacheItem: null
+      }
+    });
+  });
+  var handleClose = useMemoizedFn(function () {
+    dispatch({
+      type: 'setService',
+      payload: {
+        editModal: false,
+        cacheItem: null,
+        changeService: false
+      }
+    });
+  });
+  return /*#__PURE__*/React.createElement(SkuDetailModal, {
+    onClose: handleClose,
+    onConfirm: handleConfirm,
+    onRemove: handleRemove,
+    ref: modalRef
+  });
+});
+export default EditNormalService;

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import './index.less';
+import './index.less';
 export interface EditServiceRef {
     init: (cacheItem?: any) => void;
 }

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

@@ -15,11 +15,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useContext, useEffect, useMemo, useState, useImperativeHandle, forwardRef, useRef } from 'react';
 import Delete_wght300_24px from '@pisell/icon/es/Delete_wght300_24px';
+import { formatAmount, locales } from '@pisell/utils';
+import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import Drawer from "../../../components/drawer";
 import { Context } from "../../../info/model";
-import { formatAmount, locales } from '@pisell/utils';
 import Duration from "../../../materiels/duration";
 import Capacity from "./Capacity";
 import Resources from "./Resources";
@@ -27,18 +27,20 @@ import { Input, Button, Row, Col, Form, InputNumber } from 'antd';
 import "./index.less";
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
+import "./index.less";
 import { useUpdateEffect, useMemoizedFn, useDebounceFn } from 'ahooks';
 // import SelectTime from "../../../../../../../materials/src/components/select-time";
-import { getServiceTimes, deleteCacheParams, getProductTotalPrice, isSessionProduct } from "../../../utils";
-import { getErrorList } from "../../utilsByBooking";
-import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { PisellAdjustPriceInputNumber } from '@pisell/materials';
-import { editSessionProduct } from "../../../info/utils";
-import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
+import { PisellAdjustPriceInputNumber, ConfigProvider } from '@pisell/materials';
 import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
+import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
+import { editSessionProduct } from "../../../info/utils";
+import { deleteCacheParams, getProductTotalPrice, getServiceTimes, isSessionProduct } from "../../../utils";
+import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
+import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
+import NoteModal from "../../../../../plus/noteModal";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI10, _state$bookingConfig5, _state$service$cacheI11, _state$service$cacheI12, _state$service9, _state$service$resour2, _state$service$cacheI13, _state$service$cacheI14;
+  var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI5, _state$service$cacheI6, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI11, _state$bookingConfig5, _state$service$cacheI12, _state$service$cacheI13, _state$service9, _state$service$resour2, _state$service$cacheI14, _state$service$cacheI15;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -46,11 +48,28 @@ var Info = function Info(_, ref) {
   var useResource = Form.useWatch('resource', form);
   var useStartTime = Form.useWatch('start_time', form);
   var useDuration = Form.useWatch('duration', form);
+  var useNote = Form.useWatch('note', form);
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
   var resourcesRef = useRef(null);
   var isChangeTotal = useRef(false);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    noteModalOpen = _useState2[0],
+    setNoteModalOpen = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    open = _useState4[0],
+    setOpen = _useState4[1];
+  useEffect(function () {
+    window.openBookingEditModal = function () {
+      setOpen(true);
+    };
+    window.closeBookingEditModal = function () {
+      setOpen(false);
+    };
+  }, []);
   var isNormalProduct = useMemo(function () {
     var _state$service, _state$service2, _state$service3;
     if (!(state !== null && state !== void 0 && (_state$service = state.service) !== null && _state$service !== void 0 && _state$service.cacheItem)) {
@@ -140,6 +159,7 @@ var Info = function Info(_, ref) {
 
   // 由于灵活时长的结束时间随时变动, 这里发现如果当前选择的值没有在列表内,则选择最新的灵活时长值
   useEffect(function () {
+    console.log('执行次数:于灵活时长的结束时间随');
     try {
       if (useDuration.indexOf('flexible_') == 0) {
         if (flexibleOption) {
@@ -159,7 +179,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 13:59
    */
   var handleDeleteProduct = useMemoizedFn(function () {
-    var _state$service$cacheI;
+    var _state$service$cacheI, _window$closeBookingE, _window;
     if (state.channelDisabledEdit) {
       return;
     }
@@ -168,6 +188,7 @@ var Info = function Info(_, ref) {
     _list = _list.filter(function (d) {
       return d._id !== _id;
     });
+    (_window$closeBookingE = (_window = window).closeBookingEditModal) === null || _window$closeBookingE === void 0 || _window$closeBookingE.call(_window);
     dispatch({
       type: 'setService',
       payload: {
@@ -218,7 +239,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values) {
-    var _resourcesRef$current, _item$_extend;
+    var _resourcesRef$current, _item$_extend, _state$service$cacheI3, _window$closeBookingE2, _window2;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -277,6 +298,14 @@ var Info = function Info(_, ref) {
     deleteCacheParams();
     console.log('_onFinish', _list);
     form.resetFields();
+    if (!!((_state$service$cacheI3 = state.service.cacheItem) !== null && _state$service$cacheI3 !== void 0 && _state$service$cacheI3.new)) {
+      window.dispatchEvent(new CustomEvent('onAddNewService', {
+        detail: {
+          cacheItem: _objectSpread({}, state.service.cacheItem)
+        }
+      }));
+    }
+    (_window$closeBookingE2 = (_window2 = window).closeBookingEditModal) === null || _window$closeBookingE2 === void 0 || _window$closeBookingE2.call(_window2);
     dispatch({
       type: 'setService',
       payload: {
@@ -350,12 +379,12 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:06
    */
   var isReason = useMemo(function () {
-    var _state$service$cacheI3;
-    var oPrice = Number(((_state$service$cacheI3 = state.service.cacheItem) === null || _state$service$cacheI3 === void 0 ? void 0 : _state$service$cacheI3._extend.origin_total) || 0);
+    var _state$service$cacheI4;
+    var oPrice = Number(((_state$service$cacheI4 = state.service.cacheItem) === null || _state$service$cacheI4 === void 0 ? void 0 : _state$service$cacheI4._extend.origin_total) || 0);
     var cPrice = Number(useTotal || 0);
     // 原价 !== 现价
     return cPrice !== oPrice;
-  }, [useTotal, (_state$service$cacheI4 = state.service.cacheItem) === null || _state$service$cacheI4 === void 0 || (_state$service$cacheI4 = _state$service$cacheI4._extend) === null || _state$service$cacheI4 === void 0 ? void 0 : _state$service$cacheI4.origin_total]);
+  }, [useTotal, (_state$service$cacheI5 = state.service.cacheItem) === null || _state$service$cacheI5 === void 0 || (_state$service$cacheI5 = _state$service$cacheI5._extend) === null || _state$service$cacheI5 === void 0 ? void 0 : _state$service$cacheI5.origin_total]);
   var getResources = function getResources() {
     var res = formatResources({
       cacheItem: getCurrentCacheItem(),
@@ -429,7 +458,7 @@ var Info = function Info(_, ref) {
    */
   useEffect(function () {
     getDiscount();
-  }, [useTotal, (_state$service$cacheI5 = state.service.cacheItem) === null || _state$service$cacheI5 === void 0 || (_state$service$cacheI5 = _state$service$cacheI5._extend) === null || _state$service$cacheI5 === void 0 ? void 0 : _state$service$cacheI5.origin_total]);
+  }, [useTotal, (_state$service$cacheI6 = state.service.cacheItem) === null || _state$service$cacheI6 === void 0 || (_state$service$cacheI6 = _state$service$cacheI6._extend) === null || _state$service$cacheI6 === void 0 ? void 0 : _state$service$cacheI6.origin_total]);
   var bundles = useMemo(function () {
     var _state$service5;
     return ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 || (_state$service5 = _state$service5._extend) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.other) === null || _state$service5 === void 0 ? void 0 : _state$service5.bundle) || [];
@@ -550,10 +579,12 @@ var Info = function Info(_, ref) {
    * @Date: 2024-08-28 17:10
    */
   var handleChange = useMemoizedFn(function (e) {
+    var _window$closeBookingE3, _window3;
     if (state.channelDisabledEdit) {
       return;
     }
     form.resetFields();
+    (_window$closeBookingE3 = (_window3 = window).closeBookingEditModal) === null || _window$closeBookingE3 === void 0 || _window$closeBookingE3.call(_window3);
     dispatch({
       type: 'setService',
       payload: {
@@ -581,6 +612,22 @@ 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);
+  var handleNoteConfirm = function handleNoteConfirm(noteValue) {
+    form.setFieldsValue({
+      note: noteValue
+    });
+    setNoteModalOpen(false);
+  };
+  var handleNoteDelete = function handleNoteDelete() {
+    form.setFieldsValue({
+      note: ''
+    });
+    setNoteModalOpen(false);
+  };
+  var handleNoteCancel = function handleNoteCancel() {
+    setNoteModalOpen(false);
+  };
   console.log(isShowTimeAndResource, 'isShowTimeAndResource');
   var productName = useMemo(function () {
     var _state$service7;
@@ -609,7 +656,7 @@ var Info = function Info(_, ref) {
     }))));
   }, [(_state$service8 = state.service) === null || _state$service8 === void 0 || (_state$service8 = _state$service8.cacheItem) === null || _state$service8 === void 0 || (_state$service8 = _state$service8._extend) === null || _state$service8 === void 0 ? void 0 : _state$service8.product_name, bundles, state.amountSymbol, state.isBookingCreatePage]);
   var price = useMemo(function () {
-    var _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9;
+    var _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10;
     return /*#__PURE__*/React.createElement(Col, {
       span: 24
     }, /*#__PURE__*/React.createElement(Form.Item, {
@@ -618,7 +665,7 @@ var Info = function Info(_, ref) {
       rules: [{
         required: true
       }],
-      extra: useTotal !== ((_state$service$cacheI6 = state.service.cacheItem) === null || _state$service$cacheI6 === void 0 || (_state$service$cacheI6 = _state$service$cacheI6._extend) === null || _state$service$cacheI6 === void 0 ? void 0 : _state$service$cacheI6.origin_total) && locales.getText('page.booking.text.price-extra')(formatAmount((_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 || (_state$service$cacheI7 = _state$service$cacheI7._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total, 2, state.amountSymbol), formatAmount(useTotal, 2, state.amountSymbol))
+      extra: useTotal !== ((_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 || (_state$service$cacheI7 = _state$service$cacheI7._extend) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.origin_total) && locales.getText('page.booking.text.price-extra')(formatAmount((_state$service$cacheI8 = state.service.cacheItem) === null || _state$service$cacheI8 === void 0 || (_state$service$cacheI8 = _state$service$cacheI8._extend) === null || _state$service$cacheI8 === void 0 ? void 0 : _state$service$cacheI8.origin_total, 2, state.amountSymbol), formatAmount(useTotal, 2, state.amountSymbol))
     }, /*#__PURE__*/React.createElement(PisellAdjustPriceInputNumber, {
       style: {
         width: '100%'
@@ -628,10 +675,10 @@ var Info = function Info(_, ref) {
       prefix: state.amountSymbol,
       onChange: handleTotalChange,
       disabled: state.channelDisabledEdit,
-      originValue: ((_state$service$cacheI8 = state.service.cacheItem) === null || _state$service$cacheI8 === void 0 || (_state$service$cacheI8 = _state$service$cacheI8._extend) === null || _state$service$cacheI8 === void 0 ? void 0 : _state$service$cacheI8.origin_total) || 0,
-      placeholder: ((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 || (_state$service$cacheI9 = _state$service$cacheI9._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total) || '0'
+      originValue: ((_state$service$cacheI9 = state.service.cacheItem) === null || _state$service$cacheI9 === void 0 || (_state$service$cacheI9 = _state$service$cacheI9._extend) === null || _state$service$cacheI9 === void 0 ? void 0 : _state$service$cacheI9.origin_total) || 0,
+      placeholder: ((_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total) || '0'
     })));
-  }, [useTotal, (_state$service$cacheI10 = state.service.cacheItem) === null || _state$service$cacheI10 === void 0 || (_state$service$cacheI10 = _state$service$cacheI10._extend) === null || _state$service$cacheI10 === void 0 ? void 0 : _state$service$cacheI10.origin_total, state.amountSymbol, state.channelDisabledEdit]);
+  }, [useTotal, (_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 || (_state$service$cacheI11 = _state$service$cacheI11._extend) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.origin_total, state.amountSymbol, state.channelDisabledEdit]);
   var reason = useMemo(function () {
     return isReason ? /*#__PURE__*/React.createElement(Col, {
       span: 24
@@ -695,7 +742,7 @@ var Info = function Info(_, ref) {
       // useStartTime={useStartTime}
     }));
     // 只监听内部使用值
-  }, [state.renderType, (_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 || (_state$service$cacheI11 = _state$service$cacheI11._data) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.resources, (_state$service$cacheI12 = state.service.cacheItem) === null || _state$service$cacheI12 === void 0 || (_state$service$cacheI12 = _state$service$cacheI12._data) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.resourceMaps]);
+  }, [state.renderType, (_state$service$cacheI12 = state.service.cacheItem) === null || _state$service$cacheI12 === void 0 || (_state$service$cacheI12 = _state$service$cacheI12._data) === null || _state$service$cacheI12 === void 0 ? void 0 : _state$service$cacheI12.resources, (_state$service$cacheI13 = state.service.cacheItem) === null || _state$service$cacheI13 === void 0 || (_state$service$cacheI13 = _state$service$cacheI13._data) === null || _state$service$cacheI13 === void 0 ? void 0 : _state$service$cacheI13.resourceMaps]);
   var capacity = useMemo(function () {
     return /*#__PURE__*/React.createElement(Form.Item, {
       noStyle: true,
@@ -740,13 +787,39 @@ var Info = function Info(_, ref) {
   var footer = useMemo(function () {
     var _state$service$resour;
     return /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-service-body-edit-footer"
+      className: "pisell-lowcode__booking-service-body-edit-footer",
+      style: state !== null && state !== void 0 && state.isBookingTicket2 ? {
+        justifyContent: 'space-between'
+      } : {}
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "pisell-lowcode__booking-service-body-edit-footer-left"
     }, /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-service-delete-wrap",
       onClick: handleDeleteProduct
     }, /*#__PURE__*/React.createElement(Delete_wght300_24px, {
       className: "pisell-lowcode__booking-service-delete-icon"
-    })), /*#__PURE__*/React.createElement(Button, {
+    })), (state === null || state === void 0 ? void 0 : state.isBookingTicket2) && /*#__PURE__*/React.createElement(ConfigProvider, {
+      theme: {
+        token: {
+          colorPrimary: '#0d7fa9'
+        }
+      }
+    }, /*#__PURE__*/React.createElement(Button, {
+      className: "pisell-lowcode__booking-service-buttons-item note-button",
+      type: "primary",
+      size: "large",
+      onClick: function onClick() {
+        return setNoteModalOpen(true);
+      },
+      style: {
+        height: '48px',
+        width: '140px'
+      }
+    }, locales.getText('pisell2.ticket-booking.note'), useNote && /*#__PURE__*/React.createElement("span", {
+      className: "note-indicator"
+    }, /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-info-circle2"
+    }))))), /*#__PURE__*/React.createElement(Button, {
       type: "primary",
       className: "pisell-lowcode__booking-service-body-edit-footer-apple",
       disabled: !isNormalProduct && !((_state$service$resour = state.service.resourcesOrigin) !== null && _state$service$resour !== void 0 && _state$service$resour.length),
@@ -756,11 +829,11 @@ var Info = function Info(_, ref) {
     }, locales.getText('pisell2.text.apply')));
   }, [(_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),
-    _useState2 = _slicedToArray(_useState, 2),
-    val = _useState2[0],
-    setVal = _useState2[1];
+  console.log(state.service.editModal && !((_state$service$cacheI14 = state.service.cacheItem) !== null && _state$service$cacheI14 !== void 0 && _state$service$cacheI14.autoClose), performance.now() - window.pp1, '打开商品1');
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    val = _useState6[0],
+    setVal = _useState6[1];
   useEffect(function () {
     if (isShowTimeAndResource) {
       setTimeout(function () {
@@ -777,9 +850,11 @@ var Info = function Info(_, ref) {
     zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
     mask: state.drawerMask,
-    open: state.service.editModal && !((_state$service$cacheI14 = state.service.cacheItem) !== null && _state$service$cacheI14 !== void 0 && _state$service$cacheI14.autoClose),
+    open: !isNoSpecAndPackage && state.service.editModal && !((_state$service$cacheI15 = state.service.cacheItem) !== null && _state$service$cacheI15 !== void 0 && _state$service$cacheI15.autoClose),
     title: locales.getText('pisell2.text.edit-service'),
     onClose: function onClose() {
+      var _window$closeBookingE4, _window4;
+      (_window$closeBookingE4 = (_window4 = window).closeBookingEditModal) === null || _window$closeBookingE4 === void 0 || _window$closeBookingE4.call(_window4);
       dispatch({
         type: 'setService',
         payload: {
@@ -800,6 +875,15 @@ var Info = function Info(_, ref) {
       width: '100%'
     },
     gutter: [16, 0]
-  }, productName, price, reason, val && isShowTimeAndResource && /*#__PURE__*/React.createElement(React.Fragment, null, startTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity)), footer)));
+  }, productName, price, reason, val && isShowTimeAndResource && /*#__PURE__*/React.createElement(React.Fragment, null, startTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity), /*#__PURE__*/React.createElement(Form.Item, {
+    noStyle: true,
+    name: "note"
+  }, noteModalOpen && /*#__PURE__*/React.createElement(NoteModal, {
+    open: noteModalOpen,
+    value: form.getFieldValue('note'),
+    onConfirm: handleNoteConfirm,
+    onDelete: handleNoteDelete,
+    onCancel: handleNoteCancel
+  }))), footer)));
 };
 export default /*#__PURE__*/forwardRef(Info);

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

@@ -2,13 +2,12 @@
   padding: 24px 32px 100px !important;
 }
 
-
 .pisell-lowcode__booking-service-body-edit-footer {
   position: absolute;
   bottom: 0;
   left: 0;
   width: 100%;
-  border-top: 1px solid #E7E8E9;
+  border-top: 1px solid #e7e8e9;
   padding: 20px 32px;
   display: flex;
   align-items: center;
@@ -16,12 +15,19 @@
   gap: 12px;
   background-color: #fff;
 
+  .pisell-lowcode__booking-service-body-edit-footer-left {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    width: fit-content;
+  }
+
   .pisell-lowcode__booking-service-delete-wrap {
     height: 48px;
     width: 48px;
     border-radius: 8px;
-    border: 1px solid var(--gray-300, #D0D5DD);
-    background: var(--base-white, #FFF);
+    border: 1px solid var(--gray-300, #d0d5dd);
+    background: var(--base-white, #fff);
     box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
     cursor: pointer;
     display: flex;
@@ -29,11 +35,42 @@
     justify-content: center;
 
     .pisell-lowcode__booking-service-delete-icon {
-      color: #B42318;
+      color: #b42318;
       font-size: 20px;
     }
   }
 
+  .pisell-lowcode__booking-service-buttons-item {
+    height: 48px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 1;
+    position: relative;
+
+    &.note-button {
+      .note-indicator {
+        position: absolute;
+        top: 0; // 不使用负数偏移
+        right: 0; // 不使用负数偏移
+        transform: translate(12%, -12%); // 向外溢出约 2-3px
+        width: 24px;
+        height: 24px;
+        border-radius: 50%;
+        background-color: #7f56da; // 紫色
+        color: #fff;
+        font-weight: 700;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        line-height: 1;
+        font-size: 30px;
+        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+        pointer-events: none;
+      }
+    }
+  }
+
   .pisell-lowcode__booking-service-body-edit-footer-apple {
     flex: 1;
     height: 48px;
@@ -46,14 +83,12 @@
 .pisell-lowcode-select-selection-item {
   .resource-option {
     padding-left: 0;
-
   }
 }
 
 .pisell-lowcode-select-item-option-content {
   .resource-option {
     padding-left: 0;
-
   }
 }
 
@@ -63,7 +98,7 @@
   gap: 8px;
 
   .resource-option-alert-icon {
-    color: #B42318;
+    color: #b42318;
     cursor: pointer;
   }
 }
@@ -72,7 +107,7 @@
   min-height: 40px;
   cursor: pointer;
   background-color: #ffffff;
-  border: 1px solid #D0D5DD;
+  border: 1px solid #d0d5dd;
   border-radius: 10px;
   transition: all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
   overflow: hidden;
@@ -90,10 +125,11 @@
       flex: 1;
     }
 
-    .current-service-info-change-btn {}
+    .current-service-info-change-btn {
+    }
   }
 
   &:hover {
     border-color: #7f56d9;
   }
-}
+}

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

@@ -6,8 +6,8 @@ import "../../info/service/index.less";
 import AddTimeModal from "./addTimeModal";
 import useInfoHolder from "../../info/hooks/useInfoHolder";
 import Lists from "../../info/service/Lists";
-import useClearCart from "../../hooks/useClearCart";
 import useQuotation from "../../hooks/useQuotation";
+import EditNormalService from "./editNormalService";
 var Service = function Service() {
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -17,18 +17,21 @@ var Service = function Service() {
     handleEdit = _useInfoHolder.handleEdit,
     handleAction = _useInfoHolder.handleAction,
     dispatchService = _useInfoHolder.dispatchService,
-    showAddTimeModal = _useInfoHolder.showAddTimeModal;
+    showAddTimeModal = _useInfoHolder.showAddTimeModal,
+    editNormalServiceRef = _useInfoHolder.editNormalServiceRef;
   useEffect(function () {
     document.body.id = 'body';
   }, []);
-  var clearCart = useClearCart(state, dispatch);
+
+  // const 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"
-    }, clearCart, /*#__PURE__*/React.createElement(Lists, {
+    }, /*#__PURE__*/React.createElement(Lists, {
       isParallelResource: true,
       onEdit: handleEdit,
       onAction: handleAction,
@@ -39,8 +42,10 @@ var Service = function Service() {
       onEdit: handleEdit
     }) : null), /*#__PURE__*/React.createElement(EditService, {
       ref: detailRef
-    }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), dom);
-  }, [clearCart, dom, showAddTimeModal, clearCart]);
+    }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), /*#__PURE__*/React.createElement(EditNormalService, {
+      ref: editNormalServiceRef
+    }), dom);
+  }, [dom, showAddTimeModal]);
   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 ? /*#__PURE__*/React.createElement("div", {
+  })), d.id || d.isCustomItem ? /*#__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 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }) : null, d.id || d.isCustomItem ? /*#__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"