@pisell/private-materials 3.2.19 → 3.2.20

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

@@ -23,62 +23,31 @@ import { formatValues } from "../../../../Sales/Checkout/utils";
 // import OrderProductModal from '../../OrderProductModal/index';
 // import EmptyHolderModal from '../../EmptyHolderModal';
 import useEngineContext from "../../../../../hooks/useEngineContext";
-import { useAppointmentBooking, useAppointmentBookingLogin } from "../../../hooks";
+import { useAppointmentBookingLogin } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
 import "./index.less";
 var ContinueButton = function ContinueButton() {
   var context = useEngineContext();
-  // const { data } = useSales();
-  // const { onHolderOpen } = useHolder();
-  // const { checkHolder, onCloseCart, cartData, getWithoutCartItemsHolderNames } =
-  //   useCart();
-  // const { currentStepData, nextStep, isLastStep } = useStep();
-  // const {
-  //   onCheckout,
-  //   createBooking,
-  //   onCheckBeforeBooking,
-  //   checkBeforeBooking,
-  // } = useCheckout();
-  // const { openLoginModal, isLogin } = useCustomer();
   var utils = context.appHelper.utils || {};
-  var appointmentBooking = useAppointmentBooking();
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
   var _useAppointmentBookin = useAppointmentBookingLogin(),
     isLogin = _useAppointmentBookin.isLogin,
     openLoginModal = _useAppointmentBookin.openLoginModal;
-  // const { currentStep, isLastStep } = useAppointmentBookingStep();
   var _useAppointmentBookin2 = useAppointmentBookingContext(),
     currentStep = _useAppointmentBookin2.currentStep,
     isLastStep = _useAppointmentBookin2.isLastStep,
-    products = _useAppointmentBookin2.products;
-  // const { products } = useAppointmentBookingCart();
-
-  // 下单之前是否检测失败
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    openCheckout = _useState2[0],
-    setOpenCheckout = _useState2[1];
-  // 检测失败的商品数量
-  var _useState3 = useState(0),
-    _useState4 = _slicedToArray(_useState3, 2),
-    checkedNumber = _useState4[0],
-    setCheckedNumber = _useState4[1];
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    openEmptyHolder = _useState6[0],
-    setOpenEmptyHolder = _useState6[1];
-  // const { removeSessionStorage } = useSales();
-
+    carts = _useAppointmentBookin2.carts,
+    appointmentBooking = _useAppointmentBookin2.appointmentBooking;
   var data = {};
-  var currentStepData = {
-    key: 'select-event'
-  };
   var createBooking = {
     loading: false
   };
   var checkBeforeBooking = {
     loading: false
   };
-  var cartData = {};
 
   /**
    * @title: 下单
@@ -125,49 +94,52 @@ var ContinueButton = function ContinueButton() {
    */
   var handleNextStep = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             if (!isLastStep) {
-              _context2.next = 2;
+              _context2.next = 16;
               break;
             }
-            return _context2.abrupt("return", handleCheckout());
-          case 2:
+            setLoading(true);
+            _context2.prev = 2;
+            _context2.next = 5;
+            return appointmentBooking.submitOrder();
+          case 5:
+            res = _context2.sent;
+            console.log(isLastStep, isLogin, res, 'wh9896788');
+            utils.action({
+              type: 'pisell1.payment',
+              data: res === null || res === void 0 ? void 0 : res.data,
+              callback: function callback(e) {
+                console.log(e, 'wh9896788');
+                // checkoutCallback.current && checkoutCallback.current(e);
+              }
+            });
+            setLoading(false);
+            _context2.next = 15;
+            break;
+          case 11:
+            _context2.prev = 11;
+            _context2.t0 = _context2["catch"](2);
+            console.log(isLastStep, isLogin, _context2.t0, 'wh9896788');
+            setLoading(false);
+          case 15:
+            return _context2.abrupt("return");
+          case 16:
             return _context2.abrupt("return", appointmentBooking.next());
-          case 3:
+          case 17:
           case "end":
             return _context2.stop();
         }
-      }, _callee2);
+      }, _callee2, null, [[2, 11]]);
     }));
     return function handleNextStep() {
       return _ref2.apply(this, arguments);
     };
   }();
 
-  /**
-   * @title: 判断是打开holder弹窗还是进行下一步
-   * @description:
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2025-02-08 14:00
-   */
-  var handleHolder = function handleHolder() {
-    // const isHolder = checkHolder();
-    // // 如果没有绑定holder，则打开绑定holder弹窗
-    // if (!isHolder) {
-    //   onHolderOpen();
-    //   return;
-    // }
-    // // 验证holder是否为空
-    // const emptyHolders = getWithoutCartItemsHolderNames();
-    // if (emptyHolders?.length > 0) {
-    //   return setOpenEmptyHolder(true);
-    // }
-    // handleNextStep();
-  };
-
   /**
    * @title: 点击继续
    * @description:
@@ -191,14 +163,12 @@ var ContinueButton = function ContinueButton() {
             return _context3.abrupt("return", openLoginModal({
               callback: function callback(status) {
                 if (status === 'success') {
-                  // handleHolder();
                   handleNextStep();
                 }
               }
             }));
           case 3:
             handleNextStep();
-            // handleHolder();
           case 4:
           case "end":
             return _context3.stop();
@@ -224,7 +194,7 @@ var ContinueButton = function ContinueButton() {
     } else {
       return locales.getText('pisell2.event.close.continue');
     }
-  }, [currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key]);
+  }, [isLastStep]);
 
   /**
    * @title: 确认按钮loading
@@ -239,13 +209,13 @@ var ContinueButton = function ContinueButton() {
     return (createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading) || (checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading);
   }, [isLastStep, createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading, checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
-    disabled: !(products !== null && products !== void 0 && products.length),
+    disabled: !(carts !== null && carts !== void 0 && carts.length),
     size: "large",
     type: "primary",
     onClick: function onClick() {
       return handleContinue();
     },
-    loading: confirmLoading
+    loading: loading
   }, continueText));
 };
 export default ContinueButton;

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

@@ -5,17 +5,15 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import React from 'react';
 import { locales } from '@pisell/utils';
 import { PisellText } from '@pisell/materials';
-import useEngineContext from "../../../../../hooks/useEngineContext";
 import "./index.less";
 import classNames from 'classnames';
 import { useAppointmentBookingContext } from "../../../context";
 var Total = function Total(_ref) {
-  var _context$appHelper, _context$appHelper$ge;
   var className = _ref.className,
     isFooter = _ref.isFooter;
-  var context = useEngineContext();
   var _useAppointmentBookin = useAppointmentBookingContext(),
-    summary = _useAppointmentBookin.summary;
+    summary = _useAppointmentBookin.summary,
+    symbolic = _useAppointmentBookin.symbolic;
   var taxTitle = summary.taxTitle,
     totalTaxFee = summary.totalTaxFee,
     isPriceIncludeTax = summary.isPriceIncludeTax,
@@ -37,7 +35,7 @@ var Total = function Total(_ref) {
     className: "event-amount"
   }) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("span", {
     className: "gst"
-  }, locales.getText('pisell2.event.total.gst')("".concat(isFooter ? "".concat(taxTitle, ": ") : taxTitle), "".concat(context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getSymbolic) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper)).concat(totalTaxFee))) : null), !isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
+  }, locales.getText('pisell2.event.total.gst')("".concat(isFooter ? "".concat(taxTitle, ": ") : taxTitle), "".concat(symbolic).concat(totalTaxFee))) : null), !isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
     value: total,
     showCurrencySymbol: true,
     className: "event-amount"

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -0,0 +1,3 @@
+import './index.less';
+declare const CartItem: () => JSX.Element;
+export default CartItem;

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

@@ -1,22 +1,24 @@
 import React, { useMemo } from 'react';
 import { isMobile, locales } from '@pisell/utils';
 import ShoppingCart from "../../../../shoppingCart";
-// import SelectHolderModal from '../../../../';
 import ContinueButton from "../ContinueButton";
 import { useAppointmentBookingAccount, useAppointmentBooking } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
 import Total from "./Total";
-import { formatHolder } from "../../../utils";
+import { formatHolder, formatCarts } from "../../../utils";
 import "./index.less";
 var CartItem = function CartItem() {
+  var _currentStep$step, _currentStep$step2;
   var appointmentBooking = useAppointmentBooking();
   var appointmentBookingAccount = useAppointmentBookingAccount();
   var _useAppointmentBookin = useAppointmentBookingContext(),
     carts = _useAppointmentBookin.carts,
     summary = _useAppointmentBookin.summary,
-    isLastStep = _useAppointmentBookin.isLastStep;
+    isLastStep = _useAppointmentBookin.isLastStep,
+    currentStep = _useAppointmentBookin.currentStep,
+    resources = _useAppointmentBookin.resources;
   var accountLists = appointmentBookingAccount.accountLists;
-  console.log(summary, carts, 'accountLists');
+  console.log(summary, carts, formatCarts(carts, resources), 'accountLists');
   var holderIds = useMemo(function () {
     return accountLists.map(function (item) {
       return item.id;
@@ -51,10 +53,12 @@ var CartItem = function CartItem() {
     className: "content"
   }, /*#__PURE__*/React.createElement(ShoppingCart, {
     productParams: {
-      products: carts,
+      products: formatCarts(carts, resources),
       hideAddBtn: false,
       holders: holders,
-      disabledEdit: isLastStep
+      disabledEdit: isLastStep,
+      isShowChangeResource: (currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key) === 'select-resource',
+      isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.index) < 2
     },
     collapseParams: {
       activeKey: holderIds,

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel }: any) => JSX.Element;
 export default Cart;

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

@@ -9,24 +9,17 @@ import { SectionFooters, Button, Badge, Image } from '@pisell/materials';
 import { useState } from 'react';
 import ContinueButton from "../Cart/ContinueButton";
 import shoppingCartSvg from "../../assets/shopping-cart.svg";
-import { useAppointmentBooking, useAppointmentBookingCart } from "../../hooks";
+import { useAppointmentBookingContext } from "../../context";
 import Cart from "../Cart";
 import Total from "../Cart/Item/Total";
 import "./index.less";
 var Footer = function Footer() {
-  var _cartData$cartItems;
-  var appointmentBooking = useAppointmentBooking();
-  var appointmentBookingCart = useAppointmentBookingCart();
+  var _useAppointmentBookin = useAppointmentBookingContext(),
+    carts = _useAppointmentBookin.carts;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
-  // const { open } = useHolder();
-  // const { onOpenCart, openCart, onCloseCart, cartData } = useCart();
-  // const { total } = useSummary();
-  var cartData = {
-    cartItems: [1, 2]
-  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SectionFooters, {
     className: "section-footer-wrap",
     left: /*#__PURE__*/React.createElement(Total, {
@@ -36,7 +29,7 @@ var Footer = function Footer() {
     right: /*#__PURE__*/React.createElement("div", {
       className: "section-footer-right"
     }, /*#__PURE__*/React.createElement(Badge, {
-      count: ((_cartData$cartItems = cartData.cartItems) === null || _cartData$cartItems === void 0 ? void 0 : _cartData$cartItems.length) || 0
+      count: (carts === null || carts === void 0 ? void 0 : carts.length) || 0
     }, /*#__PURE__*/React.createElement(Button, {
       size: "large",
       onClick: function onClick() {

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

@@ -22,15 +22,25 @@ var Resource = function Resource(_ref) {
   var _useAppointmentBookin = useAppointmentBookingContext(),
     appointmentBooking = _useAppointmentBookin.appointmentBooking,
     resources = _useAppointmentBookin.resources,
-    carts = _useAppointmentBookin.carts;
+    carts = _useAppointmentBookin.carts,
+    resourceOtherParams = _useAppointmentBookin.resourceOtherParams;
   var _useAppointmentBookin2 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin2.getResourceList,
-    getResourceTimeSlot = _useAppointmentBookin2.getResourceTimeSlot;
+    getResourceTimeSlot = _useAppointmentBookin2.getResourceTimeSlot,
+    autoSelectAllProductResources = _useAppointmentBookin2.autoSelectAllProductResources;
   // const { products } = useAppointmentBookingCart();
   console.log(resources, carts, appointmentBooking, 'lists, products');
   useEffect(function () {
-    getResourceList();
+    var _resources = getResourceList();
+    autoSelectAllProductResources('resources');
   }, []);
+  useEffect(function () {
+    var _resourceOtherParams$;
+    console.log(resourceOtherParams === null || resourceOtherParams === void 0 ? void 0 : resourceOtherParams.errorList, 'errorListerrorListerrorList');
+    if ((resourceOtherParams === null || resourceOtherParams === void 0 || (_resourceOtherParams$ = resourceOtherParams.errorList) === null || _resourceOtherParams$ === void 0 ? void 0 : _resourceOtherParams$.length) > 0) {
+      return;
+    }
+  }, [resourceOtherParams === null || resourceOtherParams === void 0 ? void 0 : resourceOtherParams.errorList]);
   var anyResource = [{
     id: 0,
     image: 'https://cdn-partners-api.fresha.com/employee-avatars/processed/399178/medium/3b77991b-0ee2-4d0f-9d6f-a7501b39afcd-tempImageHYe20U.jpg',

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

@@ -47,11 +47,23 @@ var Services = function Services() {
         detail: item
       },
       callback: function callback(data) {
+        var _data$origin;
+        var 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) || [];
+        var activeStatus = resources.find(function (item) {
+          return item.status === 1;
+        });
+        if (!activeStatus) {
+          // console.log(PisellToast, 'PisellToast');
+          // return PisellToast({
+          //   content: locales.getText(
+          //     'pisell2.appointment.no.available.service'
+          //   ),
+          // });
+        }
         var product = _objectSpread(_objectSpread({}, data), {}, {
           options: (data === null || data === void 0 ? void 0 : data.option) || []
         });
         delete product.option;
-        console.log(product, data, appointmentBooking.storeProduct, 'wh978796');
         appointmentBooking.storeProduct(product);
       }
     });

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

@@ -48,7 +48,7 @@ var Resource = function Resource(_ref) {
             _context.next = 8;
             return appointmentBooking.submitTimeSlot({
               resourceProductData: resources === null || resources === void 0 ? void 0 : resources[0],
-              resources: _resources,
+              selectedResources: _resources,
               timeSlots: e
             });
           case 8:

package/es/components/appointmentBooking/context.d.ts

@@ -15,6 +15,10 @@ interface AppointmentBookingContextType {
     isLastStep?: boolean;
     setIsLastStep: (val: boolean) => void;
     setCurrentStep: (val: any) => void;
+    appHelper?: any;
+    symbolic?: any;
+    resourceOtherParams?: any;
+    setResourceOtherParams: (val: any) => void;
 }
 export declare const AppointmentBookingProvider: ({ children, }: {
     children: ReactNode;

package/es/components/appointmentBooking/context.js

@@ -6,8 +6,10 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { createContext, useContext, useState } from 'react';
 import { useAppointmentBooking } from "./hooks";
+import useEngineContext from "../../hooks/useEngineContext";
 var AppointmentBookingContext = /*#__PURE__*/createContext(undefined);
 export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref) {
+  var _appHelper$utils;
   var children = _ref.children;
   var appointmentBooking = useAppointmentBooking();
   // 商品列表
@@ -40,6 +42,13 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
     _useState14 = _slicedToArray(_useState13, 2),
     carts = _useState14[0],
     setCarts = _useState14[1];
+  var _useState15 = useState({}),
+    _useState16 = _slicedToArray(_useState15, 2),
+    resourceOtherParams = _useState16[0],
+    setResourceOtherParams = _useState16[1];
+  var _useEngineContext = useEngineContext(),
+    appHelper = _useEngineContext.appHelper;
+  var symbolic = appHelper === null || appHelper === void 0 || (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : _appHelper$utils.getSymbolic();
   console.log(3234234, times, resources);
   var value = {
     appointmentBooking: appointmentBooking,
@@ -56,7 +65,11 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
     setSummary: setSummary,
     setCurrentStep: setCurrentStep,
     setIsLastStep: setIsLastStep,
-    setCarts: setCarts
+    setCarts: setCarts,
+    appHelper: appHelper,
+    symbolic: symbolic,
+    resourceOtherParams: resourceOtherParams,
+    setResourceOtherParams: setResourceOtherParams
   };
   return /*#__PURE__*/React.createElement(AppointmentBookingContext.Provider, {
     value: value

package/es/components/appointmentBooking/hooks.d.ts

@@ -19,5 +19,6 @@ export declare const useAppointmentBookingAccount: () => {
 };
 export declare const useAppointmentBookingResource: () => {
     getResourceTimeSlot: (params: any) => Promise<void>;
-    getResourceList: () => Promise<void>;
+    getResourceList: () => Promise<any>;
+    autoSelectAllProductResources: (code: string) => Promise<void>;
 };

package/es/components/appointmentBooking/hooks.js

@@ -190,9 +190,12 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
   var _useAppointmentBookin4 = useAppointmentBookingContext(),
     appointmentBooking = _useAppointmentBookin4.appointmentBooking,
     setResources = _useAppointmentBookin4.setResources,
-    setTimes = _useAppointmentBookin4.setTimes;
+    setTimes = _useAppointmentBookin4.setTimes,
+    setResourceOtherParams = _useAppointmentBookin4.setResourceOtherParams,
+    resourceOtherParams = _useAppointmentBookin4.resourceOtherParams;
   var _ref5 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {},
     resourceSort = _ref5.resourceSort;
+  console.log(appointmentBooking, 'appointmentBooking22');
 
   // 设置时间切片
   var getResourceTimeSlot = /*#__PURE__*/function () {
@@ -231,7 +234,8 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
               });
             });
             setResources(resources || []);
-          case 3:
+            return _context5.abrupt("return", resources);
+          case 4:
           case "end":
             return _context5.stop();
         }
@@ -241,8 +245,33 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
       return _ref7.apply(this, arguments);
     };
   }();
+
+  // 获取自动分配
+  var autoSelectAllProductResources = /*#__PURE__*/function () {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code) {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            _context6.next = 2;
+            return appointmentBooking.autoSelectAllProductResources(code);
+          case 2:
+            res = _context6.sent;
+            console.log(res, 'autoSelectAllProductResources');
+            setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), res));
+          case 5:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6);
+    }));
+    return function autoSelectAllProductResources(_x5) {
+      return _ref8.apply(this, arguments);
+    };
+  }();
   return {
     getResourceTimeSlot: getResourceTimeSlot,
-    getResourceList: getResourceList
+    getResourceList: getResourceList,
+    autoSelectAllProductResources: autoSelectAllProductResources
   };
 };

package/es/components/appointmentBooking/locales.d.ts

@@ -74,6 +74,7 @@ declare const _default: {
         'pisell2.appointment.add.guest': string;
         'pisell2.appointment.edit.service': string;
         'pisell2.appointment.remove.guest': string;
+        'pisell2.appointment.no.available.service': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -150,6 +151,7 @@ declare const _default: {
         'pisell2.appointment.add.guest': string;
         'pisell2.appointment.edit.service': string;
         'pisell2.appointment.remove.guest': string;
+        'pisell2.appointment.no.available.service': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -226,6 +228,7 @@ declare const _default: {
         'pisell2.appointment.add.guest': string;
         'pisell2.appointment.edit.service': string;
         'pisell2.appointment.remove.guest': string;
+        'pisell2.appointment.no.available.service': string;
     };
 };
 export default _default;

package/es/components/appointmentBooking/locales.js

@@ -87,7 +87,8 @@ export default {
     },
     'pisell2.appointment.add.guest': "Add guest",
     'pisell2.appointment.edit.service': "Edit services",
-    'pisell2.appointment.remove.guest': "Remove guest"
+    'pisell2.appointment.remove.guest': "Remove guest",
+    'pisell2.appointment.no.available.service': "No available times for this service. Please choose another."
   },
   'zh-CN': {
     'pisell2.event.calendar.limit.unavailable': "不可预约",
@@ -177,7 +178,8 @@ export default {
     },
     'pisell2.appointment.add.guest': "添加预约人",
     'pisell2.appointment.edit.service': "编辑服务",
-    'pisell2.appointment.remove.guest': "移除预约人"
+    'pisell2.appointment.remove.guest': "移除预约人",
+    'pisell2.appointment.no.available.service': "此服务无可用时间，请选择其他服务。"
   },
   'zh-HK': {
     'pisell2.event.calendar.limit.unavailable': "不可預約",
@@ -267,6 +269,7 @@ export default {
     },
     'pisell2.appointment.add.guest': "添加預約人",
     'pisell2.appointment.edit.service': "編輯服務",
-    'pisell2.appointment.remove.guest': "移除預約人"
+    'pisell2.appointment.remove.guest': "移除預約人",
+    'pisell2.appointment.no.available.service': "此服务无可用时间，请选择其他服务。"
   }
 };

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

@@ -45,6 +45,7 @@ export declare const formatMonthDisplay: (dateString: string) => string;
 export declare const resourceTitle: (data: any) => any;
 export declare const formatHolder: (data: any[]) => any[];
 export declare const formatGuest: (data: any[], products: any) => any[];
+export declare const formatCarts: (data: any[], resources: any[]) => any[];
 /**
  * @title: 对资源进行排序
  * @description:

package/es/components/appointmentBooking/utils.js

@@ -128,6 +128,34 @@ export var formatGuest = function formatGuest(data, products) {
     });
   });
 };
+export var formatCarts = function formatCarts(data, resources) {
+  var _utils$storage2;
+  var context = useEngineContext();
+  var utils = context.appHelper.utils || {};
+  var locale = (utils === null || utils === void 0 || (_utils$storage2 = utils.storage) === null || _utils$storage2 === void 0 ? void 0 : _utils$storage2.get('umi_locale')) || 'en-US';
+  var symbol = (utils === null || utils === void 0 ? void 0 : utils.getSymbolic()) || '$';
+  console.log(resources, data, 'wh987utils');
+  return data === null || data === void 0 ? void 0 : data.map(function (d) {
+    var _currentResource$reso, _currentResources;
+    var currentResource = resources.find(function (r) {
+      return (d === null || d === void 0 ? void 0 : d._id) === (r === null || r === void 0 ? void 0 : r._id);
+    });
+    var currentResources = currentResource === null || currentResource === void 0 || (_currentResource$reso = currentResource.resources) === null || _currentResource$reso === void 0 || (_currentResource$reso = _currentResource$reso[0]) === null || _currentResource$reso === void 0 ? void 0 : _currentResource$reso.renderList;
+    currentResources = (_currentResources = currentResources) === null || _currentResources === void 0 ? void 0 : _currentResources.map(function (d) {
+      return _objectSpread(_objectSpread({}, d), {}, {
+        label: d === null || d === void 0 ? void 0 : d.main_field
+      });
+    });
+    return _objectSpread(_objectSpread({}, d), {}, {
+      format: ['HH:mm', 'HH:mm'],
+      show_time: true,
+      duration_type: d.duration.type,
+      locale: locale,
+      symbol: symbol,
+      resources: currentResources
+    });
+  });
+};
 
 /**
  * @title: 对资源进行排序

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

package/es/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;