@pisell/private-materials 6.0.25 → 6.1.2

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

@@ -0,0 +1,2 @@
+declare const formatProductMessage: (product: any, utils: any) => string;
+export default formatProductMessage;

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

@@ -0,0 +1,62 @@
+import { formatAmount } from '@pisell/utils';
+import { getServiceTime } from "./formatTime";
+var formatProductMessage = function formatProductMessage(product, utils) {
+  var product_option_string = product.product_option_string,
+    options = product.options,
+    bundle = product.bundle,
+    currency_symbol = product.currency_symbol,
+    start_date = product.start_date,
+    end_date = product.end_date,
+    holder_id = product.holder_id,
+    holders = product.holders,
+    multiResources = product.multiResources;
+  var str = '';
+  if (start_date && end_date) {
+    str += "".concat(getServiceTime(product, start_date, utils), " \n");
+  }
+  if (holder_id && Array.isArray(holders)) {
+    var targetHolder = holders.find(function (holder) {
+      return holder.id === holder_id;
+    });
+    if (targetHolder !== null && targetHolder !== void 0 && targetHolder.label) {
+      str += "".concat(targetHolder.label, " \n");
+    }
+  }
+  if (Array.isArray(multiResources) && multiResources.length > 0) {
+    multiResources.forEach(function (resource) {
+      var ids = resource.id,
+        lists = resource.lists;
+      if (Array.isArray(ids)) {
+        ids.forEach(function (id) {
+          var targetRes = lists.find(function (l) {
+            return l.id === id;
+          });
+          if (targetRes !== null && targetRes !== void 0 && targetRes.label) str += "".concat(targetRes === null || targetRes === void 0 ? void 0 : targetRes.label, " \n");
+        });
+      } else {
+        var targetRes = lists.find(function (l) {
+          return l.id === ids;
+        });
+        if (targetRes !== null && targetRes !== void 0 && targetRes.label) str += "".concat(targetRes === null || targetRes === void 0 ? void 0 : targetRes.label, " \n");
+      }
+    });
+  }
+
+  // 组合规格 单规格
+  if (product_option_string) str += "".concat(product_option_string, "\n");
+  if (Array.isArray(options) && options.length) {
+    options.forEach(function (opt) {
+      str += "".concat(opt.name, "  ").concat(formatAmount(opt === null || opt === void 0 ? void 0 : opt.price, 2, currency_symbol), " x ").concat(opt.num, "\n");
+    });
+  }
+
+  // 套餐
+  if (Array.isArray(bundle) && bundle.length) {
+    bundle.forEach(function (item) {
+      str += "".concat(item.title, " \n");
+      str += "".concat(formatAmount(item.price, 2, currency_symbol), " x ").concat(item.num);
+    });
+  }
+  return str;
+};
+export default formatProductMessage;

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

@@ -0,0 +1,31 @@
+import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/en';
+import 'dayjs/locale/zh-tw';
+/**
+ * @title: 是否英文
+ * @description:
+ * @param {any} item
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-28 22:49
+ */
+export declare const isEn: (item: any) => boolean;
+/**
+ * @title: 跨日预约时间
+ * @description:
+ * @param {any} item
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-28 22:50
+ */
+export declare const formatMultiDayDate: (item: any) => string;
+/**
+ * @title: 格式化服务的 开始时间-结束时间-时长, 用于展示
+ * @description:
+ * @param {any} item
+ * @param {any} currentDate
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 14:04
+ */
+export declare const getServiceTime: (item: any, currentDate: any, utils: any) => string;

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

@@ -0,0 +1,144 @@
+import dayjs from 'dayjs';
+import { locales } from '@pisell/utils';
+import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/en';
+import 'dayjs/locale/zh-tw';
+
+/**
+ * @title: 是否英文
+ * @description: 
+ * @param {any} item
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-28 22:49
+ */
+export var isEn = function isEn(item) {
+  var locale = (item === null || item === void 0 ? void 0 : item.locale) || 'en-US';
+  var _isEn = locale === 'en-US' || locale === 'en';
+  var localeTypes = {
+    'en-US': 'en',
+    'zh-CN': 'zh-cn',
+    'zh-HK': 'zh-tw'
+  };
+  dayjs.locale(localeTypes[locale]);
+  return _isEn;
+};
+
+/**
+ * @title: 跨日预约时间
+ * @description: 
+ * @param {any} item
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-28 22:50
+ */
+export var formatMultiDayDate = function formatMultiDayDate(item) {
+  var _isEn = isEn(item);
+
+  // 跨日
+  var startDate = dayjs(item === null || item === void 0 ? void 0 : item.start_date);
+  var endDate = dayjs(item === null || item === void 0 ? void 0 : item.end_date);
+  var _format = _isEn ? 'ddd, DD/MM/YYYY' : 'YYYY-MM-DD，ddd';
+  var date = "".concat(startDate.format(_format), " ~ ").concat(endDate.format(_format));
+  return date;
+};
+
+/**
+ * @title: 格式化服务的 开始时间-结束时间-时长, 用于展示
+ * @description:
+ * @param {any} item
+ * @param {any} currentDate
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-04-26 14:04
+ */
+export var getServiceTime = function getServiceTime(item, currentDate, utils) {
+  var _utils$storage, _item$format;
+  if (!dayjs(currentDate).isValid()) return '';
+  var locale = (item === null || item === void 0 ? void 0 : item.locale) || (utils === null || utils === void 0 || (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('umi_locale')) || 'en-US';
+  var isEn = locale === 'en-US' || locale === 'en';
+  var localeTypes = {
+    'en-US': 'en',
+    'zh-CN': 'zh-cn',
+    'zh-HK': 'zh-tw'
+  };
+  dayjs.locale(localeTypes[locale]);
+  var startDate = dayjs(item === null || item === void 0 ? void 0 : item.start_date);
+  var endDate = dayjs(item === null || item === void 0 ? void 0 : item.end_date);
+  var diffInDays = (item === null || item === void 0 ? void 0 : item.custom_day_count) || endDate.diff(startDate, 'day');
+
+  // 1.2时间格式， 同天显示 年月日 开始 - 结束， 不同天 年月日 开始 - 年月日 结束
+  if (item !== null && item !== void 0 && item.duration_type) {
+    var sameDay = startDate.isSame(endDate, 'day');
+    var dateFormat = isEn ? 'DD/MM/YYYY' : 'YYYY-MM-DD';
+    var timeFormat = 'HH:mm';
+    var startTime = (item === null || item === void 0 ? void 0 : item.start_time) || startDate.format(timeFormat);
+    var endTime = (item === null || item === void 0 ? void 0 : item.end_time) || endDate.format(timeFormat);
+    var dateTime = '';
+    if (sameDay) {
+      if (isEn) {
+        // 英文：开始时间 - 结束时间 年月日
+        dateTime = "".concat(startTime, " ~ ").concat(endTime, " ").concat(startDate.format(dateFormat));
+      } else {
+        // 中文：年月日 开始时间 - 结束时间
+        dateTime = "".concat(startDate.format(dateFormat), " ").concat(startTime, " ~ ").concat(endTime);
+      }
+    } else {
+      // 不同天
+      if (isEn) {
+        // 英文：开始时间 年月日  -  结束时间 年月日
+        dateTime = "".concat(startTime, " ").concat(startDate.format(dateFormat), " ~ ").concat(endTime, " ").concat(endDate.format(dateFormat));
+      } else {
+        // 中文：年月日 开始时间 - 年月日 结束时间
+        dateTime = "".concat(startDate.format(dateFormat), " ").concat(startTime, " ~ ").concat(endDate.format(dateFormat), " ").concat(endTime);
+      }
+    }
+    var startDateTime = "".concat(startDate.format('YYYY-MM-DD'), " ").concat(startTime);
+    var endDateTime = "".concat(endDate.format('YYYY-MM-DD'), " ").concat(endTime);
+    var _duration = dayjs(endDateTime).diff(dayjs(startDateTime), item === null || item === void 0 ? void 0 : item.duration_type);
+    var durationText = '';
+    if ((item === null || item === void 0 ? void 0 : item.duration_type) === 'minutes') {
+      // 转为小时+分钟
+      var hours = Math.floor(_duration / 60);
+      var minutes = _duration % 60;
+      durationText = locales.getText('pisell2.product.card.hour.minute')(hours, minutes);
+    } else if ((item === null || item === void 0 ? void 0 : item.duration_type) === 'days') {
+      durationText = locales.getText('pisell2.product.card.day')(_duration);
+    } else {
+      durationText = "".concat(_duration);
+    }
+    return "".concat(dateTime, " (").concat(durationText, ")");
+  }
+  var _format = isEn ? 'ddd, DD/MM/YYYY' : 'YYYY-MM-DD，ddd';
+
+  // 是否自定义格式
+  if (item !== null && item !== void 0 && item.hasOwnProperty('format') && (item === null || item === void 0 || (_item$format = item.format) === null || _item$format === void 0 ? void 0 : _item$format.length) > 0) {
+    var _item$format2, _item$format3;
+    _format = isEn ? item === null || item === void 0 || (_item$format2 = item.format) === null || _item$format2 === void 0 ? void 0 : _item$format2[0] : item === null || item === void 0 || (_item$format3 = item.format) === null || _item$format3 === void 0 ? void 0 : _item$format3[1];
+  }
+
+  // 是否显示时间
+  if (item !== null && item !== void 0 && item.show_time) {
+    startDate = dayjs(item !== null && item !== void 0 && item.start_time ? "".concat(item === null || item === void 0 ? void 0 : item.start_date, " ").concat(item === null || item === void 0 ? void 0 : item.start_time) : startDate.format('YYYY-MM-DD HH:mm'));
+    endDate = dayjs(item !== null && item !== void 0 && item.end_time ? "".concat(item === null || item === void 0 ? void 0 : item.end_date, " ").concat(item === null || item === void 0 ? void 0 : item.end_time) : endDate.format('YYYY-MM-DD HH:mm'));
+  }
+
+  // 显示时长分钟
+  if ((item === null || item === void 0 ? void 0 : item.duration_type) === 'minutes') {
+    diffInDays = endDate.diff(startDate, 'minute');
+  }
+  var date = "".concat(startDate.format(_format), " ~ ").concat(endDate.format(_format));
+
+  // 自定义文案
+  var text = locales.getText('pisell2.product.card.day')(diffInDays);
+  if (item !== null && item !== void 0 && item.custom_day_count) {
+    text = locales.getText('pisell2.product.card.day.event')(diffInDays);
+  }
+  var textTypes = {
+    'minutes': locales.getText('pisell2.product.card.minute')(diffInDays),
+    'event': locales.getText('pisell2.product.card.day.event')(diffInDays)
+  };
+  text = (textTypes === null || textTypes === void 0 ? void 0 : textTypes[item === null || item === void 0 ? void 0 : item.duration_type]) || text;
+  var duration = "".concat(diffInDays).concat(text);
+  return "".concat(date, " (").concat(duration, ")");
+};

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

@@ -0,0 +1,23 @@
+import type { Dayjs } from 'dayjs';
+/** dayjs对象格式化为字符串时间 */
+export declare const formatDateToStr: (date: Dayjs[]) => string | string[];
+export declare const getDefaultStartParam: () => string | string[];
+export declare const formatBookingList: (bookingList: any[]) => any[];
+export declare const getNextTimeSlice: (sliceMinutes: number) => Dayjs;
+export declare const getDisabledEdit: ({ shop_discount, bookings, payment_status }: any) => boolean;
+export declare const restoreProductOtherData: (data: any) => {
+    product_id: any;
+    option: never[];
+    bundle: any;
+    product_variant_id: number;
+    quantity: number;
+} | undefined;
+export declare const addService: (list: any[], addItem: any, state: any) => {
+    list: any[];
+    quantity: any;
+};
+export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
+export declare const getCartProductOverlay: (state: any) => any;
+export declare const getIsOverlayProduct: (item: any, state: any) => any;
+export declare const getIsShowNumber: (item: any, state: any) => any;
+export declare const genServiceKey: (item: any) => string;

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

@@ -0,0 +1,220 @@
+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 _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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import dayjs from 'dayjs';
+import { isNormalProductByDurationSchedule } from "../../booking/info/service2/utils";
+
+/** dayjs对象格式化为字符串时间 */
+export var formatDateToStr = function formatDateToStr(date) {
+  var format = function format(val) {
+    return dayjs(val).format('YYYY-MM-DD HH:mm:ss');
+  };
+  if (Array.isArray(date)) {
+    return date.map(format);
+  }
+  return format(date);
+};
+export var getDefaultStartParam = function getDefaultStartParam() {
+  /** 获取默认查询时间范围 */
+  return formatDateToStr([dayjs().startOf('day'), dayjs().endOf('day')]);
+};
+export var formatBookingList = function formatBookingList(bookingList) {
+  return bookingList.map(function (item) {
+    var _item$order, _item$order2, _item$order3;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      startDateTime: "".concat(item.start_date, " ").concat(item.start_time),
+      endDateTime: "".concat(item.end_date, " ").concat(item.end_time),
+      total_amount: item === null || item === void 0 || (_item$order = item.order) === null || _item$order === void 0 ? void 0 : _item$order.total_amount,
+      customer: (item === null || item === void 0 || (_item$order2 = item.order) === null || _item$order2 === void 0 || (_item$order2 = _item$order2.customer) === null || _item$order2 === void 0 || (_item$order2 = _item$order2.display_name) === null || _item$order2 === void 0 ? void 0 : _item$order2.trim()) || ((item === null || item === void 0 || (_item$order3 = item.order) === null || _item$order3 === void 0 || (_item$order3 = _item$order3.customer) === null || _item$order3 === void 0 ? void 0 : _item$order3.nickname) || '').trim()
+      // durationStr: this.formatDurationStr(item),
+      // durationNum: this.calcDuration(item),
+    });
+  });
+};
+export var getNextTimeSlice = function getNextTimeSlice(sliceMinutes) {
+  var currentTime = dayjs();
+
+  // 计算下一个时间切片
+  var nextSlice = Math.ceil(currentTime.minute() / sliceMinutes) * sliceMinutes;
+
+  // 设置下一个时间切片的分钟数
+  var nextTime = currentTime.minute(nextSlice);
+  return nextTime;
+};
+export var getDisabledEdit = function getDisabledEdit(_ref) {
+  var shop_discount = _ref.shop_discount,
+    bookings = _ref.bookings,
+    payment_status = _ref.payment_status;
+  // 如果预约列表里没有商品新信息, 则任何信息都不能编辑
+  if (bookings.list.some(function (d) {
+    return !d.detail;
+  })) {
+    return true;
+  }
+
+  //有整单折扣 不可编辑
+  if (shop_discount && Number(shop_discount)) {
+    return true;
+  }
+  var list = ['unfulfilled', 'paid', 'partially_paid', 'unpaid', 'payment_processing'];
+  // (支付状态 = 已支付 || 部分付款 || 未付款 || 支付处理中) && 预约状态 !== 已取消
+  if (bookings.appointment_status === 'cancelled' || !list.includes(payment_status)) {
+    return true;
+  }
+  return false;
+};
+
+// 还原商品other数据
+export var restoreProductOtherData = function restoreProductOtherData(data) {
+  var detail = data.detail,
+    resetD = _objectWithoutProperties(data, _excluded);
+  if (!detail) {
+    return;
+  }
+  return {
+    product_id: detail.product_id,
+    option: [],
+    bundle: (detail.product_bundle || []).map(function (bundleItem) {
+      return _objectSpread(_objectSpread({}, bundleItem), {}, {
+        title: bundleItem.bundle_title,
+        group_id: bundleItem.bundle_group_id,
+        id: bundleItem.bundle_id,
+        product_id: bundleItem.bundle_product_id,
+        bundle_variant_id: bundleItem.bundle_variant_id,
+        quantity: bundleItem.num,
+        option: bundleItem.option.map(function (optionItem) {
+          return _objectSpread(_objectSpread({}, optionItem), {}, {
+            name: optionItem.name['auto'],
+            quantity: bundleItem.num,
+            product_option_item_id: optionItem.option_group_item_id
+          });
+        }),
+        price: (bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.bundle_sum_type) === 'markdown' ? "-".concat(Number(bundleItem.bundle_sum_price)) : Number(bundleItem.bundle_sum_price)
+      });
+    }),
+    product_variant_id: 0,
+    quantity: Number(detail.product_quantity)
+  };
+};
+
+// 是相同的商品
+var isSameProduct = function isSameProduct(a, b) {
+  var _a$_extend2, _b$_extend2;
+  if (isNormalProductByDurationSchedule(a) && isNormalProductByDurationSchedule(b)) {
+    var _a$_extend, _b$_extend;
+    return ((_a$_extend = a._extend) === null || _a$_extend === void 0 || (_a$_extend = _a$_extend.other) === null || _a$_extend === void 0 ? void 0 : _a$_extend.rowKey) === ((_b$_extend = b._extend) === null || _b$_extend === void 0 || (_b$_extend = _b$_extend.other) === null || _b$_extend === void 0 ? void 0 : _b$_extend.rowKey);
+  }
+  return ((_a$_extend2 = a._extend) === null || _a$_extend2 === void 0 || (_a$_extend2 = _a$_extend2.other) === null || _a$_extend2 === void 0 ? void 0 : _a$_extend2.rowKey) === ((_b$_extend2 = b._extend) === null || _b$_extend2 === void 0 || (_b$_extend2 = _b$_extend2.other) === null || _b$_extend2 === void 0 ? void 0 : _b$_extend2.rowKey) && a._serviceKey === b._serviceKey;
+};
+export var addService = function addService(list, addItem, state) {
+  var value = list;
+  var count;
+  // 预约商品 并且配置商品卡片不叠加 直接添加
+  if (!isNormalProductByDurationSchedule(addItem) && !getIsOverlayProduct(addItem, state)) {
+    value.push(addItem);
+    count = addItem._extend.quantity;
+  } else {
+    // 非预约商品判断是否相同，相同合并
+    var isNotSame = true;
+    // 是否设置过 只追加到第一个中
+    var isSetCount = false;
+    value = list.map(function (item) {
+      // 是否商品券折扣的商品
+      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;
+        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);
+        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) || {}), {}, {
+              quantity: quantity
+            })
+          })
+        });
+      }
+      return item;
+    });
+    if (isNotSame) {
+      value.push(addItem);
+      count = addItem._extend.quantity;
+    }
+  }
+  return {
+    list: value,
+    quantity: count
+  };
+};
+export var addServiceScroll = function addServiceScroll(rowKey, cacheItem) {
+  var list = document.querySelectorAll("#rowKey-".concat(rowKey));
+  setTimeout(function () {
+    if (list.length && isNormalProductByDurationSchedule(cacheItem)) {
+      list[list.length - 1].scrollIntoView({
+        behavior: 'smooth',
+        block: 'center'
+      });
+    } else {
+      setTimeout(function () {
+        var bookingWrap = document.querySelectorAll(".booking-info-warp");
+        if (bookingWrap.length) {
+          bookingWrap[0].scrollTo({
+            top: 99999,
+            behavior: 'smooth'
+          });
+        }
+      }, 100);
+    }
+  });
+};
+
+// 获取购物车商品覆盖规则
+export var getCartProductOverlay = function getCartProductOverlay(state) {
+  var _state$bookingConfig;
+  return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.cart_product_overlay) || {
+    type: "product_all"
+  };
+};
+
+// 获取购物车商品是否覆盖
+export var getIsOverlayProduct = function getIsOverlayProduct(item, state) {
+  var _getCartProductOverla = getCartProductOverlay(state),
+    type = _getCartProductOverla.type,
+    product_ids = _getCartProductOverla.product_ids;
+  if (type === 'product_all') {
+    return true;
+  }
+  return product_ids.includes(item.product_id || item.id);
+};
+
+// 获取购物车商品是否显示数量
+export var getIsShowNumber = function getIsShowNumber(item, state) {
+  var isBookingTicket2 = state.isBookingTicket2;
+  return isNormalProductByDurationSchedule(item) || isBookingTicket2 && getIsOverlayProduct(item, state);
+};
+
+// 生成服务key
+export var genServiceKey = function genServiceKey(item) {
+  var _item$_extend3, _item$_extend4, _item$_extend5;
+  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 resourceKey = '';
+  Object.values(item._extend.resource).forEach(function (resources) {
+    resources.forEach(function (resource) {
+      resourceKey += "".concat(resource.relation_id);
+    });
+  });
+  return "".concat(product_id, "-").concat(durationKey, "-").concat(resourceKey, "-").concat(start_time, "-").concat(total);
+};

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

@@ -55,8 +55,9 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
     expire_date = _detail$expire_date === void 0 ? '' : _detail$expire_date,
     _detail$product = detail.product,
     product = _detail$product === void 0 ? {} : _detail$product;
-  var _product$description = product.description,
-    description = _product$description === void 0 ? '' : _product$description;
+  var _ref = product || {},
+    _ref$description = _ref.description,
+    description = _ref$description === void 0 ? '' : _ref$description;
   var context = useEngineContext();
   var utils = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {};
   var dvaStore = utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 ? void 0 : _utils$getStore.getState();
@@ -174,6 +175,11 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
         label: locales.getText('page.wallet.points'),
         value: balance ? "".concat(Number(balance)) : ''
       });
+    } else if (tag === 'good_pass') {
+      data.splice(2, 0, {
+        label: locales.getText('page.wallet.goodPass'),
+        value: balance ? "".concat(Number(balance)) : ''
+      });
     } else {
       data.splice(2, 0, {
         label: locales.getText('page.wallet.balance'),
@@ -190,10 +196,10 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
   locales.init(localeTexts, (dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en');
   // 注册请求
   request.setRequest(utils === null || utils === void 0 ? void 0 : utils.request);
-  var _ref = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {
+  var _ref2 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {
       store: {}
     },
-    store = _ref.store;
+    store = _ref2.store;
   var platform = isMobile() ? 'h5' : 'pc';
   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 formatTimeLineDta = function formatTimeLineDta(data) {
@@ -221,10 +227,10 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
     var absAmount = amount.startsWith('-') ? amount.substring(1) : amount;
 
     // 根据isNegative参数决定是否添加负号
-    return isNegative ? "-".concat(tag !== 'point_card' ? symbol : '').concat(absAmount) : "".concat(tag !== 'point_card' ? symbol : '').concat(amount);
+    return isNegative ? "-".concat(!['point_card', 'good_pass'].includes(tag) ? symbol : '').concat(absAmount) : "".concat(!['point_card', 'good_pass'].includes(tag) ? symbol : '').concat(amount);
   };
   var getDetail = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$getDetailApi, _yield$getDetailApi$a, apple_wallet_url, _yield$getDetailApi$g, google_wallet_url;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -248,7 +254,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       }, _callee);
     }));
     return function getDetail() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   useEffect(function () {
@@ -288,7 +294,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
     }, amount && currency_symbol ? formatCurrencyAmount(amount, action === 'order_expend') : ''));
   };
   var getTimeTreeList = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _yield$getAssetList, _yield$getAssetList$l, list, filterList, i, _filterList$i, _filterList$i2, _filterList$i3, _filterList$i4;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -340,7 +346,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       }, _callee2, null, [[1, 12, 15, 18]]);
     }));
     return function getTimeTreeList() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   useEffect(function () {
@@ -355,7 +361,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
    * @returns Promise<boolean> 是否添加成功
    */
   var addWalletPass = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(url, type) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(url, type) {
       var response, passData, blob, downloadUrl, a;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -433,11 +439,11 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       }, _callee3, null, [[8, 30, 34, 37]]);
     }));
     return function addWalletPass(_x, _x2) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   var onAppleClick = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -450,11 +456,11 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       }, _callee4);
     }));
     return function onAppleClick() {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var onGoogleClick = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -467,7 +473,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       }, _callee5);
     }));
     return function onGoogleClick() {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var isWechat = function isWechat() {

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

@@ -1,6 +1,5 @@
 .wallet-discountCard-title {
   color: var(--Gray-900, #101828);
-  font-family: Inter;
   font-size: 20px;
   font-style: normal;
   font-weight: 600;

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

@@ -1,6 +1,5 @@
 .wallet-pointCard-title {
   color: var(--Gray-900, #101828);
-  font-family: Inter;
   font-size: 20px;
   font-style: normal;
   font-weight: 600;