@pisell/private-materials 3.0.197 → 3.0.199

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

@@ -4,13 +4,9 @@ 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 dayjs from "dayjs";
 import { flexibleObj, isNowTime, getNowTime } from "../../utils";
 import { isWalkIn } from "../../utils";
 import { getSumCapacity } from "../../info2/utilsByBooking";
-import { getDays } from "../../utils";
-import { appointmentTypes } from "../../info/service2/status";
-import { isDayBooking, formatDayTime } from "../../info/service2/utils";
 var formatNote = function formatNote(data) {
   var _data$notes;
   return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || "";
@@ -80,7 +76,7 @@ var getSubType = function getSubType(item) {
   var _item$duration;
   var _type = (_item$duration = item.duration) === null || _item$duration === void 0 ? void 0 : _item$duration.type;
   // 目前不支持跨天
-  if (_type) {
+  if (_type && _type !== 'days') {
     return _type;
   }
   return 'minutes';
@@ -121,135 +117,6 @@ var formatResource = function formatResource(service) {
   }
 };
 
-/**
- * @title: 格式化子预约的holder数据
- * @description: 
- * @param {any} state
- * @param {any} item
- * @param {any} values
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-07 14:52
- */
-var formatHolders = function formatHolders(state, item, values) {
-  var _state$bookingConfig, _state$bookingConfig$, _state$bookingConfig$2, _state$bookingConfig$3, _item$_extend;
-  var form_id = (state === null || state === void 0 ? void 0 : (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 ? void 0 : (_state$bookingConfig$ = _state$bookingConfig.config) === null || _state$bookingConfig$ === void 0 ? void 0 : (_state$bookingConfig$2 = _state$bookingConfig$.basic) === null || _state$bookingConfig$2 === void 0 ? void 0 : (_state$bookingConfig$3 = _state$bookingConfig$2.appointment_subject) === null || _state$bookingConfig$3 === void 0 ? void 0 : _state$bookingConfig$3.form_id) || 0;
-  var obj = {
-    customer_id: values.customer_id,
-    form_id: form_id,
-    form_record: [((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.holder_id) || 0]
-  };
-
-  // 连锁加盟子店铺 增加参数
-  if (state.isFranchisee) {
-    obj.is_source_shop = 1;
-  }
-  return obj;
-};
-
-/**
- * @title: 格式化商品数据
- * @description: 
- * @param {any} item
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-07 14:21
- */
-var formatProducts = function formatProducts(item) {
-  var _item$_extend2, _item$_extend2$other;
-  var total = Number(item._extend.total);
-  var origin_total = Number(item._extend.origin_total);
-  var discount_amount = origin_total - total;
-
-  // 加价时type使用change_price
-  var discount_type = discount_amount < 0 ? 'change_price' : 'discount';
-  return {
-    "num": item._extend.quantity,
-    "price": item._extend.price,
-    "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
-    "discount_amount": discount_amount,
-    "product_discount_reason": item._extend.discount_reason || '',
-    "is_charge_tax": item.is_charge_tax,
-    "note": (item === null || item === void 0 ? void 0 : item.note) || '',
-    "discountway": item._extend.discountway || "num",
-    "discount_per": item._extend.discount_per,
-    "discount_type": item._extend.discount_type || discount_type,
-    "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : (_item$_extend2$other = _item$_extend2.other) === null || _item$_extend2$other === void 0 ? void 0 : _item$_extend2$other.bundle),
-    "bundle_edit": item._extend.bundle_edit
-  };
-};
-
-/**
- * @title: 格式化跨日预约下的普通商品
- * @description: 
- * @param {any} data
- * @param {any} booking_item
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-07 14:48
- */
-var formatDayRelationProducts = function formatDayRelationProducts(data, booking_item) {
-  var list = data.service.value;
-
-  // 过滤出卡片中的普通商品
-  var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend3;
-    var holderId = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.holder_id;
-    var bookingHolderId = booking_item._extend.holder_id;
-    var isAppointment = appointmentTypes.includes(item.extension_type);
-    return holderId && holderId === bookingHolderId && !isAppointment;
-  });
-  relation_products = relation_products.map(function (item) {
-    return formatProducts(item);
-  });
-  return relation_products || [];
-};
-
-/**
- * @title: 格式化跨日预约商品列表
- * @description: 
- * @param {any} data
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-17 11:06
- */
-var formatAppointmentProductLists = function formatAppointmentProductLists(data) {
-  try {
-    var _Array$from;
-    var list = data.service.value;
-
-    // 找出预约商品
-    list = list.filter(function (item) {
-      var _item$_extend4;
-      return ((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.holder_id) && appointmentTypes.includes(item.extension_type);
-    });
-
-    // 对预约商品列表根据holder_id进行分组
-    var groupMap = new Map();
-    list.forEach(function (item) {
-      var _item$_extend5;
-      var key = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id; // 分组键
-      if (!groupMap.has(key)) {
-        groupMap.set(key, []);
-      }
-      groupMap.get(key).push(item);
-    });
-
-    // 处理每个分组
-    groupMap.forEach(function (group) {
-      // 只给第一个数据增加 relation_products
-      group[0].relation_products = formatDayRelationProducts(data, group[0]);
-    });
-
-    // 将分组的结果还原为数组
-    var result = (_Array$from = Array.from(groupMap.values())) === null || _Array$from === void 0 ? void 0 : _Array$from.reduce(function (acc, group) {
-      return acc.concat(group);
-    }, []);
-    return result || [];
-  } catch (error) {}
-};
-
 /**
  * @title: 预约商品信息
  * @description: 
@@ -258,60 +125,42 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
  * @Author: zhiwei.Wang
  * @Date: 2024-02-19 09:26
  */
-var formatBookings = function formatBookings(data, values) {
-  // 是否是跨日预约
-  var isDay = isDayBooking(data);
+var formatBookings = function formatBookings(data) {
   var list = data.service.value;
-
-  // 格式化跨日预约商品列表
-  if (isDay) {
-    list = formatAppointmentProductLists(data);
-  }
-  var dayParams = {
-    relation_products: []
-  };
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
-  console.log(list, 'wh_result11');
   bookings = list.map(function (item) {
+    var _item$_extend, _item$_extend$other;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format("HH:mm");
     var start_time = item._extend.startDate.format("HH:mm");
-
     // 更新当前时间
     if (isNowTime(item._extend.start_time)) {
       start_time = getNowTime();
     }
+    var total = Number(item._extend.total);
+    var origin_total = Number(item._extend.origin_total);
+    var discount_amount = origin_total - total;
 
-    // 跨日预约下的普通商品
-    if (isDay) {
-      var _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9;
-      var startDate = ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate) || ((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.start_date);
-      var endDate = ((_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.endDate) || ((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.end_date);
-      var _formatDayTime = formatDayTime({
-          startDate: startDate,
-          endDate: endDate
-        }),
-        startDateTime = _formatDayTime.startDateTime,
-        endDateTime = _formatDayTime.endDateTime;
-
-      // 根据营业日时间更新时间
-      start_date = dayjs(startDateTime).format('YYYY-MM-DD');
-      start_time = dayjs(startDateTime).format('HH:mm');
-      end_date = dayjs(endDateTime).format('YYYY-MM-DD');
-      end_time = dayjs(endDateTime).format('HH:mm');
-      dayParams.relation_products = (item === null || item === void 0 ? void 0 : item.relation_products) || [];
-      dayParams.holder = formatHolders(data, item, values);
-      dayParams.duration = getDays({
-        _extend: {
-          start_date: startDateTime,
-          end_date: endDateTime
-        }
-      }, 'minutes');
-    }
-    return _objectSpread(_objectSpread({
-      "product": formatProducts(item),
+    // 加价时type使用change_price
+    var discount_type = discount_amount < 0 ? 'change_price' : 'discount';
+    return _objectSpread({
+      "product": {
+        "num": item._extend.quantity,
+        "price": item._extend.price,
+        "product_id": item.id,
+        "discount_amount": discount_amount,
+        "product_discount_reason": item._extend.discount_reason || '',
+        "is_charge_tax": item.is_charge_tax,
+        "note": "",
+        "discountway": item._extend.discountway || "num",
+        "discount_per": item._extend.discount_per,
+        "discount_type": item._extend.discount_type || discount_type,
+        "order_detail_id": item._extend.order_detail_id || 0,
+        "product_bundle": formatProductBundle((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : (_item$_extend$other = _item$_extend.other) === null || _item$_extend$other === void 0 ? void 0 : _item$_extend$other.bundle),
+        "bundle_edit": item._extend.bundle_edit
+      },
       "relation_products": formatRelationDetails(item._extend.relation_details),
       'id': item.booking_id || 0,
       "relation_id": item._extend.relation_id || 0,
@@ -320,12 +169,12 @@ var formatBookings = function formatBookings(data, values) {
       "is_all": false,
       "schedule_id": item._extend.schedule_id || 0,
       "end_time": end_time,
-      "sub_type": isDay ? 'days' : getSubType(item),
+      "sub_type": getSubType(item),
       "select_date": start_date,
       "start_time": start_time,
       "end_date": end_date,
       "start_date": start_date,
-      "duration": isDay ? 0 : flexibleObj.getValue(item._extend.duration),
+      "duration": flexibleObj.getValue(item._extend.duration),
       "number": item._extend.capacity ? getSumCapacity({
         cacheItem: item
       }) : item._extend.number || 1,
@@ -333,34 +182,11 @@ var formatBookings = function formatBookings(data, values) {
       "metadata": item._extend.capacity ? {
         capacity: item._extend.capacity
       } : undefined
-    }, eventOtherParams || {}), dayParams);
+    }, eventOtherParams || {});
   });
   return bookings;
 };
 
-/**
- * @title: 普通商品
- * @description: 
- * @param {any} data
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-06 21:26
- */
-var formatRelationProducts = function formatRelationProducts(data) {
-  var _data$service;
-  var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
-  // open items 下的商品
-  list = list.filter(function (item) {
-    var _item$_extend10;
-    return !((_item$_extend10 = item._extend) !== null && _item$_extend10 !== void 0 && _item$_extend10.holder_id);
-  });
-  var relationProducts = [];
-  relationProducts = list.map(function (item) {
-    return formatProducts(item);
-  });
-  return relationProducts;
-};
-
 /**
  * @title: 预约主体信息
  * @description: 
@@ -371,8 +197,8 @@ var formatRelationProducts = function formatRelationProducts(data) {
  * @Date: 2024-02-19 09:26
  */
 var formatHolder = function formatHolder(state, values) {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$bookingConfig5, _state$pet$value, _state$pet, _state$pet$originValu, _state$pet$originValu2;
-  var form_id = (state === null || state === void 0 ? void 0 : (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 ? void 0 : (_state$bookingConfig3 = _state$bookingConfig2.config) === null || _state$bookingConfig3 === void 0 ? void 0 : (_state$bookingConfig4 = _state$bookingConfig3.basic) === null || _state$bookingConfig4 === void 0 ? void 0 : (_state$bookingConfig5 = _state$bookingConfig4.appointment_subject) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.form_id) || 0;
+  var _state$bookingConfig, _state$bookingConfig$, _state$bookingConfig$2, _state$bookingConfig$3, _state$pet$value, _state$pet, _state$pet$originValu, _state$pet$originValu2;
+  var form_id = (state === null || state === void 0 ? void 0 : (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 ? void 0 : (_state$bookingConfig$ = _state$bookingConfig.config) === null || _state$bookingConfig$ === void 0 ? void 0 : (_state$bookingConfig$2 = _state$bookingConfig$.basic) === null || _state$bookingConfig$2 === void 0 ? void 0 : (_state$bookingConfig$3 = _state$bookingConfig$2.appointment_subject) === null || _state$bookingConfig$3 === void 0 ? void 0 : _state$bookingConfig$3.form_id) || 0;
   var petValue = ((_state$pet$value = state.pet.value) === null || _state$pet$value === void 0 ? void 0 : _state$pet$value[form_id]) || [];
   var obj = {
     customer_id: values.customer_id,
@@ -404,12 +230,9 @@ export var formatValues = function formatValues(state) {
     bookings: [],
     customer_id: 1,
     customer_name: "",
-    holder: {},
-    relation_products: [],
-    metadata: {}
+    holder: {}
   };
-  var isDay = isDayBooking(state);
-  if (!state.bookingId || isDay) {
+  if (!state.bookingId) {
     // 备注
     values.shop_note = formatNote(state);
   }
@@ -428,13 +251,9 @@ export var formatValues = function formatValues(state) {
 
   // 主体
   values.holder = formatHolder(state, values);
-  if (isDay) {
-    // 父预约商品
-    values.relation_products = formatRelationProducts(state);
-  }
 
   // 服务
-  values.bookings = formatBookings(state, values);
+  values.bookings = formatBookings(state);
 
   // 日期
   if ((_values = values) !== null && _values !== void 0 && (_values$bookings = _values.bookings) !== null && _values$bookings !== void 0 && (_values$bookings$ = _values$bookings[0]) !== null && _values$bookings$ !== void 0 && _values$bookings$.select_date && !(state !== null && state !== void 0 && state.bookingId)) {
@@ -444,10 +263,5 @@ export var formatValues = function formatValues(state) {
     startTime = "".concat(startTime || '00:00', ":00");
     values.schedule_date = "".concat(values.bookings[0].select_date, " ").concat(startTime);
   }
-
-  // 跨日预约增加多余参数区分
-  if (isDay) {
-    values.metadata.is_multiday_appointment = 1;
-  }
   return values;
 };

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

@@ -24,20 +24,13 @@ var AddServiceVariant = function AddServiceVariant(props) {
         service: _objectSpread(_objectSpread({}, stateRef.current.service), payload)
       });
     }
-
-    // 更新日期
-    if (type === 'setDate') {
-      setGlobalState({
-        date: _objectSpread(_objectSpread({}, stateRef.current.date), payload)
-      });
-    }
   };
   var Cpt = AddService;
   if (isBooking4Shop((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.global) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id, props === null || props === void 0 ? void 0 : (_props$globalState = props.globalState) === null || _props$globalState === void 0 ? void 0 : _props$globalState.renderType)) {
     Cpt = AddService2;
   }
   return /*#__PURE__*/React.createElement(Cpt, {
-    renderMode: 'current',
+    renderMode: "current",
     dispatch: dispatch,
     state: globalState,
     drawerProps: {

package/es/components/booking/info/clientVariant/vertical/SelectDrawer.d.ts

@@ -19,7 +19,6 @@ interface SelectDrawerProps {
     modalOpen: boolean;
     franchiseeLoading?: number;
     showHeader?: boolean;
-    showWalkIn?: boolean;
 }
 declare const _default: React.ForwardRefExoticComponent<SelectDrawerProps & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -99,8 +99,7 @@ var SelectDrawer = function SelectDrawer(props, ref) {
     handleAddPet = props.handleAddPet,
     modalOpen = props.modalOpen,
     franchiseeLoading = props.franchiseeLoading,
-    showHeader = props.showHeader,
-    showWalkIn = props.showWalkIn;
+    showHeader = props.showHeader;
   var form = (formData === null || formData === void 0 ? void 0 : formData[0]) || {};
   var valList = (childrenValue === null || childrenValue === void 0 ? void 0 : childrenValue[form.id]) || defaultArr;
   var _useState = useState(valList),
@@ -108,6 +107,13 @@ var SelectDrawer = function SelectDrawer(props, ref) {
     _value = _useState2[0],
     setValue = _useState2[1];
   var clientRef = useRef();
+  useEffect(function () {
+    setValue(valList.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        id: item.id || item.form_record_id
+      });
+    }));
+  }, [valList]);
   var searchRef = useRef();
 
   // 是否打开弹窗
@@ -119,13 +125,6 @@ var SelectDrawer = function SelectDrawer(props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     search = _useState6[0],
     _setSearch = _useState6[1];
-  useEffect(function () {
-    setValue(valList.map(function (item) {
-      return _objectSpread(_objectSpread({}, item), {}, {
-        id: item.id || item.form_record_id
-      });
-    }));
-  }, [valList, open]);
   useEffect(function () {
     if (!modalOpen) {
       setOpen(false);
@@ -169,12 +168,12 @@ var SelectDrawer = function SelectDrawer(props, ref) {
     if (getIsWalkIn(item === null || item === void 0 ? void 0 : item.id)) {
       return locales.getText('pisell2.text.select-a-customer');
     }
-    var firstLastName = item.first_name || item.last_name ? "".concat(item.first_name, " ").concat(item.last_name) : '';
+    var firstLastName = item.first_name || item.last_name ? "".concat(item.first_name, " ").concat(item.last_name) : "";
     return item.name || (item.display_name || '').trim() || (item.nickname || '').trim() || firstLastName.trim() || '';
   }, [locales.localeMap]);
   var handleAddClient = function handleAddClient() {
     handleCreateItem(function () {
-      _setSearch('');
+      _setSearch("");
     });
   };
   var handleChildrenValueChange = /*#__PURE__*/function () {
@@ -312,7 +311,7 @@ var SelectDrawer = function SelectDrawer(props, ref) {
   }();
   return /*#__PURE__*/React.createElement(Drawer, {
     showGoBack: showHeader,
-    title: showHeader && locales.getText('pisell2.text.select-customer'),
+    title: showHeader && locales.getText("pisell2.text.select-customer"),
     open: open,
     onClose: closeDrawer,
     header: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Input, {
@@ -352,13 +351,13 @@ var SelectDrawer = function SelectDrawer(props, ref) {
   }, /*#__PURE__*/React.createElement(ActionItem, {
     title: locales.getText('pisell2.text.create-new-customer'),
     onClick: handleAddClient
-  }), showWalkIn ? /*#__PURE__*/React.createElement(ActionItem, {
+  }), /*#__PURE__*/React.createElement(ActionItem, {
     title: "Walk-In",
     onClick: function onClick() {
       handleSelectClient([]);
       closeDrawer();
     }
-  }) : null), /*#__PURE__*/React.createElement(Spin, {
+  })), /*#__PURE__*/React.createElement(Spin, {
     spinning: !!loading,
     delay: 500
   }, !!options.length ? options.map(function (item) {

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

@@ -32,17 +32,14 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import { formatAddFormValues } from "../../../forms/format";
 import { moveItemToFront } from "../../utils";
 import { request } from "../../../utils";
-import { isDayBooking, isOpenDeletePet } from "../../service2/utils";
-import ChangePetModal from "../../pet/ChangePetModal";
 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$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 _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),
@@ -96,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;
@@ -120,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,
@@ -271,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, {
@@ -317,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;
@@ -412,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

@@ -23,20 +23,17 @@ import Notes from "./notes";
 import "./index.less";
 import classNames from 'classnames';
 import { Skeleton } from 'antd';
-import { Service2Cart } from "./service2";
-import { isDayBooking, isTerminalDayBooking } from "./service2/utils";
 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, _React$createElement;
+  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,
@@ -108,24 +105,15 @@ 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 (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]);
+  }, [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,
@@ -136,9 +124,9 @@ var Info = Provider(function (props) {
     })
   }, _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 && !isTerminalDayBooking(modal.state)), _classNames))), _React$createElement), /*#__PURE__*/React.createElement("div", {
+  }), _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,
@@ -146,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: {