@pisell/private-materials 6.6.2 → 6.6.4

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

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem } from "../type";
 declare type CalendarItemProps = {
     month: string;

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/CurrentDay/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type CurrentDayProps = {
     onClose: () => void;

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/components/ScheduleList/index.d.ts

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/es/components/shoppingCart/hooks/useAddService.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useAddService: (id?: number, type?: string) => JSX.Element | null;
 export default useAddService;

package/es/components/shoppingCart/hooks/useClearCart.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useClearCart: (key?: number | undefined) => JSX.Element | null;
 export default useClearCart;

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

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useMemo } from 'react';
+import React, { useMemo, useState, useEffect } from 'react';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import { DatePicker, SelectTime } from '@pisell/materials';
 import { useMemoizedFn } from 'ahooks';
@@ -13,12 +13,65 @@ import dayjs from 'dayjs';
 import classNames from 'classnames';
 import { locales } from '@pisell/utils';
 import "./index.less";
+import { Iconfont } from '@pisell/materials';
 var TimeBar = function TimeBar(props) {
-  var _state$modalState6;
+  var _state$modalState7;
   var state = props.globalState,
     setGlobalState = props.setGlobalState,
     locale = props.locale,
     onCreateClick = props.onCreateClick;
+  var _useState = useState(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    collapsed = _useState2[0],
+    setCollapsed = _useState2[1];
+  var _useState3 = useState(1),
+    _useState4 = _slicedToArray(_useState3, 2),
+    scaleCompensation = _useState4[0],
+    setScaleCompensation = _useState4[1];
+
+  // 获取 body 的 scale 值并计算补偿
+  useEffect(function () {
+    var getBodyScale = function getBodyScale() {
+      var body = document.body;
+      var computedStyle = window.getComputedStyle(body);
+      var transform = computedStyle.transform;
+      if (transform && transform !== 'none') {
+        // 解析 transform matrix 获取 scale 值
+        // matrix(scaleX, skewY, skewX, scaleY, translateX, translateY)
+        var matrix = transform.match(/matrix\(([^)]+)\)/);
+        if (matrix) {
+          var values = matrix[1].split(',').map(function (v) {
+            return parseFloat(v.trim());
+          });
+          // scaleX 通常是 matrix 的第一个值
+          var scale = values[0] || 1;
+          return scale;
+        }
+      }
+      return 1;
+    };
+    var updateScale = function updateScale() {
+      var scale = getBodyScale();
+      // 目标高度是 40px，需要补偿 scale 的影响
+      // 实际设置高度 = 目标高度 / scale
+      setScaleCompensation(scale);
+    };
+    updateScale();
+
+    // 监听 body 的 transform 变化（使用 MutationObserver）
+    var observer = new MutationObserver(updateScale);
+    observer.observe(document.body, {
+      attributes: true,
+      attributeFilter: ['style', 'class']
+    });
+
+    // 也监听窗口大小变化（某些情况下 scale 可能随窗口变化）
+    window.addEventListener('resize', updateScale);
+    return function () {
+      observer.disconnect();
+      window.removeEventListener('resize', updateScale);
+    };
+  }, []);
   var _onClickNext = useMemoizedFn(function () {
     var _state$modalState, _props$onDateChange, _props$setIntervalTim;
     var currentTime = (_state$modalState = state.modalState) === null || _state$modalState === void 0 || (_state$modalState = _state$modalState.date) === null || _state$modalState === void 0 ? void 0 : _state$modalState.value;
@@ -57,8 +110,52 @@ var TimeBar = function TimeBar(props) {
     });
     (_props$setIntervalTim5 = props.setIntervalTime) === null || _props$setIntervalTim5 === void 0 || _props$setIntervalTim5.call(props, timeString === dayjs().format('HH:mm'));
   });
+  var _onToggleCollapse = useMemoizedFn(function () {
+    setCollapsed(!collapsed);
+  });
   return useMemo(function () {
-    var _state$modalState4, _state$modalState5;
+    var _state$modalState5, _state$modalState6;
+    // 收起状态
+    if (collapsed) {
+      var _state$modalState4;
+      var currentDate = state === null || state === void 0 || (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value;
+      var isToday = currentDate && currentDate.isSame(dayjs(), 'day');
+      var displayText = isToday ? locales.getText('pisell2.ticket-booking.today') : (currentDate === null || currentDate === void 0 ? void 0 : currentDate.format('YYYY-MM-DD')) || '';
+
+      // 计算补偿后的高度：目标高度 / scale
+      var targetHeight = 40;
+      var compensatedHeight = targetHeight / scaleCompensation;
+      return /*#__PURE__*/React.createElement("div", {
+        className: classNames('pisell-ticket-booking-time-bar', 'collapsed'),
+        style: {
+          height: "".concat(compensatedHeight, "px"),
+          minHeight: "".concat(compensatedHeight, "px"),
+          maxHeight: "".concat(compensatedHeight, "px")
+        }
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "pisell-ticket-booking-time-bar-collapsed-content",
+        style: {
+          height: "".concat(compensatedHeight, "px")
+        }
+      }, /*#__PURE__*/React.createElement("span", {
+        className: "pisell-ticket-booking-time-bar-collapsed-today",
+        style: {
+          lineHeight: "".concat(compensatedHeight, "px")
+        }
+      }, displayText), /*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        size: "small",
+        className: "pisell-ticket-booking-time-bar-collapsed-expand",
+        onClick: _onToggleCollapse,
+        style: {
+          lineHeight: "".concat(compensatedHeight, "px")
+        }
+      }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.ticket-booking.expand')), /*#__PURE__*/React.createElement(Iconfont, {
+        type: "pisell2-chevron-right-double"
+      }))));
+    }
+
+    // 展开状态
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-ticket-booking-time-bar",
       style: {
@@ -85,7 +182,7 @@ var TimeBar = function TimeBar(props) {
       }
     }, /*#__PURE__*/React.createElement(DatePicker, {
       inputReadOnly: true,
-      value: state === null || state === void 0 || (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value,
+      value: state === null || state === void 0 || (_state$modalState5 = state.modalState) === null || _state$modalState5 === void 0 || (_state$modalState5 = _state$modalState5.date) === null || _state$modalState5 === void 0 ? void 0 : _state$modalState5.value,
       format: locale === 'en' ? 'dddd, DD MMM YYYY' : 'YYYY年MM月DD日',
       onChange: props === null || props === void 0 ? void 0 : props.onDateChange,
       size: "large",
@@ -101,7 +198,7 @@ var TimeBar = function TimeBar(props) {
         'booking-page-date-picker-select': state.isTimeChange
       })
     }, /*#__PURE__*/React.createElement(SelectTime, {
-      value: state === null || state === void 0 || (_state$modalState5 = state.modalState) === null || _state$modalState5 === void 0 || (_state$modalState5 = _state$modalState5.date) === null || _state$modalState5 === void 0 ? void 0 : _state$modalState5.value.format('HH:mm'),
+      value: state === null || state === void 0 || (_state$modalState6 = state.modalState) === null || _state$modalState6 === void 0 || (_state$modalState6 = _state$modalState6.date) === null || _state$modalState6 === void 0 ? void 0 : _state$modalState6.value.format('HH:mm'),
       onChange: _onDateTimeChange,
       popoverProps: {
         style: {
@@ -124,7 +221,15 @@ var TimeBar = function TimeBar(props) {
       },
       size: "large",
       type: "primary"
-    }, locales.getText('pisell2.ticket-booking.create-new')));
-  }, [(_state$modalState6 = state.modalState) === null || _state$modalState6 === void 0 || (_state$modalState6 = _state$modalState6.date) === null || _state$modalState6 === void 0 ? void 0 : _state$modalState6.value, state.intervalSetTime, state.isTimeChange, state.isDateChange, locale]);
+    }, locales.getText('pisell2.ticket-booking.create-new')), /*#__PURE__*/React.createElement(Button, {
+      type: "link",
+      style: {
+        marginLeft: 'auto'
+      },
+      onClick: _onToggleCollapse
+    }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.ticket-booking.collapse')), /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-chevron-left-double"
+    })));
+  }, [collapsed, (_state$modalState7 = state.modalState) === null || _state$modalState7 === void 0 || (_state$modalState7 = _state$modalState7.date) === null || _state$modalState7 === void 0 ? void 0 : _state$modalState7.value, state.intervalSetTime, state.isTimeChange, state.isDateChange, locale, _onToggleCollapse, scaleCompensation]);
 };
 export default TimeBar;

package/es/components/ticketBooking/components/timeBar/index.less

@@ -20,4 +20,63 @@
       }
     }
   }
+
+  // 收起状态
+  &.collapsed {
+    position: fixed;
+    bottom: 0;
+    left: 86px;
+    padding: 0;
+    background-color: transparent;
+    display: block;
+    // 高度通过内联样式动态设置以补偿 body 的 scale
+
+    .pisell-ticket-booking-time-bar-collapsed-content {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 100%;
+      // 高度通过内联样式动态设置以补偿 body 的 scale
+      padding: 0 16px;
+      background-color: #fff;
+      border-radius: 0 8px 8px 0;
+      box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
+      box-sizing: border-box;
+      overflow: hidden;
+
+      .pisell-ticket-booking-time-bar-collapsed-today {
+        font-weight: 600;
+        font-size: 18px;
+        color: #000;
+        flex-shrink: 0;
+        margin-right: 16px;
+        // line-height 通过内联样式动态设置
+      }
+
+      .pisell-ticket-booking-time-bar-collapsed-expand {
+        color: #7F56DA;
+        padding: 0;
+        margin: 0;
+        height: auto;
+        font-size: 18px;
+        font-weight: 500;
+        display: inline-flex;
+        align-items: center;
+        flex-shrink: 0;
+        // line-height 通过内联样式动态设置
+
+        &:hover {
+          color: #6941c6;
+        }
+
+        span {
+          margin-right: 2px;
+        }
+        .anticon {
+          margin-left: 0px;
+          margin-right: 0px;
+        }
+      }
+    }
+  }
 }

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

@@ -61,6 +61,8 @@ declare const _default: {
         'pisell2.ticket-booking.terminal-upgrade-description': string;
         'pisell2.ticket-booking.terminal-upgrade-ok': string;
         'pisell2.ticket-booking.terminal-upgrade-cancel': string;
+        'pisell2.ticket-booking.collapse': string;
+        'pisell2.ticket-booking.expand': string;
     };
     'zh-CN': {
         'pisell2.ticket-booking.info': string;
@@ -124,6 +126,8 @@ declare const _default: {
         'pisell2.ticket-booking.terminal-upgrade-description': string;
         'pisell2.ticket-booking.terminal-upgrade-ok': string;
         'pisell2.ticket-booking.terminal-upgrade-cancel': string;
+        'pisell2.ticket-booking.collapse': string;
+        'pisell2.ticket-booking.expand': string;
     };
     'zh-HK': {
         'pisell2.ticket-booking.info': string;
@@ -187,6 +191,8 @@ declare const _default: {
         'pisell2.ticket-booking.terminal-upgrade-description': string;
         'pisell2.ticket-booking.terminal-upgrade-ok': string;
         'pisell2.ticket-booking.terminal-upgrade-cancel': string;
+        'pisell2.ticket-booking.collapse': string;
+        'pisell2.ticket-booking.expand': string;
     };
 };
 export default _default;

package/es/components/ticketBooking/locales.js

@@ -73,7 +73,9 @@ export default {
     'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal Version Reminder',
     'pisell2.ticket-booking.terminal-upgrade-description': 'Your Terminal version is outdated. Please upgrade Terminal to use all features.',
     'pisell2.ticket-booking.terminal-upgrade-ok': 'I understand',
-    'pisell2.ticket-booking.terminal-upgrade-cancel': 'Cancel'
+    'pisell2.ticket-booking.terminal-upgrade-cancel': 'Cancel',
+    'pisell2.ticket-booking.collapse': 'Collapse',
+    'pisell2.ticket-booking.expand': 'Expand'
   },
   'zh-CN': {
     'pisell2.ticket-booking.info': '信息',
@@ -149,7 +151,9 @@ export default {
     'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal版本提醒',
     'pisell2.ticket-booking.terminal-upgrade-description': '检测到您的Terminal版本较低，请升级Terminal以使用完整功能',
     'pisell2.ticket-booking.terminal-upgrade-ok': '我知道了',
-    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消'
+    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消',
+    'pisell2.ticket-booking.collapse': '收起',
+    'pisell2.ticket-booking.expand': '展开'
   },
   'zh-HK': {
     'pisell2.ticket-booking.info': '資訊',
@@ -225,6 +229,8 @@ export default {
     'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal版本提醒',
     'pisell2.ticket-booking.terminal-upgrade-description': '檢測到您的Terminal版本較低，請升級Terminal以使用完整功能',
     'pisell2.ticket-booking.terminal-upgrade-ok': '我知道了',
-    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消'
+    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消',
+    'pisell2.ticket-booking.collapse': '收起',
+    'pisell2.ticket-booking.expand': '展開'
   }
 };

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

@@ -47,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

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

@@ -22,6 +22,7 @@ import localeTexts from "./locales";
 import { getAssetList, getDetailApi } from "./serve";
 import { request } from "./../../../utils";
 import { WalletBar, FooterButtons, UsageRules } from "../components";
+import { formatScheduleText } from "../utils";
 import "./index.less";
 var Text = Typography.Text;
 
@@ -54,7 +55,9 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
     _detail$expire_date = detail.expire_date,
     expire_date = _detail$expire_date === void 0 ? '' : _detail$expire_date,
     _detail$product = detail.product,
-    product = _detail$product === void 0 ? {} : _detail$product;
+    product = _detail$product === void 0 ? {} : _detail$product,
+    custom_schedule_snapshot = detail.custom_schedule_snapshot;
+  console.log(detail, 'detail22');
   var _ref = product || {},
     _ref$description = _ref.description,
     description = _ref$description === void 0 ? '' : _ref$description,
@@ -298,7 +301,36 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       onGoogleClick();
     }
   };
+  var scheduleList = useMemo(function () {
+    return (custom_schedule_snapshot === null || custom_schedule_snapshot === void 0 ? void 0 : custom_schedule_snapshot.data) || [];
+  }, [custom_schedule_snapshot]);
   useEffect(function () {
+    var detail = formatScheduleText(scheduleList, 'zh-CN');
+    var expireText = expire_date ? expire_date : locales.getText('page.wallet.expireDate');
+    if (scheduleList.length > 0) {
+      // 换行展示
+      var validityTexts = "";
+      var excludedText = "";
+      var includedText = "";
+      detail.forEach(function (item) {
+        if (item.validityTexts.length > 0) {
+          validityTexts = "".concat(validityTexts).concat(item.validityTexts.join('\n'), "\n");
+        }
+        if (item.excluded_date.length > 0) {
+          excludedText = "".concat(excludedText).concat(item.excluded_date.join('\n'), "\n");
+        }
+        if (item.included_date.length > 0) {
+          includedText = "".concat(includedText).concat(item.included_date.join('\n'), "\n");
+        }
+      });
+      expireText = /*#__PURE__*/React.createElement("span", {
+        className: "wallet-detail-expire-text"
+      }, validityTexts, excludedText && /*#__PURE__*/React.createElement("div", {
+        className: "wallet-detail-expire-text-title"
+      }, locales.getText('page.wallet.notValidDate')), excludedText, includedText && /*#__PURE__*/React.createElement("div", {
+        className: "wallet-detail-expire-text-title"
+      }, locales.getText('page.wallet.includedDate')), includedText);
+    }
     var data = [{
       label: locales.getText('page.wallet.cardName'),
       value: product_title
@@ -308,7 +340,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       isLink: false
     }, {
       label: locales.getText('page.wallet.validDate'),
-      value: expire_date ? expire_date : locales.getText('page.wallet.expireDate')
+      value: expireText
     }];
     //折扣卡显示折扣字段 其他显示余额字段
     if (tag === 'product_discount_card') {

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

@@ -373,3 +373,14 @@
   font-weight: 500;
   line-height: 24px;
 }
+
+.wallet-detail-expire-text {
+  white-space: pre-wrap;
+}
+
+.wallet-detail-expire-text-title {
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 20px;
+  color: #667085;
+}

package/es/components/wallet/Detail/locales.d.ts

@@ -21,6 +21,8 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
         'page.wallet.urlEmpty': string;
         'page.wallet.notIOS': string;
         'page.wallet.addSuccess': string;
@@ -69,6 +71,8 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
         'page.wallet.urlEmpty': string;
         'page.wallet.notIOS': string;
         'page.wallet.addSuccess': string;
@@ -117,6 +121,8 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
         'page.wallet.urlEmpty': string;
         'page.wallet.notIOS': string;
         'page.wallet.addSuccess': string;