@pisell/private-materials 6.6.7 → 6.6.9

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

@@ -112,7 +112,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
               },
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-                  var _appointmentBooking$o, product, res, session, startDate, endDate, _res, _data$origin, resources, activeStatus, _res2, index, stepList, hasResourceStep, description;
+                  var product, res, session, startDate, endDate, _res, _data$origin, resources, activeStatus, _res2, index, stepList, hasResourceStep, description;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
@@ -123,9 +123,6 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                         appointmentBooking.closeProductDetail();
                         return _context.abrupt("return");
                       case 3:
-                        if (data !== null && data !== void 0 && data.origin) {
-                          data.origin.isFormSubject = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSubject) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.type) === 'form';
-                        }
                         product = _objectSpread(_objectSpread({}, data), {}, {
                           options: (data === null || data === void 0 ? void 0 : data.option) || []
                         });
@@ -133,27 +130,27 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
 
                         // 零售模版，直接加入购物车
                         if (!isRetailTemplate) {
-                          _context.next = 13;
+                          _context.next = 12;
                           break;
                         }
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
-                          _context.next = 9;
+                          _context.next = 8;
                           break;
                         }
                         return _context.abrupt("return");
-                      case 9:
+                      case 8:
                         res = appointmentBooking.storeProduct(product);
                         if (!(!res.success && res.errorCode === 'not_enough_stock')) {
-                          _context.next = 12;
+                          _context.next = 11;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
-                      case 12:
+                      case 11:
                         return _context.abrupt("return");
-                      case 13:
+                      case 12:
                         session = data === null || data === void 0 ? void 0 : data.session;
                         if (!session) {
-                          _context.next = 25;
+                          _context.next = 24;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
@@ -166,45 +163,45 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                           }
                         });
                         if (!(!_res.success && _res.errorCode === 'not_enough_stock')) {
-                          _context.next = 20;
+                          _context.next = 19;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
-                      case 20:
+                      case 19:
                         appointmentBooking.closeProductDetail();
-                        _context.next = 23;
+                        _context.next = 22;
                         return appointmentBooking.getAvailableDate({
                           startDate: startDate,
                           endDate: endDate
                         });
-                      case 23:
-                        _context.next = 35;
+                      case 22:
+                        _context.next = 34;
                         break;
-                      case 25:
+                      case 24:
                         resources = (data === null || data === void 0 || (_data$origin = data.origin) === null || _data$origin === void 0 || (_data$origin = _data$origin.product_resource) === null || _data$origin === void 0 ? void 0 : _data$origin.resources) || [];
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
                         if (!(!activeStatus && !appointmentBooking.isTargetNormalProduct(data === null || data === void 0 ? void 0 : data.origin))) {
-                          _context.next = 29;
+                          _context.next = 28;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 29:
+                      case 28:
                         _res2 = appointmentBooking.storeProduct(product);
                         if (!(!_res2.success && _res2.errorCode === 'not_enough_stock')) {
-                          _context.next = 32;
+                          _context.next = 31;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
-                      case 32:
+                      case 31:
                         if (!(type === 'duration')) {
-                          _context.next = 35;
+                          _context.next = 34;
                           break;
                         }
-                        _context.next = 35;
+                        _context.next = 34;
                         return appointmentBooking.getAvailableDate();
-                      case 35:
+                      case 34:
                         appointmentBooking.closeProductDetail();
 
                         // 先选择日期流程
@@ -233,7 +230,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             removeStep('select-time');
                           }
                         }
-                      case 37:
+                      case 36:
                       case "end":
                         return _context.stop();
                     }

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

@@ -1,4 +1,5 @@
+import React from 'react';
 import '../../../booking/components/voucher/index.less';
 import './index.less';
-declare const VoucherCard: (props: any) => JSX.Element;
+declare const VoucherCard: (props: any) => React.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,16 +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 products = cart === null || cart === void 0 ? void 0 : cart.getItems();
-      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 { ReactNode } from 'react';
+import React, { 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;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export declare const useAppointmentBookingContext: () => AppointmentBookingContextType | undefined;
 export {};

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
-declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
+declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => React.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) => JSX.Element;
+declare const AuthWrap: (props: AuthWrapProps) => React.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) => JSX.Element;
+declare const BrowserSelect: (props: BrowserSelectProps) => React.JSX.Element;
 export default BrowserSelect;

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

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

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

@@ -0,0 +1,38 @@
+import React from 'react';
+import './index.less';
+interface CustomSelectProps {
+    options: any[];
+    onValueChange: (value: any[]) => void;
+    value: any[];
+    rowKey: string;
+    previewItemRender?: (item: any) => React.ReactNode;
+    previewItemTitleRender?: (item: any, index: number, values: any[]) => React.ReactNode;
+    addButtonRender?: () => React.ReactNode;
+    optionRender: (item: any) => React.ReactNode;
+    addButtonProps?: any;
+    drawerProps?: any;
+    createItemText?: string;
+    loading?: boolean;
+    previewItemClassName?: string;
+    optionClassName?: string;
+    mode?: 'single' | 'multiple' | 'form';
+    filterItem?: (item: any, search: string) => boolean;
+    isPreview?: boolean;
+    name?: string;
+    handleCreateItem?: () => void;
+    handleViewItem?: (item: any) => void;
+    searchChange?: (e: string) => void;
+    loadMore?: any;
+    virtualListHeight?: number;
+    disabled?: boolean;
+    searchValue?: string;
+    onVirtualListScroll?: any;
+    modalOpen?: boolean;
+    closeCallback?: () => any;
+    autoFocus?: boolean;
+    showDropDown?: boolean;
+    handleOpenModal?: () => void;
+    handleDayChange?: (value: any) => void;
+}
+declare const _default: React.ForwardRefExoticComponent<CustomSelectProps & React.RefAttributes<unknown>>;
+export default _default;

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) => JSX.Element;
+declare const Drawer: (props: PisellDrawerProps) => React.JSX.Element;
 export default Drawer;

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

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

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

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
-declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
+declare const FooterMenus: ({ state, menuChange, items }: any) => React.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,3 +1,4 @@
+import React from 'react';
 import './index.less';
 /**
  * @title: 底部
@@ -7,5 +8,5 @@ import './index.less';
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 16:51
  */
-declare const Footer: (props: any) => JSX.Element;
+declare const Footer: (props: any) => React.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,
         // 子商品单数量附加费
@@ -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,3 @@
-/// <reference types="react" />
-declare const FormItemChildrenWrap: (props: any) => JSX.Element;
+import React from "react";
+declare const FormItemChildrenWrap: (props: any) => React.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) => JSX.Element;
+declare const MenuButton: ({ menuWrapClassName, menuWrapStyle, dropdownProps, }: MenuButtonProps) => React.JSX.Element;
 export default MenuButton;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const VoucherCard: (props: any) => JSX.Element | null;
+declare const VoucherCard: (props: any) => React.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 () {
@@ -199,6 +193,11 @@ var VoucherCard = function VoucherCard(props) {
       return list || [];
     }
   }, [(_state$pet2 = state.pet) === null || _state$pet2 === void 0 ? void 0 : _state$pet2.value, isBooking4Shop]);
+  useEffect(function () {
+    var _shopDiscount$setBook, _state$bookingConfig;
+    console.log('update booking subject', state.bookingConfig);
+    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, (_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.bookingConfig]);
   var disabled = useMemo(function () {
     var _state$bookingDetail;
     if (['paid', 'partially_paid'].includes((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status) && [].concat(_toConsumableArray(addonsMemo), _toConsumableArray(serviceMemo)).every(function (item) {

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

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

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

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

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,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
 /**
  * @title: 表单选择器
@@ -7,5 +7,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) => JSX.Element;
+declare const Single: ({ value, onChange, form, mode, optionRender, loading, customSelectProps, onAdd, addButtonProps, modalOpen, watch, drawerProps, }: any) => React.JSX.Element;
 export default Single;

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

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

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

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

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