@pisell/private-materials 3.4.2 → 3.4.4

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;
+    };
 }
 /**
  * 计算商品小计（不含其他费用）
@@ -25,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组
@@ -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/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/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/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/index.js

@@ -47,7 +47,7 @@ import dayjs from 'dayjs';
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _businessUtils$getApp, _businessUtils$getApp2, _state$addons4, _state$bookingDetail12, _state$bookingDetail13;
+  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _businessUtils$getApp, _businessUtils$getApp2, _state$bookingDetail8, _state$addons4, _state$bookingDetail16, _state$bookingDetail17;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -628,6 +628,10 @@ var Footer = function Footer(props) {
       }
     });
   };
+  var paymentRefundedStatus = useMemo(function () {
+    var _state$bookingDetail;
+    return ['partially_refunded', 'refunded'].includes(state === null || state === void 0 || (_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status);
+  }, [state === null || state === void 0 ? void 0 : state.bookingDetail]);
 
   /**
    * @title: checkout按钮
@@ -668,7 +672,7 @@ var Footer = function Footer(props) {
   }, [isEdit, checkoutLoading, isDisabled, state, source]);
   var handleMenuClick = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(e) {
-      var id, customer, res, _state$bookingDetail, _state$bookingDetail2;
+      var id, customer, res, _state$bookingDetail2, _state$bookingDetail3;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -696,10 +700,10 @@ var Footer = function Footer(props) {
                 type: 'pisell1.sendPayLinkEmail',
                 data: {
                   id: id,
-                  is_deposit: state.bookingDetail.is_deposit || Number((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.deposit_amount),
+                  is_deposit: state.bookingDetail.is_deposit || Number((_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.deposit_amount),
                   deposit_payment_time: state.bookingDetail.deposit_payment_time,
                   customer: customer,
-                  contacts: (_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.contacts
+                  contacts: (_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.contacts
                 },
                 callback: function callback() {}
               });
@@ -925,10 +929,10 @@ var Footer = function Footer(props) {
    * @Date: 2024-01-30 16:58
    */
   var isCheckout = useMemo(function () {
-    var _state$bookingDetail3, _state$bookingDetail4;
+    var _state$bookingDetail4, _state$bookingDetail5;
     var list = ['unfulfilled', 'partially_paid', 'unpaid', 'payment_processing'];
     // (支付状态 = 已支付 || 部分付款 || 未付款 || 支付处理中) && 预约状态 !== 已取消
-    if (!state.bookingId || ((_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 || (_state$bookingDetail3 = _state$bookingDetail3.bookings) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.appointment_status) !== 'cancelled' && list.includes(state === null || state === void 0 || (_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 ? void 0 : _state$bookingDetail4.payment_status) && !state.disabledEdit) {
+    if (!state.bookingId || ((_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 || (_state$bookingDetail4 = _state$bookingDetail4.bookings) === null || _state$bookingDetail4 === void 0 ? void 0 : _state$bookingDetail4.appointment_status) !== 'cancelled' && list.includes(state === null || state === void 0 || (_state$bookingDetail5 = state.bookingDetail) === null || _state$bookingDetail5 === void 0 ? void 0 : _state$bookingDetail5.payment_status) && !state.disabledEdit) {
       return true;
     } else {
       if (total.notPaidAmount > 0) {
@@ -939,7 +943,8 @@ var Footer = function Footer(props) {
   }, [state.bookingDetail, total.notPaidAmount]);
   var _buttons = useMemo(function () {
     // 如果预约是取消状态,则不展示任何按钮
-    if (state.appointment_status === 'cancelled') {
+    // 如果订单已退款 | 部分退款，则展示再次预约按钮
+    if (state.appointment_status === 'cancelled' || paymentRefundedStatus) {
       return [buttonMap.rebook];
     }
 
@@ -1018,6 +1023,7 @@ var Footer = function Footer(props) {
     return [];
   }, [buttons, total, isEdit, checkoutLoading, isDisabled, source, buttonMap, loading, isCheckout, state, isTeam, isShowClearAll]);
   var moreButton = useMemo(function () {
+    var _state$bookingDetail6;
     var arr = [];
     if (!state.bookingId) {
       return [];
@@ -1029,10 +1035,16 @@ var Footer = function Footer(props) {
       return [];
     }
 
+    // 如果订单已退款, 则不展示任何按钮
+    if ((state === null || state === void 0 || (_state$bookingDetail6 = state.bookingDetail) === null || _state$bookingDetail6 === void 0 ? void 0 : _state$bookingDetail6.payment_status) === 'refunded') {
+      return [];
+    }
+
     // 如果外部没有按钮, 则rebook按钮放在外面
     if (_buttons.length !== 0) {
-      // 支付链接
-      if (state.bookingId && isShowPaymentLink) {
+      var _state$bookingDetail7;
+      // 支付链接, 部分退款时, 不展示支付链接
+      if (state.bookingId && isShowPaymentLink && (state === null || state === void 0 || (_state$bookingDetail7 = state.bookingDetail) === null || _state$bookingDetail7 === void 0 ? void 0 : _state$bookingDetail7.payment_status) !== 'partially_refunded') {
         arr.push(actionMap.paymentLink);
       }
     }
@@ -1066,14 +1078,14 @@ var Footer = function Footer(props) {
     // 取消订单
     // arr.push(actionMap.cancelOrder);
     return arr;
-  }, [state, total, isShowPaymentLink, source, _buttons.length]);
+  }, [state, total, isShowPaymentLink, source, _buttons.length, state === null || state === void 0 || (_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.payment_status]);
 
   /**
    * 是否只有定金支付
    */
   var isOnlyDeposit = useMemo(function () {
-    var _state$bookingDetail5, _state$bookingDetail6, _state$bookingDetail7;
-    if (state !== null && state !== void 0 && (_state$bookingDetail5 = state.bookingDetail) !== null && _state$bookingDetail5 !== void 0 && _state$bookingDetail5.deposit_payment_time && state !== null && state !== void 0 && (_state$bookingDetail6 = state.bookingDetail) !== null && _state$bookingDetail6 !== void 0 && (_state$bookingDetail6 = _state$bookingDetail6.payment_types) !== null && _state$bookingDetail6 !== void 0 && (_state$bookingDetail7 = _state$bookingDetail6.every) !== null && _state$bookingDetail7 !== void 0 && _state$bookingDetail7.call(_state$bookingDetail6, function (item) {
+    var _state$bookingDetail9, _state$bookingDetail10, _state$bookingDetail11;
+    if (state !== null && state !== void 0 && (_state$bookingDetail9 = state.bookingDetail) !== null && _state$bookingDetail9 !== void 0 && _state$bookingDetail9.deposit_payment_time && state !== null && state !== void 0 && (_state$bookingDetail10 = state.bookingDetail) !== null && _state$bookingDetail10 !== void 0 && (_state$bookingDetail10 = _state$bookingDetail10.payment_types) !== null && _state$bookingDetail10 !== void 0 && (_state$bookingDetail11 = _state$bookingDetail10.every) !== null && _state$bookingDetail11 !== void 0 && _state$bookingDetail11.call(_state$bookingDetail10, function (item) {
       return item === 'deposit';
     })) {
       return true;
@@ -1094,8 +1106,8 @@ var Footer = function Footer(props) {
 
     // 只有定金支付时，直接展示
     if (isOnlyDeposit) {
-      var _state$bookingDetail8;
-      return "".concat(locales.getText('pisell2.text.deposit-paid'), " ").concat(formatAmount(state === null || state === void 0 || (_state$bookingDetail8 = state.bookingDetail) === null || _state$bookingDetail8 === void 0 ? void 0 : _state$bookingDetail8.deposit_paid_amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'), " ").concat(total.duration ? "(".concat(total.duration, ")") : '');
+      var _state$bookingDetail12;
+      return "".concat(locales.getText('pisell2.text.deposit-paid'), " ").concat(formatAmount(state === null || state === void 0 || (_state$bookingDetail12 = state.bookingDetail) === null || _state$bookingDetail12 === void 0 ? void 0 : _state$bookingDetail12.deposit_paid_amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'), " ").concat(total.duration ? "(".concat(total.duration, ")") : '');
     }
 
     // 有退款金额时, 直接展示 退款:$8.00
@@ -1217,8 +1229,8 @@ var Footer = function Footer(props) {
     }
   };
   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) {
+    var _state$bookingDetail13, _state$bookingDetail14, _state$bookingDetail15;
+    var surcharge = (((_state$bookingDetail13 = state.bookingDetail) === null || _state$bookingDetail13 === void 0 ? void 0 : _state$bookingDetail13.surcharge) || []).map(function (d, index) {
       return {
         key: "custom_surcharge_".concat(index),
         label: d.name[state.locale],
@@ -1237,9 +1249,9 @@ var Footer = function Footer(props) {
       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,
+        rate: state === null || state === void 0 || (_state$bookingDetail14 = state.bookingDetail) === null || _state$bookingDetail14 === void 0 ? void 0 : _state$bookingDetail14.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
+        title: state === null || state === void 0 || (_state$bookingDetail15 = state.bookingDetail) === null || _state$bookingDetail15 === void 0 ? void 0 : _state$bookingDetail15.tax_title
       }
     },
     // 订单折扣
@@ -1260,7 +1272,7 @@ var Footer = function Footer(props) {
       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]);
+  }, [total, (_state$bookingDetail16 = state.bookingDetail) === null || _state$bookingDetail16 === void 0 ? void 0 : _state$bookingDetail16.surcharge, state, state.bookingId]);
   var orderTotalList = useMemo(function () {
     return [
     // 订单已付金额
@@ -1291,11 +1303,7 @@ var Footer = function Footer(props) {
       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]);
-  var paymentRefundedStatus = useMemo(function () {
-    var _state$bookingDetail14;
-    return ['partially_refunded', 'refunded'].includes(state === null || state === void 0 || (_state$bookingDetail14 = state.bookingDetail) === null || _state$bookingDetail14 === void 0 ? void 0 : _state$bookingDetail14.payment_status);
-  }, [state === null || state === void 0 ? void 0 : state.bookingDetail]);
+  }, [total, (_state$bookingDetail17 = state.bookingDetail) === null || _state$bookingDetail17 === void 0 ? void 0 : _state$bookingDetail17.surcharge, state, state.bookingId]);
   return /*#__PURE__*/React.createElement(Skeleton, {
     title: false,
     round: true,

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/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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");
     }
   });
 };

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

@@ -95,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913];
+  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913, 8918, 6413];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info2/utilsByBooking.js

@@ -69,9 +69,15 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   });
 
   // 已预约的列表
-  var eventList = (time.event_list || []).filter(function (event) {
-    return event.id !== (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.booking_id);
-  });
+  var eventList = time.event_list || [];
+
+  // todo: event_list数据会进行合并 id不准确
+  // 编辑时过滤当前预约
+  if (cacheItem !== null && cacheItem !== void 0 && cacheItem.booking_id) {
+    eventList = eventList.filter(function (event) {
+      return event.id !== (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.booking_id);
+    });
+  }
   var endDate = null;
   // 是否去计算数量
   var isCalcCount = true;

package/es/components/booking/materiels/startTime/index.js

@@ -25,7 +25,7 @@ var StartTime = function StartTime(props) {
     return sliceDayIntoFiveMinutes(slice, locale);
   }, [slice, locale]);
   useEffect(function () {
-    timeObjChange === null || timeObjChange === void 0 || timeObjChange(timeObj);
+    timeObjChange === null || timeObjChange === void 0 ? void 0 : timeObjChange(timeObj);
   }, [timeObj]);
   var renderOptions = useCallback(function (array) {
     var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "value";