@pisell/private-materials 6.3.50 → 6.3.52

package/es/components/booking/utils.js

@@ -18,6 +18,7 @@ import { locales } from '@pisell/utils';
 import { isDayBooking, formatDayDate } from "./info/service2/utils";
 import { intersectionBy } from 'lodash';
 import { getAppointmentTimingPreference } from "./info2/utilsByBooking";
+import Decimal from "decimal.js";
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -754,11 +755,24 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
   return _extend;
 };
 
+// 获取主商品价格 包含组合规格
+export var getMainPrice = function getMainPrice(item, price) {
+  var _item$_extend;
+  var newPrice = new Decimal(price || item._extend.price || 0);
+  var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+
+  // 多规格
+  if (other !== null && other !== void 0 && other.product_variant_id) {
+    newPrice = new Decimal((other === null || other === void 0 ? void 0 : other.price) || 0);
+  }
+  return newPrice.toNumber();
+};
+
 // 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
-  var _item$_extend;
+  var _item$_extend2;
   var price = Number(item._extend.price);
-  var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
+  var other = (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other;
 
   // 多规格
   if (other !== null && other !== void 0 && other.product_variant_id) {

package/es/components/eftpos/form/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/es/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页

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

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/payo/config.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusEnum } from '../const';
 export declare const POS: ({ api, onChange, }: {
     api: {

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

@@ -297,7 +297,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/es/components/eftposPay/tip.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './tip.less';
 /**
  * @title: 支付状态未知页面

package/es/components/eftposPay/windcave/receiptAction.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 按钮操作区
  * @description: 仅包含签名

package/es/components/eftposPay/windcave/windcave.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

package/es/components/eventBooking/components/ErrorTip/index.d.ts

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

package/es/components/eventBooking/components/Provider/Content/index.d.ts

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

package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts

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

package/es/components/eventBooking/components/Provider/SelectHolderModal.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type CalenDateWeekProps = {
     currentDate: string;

package/es/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export interface LoginProps {
     title: string;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts

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

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

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

package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

package/es/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/es/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts

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

package/es/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface AddClientProps {
     onChange: (value: any) => void;

package/es/components/productExtension/fields/Forms/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface InfoProps {
     relation_id: any;
     action: any;

package/es/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts

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

package/es/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductItemPreview: ({ item, onClick, onRemove, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItemPreview;

package/es/components/productExtension/fields/SelectProducts/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface valueType {
 }

package/es/components/productExtension/fields/SelectResourcesTable/index.d.ts

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

package/es/components/ruleSetting/ruleBorder/index.d.ts

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

package/es/components/schedules/calendar/index.d.ts

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

package/es/components/schedules/components/ScheduleDetailList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScheduleItem } from "../../type";
 import "./index.less";
 declare type ScheduleDetailListPropsType = {

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const ResourcesModule: ({ product }: {
     product: any;
 }) => JSX.Element;

package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const ProductDetail: ({ form, currentProduct, }: {
     form: any;

package/es/components/schedules/products/index.d.ts

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

package/es/components/schedules/products/list/ProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type Item = any;
 interface ProductItemProps {

package/es/components/schedules/products/list/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface ProductListProps {
     loading: boolean;

package/es/components/schedules/resources/list/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type ResourcesListProps = {
     list: any;

package/es/components/schedules/resources/relationProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const RelationProduct: ({ value, onChange, }: {
     value?: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { shoppingCartProps } from './type';
 declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
 export default shoppingCart;

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

@@ -21,7 +21,7 @@ import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useMemoizedFn } from 'ahooks';
 import useEngineContext from "../../../../hooks/useEngineContext";
-import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession } from "../../../booking/utils";
+import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession, getMainPrice } from "../../../booking/utils";
 import { getProductExtend } from "../../../booking/info2/service/addService/utils";
 import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { getIsBundleOrCombination, isBooking4Shop } from "../../../booking/info/utils";
@@ -390,12 +390,12 @@ var AddSerivce = function AddSerivce(props) {
                 _extend: {
                   start_date: state.date.value,
                   quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1,
-                  price: _detail.price,
                   product_name: item.title,
                   other: other
                 },
                 new: 1
               });
+              cacheItem._extend.price = getMainPrice(_detail, _detail.price);
               _total = getProductTotalPrice(cacheItem); // 用于折扣 可修改
               cacheItem._extend.total = _total;
               // 用于储存原价
@@ -487,7 +487,7 @@ var AddSerivce = function AddSerivce(props) {
                 });
                 onEdit === null || onEdit === void 0 || onEdit(cacheItem);
               }
-            case 24:
+            case 25:
             case "end":
               return _context3.stop();
           }

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

@@ -1,5 +1,11 @@
 var _excluded = ["detail"];
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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; }
@@ -126,20 +132,29 @@ export var addService = function addService(list, addItem, state) {
     // 是否设置过 只追加到第一个中
     var isSetCount = false;
     value = list.map(function (item) {
+      var _item$_extend;
       // 是否商品券折扣的商品
       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;
+      // 子商品是否有商品券折扣的商品
+      var bundleDiscountList = [];
+      ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).forEach(function (item) {
+        bundleDiscountList.push.apply(bundleDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+      });
+      var isGoodPassBundleProduct = bundleDiscountList.some(function (item) {
+        return item.type === 'good_pass';
+      });
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isGoodPassBundleProduct) {
+        var _item$_extend2, _addItem$_extend, _item$_extend3;
         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);
+        var quantity = ((item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.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,
-            other: _objectSpread(_objectSpread({}, ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other) || {}), {}, {
+            other: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), {}, {
               quantity: quantity
             })
           })
@@ -206,11 +221,11 @@ export var getIsShowNumber = function getIsShowNumber(item, state) {
 
 // 生成服务key
 export var genServiceKey = function genServiceKey(item) {
-  var _item$_extend3, _item$_extend4, _item$_extend5;
+  var _item$_extend4, _item$_extend5, _item$_extend6;
   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 durationKey = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration;
+  var start_time = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.start_time;
+  var total = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.total;
   var resourceKey = '';
   Object.values(item._extend.resource).forEach(function (resources) {
     resources.forEach(function (resource) {

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

@@ -1,3 +1,4 @@
+/// <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/hooks/usePaymentLogger.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

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

@@ -212,10 +212,7 @@ var FooterButtons = function FooterButtons(_ref) {
         className: "pisell-wallet-pass-gallery_footer-buttons-item pisell-wallet-pass-gallery_footer-buttons-item-primary"
       }, locales.getText('wallet-pass-gallery.recharge')));
     }
-
-    // 根据按钮数量设置不同的类名
-    var buttonCount = buttons.length;
-    var className = "pisell-wallet-pass-gallery_footer-buttons pisell-wallet-pass-gallery_footer-buttons-count-".concat(buttonCount);
+    var className = "pisell-wallet-pass-gallery_footer-buttons";
     return buttons.length > 0 ? /*#__PURE__*/React.createElement("div", {
       className: className
     }, buttons) : null;
@@ -223,6 +220,7 @@ var FooterButtons = function FooterButtons(_ref) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-pass-gallery_footer"
   }, renderButtons()), /*#__PURE__*/React.createElement(PisellModal, {
+    destroyOnClose: true,
     platform: platform,
     mobileModalHeight: "auto",
     headerDivider: false,

package/es/plus/walletPassGallery/components/footerButton/index.less

@@ -1,83 +1,38 @@
 .pisell-wallet-pass-gallery_footer {
   position: relative;
-  left: 0;
-  right: 0;
-  bottom: 0;
   background-color: #fff;
   padding: 24px;
   z-index: 100;
   border-top: 1px solid #d0d5de;
-  margin-left: -20px;
-  margin-right: -20px;
+  margin-left: -24px;
+  margin-right: -24px;
   &-buttons {
     display: flex;
     gap: 12px;
     width: 100%;
 
-
-.pisell-wallet-pass-gallery_footer-buttons-item-secondary{
-    overflow: hidden;
-    display: flex;
-    >span{
-      display: block;
-      // width: 100%;
-      flex:1;
+    .pisell-wallet-pass-gallery_footer-buttons-item-secondary {
+      overflow: hidden;
+      display: inline-block;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
       text-wrap: nowrap;
-    }
-}
-
-
-    // 按钮数量样式
-    // 单个按钮占满宽度
-    &-count-1 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: 100%;
-      }
-    }
-    
-    // 两个按钮各占一半
-    &-count-2 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(50% - 6px);
+      > span {
+        display: inline;
       }
     }
-    
-    // 三个按钮各占三分之一
-    &-count-3 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(33.33% - 8px);
-      }
-    }
-    
-    // 四个按钮各占四分之一
-    &-count-4 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(25% - 9px);
-      }
-    }
-    
-    // Ant Design按钮覆盖样式
-    :global(.ant-btn) {
-      height: 48px;
-      border-radius: 6px;
-      font-size: 16px;
-      font-weight: 500;
-      width: 100%;
+
+    .pisell-wallet-pass-gallery_footer-buttons-item {
+      flex-grow: 1;
     }
-    
+
     &-item {
       // 修饰符：主按钮
       &-primary {
-        background-color: var(--theme-color, #7F56D9);
+        background-color: var(--theme-color, #7f56d9);
       }
-      
+
       // 修饰符：次按钮
       &-secondary {
         background-color: #fff;
@@ -90,4 +45,4 @@
 
 .pisell-wallet-pass-gallery_footer:empty {
   display: none;
-}
+}

package/es/plus/walletPassGallery/components/passDetail/index.js

@@ -1,3 +1,7 @@
+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 _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); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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); }
@@ -247,7 +251,7 @@ var PassDetail = function PassDetail(props) {
   };
   if (!props.dataSource) return null;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: classNames("pisell-wallet-pass-gallery_detail", "pisell-wallet-pass-gallery_detail-".concat(platform))
+    className: classNames("pisell-wallet-pass-gallery_detail", "pisell-wallet-pass-gallery_detail-".concat(platform), _defineProperty({}, "pisell-wallet-pass-gallery_detail-with-footer", platform === 'h5' && tag === 'gift_card'))
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-pass-gallery_detail-content",
     ref: containerRef

package/es/plus/walletPassGallery/components/passDetail/index.less

@@ -18,6 +18,10 @@
     padding: 20px 0px;
   }
 
+  &-with-footer {
+    height: calc(100% - 90px);
+  }
+
   .pisell-wallet-pass-gallery_detail-content {
     overflow-y: auto;
     height: 100%;