@pisell/private-materials 6.0.24 → 6.1.1

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

@@ -35,20 +35,21 @@ import ProductItem from "../components/TabProduct/selectProductItem";
 import TabProduct from "../components/TabProduct";
 import EmptyBooking from "../components/emptyBooking";
 import Footer from "../components/footer";
-import { formatProductBundle } from "../components/footer/utils";
-import { formatProductListByCategory, getProductTotalPrice, request } from "../utils";
+import { formatProductBundle, formatProductOption, formatProductPrice } from "../components/footer/utils";
+import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import "./index.less";
 import useEngineContext from "../../../hooks/useEngineContext";
 export var formatProducts = function formatProducts(values) {
   var arr = [];
   arr = values.map(function (item) {
-    var _item$_extend, _item$_extend2;
+    var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4;
     return {
       order_detail_id: item.order_detail_id || 0,
       num: item._extend.quantity,
-      price: item._extend.price,
+      price: formatProductPrice(item),
       product_id: item.id,
+      discount_list: (item === null || item === void 0 ? void 0 : item.discount_list) || [],
       discount_amount: 0,
       product_discount_reason: '',
       is_charge_tax: item.is_charge_tax,
@@ -56,7 +57,9 @@ export var formatProducts = function formatProducts(values) {
       discountway: 'num',
       discount_type: 'discount',
       bundle_edit: (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle_edit,
-      product_bundle: formatProductBundle((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle)
+      product_bundle: formatProductBundle((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle),
+      "product_option_item": formatProductOption((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.option),
+      "product_variant_id": ((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.product_variant_id) || 0
     };
   });
   return arr;
@@ -83,7 +86,7 @@ var restoreProductOtherData = function restoreProductOtherData(data) {
         })
       });
     }),
-    product_variant_id: 0,
+    product_variant_id: detail.product_variant_id || 0,
     quantity: Number(detail.product_quantity)
   };
 };
@@ -94,11 +97,13 @@ var formatProductValues = function formatProductValues(data) {
     return _objectSpread(_objectSpread({}, d), {}, {
       id: d.product_id,
       title: d.product_title,
+      isAddons: true,
       quantity: d.product_quantity,
       cover: d.product_cover,
       price: Number(d.source_product_price),
       _extend: {
         total: Number(d.selling_price),
+        origin_total: Number(d.selling_price),
         payment_price: Number(d.payment_price),
         price: Number(d.source_product_price),
         quantity: d.product_quantity,
@@ -281,43 +286,52 @@ var Addons = Provider(function (props) {
    */
   var handleAddProduct = function handleAddProduct(item, type) {
     var _list = _toConsumableArray(state.addons.value);
+    var isSession = isSessionProduct(item);
 
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === 'detail' || item.bundle_group_count > 0;
+    var isEject = getIsEject(item, type);
+    var isOnlySession = getIsOnlySession(item);
     state.action({
       type: 'pisell1.handleOpenProductModal',
       data: {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
-          session: false,
-          variant: false,
-          package: true
+          option: true,
+          session: isSession,
+          variant: true,
+          package: true,
+          number: true
         },
-        is_eject: isEject ? 1 : 0
+        isOnlySession: isOnlySession,
+        is_eject: isEject ? 1 : 0,
+        isOS: isSession
       },
-      callback: function callback(e) {
-        console.log('e', e);
-        var product = _objectSpread(_objectSpread({}, item), {}, {
+      callback: function callback(e, extension_type, detail) {
+        var _detail = detail || item;
+        var product = _objectSpread(_objectSpread({}, _detail), {}, {
           _id: getUniqueId(),
+          isAddons: true,
           _key: e.key,
           _extend: {
-            price: item.price,
+            price: _detail.price,
             other: e,
-            quantity: 1
+            quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1
           },
-          quantity: 1
+          quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1
         });
         var _total = getProductTotalPrice(product);
         product._extend.total = _total;
+        product._extend.origin_total = _total;
+        // 已经加入购物车的折扣商品 不叠加
         var _item = _list.find(function (d) {
-          return d._extend.other.key === e.key;
+          var _d$discount_list;
+          return d._extend.other.rowKey === e.rowKey && !d.booking_id && !((_d$discount_list = d.discount_list) !== null && _d$discount_list !== void 0 && _d$discount_list.length);
         });
 
         // 如果已添加, 则数量+1
         if (_item) {
-          _item._extend.quantity = _item.quantity + 1;
+          _item._extend.quantity = _item._extend.quantity + product.quantity;
         } else {
           // 否则 push
           _list.push(product);
@@ -350,22 +364,20 @@ var Addons = Provider(function (props) {
     // 0 则移除
     if (quantity == 0) {
       _list = _list.filter(function (d) {
-        return d.id !== item.id;
+        return d._id !== item._id;
       });
     } else {
-      var _item$_extend3;
+      var _item$_extend5;
       var _item = _objectSpread(_objectSpread({}, item), {}, {
         _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
           quantity: Number(e.target.value)
         })
       });
-      var _total = getProductTotalPrice(_item);
-      _item._extend.total = _total;
-      if (((_item$_extend3 = _item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle_edit) !== undefined) {
+      if (((_item$_extend5 = _item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.bundle_edit) !== undefined) {
         _item._extend.bundle_edit = 1;
       }
       _list = _list.map(function (d) {
-        return d.id === item.id ? _item : d;
+        return d._id === item._id ? _item : d;
       });
     }
     dispatch({
@@ -474,6 +486,7 @@ var Addons = Provider(function (props) {
     }
     return /*#__PURE__*/React.createElement(Footer, {
       state: state,
+      dispatch: dispatch,
       buttons: _footer,
       source: "addons"
     });
@@ -486,24 +499,32 @@ var Addons = Provider(function (props) {
     if (state.channelDisabledEdit) {
       return;
     }
+    var isSession = isSessionProduct(item);
     state.action({
       type: 'pisell1.handleOpenProductModal',
       data: {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
-          session: false,
-          variant: false,
-          package: true
+          option: true,
+          session: isSession,
+          variant: true,
+          package: true,
+          number: true
         },
-        value: item._extend.other
+        value: item._extend.other,
+        isOS: isSession
       },
-      callback: function callback(e) {
+      callback: function callback(e, extension_type, detail) {
         var _product$_extend;
-        var product = _objectSpread(_objectSpread({}, item), {}, {
+        var _detail = detail || item;
+        var product = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
+          isAddons: true,
+          // 编辑商品时清除折扣信息
+          discount_list: [],
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-            other: e
+            other: e,
+            quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1
           })
         });
         if (((_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.bundle_edit) !== undefined) {
@@ -511,8 +532,8 @@ var Addons = Provider(function (props) {
         }
         var _total = getProductTotalPrice(product);
         product._extend.total = _total;
+        product._extend.origin_total = _total;
         var _list = _toConsumableArray(state.addons.value);
-        console.log('cacheItem', product);
         _list = _list.map(function (d) {
           return d._id === product._id ? product : d;
         });

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

@@ -17,6 +17,11 @@ var _miniRedux = miniRedux({
         state.setGlobalState({
           addons: _objectSpread(_objectSpread({}, state.addons), payload)
         });
+      },
+      setService: function setService(state, payload) {
+        state.setGlobalState({
+          service: _objectSpread(_objectSpread({}, state.service), payload)
+        });
       }
     }
   }),

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

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

package/es/components/booking/components/TabProduct/productItem/index.js

@@ -1,7 +1,9 @@
 import React, { useMemo } from 'react';
-import { formatAmount, image, locales } from '@pisell/utils';
+import { image, locales } from '@pisell/utils';
 import classNames from 'classnames';
 import { getDiscountTime } from "../../../utils";
+import Decimal from 'decimal.js';
+import PisellPriceText from "../../../../productSelect/components/pisellPriceText";
 import "./index.less";
 var ProductItem = function ProductItem(_ref) {
   var item = _ref.item,
@@ -9,6 +11,13 @@ var ProductItem = function ProductItem(_ref) {
     amountSymbol = _ref.amountSymbol,
     style = _ref.style,
     className = _ref.className;
+  var price = item.price,
+    is_bundle = item.is_bundle,
+    minimum_markup_price = item.minimum_markup_price;
+  var _price = price;
+  if (is_bundle) {
+    _price = new Decimal(price).plus(new Decimal(minimum_markup_price)).toFixed(2);
+  }
   var stockText = useMemo(function () {
     if (item.is_track === 0) {
       return false;
@@ -45,6 +54,9 @@ var ProductItem = function ProductItem(_ref) {
     className: "server-product-time"
   }, stockText), /*#__PURE__*/React.createElement("div", {
     className: "server-product-price"
-  }, formatAmount(item.price, 2, amountSymbol))));
+  }, /*#__PURE__*/React.createElement(PisellPriceText, {
+    value: _price,
+    isMini: is_bundle
+  }))));
 };
 export default ProductItem;

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

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

package/es/components/booking/components/TabProduct/selectProductItem/index.js

@@ -63,6 +63,8 @@ var SelectProductItem = function SelectProductItem(_ref) {
     disabled: disabled
   }), /*#__PURE__*/React.createElement("div", {
     className: "server-select-product-total"
-  }, formatAmount(item._extend.total * item._extend.quantity, 2, amountSymbol)))));
+  }, item._extend.origin_total !== item._extend.total && /*#__PURE__*/React.createElement("span", {
+    className: "server-select-product-origin-total"
+  }, formatAmount(item._extend.origin_total * item._extend.quantity, 2, amountSymbol)), formatAmount(item._extend.total * item._extend.quantity, 2, amountSymbol)))));
 };
 export default SelectProductItem;

package/es/components/booking/components/TabProduct/selectProductItem/index.less

@@ -66,6 +66,7 @@
       font-style: normal;
       font-weight: 400;
 
+
       .server-select-product-total {
         color: var(--Base-Black, #000);
         font-size: 16px;
@@ -73,6 +74,11 @@
         font-weight: 500;
         line-height: 24px;
       }
+      .server-select-product-origin-total {
+        text-decoration: line-through;
+        color: #4e4e4e;
+        margin-right: 12px;
+      }
     }
 
 

package/es/components/booking/components/TabProduct/tabs/index.js

@@ -2,7 +2,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+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, { useMemo, useState, useEffect, forwardRef, useImperativeHandle } from "react";
 import classNames from "classnames";
@@ -13,10 +13,6 @@ import "./index.less";
 
 // tabs 子组件定义
 
-// 定义主键类型
-
-// Tabs 可传递的参数
-
 var Tabs = function Tabs(_ref, ref) {
   var renderTab = _ref.renderTab,
     rowKey = _ref.rowKey,

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

@@ -29,7 +29,7 @@ var BrowserSelect = function BrowserSelect(props) {
     onChange: function onChange(e) {
       var _resetProps$onChange;
       e.persist();
-      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 || _resetProps$onChange.call(resetProps, e);
+      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 ? void 0 : _resetProps$onChange.call(resetProps, e);
     }
   }), _options);
 };

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

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

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

@@ -32,6 +32,7 @@ interface CustomSelectProps {
     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/customSelect/index.js

@@ -72,7 +72,8 @@ var CustomSelect = function CustomSelect(props, ref) {
     autoFocus = props.autoFocus,
     _props$showDropDown = props.showDropDown,
     showDropDown = _props$showDropDown === void 0 ? true : _props$showDropDown,
-    propsHandleOpenModal = props.handleOpenModal;
+    propsHandleOpenModal = props.handleOpenModal,
+    handleDayChange = props.handleDayChange;
   var searchRef = useRef();
 
   // 当前选择的值
@@ -152,7 +153,7 @@ var CustomSelect = function CustomSelect(props, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-01-30 16:45
    */
-  var handleOpenModal = function handleOpenModal() {
+  var handleOpenModal = function handleOpenModal(item) {
     // 禁止则return
     if (disabled) {
       return;
@@ -241,6 +242,9 @@ var CustomSelect = function CustomSelect(props, ref) {
    * @Date: 2024-01-30 16:47
    */
   var handleRemoveItem = function handleRemoveItem(item) {
+    if (handleDayChange) {
+      handleDayChange(item);
+    }
     var _arr = changeArray(_value, item, rowKey);
     _onValueChange(_arr);
     set_value(_arr);
@@ -466,6 +470,7 @@ var CustomSelect = function CustomSelect(props, ref) {
           'pisell-lowcode__custom-select-card-list-item-active': getItemByArray(_value, item, rowKey)
         }),
         onClick: function onClick() {
+          if ((item === null || item === void 0 ? void 0 : item.status) === 'expired') return;
           handleSelectItem(item);
         },
         id: item[rowKey]
@@ -478,6 +483,7 @@ var CustomSelect = function CustomSelect(props, ref) {
       }) : /*#__PURE__*/React.createElement("div", {
         className: "pisell-lowcode__custom-select-card-list-item-content"
       }, mode === 'multiple' && /*#__PURE__*/React.createElement(Checkbox, {
+        disabled: (item === null || item === void 0 ? void 0 : item.status) === 'expired',
         className: "custom-select-checkbox",
         checked: getItemByArray(_value, item, rowKey)
       }), optionRender(item)));

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

@@ -16,7 +16,9 @@ var Drawer = function Drawer(props) {
   var _props$hideScrollBar = props.hideScrollBar,
     hideScrollBar = _props$hideScrollBar === void 0 ? true : _props$hideScrollBar,
     _props$showGoBack = props.showGoBack,
-    showGoBack = _props$showGoBack === void 0 ? true : _props$showGoBack;
+    showGoBack = _props$showGoBack === void 0 ? true : _props$showGoBack,
+    _props$mask = props.mask,
+    mask = _props$mask === void 0 ? false : _props$mask;
   return /*#__PURE__*/React.createElement(OriginDrawer, _extends({
     width: '600px',
     closable: false,
@@ -30,7 +32,7 @@ var Drawer = function Drawer(props) {
       padding: 0
     },
     push: false,
-    mask: false
+    mask: mask
   }), /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-lowcode__booking-drawer-title-wrap')
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

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

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+export default _default;

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

@@ -0,0 +1,38 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useState, forwardRef, useImperativeHandle } from 'react';
+import { locales } from '@pisell/utils';
+import { PisellModal } from '@pisell/materials';
+var AppointmentProductModal = function AppointmentProductModal(props, ref) {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  useImperativeHandle(ref, function () {
+    return {
+      open: function open() {
+        setOpen(true);
+      }
+    };
+  });
+  return /*#__PURE__*/React.createElement(PisellModal.Information, {
+    open: open,
+    platform: "pc",
+    title: locales.getText('pisell2.text.missing.reservation.title'),
+    describe: locales.getText('pisell2.text.missing.reservation.content'),
+    cancelText: locales.getText('pisell2.text.cancel'),
+    okText: locales.getText('pisell2.text.confirm'),
+    closable: true,
+    onOk: function onOk() {
+      return setOpen(false);
+    },
+    onCancel: function onCancel() {
+      return setOpen(false);
+    }
+  });
+};
+export default /*#__PURE__*/forwardRef(AppointmentProductModal);

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

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

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

@@ -1,3 +1,4 @@
+export declare const getRelationDetailsTotal: (relation_details: any) => number;
 export declare const is_price_include_tax: (state: any) => any;
 /**
  * 总金额

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

@@ -9,7 +9,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { getDiscountTime, flexibleObj } from "../../utils";
 import { formatAmount } from '@pisell/utils';
-var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
+import { isDayBooking, isDayBookingProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
+export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
   var total = 0;
   var _iterator = _createForOfIteratorHelper(relation_details),
     _step;
@@ -35,6 +36,8 @@ var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details)
 var getProductAmount = function getProductAmount(state, isEdit) {
   var price = 0;
   var duration = 0;
+  // 是否是跨日预约
+  var isDay = isDayBooking(state);
   if (isEdit) {
     // 计算总价  服务 和 附加商品
     if (state !== null && state !== void 0 && state.service || state !== null && state !== void 0 && state.addons) {
@@ -42,44 +45,66 @@ var getProductAmount = function getProductAmount(state, isEdit) {
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var item = _step2.value;
-          // 预约商品
-          price += Number(item._extend.total);
-
-          // 附加商品
-          price += getRelationDetailsTotal(item._extend.relation_details || []);
-          // price += 
-          duration += flexibleObj.getValue(item._extend.duration);
+          var _item = _step2.value;
+          // 跨日预约
+          if (isDay || isNormalProductByDurationSchedule(_item)) {
+            var quantity = _item._extend.quantity || 1;
+            price += Number(_item._extend.total) * Number(quantity);
+
+            // 普通商品不能加到时长上
+            var _duration = isDayBookingProduct(_item, state) ? _item._extend.duration : 0;
+            duration += _duration;
+          } else {
+            var _quantity = _item._extend.quantity || 1;
+            price += Number(_item._extend.total) * Number(_quantity);
+
+            // 附加商品
+            price += getRelationDetailsTotal(_item._extend.relation_details || []);
+            duration += flexibleObj.getValue(_item._extend.duration);
+          }
         }
+
+        // 不是跨日预约才执行
       } catch (err) {
         _iterator2.e(err);
       } finally {
         _iterator2.f();
       }
-      var _iterator3 = _createForOfIteratorHelper(state.addons.value),
-        _step3;
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var _item = _step3.value;
-          price += Number(_item._extend.total) * _item._extend.quantity;
+      if (!isDay) {
+        var _iterator3 = _createForOfIteratorHelper(state.addons.value),
+          _step3;
+        try {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var item = _step3.value;
+            price += Number(item._extend.total) * item._extend.quantity;
+          }
+        } catch (err) {
+          _iterator3.e(err);
+        } finally {
+          _iterator3.f();
         }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
       }
     }
   } else {
     var _state$bookingDetail, _state$service;
     price = Number((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.product_expect_amount);
-    duration = ((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []).reduce(function (pre, cur) {
-      var _cur$_extend;
-      return pre + flexibleObj.getValue(((_cur$_extend = cur._extend) === null || _cur$_extend === void 0 ? void 0 : _cur$_extend.duration) || 0);
+    var services = (state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [];
+    duration = services.reduce(function (pre, cur) {
+      var current = 0;
+      if (isDay) {
+        // 普通商品不能加到时长上
+        var _duration2 = isDayBookingProduct(cur, state) ? cur._extend.duration : 0;
+        current = _duration2 || 0;
+      } else {
+        var _cur$_extend;
+        current = flexibleObj.getValue(((_cur$_extend = cur._extend) === null || _cur$_extend === void 0 ? void 0 : _cur$_extend.duration) || 0);
+      }
+      return pre + current;
     }, 0);
   }
   return {
     price: Number(price),
-    duration: getDiscountTime(duration)
+    duration: getDiscountTime(duration, isDay)
   };
 };
 var getProductItemTax = function getProductItemTax(item, bookingDetail) {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部