@pisell/private-materials 3.3.74 → 3.3.76

package/es/components/ticketBooking/locales.js

@@ -1,206 +1,158 @@
 export default {
-  en: {
-    'pisell2.ticket-booking.info': 'Info',
-    'pisell2.ticket-booking.notes': 'Notes',
-    'pisell2.ticket-booking.forms': 'Forms',
-    'pisell2.ticket-booking.sales': 'Sales',
-    'pisell2.ticket-booking.payment': 'Payment',
-    'pisell2.ticket-booking.unsaved-changes': 'Unsaved changes',
-    'pisell2.ticket-booking.exit-confirm': 'Your changes will not be saved if you exit. Are you sure you want to exit?',
-    'pisell2.ticket-booking.go-back': 'Go back',
-    'pisell2.ticket-booking.exit': 'Yes, exit',
-    'pisell2.ticket-booking.deposit': 'Deposit',
-    'pisell2.ticket-booking.copy-success': 'Copy successful',
-    'pisell2.ticket-booking.no-data': 'No data',
-    'pisell2.ticket-booking.authorized': 'Authorized',
-    'pisell2.ticket-booking.paid': 'Paid',
-    'pisell2.ticket-booking.partially-paid': 'Partially Paid',
-    'pisell2.ticket-booking.partially-refunded': 'Partially Refunded',
-    'pisell2.ticket-booking.payment-pending': 'Payment pending',
-    'pisell2.ticket-booking.refunded': 'Refunded',
-    'pisell2.ticket-booking.unpaid': 'Unpaid',
-    'pisell2.ticket-booking.voided': 'Voided',
-    'pisell2.ticket-booking.pending': 'Pending',
-    'pisell2.ticket-booking.all': 'All',
-    'pisell2.ticket-booking.not-started': 'Not started',
-    'pisell2.ticket-booking.started': 'Started',
-    'pisell2.ticket-booking.finished': 'Finished',
-    'pisell2.ticket-booking.canceled': 'Canceled',
-    'pisell2.ticket-booking.inform': 'Inform',
-    'pisell2.ticket-booking.check-management': 'Please go to the management side to check this data.',
-    'pisell2.ticket-booking.confirm': 'Confirm',
-    'pisell2.ticket-booking.dashboard': 'Dashboard',
-    'pisell2.ticket-booking.booking-list': 'Booking list',
-    'pisell2.ticket-booking.full-data': 'Go to full data',
-    'pisell2.ticket-booking.today': 'Today',
-    'pisell2.ticket-booking.now': 'Now',
-    'pisell2.ticket-booking.start-time': 'Start time',
-    'pisell2.ticket-booking.create-time': 'Create time',
-    'pisell2.ticket-booking.customer': 'Customer',
-    'pisell2.ticket-booking.total': 'Total',
-    'pisell2.ticket-booking.search': 'Search',
-    'pisell2.ticket-booking.refresh-success': 'Refresh Successful',
-    'pisell2.ticket-booking.loading': 'Loading',
-    'pisell2.ticket-booking.appointment-not-found': 'Appointment not found',
-    'pisell2.ticket-booking.scan': 'Scan',
-    'pisell2.ticket-booking.create-new': 'Create new',
-    'pisell2.ticket-booking.add-to-cart': 'Added to Cart',
-    'pisell2.ticket-booking.not-available-title': 'Sorry, Not available at current time.',
-    'pisell2.ticket-booking.not-available-ok': 'OK',
-    'pisell2.ticket-booking.in-cart': function pisell2TicketBookingInCart(number) {
+  "en": {
+    "pisell2.ticket-booking.info": "Info",
+    "pisell2.ticket-booking.notes": "Notes",
+    "pisell2.ticket-booking.forms": "Forms",
+    "pisell2.ticket-booking.sales": "Sales",
+    "pisell2.ticket-booking.payment": "Payment",
+    "pisell2.ticket-booking.unsaved-changes": "Unsaved changes",
+    "pisell2.ticket-booking.exit-confirm": "Your changes will not be saved if you exit. Are you sure you want to exit?",
+    "pisell2.ticket-booking.go-back": "Go back",
+    "pisell2.ticket-booking.exit": "Yes, exit",
+    "pisell2.ticket-booking.deposit": "Deposit",
+    "pisell2.ticket-booking.copy-success": "Copy successful",
+    "pisell2.ticket-booking.no-data": "No data",
+    "pisell2.ticket-booking.authorized": "Authorized",
+    "pisell2.ticket-booking.paid": "Paid",
+    "pisell2.ticket-booking.partially-paid": "Partially Paid",
+    "pisell2.ticket-booking.partially-refunded": "Partially Refunded",
+    "pisell2.ticket-booking.payment-pending": "Payment pending",
+    "pisell2.ticket-booking.refunded": "Refunded",
+    "pisell2.ticket-booking.unpaid": "Unpaid",
+    "pisell2.ticket-booking.voided": "Voided",
+    "pisell2.ticket-booking.pending": "Pending",
+    "pisell2.ticket-booking.all": "All",
+    "pisell2.ticket-booking.not-started": "Not started",
+    "pisell2.ticket-booking.started": "Started",
+    "pisell2.ticket-booking.finished": "Finished",
+    "pisell2.ticket-booking.canceled": "Canceled",
+    "pisell2.ticket-booking.inform": "Inform",
+    "pisell2.ticket-booking.check-management": "Please go to the management side to check this data.",
+    "pisell2.ticket-booking.confirm": "Confirm",
+    "pisell2.ticket-booking.dashboard": "Dashboard",
+    "pisell2.ticket-booking.booking-list": "Booking list",
+    "pisell2.ticket-booking.full-data": "Go to full data",
+    "pisell2.ticket-booking.today": "Today",
+    "pisell2.ticket-booking.now": "Now",
+    "pisell2.ticket-booking.start-time": "Start time",
+    "pisell2.ticket-booking.create-time": "Create time",
+    "pisell2.ticket-booking.customer": "Customer",
+    "pisell2.ticket-booking.total": "Total",
+    "pisell2.ticket-booking.search": "Search",
+    "pisell2.ticket-booking.refresh-success": "Refresh Successful",
+    "pisell2.ticket-booking.loading": "Loading",
+    "pisell2.ticket-booking.appointment-not-found": "Appointment not found",
+    "pisell2.ticket-booking.scan": "Scan",
+    "pisell2.ticket-booking.create-new": "Create new",
+    "pisell2.ticket-booking.add-to-cart": "Added to Cart",
+    "pisell2.ticket-booking.not-available-title": "Sorry, Not available at current time.",
+    "pisell2.ticket-booking.not-available-ok": "OK",
+    "pisell2.ticket-booking.in-cart": function pisell2TicketBookingInCart(number) {
       return "".concat(number, " in cart");
-    },
-    'pisell2.product.card.cart-items': function pisell2ProductCardCartItems(number) {
-      return "".concat(number, "items");
-    },
-    'pisell2.product.card.subtotal': 'Subtotal',
-    'pisell2.product.card.hour.minute': function pisell2ProductCardHourMinute(hour, minute) {
-      return "".concat(hour > 0 ? "".concat(hour, "h") : '').concat(hour > 0 && minute > 0 ? ' ' : '').concat(minute > 0 ? "".concat(minute, "min") : '');
-    },
-    'pisell2.product.card.day': function pisell2ProductCardDay(val) {
-      return "".concat(val > 1 ? ' days' : ' day');
-    },
-    'pisell2.product.card.day.event': function pisell2ProductCardDayEvent(val) {
-      return "".concat(val > 1 ? ' events' : ' event');
-    },
-    'pisell2.product.card.minute': function pisell2ProductCardMinute(val) {
-      return "".concat(val > 1 ? ' minutes' : ' minute');
     }
   },
-  'zh-CN': {
-    'pisell2.ticket-booking.info': '信息',
-    'pisell2.ticket-booking.notes': '备注',
-    'pisell2.ticket-booking.forms': '表单',
-    'pisell2.ticket-booking.sales': '销售',
-    'pisell2.ticket-booking.payment': '付款',
-    'pisell2.ticket-booking.unsaved-changes': '有未保存的更改',
-    'pisell2.ticket-booking.exit-confirm': '如果您退出，您的更改将不会被保存。您确定要退出吗？',
-    'pisell2.ticket-booking.go-back': '返回',
-    'pisell2.ticket-booking.exit': '退出',
-    'pisell2.ticket-booking.deposit': '定金',
-    'pisell2.ticket-booking.copy-success': '复制成功',
-    'pisell2.ticket-booking.no-data': '暂无数据',
-    'pisell2.ticket-booking.authorized': '已授权',
-    'pisell2.ticket-booking.paid': '已付款',
-    'pisell2.ticket-booking.partially-paid': '部分付款',
-    'pisell2.ticket-booking.partially-refunded': '部分退款',
-    'pisell2.ticket-booking.payment-pending': '等待付款',
-    'pisell2.ticket-booking.refunded': '已退款',
-    'pisell2.ticket-booking.unpaid': '未付款',
-    'pisell2.ticket-booking.voided': '已作废',
-    'pisell2.ticket-booking.pending': '待支付',
-    'pisell2.ticket-booking.all': '全部',
-    'pisell2.ticket-booking.not-started': '未开始',
-    'pisell2.ticket-booking.started': '已开始',
-    'pisell2.ticket-booking.finished': '已完成',
-    'pisell2.ticket-booking.canceled': '已取消',
-    'pisell2.ticket-booking.inform': '通知',
-    'pisell2.ticket-booking.check-management': '请前往管理端查看此数据。',
-    'pisell2.ticket-booking.confirm': '确认',
-    'pisell2.ticket-booking.dashboard': '数据看板',
-    'pisell2.ticket-booking.booking-list': '预约列表',
-    'pisell2.ticket-booking.full-data': '查看全部数据',
-    'pisell2.ticket-booking.today': '今天',
-    'pisell2.ticket-booking.now': '现在',
-    'pisell2.ticket-booking.start-time': '开始时间',
-    'pisell2.ticket-booking.create-time': '创建时间',
-    'pisell2.ticket-booking.customer': '客户名称',
-    'pisell2.ticket-booking.total': '价格',
-    'pisell2.ticket-booking.search': '搜索',
-    'pisell2.ticket-booking.refresh-success': '刷新成功',
-    'pisell2.ticket-booking.loading': '加载中',
-    'pisell2.ticket-booking.appointment-not-found': '没有发现此预约',
-    'pisell2.ticket-booking.scan': '',
-    'pisell2.ticket-booking.create-new': '新建',
-    'pisell2.ticket-booking.add-to-cart': '已加入购物车',
-    'pisell2.ticket-booking.not-available-title': '抱歉，目前不在可售时间。',
-    'pisell2.ticket-booking.not-available-ok': '好的',
-    'pisell2.product.card.cart-items': function pisell2ProductCardCartItems(number) {
-      return "".concat(number, "\u4EF6\u5546\u54C1");
-    },
-    'pisell2.product.card.subtotal': '小计',
-    'pisell2.ticket-booking.in-cart': function pisell2TicketBookingInCart(number) {
+  "zh-CN": {
+    "pisell2.ticket-booking.info": "信息",
+    "pisell2.ticket-booking.notes": "备注",
+    "pisell2.ticket-booking.forms": "表单",
+    "pisell2.ticket-booking.sales": "销售",
+    "pisell2.ticket-booking.payment": "付款",
+    "pisell2.ticket-booking.unsaved-changes": "有未保存的更改",
+    "pisell2.ticket-booking.exit-confirm": "如果您退出，您的更改将不会被保存。您确定要退出吗？",
+    "pisell2.ticket-booking.go-back": "返回",
+    "pisell2.ticket-booking.exit": "退出",
+    "pisell2.ticket-booking.deposit": "定金",
+    "pisell2.ticket-booking.copy-success": "复制成功",
+    "pisell2.ticket-booking.no-data": "暂无数据",
+    "pisell2.ticket-booking.authorized": "已授权",
+    "pisell2.ticket-booking.paid": "已付款",
+    "pisell2.ticket-booking.partially-paid": "部分付款",
+    "pisell2.ticket-booking.partially-refunded": "部分退款",
+    "pisell2.ticket-booking.payment-pending": "等待付款",
+    "pisell2.ticket-booking.refunded": "已退款",
+    "pisell2.ticket-booking.unpaid": "未付款",
+    "pisell2.ticket-booking.voided": "已作废",
+    "pisell2.ticket-booking.pending": "待支付",
+    "pisell2.ticket-booking.all": "全部",
+    "pisell2.ticket-booking.not-started": "未开始",
+    "pisell2.ticket-booking.started": "已开始",
+    "pisell2.ticket-booking.finished": "已完成",
+    "pisell2.ticket-booking.canceled": "已取消",
+    "pisell2.ticket-booking.inform": "通知",
+    "pisell2.ticket-booking.check-management": "请前往管理端查看此数据。",
+    "pisell2.ticket-booking.confirm": "确认",
+    "pisell2.ticket-booking.dashboard": "数据看板",
+    "pisell2.ticket-booking.booking-list": "预约列表",
+    "pisell2.ticket-booking.full-data": "查看全部数据",
+    "pisell2.ticket-booking.today": "今天",
+    "pisell2.ticket-booking.now": "现在",
+    "pisell2.ticket-booking.start-time": "开始时间",
+    "pisell2.ticket-booking.create-time": "创建时间",
+    "pisell2.ticket-booking.customer": "客户名称",
+    "pisell2.ticket-booking.total": "价格",
+    "pisell2.ticket-booking.search": "搜索",
+    "pisell2.ticket-booking.refresh-success": "刷新成功",
+    "pisell2.ticket-booking.loading": "加载中",
+    "pisell2.ticket-booking.appointment-not-found": "没有发现此预约",
+    "pisell2.ticket-booking.scan": "",
+    "pisell2.ticket-booking.create-new": "新建",
+    "pisell2.ticket-booking.add-to-cart": "已加入购物车",
+    "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售时间。",
+    "pisell2.ticket-booking.not-available-ok": "好的",
+    "pisell2.ticket-booking.in-cart": function pisell2TicketBookingInCart(number) {
       return "\u5DF2\u6709".concat(number, "\u4EF6");
-    },
-    'pisell2.product.card.hour.minute': function pisell2ProductCardHourMinute(hour, minute) {
-      return "".concat(hour > 0 ? "".concat(hour, "\u5C0F\u65F6") : '').concat(minute > 0 ? "".concat(minute, "\u5206\u949F") : '');
-    },
-    'pisell2.product.card.day': function pisell2ProductCardDay(val) {
-      return '天';
-    },
-    'pisell2.product.card.day.event': function pisell2ProductCardDayEvent(val) {
-      return '个活动';
-    },
-    'pisell2.product.card.minute': function pisell2ProductCardMinute(val) {
-      return '分钟';
     }
   },
-  'zh-HK': {
-    'pisell2.ticket-booking.info': '資訊',
-    'pisell2.ticket-booking.notes': '備註',
-    'pisell2.ticket-booking.forms': '表单',
-    'pisell2.ticket-booking.sales': '銷售',
-    'pisell2.ticket-booking.payment': '付款',
-    'pisell2.ticket-booking.unsaved-changes': '有未保存的更改',
-    'pisell2.ticket-booking.exit-confirm': '如果您退出，您的變更將不會被保存。您確定要退出嗎？',
-    'pisell2.ticket-booking.go-back': '返回',
-    'pisell2.ticket-booking.exit': '退出',
-    'pisell2.ticket-booking.deposit': '定金',
-    'pisell2.ticket-booking.copy-success': '复制成功',
-    'pisell2.ticket-booking.no-data': '暂无数据',
-    'pisell2.ticket-booking.authorized': '已授權',
-    'pisell2.ticket-booking.paid': '已付款',
-    'pisell2.ticket-booking.partially-paid': '部分付款',
-    'pisell2.ticket-booking.partially-refunded': '部分退款',
-    'pisell2.ticket-booking.payment-pending': '等待付款',
-    'pisell2.ticket-booking.refunded': '已退款',
-    'pisell2.ticket-booking.unpaid': '未付款',
-    'pisell2.ticket-booking.voided': '已作廢',
-    'pisell2.ticket-booking.pending': '待支付',
-    'pisell2.ticket-booking.all': '全部',
-    'pisell2.ticket-booking.not-started': '未开始',
-    'pisell2.ticket-booking.started': '已开始',
-    'pisell2.ticket-booking.finished': '已完成',
-    'pisell2.ticket-booking.canceled': '已取消',
-    'pisell2.ticket-booking.inform': '通知',
-    'pisell2.ticket-booking.check-management': '请前往管理端查看此数据。',
-    'pisell2.ticket-booking.confirm': '确认',
-    'pisell2.ticket-booking.dashboard': '数据看板',
-    'pisell2.ticket-booking.booking-list': '预约列表',
-    'pisell2.ticket-booking.full-data': '查看全部数据',
-    'pisell2.ticket-booking.today': '今天',
-    'pisell2.ticket-booking.now': '现在',
-    'pisell2.ticket-booking.start-time': '开始时间',
-    'pisell2.ticket-booking.create-time': '创建时间',
-    'pisell2.ticket-booking.customer': '客户名称',
-    'pisell2.ticket-booking.total': '价格',
-    'pisell2.ticket-booking.search': '搜索',
-    'pisell2.ticket-booking.refresh-success': '刷新成功',
-    'pisell2.ticket-booking.loading': '加载中',
-    'pisell2.ticket-booking.appointment-not-found': '没有發現此預約',
-    'pisell2.ticket-booking.scan': '扫码',
-    'pisell2.ticket-booking.create-new': '新建',
-    'pisell2.ticket-booking.add-to-cart': '已加入购物车',
-    'pisell2.ticket-booking.not-available-title': '抱歉，目前不在可售時間。',
-    'pisell2.ticket-booking.not-available-ok': '好的',
-    'pisell2.ticket-booking.in-cart': function pisell2TicketBookingInCart(number) {
+  "zh-HK": {
+    "pisell2.ticket-booking.info": "資訊",
+    "pisell2.ticket-booking.notes": "備註",
+    "pisell2.ticket-booking.forms": "表单",
+    "pisell2.ticket-booking.sales": "銷售",
+    "pisell2.ticket-booking.payment": "付款",
+    "pisell2.ticket-booking.unsaved-changes": "有未保存的更改",
+    "pisell2.ticket-booking.exit-confirm": "如果您退出，您的變更將不會被保存。您確定要退出嗎？",
+    "pisell2.ticket-booking.go-back": "返回",
+    "pisell2.ticket-booking.exit": "退出",
+    "pisell2.ticket-booking.deposit": "定金",
+    "pisell2.ticket-booking.copy-success": "复制成功",
+    "pisell2.ticket-booking.no-data": "暂无数据",
+    "pisell2.ticket-booking.authorized": "已授權",
+    "pisell2.ticket-booking.paid": "已付款",
+    "pisell2.ticket-booking.partially-paid": "部分付款",
+    "pisell2.ticket-booking.partially-refunded": "部分退款",
+    "pisell2.ticket-booking.payment-pending": "等待付款",
+    "pisell2.ticket-booking.refunded": "已退款",
+    "pisell2.ticket-booking.unpaid": "未付款",
+    "pisell2.ticket-booking.voided": "已作廢",
+    "pisell2.ticket-booking.pending": "待支付",
+    "pisell2.ticket-booking.all": "全部",
+    "pisell2.ticket-booking.not-started": "未开始",
+    "pisell2.ticket-booking.started": "已开始",
+    "pisell2.ticket-booking.finished": "已完成",
+    "pisell2.ticket-booking.canceled": "已取消",
+    "pisell2.ticket-booking.inform": "通知",
+    "pisell2.ticket-booking.check-management": "请前往管理端查看此数据。",
+    "pisell2.ticket-booking.confirm": "确认",
+    "pisell2.ticket-booking.dashboard": "数据看板",
+    "pisell2.ticket-booking.booking-list": "预约列表",
+    "pisell2.ticket-booking.full-data": "查看全部数据",
+    "pisell2.ticket-booking.today": "今天",
+    "pisell2.ticket-booking.now": "现在",
+    "pisell2.ticket-booking.start-time": "开始时间",
+    "pisell2.ticket-booking.create-time": "创建时间",
+    "pisell2.ticket-booking.customer": "客户名称",
+    "pisell2.ticket-booking.total": "价格",
+    "pisell2.ticket-booking.search": "搜索",
+    "pisell2.ticket-booking.refresh-success": "刷新成功",
+    "pisell2.ticket-booking.loading": "加载中",
+    "pisell2.ticket-booking.appointment-not-found": "没有發現此預約",
+    "pisell2.ticket-booking.scan": "扫码",
+    "pisell2.ticket-booking.create-new": "新建",
+    "pisell2.ticket-booking.add-to-cart": "已加入购物车",
+    "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售時間。",
+    "pisell2.ticket-booking.not-available-ok": "好的",
+    "pisell2.ticket-booking.in-cart": function pisell2TicketBookingInCart(number) {
       return "\u5DF2\u6709".concat(number, "\u4EF6");
-    },
-    'pisell2.product.card.cart-items': function pisell2ProductCardCartItems(number) {
-      return "".concat(number, "\u4EF6\u5546\u54C1");
-    },
-    'pisell2.product.card.subtotal': '小計',
-    'pisell2.product.card.hour.minute': function pisell2ProductCardHourMinute(hour, minute) {
-      return "".concat(hour > 0 ? "".concat(hour, "\u5C0F\u6642") : '').concat(minute > 0 ? "".concat(minute, "\u5206\u9418") : '');
-    },
-    'pisell2.product.card.day': function pisell2ProductCardDay(val) {
-      return '天';
-    },
-    'pisell2.product.card.day.event': function pisell2ProductCardDayEvent(val) {
-      return '个活動';
-    },
-    'pisell2.product.card.minute': function pisell2ProductCardMinute(val) {
-      return '分鐘';
     }
   }
 };

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

@@ -12,12 +12,8 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: number;
     quantity: number;
 } | undefined;
-export declare const addService: (list: any[], addItem: any, state: any) => {
+export declare const addService: (list: any[], addItem: 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

@@ -104,36 +104,25 @@ export var restoreProductOtherData = function restoreProductOtherData(data) {
 
 // 是相同的商品
 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;
+  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);
 };
-export var addService = function addService(list, addItem, state) {
+export var addService = function addService(list, addItem) {
   var value = list;
   var count;
-  // 预约商品 并且配置商品卡片不叠加 直接添加
-  if (!isNormalProductByDurationSchedule(addItem) && !getIsOverlayProduct(addItem, state)) {
+  // 预约商品直接添加
+  if (!isNormalProductByDurationSchedule(addItem)) {
     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) {
+      if (isSameProduct(item, addItem)) {
         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,
@@ -175,45 +164,4 @@ export var addServiceScroll = function addServiceScroll(rowKey, cacheItem) {
       }, 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/hooks/useWalletCard.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { IWalletListItemProps } from '../serve';
 /**
  * 钱包卡片Hook的参数

package/es/components/workSpaceList/components/Modal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

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

package/lib/components/appointmentBooking/components/Cart/Item/index.js

@@ -46,7 +46,7 @@ var import_Deposit = __toESM(require("../../Deposit"));
 var import_utils3 = require("../utils");
 var import_index = require("./index.less");
 var CartItem = ({ onNext }) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const {
     carts,
@@ -78,7 +78,6 @@ var CartItem = ({ onNext }) => {
     return (0, import_utils2.formatHolder)(accountLists);
   }, [accountLists, isFormSubject]);
   const hasGoodPassApp = !!((_a = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _a.call(businessUtils, "goodpass"));
-  const hasDiscountCardApp = !!((_b = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _b.call(businessUtils, "discountcard"));
   const handleClickCard = (e, type, val) => {
     console.log(e, type, val, "handleClickCard");
     if (type === "note") {
@@ -188,8 +187,8 @@ var CartItem = ({ onNext }) => {
           hideAddBtn: false,
           holders,
           disabledEdit: isLastStep,
-          isShowChangeResource: (_d = (_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key) == null ? void 0 : _d.startsWith("select-resource"),
-          isShowDelete: ((_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key) === "select-service",
+          isShowChangeResource: (_c = (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) == null ? void 0 : _c.startsWith("select-resource"),
+          isShowDelete: ((_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key) === "select-service",
           isShowPackageNote: false,
           isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
           isShowHolder: isFormSubject,
@@ -206,7 +205,7 @@ var CartItem = ({ onNext }) => {
         onChange: (e, type, key) => handleClickCard(e, type, key)
       }
     )),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp || hasDiscountCardApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), (carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, { onNext }))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), (carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, { onNext }))
   ));
 };
 var Item_default = CartItem;

package/lib/components/appointmentBooking/components/Cart/Item/index.less

@@ -1,5 +1,5 @@
 .appointment-cart-item-wrap {
-  height: calc(var(--vh, 1vh) * 100 - 100px);
+  height: calc(100vh - 100px);
   display: flex;
   flex-direction: column;
 
@@ -39,7 +39,7 @@
   flex-direction: column;
   align-items: start;
 
-  > div {
+  >div {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -105,4 +105,4 @@
     flex: none;
     z-index: 10;
   }
-}
+}

package/lib/components/appointmentBooking/components/Content/index.d.ts

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

package/lib/components/appointmentBooking/components/Content/index.less

@@ -107,7 +107,7 @@
     margin-top: 0;
 
     .appointment-cart-item-wrap {
-      height: calc(var(--vh, 1vh) * 100 - 16px) !important;
+      height: calc(100vh - 16px) !important;
     }
   }
 }

package/lib/components/appointmentBooking/components/Date/index.js

@@ -48,7 +48,6 @@ var import_index = require("./index.less");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 var Date = (0, import_react.forwardRef)((props, ref) => {
   var _a, _b, _c;
-  const isFetchingDates = (0, import_react.useRef)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [currentDate, setCurrentDate] = (0, import_react.useState)();
   const [dateMonthList, setDateMonthList] = (0, import_react.useState)([]);
@@ -140,22 +139,15 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
         endDate
       };
       const data = await getDateData(params);
-      const firstAvailableDate = (data || []).find(
-        (d) => d.status === "available"
-      );
-      if (!firstAvailableDate && !isFetchingDates.current) {
-        isFetchingDates.current = true;
-        const nextMonthDate = (0, import_dayjs.default)(date).add(1, "month");
-        setCurrentMonth(nextMonthDate);
-        setLoading(true);
-        return;
-      }
       const selected = await appointmentBooking.getDateRange();
       console.log(data, selected, customPageId, "getDates");
       if ((selected == null ? void 0 : selected.length) > 0) {
         setCurrentDate((_a2 = selected == null ? void 0 : selected[0]) == null ? void 0 : _a2.date);
       } else if (!isDateSelectedFirst) {
-        if (date.format("YYYY-MM") === (0, import_dayjs.default)().format("YYYY-MM") || isFetchingDates.current) {
+        if (date.format("YYYY-MM") === (0, import_dayjs.default)().format("YYYY-MM")) {
+          const firstAvailableDate = (data || []).find(
+            (d) => d.status === "available"
+          );
           if (firstAvailableDate) {
             setCurrentDate(firstAvailableDate == null ? void 0 : firstAvailableDate.date);
             appointmentBooking.setDateRange([firstAvailableDate]);
@@ -179,6 +171,7 @@ var Date = (0, import_react.forwardRef)((props, ref) => {
     } catch (error) {
       setLoading(false);
       setDateMonthList([]);
+      console.log(error, "wh978968234234");
     }
   };
   (0, import_react.useEffect)(() => {