@pisell/private-materials 3.4.55 → 3.4.57

package/es/components/pay/toC/PaymentMethods/WalletPass/serve.d.ts

@@ -50,6 +50,12 @@ export declare type WalletPassDataType = {
     shop: Shop;
     wallet_pass_usage?: any;
     balance_par_value: string;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
+    metadata?: {
+        validity_type: string;
+    };
 };
 declare type Shop = {
     id: number;

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

@@ -11,7 +11,7 @@ var voucherTime = function voucherTime(data) {
 export var formatMachineCodeServer2CardList = function formatMachineCodeServer2CardList(data) {
   var selectId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   return (data || []).map(function (item) {
-    var _item$shop, _item$unified_message, _item$product;
+    var _item$shop, _item$unified_message, _item$product, _item$custom_schedule, _item$metadata;
     return {
       id: item.id,
       name: item.product_name,
@@ -30,7 +30,9 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
       cover: (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.cover,
       qrCode: item.code,
       validDate: voucherTime(item),
-      originData: item
+      originData: item,
+      scheduleList: ((_item$custom_schedule = item.custom_schedule_snapshot) === null || _item$custom_schedule === void 0 ? void 0 : _item$custom_schedule.data) || [],
+      validDateBySchedule: ((_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.validity_type) === 'custom_schedule_validity'
     };
   });
 };

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

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

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

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/systemSettings/registry/components/SectionList.js

@@ -3,6 +3,8 @@ import { Card, Empty, Spin } from 'antd';
 import { ShoppingCartOutlined, CreditCardOutlined, SafetyCertificateOutlined, SettingOutlined } from '@ant-design/icons';
 import { ShoppingCart01 } from '@pisell/icon';
 import { locales } from '@pisell/utils';
+import useEngineContext from "../../../../hooks/useEngineContext";
+
 // 获取多语言文本的工具函数
 var getLocalizedText = function getLocalizedText(text) {
   var locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'zh-CN';
@@ -38,6 +40,7 @@ var renderSectionIcon = function renderSectionIcon(iconName, code) {
   return sectionIcons.default;
 };
 var SectionList = function SectionList(_ref) {
+  var _context$engine;
   var sections = _ref.sections,
     selectedSectionId = _ref.selectedSectionId,
     onSectionSelect = _ref.onSectionSelect,
@@ -48,9 +51,10 @@ var SectionList = function SectionList(_ref) {
     onLoadMore = _ref.onLoadMore;
   var scrollContainerRef = useRef(null);
   var loadingRef = useRef(null);
+  var context = useEngineContext();
 
   // 获取当前语言
-  var currentLocale = localStorage.getItem('umi_locale') || 'zh-CN';
+  var currentLocale = (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || localStorage.getItem('umi_locale') || 'en';
 
   // 滚动加载更多的处理函数
   var handleScroll = useCallback(function () {

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";
@@ -378,12 +378,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;
               // 用于储存原价
@@ -475,7 +475,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/components/timeBar/index.js

@@ -13,7 +13,7 @@ import classNames from 'classnames';
 import { locales } from '@pisell/utils';
 import "./index.less";
 var TimeBar = function TimeBar(props) {
-  var _state$modalState7;
+  var _state$modalState6;
   var state = props.globalState,
     setGlobalState = props.setGlobalState,
     locale = props.locale;
@@ -32,11 +32,8 @@ var TimeBar = function TimeBar(props) {
     (_props$setIntervalTim2 = props.setIntervalTime) === null || _props$setIntervalTim2 === void 0 || _props$setIntervalTim2.call(props, false);
   });
   var _onClickToday = useMemoizedFn(function () {
-    var _state$modalState3, _props$onDateChange3, _props$setIntervalTim3;
-    var currentTime = (_state$modalState3 = state.modalState) === null || _state$modalState3 === void 0 || (_state$modalState3 = _state$modalState3.date) === null || _state$modalState3 === void 0 ? void 0 : _state$modalState3.value;
-    var newTime = currentTime['subtract'](1, 'day');
-    (_props$onDateChange3 = props.onDateChange) === null || _props$onDateChange3 === void 0 || _props$onDateChange3.call(props, newTime, newTime.format('YYYY-MM-DD HH:mm:ss'));
-    (_props$setIntervalTim3 = props.setIntervalTime) === null || _props$setIntervalTim3 === void 0 || _props$setIntervalTim3.call(props, false);
+    var _props$setIntervalTim3;
+    (_props$setIntervalTim3 = props.setIntervalTime) === null || _props$setIntervalTim3 === void 0 || _props$setIntervalTim3.call(props, true);
   });
   var _onClickNow = useMemoizedFn(function () {
     var _props$setIntervalTim4;
@@ -45,8 +42,8 @@ var TimeBar = function TimeBar(props) {
 
   // 时间选择变更事件
   var _onDateTimeChange = useMemoizedFn(function (timeString) {
-    var _state$modalState4, _props$onDateTimeChan, _props$setIntervalTim5;
-    var currentTime = (_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 _state$modalState3, _props$onDateTimeChan, _props$setIntervalTim5;
+    var currentTime = (_state$modalState3 = state.modalState) === null || _state$modalState3 === void 0 || (_state$modalState3 = _state$modalState3.date) === null || _state$modalState3 === void 0 ? void 0 : _state$modalState3.value;
     var _timeString$split$map = timeString.split(':').map(Number),
       _timeString$split$map2 = _slicedToArray(_timeString$split$map, 2),
       hours = _timeString$split$map2[0],
@@ -59,7 +56,7 @@ var TimeBar = function TimeBar(props) {
     (_props$setIntervalTim5 = props.setIntervalTime) === null || _props$setIntervalTim5 === void 0 || _props$setIntervalTim5.call(props, false);
   });
   return useMemo(function () {
-    var _state$modalState5, _state$modalState6;
+    var _state$modalState4, _state$modalState5;
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-ticket-booking-time-bar"
     }, /*#__PURE__*/React.createElement(Button, {
@@ -83,7 +80,7 @@ var TimeBar = function TimeBar(props) {
       }
     }, /*#__PURE__*/React.createElement(DatePicker, {
       inputReadOnly: true,
-      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,
+      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,
       format: locale === 'en' ? 'dddd, DD MMM YYYY' : 'YYYY年MM月DD日',
       onChange: props === null || props === void 0 ? void 0 : props.onDateChange,
       size: "large",
@@ -99,7 +96,7 @@ var TimeBar = function TimeBar(props) {
         'booking-page-date-picker-select': state.isTimeChange
       })
     }, /*#__PURE__*/React.createElement(SelectTime, {
-      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'),
+      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'),
       onChange: _onDateTimeChange,
       popoverProps: {
         style: {
@@ -117,6 +114,6 @@ var TimeBar = function TimeBar(props) {
         color: '#fff'
       } : undefined
     }, locales.getText('pisell2.ticket-booking.now')));
-  }, [(_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]);
+  }, [(_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]);
 };
 export default TimeBar;

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/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;

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

@@ -24,6 +24,10 @@ export default {
     'page.wallet.addGoogle': 'Add to Google Wallet',
     'page.wallet.viewDetails': 'See details',
     'page.wallet.expireDate': 'Long term',
+    'page.wallet.notValidDate': 'Not valid on',
+    // 不可用日期
+    'page.wallet.includedDate': 'Included dates',
+    // 包含日期
     'page.wallet.urlEmpty': 'Wallet link is empty',
     'page.wallet.notIOS': 'Apple Wallet is not supported on non-iOS devices',
     'page.wallet.addSuccess': 'Successfully added to wallet',
@@ -76,6 +80,10 @@ export default {
     'page.wallet.addGoogle': '添加到谷歌钱包',
     'page.wallet.viewDetails': '查看详情',
     'page.wallet.expireDate': '长期',
+    'page.wallet.notValidDate': '不可用日期',
+    // 不可用日期
+    'page.wallet.includedDate': '包含日期',
+    // 包含日期
     'page.wallet.urlEmpty': '钱包链接为空',
     'page.wallet.notIOS': '非iOS设备不支持Apple Wallet',
     'page.wallet.addSuccess': '已成功添加到钱包',
@@ -87,7 +95,7 @@ export default {
     // Usage Rules
     'page.wallet.usageRules': '使用规则',
     'page.wallet.usageRulesSubtitle': '请仔细阅读以下使用条件',
-    'page.wallet.timeUsageLimits': '时间使用限制',
+    'page.wallet.timeUsageLimits': '使用频次限制',
     'page.wallet.totalQuantityControl': '总量控制',
     'page.wallet.dailyLimit': '每日限制:',
     'page.wallet.weeklyLimit': '每周限制:',
@@ -128,6 +136,10 @@ export default {
     'page.wallet.addGoogle': '添加到谷歌錢包',
     'page.wallet.viewDetails': '查看詳情',
     'page.wallet.expireDate': '長期',
+    'page.wallet.notValidDate': '不可用日期',
+    // 不可用日期
+    'page.wallet.includedDate': '包含日期',
+    // 包含日期
     'page.wallet.urlEmpty': '錢包連結為空',
     'page.wallet.notIOS': '非iOS設備不支持Apple Wallet',
     'page.wallet.addSuccess': '已成功添加到錢包',
@@ -139,7 +151,7 @@ export default {
     // Usage Rules
     'page.wallet.usageRules': '使用規則',
     'page.wallet.usageRulesSubtitle': '請仔細閱讀以下使用條件',
-    'page.wallet.timeUsageLimits': '時間使用限制',
+    'page.wallet.timeUsageLimits': '使用頻次限制',
     'page.wallet.totalQuantityControl': '總量控制',
     'page.wallet.dailyLimit': '每日限制:',
     'page.wallet.weeklyLimit': '每週限制:',