@pisell/private-materials 3.4.17 → 3.4.19

package/es/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/es/components/appointmentBooking/components/Content/index.js

@@ -251,7 +251,7 @@ var Layout = function Layout() {
     if (isMobile()) {
       var _header$getBoundingCl, _footer$getBoundingCl;
       var header = document.querySelector('.event-progress-bar');
-      var footer = document.querySelector('.pisell-section-footers-wrapper');
+      var footer = document.querySelector('.pisell-section-footers-wrapper') || document.querySelector('#layout-footer');
       var content = document.querySelector('.parallel-content-mobile-wrap');
       var headerHeight = (header === null || header === void 0 || (_header$getBoundingCl = header.getBoundingClientRect()) === null || _header$getBoundingCl === void 0 ? void 0 : _header$getBoundingCl.height) || 0;
       var footerHeight = (footer === null || footer === void 0 || (_footer$getBoundingCl = footer.getBoundingClientRect()) === null || _footer$getBoundingCl === void 0 ? void 0 : _footer$getBoundingCl.height) || 0;

package/es/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/es/components/appointmentBooking/components/Services/index.js

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useEffect, forwardRef, useImperativeHandle, useMemo } from 'react';
 import dayjs from 'dayjs';
 import { isMobile, locales } from '@pisell/utils';
-import ProductSelect from "../../../productSelect";
+import ProductSelect from "../../../../plus/productSelect";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useAppointmentBookingContext } from "../../context";
 import { useAppointmentBooking, useAppointmentBookingSetting, useAppointmentBookingProduct, useAppointmentBookingStep } from "../../hooks";
@@ -240,7 +240,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
   var _isMobile = useMemo(function () {
     if (typeof isMobile === 'function') return isMobile();
     return isMobile;
-  }, isMobile);
+  }, [isMobile]);
   return /*#__PURE__*/React.createElement("div", {
     className: "appointment-service-wrap"
   }, /*#__PURE__*/React.createElement(ProductSelect, {

package/es/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/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

package/es/components/appointmentBooking/index.js

@@ -30,10 +30,16 @@ var AppointmentBooking = function AppointmentBooking() {
   useEffect(function () {
     var setRealVH = function setRealVH() {
       // window.innerHeight 会返回视口真实的高度（不包括工具栏）
-      var vh = window.innerHeight * 0.01;
+      var height = window.innerHeight;
+
+      // 检查 URL 参数中是否有 fromTabbar
+      var urlParams = new URLSearchParams(window.location.search);
+      if (urlParams.has('fromTabbar')) {
+        height = height - 54;
+      }
+      var vh = height * 0.01;
       document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
     };
-
     // 页面加载和窗口大小变化时都重新计算
     setRealVH();
     window.addEventListener('resize', setRealVH);

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

@@ -434,13 +434,15 @@ var Addons = Provider(function (props) {
         }
       });
     }
-    if (state.channelDisabledEdit) {
-      modal.warning({
-        okText: locales.getText('pisell2.text.ok'),
-        content: locales.getText('pisell2.text.terminal-edit-message')
-      });
-      return;
-    }
+    /*
+        if (state.channelDisabledEdit) {
+          modal.warning({
+            okText: locales.getText('pisell2.text.ok'),
+            content: locales.getText('pisell2.text.terminal-edit-message'),
+          });
+          return;
+        }
+        */
     getProducts();
     setSearch('');
     dispatch({
@@ -496,9 +498,11 @@ var Addons = Provider(function (props) {
     if (state.disabledEdit) {
       return;
     }
+    /*
     if (state.channelDisabledEdit) {
       return;
     }
+    */
     var isSession = isSessionProduct(item);
     state.action({
       type: 'pisell1.handleOpenProductModal',
@@ -560,7 +564,7 @@ var Addons = Provider(function (props) {
     }
   }, state.addons.value.map(function (d) {
     return /*#__PURE__*/React.createElement(ProductItem, {
-      disabled: state.disabledEdit || state.channelDisabledEdit,
+      disabled: state.disabledEdit,
       item: d,
       key: d.id,
       amountSymbol: state.amountSymbol,

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

@@ -25,7 +25,7 @@ import classNames from 'classnames';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { formatProducts } from "../../addons";
-import { getIsSubjectRequire, isDayBooking, isHasDayAppointmentProduct } from "../../info/service2/utils";
+import { getIsSubjectRequire, isDayBooking, isEventBooking, isHasDayAppointmentProduct } from "../../info/service2/utils";
 import { createBookings, editBookings } from "../../info2/serve";
 import AppointmentProductModal from "./AppointmentProductModal";
 import FooterMenus from "./FooterMenus";
@@ -942,9 +942,21 @@ var Footer = function Footer(props) {
     }
   }, [state.bookingDetail, total.notPaidAmount]);
   var _buttons = useMemo(function () {
+    var isEvent = isEventBooking(state);
+
     // 如果预约是取消状态,则不展示任何按钮
-    // 如果订单已退款 | 部分退款，则展示再次预约按钮
-    if (state.appointment_status === 'cancelled' || paymentRefundedStatus) {
+    if (state.appointment_status === 'cancelled') {
+      return [buttonMap.rebook];
+    }
+
+    // 如果订单已退款 | 部分退款
+    if (paymentRefundedStatus) {
+      // 如果是活动预约, 则不展示任何按钮
+      if (isEvent) {
+        return [''];
+      }
+
+      // 显示再次预约按钮
       return [buttonMap.rebook];
     }
 
@@ -1104,17 +1116,15 @@ var Footer = function Footer(props) {
   var totalText = useMemo(function () {
     var str = '';
 
+    // 有退款金额时, 直接展示 退款:$8.00
+    if (total.totalRefundAmount > 0) {
+      return "".concat(locales.getText('pisell2.text.refunded-amount'), ": ").concat(formatAmount(total.totalRefundAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'));
+    }
     // 只有定金支付时，直接展示
     if (isOnlyDeposit) {
       var _state$bookingDetail12;
       return "".concat(locales.getText('pisell2.text.deposit-paid'), " ").concat(formatAmount(state === null || state === void 0 || (_state$bookingDetail12 = state.bookingDetail) === null || _state$bookingDetail12 === void 0 ? void 0 : _state$bookingDetail12.deposit_paid_amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'), " ").concat(total.duration ? "(".concat(total.duration, ")") : '');
     }
-
-    // 有退款金额时, 直接展示 退款:$8.00
-    if (total.totalRefundAmount > 0) {
-      return "".concat(locales.getText('pisell2.text.refunded-amount'), ": ").concat(formatAmount(total.totalRefundAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'));
-    }
-
     // 如果待支付金额小于0 则展示全额支付
     if (total.notPaidAmount <= 0 && state.bookingId) {
       str = "".concat(locales.getText('pisell1.text.fully-paid'), ": ").concat(formatAmount(total.sumTotalAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'));

package/es/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/es/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/es/components/booking/info2/service/addTimeModal/index.js

@@ -272,7 +272,6 @@ var AddTimeModal = function AddTimeModal() {
           case 3:
             newList = _context2.sent;
             list = newList.map(function (d) {
-              debugger;
               // 是否可用
               var isUsable = isUsableProduct(d.add_time, state.service.cacheItem);
               return _objectSpread(_objectSpread({}, d), {}, {

package/es/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/es/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/es/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/es/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/es/components/eventBooking/components/progressBar/index.js

@@ -61,6 +61,26 @@ var ProgressBar = function ProgressBar(_ref) {
   var handleOk = function handleOk() {
     var _interaction$utils, _interaction$utils$is;
     if (interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils)) {
+      var url = window.location.href;
+
+      // 如果 url中包含 isByTabbar 删除url中的cacheId 并刷新页面
+      if (url.includes('isByTabbar')) {
+        removeSessionStorage === null || removeSessionStorage === void 0 || removeSessionStorage();
+        var 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/es/components/eventBooking/index.js

@@ -61,7 +61,14 @@ var Content = function Content() {
   useEffect(function () {
     var setRealVH = function setRealVH() {
       // window.innerHeight 会返回视口真实的高度（不包括工具栏）
-      var vh = window.innerHeight * 0.01;
+      var height = window.innerHeight;
+
+      // 检查 URL 参数中是否有 formTabbar
+      var urlParams = new URLSearchParams(window.location.search);
+      if (urlParams.has('formTabbar')) {
+        height = height - 54;
+      }
+      var vh = height * 0.01;
       document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
     };
 

package/es/components/pay/toC/PaymentMethods/GooglePay/index.js

@@ -15,7 +15,7 @@ import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
 import { Context } from "../../model";
 import { getPayGroupParamsFromStorage } from "../../payGroup";
 import useEngineContext from "../../../../../hooks/useEngineContext";
-import { formatFranchiseeRoute } from "../../utils";
+import { clientPayment, formatFranchiseeRoute } from "../../utils";
 /**
  * @title: 谷歌支付
  * @description:
@@ -26,7 +26,7 @@ import { formatFranchiseeRoute } from "../../utils";
  * @Date: 2024-08-16 11:01
  */
 var GooglePay = function GooglePay(props, ref) {
-  var _context$appHelper;
+  var _context$appHelper, _context$appHelper2;
   var _useContext = useContext(Context),
     state = _useContext.state;
   var _useState = useState(false),
@@ -36,6 +36,8 @@ var GooglePay = function GooglePay(props, ref) {
   var context = useEngineContext();
   var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.constants) || {},
     config = _ref.config;
+  var _context$appHelper$ut = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils,
+    interaction = _context$appHelper$ut.interaction;
 
   /**
    * @title: 初始化
@@ -47,23 +49,34 @@ var GooglePay = function GooglePay(props, ref) {
    */
   var init = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
-      var _utils$getStore;
+      var _utils$getStore, _interaction$utils, _interaction$utils$is, _interaction$utils2, _interaction$utils2$i;
       var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup, locale, shopId, currentURL, linkElement, shop_domain, _href;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payGroup = _ref2.payGroup;
-            setOpen(true);
             utils = context.appHelper.utils || {};
             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(); // 获取交易组
             values = getPayGroupParamsFromStorage(payGroup.order_id);
+            if (!(interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils) && (interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$i = _interaction$utils2.isAndroid_ios) === null || _interaction$utils2$i === void 0 ? void 0 : _interaction$utils2$i.call(_interaction$utils2)) === 'android')) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return", clientPayment({
+              order_id: payGroup.order_id,
+              type: 'google_pay',
+              values: values,
+              interaction: interaction
+            }));
+          case 6:
+            setOpen(true);
             if (values) {
-              _context.next = 8;
+              _context.next = 10;
               break;
             }
             setOpen(false);
             return _context.abrupt("return");
-          case 8:
+          case 10:
             try {
               locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en';
               shopId = (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.shop) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.id;
@@ -78,7 +91,7 @@ var GooglePay = function GooglePay(props, ref) {
             } catch (err) {
               setOpen(false);
             }
-          case 9:
+          case 11:
           case "end":
             return _context.stop();
         }

package/es/components/pay/toC/PaymentMethods/WalletPass/List/index.d.ts

@@ -10,6 +10,7 @@ export interface WalletPassListProps {
     walletSetting: {
         name: string;
     };
+    onChangeDebounce?: boolean;
 }
 export declare type WalletPassListRef = {
     init: (params: MachineCodeListParams, formatList?: (val: WalletPassDataType[]) => WalletPassDataType[]) => void;

package/es/components/pay/toC/PaymentMethods/WalletPass/List/index.js

@@ -20,7 +20,10 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
     onChange = props.onChange,
     propsData = props.data,
     value = props.value,
-    walletSetting = props.walletSetting;
+    walletSetting = props.walletSetting,
+    onLoadingChange = props.onLoadingChange,
+    propsLoading = props.loading,
+    onChangeDebounce = props.onChangeDebounce;
   var _useState = useState(propsData || []),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
@@ -34,6 +37,9 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
       setData(propsData);
     }
   }, [propsData]);
+  useEffect(function () {
+    setLoading(!!propsLoading);
+  }, [propsLoading]);
   var getList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, formatList) {
       var list;
@@ -84,6 +90,9 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
       init: init
     };
   });
+  useEffect(function () {
+    onLoadingChange === null || onLoadingChange === void 0 || onLoadingChange(loading);
+  }, [loading]);
 
   /**
    * 拆分出可用的和不可用的列表
@@ -131,7 +140,8 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
     value: value,
     onChange: handleChange,
     showEmpty: data.length === 0,
-    empty: empty
+    empty: empty,
+    onChangeDebounce: onChangeDebounce
   }), !!disabledList.length && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-walletPass-list-disabled"
   }, locales.getText('tocPay.text.walletPassDisabled')), /*#__PURE__*/React.createElement(PisellCardList, {

package/es/components/pay/toC/PaymentMethods/WalletPass/index.js

@@ -42,41 +42,45 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     setCurrentWalletPass = _useState2[1];
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    open = _useState4[0],
-    setOpen = _useState4[1];
-
-  /** 搜索 modal */
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    searchOpen = _useState6[0],
-    setSearchOpen = _useState6[1];
+    open = _useState6[0],
+    setOpen = _useState6[1];
 
-  /** 搜索后添加的walletPass */
-  var _useState7 = useState([]),
+  /** 搜索 modal */
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    addList = _useState8[0],
-    setAddList = _useState8[1];
+    searchOpen = _useState8[0],
+    setSearchOpen = _useState8[1];
 
-  /** 当前order信息 */
-  var _useState9 = useState(null),
+  /** 搜索后添加的walletPass */
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    order = _useState10[0],
-    setOrder = _useState10[1];
+    addList = _useState10[0],
+    setAddList = _useState10[1];
 
-  /** 当前搜索modal内list数据 */
-  var _useState11 = useState([]),
+  /** 当前order信息 */
+  var _useState11 = useState(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    searchData = _useState12[0],
-    setSearchData = _useState12[1];
+    order = _useState12[0],
+    setOrder = _useState12[1];
+
+  /** 当前搜索modal内list数据 */
+  var _useState13 = useState([]),
+    _useState14 = _slicedToArray(_useState13, 2),
+    searchData = _useState14[0],
+    setSearchData = _useState14[1];
 
   /** 当前搜索modal内选中数据 */
-  var _useState13 = useState({
+  var _useState15 = useState({
       ids: [],
       details: []
     }),
-    _useState14 = _slicedToArray(_useState13, 2),
-    searchSelectData = _useState14[0],
-    setSearchSelectData = _useState14[1];
+    _useState16 = _slicedToArray(_useState15, 2),
+    searchSelectData = _useState16[0],
+    setSearchSelectData = _useState16[1];
 
   /** 是否默认选中 搜索时默认选中 列表select变更更新列表时不默认选中 */
   var isAutoSelect = useRef(false);
@@ -361,13 +365,16 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     data: otherCustomerWalletPassList,
     title: locales.getText('tocPay.text.couponCodesAdded'),
     onChange: handleOtherChange,
-    value: selectValue
+    value: selectValue,
+    loading: loading,
+    onChangeDebounce: true
   }), /*#__PURE__*/React.createElement(List, {
     walletSetting: walletSetting,
     title: walletSetting.name,
     onChange: handleCurrentChange,
     ref: listRef,
-    value: selectValue
+    value: selectValue,
+    onLoadingChange: setLoading
   }))), /*#__PURE__*/React.createElement(PisellModal, {
     title: /*#__PURE__*/React.createElement("div", null, locales.getText('tocPay.text.searchResult')),
     mobileModalHeight: '90%',

package/es/components/pay/toC/utils.d.ts

@@ -51,7 +51,7 @@ export declare const formatFranchiseeRoute: (url: string, history?: any) => stri
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
 export declare const clientPayment: (params: {
     order_id: number;
-    type: "aliPay" | "wxPay";
+    type: "aliPay" | "wxPay" | 'google_pay';
     values: any;
     interaction?: any;
 }) => void;

package/es/components/ticketBooking/components/addServiceVariant/addService.d.ts

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

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -27,7 +27,7 @@ import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../.
 import { getIsBundleOrCombination, isBooking4Shop } from "../../../booking/info/utils";
 import { getProductDetail } from "../../../booking/info/service/serve";
 import { useService } from "../../../booking/info/service/serviceManager";
-import ProductSelect from "../../../productSelect";
+import ProductSelect from "../../../../plus/productSelect";
 import "./index.less";
 import { addService, addServiceScroll, createSimpleCacheItem, genServiceKey, getIsShowNumber, isSameProduct } from "../../utils";
 import NotAvailable from "../notAvailable";
@@ -584,8 +584,8 @@ var AddSerivce = function AddSerivce(props) {
           isTitle: 1,
           isSubtitle: 1,
           isPrice: 1,
-          isOriginPrice: 1,
-          isStock: 1
+          isOriginPrice: 0,
+          isStock: 0
         }
       }), /*#__PURE__*/React.createElement(NotAvailable, {
         ref: notAvailableRef

package/es/components/ticketBooking/index.d.ts

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

package/es/components/wallet/Detail/index.js

@@ -30,7 +30,7 @@ var Text = Typography.Text;
 dayjs.extend(timezone);
 dayjs.extend(utc);
 var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context$appHelper, _utils$getStore, _dvaStore$core, _context$appHelper2, _store$getState, _detail$machinecode_c;
+  var _context$appHelper, _utils$getStore, _dvaStore$core, _context$appHelper2, _store$getState, _utils$interaction, _utils$interaction$is, _detail$machinecode_c;
   var _props$detail = props.detail,
     detail = _props$detail === void 0 ? {} : _props$detail,
     _props$buttonGroupLis = props.buttonGroupList,
@@ -817,7 +817,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "wallet-detail".concat(platform === 'h5' ? ' wallet-detail-h5' : ' wallet-detail-pc', " ").concat(className || ''),
     ref: detailWrapperRef
-  }, (platform === 'h5' || showWalletBar) && /*#__PURE__*/React.createElement("div", {
+  }, (platform === 'h5' || showWalletBar) && !(utils !== null && utils !== void 0 && (_utils$interaction = utils.interaction) !== null && _utils$interaction !== void 0 && (_utils$interaction = _utils$interaction.utils) !== null && _utils$interaction !== void 0 && (_utils$interaction$is = _utils$interaction.isAppEnv) !== null && _utils$interaction$is !== void 0 && _utils$interaction$is.call(_utils$interaction)) && /*#__PURE__*/React.createElement("div", {
     className: "wallet-detail-header"
   }, /*#__PURE__*/React.createElement(WalletBar, {
     setup: "detail",

package/es/components/wallet/components/WalletCard.js

@@ -62,8 +62,9 @@ var WalletCard = function WalletCard(_ref) {
     disabled: isDisabled,
     showDisabledReason: isDisabled,
     disabledReason: disabledReason,
-    propStyle: {
-      marginBottom: 16
+    style: {
+      marginBottom: 16,
+      width: '100%'
     },
     showBalanceSymbol: !['point_card', 'good_pass'].includes(tag),
     active: isActive,

package/es/hooks/useWindowSize.js

@@ -7,7 +7,14 @@ export var useWindowSize = function useWindowSize() {
     var timeoutId;
     var setRealVH = function setRealVH() {
       // window.innerHeight 会返回视口真实的高度（不包括工具栏）
-      var vh = window.innerHeight * 0.01;
+      var height = window.innerHeight;
+
+      // 检查 URL 参数中是否有 formTabbar
+      var urlParams = new URLSearchParams(window.location.search);
+      if (urlParams.has('formTabbar')) {
+        height = height - 54;
+      }
+      var vh = height * 0.01;
       document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
     };
     var debouncedHandleResize = function debouncedHandleResize() {