@pisell/private-materials 3.4.55 → 3.4.56

package/es/components/wallet/index.js

@@ -72,7 +72,8 @@ var Wallet = Provider(function () {
     document.body.id = 'body';
     getList({
       num: 999,
-      skip: 1
+      skip: 1,
+      with: ['customScheduleSnapshot']
     });
   }, []);
   var transformData = function transformData(data) {
@@ -477,7 +478,8 @@ var Wallet = Provider(function () {
               // 重新获取列表
               getList({
                 num: 999,
-                skip: 1
+                skip: 1,
+                with: ['customScheduleSnapshot']
               }, code);
             }
 

package/es/components/wallet/serve.d.ts

@@ -15,6 +15,7 @@ export interface IWalletListParmsProps {
     used_status?: string;
     num?: number;
     skip?: number;
+    with?: string[];
 }
 /**
  * 钱包列表项属性接口
@@ -48,6 +49,12 @@ export interface IWalletListItemProps {
     machinecode_config?: {
         hide_recharge?: number;
     };
+    metadata: {
+        validity_type: string;
+    };
+    custom_schedule_snapshot: {
+        data: any[];
+    };
 }
 /**
  * 商店信息接口

package/es/components/wallet/utils.d.ts

@@ -0,0 +1,48 @@
+interface ScheduleTextResult {
+    validityTexts: string[];
+    excluded_date: string[];
+    included_date: string[];
+}
+declare type Locale = 'en' | 'zh-CN' | 'zh-HK';
+interface ScheduleItem {
+    id: number;
+    name: string | {
+        [key: string]: string;
+    };
+    type: 'standard' | 'time-slots' | 'designation';
+    start_time: string | null;
+    end_time: string | null;
+    repeat_type: 'none' | 'daily' | 'weekly';
+    repeat_rule: {
+        end: {
+            type: 'never' | 'date' | 'occurrence';
+            end_date: string | null;
+            occurrence: number | null;
+        };
+        frequency: number;
+        excluded_date: Array<{
+            start: string;
+            end: string;
+        }>;
+        included_date: any[];
+        frequency_date: number[];
+    } | null;
+    designation: Array<{
+        start_date: string;
+        start_time: string;
+        end_date: string;
+        end_time: string;
+    }> | null;
+    is_all: number;
+    time_slot: Array<{
+        start_time: string;
+        end_time: string;
+    }>;
+}
+/**
+ * 根据scheduleList格式化文案展示
+ * @param scheduleList 日程列表
+ * @returns 格式化后的文案结果数组，每个日程对应一个结果
+ */
+export declare function formatScheduleText(scheduleList: ScheduleItem[], locale?: Locale): ScheduleTextResult[];
+export {};

package/es/components/wallet/utils.js

@@ -0,0 +1,342 @@
+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 formatDateTime(dateTime) {
+  var isAll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var locale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'zh-CN';
+  var date = new Date(dateTime);
+  var year = date.getFullYear();
+  var month = String(date.getMonth() + 1).padStart(2, '0');
+  var day = String(date.getDate()).padStart(2, '0');
+  var hours = date.getHours();
+  var minutes = String(date.getMinutes()).padStart(2, '0');
+  if (isAll) {
+    // 全天情况下的日期格式
+    if (locale === 'en') {
+      return "".concat(day, "/").concat(month, "/").concat(year);
+    } else {
+      return "".concat(year, "-").concat(month, "-").concat(day);
+    }
+  }
+
+  // 非全天情况下的日期时间格式
+  if (locale === 'en') {
+    // DD/MM/YYYY h:mm A 格式
+    var period = hours >= 12 ? 'PM' : 'AM';
+    var displayHours = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours;
+    return "".concat(day, "/").concat(month, "/").concat(year, " ").concat(displayHours, ":").concat(minutes, " ").concat(period);
+  } else {
+    // YYYY-MM-DD HH:mm 格式
+    var _displayHours = String(hours).padStart(2, '0');
+    return "".concat(year, "-").concat(month, "-").concat(day, " ").concat(_displayHours, ":").concat(minutes);
+  }
+}
+
+// 多语言文案配置
+var textConfig = {
+  'zh-HK': {
+    weekdays: ['日', '一', '二', '三', '四', '五', '六'],
+    separator: '、',
+    timeSeparator: '–',
+    rangeSeparator: ' 至 ',
+    periodSeparator: '；',
+    timeSlotSeparator: '，',
+    every: '每',
+    day: '天',
+    week: '周',
+    month: '月',
+    year: '年',
+    available: '可用',
+    unlimited: '无限期',
+    weekPrefix: '周'
+  },
+  'zh-CN': {
+    weekdays: ['日', '一', '二', '三', '四', '五', '六'],
+    separator: '、',
+    timeSeparator: '–',
+    rangeSeparator: ' 至 ',
+    periodSeparator: '；',
+    timeSlotSeparator: '，',
+    every: '每',
+    day: '天',
+    week: '周',
+    month: '月',
+    year: '年',
+    available: '可用',
+    unlimited: '无限期',
+    weekPrefix: '周'
+  },
+  'en': {
+    weekdays: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+    separator: ', ',
+    timeSeparator: '–',
+    rangeSeparator: ' - ',
+    periodSeparator: '; ',
+    timeSlotSeparator: ', ',
+    every: 'every ',
+    day: 'day',
+    week: 'week',
+    month: 'month',
+    year: 'year',
+    available: 'available',
+    unlimited: 'unlimited',
+    weekPrefix: ''
+  }
+};
+
+// 获取星期几的表示
+function getWeekdayText(dayNumbers, locale) {
+  var config = textConfig[locale];
+  return dayNumbers.map(function (day) {
+    return config.weekdays[day];
+  }).join(config.separator);
+}
+
+// 获取重复频率文案
+function getRepeatFrequencyText(repeatType, frequency, locale) {
+  var config = textConfig[locale];
+  var typeMap = {
+    'daily': config.day,
+    'weekly': config.week,
+    'monthly': config.month,
+    'yearly': config.year
+  };
+  if (locale === 'en') {
+    if (frequency === 1) {
+      return "".concat(config.every).concat(typeMap[repeatType]);
+    }
+    return "".concat(config.every).concat(frequency, " ").concat(typeMap[repeatType], "s");
+  } else {
+    if (frequency === 1) {
+      return "".concat(config.every).concat(typeMap[repeatType]);
+    }
+    return "".concat(config.every).concat(frequency).concat(typeMap[repeatType]);
+  }
+}
+
+/**
+ * 根据scheduleList格式化文案展示
+ * @param scheduleList 日程列表
+ * @returns 格式化后的文案结果数组，每个日程对应一个结果
+ */
+export function formatScheduleText(scheduleList) {
+  var locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'en';
+  var results = [];
+  var config = textConfig[locale];
+  scheduleList.forEach(function (schedule) {
+    var _schedule$repeat_rule, _schedule$repeat_rule2;
+    var validityTexts = [];
+    var excluded_date = [];
+    var included_date = [];
+
+    // 处理排除日期
+    if ((_schedule$repeat_rule = schedule.repeat_rule) !== null && _schedule$repeat_rule !== void 0 && _schedule$repeat_rule.excluded_date) {
+      schedule.repeat_rule.excluded_date.forEach(function (excludeItem) {
+        var startDate = formatDateTime(excludeItem.start, true, locale);
+        var endDate = formatDateTime(excludeItem.end, true, locale);
+        if (excludeItem.start === excludeItem.end) {
+          // 开始和结束日期相同，只显示开始日期
+          excluded_date.push(startDate);
+        } else {
+          // 开始和结束日期不同，显示范围格式
+          excluded_date.push("".concat(startDate).concat(config.rangeSeparator).concat(endDate));
+        }
+      });
+    }
+
+    // 处理包含日期
+    if ((_schedule$repeat_rule2 = schedule.repeat_rule) !== null && _schedule$repeat_rule2 !== void 0 && _schedule$repeat_rule2.included_date) {
+      schedule.repeat_rule.included_date.forEach(function (includeItem) {
+        var startDate = formatDateTime(includeItem.start, true, locale);
+        var endDate = formatDateTime(includeItem.end, true, locale);
+        if (includeItem.start === includeItem.end) {
+          // 开始和结束日期相同，只显示开始日期
+          included_date.push(startDate);
+        } else {
+          // 开始和结束日期不同，显示范围格式
+          included_date.push("".concat(startDate).concat(config.rangeSeparator).concat(endDate));
+        }
+      });
+    }
+    var isAllDay = schedule.is_all === 1;
+    var validityText = '';
+
+    // 1. 非循环日程处理
+    if (schedule.repeat_type === 'none') {
+      // 1.1 单个标准日程（单日单段）
+      if (schedule.type === 'standard') {
+        var startDateTime = formatDateTime(schedule.start_time, isAllDay, locale);
+        var endDateTime = formatDateTime(schedule.end_time, isAllDay, locale);
+        validityText = "".concat(startDateTime).concat(config.rangeSeparator).concat(endDateTime);
+      }
+      // 1.2 多时间段日程（单日多段）
+      else if (schedule.type === 'time-slots' && schedule.time_slot.length > 0) {
+        var baseDate = formatDateTime(schedule.start_time, true, locale);
+        if (isAllDay) {
+          // 全天情况下，不显示时分
+          validityText = "".concat(baseDate);
+        } else {
+          // 非全天情况下，按新格式显示时间段
+          var timeSlots = schedule.time_slot.map(function (slot) {
+            return "".concat(slot.start_time).concat(config.timeSeparator).concat(slot.end_time);
+          });
+          validityText = "".concat(baseDate, " ").concat(timeSlots.join(config.timeSlotSeparator));
+        }
+      } else if (schedule.type === 'designation' && schedule.designation) {
+        var designationTexts = schedule.designation.map(function (item) {
+          if (isAllDay || item.start_time === '00:00' && item.end_time === '23:59') {
+            // 全天情况：只显示日期
+            var startDate = formatDateTime(item.start_date, true, locale);
+            var endDate = formatDateTime(item.end_date, true, locale);
+            return "".concat(startDate).concat(config.rangeSeparator).concat(endDate);
+          } else {
+            // 非全天情况：按新格式显示日期时间
+            var _startDate = formatDateTime(item.start_date, true, locale);
+            return "".concat(_startDate, " ").concat(item.start_time).concat(config.timeSeparator).concat(item.end_time);
+          }
+        });
+        validityTexts.push.apply(validityTexts, _toConsumableArray(designationTexts));
+      }
+    }
+
+    // 2. 循环日程处理
+    else if (schedule.repeat_rule) {
+      var _schedule$repeat_rule3 = schedule.repeat_rule,
+        frequency = _schedule$repeat_rule3.frequency,
+        frequency_date = _schedule$repeat_rule3.frequency_date;
+
+      // 根据 is_all 决定是否显示时分
+      var startText = isAllDay ? formatDateTime(schedule.start_time, true, locale) : formatDateTime(schedule.start_time, false, locale);
+
+      // 结束日期处理
+      var endDateText = '';
+      if (schedule.repeat_rule.end.type === 'never') {
+        endDateText = config.unlimited;
+      } else if (schedule.repeat_rule.end.end_date) {
+        endDateText = formatDateTime(schedule.repeat_rule.end.end_date, true, locale);
+      }
+
+      // 2.1 标准类型循环日程
+      if (schedule.type === 'standard') {
+        // 按天循环
+        if (schedule.repeat_type === 'daily') {
+          if (isAllDay) {
+            var frequencyText = getRepeatFrequencyText('daily', frequency, locale);
+            if (locale === 'en') {
+              validityText = "".concat(startText).concat(config.rangeSeparator).concat(endDateText, ", ").concat(config.available, " ").concat(frequencyText);
+            } else {
+              validityText = "".concat(startText).concat(config.rangeSeparator).concat(endDateText, "\uFF0C").concat(frequencyText).concat(config.available);
+            }
+          } else {
+            var startTime = formatDateTime(schedule.start_time, false, locale);
+            var endTime = formatDateTime(schedule.end_time, false, locale);
+            var timeRange = locale === 'en' ? "".concat(startTime.split(' ')[1], " ").concat(startTime.split(' ')[2]).concat(config.timeSeparator).concat(endTime.split(' ')[1], " ").concat(endTime.split(' ')[2]) : "".concat(startTime.split(' ')[1]).concat(config.timeSeparator).concat(endTime.split(' ')[1]);
+            var _frequencyText = getRepeatFrequencyText('daily', frequency, locale);
+            var dateRange = locale === 'en' ? "".concat(startTime.split(' ')[0]).concat(config.rangeSeparator).concat(endDateText) : "".concat(startText.split(' ')[0]).concat(config.rangeSeparator).concat(endDateText);
+            if (locale === 'en') {
+              validityText = "".concat(dateRange, ", ").concat(config.available, " ").concat(_frequencyText, " ").concat(timeRange);
+            } else {
+              validityText = "".concat(dateRange, "\uFF0C").concat(_frequencyText, " ").concat(timeRange, " ").concat(config.available);
+            }
+          }
+        }
+
+        // 按周循环
+        else if (schedule.repeat_type === 'weekly') {
+          var weekdaysText = getWeekdayText(frequency_date, locale);
+          if (isAllDay) {
+            if (locale === 'en') {
+              var _frequencyText2 = frequency === 1 ? 'every week' : "every ".concat(frequency, " weeks");
+              validityText = "".concat(startText).concat(config.rangeSeparator).concat(endDateText, ", ").concat(_frequencyText2, " on ").concat(weekdaysText, " ");
+            } else {
+              var _frequencyText3 = frequency === 1 ? '每周' : "\u6BCF".concat(frequency, "\u5468\u7684");
+              validityText = "".concat(startText).concat(config.rangeSeparator).concat(endDateText, "\uFF0C").concat(_frequencyText3).concat(config.weekPrefix).concat(weekdaysText).concat(config.available);
+            }
+          } else {
+            var _startTime = formatDateTime(schedule.start_time, false, locale);
+            var _endTime = formatDateTime(schedule.end_time, false, locale);
+            var _timeRange = locale === 'en' ? "".concat(_startTime.split(' ')[1], " ").concat(_startTime.split(' ')[2]).concat(config.timeSeparator).concat(_endTime.split(' ')[1], " ").concat(_endTime.split(' ')[2]) : "".concat(_startTime.split(' ')[1]).concat(config.timeSeparator).concat(_endTime.split(' ')[1]);
+            var _dateRange = locale === 'en' ? "".concat(_startTime.split(' ')[0]).concat(config.rangeSeparator).concat(endDateText) : "".concat(startText.split(' ')[0]).concat(config.rangeSeparator).concat(endDateText);
+            if (locale === 'en') {
+              var _frequencyText4 = frequency === 1 ? 'every week' : "every ".concat(frequency, " weeks");
+              validityText = "".concat(_dateRange, ", ").concat(_frequencyText4, " on ").concat(weekdaysText, " ").concat(_timeRange);
+            } else {
+              var _frequencyText5 = frequency === 1 ? '每周' : "\u6BCF".concat(frequency, "\u5468\u7684");
+              validityText = "".concat(_dateRange, "\uFF0C").concat(_frequencyText5).concat(config.weekPrefix).concat(weekdaysText, " ").concat(_timeRange);
+            }
+          }
+        }
+      }
+
+      // 2.2 多时间段类型循环日程
+      else if (schedule.type === 'time-slots' && schedule.time_slot.length > 0) {
+        var _baseDate = formatDateTime(schedule.start_time, true, locale);
+
+        // 格式化时间段
+        var _timeSlots = schedule.time_slot.map(function (slot) {
+          return "".concat(slot.start_time).concat(config.timeSeparator).concat(slot.end_time);
+        });
+        var timeSlotsText = _timeSlots.join(config.timeSlotSeparator);
+
+        // 按天循环
+        if (schedule.repeat_type === 'daily') {
+          var _frequencyText6 = getRepeatFrequencyText('daily', frequency, locale);
+          if (locale === 'en') {
+            validityText = "".concat(_baseDate).concat(config.rangeSeparator).concat(endDateText, ", ").concat(config.available, " ").concat(_frequencyText6, " ").concat(timeSlotsText);
+          } else {
+            validityText = "".concat(_baseDate).concat(config.rangeSeparator).concat(endDateText, "\uFF0C").concat(_frequencyText6, " ").concat(timeSlotsText, " ").concat(config.available);
+          }
+        }
+
+        // 按周循环
+        else if (schedule.repeat_type === 'weekly') {
+          var _weekdaysText = getWeekdayText(frequency_date, locale);
+          if (locale === 'en') {
+            var _frequencyText7 = frequency === 1 ? 'every week' : "every ".concat(frequency, " weeks");
+            validityText = "".concat(_baseDate).concat(config.rangeSeparator).concat(endDateText, ", ").concat(_frequencyText7, " on ").concat(_weekdaysText, " ").concat(timeSlotsText);
+          } else {
+            var _frequencyText8 = frequency === 1 ? '每周' : "\u6BCF".concat(frequency, "\u5468\u7684");
+            validityText = "".concat(_baseDate).concat(config.rangeSeparator).concat(endDateText, "\uFF0C").concat(_frequencyText8).concat(config.weekPrefix).concat(_weekdaysText, " ").concat(timeSlotsText, " ").concat(config.available);
+          }
+        }
+      }
+    }
+
+    // 4. 指定日期日程（多天多段）
+    else if (schedule.type === 'designation' && schedule.designation) {
+      var _designationTexts = schedule.designation.map(function (item) {
+        if (isAllDay || item.start_time === '00:00' && item.end_time === '23:59') {
+          // 全天情况：只显示日期
+          var startDate = formatDateTime(item.start_date, true, locale);
+          var endDate = formatDateTime(item.end_date, true, locale);
+          return "".concat(startDate).concat(config.rangeSeparator).concat(endDate);
+        } else {
+          // 非全天情况：按新格式显示日期时间
+          var _startDate2 = formatDateTime(item.start_date, true, locale);
+          return "".concat(_startDate2, " ").concat(item.start_time).concat(config.timeSeparator).concat(item.end_time);
+        }
+      });
+      // 多天多段情况，每个时间段作为独立元素添加到validityTexts中
+      validityTexts.push.apply(validityTexts, _toConsumableArray(_designationTexts));
+    }
+    if (validityText) {
+      validityTexts.push(validityText);
+    }
+
+    // 为每个日程创建一个结果
+    results.push({
+      validityTexts: validityTexts,
+      excluded_date: excluded_date,
+      included_date: included_date
+    });
+  });
+  return results;
+}

package/es/index.d.ts

@@ -57,4 +57,5 @@ export { default as ContactInfoModal } from './plus/contactInfoModal';
 export { Login2, Register2, AuthModal } from './pro/Login2.0';
 export { default as WalletEditor } from './plus/walletEditor';
 export { default as WalletPassGallery } from './plus/walletPassGallery';
+export { default as WalletPassDetail } from './plus/walletPassGallery/components/passDetail';
 export { default as SettingsRegistry } from './components/systemSettings/registry';

package/es/index.js

@@ -60,4 +60,5 @@ export { default as ContactInfoModal } from "./plus/contactInfoModal";
 export { Login2, Register2, AuthModal } from "./pro/Login2.0";
 export { default as WalletEditor } from "./plus/walletEditor";
 export { default as WalletPassGallery } from "./plus/walletPassGallery";
+export { default as WalletPassDetail } from "./plus/walletPassGallery/components/passDetail";
 export { default as SettingsRegistry } from "./components/systemSettings/registry";

package/es/plus/clientName/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { IClientNameProps } from './type';
 declare const ClientName: ({ className, dataSource, style }: IClientNameProps) => JSX.Element | null;

package/es/plus/walletPassGallery/components/passDetail/index.d.ts

@@ -3,6 +3,7 @@ interface PassDetailProps {
     dataSource?: any | null;
     platform?: 'pc' | 'h5';
     buttonGroupList?: any[][];
+    showTimeLine?: boolean;
 }
 declare const PassDetail: (props: PassDetailProps) => JSX.Element | null;
 export default PassDetail;

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

@@ -24,16 +24,20 @@ import Recharge from "../recharge";
 import FooterButtons from "../footerButton";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import "./index.less";
+import { formatScheduleText } from "../../../../components/wallet/utils";
+import localeTexts from "../../locales";
+import { request } from "../../../../utils";
 var Text = Typography.Text;
 var PassDetail = function PassDetail(props) {
-  var _context$appHelper, _store$getState, _dataSource$machineco, _getDetail$data, _getDetail$data2, _dataSource$machineco2;
-  if (!props.dataSource) return null;
+  var _context$appHelper, _context$appHelper2, _store$getState, _context$engine, _context$appHelper3, _dataSource$machineco, _getDetail$data, _getDetail$data2, _dataSource$machineco2;
   var _usePisellConfig = usePisellConfig(),
     _usePisellConfig$symb = _usePisellConfig.symbol,
     symbol = _usePisellConfig$symb === void 0 ? '$' : _usePisellConfig$symb;
   var dataSource = props.dataSource,
     _props$platform = props.platform,
-    platform = _props$platform === void 0 ? 'pc' : _props$platform;
+    platform = _props$platform === void 0 ? 'pc' : _props$platform,
+    _props$showTimeLine = props.showTimeLine,
+    showTimeLine = _props$showTimeLine === void 0 ? true : _props$showTimeLine;
   var _useState = useState('detail'),
     _useState2 = _slicedToArray(_useState, 2),
     activeKey = _useState2[0],
@@ -51,38 +55,54 @@ var PassDetail = function PassDetail(props) {
       store: {}
     },
     store = _ref.store;
-  var timezone = (store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.symbol) === null || _store$getState === void 0 ? void 0 : _store$getState.shop.timezone) || 'Asia/Shanghai';
-  var _ref2 = dataSource || {},
-    _ref2$id = _ref2.id,
-    id = _ref2$id === void 0 ? '' : _ref2$id,
-    _ref2$code = _ref2.code,
-    code = _ref2$code === void 0 ? '' : _ref2$code,
-    _ref2$tag = _ref2.tag,
-    tag = _ref2$tag === void 0 ? '' : _ref2$tag,
-    _ref2$product_title = _ref2.product_title,
-    product_title = _ref2$product_title === void 0 ? '' : _ref2$product_title,
-    _ref2$encoded = _ref2.encoded,
-    encoded = _ref2$encoded === void 0 ? '' : _ref2$encoded,
-    balance = _ref2.balance,
-    _ref2$expire_date = _ref2.expire_date,
-    expire_date = _ref2$expire_date === void 0 ? '' : _ref2$expire_date,
-    _ref2$product = _ref2.product,
-    product = _ref2$product === void 0 ? {} : _ref2$product;
-  var _ref3 = product || {},
-    _ref3$description = _ref3.description,
-    description = _ref3$description === void 0 ? '' : _ref3$description,
-    _ref3$extension_data = _ref3.extension_data,
-    extension_data = _ref3$extension_data === void 0 ? [] : _ref3$extension_data,
-    _ref3$customer_order_ = _ref3.customer_order_behavior_count,
-    customer_order_behavior_count = _ref3$customer_order_ === void 0 ? 0 : _ref3$customer_order_;
+  var _ref2 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.constants) || {
+      apiPrefix: "/h5"
+    },
+    apiPrefix = _ref2.apiPrefix;
+  var timezone = (store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.symbol) === null || _store$getState === void 0 || (_store$getState = _store$getState.shop) === null || _store$getState === void 0 ? void 0 : _store$getState.timezone) || 'Asia/Shanghai';
+  locales.init(localeTexts, (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) || 'en');
+  if ((_context$appHelper3 = context.appHelper) !== null && _context$appHelper3 !== void 0 && (_context$appHelper3 = _context$appHelper3.utils) !== null && _context$appHelper3 !== void 0 && _context$appHelper3.request) {
+    var _context$appHelper4;
+    request.setRequest((_context$appHelper4 = context.appHelper) === null || _context$appHelper4 === void 0 || (_context$appHelper4 = _context$appHelper4.utils) === null || _context$appHelper4 === void 0 ? void 0 : _context$appHelper4.request);
+  }
+  var _ref3 = dataSource || {},
+    _ref3$id = _ref3.id,
+    id = _ref3$id === void 0 ? '' : _ref3$id,
+    _ref3$code = _ref3.code,
+    code = _ref3$code === void 0 ? '' : _ref3$code,
+    _ref3$tag = _ref3.tag,
+    tag = _ref3$tag === void 0 ? '' : _ref3$tag,
+    _ref3$product_title = _ref3.product_title,
+    product_title = _ref3$product_title === void 0 ? '' : _ref3$product_title,
+    _ref3$encoded = _ref3.encoded,
+    encoded = _ref3$encoded === void 0 ? '' : _ref3$encoded,
+    balance = _ref3.balance,
+    _ref3$expire_date = _ref3.expire_date,
+    expire_date = _ref3$expire_date === void 0 ? '' : _ref3$expire_date,
+    _ref3$product = _ref3.product,
+    product = _ref3$product === void 0 ? {} : _ref3$product,
+    custom_schedule_snapshot = _ref3.custom_schedule_snapshot,
+    customer_id = _ref3.customer_id;
+  var _ref4 = product || {},
+    _ref4$description = _ref4.description,
+    description = _ref4$description === void 0 ? '' : _ref4$description,
+    _ref4$extension_data = _ref4.extension_data,
+    extension_data = _ref4$extension_data === void 0 ? [] : _ref4$extension_data,
+    _ref4$customer_order_ = _ref4.customer_order_behavior_count,
+    customer_order_behavior_count = _ref4$customer_order_ === void 0 ? 0 : _ref4$customer_order_;
   var _getDetail = useRequest(function () {
     return getDetailApi({
-      id: id
+      id: id,
+      apiPrefix: apiPrefix,
+      order_behavior_count_customer_id: customer_id
     });
   }, {
     ready: !!id,
-    refreshDeps: [id]
+    refreshDeps: [id, customer_id]
   });
+  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 () {
     if (tag === 'product_discount_card') {
       setActiveKey('detail');
@@ -117,6 +137,33 @@ var PassDetail = function PassDetail(props) {
     };
   }, []);
   var descs = useMemo(function () {
+    var _context$engine2;
+    var detail = formatScheduleText(scheduleList, context === null || context === void 0 || (_context$engine2 = context.engine) === null || _context$engine2 === void 0 || (_context$engine2 = _context$engine2.props) === null || _context$engine2 === void 0 ? void 0 : _context$engine2.locale);
+    var expireText = expire_date ? expire_date : locales.getText('wallet-pass-gallery.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('wallet-pass-gallery.cardName'),
       value: product_title
@@ -126,7 +173,7 @@ var PassDetail = function PassDetail(props) {
       isLink: false
     }, {
       label: locales.getText('wallet-pass-gallery.validDate'),
-      value: expire_date ? expire_date : locales.getText('wallet-pass-gallery.expireDate')
+      value: expireText
     }];
     //折扣卡显示折扣字段 其他显示余额字段
     if (tag === 'product_discount_card') {
@@ -195,12 +242,14 @@ var PassDetail = function PassDetail(props) {
   };
   var renderTimeLine = function renderTimeLine() {
     if (tag === 'product_discount_card') return null;
+    if (!showTimeLine) return null;
     return /*#__PURE__*/React.createElement(TimelineSection, {
       code: code,
       tag: tag,
       timezone: timezone
     });
   };
+  if (!props.dataSource) return null;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: classNames("pisell-wallet-pass-gallery_detail", "pisell-wallet-pass-gallery_detail-".concat(platform), _defineProperty({}, "pisell-wallet-pass-gallery_detail-with-footer", platform === 'h5' && tag === 'gift_card'))
   }, /*#__PURE__*/React.createElement("div", {

package/es/plus/walletPassGallery/index.js

@@ -82,7 +82,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
               num: 20,
               skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
               tags: TAGS,
-              filter_wallet_id: walletId || undefined
+              filter_wallet_id: walletId || undefined,
+              "with": ['customScheduleSnapshot']
             });
           case 3:
             res = _context.sent;
@@ -121,7 +122,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
               num: 20,
               skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
               tags: TAGS,
-              filter_wallet_id: walletId || undefined
+              filter_wallet_id: walletId || undefined,
+              "with": ['customScheduleSnapshot']
             });
           case 3:
             res = _context2.sent;