@pisell/private-materials 6.2.24 → 6.2.25

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

@@ -5,7 +5,6 @@
   position: relative;
   display: flex;
   flex-direction: column;
-
 }
 
 .pisell-lowcode__booking-tab-pane-title {
@@ -30,6 +29,8 @@
   flex: 1;
   overflow: auto;
   padding: 0 32px;
+  // 为 voucher-section 预留空间
+  padding-bottom: 120px;
 
   .pisell-lowcode__booking-tab-pane-label {
     font-size: 16px;
@@ -45,6 +46,79 @@
   }
 }
 
+// Voucher 和功能按钮区域
+.pisell-lowcode__booking-tab-pane-voucher-section {
+  display: flex;
+  flex-direction: column;
+  padding: 8px 16px;
+  position: relative;
+  z-index: 3;
+  background-color: #1b1b1b;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06);
+  
+  .pisell-lowcode__booking-footer-voucher-container {
+    background: var(--base-white, #FFF);
+    padding: 4px;
+    border-radius: 8px;
+  }
+  
+  // ActionButtons 在 voucher-section 中的样式
+  .pisell-lowcode__action-buttons {
+    margin-top: 8px;
+    // 确保按钮可见
+    .action-button {
+      // 重要：确保文字颜色在深色背景下可见
+      color: white !important;
+      
+      &:hover:not(:disabled) {
+        color: white !important;
+      }
+    }
+  }
+}
+
+// 订单备注区域
+.pisell-lowcode__booking-tab-pane-notes-section {
+  background-color: #1b1b1b;
+  position: relative;
+  z-index: 3;
+  
+  .pisell-lowcode__booking-notes {
+    background: var(--base-white, #FFF);
+    padding: 12px;
+    width: 100%;
+    
+    .pisell-lowcode__booking-notes-label {
+      font-weight: 500;
+      color: #333;
+      margin-bottom: 8px;
+    }
+    
+    .pisell-lowcode__booking-notes-input {
+      .pisell-lowcode-input {
+        height: 44px !important;
+        min-height: 44px !important;
+        border-radius: 6px;
+        font-size: 16px;
+        line-height: 36px;
+      }
+      
+      // 备用选择器，以防万一
+      textarea.pisell-lowcode-input {
+        height: 44px !important;
+        min-height: 44px !important;
+        border-radius: 6px;
+        resize: none;
+      }
+      
+      // 去掉外层包装容器的边框
+      .pisell-lowcode-input-textarea-affix-wrapper {
+        border-width: 1px;
+      }
+    }
+  }
+}
+
 .pisell-lowcode__booking-tab-pane-footer {
   position: sticky;
   bottom: 0;

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

@@ -28,6 +28,7 @@ import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
 import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
 import { getServiceAddons } from "./utils";
+import { useCustomer } from "../../../ticketBooking/hooks/pisellos";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -65,6 +66,21 @@ var VoucherCard = function VoucherCard(props) {
   var shopDiscount = pisellos.getModule('shopDiscount');
   services = state.service;
 
+  // 将选中的客户数据传递给状态管理
+  var changeCustomerToGlobalState = useMemoizedFn(function (value) {
+    dispatch({
+      type: 'setClient',
+      payload: {
+        value: value,
+        edit: true
+      }
+    });
+  });
+  var _useCustomer = useCustomer({
+      changeCustomerToGlobalState: changeCustomerToGlobalState
+    }),
+    selectCustomer = _useCustomer.selectCustomer;
+
   // 设置client
   useDebounceEffect(function () {
     if (isBooking4Shop) {
@@ -90,7 +106,8 @@ var VoucherCard = function VoucherCard(props) {
         price: value.price,
         total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,
         discount_list: value.discount_list,
-        origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total
+        origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total,
+        quantity: value._extend.quantity
       };
     });
     return val;
@@ -156,13 +173,7 @@ var VoucherCard = function VoucherCard(props) {
   useEffect(function () {
     if (!isBooking4Shop) return;
     var onScanCustomerChange = function onScanCustomerChange(customer) {
-      // 更新客户
-      dispatch({
-        type: 'setClient',
-        payload: {
-          value: customer
-        }
-      });
+      selectCustomer(customer);
     };
     var onDiscountListChange = function onDiscountListChange(discount) {
       setDisCountList(discount);

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

@@ -4,7 +4,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 10px;
+    margin-bottom: 0px;
 
     .voucher-title-left {
       color: var(--base-black, #000);

package/es/components/booking/dashboard/index.d.ts

@@ -16,5 +16,5 @@ export interface BookingDashboardProps extends React.HTMLAttributes<HTMLDivEleme
         departed: string | number;
     }, dataList: string[]) => void;
 }
-declare const BookingDashboard: (props: BookingDashboardProps) => JSX.Element;
+declare const BookingDashboard: React.ForwardRefExoticComponent<BookingDashboardProps & React.RefAttributes<unknown>>;
 export default BookingDashboard;

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

@@ -21,7 +21,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { useEffect, useState } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
 import { PisellStatisticList } from '@pisell/materials';
 import { isArr, locales } from '@pisell/utils';
 import dayjs from 'dayjs';
@@ -52,7 +52,7 @@ var formatCapacityToChildrenData = function formatCapacityToChildrenData(data) {
   });
 };
 locales.init(localeTexts, getLocale());
-var BookingDashboard = function BookingDashboard(props) {
+var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
   var _props$otherParams = props.otherParams,
     otherParams = _props$otherParams === void 0 ? {} : _props$otherParams,
     backgroundColors = props.backgroundColors,
@@ -292,11 +292,18 @@ var BookingDashboard = function BookingDashboard(props) {
       clearInterval(timer);
     };
   }, [JSON.stringify(otherParams), refreshKey]);
+  useImperativeHandle(ref, function () {
+    return {
+      refresh: function refresh() {
+        getData();
+      }
+    };
+  });
   return /*#__PURE__*/React.createElement(PisellStatisticList, _extends({}, others, {
     data: data,
     backgroundColors: backgroundColors,
     labelColor: labelColor,
     valueColor: valueColor
   }));
-};
+});
 export default BookingDashboard;

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

@@ -1,9 +1,9 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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); }
+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 { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

package/es/components/booking/hooks/useQuotation.js

@@ -139,7 +139,7 @@ var useQuotation = function useQuotation(state, dispatch) {
   cartValueRef.current = state.service.value;
   var getCartQuotation = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-      var data;
+      var ids, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -149,18 +149,28 @@ var useQuotation = function useQuotation(state, dispatch) {
             }
             return _context.abrupt("return");
           case 2:
-            _context.next = 4;
+            ids = cartValueRef.current.filter(function (item) {
+              return !item.isCustomItem;
+            }) // 过滤掉自定义商品
+            .map(function (item) {
+              return item.product_id;
+            });
+            if (ids.length) {
+              _context.next = 5;
+              break;
+            }
+            return _context.abrupt("return");
+          case 5:
+            _context.next = 7;
             return getProductPrice({
-              ids: cartValueRef.current.map(function (item) {
-                return item.product_id;
-              }),
+              ids: ids,
               schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date,
               customer_id: params === null || params === void 0 ? void 0 : params.customer_id
             });
-          case 4:
+          case 7:
             data = _context.sent;
             return _context.abrupt("return", data);
-          case 6:
+          case 9:
           case "end":
             return _context.stop();
         }

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

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

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

@@ -5,5 +5,6 @@ declare const useInfoHolder: (state: any, dispatch: any) => {
     dispatchService: (type: string, payload: any) => void;
     handleAction: (dataSource: any) => void;
     showAddTimeModal: boolean;
+    editNormalServiceRef: import("react").MutableRefObject<any>;
 };
 export default useInfoHolder;

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

@@ -9,9 +9,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,
@@ -33,8 +35,14 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
   }, [state, appointment_card.quick_time]);
   var handleEdit = function handleEdit(cacheItem, type) {
     setTimeout(function () {
-      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 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');
+      }
     }, 100);
   };
   var dispatchService = function dispatchService(type, payload) {
@@ -63,7 +71,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.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,7 +38,7 @@
   }
 }
 .create-booking-page-info-wrap-create {
-  background: var(--Success-50, #ECFDF3);
+  background: var(--Success-50, #ecfdf3);
 }
 .create-booking-page-info-wrap {
   position: initial !important;
@@ -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/service/Lists.js

@@ -81,6 +81,7 @@ 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),
@@ -92,14 +93,16 @@ 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]);
   return /*#__PURE__*/React.createElement(CartContext.Provider, {
     value: {
       state: state
     }
   }, /*#__PURE__*/React.createElement(ShoppingCart, {
+    scenario: state.isBookingTicket2 ? 'booking2' : undefined,
     isParallelResource: isParallelResource,
     onAction: onAction,
     onChange: handleChange,

package/es/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

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/service2/Lists.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

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) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

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

@@ -429,6 +429,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 +532,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 +544,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,
@@ -621,7 +625,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) {
@@ -663,6 +667,8 @@ 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),
@@ -683,6 +689,10 @@ export var formatProducts = function formatProducts(lists, state) {
       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,
       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) || [],

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

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