@pisell/private-materials 6.3.15 → 6.4.1

package/es/components/booking/info/hooks/useInfoHolder.js

@@ -10,9 +10,11 @@ import useHolderConfig from "./useHolderConfig";
 import { isOpenAddTime } from "../utils";
 import useGetHolderList from "./useGetHolderList";
 import { getProductExtend } from "../../info2/service/addService/utils";
+import { getIsNoSpecAndPackage } from "../../info2/utilsByBooking";
 var useInfoHolder = function useInfoHolder(state, dispatch) {
   var _state$client, _state$bookingConfig2;
   var detailRef = useRef();
+  var editNormalServiceRef = useRef(null);
   var _useHolderConfig = useHolderConfig(state),
     holder = _useHolderConfig.holder,
     isFormSubject = _useHolderConfig.isFormSubject,
@@ -30,19 +32,17 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
     };
   }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.information_tab]);
   var showAddTimeModal = useMemo(function () {
-    return isOpenAddTime(state) && !state.isBookingTicket2;
+    return isOpenAddTime(state);
   }, [state, appointment_card.quick_time]);
   var handleEdit = useMemoizedFn(function (cacheItem, type) {
-    var _detailRef$current, _detailRef$current$in;
-    // console.timeEnd('handleChange');
-    console.time('handleEdit');
-    console.log(performance.now() - window.pp1, '打开商品4');
-    (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
-    // setTimeout(() => {
-    //   console.log(performance.now() - window.pp1, '打开商品5');
-    //   console.timeEnd('handleEdit')
-    //   detailRef.current?.init?.(cacheItem, false, type === 'edit_product');
-    // }, );
+    var isNoSpecAndPackage = getIsNoSpecAndPackage(cacheItem);
+    if (isNoSpecAndPackage) {
+      var _editNormalServiceRef;
+      (_editNormalServiceRef = editNormalServiceRef.current) === null || _editNormalServiceRef === void 0 || _editNormalServiceRef.init(cacheItem);
+    } else {
+      var _detailRef$current, _detailRef$current$in;
+      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem, false, type === 'edit_product');
+    }
   });
   var dispatchService = function dispatchService(type, payload) {
     dispatch({
@@ -70,7 +70,8 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
     handleEdit: handleEdit,
     dispatchService: dispatchService,
     handleAction: handleAction,
-    showAddTimeModal: showAddTimeModal
+    showAddTimeModal: showAddTimeModal,
+    editNormalServiceRef: editNormalServiceRef
   };
 };
 export default useInfoHolder;

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

@@ -5,11 +5,12 @@ import useEngineContext from "../../../hooks/useEngineContext";
 import { isBooking4Shop } from "./utils";
 import { Skeleton } from 'antd';
 var APP = function APP(props) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5;
+  var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3;
   var context = useEngineContext();
   var globalState = props.globalState;
-  var isBooking4 = isBooking4Shop((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id, globalState === null || globalState === void 0 ? void 0 : globalState.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
-  if (!((_context$appHelper$ut4 = context.appHelper.utils.store) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut5 = _context$appHelper$ut4.getState) !== null && _context$appHelper$ut5 !== void 0 && (_context$appHelper$ut5 = _context$appHelper$ut5.call(_context$appHelper$ut4)) !== null && _context$appHelper$ut5 !== void 0 && (_context$appHelper$ut5 = _context$appHelper$ut5.global) !== null && _context$appHelper$ut5 !== void 0 && (_context$appHelper$ut5 = _context$appHelper$ut5.globalConfig) !== null && _context$appHelper$ut5 !== void 0 && _context$appHelper$ut5.id)) {
+  var shopId = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getData) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'shop_id')) || ((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id);
+  var isBooking4 = isBooking4Shop(shopId, globalState === null || globalState === void 0 ? void 0 : globalState.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
+  if (!shopId) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
         padding: 16

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

@@ -4,6 +4,22 @@
   .booking-info {
     padding-bottom: 16px;
 
+    .booking-info-client-line {
+      display: flex;
+      flex-direction: row;
+      gap: 10px;
+
+      .booking-info-client-line-code {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 64px;
+        height: 64px;
+        border-radius: 8px;
+        background: #5d3f9f;
+        cursor: pointer;
+      }
+    }
   }
 
   // &::before {
@@ -22,11 +38,11 @@
   }
 }
 .create-booking-page-info-wrap-create {
-  background: var(--Success-50, #ECFDF3);
+  background: var(--Success-50, #ecfdf3);
 }
 .create-booking-page-info-wrap {
   position: initial !important;
-  padding: 0 16px !important;
+  padding: 0 10px !important;
   .booking-info-create-new {
     margin-top: 10px;
     color: var(--Base-Black, #000);
@@ -34,4 +50,4 @@
     font-weight: 600;
     line-height: 32px;
   }
-}
+}

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

@@ -9,7 +9,6 @@ import React, { useContext, useEffect, useMemo } from 'react';
 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";
@@ -37,7 +36,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state5, _context$appHelper4, _modal$state6;
+  var _modal$state2, _modal$state3, _context$appHelper4, _modal$state4;
   var style = props.style,
     globalState = props.globalState,
     _props$modules = props.modules,
@@ -109,7 +108,6 @@ 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;
     if (!modules.note) {
       return null;
     }
@@ -119,17 +117,15 @@ var Info = Provider(function (props) {
 
     // 跨日预约一直显示备注
     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 (
+        // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
+        null
+      );
     }
-    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 || (_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$state5 = modal.state) === null || _modal$state5 === void 0 || (_modal$state5 = _modal$state5.notes) === null || _modal$state5 === void 0 ? void 0 : _modal$state5.orderNote]);
+    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' || globalState.isBookingCreatePage ? /*#__PURE__*/React.createElement(Notes, null) : null :
+    // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
+    null;
+  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.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'
@@ -140,10 +136,13 @@ var Info = Provider(function (props) {
       dispatch: modal.dispatch,
       source: "info"
     }),
-    bodyClassName: classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode && !isTerminalDayBooking(modal.state)))
+    bodyClassName: classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode && !isTerminalDayBooking(modal.state))),
+    state: modal.state,
+    dispatch: modal.dispatch,
+    source: "info"
   }, /*#__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$state4 = modal.state) !== null && _modal$state4 !== void 0 && _modal$state4.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,

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

@@ -146,5 +146,5 @@
 }
 
 .pisell-lowcode__booking-pet-wraps {
-  margin-top: 16px;
+  margin-top: 12px;
 }

package/es/components/booking/info/service/Lists.js

@@ -36,6 +36,7 @@ var Lists = function Lists(_ref) {
    * @Date: 2024-11-29 16:35
    */
   var handleChange = useMemoizedFn(function (currentItem, type, other) {
+    var _window$closeBookingE, _window2;
     console.time('handleChange');
     console.log(window.pp1 = performance.now(), '打开商品');
     if (state.disabledEdit || state.disableEventBookingEdit) {
@@ -47,6 +48,7 @@ var Lists = function Lists(_ref) {
 
     // 查看
     if (type === 'view' || type === 'edit_product') {
+      var _window$openBookingEd, _window;
       var product = currentItem._origin;
       var cacheItem = _objectSpread(_objectSpread({}, product), {}, {
         new: 0
@@ -57,12 +59,14 @@ var Lists = function Lists(_ref) {
           state: state
         });
       }
+      (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
       onChange({
         editModal: true,
         cacheItem: cacheItem
       });
       return onEdit === null || onEdit === void 0 ? void 0 : onEdit(cacheItem, type);
     }
+    (_window$closeBookingE = (_window2 = window).closeBookingEditModal) === null || _window$closeBookingE === void 0 || _window$closeBookingE.call(_window2);
     var params = {
       editModal: false,
       value: products,
@@ -81,9 +85,10 @@ var Lists = function Lists(_ref) {
    * @Date: 2024-12-09 16:07
    */
   var productParams = useMemo(function () {
+    var _state$bookingConfig;
     return {
       hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
-      isShowNote: isEventBooking(state),
+      isShowNote: state.isBookingTicket2 ? true : isEventBooking(state),
       isShowPackageNote: false,
       accounts: [],
       isEdit: !!(state !== null && state !== void 0 && state.bookingId),
@@ -92,9 +97,10 @@ var Lists = function Lists(_ref) {
       isShowChangeHolder: isShowChangeHolder,
       isShowChangeResource: true,
       isShowAddHolderButton: true,
-      isShowEditProduct: !state.isBookingCreatePage
+      isShowEditProduct: !state.isBookingCreatePage,
+      productCardStyleConfig: (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.cart_settings_tab
     };
-  }, [state === null || state === void 0 ? void 0 : state.bookingId, state === null || state === void 0 ? void 0 : state.disabledEdit, isShowChangeHolder, state.isBookingCreatePage]);
+  }, [state === null || state === void 0 ? void 0 : state.bookingId, state === null || state === void 0 ? void 0 : state.disabledEdit, isShowChangeHolder, state.isBookingCreatePage, state.bookingConfig]);
   var products = useMemo(function () {
     var _state$service;
     console.time('products');
@@ -109,6 +115,7 @@ var Lists = function Lists(_ref) {
         state: state
       }
     }, /*#__PURE__*/React.createElement(ShoppingCart, {
+      scenario: state.isBookingTicket2 ? 'booking2' : undefined,
       isParallelResource: isParallelResource,
       onAction: onAction,
       onChange: handleChange,

package/es/components/booking/info/service/addService/index.js

@@ -389,9 +389,9 @@ var Info = function Info(props) {
     return ((_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.service.value]);
   useEffect(function () {
-    var _context$appHelper$ut, _context$appHelper$ut2, _state$service4;
+    var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _state$service4;
     // Salonip 不要这个
-    if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id) || state.closeAutoOpenService) {
+    if (shopList.includes(((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getData) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'shop_id')) || ((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id)) || state.closeAutoOpenService) {
       return;
     }
 

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

@@ -259,7 +259,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 13:59
    */
   var handleDeleteProduct = useMemoizedFn(function () {
-    var _state$service$cacheI;
+    var _state$service$cacheI, _window$closeBookingE, _window;
     if (state.channelDisabledEdit) {
       return;
     }
@@ -272,6 +272,7 @@ var Info = function Info(_, ref) {
         return d._id !== _id;
       });
     }
+    (_window$closeBookingE = (_window = window).closeBookingEditModal) === null || _window$closeBookingE === void 0 || _window$closeBookingE.call(_window);
     dispatch({
       type: 'setService',
       payload: {
@@ -787,9 +788,11 @@ var Info = function Info(_, ref) {
    * @Date: 2024-08-28 17:10
    */
   var handleChange = useMemoizedFn(function (e) {
+    var _window$openBookingEd, _window2;
     if (state.channelDisabledEdit) {
       return;
     }
+    (_window$openBookingEd = (_window2 = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window2);
     dispatch({
       type: 'setService',
       payload: {
@@ -977,6 +980,8 @@ var Info = function Info(_, ref) {
       open: state.service.editModal && !((_state$service$cacheI8 = state.service.cacheItem) !== null && _state$service$cacheI8 !== void 0 && _state$service$cacheI8.autoClose),
       title: isDayBookingMode ? locales.getText('pisell2.text.edit-select-service') : locales.getText('pisell2.text.edit-service'),
       onClose: function onClose() {
+        var _window$closeBookingE2, _window3;
+        (_window$closeBookingE2 = (_window3 = window).closeBookingEditModal) === null || _window$closeBookingE2 === void 0 || _window$closeBookingE2.call(_window3);
         dispatch({
           type: 'setService',
           payload: {

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

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-service-wrap {
-  margin-top: 16px;
+  margin-top: 12px;
   .pisell-lowcode__booking-service-clear-btn {
     cursor: pointer;
     margin-top: -12px;

package/es/components/booking/info/service/like/index.js

@@ -19,7 +19,7 @@ var Like = function Like(_ref) {
       }
       e.preventDefault();
       e.stopPropagation();
-      onChange === null || onChange === void 0 ? void 0 : onChange(status === "like" ? "common" : "like");
+      onChange === null || onChange === void 0 || onChange(status === "like" ? "common" : "like");
     }
   });
 };

package/es/components/booking/info/service/serviceItem/index.js

@@ -39,7 +39,7 @@ var ServiceItem = function ServiceItem(_ref) {
     icon: /*#__PURE__*/React.createElement(Iconfont, {
       type: "pisell2-trash-01"
     })
-  })), d.id ? /*#__PURE__*/React.createElement("div", {
+  })), d.id || d.isCustomItem ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-title"
   }, d.title) : null, d._extend ? /*#__PURE__*/React.createElement(React.Fragment, null, state.renderType !== 'eventBooking' && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-date"
@@ -59,7 +59,7 @@ var ServiceItem = function ServiceItem(_ref) {
     renderItem: function renderItem(item) {
       return renderBundles(item, state.amountSymbol);
     }
-  }) : null, d.id ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }) : null, d.id || d.isCustomItem ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-price-wrap"
   }, /*#__PURE__*/React.createElement("span", {
     className: "pisell-lowcode__booking-service-item-price"

package/es/components/booking/info/service/serviceList/index.js

@@ -30,9 +30,11 @@ var ServiceList = function ServiceList(_ref) {
     maxLimit: locales.getText('pisell2.text.status.service-error-3')
   };
   var handleEditService = function handleEditService(item) {
+    var _window$openBookingEd, _window;
     if (state.disabledEdit || state.disableEventBookingEdit) {
       return;
     }
+    (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
     dispatch({
       type: 'setService',
       payload: {
@@ -47,6 +49,7 @@ var ServiceList = function ServiceList(_ref) {
     }));
   };
   var handleDeleteService = function handleDeleteService(item) {
+    var _window$closeBookingE, _window2;
     if (state.disabledEdit || state.disableEventBookingEdit || state.channelDisabledEdit) {
       return;
     }
@@ -54,6 +57,7 @@ var ServiceList = function ServiceList(_ref) {
     _list = _list.filter(function (d) {
       return d._id !== item._id;
     });
+    (_window$closeBookingE = (_window2 = window).closeBookingEditModal) === null || _window$closeBookingE === void 0 || _window$closeBookingE.call(_window2);
     dispatch({
       type: 'setService',
       payload: {

package/es/components/booking/info/service/serviceManager/index.js

@@ -209,7 +209,7 @@ export var useService = function useService(_ref) {
   }();
   var editBooking = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref9) {
-      var _booking$_extend;
+      var _booking$_extend, _window$closeBookingE, _window;
       var booking, _list, _id, groupId;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -242,6 +242,7 @@ export var useService = function useService(_ref) {
               }
             }
             deleteCacheParams();
+            (_window$closeBookingE = (_window = window).closeBookingEditModal) === null || _window$closeBookingE === void 0 || _window$closeBookingE.call(_window);
             dispatch({
               type: 'setService',
               payload: {
@@ -253,7 +254,7 @@ export var useService = function useService(_ref) {
                 changeService: false
               }
             });
-          case 7:
+          case 8:
           case "end":
             return _context4.stop();
         }
@@ -264,7 +265,9 @@ export var useService = function useService(_ref) {
     };
   }();
   var goEditPanel = function goEditPanel(_ref11) {
+    var _window$openBookingEd, _window2;
     var booking = _ref11.booking;
+    (_window$openBookingEd = (_window2 = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window2);
     dispatch({
       type: 'setService',
       payload: {

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

@@ -55,12 +55,14 @@ var Lists = function Lists(_ref) {
 
     // 查看
     if (type === 'view') {
+      var _window$openBookingEd, _window;
       var product = currentItem._origin;
       // if (isGroupBooking(currentItem._id)) {
       //   product = currentItem._origin;
       // } else {
       //   product = products?.find((item: any) => item._id === currentItem._id);
       // }
+      (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
       onChange({
         editModal: true,
         cacheItem: _objectSpread(_objectSpread({}, product), {}, {

package/es/components/booking/info/service2/utils.d.ts

@@ -58,6 +58,7 @@ export declare const getIsSubjectRequire: (state: any) => boolean;
 export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
 export declare const isAllNormalProduct: (items: any[]) => boolean;
 export declare const isAllNormalProductByState: (state: any) => boolean;
+export declare const genRowKey: (key: string) => string;
 /**
  * @title: 格式化商品数据
  * @description:
@@ -71,6 +72,7 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     id: any;
     _id: any;
     name: any;
+    title: any;
     price: any;
     total: number;
     origin_total: number;
@@ -91,6 +93,8 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     end_date: any;
     holder_id: any;
     isNormalProduct: boolean;
+    isCustomItem: any;
+    vouchersApplicable: any;
     locale: any;
     symbol: any;
     relation_products: any;
@@ -244,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

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

@@ -365,6 +365,15 @@ export var updateServices = function updateServices(state, currentItem, type, ot
     products = handleChangeResource(products, currentItem, other, state);
     return products;
   }
+  if (type === 'num') {
+    return products.map(function (product) {
+      if (product._id === currentItem._id) {
+        product._extend.quantity = other.num;
+        return product;
+      }
+      return product;
+    });
+  }
 
   // 更新商品的holder_id
   if (type === 'update_holders') {
@@ -429,6 +438,7 @@ var formatBundle = function formatBundle(bundle) {
     return {
       id: item === null || item === void 0 ? void 0 : item.id,
       title: item === null || item === void 0 ? void 0 : item.title,
+      cover: item === null || item === void 0 ? void 0 : item.cover,
       num: item === null || item === void 0 ? void 0 : item.num,
       price: item === null || item === void 0 ? void 0 : item.price,
       total: item === null || item === void 0 ? void 0 : item.price,
@@ -531,7 +541,7 @@ export var getIsSubjectRequire = function getIsSubjectRequire(state) {
 // 非预约商品 通过时长和日程判断是否是普通商品
 export var isNormalProductByDurationSchedule = function isNormalProductByDurationSchedule(item) {
   var _item$schedules, _item$scheduleIds;
-  return !(item !== null && item !== void 0 && item.duration) && !(item !== null && item !== void 0 && (_item$schedules = item.schedules) !== null && _item$schedules !== void 0 && _item$schedules.length) && !((_item$scheduleIds = item['schedule.ids']) !== null && _item$scheduleIds !== void 0 && _item$scheduleIds.length);
+  return !(item !== null && item !== void 0 && item.duration) && !(item !== null && item !== void 0 && (_item$schedules = item.schedules) !== null && _item$schedules !== void 0 && _item$schedules.length) && !(item !== null && item !== void 0 && (_item$scheduleIds = item['schedule.ids']) !== null && _item$scheduleIds !== void 0 && _item$scheduleIds.length);
 };
 
 // 是否全部是普通商品
@@ -543,6 +553,9 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
 export var isAllNormalProductByState = function isAllNormalProductByState(state) {
   return isAllNormalProduct(state.service.value);
 };
+export var genRowKey = function genRowKey(key) {
+  return "rowKey-".concat(key);
+};
 var getGeneralParams = function getGeneralParams(item, state, isParallelResource) {
   var _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9;
   var pet = state.pet,
@@ -612,6 +625,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     isShowChangeHolder: !isNormalProduct,
     isShowAction: isShowAddTime(state, item),
     actionText: locales.getText('page.booking.text.add-time'),
+    actionIcon: 'pisell2-clock-plus',
     isMultipleResource: true,
     multiResources: multiResources,
     holderMaxCount: item === null || item === void 0 ? void 0 : item._extend.quantity,
@@ -621,7 +635,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     holder_id: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id,
     start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate : "",
     end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date) : "",
-    rowKey: "rowKey-".concat(item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 || (_item$_extend9 = _item$_extend9.other) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.rowKey)
+    rowKey: genRowKey(item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 || (_item$_extend9 = _item$_extend9.other) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.rowKey)
   }, parallelResourceOtherParams);
 };
 var calcAddTimeTotalPrice = function calcAddTimeTotalPrice(total, addTimeProducts) {
@@ -644,7 +658,7 @@ export var formatProducts = function formatProducts(lists, state) {
   var normalList = [];
   var groupList = [];
   var formItem = function formItem(item) {
-    var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _resourceItem, _item$_extend23, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27;
+    var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23, _resourceItem, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27, _item$_extend28;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
     var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.holder_id);
     var options = formatOptions(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.option);
@@ -663,30 +677,36 @@ export var formatProducts = function formatProducts(lists, state) {
       id: item === null || item === void 0 ? void 0 : item.id,
       _id: item === null || item === void 0 ? void 0 : item._id,
       name: item === null || item === void 0 ? void 0 : item.title,
+      title: item === null || item === void 0 ? void 0 : item.title,
+      // 购物车显示需要 title 字段
       price: item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price,
       total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.total, item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.relation_details),
       origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.origin_total, item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.relation_details),
       num: item === null || item === void 0 ? void 0 : item._extend.quantity,
       image: item === null || item === void 0 ? void 0 : item.cover,
       isShowNote: true,
-      note: item === null || item === void 0 ? void 0 : item.note,
-      like_status: item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.like_status,
+      note: (item === null || item === void 0 ? void 0 : item.note) || (item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.note),
+      like_status: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.like_status,
       bundle: bundle,
       options: options,
       errorMessage: errorMessage,
-      product_option_string: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.product_option_string,
-      discount_reason: item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.discount_reason,
-      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.resource,
+      product_option_string: item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.product_option_string,
+      discount_reason: item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.discount_reason,
+      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.resource,
       relation_form_name: isNormalProduct ? '' : ((_resourceItem = resourceItem) === null || _resourceItem === void 0 ? void 0 : _resourceItem.labelText) || item.relation_form_name,
       holder_title: clientTitle,
-      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.start_date : '',
-      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date : '',
-      holder_id: (item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id) || 0,
+      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.start_date : '',
+      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.end_date : '',
+      holder_id: (item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.holder_id) || 0,
       isNormalProduct: isNormalProduct,
+      isCustomItem: item === null || item === void 0 ? void 0 : item.isCustomItem,
+      // 添加自定义商品标识
+      vouchersApplicable: item === null || item === void 0 ? void 0 : item.vouchersApplicable,
+      // 是否适用优惠券/折扣
       locale: state.locale,
       symbol: state.amountSymbol,
-      relation_products: (item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.relation_details) || [],
-      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.items) || [])
+      relation_products: (item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.relation_details) || [],
+      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.items) || [])
     }, generalParams), {}, {
       _origin: item
     });
@@ -695,8 +715,8 @@ export var formatProducts = function formatProducts(lists, state) {
   if (isRenderGroup) {
     // 将商品分为组商品和非组商品
     lists.forEach(function (item) {
-      var _item$_extend28;
-      if (!(item !== null && item !== void 0 && (_item$_extend28 = item._extend) !== null && _item$_extend28 !== void 0 && _item$_extend28.groupId)) {
+      var _item$_extend29;
+      if (!(item !== null && item !== void 0 && (_item$_extend29 = item._extend) !== null && _item$_extend29 !== void 0 && _item$_extend29.groupId)) {
         normalList.push(formItem(item));
       } else {
         groupList.push(item);
@@ -705,8 +725,8 @@ export var formatProducts = function formatProducts(lists, state) {
 
     // 根据item._extend.groupId 进行分组
     var groups = groupList.reduce(function (prev, item) {
-      var _item$_extend29;
-      var groupId = item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.groupId;
+      var _item$_extend30;
+      var groupId = item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId;
       if (!prev[groupId]) {
         prev[groupId] = [];
       }
@@ -874,8 +894,8 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
       services: services.filter(function (item) {
-        var _item$_extend30;
-        return ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.holder_id) == d.form_record_id && checkType(item.extension_type);
+        var _item$_extend31;
+        return ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });

package/es/components/booking/info2/cartClientCard/index.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+import type { ClientCardRef, CartClientCardProps } from './types';
+import './index.less';
+export type { ClientData } from './types';
+declare const CartClientCard: React.ForwardRefExoticComponent<CartClientCardProps & React.RefAttributes<ClientCardRef>>;
+export default CartClientCard;