@pisell/private-materials 6.1.1 → 6.2.2

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

@@ -5,4 +5,14 @@ export var getResourceListApi = function getResourceListApi(params) {
   return request.getRequest().get('/h5/form/data/v1', params, {
     useCache: true
   });
+};
+
+/**
+ * @title: 获取特殊资源列表
+ * @Author: xiangfeng.xue
+ */
+export var getSpecialResourceListApi = function getSpecialResourceListApi(params) {
+  return request.getRequest().get('/h5/eventbookingv2/item/specify-resources', params, {
+    useCache: true
+  });
 };

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

@@ -7,6 +7,16 @@ interface SummaryContextType {
     taxTitle?: string;
     totalTaxFee?: string;
     isPriceIncludeTax?: 0 | 1;
+    deposit?: {
+        total: string;
+        protocols: any[];
+        hasDeposit: boolean;
+    };
+    isAgreeDepositPolicy: boolean;
+    setIsAgreeDepositPolicy: (value: boolean) => void;
+    getDepositProtocol: (params: {
+        id: string;
+    }) => Promise<any>;
 }
 interface SummaryProviderProps {
     children: React.ReactNode;

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

@@ -1,7 +1,14 @@
-import React, { createContext, useMemo } from 'react';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { createContext, useMemo, useState } from 'react';
 import { useCart } from "../Cart";
 import { calculatePriceDetails } from "./utils";
 import { useInit } from "../Init";
+import { getDepositProtocolApi } from "./serve";
 
 // 定义上下文接口
 
@@ -16,6 +23,10 @@ export var SummaryProvider = function SummaryProvider(_ref) {
     cartData = _useCart.cartData;
   var _useInit = useInit(),
     initData = _useInit.initData;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isAgreeDepositPolicy = _useState2[0],
+    setIsAgreeDepositPolicy = _useState2[1];
   var summaryData = useMemo(function () {
     return calculatePriceDetails((initData === null || initData === void 0 ? void 0 : initData.shop) || {}, cartData.cartItems);
   }, [cartData.cartItems, initData === null || initData === void 0 ? void 0 : initData.shop]);
@@ -26,7 +37,11 @@ export var SummaryProvider = function SummaryProvider(_ref) {
     total: summaryData.total,
     taxTitle: summaryData.taxTitle,
     totalTaxFee: summaryData.totalTaxFee,
-    isPriceIncludeTax: summaryData.isPriceIncludeTax
+    isPriceIncludeTax: summaryData.isPriceIncludeTax,
+    deposit: summaryData.deposit,
+    isAgreeDepositPolicy: isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy: setIsAgreeDepositPolicy,
+    getDepositProtocol: getDepositProtocolApi
   };
   return /*#__PURE__*/React.createElement(SummaryContext.Provider, {
     value: contextValue

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

@@ -0,0 +1 @@
+export declare const getDepositProtocolApi: (id: string) => Promise<any>;

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

@@ -0,0 +1,6 @@
+import { request } from "../../../utils";
+
+//  获取定金协议
+export var getDepositProtocolApi = function getDepositProtocolApi(id) {
+  return request.getRequest().get("/h5/shop-policy/".concat(id), {});
+};

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

@@ -10,6 +10,11 @@ interface PriceDetail {
     taxTitle?: string;
     totalTaxFee?: string;
     isPriceIncludeTax?: 0 | 1;
+    deposit?: {
+        total: string;
+        protocols: any[];
+        hasDeposit: boolean;
+    };
 }
 /**
  * 计算商品小计（不含其他费用）
@@ -33,4 +38,14 @@ export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.0
  * @returns 价格明细对象
  */
 export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => PriceDetail;
+/**
+ * @title: 计算定金
+ * @param items - 购物车商品数组
+ * @returns 定金字符串，保留2位小数
+ */
+export declare const calculateDeposit: (items: CartItem[]) => {
+    total: string;
+    protocols: any[];
+    hasDeposit: never;
+} | undefined;
 export {};

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

@@ -54,11 +54,53 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
 
   // 计算总价
   var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal : subtotal.plus(totalTaxFee);
+
+  // 计算定金
+  var deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
     taxTitle: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_title,
     totalTaxFee: totalTaxFee.toFixed(2),
-    isPriceIncludeTax: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax
+    isPriceIncludeTax: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax,
+    deposit: deposit
   };
+};
+
+/**
+ * @title: 计算定金
+ * @param items - 购物车商品数组
+ * @returns 定金字符串，保留2位小数
+ */
+export var calculateDeposit = function calculateDeposit(items) {
+  if (!(items !== null && items !== void 0 && items.length)) {
+    return undefined;
+  }
+  var protocols = [];
+  var hasDeposit = false;
+  var total = items.reduce(function (sum, item) {
+    if (item !== null && item !== void 0 && item.deposit) {
+      var _item$deposit, _item$deposit2;
+      hasDeposit = true;
+      var cartItemTotalPrice = new Decimal((item === null || item === void 0 || (_item$deposit = item.deposit) === null || _item$deposit === void 0 ? void 0 : _item$deposit.total) || 0);
+      // 将协议数据去重合并
+      item === null || item === void 0 || (_item$deposit2 = item.deposit) === null || _item$deposit2 === void 0 || (_item$deposit2 = _item$deposit2.protocols) === null || _item$deposit2 === void 0 || _item$deposit2.forEach(function (protocol) {
+        if (protocols.findIndex(function (p) {
+          return p.id === protocol.id;
+        }) === -1) {
+          protocols.push(protocol);
+        }
+      });
+      return sum.plus(cartItemTotalPrice);
+    }
+    return sum;
+  }, new Decimal(0));
+  if (hasDeposit) {
+    return {
+      total: total.toFixed(2),
+      protocols: protocols,
+      hasDeposit: hasDeposit
+    };
+  }
+  return undefined;
 };

package/es/components/appointmentBooking/components/Cart/Item/index.js

@@ -110,6 +110,7 @@ var CartItem = function CartItem(_ref) {
       setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), {}, {
         errorList: null
       }));
+      val.like_status = 'like';
 
       // 更新资源
       appointmentBooking.updateCart({

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

@@ -213,6 +213,19 @@ var Layout = function Layout() {
     if (isDateSelectedFirst && key === 'select-date') return false;
     return key !== 'confirm-information';
   }, [isDateSelectedFirst, currentStep === null || currentStep === void 0 || (_currentStep$step8 = currentStep.step) === null || _currentStep$step8 === void 0 ? void 0 : _currentStep$step8.key]);
+
+  /**
+   * @title: 获取协议方法需要在组件中定义才能传递给子组件，子组件无法获取到context中的方法
+   * @description:
+   * @param {string} id
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-07-07 10:06
+   */
+  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(React.Fragment, null, !isRetailTemplate ? /*#__PURE__*/React.createElement(Header, null) : null, /*#__PURE__*/React.createElement("div", {
     className: "parallel-content-wrap ".concat(isMobile() ? 'parallel-content-mobile-wrap' : '', " ").concat(isRetailTemplate ? 'parallel-content-retail-wrap' : '')
   }, /*#__PURE__*/React.createElement("div", {
@@ -237,7 +250,8 @@ var Layout = function Layout() {
     onChange: function onChange() {
       return setLoading(false);
     },
-    isHideCheckout: false
+    isHideCheckout: false,
+    depositProtocolRequest: depositProtocolRequest
   }) : null);
 };
 export default Layout;

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

@@ -1,3 +1,9 @@
 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,12 +4,11 @@ import AppointmentDeposit from "../../deposit";
 import { useAppointmentBookingContext } from "../../context";
 import { locales } from '@pisell/utils';
 import "./index.less";
-var Deposit = function Deposit() {
-  var _useAppointmentBookin = useAppointmentBookingContext(),
-    setIsAgreeDepositPolicy = _useAppointmentBookin.setIsAgreeDepositPolicy,
-    isAgreeDepositPolicy = _useAppointmentBookin.isAgreeDepositPolicy,
-    summary = _useAppointmentBookin.summary;
-  var deposit = summary.deposit;
+export var DepositContent = function DepositContent(props) {
+  var isAgreeDepositPolicy = props.isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy = props.setIsAgreeDepositPolicy,
+    deposit = props.deposit,
+    depositProtocolRequest = props.depositProtocolRequest;
   return /*#__PURE__*/React.createElement("div", {
     className: "appointment-deposit-wrap"
   }, /*#__PURE__*/React.createElement("div", {
@@ -24,7 +23,28 @@ var Deposit = function Deposit() {
     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/Form/index.js

@@ -104,7 +104,7 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     // 更新表单购物车
     appointmentBooking.updateCart({
       _id: appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.cart_id,
-      relationForms: updateRelationForms(carts, appointmentBoard, values)
+      relationForms: updateRelationForms(carts, appointmentBoard, values, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key)
     });
   };
 

package/es/components/appointmentBooking/components/Form/utils.d.ts

@@ -5,4 +5,4 @@
  * @Author: WangHan
  * @Date: 2025-05-26 16:58
  */
-export declare const updateRelationForms: (carts: any[], currentCart: any, values: any) => any;
+export declare const updateRelationForms: (carts: any[], currentCart: any, values: any, currentStepKey?: string) => any;

package/es/components/appointmentBooking/components/Form/utils.js

@@ -5,32 +5,34 @@
  * @Author: WangHan
  * @Date: 2025-05-26 16:58
  */
-export var updateRelationForms = function updateRelationForms(carts, currentCart, values) {
+export var updateRelationForms = function updateRelationForms(carts, currentCart, values, currentStepKey) {
   var _cartItem$_origin;
   if (!(currentCart !== null && currentCart !== void 0 && currentCart.cart_id)) return [];
+  // 不同情况如下：
+  // 1. 一个商品，一个资源，一个表单
+  // 2. 一个商品，多个资源，多个表单
+  // 3. 多个商品，一个资源，一个表单
+  // 4. 多个商品，多个资源，多个表单
+
   var cartItem = carts === null || carts === void 0 ? void 0 : carts.find(function (item) {
     return (item === null || item === void 0 ? void 0 : item._id) === (currentCart === null || currentCart === void 0 ? void 0 : currentCart.cart_id);
   });
   var oldLists = (cartItem === null || cartItem === void 0 || (_cartItem$_origin = cartItem._origin) === null || _cartItem$_origin === void 0 ? void 0 : _cartItem$_origin.relation_forms) || [];
   var newData = {
     form_id: Number(values === null || values === void 0 ? void 0 : values.form_id),
-    form_record_id: values === null || values === void 0 ? void 0 : values.form_record_id
+    form_record_ids: [values === null || values === void 0 ? void 0 : values.form_record_id],
+    cartId: currentCart === null || currentCart === void 0 ? void 0 : currentCart.cart_id,
+    currentStepKey: currentStepKey
   };
-  var exist = oldLists.find(function (item) {
-    return item.form_id === (newData === null || newData === void 0 ? void 0 : newData.form_id);
-  });
 
-  // 如果在目前的数组中找到form_id相同的，则更新form_record_ids参数，否则新增一条数据
-  if (exist) {
-    var _exist$form_record_id;
-    if (!(exist !== null && exist !== void 0 && (_exist$form_record_id = exist.form_record_ids) !== null && _exist$form_record_id !== void 0 && _exist$form_record_id.includes(newData.form_record_id))) {
-      exist.form_record_ids.push(newData.form_record_id);
-    }
+  // 查找是否有相同 cartId 和 form_id 的项
+  var existIndex = oldLists.findIndex(function (item) {
+    return item.cartId === newData.cartId && item.form_id === newData.form_id && item.currentStepKey === newData.currentStepKey;
+  });
+  if (existIndex > -1) {
+    oldLists[existIndex].form_record_ids = newData.form_record_ids;
   } else {
-    oldLists.push({
-      form_id: newData.form_id,
-      form_record_ids: [newData.form_record_id]
-    });
+    oldLists = oldLists.concat(newData);
   }
   return oldLists;
 };

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

@@ -106,7 +106,8 @@ var Header = function Header() {
             // 5. 清空表单数据
             if (key.startsWith('fill-form')) {
               form_key = 'booking_form';
-              booking_form = getOtherData(form_key);
+              booking_form = getOtherData(form_key); // 移除表单步骤
+              removeStep(key);
               setOtherData(form_key, _objectSpread(_objectSpread({}, booking_form), {}, _defineProperty({}, key, {})));
             }
 

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

@@ -210,6 +210,7 @@ var Resource = /*#__PURE__*/forwardRef(function (props, ref) {
       var index = carts.findIndex(function (n) {
         return !(appointmentBooking !== null && appointmentBooking !== void 0 && appointmentBooking.isTargetCartIdNormalProduct(n._id));
       });
+      e.like_status = 'like';
       return appointmentBooking.updateCart({
         _id: carts === null || carts === void 0 || (_carts$index = carts[index]) === null || _carts$index === void 0 ? void 0 : _carts$index._id,
         resources: updateCartResources(carts === null || carts === void 0 ? void 0 : carts[index], e)

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

@@ -12,7 +12,6 @@ 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,
@@ -21,9 +20,8 @@ var DepositModal = function DepositModal(props) {
     onChange = props.onChange,
     onConfirm = props.onConfirm,
     _props$isHideCheckout = props.isHideCheckout,
-    isHideCheckout = _props$isHideCheckout === void 0 ? true : _props$isHideCheckout;
-  var _useAppointmentBookin = useAppointmentBookingContext(),
-    appointmentBooking = _useAppointmentBookin.appointmentBooking;
+    isHideCheckout = _props$isHideCheckout === void 0 ? true : _props$isHideCheckout,
+    depositProtocolRequest = props.depositProtocolRequest;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     policy = _useState2[0],
@@ -50,35 +48,42 @@ var DepositModal = function DepositModal(props) {
    */
   var getPolicy = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
-      var _yield$appointmentBoo, data;
+      var _yield$depositProtoco, 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 = 1;
-            _context.next = 4;
-            return appointmentBooking.getProtocol(id);
-          case 4:
-            _yield$appointmentBoo = _context.sent;
-            data = _yield$appointmentBoo.data;
+            _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;
             setPolicy(data);
             onChange && onChange(data);
-            _context.next = 14;
+            _context.next = 17;
             break;
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](1);
+          case 13:
+            _context.prev = 13;
+            _context.t0 = _context["catch"](4);
             console.log(_context.t0);
             onChange && onChange(_context.t0);
-          case 14:
-            _context.prev = 14;
-            setLoading(false);
-            return _context.finish(14);
           case 17:
+            _context.prev = 17;
+            setLoading(false);
+            return _context.finish(17);
+          case 20:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 10, 14, 17]]);
+      }, _callee, null, [[4, 13, 17, 20]]);
     }));
     return function getPolicy(_x) {
       return _ref.apply(this, arguments);

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

@@ -21,7 +21,8 @@ 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;
+    onChange = props.onChange,
+    depositProtocolRequest = props.depositProtocolRequest;
   var context = useEngineContext();
   // 打开协议弹窗
   var _useState = useState(false),
@@ -95,7 +96,8 @@ var Deposit = function Deposit(props) {
     onCancel: function onCancel() {
       return setVisible(false);
     },
-    item: policyItem
+    item: policyItem,
+    depositProtocolRequest: depositProtocolRequest
   }));
 };
 export default Deposit;

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

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

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

@@ -76,7 +76,6 @@ var Footer = function Footer(props) {
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     isTerminal = _context$appHelper$ut.isTerminal,
-    isWebPos = _context$appHelper$ut.isWebPos,
     interaction = _context$appHelper$ut.interaction,
     store = _context$appHelper$ut.store,
     storage = _context$appHelper$ut.storage,
@@ -253,7 +252,7 @@ var Footer = function Footer(props) {
    * @Date: 2024-01-30 16:53
    */
   var goCheckout = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(order_id, totalAmount) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(order_id) {
       var _interaction$utils, _interaction$utils$po;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -264,31 +263,8 @@ var Footer = function Footer(props) {
             }
             return _context.abrupt("return");
           case 2:
-            if (!isWebPos) {
-              _context.next = 5;
-              break;
-            }
-            state.action({
-              type: 'pisell1.handleOpenPayment',
-              data: {
-                order_id: order_id,
-                total_amount: totalAmount
-              },
-              callback: function callback(res) {
-                console.log('webpos_pay_result', res);
-                if ((res === null || res === void 0 ? void 0 : res.status) === 'success') {
-                  var _window;
-                  (_window = window) === null || _window === void 0 || (_window = _window.shopApi) === null || _window === void 0 || (_window = _window.booking) === null || _window === void 0 || _window.refreshBookingDetail();
-                } else if ((res === null || res === void 0 ? void 0 : res.status) === 'cancel') {
-                  var _window2;
-                  (_window2 = window) === null || _window2 === void 0 || (_window2 = _window2.shopApi) === null || _window2 === void 0 || (_window2 = _window2.booking) === null || _window2 === void 0 || _window2.voidBooking(order_id);
-                } else {}
-              }
-            });
-            return _context.abrupt("return");
-          case 5:
             if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
-              _context.next = 7;
+              _context.next = 4;
               break;
             }
             return _context.abrupt("return", interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 ? void 0 : _interaction$utils$po.call(_interaction$utils, {
@@ -299,7 +275,7 @@ var Footer = function Footer(props) {
                 callbackType: 'pisell2'
               }
             }));
-          case 7:
+          case 4:
             state.action({
               type: 'pisell1.handlePayment',
               data: {
@@ -309,13 +285,13 @@ var Footer = function Footer(props) {
                 state === null || state === void 0 || state.callback();
               }
             });
-          case 8:
+          case 5:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function goCheckout(_x, _x2) {
+    return function goCheckout(_x) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -355,7 +331,7 @@ var Footer = function Footer(props) {
             });
           case 7:
             res = _context2.sent;
-            goCheckout((res === null || res === void 0 ? void 0 : res.order_id) || state.bookingId, res.total_amount);
+            goCheckout((res === null || res === void 0 ? void 0 : res.order_id) || state.bookingId);
             return _context2.abrupt("return");
           case 10:
             return _context2.abrupt("return", goCheckout(state.bookingId));
@@ -576,7 +552,7 @@ var Footer = function Footer(props) {
         }
       }, _callee4, null, [[20, 38]]);
     }));
-    return function handleSave(_x3) {
+    return function handleSave(_x2) {
       return _ref5.apply(this, arguments);
     };
   }();
@@ -616,7 +592,7 @@ var Footer = function Footer(props) {
         }
       }, _callee5);
     }));
-    return function onSelect(_x4) {
+    return function onSelect(_x3) {
       return _ref6.apply(this, arguments);
     };
   }();
@@ -743,7 +719,7 @@ var Footer = function Footer(props) {
         }
       }, _callee6);
     }));
-    return function handleMenuClick(_x5) {
+    return function handleMenuClick(_x4) {
       return _ref7.apply(this, arguments);
     };
   }();

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

@@ -27,6 +27,7 @@ export interface ResourceItem {
  * @Author: jinglin.tan
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
+export declare const checkResourcesFormat: (resources: any[], service: any, isChild?: boolean) => any[];
 /**
  * @title: 格式化商品单价
  * @description: