@pisell/private-materials 6.2.30 → 6.3.1

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

@@ -1,63 +1,15 @@
-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(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 React, { useMemo } from "react";
+import React from "react";
 import AuthWrap from "../authWrap";
 import { Skeleton } from "antd";
 import "./index.less";
 import classNames from "classnames";
-import useEngineContext from "../../../../hooks/useEngineContext";
-import VoucherCard from "../voucher";
-import ActionButtons from "../actionButtons";
 var TabPane = function TabPane(_ref) {
-  var _context$appHelper, _businessUtils$getApp, _businessUtils$getApp2, _state$service, _state$addons, _state$client;
   var children = _ref.children,
     header = _ref.header,
     footer = _ref.footer,
     style = _ref.style,
     loading = _ref.loading,
-    bodyClassName = _ref.bodyClassName,
-    state = _ref.state,
-    dispatch = _ref.dispatch,
-    source = _ref.source;
-  var context = useEngineContext();
-  var _ref2 = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
-    businessUtils = _ref2.businessUtils;
-
-  // 是否安装商品券应用
-  var hasGoodPassApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
-  var hasDiscountCardApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp2 = businessUtils.getAppByModal) !== null && _businessUtils$getApp2 !== void 0 && _businessUtils$getApp2.call(businessUtils, 'discountcard'));
-
-  // 支付退款状态
-  var paymentRefundedStatus = useMemo(function () {
-    var _state$bookingDetail;
-    return ['partially_refunded', 'refunded'].includes(state === null || state === void 0 || (_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status);
-  }, [state === null || state === void 0 ? void 0 : state.bookingDetail]);
-
-  // 是否显示 voucher 模块的基础条件
-  var voucherBaseCondition = (hasGoodPassApp || hasDiscountCardApp) && ['addons', 'info'].includes(source) && !paymentRefundedStatus;
-
-  // 票务预订显示独立的 voucher 模块
-  var shouldShowTerminalVoucher = voucherBaseCondition && (state === null || state === void 0 ? void 0 : state.isBookingTicket2);
-
-  // 非票务预订显示在 footer 中的 voucher 模块
-  var shouldShowFooterVoucher = voucherBaseCondition && !(state !== null && state !== void 0 && state.isBookingTicket2);
-
-  // 处理订单备注变更
-  var addNote = function addNote(noteValue) {
-    if (dispatch) {
-      dispatch({
-        type: 'setNotes',
-        payload: {
-          orderNote: noteValue,
-          edit: true
-        }
-      });
-    }
-  };
+    bodyClassName = _ref.bodyClassName;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-tab-pane-wrap",
     style: style
@@ -73,30 +25,11 @@ var TabPane = function TabPane(_ref) {
     style: {
       padding: 20
     }
-  }, children)), state && dispatch && (state === null || state === void 0 ? void 0 : state.isBookingTicket2) && /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode__booking-tab-pane-voucher-section"
-  }, /*#__PURE__*/React.createElement(ActionButtons, {
-    state: state,
-    dispatch: dispatch
-  })), /*#__PURE__*/React.createElement(AuthWrap, {
-    show: !!footer || shouldShowFooterVoucher,
+  }, children)), /*#__PURE__*/React.createElement(AuthWrap, {
+    show: !!footer,
     trueRender: /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-tab-pane-footer"
-    }, shouldShowFooterVoucher && state && dispatch && /*#__PURE__*/React.createElement(VoucherCard, {
-      state: _objectSpread(_objectSpread({}, state), {}, {
-        service: _objectSpread(_objectSpread({}, state.service || {}), {}, {
-          value: ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []
-        }),
-        addons: _objectSpread(_objectSpread({}, state.addons || {}), {}, {
-          value: ((_state$addons = state.addons) === null || _state$addons === void 0 ? void 0 : _state$addons.value) || []
-        }),
-        client: _objectSpread(_objectSpread({}, state.client || {}), {}, {
-          value: ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {}
-        })
-      }),
-      dispatch: dispatch,
-      source: source
-    }), footer)
+    }, footer)
   })));
 };
 export default TabPane;

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

@@ -5,6 +5,7 @@
   position: relative;
   display: flex;
   flex-direction: column;
+
 }
 
 .pisell-lowcode__booking-tab-pane-title {
@@ -29,8 +30,6 @@
   flex: 1;
   overflow: auto;
   padding: 0 32px;
-  // 为 voucher-section 预留空间
-  padding-bottom: 120px;
 
   .pisell-lowcode__booking-tab-pane-label {
     font-size: 16px;
@@ -46,79 +45,6 @@
   }
 }
 
-// Voucher 和功能按钮区域
-.pisell-lowcode__booking-tab-pane-voucher-section {
-  display: flex;
-  flex-direction: column;
-  padding: 10px;
-  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,7 +28,6 @@ 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',
@@ -45,10 +44,8 @@ var VoucherCard = function VoucherCard(props) {
   var context = useEngineContext();
   var state = props.state,
     dispatch = props.dispatch,
-    source = props.source,
-    _props$isInModal = props.isInModal,
-    isInModal = _props$isInModal === void 0 ? false : _props$isInModal;
-  var _useState = useState(isInModal ? true : false),
+    source = props.source;
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showDetail = _useState2[0],
     setShowDetail = _useState2[1];
@@ -68,21 +65,6 @@ 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) {
@@ -108,8 +90,7 @@ 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,
-        quantity: value._extend.quantity
+        origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total
       };
     });
     return val;
@@ -175,7 +156,13 @@ var VoucherCard = function VoucherCard(props) {
   useEffect(function () {
     if (!isBooking4Shop) return;
     var onScanCustomerChange = function onScanCustomerChange(customer) {
-      selectCustomer(customer);
+      // 更新客户
+      dispatch({
+        type: 'setClient',
+        payload: {
+          value: customer
+        }
+      });
     };
     var onDiscountListChange = function onDiscountListChange(discount) {
       setDisCountList(discount);
@@ -270,7 +257,7 @@ var VoucherCard = function VoucherCard(props) {
     className: "voucher-title"
   }, /*#__PURE__*/React.createElement("span", {
     className: "voucher-title-left"
-  }, locales.getText('pisell2.text.goodpass')), !isInModal && /*#__PURE__*/React.createElement("span", {
+  }, locales.getText('pisell2.text.goodpass')), /*#__PURE__*/React.createElement("span", {
     className: "voucher-title-right",
     onClick: function onClick() {
       console.log('showDetail: ', showDetail);
@@ -282,13 +269,12 @@ var VoucherCard = function VoucherCard(props) {
     })
   }))), /*#__PURE__*/React.createElement("div", {
     className: classNames('voucher-detail', {
-      show: showDetail || isInModal
+      show: showDetail
     })
   }, (availableData === null || availableData === void 0 ? void 0 : availableData.length) > 0 ? /*#__PURE__*/React.createElement(PisellGoodPassCard, {
     style: {
       width: '100%'
     },
-    isInModal: isInModal || false,
     dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
     mixedSort: mixedSort,
     onChange: function onChange(val) {

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

@@ -4,7 +4,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 0px;
+    margin-bottom: 10px;
 
     .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: React.ForwardRefExoticComponent<BookingDashboardProps & React.RefAttributes<unknown>>;
+declare const BookingDashboard: (props: BookingDashboardProps) => JSX.Element;
 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, { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import React, { useEffect, 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 = /*#__PURE__*/forwardRef(function (props, ref) {
+var BookingDashboard = function BookingDashboard(props) {
   var _props$otherParams = props.otherParams,
     otherParams = _props$otherParams === void 0 ? {} : _props$otherParams,
     backgroundColors = props.backgroundColors,
@@ -292,18 +292,11 @@ var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
       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/forms.js

@@ -168,7 +168,7 @@ var Forms = Provider(function (props) {
       return /*#__PURE__*/React.createElement("div", {
         className: "pisell-lowcode__booking-field-wrap",
         style: {
-          padding: hideTitle ? 0 : '0'
+          padding: hideTitle ? 0 : '12px 0 0'
         },
         key: d.form_id
       }, hideTitle ? null : /*#__PURE__*/React.createElement("div", {

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

@@ -1,9 +1,9 @@
-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 _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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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 { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

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

@@ -15,7 +15,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 React, { useEffect, useMemo, useRef, useState } from 'react';
 import { getProductTotalPrice } from "../utils";
-import useEngineContext from "../../../../es/hooks/useEngineContext";
+import useEngineContext from "../../../hooks/useEngineContext";
 import { locales } from "@pisell/utils";
 import { PisellModal } from "@pisell/materials";
 import { getProductPrice } from "../info/service/serve";
@@ -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 ids, data;
+      var data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -149,28 +149,18 @@ var useQuotation = function useQuotation(state, dispatch) {
             }
             return _context.abrupt("return");
           case 2:
-            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;
+            _context.next = 4;
             return getProductPrice({
-              ids: ids,
+              ids: cartValueRef.current.map(function (item) {
+                return item.product_id;
+              }),
               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 7:
+          case 4:
             data = _context.sent;
             return _context.abrupt("return", data);
-          case 9:
+          case 6:
           case "end":
             return _context.stop();
         }

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

@@ -5,6 +5,5 @@ 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

@@ -10,11 +10,9 @@ 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,
@@ -32,17 +30,19 @@ 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);
+    return isOpenAddTime(state) && !state.isBookingTicket2;
   }, [state, appointment_card.quick_time]);
   var handleEdit = useMemoizedFn(function (cacheItem, type) {
-    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 _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 dispatchService = function dispatchService(type, payload) {
     dispatch({
@@ -70,8 +70,7 @@ var useInfoHolder = function useInfoHolder(state, dispatch) {
     handleEdit: handleEdit,
     dispatchService: dispatchService,
     handleAction: handleAction,
-    showAddTimeModal: showAddTimeModal,
-    editNormalServiceRef: editNormalServiceRef
+    showAddTimeModal: showAddTimeModal
   };
 };
 export default useInfoHolder;

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

@@ -4,22 +4,6 @@
   .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 {
@@ -38,11 +22,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 10px !important;
+  padding: 0 16px !important;
   .booking-info-create-new {
     margin-top: 10px;
     color: var(--Base-Black, #000);
@@ -50,4 +34,4 @@
     font-weight: 600;
     line-height: 32px;
   }
-}
+}

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

@@ -9,6 +9,7 @@ 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";
@@ -36,7 +37,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state3, _context$appHelper4, _modal$state4;
+  var _modal$state2, _modal$state5, _context$appHelper4, _modal$state6;
   var style = props.style,
     globalState = props.globalState,
     _props$modules = props.modules,
@@ -108,6 +109,7 @@ 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;
     }
@@ -117,15 +119,17 @@ var Info = Provider(function (props) {
 
     // 跨日预约一直显示备注
     if (isDayBooking(globalState)) {
-      return (
-        // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
-        null
-      );
+      var _modal$state3;
+      return /*#__PURE__*/React.createElement(AddNote, {
+        value: (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote,
+        onChange: addNote
+      });
     }
-    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' || globalState.isBookingCreatePage ? /*#__PURE__*/React.createElement(Notes, null) : null :
-    // <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 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 /*#__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'
@@ -136,13 +140,10 @@ 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))),
-    state: modal.state,
-    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)))
   }, /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, 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, {
+  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state6 = modal.state) !== null && _modal$state6 !== void 0 && _modal$state6.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,

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

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

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

@@ -81,7 +81,6 @@ 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),
@@ -93,10 +92,9 @@ var Lists = function Lists(_ref) {
       isShowChangeHolder: isShowChangeHolder,
       isShowChangeResource: true,
       isShowAddHolderButton: true,
-      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
+      isShowEditProduct: !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]);
+  }, [state === null || state === void 0 ? void 0 : state.bookingId, state === null || state === void 0 ? void 0 : state.disabledEdit, isShowChangeHolder, state.isBookingCreatePage]);
   var products = useMemo(function () {
     var _state$service;
     console.time('products');
@@ -111,7 +109,6 @@ 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/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;