@pisell/private-materials 6.3.14 → 6.4.1

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

@@ -28,6 +28,8 @@ import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
 import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
 import { getServiceAddons } from "./utils";
+import { useCustomer } from "../../../ticketBooking/hooks/pisellos";
+import { getClientVariantClose } from "../../info/clientVariant/utils";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -44,8 +46,10 @@ var VoucherCard = function VoucherCard(props) {
   var context = useEngineContext();
   var state = props.state,
     dispatch = props.dispatch,
-    source = props.source;
-  var _useState = useState(false),
+    source = props.source,
+    _props$isInModal = props.isInModal,
+    isInModal = _props$isInModal === void 0 ? false : _props$isInModal;
+  var _useState = useState(isInModal ? true : false),
     _useState2 = _slicedToArray(_useState, 2),
     showDetail = _useState2[0],
     setShowDetail = _useState2[1];
@@ -65,6 +69,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 +109,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;
@@ -123,7 +143,6 @@ var VoucherCard = function VoucherCard(props) {
   }, [state, addonsMemo, serviceMemo]);
   var _useDebounceFn = useDebounceFn(function () {
       var _state$service;
-      // console.log('state.service.value1', state.service.value);
       if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value || !((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) {
         return;
       }
@@ -142,6 +161,16 @@ var VoucherCard = function VoucherCard(props) {
   useEffect(function () {
     run();
   }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
+  useEffect(function () {
+    if (pisellos) {
+      var _pisellos$effects;
+      pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.on("shopDiscount:onSelectedDiscountListChange", fn);
+      return function () {
+        var _pisellos$effects2;
+        pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.off("shopDiscount:onSelectedDiscountListChange", fn);
+      };
+    }
+  }, []);
   var fn = useMemoizedFn(function (result) {
     var _result$productList;
     if (!(result !== null && result !== void 0 && result.productList) || result !== null && result !== void 0 && (_result$productList = result.productList) !== null && _result$productList !== void 0 && _result$productList.some(function (item) {
@@ -156,13 +185,11 @@ var VoucherCard = function VoucherCard(props) {
   useEffect(function () {
     if (!isBooking4Shop) return;
     var onScanCustomerChange = function onScanCustomerChange(customer) {
-      // 更新客户
-      dispatch({
-        type: 'setClient',
-        payload: {
-          value: customer
-        }
-      });
+      var clientVariantClose = getClientVariantClose();
+      if (clientVariantClose) {
+        clientVariantClose();
+      }
+      selectCustomer(customer);
     };
     var onDiscountListChange = function onDiscountListChange(discount) {
       setDisCountList(discount);
@@ -172,12 +199,13 @@ var VoucherCard = function VoucherCard(props) {
     pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
     return function () {
       shopDiscount.clear();
-      pisellos.effects.off(ShopDiscountHooks.onCustomerChange, onScanCustomerChange);
+      pisellos.effects.off(ShopDiscountHooks.onScanCustomerChange, onScanCustomerChange);
       pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
       pisellos.effects.off(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
     };
   }, [state.bookingId, isBooking4Shop, fn]);
   var productListToValue = useMemoizedFn(function (list, edit) {
+    var _props$state;
     var _getServiceAddons = getServiceAddons(list),
       serviceList = _getServiceAddons.serviceList,
       addonsList = _getServiceAddons.addonsList;
@@ -195,12 +223,16 @@ var VoucherCard = function VoucherCard(props) {
         value: serviceList
       }, other)
     });
-    dispatch({
-      type: 'setAddons',
-      payload: _objectSpread({
-        value: addonsList
-      }, other)
-    });
+
+    // 售票页面暂时不需要
+    if (!(props !== null && props !== void 0 && (_props$state = props.state) !== null && _props$state !== void 0 && _props$state.isBookingTicket2)) {
+      dispatch({
+        type: 'setAddons',
+        payload: _objectSpread({
+          value: addonsList
+        }, other)
+      });
+    }
   });
 
   // apply code
@@ -260,10 +292,9 @@ var VoucherCard = function VoucherCard(props) {
     className: "voucher-title"
   }, /*#__PURE__*/React.createElement("span", {
     className: "voucher-title-left"
-  }, locales.getText('pisell2.text.goodpass')), /*#__PURE__*/React.createElement("span", {
+  }, locales.getText('pisell2.text.goodpass')), !isInModal && /*#__PURE__*/React.createElement("span", {
     className: "voucher-title-right",
     onClick: function onClick() {
-      console.log('showDetail: ', showDetail);
       setShowDetail(!showDetail);
     }
   }, locales.getText('pisell2.text.details'), ' ', /*#__PURE__*/React.createElement(ChevronDown, {
@@ -272,12 +303,13 @@ var VoucherCard = function VoucherCard(props) {
     })
   }))), /*#__PURE__*/React.createElement("div", {
     className: classNames('voucher-detail', {
-      show: showDetail
+      show: showDetail || isInModal
     })
   }, (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) {
@@ -286,7 +318,6 @@ var VoucherCard = function VoucherCard(props) {
         discountId: val.id,
         isSelected: val.isSelected
       });
-      console.log('setDiscountSelected:', detail);
       productListToValue(detail.productList, true);
     }
   }) : null, /*#__PURE__*/React.createElement("div", {

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/components/voucherModal/index.d.ts

@@ -0,0 +1,19 @@
+import React from 'react';
+import './index.less';
+interface VoucherModalProps {
+    /** 是否显示弹窗 */
+    visible: boolean;
+    /** 关闭弹窗回调 */
+    onClose: () => void;
+    /** booking 状态对象 */
+    state: any;
+    /** dispatch 函数 */
+    dispatch: (action: {
+        type: string;
+        payload?: any;
+    }) => void;
+    /** 数据源 */
+    source?: any;
+}
+declare const VoucherModal: React.FC<VoucherModalProps>;
+export default VoucherModal;

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

@@ -0,0 +1,47 @@
+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 from 'react';
+import { Modal } from 'antd';
+import VoucherCard from "../voucher";
+import "./index.less";
+var VoucherModal = function VoucherModal(_ref) {
+  var _state$service, _state$addons, _state$client;
+  var visible = _ref.visible,
+    onClose = _ref.onClose,
+    state = _ref.state,
+    dispatch = _ref.dispatch,
+    source = _ref.source;
+  return /*#__PURE__*/React.createElement(Modal, {
+    title: null,
+    open: visible,
+    onCancel: onClose,
+    footer: null,
+    width: 600,
+    className: "pisell-voucher-modal ".concat(!visible ? 'pisell-voucher-modal--hidden' : '')
+    // 移除 destroyOnClose，让内容始终渲染
+    ,
+    forceRender: true
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-voucher-modal-content"
+  }, /*#__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,
+    isInModal: true
+  })));
+};
+export default VoucherModal;

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

@@ -0,0 +1,23 @@
+.pisell-voucher-modal {
+  .ant-modal-body {
+    padding: 0;
+  }
+
+  .pisell-voucher-modal-content {
+    max-height: 70vh;
+    overflow-y: auto;
+  }
+
+  // 隐藏状态下的样式优化
+  &.pisell-voucher-modal--hidden {
+    // 当弹窗隐藏时，可以通过一些样式来优化性能
+    // 例如暂停动画、降低 GPU 使用等
+    .pisell-voucher-modal-content {
+      // 暂停内容中的动画和过渡效果
+      * {
+        animation-play-state: paused !important;
+        transition: none !important;
+      }
+    }
+  }
+}

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/deposit/ClientItem/index.js

@@ -2,7 +2,7 @@ import React, { useCallback } from "react";
 import { Avatar } from "antd";
 import { image, locales } from "@pisell/utils";
 import classnames from 'classnames';
-import User01 from "@pisell/icon/src/User01";
+import User01 from "@pisell/icon/es/User01";
 import { isWalkIn as getIsWalkIn } from "../../utils";
 import "./index.less";
 var ClientItem = function ClientItem(props) {

package/es/components/booking/deposit/DepositItem/index.js

@@ -3,7 +3,7 @@ import { Button, Dropdown } from 'antd';
 import { DownOutlined } from '@ant-design/icons';
 import { formatAmount, locales } from '@pisell/utils';
 import ClientItem from "../ClientItem";
-import Edit05 from '@pisell/icon/src/Edit05';
+import Edit05 from '@pisell/icon/es/Edit05';
 import "./index.less";
 var statusTagColor = {
   unpaid: '#B2DDFF',

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

@@ -1,5 +1,6 @@
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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; }
@@ -41,7 +42,10 @@ var Deposit = function Deposit(props) {
     isTerminal = _ref.isTerminal,
     interaction = _ref.interaction,
     action = _ref.action,
-    storage = _ref.storage;
+    storage = _ref.storage,
+    pisellosAllModule = _ref.pisellosAllModule,
+    getData = _ref.getData;
+  var ScheduleModule = pisellosAllModule.ScheduleModule;
   var isTeam = useMemo(function () {
     return storage.get('channel') === 'android_team_portal' || storage.get('channel') === 'ios_team_portal';
   }, []);
@@ -91,10 +95,49 @@ var Deposit = function Deposit(props) {
       }
     });
   };
+  var getDataFromHost = function getDataFromHost() {
+    try {
+      var is_price_include_tax = getData('is_price_include_tax');
+      var tax_rate = getData('tax_rate') || '10';
+      var tax_title = getData('tax_title') || 'GST';
+      var surcharge_list = getData('surcharge_list');
+      var schedule_list = getData('schedule_list');
+      var scheduleById = {};
+      // 提前转换，节省附加费计算时的遍历时间
+      if (Array.isArray(schedule_list)) {
+        var _iterator = _createForOfIteratorHelper(schedule_list),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var item = _step.value;
+            scheduleById[item.id] = item;
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      }
+      return {
+        is_price_include_tax: is_price_include_tax,
+        tax_rate: tax_rate,
+        tax_title: tax_title,
+        surcharge_list: surcharge_list,
+        schedule_list: schedule_list,
+        scheduleById: scheduleById
+      };
+    } catch (error) {
+      console.error(error);
+      return {};
+    }
+  };
 
   // 订单金额计算
   var total = useMemo(function () {
-    return getSumTotal(globalState, false);
+    return getSumTotal(globalState, _objectSpread({
+      isEdit: false,
+      ScheduleModule: ScheduleModule
+    }, getDataFromHost()));
   }, [globalState]);
   var depositList = useMemo(function () {
     if (!bookingId) return [];

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 : '12px 0 0'
+          padding: hideTitle ? 0 : '0'
         },
         key: d.form_id
       }, hideTitle ? null : /*#__PURE__*/React.createElement("div", {

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

@@ -5,7 +5,7 @@ export var useIsBooking4Shop = function useIsBooking4Shop(state) {
   var _context$appHelper$ut4;
   var context = useEngineContext();
   return useMemo(function () {
-    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3;
-    return 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, state.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
+    var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3;
+    return isBooking4Shop(((_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.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils);
   }, [state.renderType, (_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.businessUtils]);
 };

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/addServiceVariant/index.js

@@ -10,7 +10,7 @@ import AddService2 from "../../info2/service/addService";
 import { isBooking4Shop } from "../utils";
 import useEngineContext from "../../../../hooks/useEngineContext";
 var AddServiceVariant = function AddServiceVariant(props) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _props$globalState, _context$appHelper$ut3;
+  var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _props$globalState, _context$appHelper$ut3;
   var globalState = props.globalState,
     setGlobalState = props.setGlobalState;
   var context = useEngineContext();
@@ -33,7 +33,7 @@ var AddServiceVariant = function AddServiceVariant(props) {
     }
   };
   var Cpt = AddService;
-  if (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, props === null || props === void 0 || (_props$globalState = props.globalState) === null || _props$globalState === void 0 ? void 0 : _props$globalState.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils)) {
+  if (isBooking4Shop(((_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), props === null || props === void 0 || (_props$globalState = props.globalState) === null || _props$globalState === void 0 ? void 0 : _props$globalState.renderType, (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.businessUtils)) {
     Cpt = AddService2;
   }
   return /*#__PURE__*/React.createElement(Cpt, {

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

@@ -170,7 +170,7 @@ var Client = function Client() {
     if (getIsWalkIn(item === null || item === void 0 ? void 0 : item.id)) {
       return locales.getText('pisell2.text.select-a-customer');
     }
-    var firstLastName = item.first_name || item.last_name ? "".concat(item.first_name, " ").concat(item.last_name) : "";
+    var firstLastName = item.first_name || item.last_name ? "".concat(item.first_name, " ").concat(item.last_name) : '';
     return item.name || (item.display_name || '').trim() || (item.nickname || '').trim() || firstLastName.trim() || '';
   }, [locales.localeMap]);
 
@@ -444,7 +444,7 @@ var Client = function Client() {
             className: 'pisell-lowcode__booking-client-list-item-waiver-filled'
           }, locales.getText('pisell2.text.filled')) : /*#__PURE__*/React.createElement("span", {
             className: 'pisell-lowcode__booking-client-list-item-waiver-not-filled'
-          }, locales.getText('pisell2.text.not-filled')), "; ");
+          }, locales.getText('pisell2.text.not-filled')), ";", ' ');
         }))), /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode__booking-client-list-item-loading"
         }, /*#__PURE__*/React.createElement(Spin, {

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

@@ -1 +1,3 @@
 export declare const getWaiverTitle: (waiverForm: any[]) => string;
+export declare const setClientVariantClose: (fn: any) => void;
+export declare const getClientVariantClose: () => (() => void) | null;

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

@@ -3,4 +3,11 @@ export var getWaiverTitle = function getWaiverTitle(waiverForm) {
   return (waiverForm || []).map(function (item) {
     return "".concat(item.form_title || '', ":").concat(item.is_filled ? locales.getText('pisell2.text.filled') : locales.getText('pisell2.text.not-filled'));
   }).join(';');
+};
+var clientVariantClose;
+export var setClientVariantClose = function setClientVariantClose(fn) {
+  clientVariantClose = fn;
+};
+export var getClientVariantClose = function getClientVariantClose() {
+  return clientVariantClose;
 };

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

@@ -36,10 +36,10 @@ import { getAppointmentService, getPets, isDayBooking, isOpenDeletePet, updateSe
 import { moveItemToFront } from "../../utils";
 import "./index.less";
 import useAddHolder, { useFormDataConfig } from "../../hooks/useAddHolder";
-import { getWaiverTitle } from "../utils";
+import { getWaiverTitle, setClientVariantClose } from "../utils";
 import useGetHolderList from "../../hooks/useGetHolderList";
 var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context$appHelper, _context$appHelper$ge, _state$bookingConfig2, _state$bookingConfig4, _state$pet3, _state$pet4, _state$pet6, _state$pet8, _state$client$value3, _state$bookingConfig7, _state$pet9, _state$bookingConfig8, _state$service2, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11, _state$client$value12, _state$client$value13, _context$appHelper2, _context$appHelper2$i, _state$bookingConfig9, _state$client6;
+  var _context$appHelper, _context$appHelper$ge, _state$bookingConfig2, _state$bookingConfig4, _state$pet3, _state$pet4, _state$pet6, _state$pet8, _state$client$value3, _state$bookingConfig7, _state$pet9, _state$bookingConfig8, _state$service2, _modalRef$current3, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11, _state$client$value12, _state$client$value13, _context$appHelper2, _context$appHelper2$i, _state$bookingConfig9, _state$client6;
   var globalState = props.globalState,
     setGlobalState = props.setGlobalState;
   var modalRef = useRef();
@@ -348,6 +348,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
       setSearch: (_modalRef$current2 = modalRef.current) === null || _modalRef$current2 === void 0 ? void 0 : _modalRef$current2.setSearch
     };
   });
+  setClientVariantClose((_modalRef$current3 = modalRef.current) === null || _modalRef$current3 === void 0 ? void 0 : _modalRef$current3.close);
 
   /**
    * @title: 是否打开更改商品弹窗

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

@@ -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;