@pisell/private-materials 3.4.17 → 3.4.19

package/es/plus/productSelect/locales.d.ts

@@ -0,0 +1,18 @@
+declare const _default: {
+    en: {
+        'pisell2.product-select.search': string;
+        'pisell2.product-select.stock': string;
+        'pisell2.product-select.empty': string;
+    };
+    'zh-CN': {
+        'pisell2.product-select.search': string;
+        'pisell2.product-select.stock': string;
+        'pisell2.product-select.empty': string;
+    };
+    'zh-HK': {
+        'pisell2.product-select.search': string;
+        'pisell2.product-select.stock': string;
+        'pisell2.product-select.empty': string;
+    };
+};
+export default _default;

package/es/plus/productSelect/locales.js

@@ -0,0 +1,17 @@
+export default {
+  en: {
+    'pisell2.product-select.search': 'Search',
+    'pisell2.product-select.stock': 'Stock',
+    'pisell2.product-select.empty': 'No Data'
+  },
+  'zh-CN': {
+    'pisell2.product-select.search': '搜索',
+    'pisell2.product-select.stock': '库存',
+    'pisell2.product-select.empty': '暂无数据'
+  },
+  'zh-HK': {
+    'pisell2.product-select.search': '搜索',
+    'pisell2.product-select.stock': '庫存',
+    'pisell2.product-select.empty': '暂无数据'
+  }
+};

package/es/plus/productSelect/theme/token.d.ts

@@ -0,0 +1,17 @@
+export interface ProductSelectToken {
+    colorPrimary: string;
+    colorText: string;
+    colorTextSecondary: string;
+    searchInputColor: string;
+    containerBg: string;
+    tabItemBg: string;
+    tabItemHoverBg: string;
+    tabItemActiveBg: string;
+    categoryTextColor: string;
+    cardBg: string;
+    cardHoverBg: string;
+    cardSelectedBg: string;
+    cardSelectedTextColor: string;
+    cardSelectedSecondaryTextColor: string;
+}
+export declare const defaultToken: ProductSelectToken;

package/es/plus/productSelect/theme/token.js

@@ -0,0 +1,19 @@
+export var defaultToken = {
+  colorPrimary: '#8157D5',
+  colorText: '#1B1B1B',
+  colorTextSecondary: '#4E4E4E',
+  containerBg: '#4E4E4E',
+  // search
+  searchInputColor: '#98a2b3',
+  // tab
+  tabItemBg: '#FFFFFF',
+  tabItemHoverBg: '#FFFFFF',
+  tabItemActiveBg: '#8157D5',
+  // category
+  categoryTextColor: '#FFFFFF',
+  cardBg: '#FFFFFF',
+  cardHoverBg: '#eaecf0',
+  cardSelectedBg: '#8157D5',
+  cardSelectedTextColor: '#ffffff',
+  cardSelectedSecondaryTextColor: 'rgba(255, 255, 255, 0.7)'
+};

package/es/plus/productSelect/utils.d.ts

@@ -0,0 +1,39 @@
+interface Product {
+    id: number;
+    title: string;
+    sort?: number;
+    category: Array<{
+        id: number;
+        name: string;
+        icon?: string;
+        slug: string;
+        sort: number;
+    }>;
+    [key: string]: any;
+}
+interface CategoryItem {
+    __typename: 'category';
+    id: number;
+    name: string;
+    icon?: string;
+    slug: string;
+    sort: number;
+}
+interface ProductItem extends Product {
+    __typename?: 'product';
+}
+declare type ListItem = CategoryItem | ProductItem;
+/**
+ * 按目录对商品进行分组，产出平级的数据结构用于虚拟列表渲染
+ * @param products 商品列表
+ * @returns 包含目录项和商品项的平级数组
+ */
+export declare function groupProductsByCategory(products: Product[]): ListItem[];
+/**
+ * 根据传入的元素标识符获取DOM元素
+ * @param elementIdentifier 元素标识符，可以是HTMLElement、带'#'的id、带'.'的类名或CSS选择器
+ * @returns 找到的DOM元素或null
+ */
+export declare function getElementByIdentifier(elementIdentifier: HTMLElement | string | null | undefined): HTMLElement | null;
+export declare const getOffsetTopRelativeToScrollContainer: (targetElement: HTMLElement, scrollContainer: HTMLElement) => number;
+export {};

package/es/plus/productSelect/utils.js

@@ -0,0 +1,162 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+// 商品按目录分组的工具函数
+import { locales } from '@pisell/utils';
+/**
+ * 按目录对商品进行分组，产出平级的数据结构用于虚拟列表渲染
+ * @param products 商品列表
+ * @returns 包含目录项和商品项的平级数组
+ */
+export function groupProductsByCategory(products) {
+  if (!products || products.length === 0) {
+    return [];
+  }
+
+  // 收集所有的目录信息
+  var categoryMap = new Map();
+  var categoryProductsMap = new Map();
+  var uncategorizedProducts = [];
+
+  // 遍历商品，收集目录信息和建立目录-商品映射
+  products.forEach(function (product) {
+    if (product.category && Array.isArray(product.category) && product.category.length > 0) {
+      product.category.forEach(function (cat) {
+        // 收集目录信息
+        if (!categoryMap.has(cat.id)) {
+          categoryMap.set(cat.id, {
+            __typename: 'category',
+            id: cat.id,
+            name: cat.name,
+            icon: cat.icon,
+            slug: cat.slug,
+            sort: cat.sort
+          });
+        }
+
+        // 建立目录-商品映射
+        if (!categoryProductsMap.has(cat.id)) {
+          categoryProductsMap.set(cat.id, []);
+        }
+        categoryProductsMap.get(cat.id).push(_objectSpread(_objectSpread({}, product), {}, {
+          __typename: 'product',
+          __categoryId: cat.id
+        }));
+      });
+    } else {
+      // 没有分组的商品放入未分类列表
+      uncategorizedProducts.push(_objectSpread(_objectSpread({}, product), {}, {
+        __typename: 'product',
+        __categoryId: 0
+      }));
+    }
+  });
+
+  // 按目录的sort字段排序
+  var sortedCategories = Array.from(categoryMap.values()).sort(function (a, b) {
+    return b.sort - a.sort;
+  });
+
+  // 构建最终的平级数组
+  var result = [];
+  sortedCategories.forEach(function (category) {
+    // 添加目录项
+    result.push(category);
+
+    // 添加该目录下的商品，按商品的sort字段排序
+    var categoryProducts = categoryProductsMap.get(category.id) || [];
+    var sortedProducts = categoryProducts.sort(function (a, b) {
+      var sortA = a.sort || 0;
+      var sortB = b.sort || 0;
+      return sortB - sortA;
+    });
+    result.push.apply(result, _toConsumableArray(sortedProducts));
+  });
+
+  // 如果有未分类的商品，添加other分组
+  if (uncategorizedProducts.length > 0) {
+    var otherCategory = {
+      __typename: 'category',
+      id: 0,
+      name: locales.getText('pisell2.text.other'),
+      icon: '',
+      slug: 'other',
+      sort: 99999999 // 确保other分组排在最后
+    };
+    result.push(otherCategory);
+    // 对未分类商品也进行排序
+    var sortedUncategorizedProducts = uncategorizedProducts.sort(function (a, b) {
+      var sortA = a.sort || 0;
+      var sortB = b.sort || 0;
+      return sortB - sortA;
+    });
+    result.push.apply(result, _toConsumableArray(sortedUncategorizedProducts));
+  }
+  console.log('xxxxxx', result);
+  return result;
+}
+
+/**
+ * 根据传入的元素标识符获取DOM元素
+ * @param elementIdentifier 元素标识符，可以是HTMLElement、带'#'的id、带'.'的类名或CSS选择器
+ * @returns 找到的DOM元素或null
+ */
+export function getElementByIdentifier(elementIdentifier) {
+  // 如果没有提供标识符，返回null
+  if (!elementIdentifier) {
+    return null;
+  }
+
+  // 如果是HTMLElement，直接返回
+  if (elementIdentifier instanceof HTMLElement) {
+    return elementIdentifier;
+  }
+
+  // 如果是字符串，判断是id、类名还是选择器
+  if (typeof elementIdentifier === 'string') {
+    // 如果以#开头，按id查找
+    if (elementIdentifier.startsWith('#')) {
+      return document.getElementById(elementIdentifier.slice(1));
+    }
+    // 如果以.开头，按类名查找
+    if (elementIdentifier.startsWith('.')) {
+      return document.querySelector(elementIdentifier);
+    }
+    // 否则直接作为选择器查找
+    return document.querySelector(elementIdentifier);
+  }
+  return null;
+}
+
+// 获取元素相对于指定滚动容器的偏移量
+export var getOffsetTopRelativeToScrollContainer = function getOffsetTopRelativeToScrollContainer(targetElement, scrollContainer) {
+  if (!targetElement || !scrollContainer) return 0;
+
+  // 如果目标元素就是滚动容器本身，返回0
+  if (targetElement === scrollContainer) {
+    return 0;
+  }
+  var bodyTransform = getComputedStyle(document.body).transform;
+  var scaleY = 1;
+  if (bodyTransform !== 'none') {
+    var matrix = new DOMMatrix(bodyTransform);
+    scaleY = matrix.d;
+  }
+  // 使用getBoundingClientRect计算相对偏移量
+  var targetRect = targetElement.getBoundingClientRect();
+  var containerRect = scrollContainer.getBoundingClientRect();
+
+  // targetRect.top - containerRect.top 得到目标元素相对于容器顶部的可视距离
+  // 考虑容器已经滚动的距离 再加上scrollContainer.scrollTop
+  // 这样得到的是目标元素在容器内容中的绝对位置
+  return targetRect.top / scaleY - containerRect.top / scaleY + scrollContainer.scrollTop;
+};

package/es/plus/saasCreateOrganization/components/Header.d.ts

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

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormInstance } from 'antd';
 import { SRProps } from '../types';
 import '../index.less';

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormInstance } from 'antd';
 import { SRProps } from '../types';
 import '../index.less';

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

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

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

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

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/saasRegister/components/VertifyEmail.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../index.less';
 declare const VertifyEmail: (props: {
     email: string;

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

@@ -199,7 +199,7 @@ var Layout = () => {
     var _a2, _b2;
     if ((0, import_utils.isMobile)()) {
       const header = document.querySelector(".event-progress-bar");
-      const footer = document.querySelector(".pisell-section-footers-wrapper");
+      const footer = document.querySelector(".pisell-section-footers-wrapper") || document.querySelector("#layout-footer");
       const content = document.querySelector(
         ".parallel-content-mobile-wrap"
       );

package/lib/components/appointmentBooking/components/Content/index.less

@@ -7,7 +7,7 @@
   flex: 1;
 
   .pisell-product-select-wrapper {
-    .pisell-product-select-tabs-wrapper {
+    .pisell-product-select__tabs-wrapper {
       top: 77px !important;
     }
   }
@@ -50,7 +50,7 @@
   flex: none;
 
   .pisell-product-select-wrapper {
-    .pisell-product-select-tabs-wrapper {
+    .pisell-product-select__tabs-wrapper {
       top: 0 !important;
     }
   }
@@ -97,7 +97,7 @@
 
 .parallel-content-retail-wrap {
   .pisell-product-select-wrapper {
-    .pisell-product-select-tabs-wrapper {
+    .pisell-product-select__tabs-wrapper {
       top: 0px !important;
     }
   }

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

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(Services_exports);
 var import_react = __toESM(require("react"));
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
-var import_productSelect = __toESM(require("../../../productSelect"));
+var import_productSelect = __toESM(require("../../../../plus/productSelect"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_context = require("../../context");
 var import_hooks = require("../../hooks");
@@ -174,7 +174,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
   const _isMobile = (0, import_react.useMemo)(() => {
     if (typeof import_utils.isMobile === "function") return (0, import_utils.isMobile)();
     return import_utils.isMobile;
-  }, import_utils.isMobile);
+  }, [import_utils.isMobile]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     import_productSelect.default,
     {

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

@@ -60,7 +60,12 @@ var AppointmentBooking = () => {
   }, []);
   (0, import_react.useEffect)(() => {
     const setRealVH = () => {
-      const vh = window.innerHeight * 0.01;
+      let height = window.innerHeight;
+      const urlParams = new URLSearchParams(window.location.search);
+      if (urlParams.has("fromTabbar")) {
+        height = height - 54;
+      }
+      const vh = height * 0.01;
       document.documentElement.style.setProperty("--vh", `${vh}px`);
     };
     setRealVH();

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

@@ -324,13 +324,6 @@ var Addons = (0, import_model.Provider)((props) => {
         }
       });
     }
-    if (state.channelDisabledEdit) {
-      modal.warning({
-        okText: import_utils3.locales.getText("pisell2.text.ok"),
-        content: import_utils3.locales.getText("pisell2.text.terminal-edit-message")
-      });
-      return;
-    }
     getProducts();
     setSearch("");
     dispatch({
@@ -374,9 +367,6 @@ var Addons = (0, import_model.Provider)((props) => {
     if (state.disabledEdit) {
       return;
     }
-    if (state.channelDisabledEdit) {
-      return;
-    }
     const isSession = (0, import_utils2.isSessionProduct)(item);
     state.action({
       type: "pisell1.handleOpenProductModal",
@@ -439,7 +429,7 @@ var Addons = (0, import_model.Provider)((props) => {
       return /* @__PURE__ */ import_react.default.createElement(
         import_selectProductItem.default,
         {
-          disabled: state.disabledEdit || state.channelDisabledEdit,
+          disabled: state.disabledEdit,
           item: d,
           key: d.id,
           amountSymbol: state.amountSymbol,

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

@@ -614,7 +614,14 @@ var Footer = (props) => {
     }
   }, [state.bookingDetail, total.notPaidAmount]);
   const _buttons = (0, import_react.useMemo)(() => {
-    if (state.appointment_status === "cancelled" || paymentRefundedStatus) {
+    const isEvent = (0, import_utils2.isEventBooking)(state);
+    if (state.appointment_status === "cancelled") {
+      return [buttonMap.rebook];
+    }
+    if (paymentRefundedStatus) {
+      if (isEvent) {
+        return [""];
+      }
       return [buttonMap.rebook];
     }
     if (source === "addons") {
@@ -739,13 +746,6 @@ var Footer = (props) => {
   const totalText = (0, import_react.useMemo)(() => {
     var _a2;
     let str = "";
-    if (isOnlyDeposit) {
-      return `${import_utils.locales.getText("pisell2.text.deposit-paid")} ${(0, import_utils.formatAmount)(
-        (_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.deposit_paid_amount,
-        2,
-        (state == null ? void 0 : state.amountSymbol) || "$"
-      )} ${total.duration ? `(${total.duration})` : ""}`;
-    }
     if (total.totalRefundAmount > 0) {
       return `${import_utils.locales.getText(
         "pisell2.text.refunded-amount"
@@ -755,6 +755,13 @@ var Footer = (props) => {
         (state == null ? void 0 : state.amountSymbol) || "$"
       )}`;
     }
+    if (isOnlyDeposit) {
+      return `${import_utils.locales.getText("pisell2.text.deposit-paid")} ${(0, import_utils.formatAmount)(
+        (_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.deposit_paid_amount,
+        2,
+        (state == null ? void 0 : state.amountSymbol) || "$"
+      )} ${total.duration ? `(${total.duration})` : ""}`;
+    }
     if (total.notPaidAmount <= 0 && state.bookingId) {
       str = `${import_utils.locales.getText("pisell1.text.fully-paid")}: ${(0, import_utils.formatAmount)(
         total.sumTotalAmount,

package/lib/components/booking/components/voucher/index.d.ts

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

package/lib/components/booking/info2/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

package/lib/components/booking/info2/service/addTimeModal/index.js

@@ -208,7 +208,6 @@ var AddTimeModal = () => {
     setLoading("list");
     const newList = await _getAddTimeProducts();
     let list = newList.map((d) => {
-      debugger;
       let isUsable = (0, import_utils2.isUsableProduct)(d.add_time, state.service.cacheItem);
       return {
         ...d,

package/lib/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "warn" | "success" | "loading" | "fail" | "question";
+        status: "loading" | "warn" | "success" | "fail" | "question";
     };
 };
 /**
@@ -297,18 +297,18 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
         subTitle?: string | undefined;
-        type?: "step" | "unset" | undefined;
+        type?: "unset" | "step" | undefined;
         render?: boolean | undefined;
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/eventBooking/components/progressBar/index.js

@@ -64,6 +64,24 @@ var ProgressBar = ({
   const handleOk = () => {
     var _a2, _b;
     if ((_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2)) {
+      const url = window.location.href;
+      if (url.includes("isByTabbar")) {
+        removeSessionStorage == null ? void 0 : removeSessionStorage();
+        const urlParams = new URLSearchParams(window.location.search);
+        urlParams.delete("cacheId");
+        setOpen(false);
+        interaction.utils.postMessageToApp({
+          module: "global",
+          key: "openNative",
+          data: {
+            link: {
+              page: "home"
+            }
+          }
+        });
+        window.location.href = window.location.pathname + "?" + urlParams.toString();
+        return;
+      }
       interaction.utils.postMessageToApp({
         module: "global",
         key: "paymentResultAction",

package/lib/components/eventBooking/index.js

@@ -68,7 +68,12 @@ var Content = () => {
   }, []);
   (0, import_react.useEffect)(() => {
     const setRealVH = () => {
-      const vh = window.innerHeight * 0.01;
+      let height = window.innerHeight;
+      const urlParams = new URLSearchParams(window.location.search);
+      if (urlParams.has("formTabbar")) {
+        height = height - 54;
+      }
+      const vh = height * 0.01;
       document.documentElement.style.setProperty("--vh", `${vh}px`);
     };
     setRealVH();