@pisell/private-materials 6.6.5 → 6.6.7

package/es/plus/walletPassGallery/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/pro/Login2.0/index.less

@@ -15,6 +15,14 @@
   
   /* 默认底部内边距 */
   padding-bottom: 24px;
+
+  // 加载状态优化
+  .pisell-lowcode-btn-loading-icon {
+    .anticon {
+      color: #ffffff !important;
+    }
+  }
+
   
   /* 在弹窗模式下不需要额外的底部内边距，因为使用 sticky 定位 */
   .pisell-lowcode-modal-body & {
@@ -462,6 +470,13 @@
   .login-lm-drawer-popover & {
     padding-bottom: 100px;
   }
+    // 加载状态优化
+  .pisell-lowcode-btn-loading-icon {
+    .anticon {
+      color: #ffffff !important;
+    }
+  }
+
 }
 
 // 错误提示样式优化
@@ -521,14 +536,6 @@
 //     }
 //   }
 // }
-
-// 加载状态优化
-.pisell-lowcode-btn-loading-icon {
-  .anticon {
-    color: #ffffff !important;
-  }
-}
-
 // 切换认证方式按钮
 .login2-switch-button {
   margin-top: 0;

package/es/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.js

@@ -22,7 +22,6 @@ import { useControllableValue } from 'ahooks';
 import { merge, omit } from 'lodash';
 //@ts-ignore
 import { locales } from '@pisell/utils';
-import { VirtualInput } from '@pisell/materials';
 import Shortcuts from "../shortcuts";
 import CashKeyboardSimple from "./CashKeyboardSimple";
 import { setKeyboardTheme } from "../../utils";
@@ -30,6 +29,7 @@ import "./index.less";
 import Decimal from 'decimal.js';
 import { AutoResizeText } from '@pisell/materials';
 import { formatAmountWithOptions } from '@pisell/utils';
+import { Iconfont } from '@pisell/materials';
 var CashKeyboardIntact = function CashKeyboardIntact(props) {
   var _mergedDisplayField$b, _mergedDisplayField$c, _mergedDisplayField$c2;
   var amountSymbol = props.amountSymbol,
@@ -251,47 +251,52 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     showCurrencySymbol: true
   }))))), ((_mergedDisplayField$c = mergedDisplayField.cashReceived) === null || _mergedDisplayField$c === void 0 ? void 0 : _mergedDisplayField$c.visible) && /*#__PURE__*/React.createElement("div", {
     style: _objectSpread(_objectSpread({}, getGridStyle(1)), {}, {
-      padding: '6px 16px',
+      padding: '0px 16px',
       borderRadius: '8px',
       backgroundColor: 'white',
       boxShadow: 'inset 0 2px 4px rgba(16, 24, 40, 0.08), inset 0 -2px 4px rgba(16, 24, 40, 0.08), inset 2px 0 4px rgba(16, 24, 40, 0.08), inset -2px 0 4px rgba(16, 24, 40, 0.08)',
       overflow: 'hidden',
       maxWidth: 188,
       cursor: 'pointer',
-      border: '1px solid #7f56da'
+      border: '1px solid #7f56da',
+      borderBottom: '1px solid #7f56da'
     }),
     onClick: function onClick() {
       setIsShowModal(true);
     }
-  }, /*#__PURE__*/React.createElement(VirtualInput, {
-    showCursor: false,
-    focused: true,
-    wrapperStyle: {
-      width: '100%'
-    },
-    topContent: /*#__PURE__*/React.createElement("div", {
-      style: {
-        fontSize: '14px',
-        color: '#667085'
-      }
-    }, mergedDisplayField.cashReceived.label),
-    value: internalValue ? formatAmountWithOptions(internalValue || '', amountSymbol, {
-      value: internalValue,
-      hideDecimalForWholeNumbers: false,
-      precision: 2,
-      showCurrencySymbol: true
-    }) : '',
-    height: 30,
-    fontSize: 20,
-    placeholder: placeholder,
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-cash-keyboard-intact-container-top",
+    style: _objectSpread(_objectSpread({}, getGridStyle(0)), {}, {
+      overflow: 'hidden',
+      padding: '5px 0'
+    })
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-cash-keyboard-intact-container-top-label"
+  }, mergedDisplayField.cashReceived.label), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-cash-keyboard-intact-container-top-value"
+  }, /*#__PURE__*/React.createElement(AutoResizeText, {
+    minFontSizePx: 10,
+    maxFontSizePx: 18,
+    fontSizePrecisionPx: 0.5,
+    style: {
+      color: '#7f56da',
+      textDecoration: 'underline',
+      textUnderlineOffset: '3px'
+    }
+  }, internalValue ? formatAmountWithOptions(internalValue || '', amountSymbol, {
+    value: internalValue,
+    hideDecimalForWholeNumbers: false,
+    precision: 2,
+    showCurrencySymbol: true
+  }) : ''), /*#__PURE__*/React.createElement(Iconfont, {
+    type: "pisell2-edit-05",
     style: {
-      fontSize: '24px',
-      fontWeight: 'bold',
-      border: 'none',
-      background: 'transparent',
-      width: '100%'
+      color: '#7f56da',
+      fontSize: '18px',
+      marginLeft: '4px',
+      marginTop: '4px'
     }
-  })), ((_mergedDisplayField$c2 = mergedDisplayField.changeDue) === null || _mergedDisplayField$c2 === void 0 ? void 0 : _mergedDisplayField$c2.visible) && /*#__PURE__*/React.createElement("div", {
+  })))), ((_mergedDisplayField$c2 = mergedDisplayField.changeDue) === null || _mergedDisplayField$c2 === void 0 ? void 0 : _mergedDisplayField$c2.visible) && /*#__PURE__*/React.createElement("div", {
     className: "pisell-cash-keyboard-intact-container-top",
     style: _objectSpread(_objectSpread({}, getGridStyle(2)), {}, {
       overflow: 'hidden'

package/es/pro/priceKeyboard/components/cashKeyboard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CashKeyboardBaseProps } from './types';
 export interface CashKeyboardProps extends CashKeyboardBaseProps {
     containerProps?: {

package/lib/businessModel/SalesModel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts

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

package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel, onNext }: any) => JSX.Element;
 export default Cart;

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/Deposit/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;

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

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

package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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

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

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

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

@@ -87,11 +87,14 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
         setting: { can_input: true, item_max_length: isShowProductDetailStepper, is_detail_open: clickType === "cover" }
       },
       callback: async (data) => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         if (data.isCancel) {
           appointmentBooking.closeProductDetail();
           return;
         }
+        if (data == null ? void 0 : data.origin) {
+          data.origin.isFormSubject = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a.bookingSetting) == null ? void 0 : _b.bookingSubject) == null ? void 0 : _c.type) === "form";
+        }
         const product = {
           ...data,
           options: (data == null ? void 0 : data.option) || []
@@ -125,7 +128,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
             endDate
           });
         } else {
-          const resources = ((_b = (_a = data == null ? void 0 : data.origin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [];
+          const resources = ((_e = (_d = data == null ? void 0 : data.origin) == null ? void 0 : _d.product_resource) == null ? void 0 : _e.resources) || [];
           const activeStatus = resources.find((item2) => item2.status === 1);
           if (!activeStatus && !appointmentBooking.isTargetNormalProduct(data == null ? void 0 : data.origin)) {
             return (0, import_utils2.Toast)(

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

@@ -43,6 +43,8 @@ var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
 var import_voucher = require("../../../booking/components/voucher/index.less");
 var import_index = require("./index.less");
+var import_context = require("../../context");
+var import_ahooks = require("ahooks");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -66,11 +68,17 @@ var VoucherCard = (props) => {
   const productRef = (0, import_react.useRef)(products);
   const { openLoginModal } = (0, import_hooks.useAppointmentBookingLogin)();
   const { accountLists } = (0, import_hooks.useAppointmentBookingAccount)();
+  const { summary } = (0, import_context.useAppointmentBookingContext)();
+  const { originTotal, total } = summary;
   const cart = (_b = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _b.cart;
   const isUserLoggedIn = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return !!((_b2 = (_a2 = utils == null ? void 0 : utils.token) == null ? void 0 : _a2.get) == null ? void 0 : _b2.call(_a2)) || false;
   }, [store]);
+  (0, import_react.useEffect)(() => {
+    const shopDiscount2 = pisellos.getModule("shopDiscount");
+    shopDiscount2.setOriginTotalAmount(originTotal);
+  }, [originTotal]);
   const availableData = (0, import_react.useMemo)(() => {
     return discountList.filter((item) => !!item.isAvailable).map((discount) => {
       return {
@@ -96,7 +104,7 @@ var VoucherCard = (props) => {
       return {
         _id: item._id,
         quantity: item.num,
-        bundle: item._bundleOrigin,
+        bundle: item.bundle,
         options: item._optionsOrigin,
         product: {
           ...item._productOrigin
@@ -106,11 +114,23 @@ var VoucherCard = (props) => {
     });
     (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.batchUpdateCart) == null ? void 0 : _a2.call(appointmentBooking, items);
   };
-  const onCartChange = () => {
+  const { run: onCartChange } = (0, import_ahooks.useDebounceFn)(() => {
     const products2 = cart == null ? void 0 : cart.getItems();
     const val = shopDiscount.calcDiscount(products2);
     batchUpdateCart(val.productList);
-  };
+  }, { wait: 200 });
+  const stringifiedHolders = (0, import_react.useMemo)(() => {
+    let _ret;
+    try {
+      _ret = JSON.stringify(products.map((item) => (item == null ? void 0 : item.holder_id) || ""));
+    } catch (error) {
+      _ret = "";
+    }
+    return _ret;
+  }, [products]);
+  (0, import_react.useEffect)(() => {
+    onCartChange();
+  }, [stringifiedHolders]);
   (0, import_react.useEffect)(() => {
     const val = shopDiscount.getDiscountList();
     setDisCountList(val);

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

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

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