@pisell/private-materials 3.3.80 → 3.3.82

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

@@ -104,25 +104,36 @@ 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 {
     // 非预约商品判断是否相同，相同合并
     var isNotSame = true;
+    // 是否设置过 只追加到第一个中
+    var isSetCount = false;
     value = list.map(function (item) {
-      if (isSameProduct(item, addItem)) {
+      // 是否商品券折扣的商品
+      var isGoodPassDiscountProduct = (item.discount_list || []).some(function (item) {
+        return item.type === 'good_pass';
+      });
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct) {
         var _item$_extend, _addItem$_extend, _item$_extend2;
         isNotSame = false;
         var quantity = ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend = addItem._extend) === null || _addItem$_extend === void 0 ? void 0 : _addItem$_extend.quantity) || 1);
         count = quantity;
+        isSetCount = true;
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
             quantity: quantity,
@@ -164,4 +175,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/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/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

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

package/es/hooks/useWindowSize.d.ts

@@ -0,0 +1,5 @@
+interface UseWindowSizeOptions {
+    debounceMs?: number;
+}
+export declare const useWindowSize: (options?: UseWindowSizeOptions) => void;
+export {};

package/es/hooks/useWindowSize.js

@@ -0,0 +1,26 @@
+import { useEffect } from 'react';
+export var useWindowSize = function useWindowSize() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _options$debounceMs = options.debounceMs,
+    debounceMs = _options$debounceMs === void 0 ? 100 : _options$debounceMs;
+  useEffect(function () {
+    var timeoutId;
+    var setRealVH = function setRealVH() {
+      // window.innerHeight 会返回视口真实的高度（不包括工具栏）
+      var vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
+    };
+    var debouncedHandleResize = function debouncedHandleResize() {
+      clearTimeout(timeoutId);
+      timeoutId = setTimeout(setRealVH, debounceMs);
+    };
+
+    // 页面加载和窗口大小变化时都重新计算
+    debouncedHandleResize();
+    window.addEventListener('resize', debouncedHandleResize);
+    return function () {
+      window.removeEventListener('resize', debouncedHandleResize);
+      clearTimeout(timeoutId);
+    };
+  }, [debounceMs]);
+};

package/es/index.d.ts

@@ -43,3 +43,5 @@ export { default as AppointmentBooking } from './components/appointmentBooking';
 export { default as AppointmentDeposit } from './components/appointmentBooking/deposit';
 export { default as TicketBooking } from './components/ticketBooking';
 export { default as SubTotal } from './components/subTotal';
+export { default as StepController } from './components/stepController';
+export { default as EditBookingModal } from './components/booking/editBookingModal';

package/es/index.js

@@ -46,4 +46,6 @@ export { default as ShoppingCart } from "./components/shoppingCart";
 export { default as AppointmentBooking } from "./components/appointmentBooking";
 export { default as AppointmentDeposit } from "./components/appointmentBooking/deposit";
 export { default as TicketBooking } from "./components/ticketBooking";
-export { default as SubTotal } from "./components/subTotal";
+export { default as SubTotal } from "./components/subTotal";
+export { default as StepController } from "./components/stepController";
+export { default as EditBookingModal } from "./components/booking/editBookingModal";

package/lib/businessModel/SalesModel/Sales/index.js

@@ -35,6 +35,7 @@ __export(Sales_exports, {
 });
 module.exports = __toCommonJS(Sales_exports);
 var import_react = __toESM(require("react"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var defaultData = {};
 var SALES_MODEL_SESSION_STORAGE_KEY = "shop_h5_sales_model_data";
 var SalesContext = (0, import_react.createContext)(
@@ -45,14 +46,13 @@ var SalesProvider = (props) => {
   const dataRef = (0, import_react.useRef)({});
   const [data, setData] = (0, import_react.useState)(defaultData);
   const [hooks, setHooks] = (0, import_react.useState)(props.hooks);
+  const context = (0, import_useEngineContext.default)();
+  const utils = context.appHelper.utils || {};
   const _setData = (newData) => {
     dataRef.current = { ...dataRef.current, ...newData };
     console.log("sales_model_newData", dataRef.current);
     if (config == null ? void 0 : config.useSessionStorage) {
-      sessionStorage.setItem(
-        SALES_MODEL_SESSION_STORAGE_KEY,
-        JSON.stringify(dataRef.current || {})
-      );
+      setSessionStorage();
     }
     setData({ ...dataRef.current });
   };
@@ -60,14 +60,28 @@ var SalesProvider = (props) => {
     return dataRef.current;
   };
   const setSessionStorage = () => {
+    var _a, _b, _c;
+    const history = ((_a = utils == null ? void 0 : utils.getHistory) == null ? void 0 : _a.call(utils)) || {};
+    const cacheId = ((_c = (_b = history == null ? void 0 : history.location) == null ? void 0 : _b.query) == null ? void 0 : _c.cacheId) || "";
+    const sessionData = { ...dataRef.current || {}, cacheId };
     sessionStorage.setItem(
-      SALES_MODEL_SESSION_STORAGE_KEY,
-      JSON.stringify(dataRef.current || {})
+      `${SALES_MODEL_SESSION_STORAGE_KEY}`,
+      JSON.stringify(sessionData || {})
     );
   };
   const getSessionStorage = () => {
-    const result = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
-    return JSON.parse(result || "{}");
+    var _a, _b, _c;
+    const history = ((_a = utils == null ? void 0 : utils.getHistory) == null ? void 0 : _a.call(utils)) || {};
+    const strResult = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
+    const result = strResult ? JSON.parse(strResult || "{}") : {};
+    const cacheId = ((_c = (_b = history == null ? void 0 : history.location) == null ? void 0 : _b.query) == null ? void 0 : _c.cacheId) || "";
+    if (!cacheId && !(result == null ? void 0 : result.cacheId)) {
+      return result;
+    }
+    if (cacheId && (result == null ? void 0 : result.cacheId) === cacheId) {
+      return result;
+    }
+    return {};
   };
   const removeSessionStorage = () => {
     sessionStorage.removeItem(SALES_MODEL_SESSION_STORAGE_KEY);

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

@@ -90,7 +90,7 @@ var ResourceProvider = ({
     resourceMap.forEach((v) => renderData.push(v));
     return renderData;
   };
-  const getResourceList = (0, import_ahooks.useRequest)(import_serve.getResourceListApi, {
+  const getResourceList = (0, import_ahooks.useRequest)(import_serve.getSpecialResourceListApi, {
     manual: true,
     onSuccess: (res) => {
       const formatData = formatResourceList(res);

package/lib/components/Sales/Resource/serve.d.ts

@@ -3,3 +3,10 @@ export declare const getResourceListApi: (params: {
     shop_id: string;
     form_data_status: string;
 }) => Promise<any>;
+/**
+ * @title: 获取特殊资源列表
+ * @Author: xiangfeng.xue
+ */
+export declare const getSpecialResourceListApi: (params: {
+    event_item_ids?: string | number[];
+}) => Promise<any>;

package/lib/components/Sales/Resource/serve.js

@@ -19,14 +19,21 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/Sales/Resource/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
-  getResourceListApi: () => getResourceListApi
+  getResourceListApi: () => getResourceListApi,
+  getSpecialResourceListApi: () => getSpecialResourceListApi
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
 var getResourceListApi = (params) => {
   return import_utils.request.getRequest().get("/h5/form/data/v1", params, { useCache: true });
 };
+var getSpecialResourceListApi = (params) => {
+  return import_utils.request.getRequest().get("/h5/eventbookingv2/item/specify-resources", params, {
+    useCache: true
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getResourceListApi
+  getResourceListApi,
+  getSpecialResourceListApi
 });

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

@@ -74,7 +74,7 @@ var Header = () => {
     return ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.description) || "";
   }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key, currentSelectedResources]);
   const handleBack = async () => {
-    var _a2, _b;
+    var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     const types = {
       "select-time": "time",
@@ -89,8 +89,7 @@ var Header = () => {
     }
     if (key === "select-service") {
       appointmentBooking.clearCart();
-      const type = await checkProductType((_b = carts == null ? void 0 : carts[0]) == null ? void 0 : _b.id);
-      if (type === "duration") {
+      if (appointmentBooking.isCartHasDurationProduct()) {
         appointmentBooking.deleteCartItemInfo("time");
       }
     }

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
@@ -132,16 +126,23 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
             await appointmentBooking.getAvailableDate();
           }
         }
+        appointmentBooking.closeProductDetail();
         if (isDateSelectedFirst) {
           const index = (currentStep == null ? void 0 : currentStep.index) + 2;
-          if (type === "duration") {
-            const description = import_utils.locales.getText(
-              "pisell2.appointment.select.time"
-            );
-            appointmentBooking.addStep(
-              { index, key: "select-time", description },
-              "select-resource"
+          if (type === "duration" || appointmentBooking.isCartHasDurationProduct()) {
+            const { stepList } = (0, import_hooks.useAppointmentBookingStep)();
+            const hasResourceStep = stepList == null ? void 0 : stepList.find(
+              (item2) => (item2 == null ? void 0 : item2.key) === "select-resource"
             );
+            if (hasResourceStep) {
+              const description = import_utils.locales.getText(
+                "pisell2.appointment.select.time"
+              );
+              appointmentBooking.addStep(
+                { index, key: "select-time", description },
+                "select-resource"
+              );
+            }
           } else {
             removeStep("select-time");
           }

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 {

package/lib/components/appointmentBooking/locales.js

@@ -132,7 +132,7 @@ var locales_default = {
     "pisell2.appointment.policy.confirm": "Confirm",
     "pisell2.appointment.resource.tip": (val) => `Tip: Change ${val || "resource"} using the dropdown in the cart.`,
     "pisell2.text.apply": "Apply",
-    "pisell2.text.goodpass": "GoodPass",
+    "pisell2.text.goodpass": "Promotion",
     "pisell2.text.goodpass.product-vouchers": "Product Vouchers",
     "pisell2.text.goodpass.view-more": "View More",
     "pisell2.text.goodpass.code": "Code",
@@ -250,7 +250,7 @@ var locales_default = {
     "pisell2.appointment.policy.confirm": "确定",
     "pisell2.appointment.resource.tip": (val) => `提示：在右侧购物车中，通过下拉框修改“${val || "资源"}”`,
     "pisell2.text.apply": "应用",
-    "pisell2.text.goodpass": "商品券",
+    "pisell2.text.goodpass": "促销",
     "pisell2.text.goodpass.product-vouchers": "商品兑换券",
     "pisell2.text.goodpass.view-more": "查看更多",
     "pisell2.text.goodpass.code": "券码",
@@ -368,7 +368,7 @@ var locales_default = {
     "pisell2.appointment.policy.confirm": "確定",
     "pisell2.appointment.resource.tip": (val) => `提示：在右側購物車中，透過下拉框修改“${val || "資源"}”`,
     "pisell2.text.apply": "應用",
-    "pisell2.text.goodpass": "商品券",
+    "pisell2.text.goodpass": "促銷",
     "pisell2.text.goodpass.product-vouchers": "商品兌換券",
     "pisell2.text.goodpass.view-more": "查看更多",
     "pisell2.text.goodpass.code": "券碼",

package/lib/components/booking/addons/index.js

@@ -106,11 +106,13 @@ var formatProductValues = (data) => {
       ...d,
       id: d.product_id,
       title: d.product_title,
+      isAddons: true,
       quantity: d.product_quantity,
       cover: d.product_cover,
       price: Number(d.source_product_price),
       _extend: {
         total: Number(d.selling_price),
+        origin_total: Number(d.selling_price),
         payment_price: Number(d.payment_price),
         price: Number(d.source_product_price),
         quantity: d.product_quantity,
@@ -236,6 +238,7 @@ var Addons = (0, import_model.Provider)((props) => {
         let product = {
           ..._detail,
           _id: (0, import_utils3.getUniqueId)(),
+          isAddons: true,
           _key: e.key,
           _extend: {
             price: _detail.price,
@@ -246,7 +249,11 @@ var Addons = (0, import_model.Provider)((props) => {
         };
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
-        let _item = _list.find((d) => d._extend.other.rowKey === e.rowKey);
+        product._extend.origin_total = _total;
+        let _item = _list.find((d) => {
+          var _a2;
+          return d._extend.other.rowKey === e.rowKey && !d.booking_id && !((_a2 = d.discount_list) == null ? void 0 : _a2.length);
+        });
         if (_item) {
           _item._extend.quantity = _item._extend.quantity + product.quantity;
         } else {
@@ -392,6 +399,7 @@ var Addons = (0, import_model.Provider)((props) => {
         let product = {
           ...item,
           ..._detail,
+          isAddons: true,
           // 编辑商品时清除折扣信息
           discount_list: [],
           _extend: {
@@ -405,8 +413,8 @@ var Addons = (0, import_model.Provider)((props) => {
         }
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
+        product._extend.origin_total = _total;
         let _list = [...state.addons.value];
-        console.log("cacheItem", product);
         _list = _list.map((d) => d._id === product._id ? product : d);
         dispatch({
           type: "setAddons",