@pisell/private-materials 3.4.65 → 3.4.67

package/es/plus/saasRegister/components/VerifyError.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SRStepStatus } from '../types';
 import '../index.less';
 declare const VerifyError: (props: {

package/es/plus/saasRegister/components/VerifyingLink.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../index.less';
 declare const VerifyingEmailLink: (props: {
     onVerifyLink: () => Promise<void>;

package/es/plus/selectHolder/components/ErrorTip/index.d.ts

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

package/es/plus/skuOptionsSelection/components/NormalCard/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { RenderItemProps } from '../../../../pro/Selector/types';
 declare const NormalCard: (props: RenderItemProps & {
     parentDataSource: any;

package/es/plus/skuOptionsSelection/components/OptionsCard/OptionItemCard.d.ts

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

package/es/plus/skuOptionsSelection/components/OptionsCard/index.d.ts

@@ -1,7 +1,6 @@
 /**
  * 单规格商品卡片，点击后需要拉起弹窗展示具体的规格信息
  */
-/// <reference types="react" />
 import { RenderItemProps } from '../../../../pro/Selector/types';
 import './index.less';
 declare const OptionsCard: (props: RenderItemProps & {

package/es/plus/skuOptionsSelection/components/OptionsModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface OptionsModalProps {
     parentDataSource: any;
     dataSource: any;

package/es/plus/walletEditor/components/ImageUpload/index.d.ts

@@ -3,6 +3,6 @@ export interface ImageUploadProps {
     value?: string;
     onChange?: (val: string) => void;
 }
-export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
 declare const ImageUpload: React.FC<ImageUploadProps>;
 export default ImageUpload;

package/es/plus/walletPassGallery/components/passDetail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface PassDetailProps {
     dataSource?: any | null;

package/es/plus/walletPassGallery/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export interface WalletPassGalleryProps {
     [key: string]: any;

package/es/pro/Selector/demo.d.ts

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

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

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

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

@@ -225,7 +225,7 @@ var CartProvider = ({ children }) => {
     });
   };
   const createCartItemData = () => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
     const _cartData = getCurrentData().cartData;
     if (_cartData.currentCartItem) {
       const {
@@ -241,16 +241,24 @@ var CartProvider = ({ children }) => {
       const endDateInfo = (_g = (_f = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _f.selectDate) == null ? void 0 : _g.endDateInfo;
       const endTime = (_j = (_i = (_h = endDateInfo == null ? void 0 : endDateInfo.times) == null ? void 0 : _h.slice(-1)) == null ? void 0 : _i[0]) == null ? void 0 : _j.end_at;
       const num = 1;
-      const { totalPrice, originTotal, is_charge_tax } = (0, import_utils3.handleProductInfo)(
+      const { price, totalPrice, originTotal, is_charge_tax } = (0, import_utils3.handleProductInfo)(
         eventDetail,
         num
       );
+      const transformProduct = (_temp) => {
+        var _a2;
+        if (!((_a2 = _temp == null ? void 0 : _temp.variant) == null ? void 0 : _a2.length)) {
+          return { ..._temp || {}, variant: [] };
+        }
+        return _temp;
+      };
       const newCartItem = {
         _id,
         id: eventItem.id,
         name: eventItem.title,
-        price: totalPrice,
+        price,
         // eventBooking中售价和总价保持一致，因为数量为1
+        origin_price: price,
         total: totalPrice,
         // 排除原始价格为0的场景
         origin_total: isNaN(originTotal) || originTotal === 0 ? void 0 : originTotal,
@@ -271,6 +279,10 @@ var CartProvider = ({ children }) => {
         end_time: endTime ? (0, import_dayjs.default)(endTime || "").format("HH:mm") : "",
         custom_day_count: ((_m = (_l = (_k = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _k.selectDate) == null ? void 0 : _l.dates) == null ? void 0 : _m.length) || 0,
         is_charge_tax,
+        selectedBundle: (_n = eventDetail == null ? void 0 : eventDetail.productDetail) == null ? void 0 : _n.bundle,
+        selectedOptions: (_o = eventDetail == null ? void 0 : eventDetail.productDetail) == null ? void 0 : _o.options,
+        isNormalProduct: true,
+        // 是否是普通商品，eventBooking中接入的都是普通商品
         _originData: {
           ..._cartData.currentCartItem._originData,
           product: {
@@ -293,16 +305,22 @@ var CartProvider = ({ children }) => {
           event_unique_identifier: _id
           // 传递给接口用于商品可用性检测的比对
         },
-        _productDetail: eventDetail.productDetail
+        _productDetail: eventDetail.productDetail,
+        _productOrigin: transformProduct(
+          ((_p = eventDetail == null ? void 0 : eventDetail.productDetail) == null ? void 0 : _p.origin) || bookingOptionData
+        ),
+        _productInit: transformProduct(
+          ((_q = eventDetail == null ? void 0 : eventDetail.productDetail) == null ? void 0 : _q.origin) || bookingOptionData
+        )
       };
       newCartItem.deposit = (0, import_utils3.handleProductDeposit)(newCartItem, eventDetail, num);
       const originData = (0, import_utils3.handleCartItemOrigin)(newCartItem, eventDetail);
       newCartItem._originData = originData;
       if (holderItem == null ? void 0 : holderItem._originData) {
         newCartItem._originData.holder = {
-          customer_id: (_n = getUserInfo()) == null ? void 0 : _n.id,
-          form_id: (_o = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _o.form_id,
-          form_record: ((_p = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _p.form_record_id) ? [(_q = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _q.form_record_id] : null
+          customer_id: (_r = getUserInfo()) == null ? void 0 : _r.id,
+          form_id: (_s = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _s.form_id,
+          form_record: ((_t = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _t.form_record_id) ? [(_u = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _u.form_record_id] : null
         };
       }
       return newCartItem;

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

@@ -1,10 +1,15 @@
 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/lib/components/Sales/Cart/utils.js

@@ -33,6 +33,7 @@ __export(utils_exports, {
   formatBundleToOrigin: () => formatBundleToOrigin,
   formatOptionsToOrigin: () => formatOptionsToOrigin,
   getOriginTotalPrice: () => getOriginTotalPrice,
+  getPrice: () => getPrice,
   getProductDeposit: () => getProductDeposit,
   getTotalPrice: () => getTotalPrice,
   handleCartItemOrigin: () => handleCartItemOrigin,
@@ -45,6 +46,7 @@ var handleProductInfo = (eventDetail, num) => {
   var _a;
   const { productDetail, bookingOptionItem } = eventDetail;
   const normalProduct = bookingOptionItem == null ? void 0 : bookingOptionItem._originData;
+  let price = Number((normalProduct == null ? void 0 : normalProduct.price) || 0);
   let totalPrice = Number((normalProduct == null ? void 0 : normalProduct.price) || "");
   let originTotal = Number((normalProduct == null ? void 0 : normalProduct.original_price) || "");
   let is_charge_tax = normalProduct == null ? void 0 : normalProduct.is_charge_tax;
@@ -58,10 +60,19 @@ var handleProductInfo = (eventDetail, num) => {
       is_charge_tax = variant == null ? void 0 : variant.is_charge_tax;
     }
     const params = { product: origin, variant, bundle, options, num };
+    price = getPrice(params);
     totalPrice = getTotalPrice(params);
     originTotal = getOriginTotalPrice(params);
   }
-  return { totalPrice, originTotal, is_charge_tax };
+  return { price, totalPrice, originTotal, is_charge_tax };
+};
+var getPrice = (params) => {
+  const { product, variant } = params;
+  let price = Number(product.price);
+  if (variant) {
+    price = Number(variant == null ? void 0 : variant.price);
+  }
+  return price;
 };
 var getTotalPrice = (params) => {
   const { product, bundle, options, variant } = params;
@@ -270,6 +281,7 @@ var calculateProductDeposit = (params) => {
   formatBundleToOrigin,
   formatOptionsToOrigin,
   getOriginTotalPrice,
+  getPrice,
   getProductDeposit,
   getTotalPrice,
   handleCartItemOrigin,

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

@@ -41,9 +41,7 @@ var calculateSubtotal = (items) => {
     return "0.00";
   }
   const subtotal = items.reduce((sum, item) => {
-    const price = new import_decimal.default(item.price || 0);
-    const quantity = new import_decimal.default(item.quantity || 1);
-    return sum.plus(price.times(quantity));
+    return sum.plus(item.total || 0);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
@@ -54,7 +52,7 @@ var calculateTaxFee = (shopInfo, items) => {
   const { is_price_include_tax, tax_rate } = shopInfo || {};
   console.log("shopInfo>>>", is_price_include_tax, tax_rate);
   const totalTaxFee = items.reduce((sum, item) => {
-    const price = new import_decimal.default(item.price || 0);
+    const price = new import_decimal.default(item.total || 0);
     const taxRate = new import_decimal.default(tax_rate || 0).div(100);
     const productTaxRate = price.times(taxRate).times((item == null ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);

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

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

package/lib/components/appointmentBooking/components/Content/index.d.ts

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;

package/lib/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/lib/components/appointmentBooking/components/Header/index.d.ts

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

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

@@ -114,20 +114,15 @@ var Header = () => {
         isSkip: false
       });
     }
-    if ((prevStepData == null ? void 0 : prevStepData.key) === "select-service") {
+    const isServiceStep = (prevStepData == null ? void 0 : prevStepData.key) === "select-service";
+    const isResourceStep = (prevStepData == null ? void 0 : prevStepData.key) === "select-resource";
+    if (isServiceStep || isResourceStep) {
       stepList.forEach((item) => {
         if (item.key.startsWith("select-resource_") || item.key.startsWith("fill-form_")) {
           removeStep(item.key);
         }
       });
     }
-    if ((prevStepData == null ? void 0 : prevStepData.key) === "select-resource") {
-      stepList.forEach((item) => {
-        if (item.key.startsWith("fill-form_")) {
-          removeStep(item.key);
-        }
-      });
-    }
   };
   const handleClose = () => {
     var _a2, _b;

package/lib/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.d.ts

@@ -0,0 +1,2 @@
+declare const SelectDate: (props: any) => JSX.Element | null;
+export default SelectDate;

package/lib/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.js

@@ -0,0 +1,89 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.tsx
+var SelectDateOS_exports = {};
+__export(SelectDateOS_exports, {
+  default: () => SelectDateOS_default
+});
+module.exports = __toCommonJS(SelectDateOS_exports);
+var import_react = __toESM(require("react"));
+var import_hooks = require("../../../hooks");
+var import_context = require("../../../context");
+var import_useComponents = __toESM(require("../../../../../hooks/useComponents"));
+var import_utils = require("../../../utils");
+var import_hooks2 = require("../../../hooks");
+var import_utils2 = require("../../../utils");
+var SelectDate = (props) => {
+  const { onDateChange, times, currentDate } = props;
+  const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
+  const { currentSelectedResources, setTimes } = (0, import_context.useAppointmentBookingContext)();
+  const utils = (0, import_hooks2.contextUtils)();
+  const [SelectDateOS] = (0, import_useComponents.default)({
+    components: ["SelectDateOS"]
+  });
+  const resourceCode = (0, import_react.useMemo)(() => {
+    const { resourceSort } = (appointmentBooking == null ? void 0 : appointmentBooking.otherParams) || {};
+    const resources = appointmentBooking.getResourcesList();
+    const { resourceCodes } = (0, import_utils.processResourceList)(resources, resourceSort);
+    return (resourceCodes == null ? void 0 : resourceCodes[0]) || "";
+  }, []);
+  const currentResourceName = (0, import_react.useMemo)(() => {
+    var _a;
+    const currentResource = (_a = currentSelectedResources == null ? void 0 : currentSelectedResources[0]) == null ? void 0 : _a.currentSelectedResource;
+    const resourceItem = (currentResource == null ? void 0 : currentResource.resourceItem) || {};
+    const name = (0, import_utils.getResourceTitle)(
+      appointmentBooking,
+      resourceItem == null ? void 0 : resourceItem.code,
+      utils,
+      resourceItem
+    );
+    return name;
+  }, [currentSelectedResources]);
+  const onStepChange = () => {
+    (0, import_utils2.clearDataByStepKey)("select-service", appointmentBooking, setTimes);
+    const stepLists = appointmentBooking.getStepList();
+    const serviceIndex = stepLists.findIndex(
+      (item) => (item == null ? void 0 : item.key) === "select-service"
+    );
+    appointmentBooking.gotoStep(serviceIndex);
+  };
+  return SelectDateOS ? /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
+    SelectDateOS,
+    {
+      isTimeSlicing: true,
+      currentDate,
+      resourceCode,
+      resourceName: currentResourceName,
+      onDateChange,
+      onStepChange,
+      times
+    }
+  )) : null;
+};
+var SelectDateOS_default = SelectDate;

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

@@ -39,6 +39,7 @@ var import_context = require("../../context");
 var import_utils2 = require("../Resource/utils");
 var import_hooks = require("../../hooks");
 var import_utils3 = require("../../utils");
+var import_SelectDateOS = __toESM(require("./components/SelectDateOS"));
 var import_index = require("./index.less");
 var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
   const [selectedResource, setSelectedResource] = (0, import_react.useState)("");
@@ -51,6 +52,7 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
   } = (0, import_context.useAppointmentBookingContext)();
   const { getResourceTimeSlot, getResourceList } = (0, import_hooks.useAppointmentBookingResource)();
   const { nextStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const [currentDate, setCurrentDate] = (0, import_react.useState)(void 0);
   (0, import_react.useImperativeHandle)(ref, () => ({
     next: () => {
       const isUnSelectedTimes = appointmentBooking.checkCartItems("date");
@@ -85,7 +87,30 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
     setSelectedResource(e == null ? void 0 : e.start_time);
     getAutoSelect(e);
   };
-  return (times == null ? void 0 : times.length) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-time-slicing-wrap" }, times.map((item, index) => {
+  (0, import_react.useEffect)(() => {
+    const getCurrentDate = async () => {
+      var _a;
+      const res = await appointmentBooking.getDateRange();
+      const date = (_a = res == null ? void 0 : res[0]) == null ? void 0 : _a.date;
+      setCurrentDate(date);
+    };
+    getCurrentDate();
+  }, []);
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+    import_SelectDateOS.default,
+    {
+      onDateChange: (currentData) => {
+        if ((times == null ? void 0 : times.length) > 0) {
+          appointmentBooking.deleteCartItemInfo("time");
+        }
+        setCurrentDate(currentData == null ? void 0 : currentData.date);
+        appointmentBooking.setDateRange([currentData]);
+        getResourceTimeSlot();
+      },
+      times,
+      currentDate
+    }
+  ), (times == null ? void 0 : times.length) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-time-slicing-wrap" }, times.map((item, index) => {
     return /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
@@ -96,11 +121,6 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
       /* @__PURE__ */ import_react.default.createElement("span", null, item == null ? void 0 : item.start_time),
       /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-chevron-right", className: `icon` })
     );
-  })) : /* @__PURE__ */ import_react.default.createElement(
-    import_materials.PisellEmpty,
-    {
-      description: import_utils.locales.getText("pisell2.appointment.unselect.time")
-    }
-  );
+  })) : null);
 });
 var TimeSlicing_default = TimeSlicing;

package/lib/components/appointmentBooking/components/Voucher/index.d.ts

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

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

@@ -43,6 +43,7 @@ var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
 var import_voucher = require("../../../booking/components/voucher/index.less");
 var import_index = require("./index.less");
+var import_ahooks = require("ahooks");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -89,6 +90,12 @@ var VoucherCard = (props) => {
   (0, import_react.useEffect)(() => {
     shopDiscount.setProductList(products);
   }, [products]);
+  const { run: onCartChange } = (0, import_ahooks.useDebounceFn)(
+    () => {
+      onCartChangeFn();
+    },
+    { wait: 300 }
+  );
   const batchUpdateCart = (productList) => {
     var _a2;
     const items = productList.map((item) => {
@@ -106,13 +113,16 @@ var VoucherCard = (props) => {
     });
     (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.batchUpdateCart) == null ? void 0 : _a2.call(appointmentBooking, items);
   };
-  const onCartChange = () => {
-    var _a2, _b2, _c;
+  const onCartChangeFn = () => {
+    var _a2, _b2, _c, _d;
     const products2 = cart == null ? void 0 : cart.getItems();
     (_c = shopDiscount == null ? void 0 : shopDiscount.setBookingSubject) == null ? void 0 : _c.call(
       shopDiscount,
       (_b2 = (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a2.bookingSetting) == null ? void 0 : _b2.bookingSubject
     );
+    if (Array.isArray((_d = shopDiscount == null ? void 0 : shopDiscount.getDiscountList) == null ? void 0 : _d.call(shopDiscount)) && !(shopDiscount == null ? void 0 : shopDiscount.getDiscountList().length)) {
+      return;
+    }
     const val = shopDiscount.calcDiscount(products2);
     batchUpdateCart(val.productList);
   };
@@ -160,8 +170,11 @@ var VoucherCard = (props) => {
       batchUpdateCart(val.productList);
       setCode("");
     } else {
+      const content = {
+        time_limit: import_utils.locales.getText("pisell2.text.goodpass.code-invalid-expired")
+      };
       (0, import_materials.PisellToast)({
-        content: val.type === "server" ? import_utils.locales.getText("pisell2.text.goodpass.code-invalid") : import_utils.locales.getText("pisell2.text.goodpass.code-invalid-cart")
+        content: val.type === "server" ? import_utils.locales.getText("pisell2.text.goodpass.code-invalid") : content[val == null ? void 0 : val.unavailableReason] || import_utils.locales.getText("pisell2.text.goodpass.code-invalid-cart")
       });
     }
   };

package/lib/components/appointmentBooking/deposit/index.d.ts

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

package/lib/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/lib/components/appointmentBooking/hooks.js

@@ -489,18 +489,13 @@ var useAppointmentBookingResource = () => {
   const { appointmentBooking, setResources, setTimes } = (0, import_context.useAppointmentBookingContext)();
   const { resourceSort } = (appointmentBooking == null ? void 0 : appointmentBooking.otherParams) || {};
   const getResourceList = () => {
-    var _a;
     let resources = appointmentBooking.getResourcesList();
-    resources = resources.map((item) => {
-      return {
-        ...item,
-        resources: (0, import_utils2.sortResources)((item == null ? void 0 : item.resources) || [], resourceSort)
-      };
-    });
-    const _resources = ((_a = resources == null ? void 0 : resources[0]) == null ? void 0 : _a.resources) || [];
-    const resourceCodes = _resources.map((item) => item.code);
-    setResources(resources || []);
-    return { resources, resourceCodes };
+    const { resources: processedResources, resourceCodes } = (0, import_utils2.processResourceList)(
+      resources,
+      resourceSort
+    );
+    setResources(processedResources || []);
+    return { resources: processedResources, resourceCodes };
   };
   const getResourceTimeSlot = async (index) => {
     const { resourceCodes } = getResourceList();

package/lib/components/appointmentBooking/index.d.ts

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

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

@@ -115,6 +115,7 @@ 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;
@@ -235,6 +236,7 @@ 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;
@@ -355,6 +357,7 @@ 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/lib/components/appointmentBooking/locales.js

@@ -139,6 +139,7 @@ var locales_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"
@@ -259,6 +260,7 @@ var locales_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": "联系信息"
@@ -379,6 +381,7 @@ var locales_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/lib/components/appointmentBooking/utils.d.ts

@@ -39,6 +39,19 @@ 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) => {
@@ -201,3 +214,13 @@ 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;