@pisell/private-materials 3.3.76 → 3.3.78

package/es/components/appointmentBooking/index.js

@@ -27,6 +27,20 @@ var AppointmentBooking = function AppointmentBooking() {
       }
     });
   }, []);
+  useEffect(function () {
+    var setRealVH = function setRealVH() {
+      // window.innerHeight 会返回视口真实的高度（不包括工具栏）
+      var vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
+    };
+
+    // 页面加载和窗口大小变化时都重新计算
+    setRealVH();
+    window.addEventListener('resize', setRealVH);
+    return function () {
+      window.removeEventListener('resize', setRealVH);
+    };
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "parallel-booking-wrap ".concat(isMobile() ? 'parallel-booking-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement(AppointmentBookingProvider, null, /*#__PURE__*/React.createElement(Content, null)));

package/es/components/appointmentBooking/index.less

@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: center;
   background: #ffffff;
-  height: 100vh;
+  height: calc(var(--vh, 1vh) * 100);
   overflow-y: auto;
 
   .pisell-section-headers {

package/es/components/appointmentBooking/locales.js

@@ -126,7 +126,7 @@ export default {
       return "Tip: Change ".concat(val || 'resource', " using the dropdown in the cart.");
     },
     'pisell2.text.apply': 'Apply',
-    'pisell2.text.goodpass': 'GoodPass',
+    'pisell2.text.goodpass': 'Promotion',
     'pisell2.text.goodpass.product-vouchers': 'Product Vouchers',
     'pisell2.text.goodpass.view-more': 'View More',
     'pisell2.text.goodpass.code': 'Code',
@@ -262,7 +262,7 @@ export default {
       return "\u63D0\u793A\uFF1A\u5728\u53F3\u4FA7\u8D2D\u7269\u8F66\u4E2D\uFF0C\u901A\u8FC7\u4E0B\u62C9\u6846\u4FEE\u6539\u201C".concat(val || '资源', "\u201D");
     },
     'pisell2.text.apply': '应用',
-    'pisell2.text.goodpass': '商品券',
+    'pisell2.text.goodpass': '促销',
     'pisell2.text.goodpass.product-vouchers': '商品兑换券',
     'pisell2.text.goodpass.view-more': '查看更多',
     'pisell2.text.goodpass.code': '券码',
@@ -398,7 +398,7 @@ export default {
       return "\u63D0\u793A\uFF1A\u5728\u53F3\u5074\u8CFC\u7269\u8ECA\u4E2D\uFF0C\u900F\u904E\u4E0B\u62C9\u6846\u4FEE\u6539\u201C".concat(val || '資源', "\u201D");
     },
     'pisell2.text.apply': '應用',
-    'pisell2.text.goodpass': '商品券',
+    'pisell2.text.goodpass': '促銷',
     'pisell2.text.goodpass.product-vouchers': '商品兌換券',
     'pisell2.text.goodpass.view-more': '查看更多',
     'pisell2.text.goodpass.code': '券碼',

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

@@ -36,7 +36,7 @@ import TabProduct from "../components/TabProduct";
 import EmptyBooking from "../components/emptyBooking";
 import Footer from "../components/footer";
 import { formatProductBundle, formatProductOption, formatProductPrice } from "../components/footer/utils";
-import { formatProductListByCategory, getIsEject, getProductTotalPrice, isSessionProduct, request } from "../utils";
+import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import "./index.less";
 import useEngineContext from "../../../hooks/useEngineContext";
@@ -97,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,
@@ -288,6 +290,7 @@ var Addons = Provider(function (props) {
 
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
     var isEject = getIsEject(item, type);
+    var isOnlySession = getIsOnlySession(item);
     state.action({
       type: 'pisell1.handleOpenProductModal',
       data: {
@@ -300,6 +303,7 @@ var Addons = Provider(function (props) {
           package: true,
           number: true
         },
+        isOnlySession: isOnlySession,
         is_eject: isEject ? 1 : 0,
         isOS: isSession
       },
@@ -307,6 +311,7 @@ var Addons = Provider(function (props) {
         var _detail = detail || item;
         var product = _objectSpread(_objectSpread({}, _detail), {}, {
           _id: getUniqueId(),
+          isAddons: true,
           _key: e.key,
           _extend: {
             price: _detail.price,
@@ -317,8 +322,11 @@ var Addons = Provider(function (props) {
         });
         var _total = getProductTotalPrice(product);
         product._extend.total = _total;
+        product._extend.origin_total = _total;
+        // 已经加入购物车的折扣商品 不叠加
         var _item = _list.find(function (d) {
-          return d._extend.other.rowKey === e.rowKey;
+          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
@@ -511,6 +519,7 @@ var Addons = Provider(function (props) {
         var _product$_extend;
         var _detail = detail || item;
         var product = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
+          isAddons: true,
           // 编辑商品时清除折扣信息
           discount_list: [],
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
@@ -523,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/selectProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <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(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 _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, { useMemo, useState, useEffect, forwardRef, useImperativeHandle } from "react";
 import classNames from "classnames";
@@ -13,6 +13,10 @@ 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 ? void 0 : _resetProps$onChange.call(resetProps, e);
+      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 || _resetProps$onChange.call(resetProps, e);
     }
   }), _options);
 };

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

@@ -55,7 +55,8 @@ var getProductAmount = function getProductAmount(state, isEdit) {
             var _duration = isDayBookingProduct(_item, state) ? _item._extend.duration : 0;
             duration += _duration;
           } else {
-            price += Number(_item._extend.total);
+            var _quantity = _item._extend.quantity || 1;
+            price += Number(_item._extend.total) * Number(_quantity);
 
             // 附加商品
             price += getRelationDetailsTotal(_item._extend.relation_details || []);

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

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

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

@@ -47,7 +47,7 @@ import dayjs from 'dayjs';
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _businessUtils$getApp, _state$addons4, _state$bookingDetail12, _state$bookingDetail13;
+  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _businessUtils$getApp, _businessUtils$getApp2, _state$addons4, _state$bookingDetail12, _state$bookingDetail13;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -240,6 +240,7 @@ var Footer = function Footer(props) {
 
   // 是否安装商品券应用
   var hasGoodPassApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
+  var hasDiscountCardApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp2 = businessUtils.getAppByModal) !== null && _businessUtils$getApp2 !== void 0 && _businessUtils$getApp2.call(businessUtils, 'discountcard'));
   console.log('has goodpass app:', hasGoodPassApp);
 
   /**
@@ -1291,14 +1292,19 @@ var Footer = function Footer(props) {
       label: locales.getText('pisell2.text.refunded-amount')
     }];
   }, [total, (_state$bookingDetail13 = state.bookingDetail) === null || _state$bookingDetail13 === void 0 ? void 0 : _state$bookingDetail13.surcharge, state, state.bookingId]);
+  var paymentRefundedStatus = useMemo(function () {
+    var _state$bookingDetail14;
+    return ['partially_refunded', 'refunded'].includes(state === null || state === void 0 || (_state$bookingDetail14 = state.bookingDetail) === null || _state$bookingDetail14 === void 0 ? void 0 : _state$bookingDetail14.payment_status);
+  }, [state === null || state === void 0 ? void 0 : state.bookingDetail]);
   return /*#__PURE__*/React.createElement(Skeleton, {
     title: false,
     round: true,
     loading: showFooter,
     active: true
-  }, hasGoodPassApp && source === 'info' ? /*#__PURE__*/React.createElement(VoucherCard, {
+  }, (hasGoodPassApp || hasDiscountCardApp) && ['addons', 'info'].includes(source) && !paymentRefundedStatus ? /*#__PURE__*/React.createElement(VoucherCard, {
     state: state,
-    dispatch: dispatch
+    dispatch: dispatch,
+    source: source
   }) : null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-footer-total"
   }, /*#__PURE__*/React.createElement("span", {

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

@@ -11,7 +11,7 @@ import { getSumCapacity } from "../../info2/utilsByBooking";
 import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
 import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
-import { locales, sendWarningLog } from '@pisell/utils';
+import { isArr, locales, sendWarningLog } from '@pisell/utils';
 import { PisellToast } from "@pisell/materials";
 var formatNote = function formatNote(data) {
   var _data$notes;
@@ -158,7 +158,7 @@ var checkResourcesFormat = function checkResourcesFormat(resources, service, isC
     if (!isChild) {
       resource.capacity = getSumCapacity({
         cacheItem: service
-      });
+      }, false);
     }
     checkSubResourcesCapacity(resource);
     return {
@@ -198,12 +198,17 @@ var formatResource = function formatResource(service) {
  * @Date: 2024-12-07 14:52
  */
 var formatHolders = function formatHolders(state, item, values) {
-  var _state$bookingConfig, _item$_extend, _item$_extend2;
+  var _state$bookingConfig, _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4;
   var form_id = (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 || (_state$bookingConfig = _state$bookingConfig.appointment_subject) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.form_id) || 0;
+  var form_record = (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.holder_id ? [(_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.holder_id] : [];
+  if ((_item$_extend3 = item._extend) !== null && _item$_extend3 !== void 0 && _item$_extend3.holder_id && isArr((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.holder_id)) {
+    var _item$_extend5;
+    form_record = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id;
+  }
   var obj = {
     customer_id: values.customer_id,
     form_id: form_id,
-    form_record: (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.holder_id ? [(_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.holder_id] : []
+    form_record: form_record
   };
 
   // 连锁加盟子店铺 增加参数
@@ -222,9 +227,9 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-23 12:05
  */
 export var formatProductPrice = function formatProductPrice(item) {
-  var _item$_extend3, _item$_extend4;
-  var other = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other;
-  var price = Number((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.price);
+  var _item$_extend6, _item$_extend7;
+  var other = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other;
+  var price = Number((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
   // 单规格， 单价 + 单规格价格
   if (other !== null && other !== void 0 && other.option) {
     var _other$option;
@@ -235,21 +240,21 @@ export var formatProductPrice = function formatProductPrice(item) {
   return price;
 };
 var formatMetaData = function formatMetaData(item) {
-  var _item$_extend5, _item$_extend6, _item$_extend8;
+  var _item$_extend8, _item$_extend9, _item$_extend11;
   var metadata = {};
-  if ((_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && _item$_extend5.capacity) {
+  if ((_item$_extend8 = item._extend) !== null && _item$_extend8 !== void 0 && _item$_extend8.capacity) {
     metadata.capacity = item._extend.capacity;
   }
   if (item._extend.groupId) {
     metadata.groupId = item._extend.groupId;
   }
-  if ((_item$_extend6 = item._extend) !== null && _item$_extend6 !== void 0 && _item$_extend6.holder_id) {
-    var _item$_extend7;
-    metadata.holder_id = (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.holder_id;
+  if ((_item$_extend9 = item._extend) !== null && _item$_extend9 !== void 0 && _item$_extend9.holder_id) {
+    var _item$_extend10;
+    metadata.holder_id = (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.holder_id;
   }
-  if ((_item$_extend8 = item._extend) !== null && _item$_extend8 !== void 0 && _item$_extend8.multiDayPrices) {
-    var _item$_extend9;
-    metadata.multiDayPrices = (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.multiDayPrices;
+  if ((_item$_extend11 = item._extend) !== null && _item$_extend11 !== void 0 && _item$_extend11.multiDayPrices) {
+    var _item$_extend12;
+    metadata.multiDayPrices = (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.multiDayPrices;
   }
   return metadata;
 };
@@ -276,8 +281,8 @@ var formatMetaData = function formatMetaData(item) {
  * @Author: WangHan
  * @Date: 2024-12-07 14:21
  */
-var formatProducts = function formatProducts(item) {
-  var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend13;
+var formatProducts = function formatProducts(item, quantity) {
+  var _item$_extend13, _item$_extend14, _item$_extend15, _item$_extend16;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -291,9 +296,9 @@ var formatProducts = function formatProducts(item) {
     return item.type !== 'product';
   });
   return {
-    "num": item._extend.quantity,
+    "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
-    "source_product_price": (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.price,
+    "source_product_price": (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.price,
     "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
@@ -303,10 +308,10 @@ var formatProducts = function formatProducts(item) {
     "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$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.bundle),
+    "product_bundle": formatProductBundle((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 || (_item$_extend14 = _item$_extend14.other) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.option),
-    "product_variant_id": ((_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 || (_item$_extend13 = _item$_extend13.other) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.option),
+    "product_variant_id": ((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -326,8 +331,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend14;
-    var holderId = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.holder_id;
+    var _item$_extend17;
+    var holderId = (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -353,15 +358,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend15;
-      return ((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.holder_id) && appointmentTypes.includes(item.extension_type);
+      var _item$_extend18;
+      return ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id) && appointmentTypes.includes(item.extension_type);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend16;
-      var key = (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.holder_id; // 分组键
+      var _item$_extend19;
+      var key = (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -381,6 +386,12 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
     return list || [];
   } catch (error) {}
 };
+var getHolderByIndex = function getHolderByIndex(holder, index) {
+  var _holder$form_record;
+  return _objectSpread(_objectSpread({}, holder), {}, {
+    form_record: [holder === null || holder === void 0 || (_holder$form_record = holder.form_record) === null || _holder$form_record === void 0 ? void 0 : _holder$form_record[index]].filter(Boolean)
+  });
+};
 
 /**
  * @title: 预约商品信息
@@ -414,7 +425,7 @@ var formatBookings = function formatBookings(data, values) {
   var dayParams = {};
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
-  bookings = list.map(function (item) {
+  list.forEach(function (item) {
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format("HH:mm");
@@ -428,9 +439,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20;
-      var startDate = ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.startDate) || ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.start_date);
-      var endDate = ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.endDate) || ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.end_date);
+      var _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23;
+      var startDate = ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.startDate) || ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.start_date);
+      var endDate = ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.endDate) || ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -452,7 +463,7 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
-    return _objectSpread(_objectSpread({
+    var booking = _objectSpread(_objectSpread({
       "product": formatProducts(item),
       "relation_products": formatRelationDetails(item._extend.relation_details),
       'id': item.booking_id || 0,
@@ -474,6 +485,19 @@ var formatBookings = function formatBookings(data, values) {
       "resources": formatResource(item),
       "metadata": formatMetaData(item)
     }, eventOtherParams || {}), dayParams);
+    if (isDay) {
+      bookings.push(booking);
+      return;
+    }
+    for (var i = 0; i < (item._extend.quantity || 1); i++) {
+      bookings.push(_objectSpread(_objectSpread({}, booking), {}, {
+        "product": formatProducts(item, 1),
+        "number": item._extend.capacity ? getSumCapacity({
+          cacheItem: item
+        }, false) : item._extend.number || 1,
+        "holder": getHolderByIndex(booking.holder, i)
+      }));
+    }
   });
   return bookings;
 };
@@ -491,8 +515,8 @@ var formatRelationProducts = function formatRelationProducts(data) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend21;
-    return !((_item$_extend21 = item._extend) !== null && _item$_extend21 !== void 0 && _item$_extend21.holder_id);
+    var _item$_extend24;
+    return !((_item$_extend24 = item._extend) !== null && _item$_extend24 !== void 0 && _item$_extend24.holder_id);
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
@@ -587,7 +611,11 @@ export var formatValues = function formatValues(state) {
   if (isDay || isEvent) {
     values.relation_products = formatRelationProducts(state);
   } else {
+    var _values$relation_prod;
     values.relation_products = formatNormalProducts(state);
+    if (!((_values$relation_prod = values.relation_products) !== null && _values$relation_prod !== void 0 && _values$relation_prod.length)) {
+      values.relation_products = undefined;
+    }
   }
   // 服务
   values.bookings = formatBookings(state, values);
@@ -617,8 +645,18 @@ export var formatValues = function formatValues(state) {
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var holderError = state.service.value.some(function (item) {
+    var _item$_extend25;
     // 普通商品不需要检测holder
-    return !item._extend.holder_id && !isNormalProductByDurationSchedule(item);
+    if (isNormalProductByDurationSchedule(item)) {
+      return false;
+    }
+    if (item._extend.quantity === 1 && !item._extend.holder_id) {
+      return true;
+    }
+    if (item._extend.quantity > 1 && ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 || (_item$_extend25 = _item$_extend25.holder_id) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.length) !== item._extend.quantity) {
+      return true;
+    }
+    return false;
   });
   var clientId = (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id;
   if (holderError && (!clientId || clientId === 0 || clientId === 1)) {

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

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