@pisell/private-materials 6.2.32 → 6.2.33

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

@@ -39,6 +39,7 @@ import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import { sendWarningLog } from '@pisell/utils';
 import dayjs from 'dayjs';
 import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
+import { Iconfont } from '@pisell/materials';
 /**
  * @title: 底部
  * @description:
@@ -48,7 +49,7 @@ import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail8, _state$addons4, _state$bookingDetail16, _state$bookingDetail17, _state$notes2;
+  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$notes3, _state$bookingDetail8, _state$addons4, _state$bookingDetail16, _state$bookingDetail17, _state$notes4;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -946,6 +947,11 @@ var Footer = function Footer(props) {
       // style={{ backgroundColor: '#f04438', color: '#fff' }}
     }, locales.getText('pisell2.booking.info.text.clear-all')));
   }, []);
+  var hasOrderNote = useMemo(function () {
+    var _state$notes2;
+    var note = (state === null || state === void 0 || (_state$notes2 = state.notes) === null || _state$notes2 === void 0 ? void 0 : _state$notes2.orderNote) || '';
+    return note.trim().length > 0;
+  }, [state === null || state === void 0 || (_state$notes3 = state.notes) === null || _state$notes3 === void 0 ? void 0 : _state$notes3.orderNote]);
   var noteButton = useMemo(function () {
     return /*#__PURE__*/React.createElement(ConfigProvider, {
       theme: {
@@ -954,11 +960,15 @@ var Footer = function Footer(props) {
         }
       }
     }, /*#__PURE__*/React.createElement(Button, {
-      className: "pisell-lowcode__booking-footer-buttons-item",
+      className: "pisell-lowcode__booking-footer-buttons-item note-button",
       type: "primary",
       onClick: handleNote
-    }, locales.getText('pisell2.ticket-booking.note')));
-  }, []);
+    }, locales.getText('pisell2.ticket-booking.note'), hasOrderNote && /*#__PURE__*/React.createElement("span", {
+      className: "note-indicator"
+    }, /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-info-circle2"
+    }))));
+  }, [hasOrderNote]);
   var buttonMap = {
     checkout: checkoutButton,
     save: saveButton,
@@ -1444,7 +1454,7 @@ var Footer = function Footer(props) {
   }), noteModalOpen && /*#__PURE__*/React.createElement(NoteModal, {
     open: noteModalOpen,
     title: locales.getText('pisell2.text.add-order-notes'),
-    value: ((_state$notes2 = state.notes) === null || _state$notes2 === void 0 ? void 0 : _state$notes2.orderNote) || '',
+    value: ((_state$notes4 = state.notes) === null || _state$notes4 === void 0 ? void 0 : _state$notes4.orderNote) || '',
     onConfirm: handleNoteConfirm,
     onDelete: handleNoteDelete,
     onCancel: handleNoteCancel

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

@@ -122,6 +122,29 @@
     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-footer-buttons-item-primary {

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

@@ -120,9 +120,9 @@
 }
 
 .pisell-lowcode__booking-tab-pane-footer {
-  position: sticky;
-  bottom: 0;
-  left: 0;
+  //position: sticky;
+  //bottom: 0;
+  //left: 0;
   z-index: 2;
   display: block;
   // display: flex;

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

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

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

@@ -84,7 +84,7 @@ var Lists = function Lists(_ref) {
     var _state$bookingConfig;
     return {
       hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
-      isShowNote: isEventBooking(state),
+      isShowNote: state.isBookingTicket2 ? true : isEventBooking(state),
       isShowPackageNote: false,
       accounts: [],
       isEdit: !!(state !== null && state !== void 0 && state.bookingId),

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

@@ -625,6 +625,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     isShowChangeHolder: !isNormalProduct,
     isShowAction: isShowAddTime(state, item),
     actionText: locales.getText('page.booking.text.add-time'),
+    actionIcon: 'pisell2-clock-plus',
     isMultipleResource: true,
     multiResources: multiResources,
     holderMaxCount: item === null || item === void 0 ? void 0 : item._extend.quantity,
@@ -657,7 +658,7 @@ export var formatProducts = function formatProducts(lists, state) {
   var normalList = [];
   var groupList = [];
   var formItem = function formItem(item) {
-    var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _resourceItem, _item$_extend23, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27;
+    var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23, _resourceItem, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27, _item$_extend28;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
     var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.holder_id);
     var options = formatOptions(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.option);
@@ -684,19 +685,19 @@ export var formatProducts = function formatProducts(lists, state) {
       num: item === null || item === void 0 ? void 0 : item._extend.quantity,
       image: item === null || item === void 0 ? void 0 : item.cover,
       isShowNote: true,
-      note: item === null || item === void 0 ? void 0 : item.note,
-      like_status: item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.like_status,
+      note: (item === null || item === void 0 ? void 0 : item.note) || (item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.note),
+      like_status: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.like_status,
       bundle: bundle,
       options: options,
       errorMessage: errorMessage,
-      product_option_string: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.product_option_string,
-      discount_reason: item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.discount_reason,
-      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.resource,
+      product_option_string: item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.product_option_string,
+      discount_reason: item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.discount_reason,
+      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.resource,
       relation_form_name: isNormalProduct ? '' : ((_resourceItem = resourceItem) === null || _resourceItem === void 0 ? void 0 : _resourceItem.labelText) || item.relation_form_name,
       holder_title: clientTitle,
-      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.start_date : '',
-      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,
+      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.start_date : '',
+      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.end_date : '',
+      holder_id: (item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.holder_id) || 0,
       isNormalProduct: isNormalProduct,
       isCustomItem: item === null || item === void 0 ? void 0 : item.isCustomItem,
       // 添加自定义商品标识
@@ -704,8 +705,8 @@ export var formatProducts = function formatProducts(lists, state) {
       // 是否适用优惠券/折扣
       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) || [],
-      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.items) || [])
+      relation_products: (item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.relation_details) || [],
+      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.items) || [])
     }, generalParams), {}, {
       _origin: item
     });
@@ -714,8 +715,8 @@ export var formatProducts = function formatProducts(lists, state) {
   if (isRenderGroup) {
     // 将商品分为组商品和非组商品
     lists.forEach(function (item) {
-      var _item$_extend28;
-      if (!(item !== null && item !== void 0 && (_item$_extend28 = item._extend) !== null && _item$_extend28 !== void 0 && _item$_extend28.groupId)) {
+      var _item$_extend29;
+      if (!(item !== null && item !== void 0 && (_item$_extend29 = item._extend) !== null && _item$_extend29 !== void 0 && _item$_extend29.groupId)) {
         normalList.push(formItem(item));
       } else {
         groupList.push(item);
@@ -724,8 +725,8 @@ export var formatProducts = function formatProducts(lists, state) {
 
     // 根据item._extend.groupId 进行分组
     var groups = groupList.reduce(function (prev, item) {
-      var _item$_extend29;
-      var groupId = item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.groupId;
+      var _item$_extend30;
+      var groupId = item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId;
       if (!prev[groupId]) {
         prev[groupId] = [];
       }
@@ -893,8 +894,8 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
       services: services.filter(function (item) {
-        var _item$_extend30;
-        return ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.holder_id) == d.form_record_id && checkType(item.extension_type);
+        var _item$_extend31;
+        return ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });

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

@@ -47,7 +47,12 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (props, ref) {
     state = _ref.state,
     dispatch = _ref.dispatch;
   var translationOriginal = useTranslationOriginal();
+  var _useState7 = useState(''),
+    _useState8 = _slicedToArray(_useState7, 2),
+    keyword = _useState8[0],
+    setKeyword = _useState8[1];
   var keywordRef = useRef('');
+  keywordRef.current = keyword;
   var Toast = useToast();
   var _useScanCustomer = useScanCustomer(),
     openScan = _useScanCustomer.openScan,
@@ -72,17 +77,61 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (props, ref) {
     selectedCustomer = _useCustomer.selectedCustomer,
     loading = _useCustomer.loading,
     pagination = _useCustomer.pagination,
-    loadCustomers = _useCustomer.loadCustomers,
     changePage = _useCustomer.changePage,
     selectCustomer = _useCustomer.selectCustomer,
     addCustomerToFirst = _useCustomer.addCustomerToFirst,
     initLoad = _useCustomer.initLoad,
     hasMore = _useCustomer.hasMore,
     loadMore = _useCustomer.loadMore;
+
+  // 点击搜索按钮 重置列表
+  var handleSearchClient = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(keyword) {
+      var _clientSearchRef$curr, _clientSearchRef$curr2;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return initLoad(keyword);
+          case 2:
+            (_clientSearchRef$curr = clientSearchRef.current) === null || _clientSearchRef$curr === void 0 || (_clientSearchRef$curr2 = _clientSearchRef$curr.resetScrollPosition) === null || _clientSearchRef$curr2 === void 0 || _clientSearchRef$curr2.call(_clientSearchRef$curr);
+          case 3:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleSearchClient(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  // keyword 变动时触发
+  var _debouncedSearch = useDebounceFn( /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_keyword) {
+      var _clientSearchRef$curr3, _clientSearchRef$curr4;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return initLoad(keyword);
+          case 2:
+            (_clientSearchRef$curr3 = clientSearchRef.current) === null || _clientSearchRef$curr3 === void 0 || (_clientSearchRef$curr4 = _clientSearchRef$curr3.resetScrollPosition) === null || _clientSearchRef$curr4 === void 0 || _clientSearchRef$curr4.call(_clientSearchRef$curr3);
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x2) {
+      return _ref3.apply(this, arguments);
+    };
+  }(), {
+    wait: 500
+  });
   useEffect(function () {
-    // 加载客户列表
-    initLoad();
-  }, []);
+    _debouncedSearch.run(keyword);
+  }, [keyword]);
   useEffect(function () {
     if (state.action) {
       state.action({
@@ -93,15 +142,9 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (props, ref) {
       });
     }
   }, []);
-  var updateSearchKeyword = function updateSearchKeyword(newVal) {
-    var _clientSearchRef$curr, _clientSearchRef$curr2;
-    (_clientSearchRef$curr = clientSearchRef.current) === null || _clientSearchRef$curr === void 0 || (_clientSearchRef$curr2 = _clientSearchRef$curr.setSearchKeyword) === null || _clientSearchRef$curr2 === void 0 || _clientSearchRef$curr2.call(_clientSearchRef$curr, newVal);
-    keywordRef.current = newVal;
-  };
   var handleScanCustomer = function handleScanCustomer(customer) {
     if (customer !== null && customer !== void 0 && customer.scanCode) {
-      updateSearchKeyword(customer.scanCode);
-      handleSearchClient(customer.scanCode);
+      setKeyword(customer.scanCode);
     }
   };
   useEffect(function () {
@@ -111,10 +154,7 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (props, ref) {
       closeScan();
       // 如果有搜索内容，则清除
       if (keywordRef.current) {
-        var _clientSearchRef$curr3, _clientSearchRef$curr4;
-        updateSearchKeyword('');
-        (_clientSearchRef$curr3 = clientSearchRef.current) === null || _clientSearchRef$curr3 === void 0 || (_clientSearchRef$curr4 = _clientSearchRef$curr3.resetScrollPosition) === null || _clientSearchRef$curr4 === void 0 || _clientSearchRef$curr4.call(_clientSearchRef$curr3);
-        initLoad();
+        setKeyword('');
       }
     }
   }, [searchModalVisible, initLoad]);
@@ -127,75 +167,28 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (props, ref) {
   // 处理更换客户
   var handleChangeClient = function handleChangeClient(data) {
     setSearchModalVisible(true);
-    console.log('更换客户:', data);
   };
 
   // 处理移除客户
   var handleRemoveClient = function handleRemoveClient(data) {
     selectCustomer(null);
-    console.log('移除客户:', data);
   };
 
   // 处理查看客户
   var handleViewClient = function handleViewClient(data) {
-    console.log('查看客户:', data);
     state.action({
       type: 'pisell1.handleOpenCustomerModal',
       data: {
         id: state.client.value.id
       },
-      callback: function callback(data) {
-        if (state.disabledEdit) {
-          return;
-        }
-        // if (data) {
-        //   handleSelectClient([data]);
-        // }
-        // getHolders();
-        // getClients({
-        //   ...state.client.clientsParams,
-        //   search: '',
-        //   customer_id: data?.id,
-        //   skip: 1,
-        //   sort_by: 'id',
-        // });
-      }
+      callback: function callback(data) {}
     });
   };
 
-  // 处理搜索结果选择
-  var handleRowClick = function handleRowClick(record) {
-    // selectCustomer(record);
-    // setSearchModalVisible(false);
-    handleSetClient(record);
-  };
-
   // 处理模态框取消
   var handleModalCancel = function handleModalCancel() {
     setSearchModalVisible(false);
   };
-  var handleSearchClient = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(keyword) {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return loadCustomers({
-              search: keyword
-            });
-          case 2:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function handleSearchClient(_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-  var _debouncedSearch = useDebounceFn(handleSearchClient, {
-    wait: 500
-  });
 
   // 处理添加客户成功
   var handleAddClientSuccess = function handleAddClientSuccess(record, isChecked) {
@@ -306,11 +299,11 @@ var CartClientCard = /*#__PURE__*/forwardRef(function (props, ref) {
     loading: loading,
     dataSource: customers,
     onSearch: handleSearchClient,
-    onSearchTextChange: function onSearchTextChange(keyword) {
-      keywordRef.current = keyword;
-      _debouncedSearch.run(keyword);
+    keyword: keyword,
+    onKeywordChange: function onKeywordChange(_keyword) {
+      setKeyword(_keyword);
     },
-    onRowClick: handleRowClick,
+    onRowClick: handleSetClient,
     containerProps: {
       open: searchModalVisible,
       onCancel: handleModalCancel

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

@@ -23,7 +23,7 @@ import { formatAmount, locales } from '@pisell/utils';
 import Duration from "../../../materiels/duration";
 import Capacity from "./Capacity";
 import Resources from "./Resources";
-import { Input, Button, Row, Col, Form, InputNumber } from 'antd';
+import { Input, Button, Row, Col, Form, InputNumber, ConfigProvider } from 'antd';
 import "./index.less";
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
@@ -32,10 +32,11 @@ import { useUpdateEffect, useMemoizedFn, useDebounceFn } from 'ahooks';
 import { getServiceTimes, deleteCacheParams, getProductTotalPrice, isSessionProduct } from "../../../utils";
 import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
-import { PisellAdjustPriceInputNumber } from '@pisell/materials';
+import { Iconfont, PisellAdjustPriceInputNumber } from '@pisell/materials';
 import { editSessionProduct } from "../../../info/utils";
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/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;
@@ -46,11 +47,16 @@ 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 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)) {
@@ -740,27 +746,57 @@ 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),
       onClick: function onClick() {
         form.submit();
-      }
+      },
+      style: state !== null && state !== void 0 && state.isBookingTicket2 ? {
+        width: '200px',
+        maxWidth: '200px'
+      } : {}
     }, 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),
-    _useState2 = _slicedToArray(_useState, 2),
-    val = _useState2[0],
-    setVal = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    val = _useState4[0],
+    setVal = _useState4[1];
   useEffect(function () {
     if (isShowTimeAndResource) {
       setTimeout(function () {
@@ -770,6 +806,21 @@ var Info = function Info(_, ref) {
       setVal(false);
     }
   }, [isShowTimeAndResource]);
+  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);
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     titleNoWrap: true
     //通过zIndex的方式控制  添加商品 和 编辑服务弹窗的上下层级
@@ -800,6 +851,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);