@pisell/private-materials 6.2.32 → 6.3.2

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

@@ -10,7 +10,7 @@ import { isWalkIn } from "../../utils";
 import { getSumCapacity } from "../../info2/utilsByBooking";
 import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
-import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule, genRowKey } from "../../info/service2/utils";
+import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 import { isArr, locales, sendWarningLog } from '@pisell/utils';
 import { PisellToast } from "@pisell/materials";
 var formatNote = function formatNote(data) {
@@ -125,7 +125,7 @@ var formatRelationDetails = function formatRelationDetails(list) {
   return (list || []).map(function (item) {
     return {
       num: item.product_quantity,
-      price: item.original_price || 0,
+      price: item.payment_price || 0,
       product_id: item.product_id,
       is_charge_tax: item.is_charge_tax,
       order_detail_id: item.order_detail_id
@@ -311,7 +311,7 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18;
+  var _item$_extend15, _item$_extend16, _item$_extend17;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -324,27 +324,23 @@ var formatProducts = function formatProducts(item, quantity) {
   var notManualDiscount = discount_list.filter(function (item) {
     return item.type !== 'product';
   });
-  if (item.isCustomItem) {
-    item.product_id = 0;
-  }
   return {
-    "name": item.name,
     "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
     "source_product_price": getSourceProductPrice(item),
-    "product_id": item !== null && item !== void 0 && item.product_id || item.product_id === 0 ? item.product_id : item.id,
+    "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
     "is_charge_tax": item.is_charge_tax,
-    "note": ((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.note) || '',
+    "note": (item === null || item === void 0 ? void 0 : item.note) || '',
     "discountway": item._extend.discountway || "num",
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.bundle),
+    "product_bundle": formatProductBundle((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.option),
-    "product_variant_id": ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 || (_item$_extend18 = _item$_extend18.other) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.option),
+    "product_variant_id": ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -364,8 +360,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend19;
-    var holderId = (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id;
+    var _item$_extend18;
+    var holderId = (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -391,15 +387,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend20;
-      return ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend19;
+      return ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend21;
-      var key = (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.holder_id; // 分组键
+      var _item$_extend20;
+      var key = (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -459,13 +455,6 @@ var formatBookings = function formatBookings(data, values) {
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   list.forEach(function (item) {
-    // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
-    if (item.isCustomItem) {
-      bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
-        product_id: 0 // 确保后端接收到的 product_id 为 0
-      }));
-      return;
-    }
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format("HH:mm");
@@ -479,9 +468,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend22, _item$_extend23, _item$_extend24, _item$_extend25;
-      var startDate = ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.startDate) || ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.start_date);
-      var endDate = ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.endDate) || ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.end_date);
+      var _item$_extend21, _item$_extend22, _item$_extend23, _item$_extend24;
+      var startDate = ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.startDate) || ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.start_date);
+      var endDate = ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.endDate) || ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -523,8 +512,7 @@ var formatBookings = function formatBookings(data, values) {
         cacheItem: item
       }) : item._extend.number || 1,
       "resources": formatResource(item),
-      "metadata": formatMetaData(item),
-      "note": item._extend.note
+      "metadata": formatMetaData(item)
     }, eventOtherParams || {}), dayParams);
     if (isDay) {
       bookings.push(booking);
@@ -634,11 +622,9 @@ export var formatValues = function formatValues(state) {
     // 备注
     values.shop_note = formatNote(state);
   }
-
-  // 提交手动价格调整（shop_discount）
-  if (state.shop_discount && Number(state.shop_discount) > 0) {
-    values.shop_discount = state.shop_discount;
-    values.shop_discount_reason = '';
+  if (state.bookingId) {
+    values.shop_discount = state.bookingDetail.shop_discount;
+    values.shop_discount_reason = state.bookingDetail.shop_discount_reason;
   }
   if (state.contacts) {
     var _state$contacts;
@@ -687,35 +673,21 @@ export var formatValues = function formatValues(state) {
 // 检测预约主体是否为空
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
-  var errorRowKey = "";
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend27;
+    var _item$_extend25;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
-      var _item$_extend26;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 || (_item$_extend26 = _item$_extend26.other) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 || (_item$_extend27 = _item$_extend27.holder_id) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.length) !== item._extend.quantity) {
-      var _item$_extend28;
-      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 || (_item$_extend28 = _item$_extend28.other) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.rowKey);
+    if (item._extend.quantity > 1 && ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 || (_item$_extend25 = _item$_extend25.holder_id) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.length) !== item._extend.quantity) {
       return true;
     }
     return false;
   });
   var clientId = (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id;
-  if (holderError) {
-    var dom = document.getElementById(errorRowKey);
-    if (dom) {
-      dom.scrollIntoView({
-        behavior: 'smooth',
-        block: 'start'
-      });
-    }
-  }
   if (holderError && (!clientId || clientId === 0 || clientId === 1)) {
     PisellToast({
       content: locales.getText('pisell2.text.please-select-the-customer-first')

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

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/sendModal/useSendModal.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/es/components/booking/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/es/components/booking/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

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/clientVariant/hooks/useClientFn.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;
@@ -6,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;