@pisell/private-materials 6.6.12 → 6.6.14

package/es/businessModel/SalesModel/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
-declare const SalesModel: ({ children, hooks, config }: any) => React.JSX.Element;
+declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/es/components/Sales/index.d.ts

@@ -15,6 +15,6 @@ declare const SalesPage: ({ config, children, }: {
     config?: {
         useSessionStorage?: boolean | undefined;
     } | undefined;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default SalesPage;
 export { useCustomer, useInit, useSales, useStep, useResource, useEvent, useEventDetail, useHolder, useSummary, useCheckout, useCart, };

package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const Total: ({ className, isFooter }: any) => React.JSX.Element;
+declare const Total: ({ className, isFooter }: any) => JSX.Element;
 export default Total;

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const CartItem: ({ onNext, renderContactInfo }: any) => React.JSX.Element;
+declare const CartItem: ({ onNext, renderContactInfo }: any) => JSX.Element;
 export default CartItem;

package/es/components/appointmentBooking/components/Cart/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const Cart: ({ open, onCancel, onNext }: any) => React.JSX.Element;
+declare const Cart: ({ open, onCancel, onNext }: any) => JSX.Element;
 export default Cart;

package/es/components/appointmentBooking/components/Content/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const Layout: () => React.JSX.Element;
+declare const Layout: () => JSX.Element;
 export default Layout;

package/es/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,10 +1,9 @@
-import React from 'react';
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;
     setIsAgreeDepositPolicy: (value: boolean) => void;
     deposit: any;
     depositProtocolRequest?: any;
-}) => React.JSX.Element;
-declare const Deposit: () => React.JSX.Element;
+}) => JSX.Element;
+declare const Deposit: () => JSX.Element;
 export default Deposit;

package/es/components/appointmentBooking/components/Footer/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const Footer: ({ onNext, isOpen }: any) => React.JSX.Element;
+declare const Footer: ({ onNext, isOpen }: any) => JSX.Element;
 export default Footer;

package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const GuestOptionsModal: (props: any) => React.JSX.Element;
+declare const GuestOptionsModal: (props: any) => JSX.Element;
 export default GuestOptionsModal;

package/es/components/appointmentBooking/components/Header/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const Header: () => React.JSX.Element;
+declare const Header: () => JSX.Element;
 export default Header;

package/es/components/appointmentBooking/components/Voucher/index.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
 import '../../../booking/components/voucher/index.less';
 import './index.less';
-declare const VoucherCard: (props: any) => React.JSX.Element;
+declare const VoucherCard: (props: any) => JSX.Element;
 export default VoucherCard;

package/es/components/appointmentBooking/components/Voucher/index.js

@@ -28,8 +28,6 @@ import { PisellInput, PisellGoodPassCard, PisellText, PisellToast } from '@pisel
 import { useAppointmentBooking, useShopDiscount, useAppointmentBookingLogin, useAppointmentBookingAccount } from "../../hooks";
 import "../../../booking/components/voucher/index.less";
 import "./index.less";
-import { useAppointmentBookingContext } from "../../context";
-import { useDebounceFn } from 'ahooks';
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -71,19 +69,11 @@ var VoucherCard = function VoucherCard(props) {
     openLoginModal = _useAppointmentBookin.openLoginModal;
   var _useAppointmentBookin2 = useAppointmentBookingAccount(),
     accountLists = _useAppointmentBookin2.accountLists;
-  var _useAppointmentBookin3 = useAppointmentBookingContext(),
-    summary = _useAppointmentBookin3.summary;
-  var originTotal = summary.originTotal,
-    total = summary.total;
   var cart = appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s = appointmentBooking.store) === null || _appointmentBooking$s === void 0 ? void 0 : _appointmentBooking$s.cart;
   var isUserLoggedIn = useMemo(function () {
     var _utils$token, _utils$token$get;
     return !!(utils !== null && utils !== void 0 && (_utils$token = utils.token) !== null && _utils$token !== void 0 && (_utils$token$get = _utils$token.get) !== null && _utils$token$get !== void 0 && _utils$token$get.call(_utils$token)) || false;
   }, [store]);
-  useEffect(function () {
-    var shopDiscount = pisellos.getModule('shopDiscount');
-    shopDiscount.setOriginTotalAmount(originTotal);
-  }, [originTotal]);
   var availableData = useMemo(function () {
     return discountList.filter(function (item) {
       return !!item.isAvailable;
@@ -120,18 +110,13 @@ var VoucherCard = function VoucherCard(props) {
     });
     appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$b = appointmentBooking.batchUpdateCart) === null || _appointmentBooking$b === void 0 || _appointmentBooking$b.call(appointmentBooking, items);
   };
-
-  // 防抖处理
-  var _useDebounceFn = useDebounceFn(function () {
-      var _shopDiscount$setBook, _appointmentBooking$o;
-      var products = cart === null || cart === void 0 ? void 0 : cart.getItems();
-      shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.bookingSubject);
-      var val = shopDiscount.calcDiscount(products);
-      batchUpdateCart(val.productList);
-    }, {
-      wait: 200
-    }),
-    onCartChange = _useDebounceFn.run;
+  var onCartChange = function onCartChange() {
+    var _shopDiscount$setBook, _appointmentBooking$o;
+    var products = cart === null || cart === void 0 ? void 0 : cart.getItems();
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.bookingSubject);
+    var val = shopDiscount.calcDiscount(products);
+    batchUpdateCart(val.productList);
+  };
   var stringifiedHolders = useMemo(function () {
     var _ret;
     try {

package/es/components/appointmentBooking/context.d.ts

@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
 import { TasksManager } from '../../utils/tasks';
 interface AppointmentBookingContextType {
     appointmentBooking: any;
@@ -30,6 +30,6 @@ interface AppointmentBookingContextType {
 }
 export declare const AppointmentBookingProvider: ({ children, }: {
     children: ReactNode;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export declare const useAppointmentBookingContext: () => AppointmentBookingContextType | undefined;
 export {};

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const DepositModal: (props: any) => React.JSX.Element;
+declare const DepositModal: (props: any) => JSX.Element;
 export default DepositModal;

package/es/components/appointmentBooking/deposit/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const Deposit: (props: any) => React.JSX.Element;
+declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/es/components/appointmentBooking/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const AppointmentBooking: () => React.JSX.Element;
+declare const AppointmentBooking: () => JSX.Element;
 export default AppointmentBooking;

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

@@ -60,15 +60,14 @@ export var formatProducts = function formatProducts(values) {
       discountway: 'num',
       discount_type: 'discount',
       bundle_edit: (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle_edit,
-      product_bundle: formatProductBundle((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle, item.is_price_include_tax),
+      product_bundle: formatProductBundle((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle),
       "product_option_item": formatProductOption((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.option),
       "product_variant_id": ((_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 || (_item$_extend5 = _item$_extend5.other) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.product_variant_id) || 0,
       "source_product_price": getSourceProductPrice(item),
       "main_product_selling_price": (_getMainProductSellin = getMainProductSellingPrice(item)) !== null && _getMainProductSellin !== void 0 ? _getMainProductSellin : formatProductPrice(item),
       "calculated_original_price": formatOriginalPrice(item),
       "calculated_selling_price": formatSellingPrice(item),
-      "tax_fee": item._extend.tax_fee,
-      is_price_include_tax: item.is_price_include_tax
+      "tax_fee": item._extend.tax_fee
     };
   });
   return arr;

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

@@ -1,4 +1,3 @@
-import React from "react";
 import "./index.less";
 interface TabProductProps {
     list: any[];
@@ -6,5 +5,5 @@ interface TabProductProps {
     onChange: (item: any, type: "select" | "detail") => void;
     scrollDom?: string;
 }
-declare const TabProduct: (props: TabProductProps) => React.JSX.Element;
+declare const TabProduct: (props: TabProductProps) => JSX.Element;
 export default TabProduct;

package/es/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => React.JSX.Element;
+declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 import "./index.less";
-declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => React.JSX.Element;
+declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

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

@@ -4,5 +4,5 @@ interface AuthWrapProps {
     falseRender?: React.ReactNode;
     show: boolean;
 }
-declare const AuthWrap: (props: AuthWrapProps) => React.JSX.Element;
+declare const AuthWrap: (props: AuthWrapProps) => JSX.Element;
 export default AuthWrap;

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

@@ -11,5 +11,5 @@ interface BrowserSelectProps extends React.DetailedHTMLProps<React.SelectHTMLAtt
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:43
  */
-declare const BrowserSelect: (props: BrowserSelectProps) => React.JSX.Element;
+declare const BrowserSelect: (props: BrowserSelectProps) => JSX.Element;
 export default BrowserSelect;

package/es/components/booking/components/collapsibleList/utils.d.ts

@@ -1,2 +1 @@
-import React from "react";
-export declare const renderBundles: (item: any, amountSymbol: string) => React.JSX.Element;
+export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

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

@@ -15,5 +15,5 @@ export interface PisellDrawerProps extends DrawerProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:51
  */
-declare const Drawer: (props: PisellDrawerProps) => React.JSX.Element;
+declare const Drawer: (props: PisellDrawerProps) => JSX.Element;
 export default Drawer;

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

@@ -1,4 +1,3 @@
-import React from "react";
 /**
  * @title: 空状态
  * @description:
@@ -9,5 +8,5 @@ import React from "react";
  */
 declare const EmptyBooking: ({ description }: {
     description?: string | undefined;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default EmptyBooking;

package/es/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 import "./index.less";
-declare const FooterMenus: ({ state, menuChange, items }: any) => React.JSX.Element | null;
+declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

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

@@ -625,7 +625,7 @@ var getMainProductTotal = function getMainProductTotal(item) {
   var _ref3, _ref4, _item$_extend$main_pr, _item$_extend3, _item$metadata, _item$_extend$other2, _item$_extend$other3, _item$_extend$other5;
   var total = new Decimal((_ref3 = (_ref4 = (_item$_extend$main_pr = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.main_product_selling_price) !== null && _item$_extend$main_pr !== void 0 ? _item$_extend$main_pr : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref4 !== void 0 ? _ref4 : item._extend.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
 
-  // 单规格
+  // 单规格 
   if ((_item$_extend$other2 = item._extend.other) !== null && _item$_extend$other2 !== void 0 && _item$_extend$other2.option && Array.isArray((_item$_extend$other3 = item._extend.other) === null || _item$_extend$other3 === void 0 ? void 0 : _item$_extend$other3.option)) {
     var _item$_extend$other4;
     total = total.add((_item$_extend$other4 = item._extend.other) === null || _item$_extend$other4 === void 0 ? void 0 : _item$_extend$other4.option.reduce(function (t, option) {
@@ -644,7 +644,7 @@ var getMainProductTotal = function getMainProductTotal(item) {
         // 子商品价格
         var bundleItemPrice = new Decimal((_ref5 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
         // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
-        var bundleItemTotal = bundleItemPrice;
+        var bundleItemTotal = bundleItemPrice.minus(discountAmount);
         total = total.add(bundleItemTotal);
       }
     }

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 /**
  * @title: 底部
@@ -8,5 +7,5 @@ import './index.less';
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:51
  */
-declare const Footer: (props: any) => React.JSX.Element;
+declare const Footer: (props: any) => JSX.Element;
 export default Footer;

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

@@ -339,13 +339,6 @@ var Footer = function Footer(props) {
       ScheduleModule: ScheduleModule
     }, getDataFromHost()));
   }, [state, isEdit]);
-  useEffect(function () {
-    window.dispatchEvent(new CustomEvent('onOriginExpectAmountWithoutDiscountChange', {
-      detail: {
-        originExpectAmountWithoutDiscount: total === null || total === void 0 ? void 0 : total.originExpectAmountWithoutDiscount
-      }
-    }));
-  }, [total === null || total === void 0 ? void 0 : total.originExpectAmountWithoutDiscount]);
   var orderTotalList = useMemo(function () {
     return [
     // 订单已付金额

package/es/components/booking/components/footer/utils.d.ts

@@ -15,7 +15,7 @@ export declare const formatProductOption: (option: any) => any;
  * @Author: zhiwei.Wang
  * @Date: 2024-02-19 09:26
  */
-export declare const formatProductBundle: (bundle: any, is_price_include_tax: number) => any;
+export declare const formatProductBundle: (bundle: any) => any;
 /**
  * 获取子商品折扣信息
  * @param item

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

@@ -92,7 +92,7 @@ var log = function log(data) {
  * @Author: zhiwei.Wang
  * @Date: 2024-02-19 09:26
  */
-export var formatProductBundle = function formatProductBundle(bundle, is_price_include_tax) {
+export var formatProductBundle = function formatProductBundle(bundle) {
   if (!bundle) {
     return;
   }
@@ -129,7 +129,6 @@ export var formatProductBundle = function formatProductBundle(bundle, is_price_i
       "option": option,
       "bundle_selling_price": Math.abs(d === null || d === void 0 ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
-      is_price_include_tax: is_price_include_tax,
       "metadata": {
         custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
@@ -469,7 +468,7 @@ var formatProducts = function formatProducts(item, quantity) {
     "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$_extend32 = item._extend) === null || _item$_extend32 === void 0 || (_item$_extend32 = _item$_extend32.other) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.bundle, item.is_price_include_tax),
+    "product_bundle": formatProductBundle((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 || (_item$_extend32 = _item$_extend32.other) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.bundle),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
     "product_option_item": formatProductOption((_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 || (_item$_extend33 = _item$_extend33.other) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.option),
     "product_variant_id": ((_item$_extend34 = item._extend) === null || _item$_extend34 === void 0 || (_item$_extend34 = _item$_extend34.other) === null || _item$_extend34 === void 0 ? void 0 : _item$_extend34.product_variant_id) || 0,
@@ -479,8 +478,7 @@ var formatProducts = function formatProducts(item, quantity) {
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
     "tax_fee": item._extend.tax_fee,
-    "custom_deposit_data": item.custom_deposit_data,
-    is_price_include_tax: item.is_price_include_tax
+    "custom_deposit_data": item.custom_deposit_data
   };
 };
 

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

@@ -1,3 +1,2 @@
-import React from "react";
-declare const FormItemChildrenWrap: (props: any) => React.JSX.Element;
+declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

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

@@ -6,5 +6,5 @@ interface MenuButtonProps {
     menuWrapStyle?: React.CSSProperties;
     dropdownProps?: DropdownProps;
 }
-declare const MenuButton: ({ menuWrapClassName, menuWrapStyle, dropdownProps, }: MenuButtonProps) => React.JSX.Element;
+declare const MenuButton: ({ menuWrapClassName, menuWrapStyle, dropdownProps, }: MenuButtonProps) => JSX.Element;
 export default MenuButton;

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

@@ -1,9 +1,8 @@
-import React from 'react';
 import './index.less';
 interface IProps {
     modal: any;
     onReload: () => Promise<any>;
     onCancel: () => void;
 }
-declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => React.JSX.Element;
+declare const ReloadResourceModal: ({ modal, onReload, onCancel }: IProps) => JSX.Element;
 export default ReloadResourceModal;

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const VoucherCard: (props: any) => React.JSX.Element | null;
+declare const VoucherCard: (props: any) => JSX.Element | null;
 export default VoucherCard;

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

@@ -152,17 +152,11 @@ var VoucherCard = function VoucherCard(props) {
     }
     onScanCode(e.detail.code);
   });
-  var onOriginExpectAmountWithoutDiscountChange = useMemoizedFn(function (e) {
-    var _shopDiscount$setOrig;
-    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setOrig = shopDiscount.setOriginTotalAmount) === null || _shopDiscount$setOrig === void 0 || _shopDiscount$setOrig.call(shopDiscount, e.detail.originExpectAmountWithoutDiscount);
-  });
   useEffect(function () {
     var wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
     window.addEventListener('onScanWallPassCode', wrappedOnScanWallPassCode);
-    window.addEventListener('onOriginExpectAmountWithoutDiscountChange', onOriginExpectAmountWithoutDiscountChange);
     return function () {
       window.removeEventListener('onScanWallPassCode', wrappedOnScanWallPassCode);
-      window.removeEventListener('onOriginExpectAmountWithoutDiscountChange', onOriginExpectAmountWithoutDiscountChange);
     };
   }, []);
   var addonsMemo = useMemo(function () {

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

@@ -1,8 +1,5 @@
 .pisell-lowcode__booking-footer-voucher-container {
   margin-bottom: 8px;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
   .voucher-title {
     display: flex;
     align-items: center;
@@ -50,9 +47,9 @@
     width: 100%;
     transition: 0.2s;
     max-height: 0;
+    overflow: hidden;
     display: flex;
     flex-direction: column;
-    overflow: auto;
 
     &.show {
       max-height: unset;

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

@@ -6,7 +6,6 @@
   .pisell-voucher-modal-content {
     max-height: 70vh;
     overflow-y: auto;
-    display: flex;
   }
 
   // 隐藏状态下的样式优化

package/es/components/booking/deposit/ClientItem/index.d.ts

@@ -14,5 +14,5 @@ declare type ClientItemProps = {
     className?: string;
     walkInName?: string;
 };
-declare const ClientItem: (props: ClientItemProps) => React.JSX.Element;
+declare const ClientItem: (props: ClientItemProps) => JSX.Element;
 export default ClientItem;

package/es/components/booking/deposit/DepositItem/index.d.ts

@@ -21,5 +21,5 @@ declare type DepositItemProps = {
     isBookingCancelled: boolean;
     hideOrderDetail?: boolean;
 };
-declare const DepositItem: (props: DepositItemProps) => React.JSX.Element;
+declare const DepositItem: (props: DepositItemProps) => JSX.Element;
 export default DepositItem;

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

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const Deposit: (props: any) => React.JSX.Element;
+declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/es/components/booking/forms/footer.d.ts

@@ -1,7 +1,6 @@
-import React from 'react';
 interface FooterProps {
     state: any;
     reload: () => void;
 }
-declare const Footer: ({ state, reload }: FooterProps) => React.JSX.Element | null;
+declare const Footer: ({ state, reload }: FooterProps) => JSX.Element | null;
 export default Footer;

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 /**
  * @title: 表单选择器
@@ -7,5 +6,5 @@ import './index.less';
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:06
  */
-declare const Single: ({ value, onChange, form, mode, optionRender, loading, customSelectProps, onAdd, addButtonProps, modalOpen, watch, drawerProps, }: any) => React.JSX.Element;
+declare const Single: ({ value, onChange, form, mode, optionRender, loading, customSelectProps, onAdd, addButtonProps, modalOpen, watch, drawerProps, }: any) => JSX.Element;
 export default Single;

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

@@ -1,4 +1,3 @@
-import React from "react";
 import "./index.less";
-declare const Table: ({ value, onChange, field, mode, onAdd }: any) => React.JSX.Element;
+declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

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

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const useClearCart: (state: any, dispatch: any) => false | React.JSX.Element;
+declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

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

@@ -1,6 +1,5 @@
-import React from 'react';
 export declare const calculateTotalPrice: (data: any) => number;
 declare const useQuotation: (state: any, dispatch: any) => {
-    dom: React.JSX.Element;
+    dom: JSX.Element;
 };
 export default useQuotation;

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

@@ -1,7 +1,6 @@
-import React from 'react';
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const AddServiceVariant: (props: AddServiceVariantProps) => React.JSX.Element;
+declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
 export default AddServiceVariant;

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

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
 export default _default;

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

@@ -36,7 +36,7 @@ import { getWaiverTitle } from "../clientVariant/utils";
 import useGetHolderList from "../hooks/useGetHolderList";
 var isLoadClient = false;
 var Client = function Client() {
-  var _state$client$value2, _state$client4, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
+  var _state$bookingConfig2, _state$client$value2, _state$client4, _state$client$value3, _state$client$value4, _state$client$value5, _state$client$value6, _state$client$value7, _state$client$value8, _state$client$value9, _state$client$value10, _state$client$value11;
   var modalRef = useRef();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -54,6 +54,10 @@ var Client = function Client() {
     franchiseeLoading = _useState6[0],
     setFranchiseeLoading = _useState6[1];
   var getHolders = useGetHolderList(state, dispatch);
+  var boardConfig = useMemo(function () {
+    var _state$bookingConfig;
+    return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_subject) || {};
+  }, [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.basic]);
   var _useState7 = useState({
       skip: 1,
       num: 10,
@@ -106,15 +110,21 @@ var Client = function Client() {
             if (!withKey.includes('contactsInfo')) {
               withKey.push('contactsInfo');
             }
-            _context.next = 8;
-            return api(_objectSpread(_objectSpread({}, resetParams), {}, {
+            // 返回用户的表单记录
+            if (!(withKey !== null && withKey !== void 0 && withKey.includes('formRecord'))) {
+              withKey.push('formRecord');
+            }
+            _context.next = 9;
+            return api(_objectSpread(_objectSpread(_objectSpread({}, resetParams), {}, {
               with: withKey
             }, !state.isFranchisee ? {
               _config: {
                 abort: true
               }
-            } : {}));
-          case 8:
+            } : {}), {}, {
+              relation_form_id: (boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id) || undefined
+            }));
+          case 9:
             data = _context.sent;
             list = ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
@@ -151,7 +161,7 @@ var Client = function Client() {
             setLoadLoading(false);
             isLoadClient = true;
             return _context.abrupt("return", {});
-          case 21:
+          case 22:
           case "end":
             return _context.stop();
         }

package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;
@@ -36,7 +35,7 @@ declare const useClientFn: (_params: useClientFnParams) => {
     };
     searchChange: (search: string) => void;
     loading: boolean;
-    loadMore: React.JSX.Element | null;
+    loadMore: JSX.Element | null;
     handleOpenClientModal: (val?: string) => void;
     getNickname: (item: any) => any;
     franchiseeLoading: number;

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

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