@pisell/private-materials 6.0.24 → 6.0.25

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

@@ -17,29 +17,33 @@ 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, { 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 User01 from '@pisell/icon/es/User01';
 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 { moveItemToFront } from "../../utils";
 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";
 var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context$appHelper, _context$appHelper$ge, _state$bookingConfig2, _state$bookingConfig4, _state$pet3, _state$pet4, _state$pet6, _state$pet8, _state$client$value3, _state$bookingConfig7, _state$pet9, _state$bookingConfig8, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _context$appHelper2, _context$appHelper2$i, _state$bookingConfig9, _state$client6;
+  var _context$appHelper, _context$appHelper$ge, _state$bookingConfig2, _state$bookingConfig4, _state$pet3, _state$pet4, _state$pet6, _state$pet8, _state$client$value3, _state$bookingConfig7, _state$pet9, _state$bookingConfig8, _state$service2, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _context$appHelper2, _context$appHelper2$i, _state$bookingConfig9, _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),
@@ -74,6 +78,7 @@ 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);
@@ -93,6 +98,13 @@ 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;
@@ -110,6 +122,21 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }, [state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.appointment_customer) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.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 || _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,
@@ -245,7 +272,8 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
   }, [isWalkIn, formId, (_state$client$value3 = state.client.value) === null || _state$client$value3 === void 0 ? void 0 : _state$client$value3.id, currentPetValue, boardConfig]);
   var petRender = useMemo(function () {
     var _state$bookingConfig6;
-    if (state !== null && state !== void 0 && state.disabledEdit || boardConfig.type !== 'form') {
+    // 跨日预约需要显示pet
+    if ((state !== null && state !== void 0 && state.disabledEdit || boardConfig.type !== 'form') && !isDayBooking(state)) {
       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, {
@@ -290,7 +318,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 || (_state$bookingConfig7 = state.bookingConfig) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.holder) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.form) === null || _state$bookingConfig7 === void 0 ? void 0 : _state$bookingConfig7.title, (_state$pet9 = state.pet) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9.formData) === null || _state$pet9 === void 0 ? void 0 : _state$pet9[0], state, petDispatch, handleOpenModal, handleOpenClientModal, previewItemTitleRender, handleAddPet, currentPetValue, formId, state === null || state === void 0 || (_state$bookingConfig8 = state.bookingConfig) === null || _state$bookingConfig8 === void 0 || (_state$bookingConfig8 = _state$bookingConfig8.holder) === null || _state$bookingConfig8 === void 0 ? void 0 : _state$bookingConfig8.data_range]);
+  }, [isWalkIn, isHasFormRecord, state === null || state === void 0 ? void 0 : state.disabledEdit, boardConfig.type, state === null || state === void 0 || (_state$bookingConfig7 = state.bookingConfig) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.holder) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.form) === null || _state$bookingConfig7 === void 0 ? void 0 : _state$bookingConfig7.title, (_state$pet9 = state.pet) === null || _state$pet9 === void 0 || (_state$pet9 = _state$pet9.formData) === null || _state$pet9 === void 0 ? void 0 : _state$pet9[0], state, petDispatch, handleOpenModal, handleOpenClientModal, previewItemTitleRender, handleAddPet, currentPetValue, formId, state === null || state === void 0 || (_state$bookingConfig8 = state.bookingConfig) === null || _state$bookingConfig8 === void 0 || (_state$bookingConfig8 = _state$bookingConfig8.holder) === null || _state$bookingConfig8 === void 0 ? void 0 : _state$bookingConfig8.data_range, (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value]);
   var handleOpenClient = function handleOpenClient() {
     if (!isWalkIn || state !== null && state !== void 0 && state.disableEventBookingEdit) {
       return;
@@ -305,6 +333,91 @@ 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$client$value4, _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 || (_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length) > 0 && ((_state$client$value4 = state.client.value) === null || _state$client$value4 === void 0 ? void 0 : _state$client$value4.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 || _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(_x) {
+      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", {
@@ -318,7 +431,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$value4 = state.client.value) === null || _state$client$value4 === void 0 ? void 0 : _state$client$value4.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"
@@ -331,11 +444,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$value5 = state.client.value) !== null && _state$client$value5 !== void 0 && _state$client$value5.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$value6 = state.client.value) === null || _state$client$value6 === void 0 ? void 0 : _state$client$value6.email) : null, (_state$client$value7 = state.client.value) !== null && _state$client$value7 !== void 0 && _state$client$value7.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$value8 = state.client.value) === null || _state$client$value8 === void 0 ? void 0 : _state$client$value8.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: {
@@ -373,7 +486,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 = _context$appHelper2.utils) !== null && _context$appHelper2 !== void 0 && (_context$appHelper2$i = _context$appHelper2.isTerminal) !== null && _context$appHelper2$i !== void 0 && _context$appHelper2$i.call(_context$appHelper2)),
     ref: modalRef,
     onClose: handleClose,
-    handleSelectClient: handleSelectClient,
+    handleSelectClient: _handleSelectClient,
     handleCreateItem: handleCreateItem,
     childrenValue: state.pet.value,
     handleSelectPet: handleSelectPet,
@@ -385,7 +498,10 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
     loadMore: loadMore,
     showPet: (boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.type) === 'form',
     handleAddPet: handleAddPet,
-    franchiseeLoading: franchiseeLoading
+    franchiseeLoading: franchiseeLoading,
+    showWalkIn: !isDayBooking(state)
+  }), /*#__PURE__*/React.createElement(ChangePetModal, {
+    ref: changePetRef
   }));
 });
 export default VerticalClient;

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

@@ -0,0 +1,4 @@
+import './index.less';
+export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
+declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;
+export default DateRange;

package/es/components/booking/info/dateRange/index.js

@@ -0,0 +1,98 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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, { useEffect, useMemo, useState } from 'react';
+import { CalendarOutlined } from '@ant-design/icons';
+import classNames from 'classnames';
+import dayjs from 'dayjs';
+import { DatePicker, Page } from '@pisell/materials';
+import "./index.less";
+
+// 禁用之前的日期
+export var disabledDate = function disabledDate(current, position, currentDate) {
+  if (position === 'start') {
+    return false;
+  }
+  if (position === 'end' && current.endOf('day') && currentDate !== null && currentDate !== void 0 && currentDate[0]) {
+    // 结束日期最大 = 开始日期 + 8个月
+    var endDisabled = currentDate === null || currentDate === void 0 ? void 0 : currentDate[0].add(8, 'months').format('YYYY-MM-DD');
+    return dayjs(endDisabled) < current.startOf('day') || current.startOf('day') <= (currentDate === null || currentDate === void 0 ? void 0 : currentDate[0]);
+  }
+  return current && current <= (currentDate === null || currentDate === void 0 ? void 0 : currentDate[0]);
+};
+var DateRange = function DateRange(_ref) {
+  var state = _ref.state,
+    dispatch = _ref.dispatch,
+    key = _ref.key;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    value = _useState2[0],
+    setValue = _useState2[1];
+  useEffect(function () {
+    var _state$date, _state$date2;
+    var lists = [(_state$date = state.date) === null || _state$date === void 0 ? void 0 : _state$date.value, (_state$date2 = state.date) === null || _state$date2 === void 0 ? void 0 : _state$date2.end_date];
+    setValue(lists);
+    console.log('lists', lists);
+  }, [state.date]);
+
+  /**
+   * @title: 点击确定
+   * @description:
+   * @param {any} e
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-12-12 15:39
+   */
+  var dateChange = function dateChange(e) {
+    dispatch({
+      type: 'setDate',
+      payload: {
+        value: e[0],
+        end_date: e[1],
+        edit: true
+      }
+    });
+  };
+
+  /**
+   * @title: 格式化语言
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-12-09 17:47
+   */
+  var formatLocale = useMemo(function () {
+    var locale = state === null || state === void 0 ? void 0 : state.locale;
+    var isEn = locale === 'en' || locale === 'en-US';
+    var _format = isEn ? 'DD/MM/YYYY' : 'YYYY-MM-DD';
+    return _format;
+  }, [state === null || state === void 0 ? void 0 : state.locale, state.date]);
+  return useMemo(function () {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: classNames('pisell-lowcode__booking-service-header-date-range', {
+        'pisell-lowcode__booking-service-header-date-range-terminal': state.isTerminalDayBookingPage
+      })
+    }, /*#__PURE__*/React.createElement(Page, null, /*#__PURE__*/React.createElement(DatePicker.RangePicker, {
+      key: key,
+      inputReadOnly: true,
+      allowClear: false,
+      size: "large",
+      style: {
+        width: '100%',
+        padding: 0
+      },
+      suffixIcon: !state.disabledEdit ? /*#__PURE__*/React.createElement(CalendarOutlined, null) : null,
+      disabledDate: disabledDate,
+      value: [value[0], value[1]],
+      onChange: dateChange,
+      format: formatLocale,
+      isHideCustomSelect: true,
+      endDateDays: 1
+    }))));
+  }, [value, state.disabledEdit, state === null || state === void 0 ? void 0 : state.locale]);
+};
+export default DateRange;

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

@@ -0,0 +1,21 @@
+.pisell-lowcode__booking-service-header-date-range {
+  flex: 1.1;
+  margin-top: 16px;
+
+  .pisell-date-range-picker > div > div {
+    height: 44px !important;
+    cursor: pointer !important;
+    input {
+      cursor: pointer;
+    }
+  }
+
+  .anticon-calendar {
+    font-size: 20px;
+    color: #667085;
+  }
+}
+
+.pisell-lowcode__booking-service-header-date-range-terminal {
+  margin-top: 0;
+}

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

@@ -4,38 +4,40 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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 localeTexts from "../locales";
-import { locales } from '@pisell/utils';
-import { findNextDuration, flexibleObj, formatResource, getErrorList, sliceDayIntoFiveMinutes, request } from "../utils";
-import { updateServiceDate } from "./date";
-import useEngineContext from "../../../hooks/useEngineContext";
-import Notes from "./notes";
-import "./index.less";
-import classNames from 'classnames';
+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 { updateServiceDate } from "./date";
 import { getLocale } from "../../../utils/locales";
+import "./index.less";
+import Notes from "./notes";
+import { Service2Cart } from "./service2";
+import { isDayBooking, isEventBooking, isTerminalDayBooking } from "./service2/utils";
 var defaultModules = {
   client: 1,
   date: 1,
   service: 1,
   holder: 1,
-  note: 1
+  note: 1,
+  service2: 0
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state4, _context$appHelper4, _modal$state5;
-  // return <Payments {...props} />;
+  var _modal$state2, _modal$state5, _context$appHelper4, _modal$state6;
   var style = props.style,
     globalState = props.globalState,
     _props$modules = props.modules,
@@ -78,7 +80,8 @@ var Info = Provider(function (props) {
       }, globalState), {}, {
         isTerminal: context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$i = _context$appHelper2.isTerminal) === null || _context$appHelper2$i === void 0 ? void 0 : _context$appHelper2$i.call(_context$appHelper2),
         isFranchisee: isFranchisee,
-        timezone: context === null || context === void 0 || (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.utils) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.store) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.getState()) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.global) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.globalConfig) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.timezone
+        timezone: context === null || context === void 0 || (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.utils) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.store) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.getState()) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.global) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.globalConfig) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.timezone,
+        isDayBooking: (globalState === null || globalState === void 0 ? void 0 : globalState.renderType) === 'dayBooking'
       })
     });
   }, [JSON.stringify(globalState)]);
@@ -106,28 +109,41 @@ var Info = Provider(function (props) {
     });
   }, [globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, modal.state, modal.dispatch, globalState === null || globalState === void 0 ? void 0 : globalState.renderType]);
   var notes = useMemo(function () {
-    var _modal$state3;
+    var _modal$state4;
     if (!modules.note) {
       return null;
     }
+    if (isEventBooking(modal.state)) {
+      return null;
+    }
+
+    // 跨日预约一直显示备注
+    if (isDayBooking(globalState)) {
+      var _modal$state3;
+      return /*#__PURE__*/React.createElement(AddNote, {
+        value: (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote,
+        onChange: addNote
+      });
+    }
     return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' || globalState.isBookingCreatePage ? /*#__PURE__*/React.createElement(Notes, null) : null : /*#__PURE__*/React.createElement(AddNote, {
-      value: (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote,
+      value: (_modal$state4 = modal.state) === null || _modal$state4 === void 0 || (_modal$state4 = _modal$state4.notes) === null || _modal$state4 === void 0 ? void 0 : _modal$state4.orderNote,
       onChange: addNote
     });
-  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state4 = modal.state) === null || _modal$state4 === void 0 || (_modal$state4 = _modal$state4.notes) === null || _modal$state4 === void 0 ? void 0 : _modal$state4.orderNote]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
-    style: style,
+  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state5 = modal.state) === null || _modal$state5 === void 0 || (_modal$state5 = _modal$state5.notes) === null || _modal$state5 === void 0 ? void 0 : _modal$state5.orderNote]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
+    style: _objectSpread(_objectSpread({}, style), {}, {
+      height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
+    }),
     header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {
       state: modal.state,
       dispatch: modal.dispatch,
       source: "info"
-    })
-  }, "style", {
-    height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
-  }), "bodyClassName", classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode))), /*#__PURE__*/React.createElement("div", {
+    }),
+    bodyClassName: classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode && !isTerminalDayBooking(modal.state)))
+  }, /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$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, {
+  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state6 = modal.state) !== null && _modal$state6 !== void 0 && _modal$state6.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,
@@ -135,6 +151,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, notes, slot ? slot : null))) : null);
+  }, 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);
 });
 export default Info;

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

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

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

@@ -0,0 +1,4 @@
+import React from 'react';
+import './index.less';
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+export default _default;