@pisell/private-materials 6.9.6 → 6.10.2

package/es/businessModel/SalesModel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

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

@@ -260,7 +260,7 @@ export var CartProvider = function CartProvider(_ref) {
   var createCartItemData = function createCartItemData() {
     var _cartData = getCurrentData().cartData;
     if (_cartData.currentCartItem) {
-      var _eventDetail$bookingO, _eventItem$eventDetai, _startDateInfo$times, _eventItem$eventDetai2, _endDateInfo$times, _eventItem$eventDetai3, _eventDetail$productD, _eventDetail$productD2, _eventDetail$productD3, _eventDetail$productD4;
+      var _eventDetail$bookingO, _eventItem$eventDetai, _startDateInfo$times, _eventItem$eventDetai2, _endDateInfo$times, _eventItem$eventDetai3;
       var _ref2 = _cartData.currentCartItem || {},
         _id = _ref2._id,
         _ref2$eventItem = _ref2.eventItem,
@@ -278,26 +278,15 @@ export var CartProvider = function CartProvider(_ref) {
       var endTime = endDateInfo === null || endDateInfo === void 0 || (_endDateInfo$times = endDateInfo.times) === null || _endDateInfo$times === void 0 || (_endDateInfo$times = _endDateInfo$times.slice(-1)) === null || _endDateInfo$times === void 0 || (_endDateInfo$times = _endDateInfo$times[0]) === null || _endDateInfo$times === void 0 ? void 0 : _endDateInfo$times.end_at;
       var num = 1;
       var _handleProductInfo = handleProductInfo(eventDetail, num),
-        price = _handleProductInfo.price,
         totalPrice = _handleProductInfo.totalPrice,
         originTotal = _handleProductInfo.originTotal,
         is_charge_tax = _handleProductInfo.is_charge_tax;
-      var transformProduct = function transformProduct(_temp) {
-        var _temp$variant;
-        if (!(_temp !== null && _temp !== void 0 && (_temp$variant = _temp.variant) !== null && _temp$variant !== void 0 && _temp$variant.length)) {
-          return _objectSpread(_objectSpread({}, _temp || {}), {}, {
-            variant: []
-          });
-        }
-        return _temp;
-      };
       var newCartItem = {
         _id: _id,
         id: _eventItem.id,
         name: _eventItem.title,
-        price: price,
+        price: totalPrice,
         // eventBooking中售价和总价保持一致，因为数量为1
-        origin_price: price,
         total: totalPrice,
         // 排除原始价格为0的场景
         origin_total: isNaN(originTotal) || originTotal === 0 ? undefined : originTotal,
@@ -318,10 +307,6 @@ export var CartProvider = function CartProvider(_ref) {
         end_time: endTime ? dayjs(endTime || '').format('HH:mm') : '',
         custom_day_count: (_eventItem === null || _eventItem === void 0 || (_eventItem$eventDetai3 = _eventItem.eventDetail) === null || _eventItem$eventDetai3 === void 0 || (_eventItem$eventDetai3 = _eventItem$eventDetai3.selectDate) === null || _eventItem$eventDetai3 === void 0 || (_eventItem$eventDetai3 = _eventItem$eventDetai3.dates) === null || _eventItem$eventDetai3 === void 0 ? void 0 : _eventItem$eventDetai3.length) || 0,
         is_charge_tax: is_charge_tax,
-        selectedBundle: eventDetail === null || eventDetail === void 0 || (_eventDetail$productD = eventDetail.productDetail) === null || _eventDetail$productD === void 0 ? void 0 : _eventDetail$productD.bundle,
-        selectedOptions: eventDetail === null || eventDetail === void 0 || (_eventDetail$productD2 = eventDetail.productDetail) === null || _eventDetail$productD2 === void 0 ? void 0 : _eventDetail$productD2.options,
-        isNormalProduct: true,
-        // 是否是普通商品，eventBooking中接入的都是普通商品
         _originData: _objectSpread(_objectSpread({}, _cartData.currentCartItem._originData), {}, {
           product: {
             num: 1,
@@ -342,9 +327,7 @@ export var CartProvider = function CartProvider(_ref) {
           },
           event_unique_identifier: _id // 传递给接口用于商品可用性检测的比对
         }),
-        _productDetail: eventDetail.productDetail,
-        _productOrigin: transformProduct((eventDetail === null || eventDetail === void 0 || (_eventDetail$productD3 = eventDetail.productDetail) === null || _eventDetail$productD3 === void 0 ? void 0 : _eventDetail$productD3.origin) || bookingOptionData),
-        _productInit: transformProduct((eventDetail === null || eventDetail === void 0 || (_eventDetail$productD4 = eventDetail.productDetail) === null || _eventDetail$productD4 === void 0 ? void 0 : _eventDetail$productD4.origin) || bookingOptionData)
+        _productDetail: eventDetail.productDetail
       };
 
       // 处理定金

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

@@ -1,15 +1,10 @@
 import Decimal from 'decimal.js';
 import { ICalculatePriceParams } from './types';
 export declare const handleProductInfo: (eventDetail: any, num: number) => {
-    price: number;
     totalPrice: number;
     originTotal: any;
     is_charge_tax: any;
 };
-/**
- * 获取商品价格
- */
-export declare const getPrice: (params: ICalculatePriceParams) => number;
 /**
  * 获取商品总价
  * @description 当前总价计算基于商品数量为1

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

@@ -9,7 +9,6 @@ export var handleProductInfo = function handleProductInfo(eventDetail, num) {
   var productDetail = eventDetail.productDetail,
     bookingOptionItem = eventDetail.bookingOptionItem;
   var normalProduct = bookingOptionItem === null || bookingOptionItem === void 0 ? void 0 : bookingOptionItem._originData;
-  var price = Number((normalProduct === null || normalProduct === void 0 ? void 0 : normalProduct.price) || 0);
   var totalPrice = Number((normalProduct === null || normalProduct === void 0 ? void 0 : normalProduct.price) || '');
   var originTotal = Number((normalProduct === null || normalProduct === void 0 ? void 0 : normalProduct.original_price) || '');
   var is_charge_tax = normalProduct === null || normalProduct === void 0 ? void 0 : normalProduct.is_charge_tax;
@@ -35,31 +34,16 @@ export var handleProductInfo = function handleProductInfo(eventDetail, num) {
       options: options,
       num: num
     };
-    price = getPrice(params);
     totalPrice = getTotalPrice(params);
     originTotal = getOriginTotalPrice(params);
   }
   return {
-    price: price,
     totalPrice: totalPrice,
     originTotal: originTotal,
     is_charge_tax: is_charge_tax
   };
 };
 
-/**
- * 获取商品价格
- */
-export var getPrice = function getPrice(params) {
-  var product = params.product,
-    variant = params.variant;
-  var price = Number(product.price);
-  if (variant) {
-    price = Number(variant === null || variant === void 0 ? void 0 : variant.price);
-  }
-  return price;
-};
-
 /**
  * 获取商品总价
  * @description 当前总价计算基于商品数量为1

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

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

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

@@ -9,10 +9,9 @@ export var calculateSubtotal = function calculateSubtotal(items) {
     return '0.00';
   }
   var subtotal = items.reduce(function (sum, item) {
-    // const price = new Decimal(item.price || 0);
-    // const quantity = new Decimal(item.quantity || 1);
-    // return sum.plus(price.times(quantity));
-    return sum.plus(item.total || 0);
+    var price = new Decimal(item.price || 0);
+    var quantity = new Decimal(item.quantity || 1);
+    return sum.plus(price.times(quantity));
   }, new Decimal(0));
   return subtotal.toFixed(2);
 };
@@ -34,7 +33,7 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
     tax_rate = _ref.tax_rate;
   console.log('shopInfo>>>', is_price_include_tax, tax_rate);
   var totalTaxFee = items.reduce(function (sum, item) {
-    var price = new Decimal(item.total || 0);
+    var price = new Decimal(item.price || 0);
     var taxRate = new Decimal(tax_rate || 0).div(100);
     var productTaxRate = price.times(taxRate).times((item === null || item === void 0 ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);

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

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

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

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

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

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

package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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

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

@@ -71,7 +71,7 @@ var Header = function Header() {
   var handleBack = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _currentStep$step4;
-      var key, types, form_key, booking_form, prevStepData, currentStepData, _key, isServiceStep, isResourceStep;
+      var key, types, form_key, booking_form, prevStepData, currentStepData, _key;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -130,9 +130,9 @@ var Header = function Header() {
                 isSkip: false
               });
             }
-            isServiceStep = (prevStepData === null || prevStepData === void 0 ? void 0 : prevStepData.key) === 'select-service';
-            isResourceStep = (prevStepData === null || prevStepData === void 0 ? void 0 : prevStepData.key) === 'select-resource'; // 如果前一步是选择服务步骤，则移除表单和资源开头的步骤, 防止每个商品配置的资源不一样，导致步骤会有上次的数据
-            if (isServiceStep || isResourceStep) {
+
+            // 如果前一步是选择服务步骤，则移除表单和资源开头的步骤, 防止每个商品配置的资源不一样，导致步骤会有上次的数据
+            if ((prevStepData === null || prevStepData === void 0 ? void 0 : prevStepData.key) === 'select-service') {
               stepList.forEach(function (item) {
                 if (item.key.startsWith('select-resource_') || item.key.startsWith('fill-form_')) {
                   removeStep(item.key);
@@ -141,13 +141,13 @@ var Header = function Header() {
             }
 
             // 如果前一步是选择资源，则清空表单步骤，不然表单步骤会累加
-            // if (prevStepData?.key === 'select-resource') {
-            //   stepList.forEach((item: any) => {
-            //     if (item.key.startsWith('fill-form_')) {
-            //       removeStep(item.key);
-            //     }
-            //   });
-            // }
+            if ((prevStepData === null || prevStepData === void 0 ? void 0 : prevStepData.key) === 'select-resource') {
+              stepList.forEach(function (item) {
+                if (item.key.startsWith('fill-form_')) {
+                  removeStep(item.key);
+                }
+              });
+            }
 
             // 再次将步骤更新为false, 增加这个判断为了跳过那一步没有设置holder，但是直接后退了
             // if (
@@ -160,7 +160,7 @@ var Header = function Header() {
             //     isSkip: false,
             //   });
             // }
-          case 14:
+          case 13:
           case "end":
             return _context.stop();
         }

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

@@ -9,13 +9,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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, { useEffect, useState, forwardRef, useImperativeHandle } from 'react';
-import { Iconfont } from '@pisell/materials';
+import { Iconfont, PisellEmpty } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import { useAppointmentBookingContext } from "../../context";
 import { scrollToFirstErrorCard } from "../Resource/utils";
 import { useAppointmentBookingResource, useAppointmentBookingStep } from "../../hooks";
 import { Toast } from "../../utils";
-import SelectDate from "./components/SelectDateOS";
 import "./index.less";
 var TimeSlicing = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useState = useState(''),
@@ -33,10 +32,6 @@ var TimeSlicing = /*#__PURE__*/forwardRef(function (props, ref) {
     getResourceList = _useAppointmentBookin.getResourceList;
   var _useAppointmentBookin2 = useAppointmentBookingStep(),
     nextStep = _useAppointmentBookin2.nextStep;
-  var _useState3 = useState(undefined),
-    _useState4 = _slicedToArray(_useState3, 2),
-    currentDate = _useState4[0],
-    setCurrentDate = _useState4[1];
   useImperativeHandle(ref, function () {
     return {
       next: function next() {
@@ -107,45 +102,7 @@ var TimeSlicing = /*#__PURE__*/forwardRef(function (props, ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  useEffect(function () {
-    var getCurrentDate = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _res$;
-        var res, date;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return appointmentBooking.getDateRange();
-            case 2:
-              res = _context3.sent;
-              date = res === null || res === void 0 || (_res$ = res[0]) === null || _res$ === void 0 ? void 0 : _res$.date;
-              setCurrentDate(date);
-            case 5:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      }));
-      return function getCurrentDate() {
-        return _ref4.apply(this, arguments);
-      };
-    }();
-    getCurrentDate();
-  }, []);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SelectDate, {
-    onDateChange: function onDateChange(currentData) {
-      if ((times === null || times === void 0 ? void 0 : times.length) > 0) {
-        // 如果已经选择了日期，再触发选择，则清空上次选择的时间
-        appointmentBooking.deleteCartItemInfo('time');
-      }
-      setCurrentDate(currentData === null || currentData === void 0 ? void 0 : currentData.date);
-      appointmentBooking.setDateRange([currentData]);
-      getResourceTimeSlot();
-    },
-    times: times,
-    currentDate: currentDate
-  }), (times === null || times === void 0 ? void 0 : times.length) > 0 ? /*#__PURE__*/React.createElement("div", {
+  return (times === null || times === void 0 ? void 0 : times.length) > 0 ? /*#__PURE__*/React.createElement("div", {
     className: 'appointment-time-slicing-wrap'
   }, times.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
@@ -158,6 +115,8 @@ var TimeSlicing = /*#__PURE__*/forwardRef(function (props, ref) {
       type: "pisell2-chevron-right",
       className: "icon"
     }));
-  })) : null);
+  })) : /*#__PURE__*/React.createElement(PisellEmpty, {
+    description: locales.getText('pisell2.appointment.unselect.time')
+  });
 });
 export default TimeSlicing;

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

@@ -28,8 +28,6 @@ import { PisellInput, PisellGoodPassCard, PisellText, PisellToast } from '@pisel
 import { useAppointmentBooking, useShopDiscount, useAppointmentBookingLogin, useAppointmentBookingAccount } from "../../hooks";
 import "../../../booking/components/voucher/index.less";
 import "./index.less";
-import { useDebounceFn } from 'ahooks';
-import { useAppointmentBookingContext } from "../../context";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -71,19 +69,11 @@ var VoucherCard = function VoucherCard(props) {
     openLoginModal = _useAppointmentBookin.openLoginModal;
   var _useAppointmentBookin2 = useAppointmentBookingAccount(),
     accountLists = _useAppointmentBookin2.accountLists;
-  var _useAppointmentBookin3 = useAppointmentBookingContext(),
-    summary = _useAppointmentBookin3.summary;
-  var originTotal = summary.originTotal,
-    total = summary.total;
   var cart = appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s = appointmentBooking.store) === null || _appointmentBooking$s === void 0 ? void 0 : _appointmentBooking$s.cart;
   var isUserLoggedIn = useMemo(function () {
     var _utils$token, _utils$token$get;
     return !!(utils !== null && utils !== void 0 && (_utils$token = utils.token) !== null && _utils$token !== void 0 && (_utils$token$get = _utils$token.get) !== null && _utils$token$get !== void 0 && _utils$token$get.call(_utils$token)) || false;
   }, [store]);
-  useEffect(function () {
-    var shopDiscount = pisellos.getModule('shopDiscount');
-    shopDiscount.setOriginTotalAmount(originTotal);
-  }, [originTotal]);
   var availableData = useMemo(function () {
     return discountList.filter(function (item) {
       return !!item.isAvailable;
@@ -105,12 +95,6 @@ var VoucherCard = function VoucherCard(props) {
   useEffect(function () {
     shopDiscount.setProductList(products);
   }, [products]);
-  var _useDebounceFn = useDebounceFn(function () {
-      onCartChangeFn();
-    }, {
-      wait: 300
-    }),
-    onCartChange = _useDebounceFn.run;
   var batchUpdateCart = function batchUpdateCart(productList) {
     var _appointmentBooking$b;
     var items = productList.map(function (item) {
@@ -126,13 +110,10 @@ var VoucherCard = function VoucherCard(props) {
     });
     appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$b = appointmentBooking.batchUpdateCart) === null || _appointmentBooking$b === void 0 || _appointmentBooking$b.call(appointmentBooking, items);
   };
-  var onCartChangeFn = function onCartChangeFn() {
-    var _shopDiscount$setBook, _appointmentBooking$o, _shopDiscount$getDisc;
+  var onCartChange = function onCartChange() {
+    var _shopDiscount$setBook, _appointmentBooking$o;
     var products = cart === null || cart === void 0 ? void 0 : cart.getItems();
     shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.bookingSubject);
-    if (Array.isArray(shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$getDisc = shopDiscount.getDiscountList) === null || _shopDiscount$getDisc === void 0 ? void 0 : _shopDiscount$getDisc.call(shopDiscount)) && !(shopDiscount !== null && shopDiscount !== void 0 && shopDiscount.getDiscountList().length)) {
-      return;
-    }
     var val = shopDiscount.calcDiscount(products);
     batchUpdateCart(val.productList);
   };
@@ -172,7 +153,7 @@ var VoucherCard = function VoucherCard(props) {
   // // apply code
   var onScanCode = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var customerId, val, content;
+      var customerId, val;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -185,11 +166,8 @@ var VoucherCard = function VoucherCard(props) {
               batchUpdateCart(val.productList);
               setCode('');
             } else {
-              content = {
-                time_limit: locales.getText('pisell2.text.goodpass.code-invalid-expired')
-              };
               PisellToast({
-                content: val.type === 'server' ? locales.getText('pisell2.text.goodpass.code-invalid') : content[val === null || val === void 0 ? void 0 : val.unavailableReason] || locales.getText('pisell2.text.goodpass.code-invalid-cart')
+                content: val.type === 'server' ? locales.getText('pisell2.text.goodpass.code-invalid') : locales.getText('pisell2.text.goodpass.code-invalid-cart')
               });
             }
           case 5:
@@ -221,6 +199,7 @@ var VoucherCard = function VoucherCard(props) {
             // const user = utils.store?.getState()?.global?.userInfo;
             // const currentUser = formatCustomer(user);
             // const meAccount = accountLists?.find((d: any) => !d?.isGuest);
+
             // if (status === 'success') {
             //   // appointmentBooking.setLoginAccount(
             //   //   meAccount?.id,

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

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

@@ -72,7 +72,7 @@ export declare const useAppointmentBookingAccount: () => {
 export declare const useAppointmentBookingResource: () => {
     getResourceTimeSlot: (index?: number) => Promise<void>;
     getResourceList: () => {
-        resources: any[];
+        resources: any;
         resourceCodes: any;
     };
 };

package/es/components/appointmentBooking/hooks.js

@@ -17,7 +17,7 @@ import { useState, useEffect, useMemo } from 'react';
 import { locales } from '@pisell/utils';
 import { usePisellOS } from "../../hooks/useEngineContext";
 import useEngineContext from "../../hooks/useEngineContext";
-import { processResourceList, getCustomer, currentAppointmentBoard, currentRenderLists, getFormInsertBeforeKey, checkAndGoNext, checkAndMarkCartRenderError, formatHolder, Toast } from "./utils";
+import { sortResources, getCustomer, currentAppointmentBoard, currentRenderLists, getFormInsertBeforeKey, checkAndGoNext, checkAndMarkCartRenderError, formatHolder, Toast } from "./utils";
 import { useAppointmentBookingContext } from "./context";
 import { scrollToFirstErrorCard } from "./components/Resource/utils";
 export var useAppointmentBooking = function useAppointmentBooking() {
@@ -809,13 +809,20 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
 
   // 设置资源列表
   var getResourceList = function getResourceList() {
+    var _resources2;
     var resources = appointmentBooking.getResourcesList();
-    var _processResourceList = processResourceList(resources, resourceSort),
-      processedResources = _processResourceList.resources,
-      resourceCodes = _processResourceList.resourceCodes;
-    setResources(processedResources || []);
+    resources = resources.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        resources: sortResources((item === null || item === void 0 ? void 0 : item.resources) || [], resourceSort)
+      });
+    });
+    var _resources = ((_resources2 = resources) === null || _resources2 === void 0 || (_resources2 = _resources2[0]) === null || _resources2 === void 0 ? void 0 : _resources2.resources) || [];
+    var resourceCodes = _resources.map(function (item) {
+      return item.code;
+    });
+    setResources(resources || []);
     return {
-      resources: processedResources,
+      resources: resources,
       resourceCodes: resourceCodes
     };
   };

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

@@ -115,7 +115,6 @@ declare const _default: {
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
         'pisell2.text.goodpass.code-invalid-cart': string;
-        'pisell2.text.goodpass.code-invalid-expired': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
         'pisell2.text.contact-info.title': string;
@@ -236,7 +235,6 @@ declare const _default: {
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
         'pisell2.text.goodpass.code-invalid-cart': string;
-        'pisell2.text.goodpass.code-invalid-expired': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
         'pisell2.text.contact-info.title': string;
@@ -357,7 +355,6 @@ declare const _default: {
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
         'pisell2.text.goodpass.code-invalid-cart': string;
-        'pisell2.text.goodpass.code-invalid-expired': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
         'pisell2.text.contact-info.title': string;

package/es/components/appointmentBooking/locales.js

@@ -133,7 +133,6 @@ export default {
     'pisell2.text.goodpass.enter-code': 'Enter Code',
     'pisell2.text.goodpass.code-invalid': 'Current code is invalid',
     'pisell2.text.goodpass.code-invalid-cart': 'No eligible items in the cart',
-    'pisell2.text.goodpass.code-invalid-expired': 'Current coupon is not valid in use',
     'pisell2.text.goodpass.login': 'Login',
     'pisell2.text.goodpass.login-tip': ' for member benefit Or use account credit',
     'pisell2.text.contact-info.title': 'Contact info'
@@ -272,7 +271,6 @@ export default {
     'pisell2.text.goodpass.enter-code': '请输入券码',
     'pisell2.text.goodpass.code-invalid': '当前券码不可用',
     'pisell2.text.goodpass.code-invalid-cart': '当前购物车中无可用商品',
-    'pisell2.text.goodpass.code-invalid-expired': '当前优惠券不在使用期限内',
     'pisell2.text.goodpass.login': '登录',
     'pisell2.text.goodpass.login-tip': '以获取会员福利或使用账户积分',
     'pisell2.text.contact-info.title': '联系信息'
@@ -411,7 +409,6 @@ export default {
     'pisell2.text.goodpass.enter-code': '請輸入券碼',
     'pisell2.text.goodpass.code-invalid': '當前券碼不可用',
     'pisell2.text.goodpass.code-invalid-cart': '當前購物車中無可用商品',
-    'pisell2.text.goodpass.code-invalid-expired': '當前優惠券不在使用期限內',
     'pisell2.text.goodpass.login': '登錄',
     'pisell2.text.goodpass.login-tip': '以獲取會員福利或使用賬戶積分',
     'pisell2.text.contact-info.title': '聯繫信息'

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

@@ -39,19 +39,6 @@ export declare const formatCarts: (data: any[], resources: any[], utils: any, ac
  * @Date: 2025-04-14 11:16
  */
 export declare const sortResources: (resources: any[], resourceSort: any[]) => any[] | undefined;
-/**
- * @title: 处理资源列表并提取资源代码
- * @description: 对资源列表进行排序，并提取 resourceCodes
- * @param {any[]} resources - 原始资源列表
- * @param {any[]} resourceSort - 资源排序配置
- * @return {*} 返回处理后的资源列表和资源代码数组
- * @Author: WangHan
- * @Date: 2025-11-21 15:33
- */
-export declare const processResourceList: (resources: any[], resourceSort: any[]) => {
-    resources: any[];
-    resourceCodes: any;
-};
 export declare const getMeAccount: (val: any[]) => any;
 export declare const getCustomer: (utils: any) => any;
 export declare const formatCustomer: (val: any) => {
@@ -214,13 +201,3 @@ export declare const currentRenderLists: (resources: any[], code: any) => any;
  * @Date: 2025-05-25 23:17
  */
 export declare const updateCartResources: (item: any, value?: any, currentSelectedResources?: any) => any;
-/**
- * @title: 根据步骤key清空数据
- * @param {string} key - 当前步骤的key
- * @param {any} appointmentBooking - 预约预订实例
- * @param {(times: any[]) => void} setTimes - 设置时间列表的回调函数
- * @return {string[]} 返回需要清空的数据类型数组
- * @Author: WangHan
- * @Date: 2025-11-21 15:40
- */
-export declare const clearDataByStepKey: (key: string, appointmentBooking: any, setTimes?: ((times: any[]) => void) | undefined) => string[] | undefined;