@pisell/private-materials 3.2.39 → 3.3.0

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 } from "../components/footer/utils";
-import { formatProductListByCategory, getProductTotalPrice, request } from "../utils";
+import { formatProductListByCategory, getProductTotalPrice, isSessionProduct, request } from "../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import "./index.less";
 import useEngineContext from "../../../hooks/useEngineContext";
@@ -281,9 +281,10 @@ 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 = type === 'detail' || item.bundle_group_count > 0 || isSession;
     state.action({
       type: 'pisell1.handleOpenProductModal',
       data: {
@@ -291,11 +292,12 @@ var Addons = Provider(function (props) {
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
           option: false,
-          session: false,
+          session: isSession,
           variant: false,
           package: true
         },
-        is_eject: isEject ? 1 : 0
+        is_eject: isEject ? 1 : 0,
+        isOS: isSession
       },
       callback: function callback(e, extension_type, detail) {
         console.log('e', e);
@@ -488,6 +490,7 @@ var Addons = Provider(function (props) {
     if (state.channelDisabledEdit) {
       return;
     }
+    var isSession = isSessionProduct(item);
     state.action({
       type: 'pisell1.handleOpenProductModal',
       data: {
@@ -495,11 +498,12 @@ var Addons = Provider(function (props) {
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
           option: false,
-          session: false,
+          session: isSession,
           variant: false,
           package: true
         },
-        value: item._extend.other
+        value: item._extend.other,
+        isOS: isSession
       },
       callback: function callback(e, extension_type, detail) {
         var _product$_extend;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

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

@@ -1,3 +1,4 @@
+/// <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/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/collapsibleList/utils.d.ts

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

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

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

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

@@ -1,3 +1,4 @@
+/// <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/index.js

@@ -35,7 +35,7 @@ import "./index.less";
 import { createEventBooking, editEventBooking } from "./serve";
 import { formatValues } from "./utils";
 import VoucherCard from "../voucher";
-
+import { SubTotal } from "../../../../index";
 /**
  * @title: 底部
  * @description:
@@ -45,7 +45,7 @@ import VoucherCard from "../voucher";
  * @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$bookingDetail9;
+  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _businessUtils$getApp, _state$addons4, _state$bookingDetail12, _state$bookingDetail13;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -1168,6 +1168,82 @@ var Footer = function Footer(props) {
         break;
     }
   };
+  var subTotalList = useMemo(function () {
+    var _state$bookingDetail9, _state$bookingDetail10, _state$bookingDetail11;
+    var surcharge = (((_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.surcharge) || []).map(function (d, index) {
+      return {
+        key: "custom_surcharge_".concat(index),
+        label: d.name[state.locale],
+        value: d.amount
+      };
+    });
+    return [
+    // 小计
+    {
+      key: 'sub_total',
+      value: total.productAmount
+    }].concat(_toConsumableArray(surcharge), [
+    // 税费
+    {
+      hidden: !state.bookingId,
+      key: 'tax',
+      value: total.tax,
+      tax: {
+        rate: state === null || state === void 0 || (_state$bookingDetail10 = state.bookingDetail) === null || _state$bookingDetail10 === void 0 ? void 0 : _state$bookingDetail10.tax_rate,
+        is_price_include_tax: is_price_include_tax(state),
+        title: state === null || state === void 0 || (_state$bookingDetail11 = state.bookingDetail) === null || _state$bookingDetail11 === void 0 ? void 0 : _state$bookingDetail11.tax_title
+      }
+    },
+    // 订单折扣
+    {
+      hidden: !state.bookingId,
+      key: 'discount',
+      value: total.shopDiscount
+    },
+    // 总计
+    {
+      key: 'total',
+      value: total.expectAmount
+    },
+    // 舍入金额
+    {
+      hidden: !total.roundingAmount,
+      key: 'custom_roundingAmount',
+      value: total.roundingAmount,
+      label: locales.getText('pisell1.text.rounding')
+    }]);
+  }, [total, (_state$bookingDetail12 = state.bookingDetail) === null || _state$bookingDetail12 === void 0 ? void 0 : _state$bookingDetail12.surcharge, state, state.bookingId]);
+  var orderTotalList = useMemo(function () {
+    return [
+    // 订单已付金额
+    {
+      hidden: !state.bookingId,
+      key: 'custom_orderPaidAmount',
+      value: total.orderPaidAmount,
+      label: locales.getText('pisell2.text.amount-paid-on-order')
+    },
+    // 支付手续费
+    {
+      hidden: !state.bookingId,
+      key: 'custom_paySurchargeFee',
+      value: total.paySurchargeFee,
+      label: locales.getText('pisell1.text.payment-fee')
+    },
+    // 客户实付金额
+    {
+      hidden: !state.bookingId,
+      key: 'custom_actualPaidAmount',
+      value: total.actualPaidAmount,
+      label: locales.getText('pisell2.text.amount-actually-paid-by-the-customer')
+    },
+    // 退款金额
+    {
+      hidden: !state.bookingId || !total.totalRefundAmount,
+      key: 'custom_totalRefundAmount',
+      value: total.totalRefundAmount,
+      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]);
   return /*#__PURE__*/React.createElement(Skeleton, {
     title: false,
     round: true,
@@ -1199,79 +1275,21 @@ var Footer = function Footer(props) {
     })
   }, /*#__PURE__*/React.createElement("div", {
     className: "order-total-item-border"
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-label"
-  }, locales.getText('pisell1.text.subtotal')), /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-value"
-  }, formatAmount(total.productAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'))), (((_state$bookingDetail9 = state.bookingDetail) === null || _state$bookingDetail9 === void 0 ? void 0 : _state$bookingDetail9.surcharge) || []).map(function (d) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "order-total-item",
-      key: d.id
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "order-total-item-label"
-    }, d.name[state.locale]), /*#__PURE__*/React.createElement("span", {
-      className: "order-total-item-value"
-    }, formatAmount(d.amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$')));
-  }), state.bookingId ? /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item-label"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: ""
-  }, locales.getText('pisell1.text.tax')), /*#__PURE__*/React.createElement("div", {
-    className: "",
+  }), /*#__PURE__*/React.createElement(SubTotal, {
+    mode: "column1",
+    list: subTotalList,
     style: {
-      fontSize: 14
+      padding: "0"
     }
-  }, taxText)), /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-value"
-  }, formatAmount(total.tax, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'))) : null, state.bookingId ? /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item-label"
-  }, locales.getText('pisell2.text.order-discount')), /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-value"
-  }, formatAmount(total.shopDiscount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'))) : null, /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-label order-total-item-label-bold"
-  }, locales.getText('pisell1.text.total')), /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-value"
-  }, formatAmount(total.expectAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'))), !!total.roundingAmount && /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-label"
-  }, locales.getText('pisell1.text.rounding')), /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-value"
-  }, formatAmount(total.roundingAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'))), state.bookingId ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item-border"
   }), /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-label order-total-item-label-bold"
-  }, locales.getText('pisell2.text.amount-paid-on-order')), /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-value"
-  }, formatAmount(total.orderPaidAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'))), /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-label"
-  }, locales.getText('pisell1.text.payment-fee')), /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-value"
-  }, formatAmount(total.paySurchargeFee, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'))), /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-label order-total-item-label-bold"
-  }, locales.getText('pisell2.text.amount-actually-paid-by-the-customer')), /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-value"
-  }, formatAmount(total.actualPaidAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'))), total.totalRefundAmount > 0 ? /*#__PURE__*/React.createElement("div", {
-    className: "order-total-item"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-label order-total-item-label-bold"
-  }, locales.getText('pisell2.text.refunded-amount')), /*#__PURE__*/React.createElement("span", {
-    className: "order-total-item-value"
-  }, formatAmount(total.totalRefundAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'))) : null) : null), !(state !== null && state !== void 0 && state.disableEventBookingEdit) && /*#__PURE__*/React.createElement("div", {
+    className: state.bookingId ? "order-total-item-border" : ""
+  }), !!state.bookingId && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SubTotal, {
+    mode: "column1",
+    list: orderTotalList,
+    style: {
+      padding: " 0 0 16px"
+    }
+  }))), !(state !== null && state !== void 0 && state.disableEventBookingEdit) && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-footer-buttons"
   }, /*#__PURE__*/React.createElement(FooterMenus, {
     items: moreButton,

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

@@ -16,4 +16,15 @@ export declare const formatProductOption: (option: any) => any;
  * @Date: 2024-02-19 09:26
  */
 export declare const formatProductBundle: (bundle: any) => any;
+export interface ResourceItem {
+    [key: string]: any;
+}
+/**
+ * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
+ * @description:
+ * @param {object} resource
+ * @return {*}
+ * @Author: jinglin.tan
+ */
+export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
 export declare const formatValues: (state: any) => any;

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

@@ -131,24 +131,54 @@ var formatRelationDetails = function formatRelationDetails(list) {
     };
   });
 };
+/**
+ * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
+ * @description:
+ * @param {object} resource
+ * @return {*}
+ * @Author: jinglin.tan
+ */
+export var checkSubResourcesCapacity = function checkSubResourcesCapacity(resource) {
+  if (resource.children && resource.children.length) {
+    var countCapacity = resource.capacity;
+    resource.children.forEach(function (child) {
+      if (child.capacity <= countCapacity) {
+        countCapacity -= child.capacity;
+      } else {
+        child.capacity = countCapacity;
+        countCapacity = 0;
+      }
+    });
+  }
+};
+var checkResourcesFormat = function checkResourcesFormat(resources, service, isChild) {
+  return resources.map(function (resource) {
+    var _resource$children;
+    if (!isChild) {
+      resource.capacity = getSumCapacity({
+        cacheItem: service
+      });
+    }
+    checkSubResourcesCapacity(resource);
+    return {
+      children: (_resource$children = resource.children) !== null && _resource$children !== void 0 && _resource$children.length ? checkResourcesFormat(resource.children, service, true) : undefined,
+      form_id: resource.form_id,
+      relation_type: resource.relation_type || 'form',
+      relation_id: resource.relation_id || resource.id || 0,
+      capacity: resource.capacity,
+      like_status: resource.like_status || 'common',
+      metadata: resource.metadata || {}
+    };
+  });
+};
 var formatResource = function formatResource(service) {
   if (!service._extend.resource) {
     return undefined;
   }
   try {
     return Object.values(service._extend.resource).reduce(function (pre, cur) {
-      pre = pre.concat(cur.map(function (d) {
-        return {
-          form_id: d.form_id,
-          relation_type: d.relation_type || 'form',
-          relation_id: d.relation_id || 0,
-          capacity: getSumCapacity({
-            cacheItem: service
-          }),
-          like_status: d.like_status,
-          metadata: d.metadata
-        };
-      }));
+      var newList = checkResourcesFormat(cur, service);
+      pre = pre.concat(newList);
       return pre;
     }, []);
   } catch (err) {
@@ -167,12 +197,12 @@ var formatResource = function formatResource(service) {
  * @Date: 2024-12-07 14:52
  */
 var formatHolders = function formatHolders(state, item, values) {
-  var _state$bookingConfig, _item$_extend;
+  var _state$bookingConfig, _item$_extend, _item$_extend2;
   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 obj = {
     customer_id: values.customer_id,
     form_id: form_id,
-    form_record: [((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.holder_id) || 0]
+    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] : []
   };
 
   // 连锁加盟子店铺 增加参数
@@ -191,9 +221,9 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-23 12:05
  */
 var formatProductPrice = function formatProductPrice(item) {
-  var _item$_extend2, _item$_extend3;
-  var other = (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other;
-  var price = Number((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.price);
+  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);
   // 单规格， 单价 + 单规格价格
   if (other !== null && other !== void 0 && other.option) {
     var _other$option;
@@ -204,21 +234,21 @@ var formatProductPrice = function formatProductPrice(item) {
   return price;
 };
 var formatMetaData = function formatMetaData(item) {
-  var _item$_extend4, _item$_extend5, _item$_extend7;
+  var _item$_extend5, _item$_extend6, _item$_extend8;
   var metadata = {};
-  if ((_item$_extend4 = item._extend) !== null && _item$_extend4 !== void 0 && _item$_extend4.capacity) {
+  if ((_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && _item$_extend5.capacity) {
     metadata.capacity = item._extend.capacity;
   }
   if (item._extend.groupId) {
     metadata.groupId = item._extend.groupId;
   }
-  if ((_item$_extend5 = item._extend) !== null && _item$_extend5 !== void 0 && _item$_extend5.holder_id) {
-    var _item$_extend6;
-    metadata.holder_id = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.holder_id;
+  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$_extend7 = item._extend) !== null && _item$_extend7 !== void 0 && _item$_extend7.multiDayPrices) {
-    var _item$_extend8;
-    metadata.multiDayPrices = (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.multiDayPrices;
+  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;
   }
   return metadata;
 };
@@ -246,7 +276,7 @@ var formatMetaData = function formatMetaData(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item) {
-  var _item$_extend9, _item$_extend10, _item$_extend11;
+  var _item$_extend10, _item$_extend11, _item$_extend12;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -271,10 +301,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$_extend9 = item._extend) === null || _item$_extend9 === void 0 || (_item$_extend9 = _item$_extend9.other) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.bundle),
+    "product_bundle": formatProductBundle((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 || (_item$_extend10 = _item$_extend10.other) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 || (_item$_extend10 = _item$_extend10.other) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.option),
-    "product_variant_id": ((_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.option),
+    "product_variant_id": ((_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -294,8 +324,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend12;
-    var holderId = (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.holder_id;
+    var _item$_extend13;
+    var holderId = (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -321,15 +351,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend13;
-      return ((_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.holder_id) && appointmentTypes.includes(item.extension_type);
+      var _item$_extend14;
+      return ((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.holder_id) && appointmentTypes.includes(item.extension_type);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend14;
-      var key = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.holder_id; // 分组键
+      var _item$_extend15;
+      var key = (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -387,12 +417,13 @@ var formatBookings = function formatBookings(data, values) {
     if (isNowTime(item._extend.start_time)) {
       start_time = getNowTime();
     }
+    dayParams.holder = formatHolders(data, item, values);
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18;
-      var startDate = ((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.startDate) || ((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.start_date);
-      var endDate = ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.endDate) || ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.end_date);
+      var _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19;
+      var startDate = ((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.startDate) || ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.start_date);
+      var endDate = ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.endDate) || ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -414,9 +445,6 @@ var formatBookings = function formatBookings(data, values) {
         }
       }, 'minutes');
     }
-    if (isEvent) {
-      dayParams.holder = formatHolders(data, item, values);
-    }
     return _objectSpread(_objectSpread({
       "product": formatProducts(item),
       "relation_products": formatRelationDetails(item._extend.relation_details),
@@ -457,8 +485,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$_extend19;
-    return !((_item$_extend19 = item._extend) !== null && _item$_extend19 !== void 0 && _item$_extend19.holder_id);
+    var _item$_extend20;
+    return !((_item$_extend20 = item._extend) !== null && _item$_extend20 !== void 0 && _item$_extend20.holder_id);
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {
@@ -532,7 +560,7 @@ export var formatValues = function formatValues(state) {
   // 客户
   var customer = formatCustomer(state);
   values = _objectSpread(_objectSpread({}, values), customer);
-  debugger;
+
   // 主体
   values.holder = formatHolder(state, values);
   if (isDay) {

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

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

@@ -36,12 +36,12 @@ var services = {};
 var VoucherCard = function VoucherCard(props) {
   var _context$appHelper, _state$client$value;
   var context = useEngineContext();
-  var _useState = useState(true),
+  var state = props.state,
+    dispatch = props.dispatch;
+  var _useState = useState(!state.bookingId),
     _useState2 = _slicedToArray(_useState, 2),
     showDetail = _useState2[0],
     setShowDetail = _useState2[1];
-  var state = props.state,
-    dispatch = props.dispatch;
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     pisellos = _context$appHelper$ut.pisellos;
   var _useState3 = useState(''),
@@ -81,6 +81,22 @@ var VoucherCard = function VoucherCard(props) {
       shopDiscount.setProductList(state.service.value);
     }
   }, [state.service.value, isBooking4Shop]);
+  var serviceMemo = useMemo(function () {
+    var _ref;
+    var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
+      var _value$_extend, _value$_extend2;
+      return {
+        booking_id: value.booking_id,
+        id: value.id,
+        _id: value._id,
+        price: value.price,
+        total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,
+        discount_list: value.discount_list,
+        origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total
+      };
+    });
+    return val;
+  }, [state.service.value]);
 
   // 更新productList
   useEffect(function () {
@@ -99,7 +115,7 @@ var VoucherCard = function VoucherCard(props) {
         })
       });
     }
-  }, [state.service.value, isBooking4Shop]);
+  }, [JSON.stringify(serviceMemo), isBooking4Shop]);
   var fn = useMemoizedFn(function (result) {
     if (result.productList.some(function (item) {
       return !item;
@@ -140,7 +156,7 @@ var VoucherCard = function VoucherCard(props) {
 
   // apply code
   var onScanCode = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var val;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -170,7 +186,7 @@ var VoucherCard = function VoucherCard(props) {
       }, _callee);
     }));
     return function onScanCode() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   if (!isBooking4Shop) return null;

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

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

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 /**
  * @title: 表单选择器

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

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

package/es/components/booking/hooks/useCreateBookingPageHeader.js

@@ -2,6 +2,9 @@ import React, { useMemo } from 'react';
 import { locales } from '@pisell/utils';
 var useCreateBookingPageHeader = function useCreateBookingPageHeader(state) {
   var createHeader = useMemo(function () {
+    if (state.hideCreateText) {
+      return null;
+    }
     return state.isBookingCreatePage && !state.bookingId && /*#__PURE__*/React.createElement("div", {
       className: "booking-info-create-new"
     }, locales.getText('pisell2.booking.info.text.create-new'));

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;