@pisell/private-materials 3.3.93 → 3.3.95

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

@@ -1,9 +1,3 @@
 import './index.less';
-export declare const DepositContent: (props: {
-    isAgreeDepositPolicy: boolean;
-    setIsAgreeDepositPolicy: (value: boolean) => void;
-    deposit: any;
-    depositProtocolRequest?: any;
-}) => JSX.Element;
 declare const Deposit: () => JSX.Element;
 export default Deposit;

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

@@ -4,11 +4,12 @@ import AppointmentDeposit from "../../deposit";
 import { useAppointmentBookingContext } from "../../context";
 import { locales } from '@pisell/utils';
 import "./index.less";
-export var DepositContent = function DepositContent(props) {
-  var isAgreeDepositPolicy = props.isAgreeDepositPolicy,
-    setIsAgreeDepositPolicy = props.setIsAgreeDepositPolicy,
-    deposit = props.deposit,
-    depositProtocolRequest = props.depositProtocolRequest;
+var Deposit = function Deposit() {
+  var _useAppointmentBookin = useAppointmentBookingContext(),
+    setIsAgreeDepositPolicy = _useAppointmentBookin.setIsAgreeDepositPolicy,
+    isAgreeDepositPolicy = _useAppointmentBookin.isAgreeDepositPolicy,
+    summary = _useAppointmentBookin.summary;
+  var deposit = summary.deposit;
   return /*#__PURE__*/React.createElement("div", {
     className: "appointment-deposit-wrap"
   }, /*#__PURE__*/React.createElement("div", {
@@ -23,28 +24,7 @@ export var DepositContent = function DepositContent(props) {
     isAgreePolicy: isAgreeDepositPolicy,
     onChange: function onChange(value) {
       return setIsAgreeDepositPolicy(value);
-    },
-    depositProtocolRequest: depositProtocolRequest
+    }
   }));
 };
-var Deposit = function Deposit() {
-  var _ref = useAppointmentBookingContext(),
-    setIsAgreeDepositPolicy = _ref.setIsAgreeDepositPolicy,
-    isAgreeDepositPolicy = _ref.isAgreeDepositPolicy,
-    summary = _ref.summary,
-    appointmentBooking = _ref.appointmentBooking;
-  var deposit = summary.deposit;
-
-  // 获取协议方法需要在组件中定义才能传递给子组件，子组件无法获取到context中的方法
-  var depositProtocolRequest = function depositProtocolRequest(id) {
-    var _appointmentBooking$g;
-    return appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$g = appointmentBooking.getProtocol) === null || _appointmentBooking$g === void 0 ? void 0 : _appointmentBooking$g.call(appointmentBooking, id);
-  };
-  return /*#__PURE__*/React.createElement(DepositContent, {
-    isAgreeDepositPolicy: !!isAgreeDepositPolicy,
-    setIsAgreeDepositPolicy: setIsAgreeDepositPolicy,
-    deposit: deposit,
-    depositProtocolRequest: depositProtocolRequest
-  });
-};
 export default Deposit;

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

@@ -85,7 +85,9 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
             return checkProductType(item === null || item === void 0 ? void 0 : item.id);
           case 4:
             type = _context2.sent;
-            appointmentBooking.openProductDetail(item.id);
+            if (type === 'session') {
+              appointmentBooking.openProductDetail(item.id);
+            }
           case 6:
             utils === null || utils === void 0 || utils.action({
               type: 'pisell1.productDetail',
@@ -103,13 +105,6 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
-                        if (!data.isCancel) {
-                          _context.next = 3;
-                          break;
-                        }
-                        appointmentBooking.closeProductDetail();
-                        return _context.abrupt("return");
-                      case 3:
                         product = _objectSpread(_objectSpread({}, data), {}, {
                           options: (data === null || data === void 0 ? void 0 : data.option) || []
                         });
@@ -117,21 +112,31 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
 
                         // 零售模版，直接加入购物车
                         if (!isRetailTemplate) {
-                          _context.next = 10;
+                          _context.next = 7;
                           break;
                         }
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
-                          _context.next = 8;
+                          _context.next = 5;
                           break;
                         }
                         return _context.abrupt("return");
-                      case 8:
+                      case 5:
                         appointmentBooking.storeProduct(product);
                         return _context.abrupt("return");
+                      case 7:
+                        if (!(data !== null && data !== void 0 && data.isCancel)) {
+                          _context.next = 10;
+                          break;
+                        }
+                        if (type === 'session') {
+                          appointmentBooking.closeProductDetail();
+                          appointmentBooking.getAvailableDate();
+                        }
+                        return _context.abrupt("return");
                       case 10:
                         session = data === null || data === void 0 ? void 0 : data.session;
                         if (!session) {
-                          _context.next = 19;
+                          _context.next = 20;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
@@ -143,36 +148,35 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             endTime: "".concat(endDate, " ").concat(session === null || session === void 0 ? void 0 : session.end_time)
                           }
                         });
-                        _context.next = 17;
+                        appointmentBooking.closeProductDetail();
+                        _context.next = 18;
                         return appointmentBooking.getAvailableDate({
                           startDate: startDate,
                           endDate: endDate
                         });
-                      case 17:
-                        _context.next = 27;
+                      case 18:
+                        _context.next = 28;
                         break;
-                      case 19:
+                      case 20:
                         resources = (data === null || data === void 0 || (_data$origin = data.origin) === null || _data$origin === void 0 || (_data$origin = _data$origin.product_resource) === null || _data$origin === void 0 ? void 0 : _data$origin.resources) || [];
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
                         if (!(!activeStatus && !appointmentBooking.isTargetNormalProduct(data === null || data === void 0 ? void 0 : data.origin))) {
-                          _context.next = 23;
+                          _context.next = 24;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 23:
+                      case 24:
                         appointmentBooking.storeProduct(product);
                         // duration 类型的商品，要获取一下资源，在先选日期的 duration 步骤里目前只能通过这个动作拉取
                         if (!(type === 'duration')) {
-                          _context.next = 27;
+                          _context.next = 28;
                           break;
                         }
-                        _context.next = 27;
+                        _context.next = 28;
                         return appointmentBooking.getAvailableDate();
-                      case 27:
-                        appointmentBooking.closeProductDetail();
-
+                      case 28:
                         // 先选择日期流程
                         if (isDateSelectedFirst) {
                           index = (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2; //先选择日期流程：如果商品类型是duration的商品，则需要增加选择时间步骤

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -12,6 +12,7 @@ import React, { useState, useEffect } from 'react';
 import { Spin } from 'antd';
 import { PisellModal, PisellEmpty, Button, Checkbox } from '@pisell/materials';
 import { locales, isMobile } from '@pisell/utils';
+import { useAppointmentBookingContext } from "../../../context";
 import "./index.less";
 var DepositModal = function DepositModal(props) {
   var open = props.open,
@@ -20,8 +21,9 @@ var DepositModal = function DepositModal(props) {
     onChange = props.onChange,
     onConfirm = props.onConfirm,
     _props$isHideCheckout = props.isHideCheckout,
-    isHideCheckout = _props$isHideCheckout === void 0 ? true : _props$isHideCheckout,
-    depositProtocolRequest = props.depositProtocolRequest;
+    isHideCheckout = _props$isHideCheckout === void 0 ? true : _props$isHideCheckout;
+  var _useAppointmentBookin = useAppointmentBookingContext(),
+    appointmentBooking = _useAppointmentBookin.appointmentBooking;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     policy = _useState2[0],
@@ -48,42 +50,35 @@ var DepositModal = function DepositModal(props) {
    */
   var getPolicy = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
-      var _yield$depositProtoco, data;
+      var _yield$appointmentBoo, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (depositProtocolRequest) {
-              _context.next = 3;
-              break;
-            }
-            console.error('depositProtocolRequest is not defined');
-            return _context.abrupt("return");
-          case 3:
             setLoading(true);
-            _context.prev = 4;
-            _context.next = 7;
-            return depositProtocolRequest === null || depositProtocolRequest === void 0 ? void 0 : depositProtocolRequest(id);
-          case 7:
-            _yield$depositProtoco = _context.sent;
-            data = _yield$depositProtoco.data;
+            _context.prev = 1;
+            _context.next = 4;
+            return appointmentBooking.getProtocol(id);
+          case 4:
+            _yield$appointmentBoo = _context.sent;
+            data = _yield$appointmentBoo.data;
             setPolicy(data);
             onChange && onChange(data);
-            _context.next = 17;
+            _context.next = 14;
             break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](4);
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](1);
             console.log(_context.t0);
             onChange && onChange(_context.t0);
-          case 17:
-            _context.prev = 17;
+          case 14:
+            _context.prev = 14;
             setLoading(false);
-            return _context.finish(17);
-          case 20:
+            return _context.finish(14);
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 13, 17, 20]]);
+      }, _callee, null, [[1, 10, 14, 17]]);
     }));
     return function getPolicy(_x) {
       return _ref.apply(this, arguments);

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

@@ -21,8 +21,7 @@ var Deposit = function Deposit(props) {
     isAgreePolicy = _props$isAgreePolicy === void 0 ? true : _props$isAgreePolicy,
     _props$isShowTitle = props.isShowTitle,
     isShowTitle = _props$isShowTitle === void 0 ? true : _props$isShowTitle,
-    onChange = props.onChange,
-    depositProtocolRequest = props.depositProtocolRequest;
+    onChange = props.onChange;
   var context = useEngineContext();
   // 打开协议弹窗
   var _useState = useState(false),
@@ -96,8 +95,7 @@ var Deposit = function Deposit(props) {
     onCancel: function onCancel() {
       return setVisible(false);
     },
-    item: policyItem,
-    depositProtocolRequest: depositProtocolRequest
+    item: policyItem
   }));
 };
 export default Deposit;

package/es/components/appointmentBooking/index.js

@@ -27,20 +27,6 @@ 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: calc(var(--vh, 1vh) * 100);
+  height: 100vh;
   overflow-y: auto;
 
   .pisell-section-headers {

package/es/components/booking/addons/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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/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/footer/utils.js

@@ -227,9 +227,20 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-23 12:05
  */
 export var formatProductPrice = function formatProductPrice(item) {
-  var _item$_extend6, _item$_extend7;
+  var _item$_extend6, _item$_extend7, _item$variant;
   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);
+
+  // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
+  if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant = item.variant) === null || _item$variant === void 0 ? void 0 : _item$variant.length) > 0) {
+    var variant = item.variant.find(function (d) {
+      return d.id === (other === null || other === void 0 ? void 0 : other.product_variant_id);
+    });
+    if (variant) {
+      price = Number(variant === null || variant === void 0 ? void 0 : variant.price) || 0;
+    }
+  }
+
   // 单规格， 单价 + 单规格价格
   if (other !== null && other !== void 0 && other.option) {
     var _other$option;
@@ -273,6 +284,24 @@ var formatMetaData = function formatMetaData(item) {
 //   })
 // }
 
+// 获取商品价格 包含组合规格
+var getSourceProductPrice = function getSourceProductPrice(item) {
+  var _item$_extend13, _item$_extend14, _item$variant2;
+  var other = (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.other;
+  var price = Number((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price);
+
+  // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
+  if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant2 = item.variant) === null || _item$variant2 === void 0 ? void 0 : _item$variant2.length) > 0) {
+    var variant = item.variant.find(function (d) {
+      return d.id === (other === null || other === void 0 ? void 0 : other.product_variant_id);
+    });
+    if (variant) {
+      price = Number(variant === null || variant === void 0 ? void 0 : variant.price) || 0;
+    }
+  }
+  return price;
+};
+
 /**
  * @title: 格式化商品数据
  * @description: 
@@ -282,7 +311,7 @@ var formatMetaData = function formatMetaData(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend13, _item$_extend14, _item$_extend15, _item$_extend16;
+  var _item$_extend15, _item$_extend16, _item$_extend17;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -298,7 +327,7 @@ var formatProducts = function formatProducts(item, quantity) {
   return {
     "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
-    "source_product_price": (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.price,
+    "source_product_price": getSourceProductPrice(item),
     "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 || '',
@@ -308,10 +337,10 @@ var formatProducts = function formatProducts(item, quantity) {
     "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$_extend14 = item._extend) === null || _item$_extend14 === void 0 || (_item$_extend14 = _item$_extend14.other) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.bundle),
+    "product_bundle": formatProductBundle((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "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,
+    "product_option_item": formatProductOption((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.option),
+    "product_variant_id": ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -331,8 +360,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend17;
-    var holderId = (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.holder_id;
+    var _item$_extend18;
+    var holderId = (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -358,15 +387,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend18;
-      return ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend19;
+      return ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend19;
-      var key = (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id; // 分组键
+      var _item$_extend20;
+      var key = (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -439,9 +468,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      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 _item$_extend21, _item$_extend22, _item$_extend23, _item$_extend24;
+      var startDate = ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.startDate) || ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.start_date);
+      var endDate = ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.endDate) || ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -644,7 +673,7 @@ 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$_extend24;
+    var _item$_extend25;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
@@ -652,7 +681,7 @@ export var checkHolderIsError = function checkHolderIsError(state) {
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 || (_item$_extend24 = _item$_extend24.holder_id) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.length) !== item._extend.quantity) {
+    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;

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

@@ -26,8 +26,8 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials';
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
-import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
 import { getServiceAddons } from "./utils";
+import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -275,8 +275,8 @@ var VoucherCard = function VoucherCard(props) {
     style: {
       width: '100%'
     },
-    dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
     mixedSort: mixedSort,
+    dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
     onChange: function onChange(val) {
       var shopDiscount = pisellos.getModule('shopDiscount');
       var detail = shopDiscount.setDiscountSelected({

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

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

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

@@ -1,9 +1,9 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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 { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

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

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

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/es/components/booking/info/model.d.ts

@@ -1,5 +1,14 @@
+/// <reference types="react" />
+import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/info/service/like/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/es/components/booking/info/service/like/index.js

@@ -19,7 +19,7 @@ var Like = function Like(_ref) {
       }
       e.preventDefault();
       e.stopPropagation();
-      onChange === null || onChange === void 0 || onChange(status === "like" ? "common" : "like");
+      onChange === null || onChange === void 0 ? void 0 : onChange(status === "like" ? "common" : "like");
     }
   });
 };