@pisell/private-materials 3.3.67 → 3.3.69

package/es/components/ticketBooking/utils/index.js

@@ -104,14 +104,18 @@ export var restoreProductOtherData = function restoreProductOtherData(data) {
 
 // 是相同的商品
 var isSameProduct = function isSameProduct(a, b) {
-  var _a$_extend, _b$_extend;
-  return ((_a$_extend = a._extend) === null || _a$_extend === void 0 || (_a$_extend = _a$_extend.other) === null || _a$_extend === void 0 ? void 0 : _a$_extend.rowKey) === ((_b$_extend = b._extend) === null || _b$_extend === void 0 || (_b$_extend = _b$_extend.other) === null || _b$_extend === void 0 ? void 0 : _b$_extend.rowKey);
+  var _a$_extend2, _b$_extend2;
+  if (isNormalProductByDurationSchedule(a) && isNormalProductByDurationSchedule(b)) {
+    var _a$_extend, _b$_extend;
+    return ((_a$_extend = a._extend) === null || _a$_extend === void 0 || (_a$_extend = _a$_extend.other) === null || _a$_extend === void 0 ? void 0 : _a$_extend.rowKey) === ((_b$_extend = b._extend) === null || _b$_extend === void 0 || (_b$_extend = _b$_extend.other) === null || _b$_extend === void 0 ? void 0 : _b$_extend.rowKey);
+  }
+  return ((_a$_extend2 = a._extend) === null || _a$_extend2 === void 0 || (_a$_extend2 = _a$_extend2.other) === null || _a$_extend2 === void 0 ? void 0 : _a$_extend2.rowKey) === ((_b$_extend2 = b._extend) === null || _b$_extend2 === void 0 || (_b$_extend2 = _b$_extend2.other) === null || _b$_extend2 === void 0 ? void 0 : _b$_extend2.rowKey) && a._serviceKey === b._serviceKey;
 };
-export var addService = function addService(list, addItem) {
+export var addService = function addService(list, addItem, state) {
   var value = list;
   var count;
-  // 预约商品直接添加
-  if (!isNormalProductByDurationSchedule(addItem)) {
+  // 预约商品 并且配置商品卡片不叠加 直接添加
+  if (!isNormalProductByDurationSchedule(addItem) && !getIsOverlayProduct(addItem, state)) {
     value.push(addItem);
     count = addItem._extend.quantity;
   } else {
@@ -164,4 +168,45 @@ export var addServiceScroll = function addServiceScroll(rowKey, cacheItem) {
       }, 100);
     }
   });
+};
+
+// 获取购物车商品覆盖规则
+export var getCartProductOverlay = function getCartProductOverlay(state) {
+  var _state$bookingConfig;
+  return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.cart_product_overlay) || {
+    type: "product_all"
+  };
+};
+
+// 获取购物车商品是否覆盖
+export var getIsOverlayProduct = function getIsOverlayProduct(item, state) {
+  var _getCartProductOverla = getCartProductOverlay(state),
+    type = _getCartProductOverla.type,
+    product_ids = _getCartProductOverla.product_ids;
+  if (type === 'product_all') {
+    return true;
+  }
+  return product_ids.includes(item.product_id || item.id);
+};
+
+// 获取购物车商品是否显示数量
+export var getIsShowNumber = function getIsShowNumber(item, state) {
+  var isBookingTicket2 = state.isBookingTicket2;
+  return isNormalProductByDurationSchedule(item) || isBookingTicket2 && getIsOverlayProduct(item, state);
+};
+
+// 生成服务key
+export var genServiceKey = function genServiceKey(item) {
+  var _item$_extend3, _item$_extend4, _item$_extend5;
+  var product_id = item.product_id;
+  var durationKey = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.duration;
+  var start_time = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.start_time;
+  var total = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.total;
+  var resourceKey = '';
+  Object.values(item._extend.resource).forEach(function (resources) {
+    resources.forEach(function (resource) {
+      resourceKey += "".concat(resource.relation_id);
+    });
+  });
+  return "".concat(product_id, "-").concat(durationKey, "-").concat(resourceKey, "-").concat(start_time, "-").concat(total);
 };

package/es/components/wallet/hooks/useWalletCard.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IWalletListItemProps } from '../serve';
 /**
  * 钱包卡片Hook的参数

package/es/components/walletList/index.js

@@ -21,9 +21,11 @@ import { Provider, Context } from "./model";
 import { WalletCard, Carousel } from '@pisell/materials';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import useEngineContext from "./../../hooks/useEngineContext";
-import { getWalletList, getWalletBalance } from "./serve";
-import { locales } from '@pisell/utils';
+import { getWalletList, getWalletBalance, getWalletShopList } from "./serve";
+import { locales, getUniqueId } from '@pisell/utils';
 import { request } from "./../../utils";
+import { defaultWalletGuideConfig } from "./status";
+import localeTexts from "./locales";
 import "./index.less";
 import classNames from 'classnames';
 // 导入所有类型
@@ -120,7 +122,7 @@ var DEFAULT_WALLET_CARD = {
       original: 'Level',
       'zh-CN': 'Level',
       'zh-HK': 'Level',
-      'en': 'Level'
+      en: 'Level'
     },
     metadata: {
       barcodetype: 'barCode',
@@ -150,7 +152,7 @@ var WalletList = Provider(function (props) {
     constants = _ref.constants,
     utils = _ref.utils;
   var dvaStore = utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 ? void 0 : _utils$getStore.getState();
-  locales.init({}, (dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en');
+  locales.init(localeTexts, (dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en');
   // 添加组件挂载状态引用
   var isMountedRef = useRef(true);
   var carouselRef = useRef(null);
@@ -164,9 +166,15 @@ var WalletList = Provider(function (props) {
     _useState2 = _slicedToArray(_useState, 2),
     currentIndex = _useState2[0],
     setCurrentIndex = _useState2[1];
+  // 店铺wallet pass列表
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    walletShopList = _useState4[0],
+    setWalletShopList = _useState4[1];
 
   // 添加一个请求ID引用，用于去重
   var requestIdRef = useRef('');
+  var pubsub = utils === null || utils === void 0 ? void 0 : utils.pubsub;
 
   //获取登录状态
   var isUserLoggedIn = useMemo(function () {
@@ -188,6 +196,27 @@ var WalletList = Provider(function (props) {
       request.setRequest(utils.request);
     }
   }, [utils === null || utils === void 0 ? void 0 : utils.request]);
+  useEffect(function () {
+    if (isUserLoggedIn) {
+      // 获取店铺wallet pass列表
+      getWalletShopList({
+        skip: 1,
+        num: 50
+      }).then(function (res) {
+        pubsub.publish('wallet:shopList', res);
+      });
+
+      // 订阅
+      var subscription = pubsub.subscribe('wallet:shopList', function (res) {
+        setWalletShopList((res === null || res === void 0 ? void 0 : res.list) || []);
+      });
+
+      // 卸载时取消订阅
+      return function () {
+        subscription.unsubscribe();
+      };
+    }
+  }, [isUserLoggedIn]);
 
   // 组件挂载时执行一次请求
   useEffect(function () {
@@ -433,7 +462,7 @@ var WalletList = Provider(function (props) {
             return _context3.abrupt("return");
           case 24:
             // 如果获取到有效数据，保存到 localStorage
-            if (walletListData && walletListData.length > 0) {
+            if (walletListData) {
               try {
                 saveToLocalStorage(STORAGE_KEY, walletListData);
               } catch (e) {
@@ -710,10 +739,24 @@ var WalletList = Provider(function (props) {
     })));
   }, []);
 
+  /**
+   * @title: 是否显示引导页
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-06-09 13:16
+   */
+  var isShowGuide = useMemo(function () {
+    var _globalState$walletGu;
+    if ((globalState === null || globalState === void 0 || (_globalState$walletGu = globalState.walletGuideConfig) === null || _globalState$walletGu === void 0 ? void 0 : _globalState$walletGu.show) === 0) return false;
+    return (walletShopList === null || walletShopList === void 0 ? void 0 : walletShopList.length) > 0 && !(list !== null && list !== void 0 && list.length);
+  }, [walletShopList, list, globalState === null || globalState === void 0 ? void 0 : globalState.walletGuideConfig]);
+
   // 确保renderContent总是返回JSX，避免返回null
   var renderContent = function renderContent() {
     // 如果列表为空，不显示任何内容
-    if (list.length === 0) {
+    if (list.length === 0 && !isShowGuide) {
       return null;
     }
 
@@ -722,7 +765,12 @@ var WalletList = Provider(function (props) {
       className: "pisell-wallet-list-container"
     }, /*#__PURE__*/React.createElement("div", {
       className: "wallet-content"
-    }, /*#__PURE__*/React.createElement(Carousel, _extends({
+    }, isShowGuide ? /*#__PURE__*/React.createElement(WalletCard, _extends({
+      key: getUniqueId(),
+      isGuide: true
+    }, globalState, {
+      walletGuideConfig: (globalState === null || globalState === void 0 ? void 0 : globalState.walletGuideConfig) || defaultWalletGuideConfig()
+    })) : /*#__PURE__*/React.createElement(Carousel, _extends({
       ref: carouselRef
     }, carouselProps), list.map(function (item) {
       return renderWalletCard(item);

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

@@ -0,0 +1,18 @@
+declare const _default: {
+    en: {
+        'page.wallet.guide.title': string;
+        'page.wallet.guide.subtitle': string;
+        'page.wallet.guide.button': string;
+    };
+    'zh-CN': {
+        'page.wallet.guide.title': string;
+        'page.wallet.guide.subtitle': string;
+        'page.wallet.guide.button': string;
+    };
+    'zh-HK': {
+        'page.wallet.guide.title': string;
+        'page.wallet.guide.subtitle': string;
+        'page.wallet.guide.button': string;
+    };
+};
+export default _default;

package/es/components/walletList/locales.js

@@ -0,0 +1,17 @@
+export default {
+  "en": {
+    'page.wallet.guide.title': 'Activate Now!',
+    'page.wallet.guide.subtitle': 'Unlock membership benefits now',
+    'page.wallet.guide.button': 'Get Your Reward'
+  },
+  'zh-CN': {
+    'page.wallet.guide.title': '待解锁权益',
+    'page.wallet.guide.subtitle': '成为专属会员，即可享受更多权益',
+    'page.wallet.guide.button': '点击获取'
+  },
+  'zh-HK': {
+    'page.wallet.guide.title': '待解鎖權益',
+    'page.wallet.guide.subtitle': '成為專屬會員，即可享受更多權益',
+    'page.wallet.guide.button': '點擊獲取'
+  }
+};

package/es/components/walletList/serve.d.ts

@@ -10,3 +10,11 @@ export declare const getWalletList: () => Promise<WalletPass[]>;
  * @returns
  */
 export declare const getWalletBalance: () => Promise<WalletBalance | null>;
+/**
+ * @title: 获取钱包店铺列表
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-06-09 11:12
+ */
+export declare const getWalletShopList: (params: any) => Promise<any>;

package/es/components/walletList/serve.js

@@ -66,4 +66,42 @@ export var getWalletBalance = /*#__PURE__*/function () {
   return function getWalletBalance() {
     return _ref2.apply(this, arguments);
   };
+}();
+
+/**
+ * @title: 获取钱包店铺列表
+ * @description: 
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-06-09 11:12
+ */
+export var getWalletShopList = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    var _yield$request$getReq3, data;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.prev = 0;
+          _context3.next = 3;
+          return request.getRequest().get('/h5/wallet/shop/list', params || {}, {
+            abort: true,
+            useCache: true
+          });
+        case 3:
+          _yield$request$getReq3 = _context3.sent;
+          data = _yield$request$getReq3.data;
+          return _context3.abrupt("return", data || null);
+        case 8:
+          _context3.prev = 8;
+          _context3.t0 = _context3["catch"](0);
+          return _context3.abrupt("return", null);
+        case 11:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[0, 8]]);
+  }));
+  return function getWalletShopList(_x) {
+    return _ref3.apply(this, arguments);
+  };
 }();

package/es/components/walletList/status.d.ts

@@ -0,0 +1,38 @@
+/**
+ * @title: 默认引导页配置
+ * @description:
+ * @param {any} locales
+ * @return {any}
+ * @Author: WangHan
+ * @Date: 2025-06-09 14:22
+ */
+export declare const defaultWalletGuideConfig: () => {
+    show: number;
+    align: string;
+    backgroundColor: string;
+    backgroundImage: string;
+    backgroundImageAlt: string;
+    buttonColor: string;
+    buttonBorderColor: string;
+    titleConfig: {
+        size: number;
+        color: string;
+        weight: number;
+        style: string;
+        text: any;
+    };
+    subtitleConfig: {
+        size: number;
+        color: string;
+        weight: number;
+        style: string;
+        text: any;
+    };
+    buttonConfig: {
+        size: number;
+        color: string;
+        weight: number;
+        style: string;
+        text: any;
+    };
+};

package/es/components/walletList/status.js

@@ -0,0 +1,47 @@
+import { locales } from '@pisell/utils';
+
+/**
+ * @title: 默认引导页配置
+ * @description: 
+ * @param {any} locales
+ * @return {any}
+ * @Author: WangHan
+ * @Date: 2025-06-09 14:22
+ */
+export var defaultWalletGuideConfig = function defaultWalletGuideConfig() {
+  return {
+    show: 1,
+    //文字居中
+    align: 'center',
+    //背景颜色
+    backgroundColor: '',
+    backgroundImage: '',
+    backgroundImageAlt: '',
+    buttonColor: 'rgba(127,86,217,1)',
+    buttonBorderColor: 'rgba(127,86,217,1)',
+    // 标题配置
+    titleConfig: {
+      size: 18,
+      color: 'rgba(255,255,255,1)',
+      weight: 600,
+      style: 'normal',
+      text: locales.getText('page.wallet.guide.title')
+    },
+    // 副标题配置
+    subtitleConfig: {
+      size: 14,
+      color: 'rgba(208,213,221,1)',
+      weight: 400,
+      style: 'normal',
+      text: locales.getText('page.wallet.guide.subtitle')
+    },
+    // 按钮配置
+    buttonConfig: {
+      size: 14,
+      color: 'rgba(255,255,255,1)',
+      weight: 600,
+      style: 'normal',
+      text: locales.getText('page.wallet.guide.button')
+    }
+  };
+};

package/es/components/workSpaceList/components/Modal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

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/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/lib/components/appointmentBooking/components/Cart/Item/index.js

@@ -46,7 +46,7 @@ var import_Deposit = __toESM(require("../../Deposit"));
 var import_utils3 = require("../utils");
 var import_index = require("./index.less");
 var CartItem = ({ onNext }) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const {
     carts,
@@ -78,6 +78,7 @@ var CartItem = ({ onNext }) => {
     return (0, import_utils2.formatHolder)(accountLists);
   }, [accountLists, isFormSubject]);
   const hasGoodPassApp = !!((_a = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _a.call(businessUtils, "goodpass"));
+  const hasDiscountCardApp = !!((_b = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _b.call(businessUtils, "discountcard"));
   const handleClickCard = (e, type, val) => {
     console.log(e, type, val, "handleClickCard");
     if (type === "note") {
@@ -187,8 +188,8 @@ var CartItem = ({ onNext }) => {
           hideAddBtn: false,
           holders,
           disabledEdit: isLastStep,
-          isShowChangeResource: (_c = (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) == null ? void 0 : _c.startsWith("select-resource"),
-          isShowDelete: ((_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key) === "select-service",
+          isShowChangeResource: (_d = (_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key) == null ? void 0 : _d.startsWith("select-resource"),
+          isShowDelete: ((_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key) === "select-service",
           isShowPackageNote: false,
           isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
           isShowHolder: isFormSubject,
@@ -205,7 +206,7 @@ var CartItem = ({ onNext }) => {
         onChange: (e, type, key) => handleClickCard(e, type, key)
       }
     )),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), (carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, { onNext }))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp || hasDiscountCardApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), (carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, { onNext }))
   ));
 };
 var Item_default = CartItem;

package/lib/components/appointmentBooking/components/Cart/Item/index.less

@@ -1,5 +1,5 @@
 .appointment-cart-item-wrap {
-  height: calc(100vh - 100px);
+  height: calc(var(--vh, 1vh) * 100 - 100px);
   display: flex;
   flex-direction: column;
 
@@ -39,7 +39,7 @@
   flex-direction: column;
   align-items: start;
 
-  >div {
+  > div {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -105,4 +105,4 @@
     flex: none;
     z-index: 10;
   }
-}
+}

package/lib/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/lib/components/appointmentBooking/components/Content/index.less

@@ -107,7 +107,7 @@
     margin-top: 0;
 
     .appointment-cart-item-wrap {
-      height: calc(100vh - 16px) !important;
+      height: calc(var(--vh, 1vh) * 100 - 16px) !important;
     }
   }
 }

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

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

package/lib/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/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/Services/index.js

@@ -74,9 +74,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
     let type = "";
     if (!isRetailTemplate) {
       type = await checkProductType(item == null ? void 0 : item.id);
-      if (type === "session") {
-        appointmentBooking.openProductDetail(item.id);
-      }
+      appointmentBooking.openProductDetail(item.id);
     }
     utils == null ? void 0 : utils.action({
       type: "pisell1.productDetail",
@@ -86,6 +84,10 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       },
       callback: async (data) => {
         var _a, _b;
+        if (data.isCancel) {
+          appointmentBooking.closeProductDetail();
+          return;
+        }
         const product = {
           ...data,
           options: (data == null ? void 0 : data.option) || []
@@ -96,13 +98,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
           appointmentBooking.storeProduct(product);
           return;
         }
-        if (data == null ? void 0 : data.isCancel) {
-          if (type === "session") {
-            appointmentBooking.closeProductDetail();
-            appointmentBooking.getAvailableDate();
-          }
-          return;
-        }
         const session = data == null ? void 0 : data.session;
         if (session) {
           const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
@@ -114,7 +109,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
-          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -128,10 +122,8 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
             );
           }
           appointmentBooking.storeProduct(product);
-          if (type === "duration") {
-            await appointmentBooking.getAvailableDate();
-          }
         }
+        appointmentBooking.closeProductDetail();
         if (isDateSelectedFirst) {
           const index = (currentStep == null ? void 0 : currentStep.index) + 2;
           if (type === "duration") {

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

@@ -76,6 +76,7 @@ var VoucherCard = (props) => {
     return discountList.filter((item) => !!item.isAvailable).map((discount) => {
       return {
         ...discount,
+        isDisabled: discount.isDisabled || discount.isDisabledForProductUsed,
         savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
       };
     });
@@ -122,6 +123,7 @@ var VoucherCard = (props) => {
     );
     pisellos.effects.on("appointmentBooking_cart:onAddItem", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateQuotationPrice", onCartChange);
+    pisellos.effects.on("appointmentBooking_cart:onUpdateCartItemNums", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onRemoveItem", onCartChange);
     pisellos.effects.on(
       ShopDiscountHooks.onDiscountListChange,
@@ -169,6 +171,11 @@ var VoucherCard = (props) => {
       import_utils.locales.getText("pisell2.text.goodpass.login")
     ), /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.text.goodpass.login-tip"))));
   };
+  const mixedSort = (val) => {
+    return [...val].sort((a, b) => {
+      return Number(b == null ? void 0 : b.isSelected) - Number(a == null ? void 0 : a.isSelected);
+    });
+  };
   const renderVoucherInfo = () => {
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "voucher-title" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "voucher-title-left" }, import_utils.locales.getText("pisell2.text.goodpass")), /* @__PURE__ */ import_react.default.createElement(
       "span",
@@ -201,6 +208,7 @@ var VoucherCard = (props) => {
         {
           style: { width: "100%" },
           dataSource: availableData,
+          mixedSort,
           onChange: (val) => {
             const detail = shopDiscount.setDiscountSelected({
               discountId: val.id,
@@ -215,6 +223,7 @@ var VoucherCard = (props) => {
         import_materials.PisellInput,
         {
           value: code,
+          allowClear: true,
           onChange: (e) => {
             var _a2;
             setCode((_a2 = e.target) == null ? void 0 : _a2.value);

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

@@ -63,7 +63,6 @@ var DepositModal = (props) => {
     } catch (error) {
       console.log(error);
       onChange && onChange(error);
-      debugger;
     } finally {
       setLoading(false);
     }

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/index.js

@@ -58,6 +58,17 @@ var AppointmentBooking = () => {
       }
     });
   }, []);
+  (0, import_react.useEffect)(() => {
+    const setRealVH = () => {
+      const vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty("--vh", `${vh}px`);
+    };
+    setRealVH();
+    window.addEventListener("resize", setRealVH);
+    return () => {
+      window.removeEventListener("resize", setRealVH);
+    };
+  }, []);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/appointmentBooking/index.less

@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: center;
   background: #ffffff;
-  height: 100vh;
+  height: calc(var(--vh, 1vh) * 100);
   overflow-y: auto;
 
   .pisell-section-headers {