@pisell/private-materials 3.0.211 → 3.0.213

package/es/components/Sales/Cart/index.js

@@ -253,7 +253,7 @@ export var CartProvider = function CartProvider(_ref) {
   var createCartItemData = function createCartItemData() {
     var _cartData = getCurrentData().cartData;
     if (_cartData.currentCartItem) {
-      var _eventItem$eventDetai, _eventItem$eventDetai2, _eventItem$eventDetai3, _eventItem$eventDetai4, _startDateInfo$times, _startDateInfo$times$, _eventItem$eventDetai5, _eventItem$eventDetai6, _endDateInfo$times, _endDateInfo$times$sl, _endDateInfo$times$sl2;
+      var _eventItem$eventDetai, _eventItem$eventDetai2, _eventItem$eventDetai3, _eventItem$eventDetai4, _startDateInfo$times, _startDateInfo$times$, _eventItem$eventDetai5, _eventItem$eventDetai6, _endDateInfo$times, _endDateInfo$times$sl, _endDateInfo$times$sl2, _eventItem$eventDetai7, _eventItem$eventDetai8, _eventItem$eventDetai9;
       var _ref2 = _cartData.currentCartItem || {},
         _id = _ref2._id,
         _ref2$eventItem = _ref2.eventItem,
@@ -290,6 +290,8 @@ export var CartProvider = function CartProvider(_ref) {
         // 是否显示时间
         show_time: true,
         end_time: endTime ? dayjs(endTime || '').format('HH:mm') : '',
+        custom_day_count: (_eventItem === null || _eventItem === void 0 ? void 0 : (_eventItem$eventDetai7 = _eventItem.eventDetail) === null || _eventItem$eventDetai7 === void 0 ? void 0 : (_eventItem$eventDetai8 = _eventItem$eventDetai7.selectDate) === null || _eventItem$eventDetai8 === void 0 ? void 0 : (_eventItem$eventDetai9 = _eventItem$eventDetai8.dates) === null || _eventItem$eventDetai9 === void 0 ? void 0 : _eventItem$eventDetai9.length) || 0,
+        is_charge_tax: bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.is_charge_tax,
         _originData: _objectSpread(_objectSpread({}, _cartData.currentCartItem._originData), {}, {
           product: {
             num: 1,

package/es/components/Sales/Checkout/index.js

@@ -50,6 +50,12 @@ export var CheckoutProvider = function CheckoutProvider(_ref) {
       checkoutCallback.current({
         success: true
       });
+    },
+    onError: function onError(err) {
+      checkoutCallback.current({
+        success: false,
+        err: err
+      });
     }
   });
 

package/es/components/Sales/Event/Detail.js

@@ -55,7 +55,7 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
     var introduction = {
       title: eventItem.title,
       price: eventItem.price,
-      images: [eventItem.image]
+      images: eventItem.image ? [eventItem.image] : []
     };
     eventRef.current = eventItem;
     _setDetail({

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

@@ -1,5 +1,9 @@
 import React from 'react';
 interface InitData {
+    boardSetting?: any;
+    form_id?: number;
+    shop_id?: number;
+    shop?: any;
 }
 interface InitContextType {
     getBoardSetting: any;

package/es/components/Sales/Init/index.js

@@ -15,6 +15,7 @@ import holder from "../Holder";
 import event from "../Event";
 import resource from "../Resource";
 import summary from "../Summary";
+import { useCustomer } from "../Customer";
 // 默认步骤状态
 var defaultState = {};
 
@@ -28,6 +29,8 @@ export var InitProvider = function InitProvider(_ref) {
     hooks = _useSales.hooks,
     getCurrentData = _useSales.getCurrentData,
     getSessionStorage = _useSales.getSessionStorage;
+  var _useCustomer = useCustomer(),
+    appUtils = _useCustomer.appUtils;
   var useCustomInit = hooks.useCustomInit;
   var customInit = useCustomInit();
   var initData = useMemo(function () {
@@ -78,11 +81,12 @@ export var InitProvider = function InitProvider(_ref) {
   var getBoardSetting = useRequest(getBoardSettingApi, {
     manual: true,
     onSuccess: function onSuccess(res) {
-      var _res$data, _res$data$config, _res$data$config$reso, _res$data$config$reso2, _res$data2;
+      var _res$data, _res$data$config, _res$data$config$reso, _res$data$config$reso2, _res$data2, _appUtils$getStore, _appUtils$getStore$ge, _appUtils$getStore$ge2, _appUtils$getStore$ge3;
       setInitData({
         boardSetting: res === null || res === void 0 ? void 0 : res.data,
         form_id: res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$config = _res$data.config) === null || _res$data$config === void 0 ? void 0 : (_res$data$config$reso = _res$data$config.resource) === null || _res$data$config$reso === void 0 ? void 0 : (_res$data$config$reso2 = _res$data$config$reso.booking_event_v2_resource) === null || _res$data$config$reso2 === void 0 ? void 0 : _res$data$config$reso2.form_id,
-        shop_id: res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shop_id
+        shop_id: res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shop_id,
+        shop: (_appUtils$getStore = appUtils.getStore()) === null || _appUtils$getStore === void 0 ? void 0 : (_appUtils$getStore$ge = _appUtils$getStore.getState()) === null || _appUtils$getStore$ge === void 0 ? void 0 : (_appUtils$getStore$ge2 = _appUtils$getStore$ge.core) === null || _appUtils$getStore$ge2 === void 0 ? void 0 : (_appUtils$getStore$ge3 = _appUtils$getStore$ge2.core) === null || _appUtils$getStore$ge3 === void 0 ? void 0 : _appUtils$getStore$ge3.shop
       });
     }
   });

package/es/components/Sales/Resource/serve.d.ts

@@ -1,4 +1,5 @@
 export declare const getResourceListApi: (params: {
     form_id: string;
     shop_id: string;
+    form_data_status: string;
 }) => Promise<any>;

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

@@ -4,6 +4,9 @@ interface SummaryData {
 interface SummaryContextType {
     subtotal: number | string;
     total: number | string;
+    taxTitle?: string;
+    totalTaxFee?: string;
+    isPriceIncludeTax?: 0 | 1;
 }
 interface SummaryProviderProps {
     children: React.ReactNode;

package/es/components/Sales/Summary/index.js

@@ -1,6 +1,7 @@
 import React, { createContext, useMemo } from 'react';
 import { useCart } from "../Cart";
 import { calculatePriceDetails } from "./utils";
+import { useInit } from "../Init";
 // 默认步骤状态
 var defaultState = {};
 
@@ -10,14 +11,19 @@ export var SummaryProvider = function SummaryProvider(_ref) {
   var children = _ref.children;
   var _useCart = useCart(),
     cartData = _useCart.cartData;
+  var _useInit = useInit(),
+    initData = _useInit.initData;
   var summaryData = useMemo(function () {
-    return calculatePriceDetails(cartData.cartItems);
-  }, [cartData.cartItems]);
+    return calculatePriceDetails((initData === null || initData === void 0 ? void 0 : initData.shop) || {}, cartData.cartItems);
+  }, [cartData.cartItems, initData === null || initData === void 0 ? void 0 : initData.shop]);
   var contextValue = {
     // 商品总价
     subtotal: summaryData.subtotal,
     // 总金额
-    total: summaryData.total
+    total: summaryData.total,
+    taxTitle: summaryData.taxTitle,
+    totalTaxFee: summaryData.totalTaxFee,
+    isPriceIncludeTax: summaryData.isPriceIncludeTax
   };
   return /*#__PURE__*/React.createElement(SummaryContext.Provider, {
     value: contextValue

package/es/components/Sales/Summary/serve.d.ts

@@ -1,2 +0,0 @@
-export declare const getHolderListApi: () => any;
-export declare const createHolderApi: (data: any) => any;

package/es/components/Sales/Summary/serve.js

@@ -1,11 +0,0 @@
-import { get, post } from "../../../utils/request";
-
-//  获取holder列表
-export var getHolderListApi = function getHolderListApi() {
-  return get('/api/holder/list');
-};
-
-// 创建holder
-export var createHolderApi = function createHolderApi(data) {
-  return post('/api/holder/create', data);
-};

package/es/components/Sales/Summary/utils.d.ts

@@ -1,10 +1,15 @@
+import Decimal from 'decimal.js';
 interface CartItem {
     price: number | string;
     quantity?: number;
+    [k: string]: any;
 }
 interface PriceDetail {
     subtotal: string;
     total: string;
+    taxTitle?: string;
+    totalTaxFee?: string;
+    isPriceIncludeTax?: 0 | 1;
 }
 /**
  * 计算商品小计（不含其他费用）
@@ -12,11 +17,20 @@ interface PriceDetail {
  * @returns 商品总价字符串，保留2位小数
  */
 export declare const calculateSubtotal: (items: CartItem[]) => string;
+/**
+ * @title: 单个商品的税费
+ * @description:
+ * 单个商品的税费 = 商品销售单价（折扣后） * 税率 * is_charge_tax /( 1+ 税率 * is_price_include_tax)
+ * $taxFee = $price * $taxRate * $isChargeTax / (1 + $taxRate * $isPriceIncludeTax);
+ * @return {*}
+ * @Author: xiangfeng.xue
+ */
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组
  * @param options - 其他费用配置
  * @returns 价格明细对象
  */
-export declare const calculatePriceDetails: (items: CartItem[]) => PriceDetail;
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => PriceDetail;
 export {};

package/es/components/Sales/Summary/utils.js

@@ -16,19 +16,48 @@ export var calculateSubtotal = function calculateSubtotal(items) {
   return subtotal.toFixed(2);
 };
 
+/**
+ * @title: 单个商品的税费
+ * @description:
+ * 单个商品的税费 = 商品销售单价（折扣后） * 税率 * is_charge_tax /( 1+ 税率 * is_price_include_tax)
+ * $taxFee = $price * $taxRate * $isChargeTax / (1 + $taxRate * $isPriceIncludeTax);
+ * @return {*}
+ * @Author: xiangfeng.xue
+ */
+export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
+  if (!(items !== null && items !== void 0 && items.length)) {
+    return '0.00';
+  }
+  var _ref = shopInfo || {},
+    is_price_include_tax = _ref.is_price_include_tax,
+    tax_rate = _ref.tax_rate;
+  var totalTaxFee = items.reduce(function (sum, item) {
+    var price = new Decimal(item.price || 0);
+    var taxRate = new Decimal(tax_rate || 0).div(100);
+    var productTaxRate = price.times(taxRate).times((item === null || item === void 0 ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
+    return sum.plus(productTaxRate);
+  }, new Decimal(0));
+  return totalTaxFee;
+};
+
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组
  * @param options - 其他费用配置
  * @returns 价格明细对象
  */
-export var calculatePriceDetails = function calculatePriceDetails(items) {
+export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items) {
   var subtotal = new Decimal(calculateSubtotal(items));
+  var totalTaxFee = new Decimal(calculateTaxFee(shopInfo, items));
+  console.log('totalTaxFee', totalTaxFee.toFixed(2));
 
   // 计算总价
-  var total = subtotal;
+  var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal : subtotal.plus(totalTaxFee);
   return {
     subtotal: subtotal.toFixed(2),
-    total: total.toFixed(2)
+    total: total.toFixed(2),
+    taxTitle: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_title,
+    totalTaxFee: totalTaxFee.toFixed(2),
+    isPriceIncludeTax: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax
   };
 };

package/es/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"windcave" | "tyro" | "payo" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState } from 'react';
 import { locales } from '@pisell/utils';
-import { Button } from '@pisell/materials';
+import { Button, PisellToast } from '@pisell/materials';
 import { useCart, useHolder, useStep, useCheckout, useSales, useCustomer } from "../../../../../Sales";
 import { formatValues } from "../../../../../Sales/Checkout/utils";
 import OrderProductModal from "../../OrderProductModal/index";
@@ -66,7 +66,7 @@ var ContinueButton = function ContinueButton() {
    */
   var handleCheckout = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var value, result;
+      var value, result, _result$err;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -78,6 +78,10 @@ var ContinueButton = function ContinueButton() {
             // 清空数据
             if (result !== null && result !== void 0 && result.success) {
               removeSessionStorage();
+            } else {
+              PisellToast({
+                content: (result === null || result === void 0 ? void 0 : (_result$err = result.err) === null || _result$err === void 0 ? void 0 : _result$err.message) || ''
+              });
             }
           case 5:
           case "end":

package/es/components/eventBooking/components/Provider/Cart/Item/Total.d.ts

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

package/es/components/eventBooking/components/Provider/Cart/Item/Total.js

@@ -0,0 +1,46 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import React from 'react';
+import { locales } from '@pisell/utils';
+import { PisellText } from '@pisell/materials';
+import { useSummary } from "../../../../../Sales";
+import useEngineContext from "../../../../../../hooks/useEngineContext";
+import "./index.less";
+import classNames from 'classnames';
+var Total = function Total(_ref) {
+  var _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper2, _context$appHelper2$u, _context$appHelper2$u2;
+  var className = _ref.className,
+    isFooter = _ref.isFooter;
+  var _useSummary = useSummary(),
+    taxTitle = _useSummary.taxTitle,
+    totalTaxFee = _useSummary.totalTaxFee,
+    isPriceIncludeTax = _useSummary.isPriceIncludeTax,
+    total = _useSummary.total;
+  var context = useEngineContext();
+  console.log(taxTitle, isPriceIncludeTax, totalTaxFee, total, context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : (_context$appHelper$ut = _context$appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getSymbolic) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.call(_context$appHelper$ut), 'wh97978');
+  return /*#__PURE__*/React.createElement("div", {
+    className: "event-total-wrap ".concat(className)
+  }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("div", {
+    className: "gst-wrap"
+  }, /*#__PURE__*/React.createElement("span", null, taxTitle, isFooter ? ': ' : ''), /*#__PURE__*/React.createElement(PisellText.Amount, {
+    value: totalTaxFee,
+    showCurrencySymbol: true
+  })) : null, /*#__PURE__*/React.createElement("div", {
+    className: classNames('event-total', _defineProperty({}, ['total-gst-wrap'], !isPriceIncludeTax && Number(totalTaxFee) > 0))
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "left"
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.event.total'), isFooter ? ': ' : ''), isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
+    value: total,
+    showCurrencySymbol: true,
+    className: "event-amount"
+  }) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("span", {
+    className: "gst"
+  }, locales.getText('pisell2.event.total.gst')("".concat(isFooter ? "".concat(taxTitle, ": ") : taxTitle), "".concat(context === null || context === void 0 ? void 0 : (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : (_context$appHelper2$u = _context$appHelper2.utils) === null || _context$appHelper2$u === void 0 ? void 0 : (_context$appHelper2$u2 = _context$appHelper2$u.getSymbolic) === null || _context$appHelper2$u2 === void 0 ? void 0 : _context$appHelper2$u2.call(_context$appHelper2$u)).concat(totalTaxFee))) : null), !isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
+    value: total,
+    showCurrencySymbol: true,
+    className: "event-amount"
+  }) : null));
+};
+export default Total;

package/es/components/eventBooking/components/Provider/Cart/Item/index.js

@@ -1,10 +1,10 @@
 import React from 'react';
 import { isMobile, locales } from '@pisell/utils';
-import { PisellText } from '@pisell/materials';
 import ShoppingCart from "../../../../../shoppingCart";
 import { useCart, useHolder, useSummary, useStep } from "../../../../../Sales";
 import SelectHolderModal from "../../SelectHolderModal";
 import ContinueButton from "../ContinueButton";
+import Total from "./Total";
 import "./index.less";
 var CartItem = function CartItem() {
   var _useHolder = useHolder(),
@@ -56,13 +56,7 @@ var CartItem = function CartItem() {
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "event-footer"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "event-total-wrap"
-  }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.event.total')), /*#__PURE__*/React.createElement(PisellText.Amount, {
-    value: subtotal,
-    showCurrencySymbol: true,
-    className: "event-amount"
-  })), /*#__PURE__*/React.createElement(ContinueButton, null))), /*#__PURE__*/React.createElement(SelectHolderModal, {
+  }, /*#__PURE__*/React.createElement(Total, null), /*#__PURE__*/React.createElement(ContinueButton, null))), /*#__PURE__*/React.createElement(SelectHolderModal, {
     open: open
   }));
 };

package/es/components/eventBooking/components/Provider/Cart/Item/index.less

@@ -17,19 +17,51 @@
     flex-direction: column;
     gap: 14px;
     margin-top: 6px;
-    .event-total-wrap {
-      color: var(--Text-Text_1, #1b1b1b);
-      font-size: 20px;
-      font-weight: 600;
-      line-height: 28px;
+  }
+}
+
+.event-total-wrap {
+  color: var(--Text-Text_1, #1b1b1b);
+  font-size: 20px;
+  font-weight: 600;
+  line-height: 28px;
+  display: flex;
+  flex-direction: column;
+  align-items: start;
+
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+  }
+
+  .gst-wrap {
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 24px;
+  }
+
+  .event-total {
+    .left {
       display: flex;
-      align-items: center;
-      justify-content: space-between;
-      .event-amount {
-        color: var(--Blue-600, #1570ef);
+      flex-direction: column;
+      .gst {
+        color: var(--Gray-500, #667085);
+        font-size: 14px;
+        font-weight: 400;
+        line-height: 20px;
       }
     }
   }
+
+  .total-gst-wrap {
+    padding: 14px 0 0;
+  }
+
+  .event-amount {
+    color: var(--Blue-600, #1570ef);
+  }
 }
 
 .cart-mobile-item-wrap {
@@ -40,7 +72,7 @@
   .content {
     flex: 1;
     overflow-y: auto;
-    padding: 0 0 120px;
+    padding: 0 0 140px;
   }
   .event-footer {
     z-index: 10;

package/es/components/eventBooking/components/Provider/Cart/index.js

@@ -15,12 +15,8 @@ var Cart = function Cart(_ref) {
       return _onCancel();
     },
     bodyStyle: {
-      padding: '20px',
-      display: 'flex',
-      flexDirection: 'column',
-      height: '100%'
+      padding: '20px'
     },
-    mobileModalHeight: '90%',
     destroyOnClose: true,
     className: "event-cart-modal",
     footer: null

package/es/components/eventBooking/components/Provider/Cart/index.less

@@ -1,4 +1,2 @@
 .event-cart-modal {
 }
-.event-cart-modal {
-}

package/es/components/eventBooking/components/Provider/Content/index.js

@@ -30,6 +30,30 @@ var Layout = function Layout() {
     var Com = components[key];
     return /*#__PURE__*/React.createElement(Com, null);
   }, [currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key]);
+
+  /**
+   * @title: 动态计算中间内容区域的高度
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-02-18 15:36
+   */
+  useEffect(function () {
+    if (isMobile()) {
+      var _header$getBoundingCl, _footer$getBoundingCl;
+      var header = document.querySelector('.event-progress-bar');
+      var footer = document.querySelector('.pisell-section-footers-wrapper');
+      var content = document.querySelector('.event-content-mobile-wrap');
+      var headerHeight = (header === null || header === void 0 ? void 0 : (_header$getBoundingCl = header.getBoundingClientRect()) === null || _header$getBoundingCl === void 0 ? void 0 : _header$getBoundingCl.height) || 0;
+      var footerHeight = (footer === null || footer === void 0 ? void 0 : (_footer$getBoundingCl = footer.getBoundingClientRect()) === null || _footer$getBoundingCl === void 0 ? void 0 : _footer$getBoundingCl.height) || 0;
+      var windowHeight = window.innerHeight;
+      var contentHeight = windowHeight - headerHeight - footerHeight;
+      if (content && content !== null && content !== void 0 && content.style) {
+        content.style.height = "".concat(contentHeight, "px");
+        content.style.overflowY = 'auto';
+      }
+    }
+  }, [currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key]);
   return /*#__PURE__*/React.createElement("div", {
     className: "event-content-wrap ".concat(isMobile() ? 'event-content-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement("div", {

package/es/components/eventBooking/components/Provider/Content/index.less

@@ -3,6 +3,7 @@
   display: flex;
   gap: 6px;
   // align-items: center;
+  flex: 1;
 
   .event-content-left {
     flex: 1;
@@ -19,10 +20,10 @@
 
 .event-content-mobile-wrap {
   width: 100%;
+  flex: none;
   .event-content-left {
-    background: #fff;
     width: 100%;
-    min-height: 100vh;
+    flex: none;
     .provider-information-wrap {
       width: 100%;
     }

package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.js

@@ -28,8 +28,7 @@ var EmptyHolderModal = function EmptyHolderModal(props) {
     },
     onOk: function onOk() {
       return _onOk();
-    },
-    mobileModalHeight: '80vh'
+    }
   });
 };
 export default EmptyHolderModal;

package/es/components/eventBooking/components/Provider/Event/index.less

@@ -6,7 +6,7 @@
   .event-booking-service-list {
     flex: 1;
     background: #ffffff;
-    min-height: calc(100vh - 93px);
+    // min-height: calc(100vh - 93px);
   }
 }
 

package/es/components/eventBooking/components/Provider/Footer/index.js

@@ -5,14 +5,14 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
-import { SectionFooters, PisellText, Button, Badge, Image } from '@pisell/materials';
-import { locales } from '@pisell/utils';
+import { SectionFooters, Button, Badge, Image } from '@pisell/materials';
 import { useState } from 'react';
 import { useCart, useHolder, useSummary } from "../../../../Sales";
 import SelectHolderModal from "../SelectHolderModal";
 import ContinueButton from "../Cart/ContinueButton";
 import shoppingCartSvg from "../../../assets/shopping-cart.svg";
 import Cart from "../Cart";
+import Total from "../Cart/Item/Total";
 import "./index.less";
 var Footer = function Footer() {
   var _cartData$cartItems;
@@ -24,7 +24,7 @@ var Footer = function Footer() {
     onCloseCart = _useCart.onCloseCart,
     cartData = _useCart.cartData;
   var _useSummary = useSummary(),
-    subtotal = _useSummary.subtotal;
+    total = _useSummary.total;
   // 当前本地选中的holder
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
@@ -32,13 +32,20 @@ var Footer = function Footer() {
     setSelectedItem = _useState2[1];
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SectionFooters, {
     className: "section-footer-wrap",
-    left: /*#__PURE__*/React.createElement("div", {
-      className: "section-footer-left"
-    }, /*#__PURE__*/React.createElement(PisellText, null, locales.getText('pisell2.event.total')), /*#__PURE__*/React.createElement(PisellText.Amount, {
-      value: subtotal,
-      showCurrencySymbol: true,
-      className: "amount"
-    })),
+    left:
+    /*#__PURE__*/
+    // <div className="section-footer-left">
+    //   {/* <PisellText>{locales.getText('pisell2.event.total')}: </PisellText>
+    //   <PisellText.Amount
+    //     value={total}
+    //     showCurrencySymbol={true}
+    //     className="amount"
+    //   /> */}
+    // </div>
+    React.createElement(Total, {
+      className: "section-footer-left",
+      isFooter: true
+    }),
     right: /*#__PURE__*/React.createElement("div", {
       className: "section-footer-right"
     }, /*#__PURE__*/React.createElement(Badge, {
@@ -52,7 +59,7 @@ var Footer = function Footer() {
     }, /*#__PURE__*/React.createElement(Image, {
       src: shoppingCartSvg,
       preview: false
-    }), locales.getText('pisell2.event.cart'))), /*#__PURE__*/React.createElement(ContinueButton, null))
+    }))), /*#__PURE__*/React.createElement(ContinueButton, null))
   }), /*#__PURE__*/React.createElement(SelectHolderModal, {
     open: open,
     selectedItem: selectedItem,