@pisell/private-materials 6.7.9 → 6.8.1

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,13 +13,66 @@ 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,
     setNowTime = props.setNowTime;
+  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;
@@ -60,8 +113,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: {
@@ -88,7 +185,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",
@@ -104,7 +201,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: {
@@ -127,7 +224,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/hooks/pisellos/useProducts.js

@@ -18,7 +18,14 @@ import { useBookingTicket } from "./bookingTicket";
 import { useState, useEffect, useRef } from 'react';
 import useEngineContext, { usePlatform } from "../../../../hooks/useEngineContext";
 import dayjs from 'dayjs';
+// 等待函数
+var sleep = function sleep(ms) {
+  return new Promise(function (resolve) {
+    return setTimeout(resolve, ms);
+  });
+};
 export var useProducts = function useProducts(notAvailableRef) {
+  var _context$appHelper;
   var bookingTicket = useBookingTicket();
   var context = useEngineContext();
   var platform = usePlatform();
@@ -31,6 +38,10 @@ export var useProducts = function useProducts(notAvailableRef) {
     loading = _useState4[0],
     setLoading = _useState4[1];
   var isFirstLoadRef = useRef(true);
+  var isFirstLoadDataRef = useRef(true);
+  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    getApp = _ref.getApp;
+  var app = getApp();
 
   // 日程时间段列表 HH:mm格式
   var _useState5 = useState([]),
@@ -40,7 +51,7 @@ export var useProducts = function useProducts(notAvailableRef) {
   var scheduledTaskQueueIdRef = useRef('booking-schedule-products');
   var paramsRef = useRef(undefined);
   var getProducts = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
       var _products, _notAvailableRef$curr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -73,7 +84,7 @@ export var useProducts = function useProducts(notAvailableRef) {
       }, _callee, null, [[1, 11]]);
     }));
     return function (_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }());
 
@@ -83,21 +94,21 @@ export var useProducts = function useProducts(notAvailableRef) {
       return;
     }
     try {
-      var _context$appHelper, _context$appHelper$ge;
-      var app = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getApp) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper);
-      if (!app || !app.tasksManager) {
+      var _context$appHelper2, _context$appHelper2$g;
+      var _app = context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getApp) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2);
+      if (!_app || !_app.tasksManager) {
         console.warn('App 或 tasksManager 不可用');
         return;
       }
 
       // 注册 getProducts 任务函数
-      app.tasksManager.addTaskFunction('getProducts', /*#__PURE__*/function () {
-        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+      _app.tasksManager.addTaskFunction('getProducts', /*#__PURE__*/function () {
+        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
           var task;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                task = _ref2.task;
+                task = _ref3.task;
                 console.log('定时执行 getProducts，参数：', task.payload);
                 _context2.next = 4;
                 return getProducts(task.payload);
@@ -112,14 +123,14 @@ export var useProducts = function useProducts(notAvailableRef) {
           }, _callee2);
         }));
         return function (_x2) {
-          return _ref3.apply(this, arguments);
+          return _ref4.apply(this, arguments);
         };
       }());
 
       // 如果有 scheduleTimePoints，创建定时任务
       if (scheduleTimePoints && scheduleTimePoints.length > 0) {
         // 先清除之前的定时任务
-        app.tasksManager.clearTasks({
+        _app.tasksManager.clearTasks({
           module: 'scheduledTasks',
           queueId: scheduledTaskQueueIdRef.current
         });
@@ -147,14 +158,14 @@ export var useProducts = function useProducts(notAvailableRef) {
         });
 
         // 添加定时任务到 scheduledTasks 模块
-        app.tasksManager.addTask({
+        _app.tasksManager.addTask({
           module: 'scheduledTasks',
           queueId: scheduledTaskQueueIdRef.current,
           tasks: tasks
         });
 
         // 开始执行定时任务队列
-        app.tasksManager.run({
+        _app.tasksManager.run({
           module: 'scheduledTasks',
           queueId: scheduledTaskQueueIdRef.current
         });
@@ -167,10 +178,10 @@ export var useProducts = function useProducts(notAvailableRef) {
     // 清理函数：组件卸载时清除定时任务
     return function () {
       try {
-        var _context$appHelper2, _context$appHelper2$g;
-        var _app = context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getApp) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2);
-        if (_app && _app.tasksManager) {
-          _app.tasksManager.clearTasks({
+        var _context$appHelper3, _context$appHelper3$g;
+        var _app2 = context === null || context === void 0 || (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.utils) === null || _context$appHelper3 === void 0 || (_context$appHelper3$g = _context$appHelper3.getApp) === null || _context$appHelper3$g === void 0 ? void 0 : _context$appHelper3$g.call(_context$appHelper3);
+        if (_app2 && _app2.tasksManager) {
+          _app2.tasksManager.clearTasks({
             module: 'scheduledTasks',
             queueId: scheduledTaskQueueIdRef.current
           });
@@ -181,7 +192,7 @@ export var useProducts = function useProducts(notAvailableRef) {
     };
   }, [scheduleTimePoints]);
   var getScheduleTimePoints = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
       var scheduleTimePoints;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -204,7 +215,7 @@ export var useProducts = function useProducts(notAvailableRef) {
       }, _callee3);
     }));
     return function (_x3) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }());
   return {

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

@@ -61,6 +61,9 @@ 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;
+        'pisell2.product-select.search': string;
     };
     'zh-CN': {
         'pisell2.ticket-booking.info': string;
@@ -124,6 +127,9 @@ 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;
+        'pisell2.product-select.search': string;
     };
     'zh-HK': {
         'pisell2.ticket-booking.info': string;
@@ -187,6 +193,9 @@ 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;
+        'pisell2.product-select.search': string;
     };
 };
 export default _default;

package/es/components/ticketBooking/locales.js

@@ -73,7 +73,10 @@ 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',
+    'pisell2.product-select.search': 'Search'
   },
   'zh-CN': {
     'pisell2.ticket-booking.info': '信息',
@@ -149,7 +152,10 @@ 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': '展开',
+    'pisell2.product-select.search': '搜索'
   },
   'zh-HK': {
     'pisell2.ticket-booking.info': '資訊',
@@ -225,6 +231,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': '展開',
+    'pisell2.product-select.search': '搜索'
   }
 };

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

@@ -73,6 +73,9 @@ export declare const rulesHooks: {
         num: any;
         quantity: any;
         vouchersApplicable: any;
+        startDate: any;
+        bundle: any;
+        options: any;
     };
     setProduct(product: Record<string, any>, values: {
         total: number;

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

@@ -2,10 +2,14 @@ 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 _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); }
-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; }
+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; }
@@ -162,21 +166,30 @@ 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';
       });
       var isEdit = item === null || item === void 0 ? void 0 : item.edit;
-      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit) {
-        var _item$_extend, _addItem$_extend2, _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 && !isEdit && !isGoodPassBundleProduct) {
+        var _item$_extend2, _addItem$_extend2, _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$_extend2 = addItem._extend) === null || _addItem$_extend2 === void 0 ? void 0 : _addItem$_extend2.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$_extend2 = addItem._extend) === null || _addItem$_extend2 === void 0 ? void 0 : _addItem$_extend2.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
             })
           })
@@ -253,11 +266,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) {
@@ -362,17 +375,21 @@ export var getShopDiscountKey = function getShopDiscountKey(osKey) {
 export var rulesHooks = {
   // 获取商品关键信息
   getProduct: function getProduct(product) {
+    var _product$_extend, _product$_extend2, _product$_extend3;
     var detail = {
       booking_id: product.booking_id,
       id: product.id,
       _id: product._id,
-      price: product.price,
+      price: product._extend.price,
       total: product._extend.total,
       discount_list: product.discount_list,
       origin_total: product._extend.origin_total,
       num: product._extend.quantity,
       quantity: product._extend.quantity || 1,
-      vouchersApplicable: product.vouchersApplicable
+      vouchersApplicable: product.vouchersApplicable,
+      startDate: (_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.startDate,
+      bundle: ((_product$_extend2 = product._extend) === null || _product$_extend2 === void 0 || (_product$_extend2 = _product$_extend2.other) === null || _product$_extend2 === void 0 ? void 0 : _product$_extend2.bundle) || [],
+      options: ((_product$_extend3 = product._extend) === null || _product$_extend3 === void 0 || (_product$_extend3 = _product$_extend3.other) === null || _product$_extend3 === void 0 ? void 0 : _product$_extend3.option) || []
     };
     return detail;
   },
@@ -380,8 +397,14 @@ export var rulesHooks = {
     var detail = _objectSpread(_objectSpread({}, product), {}, {
       _id: values._id || product._id,
       discount_list: values.discount_list,
-      _extend: _objectSpread(_objectSpread(_objectSpread({}, product._extend), 'total' in values ? {
+      _extend: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, product._extend), {}, {
+        other: _objectSpread(_objectSpread({}, product._extend.other), 'bundle' in values ? {
+          bundle: values.bundle
+        } : {})
+      }, 'total' in values ? {
         total: values.total
+      } : {}), 'main_product_selling_price' in values ? {
+        main_product_selling_price: values.main_product_selling_price
       } : {}), 'quantity' in values ? {
         quantity: values.quantity
       } : {})

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;
+}