@pisell/private-materials 3.0.214 → 3.1.2

package/es/components/booking/info/clientVariant/vertical/index.js

@@ -17,33 +17,29 @@ 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(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import PlusCircle from '@pisell/icon/es/PlusCircle';
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import User01 from '@pisell/icon/es/User01';
+import PlusCircle from '@pisell/icon/es/PlusCircle';
+import { Avatar, Button, Dropdown, Empty, Skeleton } from 'antd';
 import { image, locales } from '@pisell/utils';
 import { useMemoizedFn } from 'ahooks';
-import { Avatar, Button, Dropdown, Empty, Skeleton } from 'antd';
 import classNames from 'classnames';
-import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import Pet from "../../pet";
 import useClientFn from "../hooks/useClientFn";
 import SelectDrawer from "./SelectDrawer";
+import Pet from "../../pet";
+import "./index.less";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import { formatAddFormValues } from "../../../forms/format";
-import { request } from "../../../utils";
-import { walkInData } from "../../model";
-import ChangePetModal from "../../pet/ChangePetModal";
-import { getAppointmentService, getPets, isDayBooking, isOpenDeletePet, updateServicePrice, isEventBooking } from "../../service2/utils";
 import { moveItemToFront } from "../../utils";
-import "./index.less";
+import { request } from "../../../utils";
 var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig8, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$pet3, _state$pet4, _state$pet6, _state$pet6$formData, _state$pet6$formData$, _state$pet8, _state$client$value4, _state$bookingConfig17, _state$bookingConfig18, _state$bookingConfig19, _state$pet9, _state$pet9$formData, _state$bookingConfig20, _state$bookingConfig21, _state$service2, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _context$appHelper2, _context$appHelper2$u, _context$appHelper2$u2, _state$bookingConfig22, _state$client6;
+  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig8, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$pet3, _state$pet4, _state$pet6, _state$pet6$formData, _state$pet6$formData$, _state$pet8, _state$client$value4, _state$bookingConfig17, _state$bookingConfig18, _state$bookingConfig19, _state$pet9, _state$pet9$formData, _state$bookingConfig20, _state$bookingConfig21, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _context$appHelper2, _context$appHelper2$u, _context$appHelper2$u2, _state$bookingConfig22, _state$client6;
   var globalState = props.globalState,
     setGlobalState = props.setGlobalState;
   var modalRef = useRef();
   var state = globalState;
   var stateRef = useRef(state);
   var prevCustomerId = useRef(null);
-  var changePetRef = useRef(null);
   var context = useEngineContext();
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
@@ -78,7 +74,6 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     handleOpenClientModal = _useClientFn.handleOpenClientModal,
     getNickname = _useClientFn.getNickname,
     franchiseeLoading = _useClientFn.franchiseeLoading;
-  console.log('state.modalOpen', state.modalOpen);
   var renderList = useMemo(function () {
     var _list = _toConsumableArray(state.client.clients);
     return moveItemToFront(_list, state.client.value.id);
@@ -98,13 +93,6 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
         pet: _objectSpread(_objectSpread({}, stateRef.current.pet), payload)
       });
     }
-
-    // 设置服务
-    if (type === 'setService') {
-      setGlobalState({
-        service: _objectSpread(_objectSpread({}, stateRef.current.service), payload)
-      });
-    }
   };
   var boardConfig = useMemo(function () {
     var _state$bookingConfig, _state$bookingConfig$, _state$bookingConfig$2;
@@ -122,21 +110,6 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, [state === null || state === void 0 ? void 0 : (_state$bookingConfig8 = state.bookingConfig) === null || _state$bookingConfig8 === void 0 ? void 0 : (_state$bookingConfig9 = _state$bookingConfig8.config) === null || _state$bookingConfig9 === void 0 ? void 0 : (_state$bookingConfig10 = _state$bookingConfig9.basic) === null || _state$bookingConfig10 === void 0 ? void 0 : (_state$bookingConfig11 = _state$bookingConfig10.appointment_customer) === null || _state$bookingConfig11 === void 0 ? void 0 : _state$bookingConfig11.type, state === null || state === void 0 ? void 0 : state.modalOpen]);
   var handleSelectPet = function handleSelectPet(val) {
-    // 跨日预约，更改表单的时候打开弹窗提示
-    if (isDayBooking(state)) {
-      var _isOpenDeletePet = isOpenDeletePet(state, val),
-        ids = _isOpenDeletePet.ids,
-        lists = _isOpenDeletePet.lists;
-      if ((ids === null || ids === void 0 ? void 0 : ids.length) > 0 && (lists === null || lists === void 0 ? void 0 : lists.length) > 0) {
-        var _changePetRef$current, _state$service;
-        (_changePetRef$current = changePetRef.current) === null || _changePetRef$current === void 0 ? void 0 : _changePetRef$current.open({
-          ids: ids,
-          setGlobalState: setGlobalState,
-          service: ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [],
-          state: state
-        });
-      }
-    }
     setGlobalState({
       pet: _objectSpread(_objectSpread({}, state.pet), {}, {
         edit: true,
@@ -273,8 +246,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
   }, [isWalkIn, formId, (_state$client$value4 = state.client.value) === null || _state$client$value4 === void 0 ? void 0 : _state$client$value4.id, currentPetValue, boardConfig]);
   var petRender = useMemo(function () {
     var _state$bookingConfig14, _state$bookingConfig15, _state$bookingConfig16;
-    // 跨日预约需要显示pet
-    if ((state !== null && state !== void 0 && state.disabledEdit || boardConfig.type !== 'form') && !isDayBooking(state)) {
+    if (state !== null && state !== void 0 && state.disabledEdit || boardConfig.type !== 'form') {
       return null;
     }
     return /*#__PURE__*/React.createElement(React.Fragment, null, !(currentPetValue !== null && currentPetValue !== void 0 && currentPetValue.length) && !isHasFormRecord && !isWalkIn && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Empty, {
@@ -319,7 +291,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
       },
       previewItemTitleRender: previewItemTitleRender
     }));
-  }, [isWalkIn, isHasFormRecord, state === null || state === void 0 ? void 0 : state.disabledEdit, boardConfig.type, state === null || state === void 0 ? void 0 : (_state$bookingConfig17 = state.bookingConfig) === null || _state$bookingConfig17 === void 0 ? void 0 : (_state$bookingConfig18 = _state$bookingConfig17.holder) === null || _state$bookingConfig18 === void 0 ? void 0 : (_state$bookingConfig19 = _state$bookingConfig18.form) === null || _state$bookingConfig19 === void 0 ? void 0 : _state$bookingConfig19.title, (_state$pet9 = state.pet) === null || _state$pet9 === void 0 ? void 0 : (_state$pet9$formData = _state$pet9.formData) === null || _state$pet9$formData === void 0 ? void 0 : _state$pet9$formData[0], state, petDispatch, handleOpenModal, handleOpenClientModal, previewItemTitleRender, handleAddPet, currentPetValue, formId, state === null || state === void 0 ? void 0 : (_state$bookingConfig20 = state.bookingConfig) === null || _state$bookingConfig20 === void 0 ? void 0 : (_state$bookingConfig21 = _state$bookingConfig20.holder) === null || _state$bookingConfig21 === void 0 ? void 0 : _state$bookingConfig21.data_range, (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value]);
+  }, [isWalkIn, isHasFormRecord, state === null || state === void 0 ? void 0 : state.disabledEdit, boardConfig.type, state === null || state === void 0 ? void 0 : (_state$bookingConfig17 = state.bookingConfig) === null || _state$bookingConfig17 === void 0 ? void 0 : (_state$bookingConfig18 = _state$bookingConfig17.holder) === null || _state$bookingConfig18 === void 0 ? void 0 : (_state$bookingConfig19 = _state$bookingConfig18.form) === null || _state$bookingConfig19 === void 0 ? void 0 : _state$bookingConfig19.title, (_state$pet9 = state.pet) === null || _state$pet9 === void 0 ? void 0 : (_state$pet9$formData = _state$pet9.formData) === null || _state$pet9$formData === void 0 ? void 0 : _state$pet9$formData[0], state, petDispatch, handleOpenModal, handleOpenClientModal, previewItemTitleRender, handleAddPet, currentPetValue, formId, state === null || state === void 0 ? void 0 : (_state$bookingConfig20 = state.bookingConfig) === null || _state$bookingConfig20 === void 0 ? void 0 : (_state$bookingConfig21 = _state$bookingConfig20.holder) === null || _state$bookingConfig21 === void 0 ? void 0 : _state$bookingConfig21.data_range]);
   var handleOpenClient = function handleOpenClient() {
     if (!isWalkIn || state !== null && state !== void 0 && state.disableEventBookingEdit) {
       return;
@@ -334,91 +306,6 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
       setSearch: (_modalRef$current2 = modalRef.current) === null || _modalRef$current2 === void 0 ? void 0 : _modalRef$current2.setSearch
     };
   });
-
-  /**
-   * @title: 是否打开更改商品弹窗
-   * @description:
-   * @param {*} useMemo
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2024-12-30 22:40
-   */
-  var isOpenDeleteProduct = useMemo(function () {
-    if (!isDayBooking(state)) return false;
-    var pets = getPets(state);
-    var appointmentServices = getAppointmentService(state);
-    if (pets !== null && pets !== void 0 && pets.length && (appointmentServices !== null && appointmentServices !== void 0 && appointmentServices.length || isEventBooking(state))) {
-      return true;
-    }
-    return false;
-  }, [state]);
-
-  /**
-   * @title: 更改了客户
-   * @description:
-   * @param {any} e
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2024-12-31 14:48
-   */
-  var _handleSelectClient = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
-      var _state$service3, _state$service3$value, _state$client$value5, _value, _state, _changePetRef$current2, _state$service4, services;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            handleSelectClient(e);
-            if (!isDayBooking(state)) {
-              _context2.next = 13;
-              break;
-            }
-            _value = (e === null || e === void 0 ? void 0 : e[e.length - 1]) || walkInData;
-            if (!_value.loading) {
-              _context2.next = 5;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 5:
-            if (!(isDayBooking(state) && (state === null || state === void 0 ? void 0 : (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : (_state$service3$value = _state$service3.value) === null || _state$service3$value === void 0 ? void 0 : _state$service3$value.length) > 0 && ((_state$client$value5 = state.client.value) === null || _state$client$value5 === void 0 ? void 0 : _state$client$value5.id) !== (_value === null || _value === void 0 ? void 0 : _value.id))) {
-              _context2.next = 13;
-              break;
-            }
-            _state = _objectSpread(_objectSpread({}, state), {}, {
-              client: _objectSpread(_objectSpread({}, state.client), {}, {
-                value: _objectSpread(_objectSpread({}, _value), {}, {
-                  name: getNickname(_value)
-                })
-              })
-            }); // 表单数据并且有预约商品数据，则更新客户后将预约商品数据清空
-            if (isOpenDeleteProduct) {
-              (_changePetRef$current2 = changePetRef.current) === null || _changePetRef$current2 === void 0 ? void 0 : _changePetRef$current2.open({
-                setGlobalState: setGlobalState,
-                service: ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.value) || [],
-                state: state,
-                source: 'changeClient'
-              });
-            }
-            _context2.next = 10;
-            return updateServicePrice(_state);
-          case 10:
-            services = _context2.sent;
-            console.log(services, state, _value, isOpenDeleteProduct, 'wh98797686');
-            setGlobalState({
-              service: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
-                value: services,
-                edit: true
-              })
-            });
-          case 13:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function _handleSelectClient(_x2) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-lowcode__booking-vertical-client-wrap', _defineProperty({}, 'create-booking-page-vertical-client-wrap', state.isBookingCreatePage))
   }, /*#__PURE__*/React.createElement("div", {
@@ -432,7 +319,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     round: true
   }, /*#__PURE__*/React.createElement(Avatar, {
     className: "pisell-lowcode__booking-client-avatar",
-    src: image.ali((_state$client$value6 = state.client.value) === null || _state$client$value6 === void 0 ? void 0 : _state$client$value6.cover, 100),
+    src: image.ali((_state$client$value5 = state.client.value) === null || _state$client$value5 === void 0 ? void 0 : _state$client$value5.cover, 100),
     size: 64,
     icon: /*#__PURE__*/React.createElement(User01, {
       className: "pisell-lowcode__booking-client-list-item-avatar-icon"
@@ -445,11 +332,11 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     className: "pisell-lowcode__booking-client-desc-item"
   }, locales.getText('pisell2.text.leave-empty-for-walk-in'))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-client-title"
-  }, getNickname(state.client.value)), (_state$client$value7 = state.client.value) !== null && _state$client$value7 !== void 0 && _state$client$value7.email ? /*#__PURE__*/React.createElement("div", {
+  }, getNickname(state.client.value)), (_state$client$value6 = state.client.value) !== null && _state$client$value6 !== void 0 && _state$client$value6.email ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-client-desc-item"
-  }, (_state$client$value8 = state.client.value) === null || _state$client$value8 === void 0 ? void 0 : _state$client$value8.email) : null, (_state$client$value9 = state.client.value) !== null && _state$client$value9 !== void 0 && _state$client$value9.phone ? /*#__PURE__*/React.createElement("div", {
+  }, (_state$client$value7 = state.client.value) === null || _state$client$value7 === void 0 ? void 0 : _state$client$value7.email) : null, (_state$client$value8 = state.client.value) !== null && _state$client$value8 !== void 0 && _state$client$value8.phone ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-client-desc-item"
-  }, (_state$client$value10 = state.client.value) === null || _state$client$value10 === void 0 ? void 0 : _state$client$value10.phone) : null), !isWalkIn && /*#__PURE__*/React.createElement("div", {
+  }, (_state$client$value9 = state.client.value) === null || _state$client$value9 === void 0 ? void 0 : _state$client$value9.phone) : null), !isWalkIn && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-client-action-wrap"
   }, !state.disabledEdit && /*#__PURE__*/React.createElement(Dropdown.Button, {
     menu: {
@@ -487,7 +374,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     autoFocus: !(context !== null && context !== void 0 && (_context$appHelper2 = context.appHelper) !== null && _context$appHelper2 !== void 0 && (_context$appHelper2$u = _context$appHelper2.utils) !== null && _context$appHelper2$u !== void 0 && (_context$appHelper2$u2 = _context$appHelper2$u.isTerminal) !== null && _context$appHelper2$u2 !== void 0 && _context$appHelper2$u2.call(_context$appHelper2$u)),
     ref: modalRef,
     onClose: handleClose,
-    handleSelectClient: _handleSelectClient,
+    handleSelectClient: handleSelectClient,
     handleCreateItem: handleCreateItem,
     childrenValue: state.pet.value,
     handleSelectPet: handleSelectPet,
@@ -499,10 +386,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     loadMore: loadMore,
     showPet: (boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.type) === 'form',
     handleAddPet: handleAddPet,
-    franchiseeLoading: franchiseeLoading,
-    showWalkIn: !isDayBooking(state)
-  }), /*#__PURE__*/React.createElement(ChangePetModal, {
-    ref: changePetRef
+    franchiseeLoading: franchiseeLoading
   }));
 });
 export default VerticalClient;

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

@@ -4,39 +4,37 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { locales } from '@pisell/utils';
 import React, { useContext, useEffect, useMemo } from 'react';
+import { Provider, Context } from "./model";
+import Client from "./client";
+import Service from "./service";
+import Pet from "./pet";
+import DateCom from "./date";
 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";
-import { Context, Provider } from "./model";
-import Pet from "./pet";
-import Service from "./service";
-import { Skeleton } from 'antd';
-import classNames from 'classnames';
-import useEngineContext from "../../../hooks/useEngineContext";
-import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
-import { findNextDuration, flexibleObj, formatResource, getErrorList, request, sliceDayIntoFiveMinutes } from "../utils";
+import localeTexts from "../locales";
+import { locales } from '@pisell/utils';
+import { findNextDuration, flexibleObj, formatResource, getErrorList, sliceDayIntoFiveMinutes, request } from "../utils";
 import { updateServiceDate } from "./date";
-import "./index.less";
+import useEngineContext from "../../../hooks/useEngineContext";
 import Notes from "./notes";
-import { Service2Cart } from "./service2";
-import { isDayBooking, isEventBooking, isTerminalDayBooking } from "./service2/utils";
+import "./index.less";
+import classNames from 'classnames';
+import { Skeleton } from 'antd';
+import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 var defaultModules = {
   client: 1,
   date: 1,
   service: 1,
   holder: 1,
-  note: 1,
-  service2: 0
+  note: 1
 };
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state2$booking, _modal$state2$booking2, _modal$state2$booking3, _modal$state5, _modal$state5$notes, _context$appHelper4, _context$appHelper4$u, _classNames, _modal$state6;
+  var _modal$state2, _modal$state2$booking, _modal$state2$booking2, _modal$state2$booking3, _modal$state4, _modal$state4$notes, _context$appHelper4, _context$appHelper4$u, _classNames, _modal$state5, _React$createElement;
+  // return <Payments {...props} />;
   var style = props.style,
     globalState = props.globalState,
     _props$modules = props.modules,
@@ -79,8 +77,7 @@ var Info = Provider(function (props) {
       }, globalState), {}, {
         isTerminal: context === null || context === void 0 ? void 0 : (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : (_context$appHelper2$u = _context$appHelper2.utils) === null || _context$appHelper2$u === void 0 ? void 0 : (_context$appHelper2$u2 = _context$appHelper2$u.isTerminal) === null || _context$appHelper2$u2 === void 0 ? void 0 : _context$appHelper2$u2.call(_context$appHelper2$u),
         isFranchisee: isFranchisee,
-        timezone: context === null || context === void 0 ? void 0 : (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 ? void 0 : (_context$appHelper3$u = _context$appHelper3.utils) === null || _context$appHelper3$u === void 0 ? void 0 : (_context$appHelper3$u2 = _context$appHelper3$u.store) === null || _context$appHelper3$u2 === void 0 ? void 0 : (_context$appHelper3$u3 = _context$appHelper3$u2.getState()) === null || _context$appHelper3$u3 === void 0 ? void 0 : (_context$appHelper3$u4 = _context$appHelper3$u3.global) === null || _context$appHelper3$u4 === void 0 ? void 0 : (_context$appHelper3$u5 = _context$appHelper3$u4.globalConfig) === null || _context$appHelper3$u5 === void 0 ? void 0 : _context$appHelper3$u5.timezone,
-        isDayBooking: (globalState === null || globalState === void 0 ? void 0 : globalState.renderType) === 'dayBooking'
+        timezone: context === null || context === void 0 ? void 0 : (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 ? void 0 : (_context$appHelper3$u = _context$appHelper3.utils) === null || _context$appHelper3$u === void 0 ? void 0 : (_context$appHelper3$u2 = _context$appHelper3$u.store) === null || _context$appHelper3$u2 === void 0 ? void 0 : (_context$appHelper3$u3 = _context$appHelper3$u2.getState()) === null || _context$appHelper3$u3 === void 0 ? void 0 : (_context$appHelper3$u4 = _context$appHelper3$u3.global) === null || _context$appHelper3$u4 === void 0 ? void 0 : (_context$appHelper3$u5 = _context$appHelper3$u4.globalConfig) === null || _context$appHelper3$u5 === void 0 ? void 0 : _context$appHelper3$u5.timezone
       })
     });
   }, [JSON.stringify(globalState)]);
@@ -108,41 +105,28 @@ 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, _modal$state4$notes;
+    var _modal$state3, _modal$state3$notes;
     if (!modules.note) {
       return null;
     }
-    if (isEventBooking(modal.state)) {
-      return null;
-    }
-
-    // 跨日预约一直显示备注
-    if (isDayBooking(globalState)) {
-      var _modal$state3, _modal$state3$notes;
-      return /*#__PURE__*/React.createElement(AddNote, {
-        value: (_modal$state3 = modal.state) === null || _modal$state3 === void 0 ? void 0 : (_modal$state3$notes = _modal$state3.notes) === null || _modal$state3$notes === void 0 ? void 0 : _modal$state3$notes.orderNote,
-        onChange: addNote
-      });
-    }
     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 ? void 0 : (_modal$state4$notes = _modal$state4.notes) === null || _modal$state4$notes === void 0 ? void 0 : _modal$state4$notes.orderNote,
+      value: (_modal$state3 = modal.state) === null || _modal$state3 === void 0 ? void 0 : (_modal$state3$notes = _modal$state3.notes) === null || _modal$state3$notes === void 0 ? void 0 : _modal$state3$notes.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 ? void 0 : (_modal$state5$notes = _modal$state5.notes) === null || _modal$state5$notes === void 0 ? void 0 : _modal$state5$notes.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$u = _context$appHelper4.utils) !== null && _context$appHelper4$u !== void 0 && _context$appHelper4$u.isMobile ? '100%' : '100vh'
-    }),
+  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state4 = modal.state) === null || _modal$state4 === void 0 ? void 0 : (_modal$state4$notes = _modal$state4.notes) === null || _modal$state4$notes === void 0 ? void 0 : _modal$state4$notes.orderNote]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, (_React$createElement = {
+    style: style,
     header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {
       state: modal.state,
       dispatch: modal.dispatch,
       source: "info"
-    }),
-    bodyClassName: classNames('booking-info-warp', (_classNames = {}, _defineProperty(_classNames, 'create-booking-page-info-wrap', isBookingCreatePage), _defineProperty(_classNames, 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode && !isTerminalDayBooking(modal.state)), _classNames))
-  }, /*#__PURE__*/React.createElement("div", {
+    })
+  }, _defineProperty(_React$createElement, "style", {
+    height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4$u = _context$appHelper4.utils) !== null && _context$appHelper4$u !== void 0 && _context$appHelper4$u.isMobile ? '100%' : '100vh'
+  }), _defineProperty(_React$createElement, "bodyClassName", classNames('booking-info-warp', (_classNames = {}, _defineProperty(_classNames, 'create-booking-page-info-wrap', isBookingCreatePage), _defineProperty(_classNames, 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode), _classNames))), _React$createElement), /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, 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, {
+  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state5 = modal.state) !== null && _modal$state5 !== void 0 && _modal$state5.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,
@@ -150,6 +134,6 @@ var Info = Provider(function (props) {
     style: {
       paddingTop: 20
     }
-  }, modules.service ? /*#__PURE__*/React.createElement(React.Fragment, null, modal.state.date.value ? /*#__PURE__*/React.createElement(Service, null) : null) : null, modules.service2 ? /*#__PURE__*/React.createElement(React.Fragment, null, modal.state.date.value ? /*#__PURE__*/React.createElement(Service2Cart, null) : null) : null, notes, slot ? slot : null))) : null);
+  }, modules.service ? /*#__PURE__*/React.createElement(React.Fragment, null, modal.state.date.value ? /*#__PURE__*/React.createElement(Service, null) : null) : null, notes, slot ? slot : null))) : null);
 });
 export default Info;

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

@@ -64,9 +64,6 @@ var _miniRedux = miniRedux({
           _val.disabledEdit = false;
         }
         state.setGlobalState(_val);
-      },
-      setActiveCartId: function setActiveCartId(state, payload) {
-        state.setGlobalState(payload);
       }
     },
     reducers: {

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

@@ -1,6 +1,6 @@
 import React from 'react';
-import { InfoProps } from '../../forms/forms';
 import './index.less';
+import { InfoProps } from '../../forms/forms';
 interface PetProps {
     state?: any;
     dispatch?: any;