@pisell/private-materials 3.2.33 → 3.2.34

package/es/components/appointmentBooking/index.js

@@ -15,6 +15,14 @@ var AppointmentBooking = function AppointmentBooking() {
   var appointmentBooking = useAppointmentBooking();
   var currentUser = formatCurrentUser();
   useEffect(function () {
+    var _appointmentBooking$o;
+    var _ref = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.productModuleParams) || {},
+      bookingSubject = _ref.bookingSubject;
+
+    // 预约主体是表单则不需要添加账户
+    if ((bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.type) === 'form') {
+      return;
+    }
     appointmentBooking.getAccounts().then(function (data) {
       if (!data.length) {
         appointmentBooking.addAccount([currentUser]);

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

@@ -12,7 +12,7 @@ declare const _default: {
         'pisell2.event.close.tip': string;
         'pisell2.event.close.continue': string;
         'pisell2.event.close.exit': string;
-        'pisell2.event.step': (step: number) => string;
+        'pisell2.appointment.step': (step: number) => string;
         'pisell2.event.select.category': (val: string) => string;
         'pisell2.event.select.campus': (val: string) => string;
         'pisell2.event.select.event': string;
@@ -70,6 +70,7 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.title': string;
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.appointment.booking.empty.service': string;
+        'pisell2.appointment.booking.empty.data': string;
         'pisell2.appointment.booking.empty.time': string;
         'pisell2.appointment.service.title': (val: number) => string;
         'pisell2.appointment.add.guest': string;
@@ -87,6 +88,16 @@ declare const _default: {
         'pisell2.appointment.sunday': string;
         'pisell2.appointment.any.professional': string;
         'pisell2.appointment.for.maximum.availability': string;
+        'pisell2.appointment.deposit': string;
+        'pisell2.appointment.deposit.agreed': string;
+        'pisell2.appointment.deposit.agree.policy': string;
+        'pisell2.appointment.deposit.and': string;
+        'pisell2.appointment.deposit.amount.tip1': string;
+        'pisell2.appointment.deposit.amount.tip2': string;
+        'pisell2.appointment.deposit.close': string;
+        'pisell2.appointment.tips': string;
+        'pisell2.appointment.tips.content': (x: string) => string;
+        'pisell2.appointment.fill-form': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -110,7 +121,7 @@ declare const _default: {
         'pisell2.event.close.tip': string;
         'pisell2.event.close.continue': string;
         'pisell2.event.close.exit': string;
-        'pisell2.event.step': (step: number) => string;
+        'pisell2.appointment.step': (step: number) => string;
         'pisell2.event.select.category': (val: string) => string;
         'pisell2.event.select.event': string;
         'pisell2.event.select.campus': (val: string) => string;
@@ -168,6 +179,7 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.title': string;
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.appointment.booking.empty.service': string;
+        'pisell2.appointment.booking.empty.data': string;
         'pisell2.appointment.booking.empty.time': string;
         'pisell2.appointment.service.title': (val: number) => string;
         'pisell2.appointment.add.guest': string;
@@ -185,6 +197,16 @@ declare const _default: {
         'pisell2.appointment.sunday': string;
         'pisell2.appointment.any.professional': string;
         'pisell2.appointment.for.maximum.availability': string;
+        'pisell2.appointment.deposit': string;
+        'pisell2.appointment.deposit.agreed': string;
+        'pisell2.appointment.deposit.agree.policy': string;
+        'pisell2.appointment.deposit.and': string;
+        'pisell2.appointment.deposit.amount.tip1': string;
+        'pisell2.appointment.deposit.amount.tip2': string;
+        'pisell2.appointment.deposit.close': string;
+        'pisell2.appointment.tips': string;
+        'pisell2.appointment.tips.content': (x: string) => string;
+        'pisell2.appointment.fill-form': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -208,7 +230,7 @@ declare const _default: {
         'pisell2.event.close.tip': string;
         'pisell2.event.close.continue': string;
         'pisell2.event.close.exit': string;
-        'pisell2.event.step': (step: number) => string;
+        'pisell2.appointment.step': (step: number) => string;
         'pisell2.event.select.category': (val: string) => string;
         'pisell2.event.select.event': string;
         'pisell2.event.select.campus': (val: string) => string;
@@ -266,6 +288,7 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.title': string;
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.appointment.booking.empty.service': string;
+        'pisell2.appointment.booking.empty.data': string;
         'pisell2.appointment.booking.empty.time': string;
         'pisell2.appointment.service.title': (val: number) => string;
         'pisell2.appointment.add.guest': string;
@@ -283,6 +306,16 @@ declare const _default: {
         'pisell2.appointment.sunday': string;
         'pisell2.appointment.any.professional': string;
         'pisell2.appointment.for.maximum.availability': string;
+        'pisell2.appointment.deposit': string;
+        'pisell2.appointment.deposit.agreed': string;
+        'pisell2.appointment.deposit.agree.policy': string;
+        'pisell2.appointment.deposit.and': string;
+        'pisell2.appointment.deposit.amount.tip1': string;
+        'pisell2.appointment.deposit.amount.tip2': string;
+        'pisell2.appointment.deposit.close': string;
+        'pisell2.appointment.tips': string;
+        'pisell2.appointment.tips.content': (x: string) => string;
+        'pisell2.appointment.fill-form': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;

package/es/components/appointmentBooking/locales.js

@@ -12,7 +12,7 @@ export default {
     'pisell2.event.close.tip': "All entered information will be lost. Are you sure you want to exit?",
     'pisell2.event.close.continue': "Continue",
     'pisell2.event.close.exit': "Exit",
-    'pisell2.event.step': function pisell2EventStep(step) {
+    'pisell2.appointment.step': function pisell2AppointmentStep(step) {
       return "Step ".concat(step);
     },
     'pisell2.event.select.category': function pisell2EventSelectCategory(val) {
@@ -82,6 +82,7 @@ export default {
     'pisell2.event.capacity.limit.reached.title': 'Capacity limit reached',
     'pisell2.event.capacity.limit.reached.tip': 'One or more events in your cart are no longer available due to full capacity. Please remove unavailable events from your cart to complete checkout.',
     'pisell2.appointment.booking.empty.service': 'No service',
+    'pisell2.appointment.booking.empty.data': 'No data',
     'pisell2.appointment.booking.empty.time': 'No time',
     'pisell2.appointment.service.title': function pisell2AppointmentServiceTitle(val) {
       return "".concat(val, " ").concat(val > 1 ? 'services' : 'service');
@@ -101,6 +102,18 @@ export default {
     'pisell2.appointment.sunday': 'Sun',
     'pisell2.appointment.any.professional': 'Any professional',
     'pisell2.appointment.for.maximum.availability': 'for maximum availability',
+    'pisell2.appointment.deposit': 'Deposit',
+    'pisell2.appointment.deposit.agreed': 'I have read and agree to the ',
+    'pisell2.appointment.deposit.agree.policy': 'You need to agree the policy to proceed',
+    'pisell2.appointment.deposit.and': ' & ',
+    'pisell2.appointment.deposit.amount.tip1': ' needs to be paid as deposit.',
+    'pisell2.appointment.deposit.amount.tip2': '',
+    'pisell2.appointment.deposit.close': 'Close',
+    'pisell2.appointment.tips': 'Tips',
+    'pisell2.appointment.tips.content': function pisell2AppointmentTipsContent(x) {
+      return "Please carefully review the items in your shopping cart and click the '".concat(x, "' button below to proceed with the payment.");
+    },
+    'pisell2.appointment.fill-form': 'Enter your details',
     'pisell2.text.apply': 'Apply',
     'pisell2.text.goodpass': "GoodPass",
     'pisell2.text.goodpass.product-vouchers': "Product Vouchers",
@@ -124,7 +137,7 @@ export default {
     'pisell2.event.close.tip': "退出后将丢失所有已填写的信息，确定要退出吗？",
     'pisell2.event.close.continue': "继续",
     'pisell2.event.close.exit': "退出",
-    'pisell2.event.step': function pisell2EventStep(step) {
+    'pisell2.appointment.step': function pisell2AppointmentStep(step) {
       return "\u6B65\u9AA4 ".concat(step);
     },
     'pisell2.event.select.category': function pisell2EventSelectCategory(val) {
@@ -194,6 +207,7 @@ export default {
     'pisell2.event.capacity.limit.reached.title': '活动名额已满',
     'pisell2.event.capacity.limit.reached.tip': '购物车中有一个或多个活动已达预约上限，请将已满额的活动从购物车中移除后再完成结算。',
     'pisell2.appointment.booking.empty.service': '暂无服务',
+    'pisell2.appointment.booking.empty.data': '暂无数据',
     'pisell2.appointment.booking.empty.time': '暂无时间',
     'pisell2.appointment.service.title': function pisell2AppointmentServiceTitle(val) {
       return "".concat(val, "\u4E2A\u670D\u52A1");
@@ -213,6 +227,18 @@ export default {
     'pisell2.appointment.sunday': '周日',
     'pisell2.appointment.any.professional': '随机分配',
     'pisell2.appointment.for.maximum.availability': '立即匹配',
+    'pisell2.appointment.deposit': '定金',
+    'pisell2.appointment.deposit.agreed': '我已阅读并同意 ',
+    'pisell2.appointment.deposit.agree.policy': '您需要同意协议才能继续',
+    'pisell2.appointment.deposit.and': ' 和 ',
+    'pisell2.appointment.deposit.amount.tip1': '请支付 ',
+    'pisell2.appointment.deposit.amount.tip2': ' 定金。',
+    'pisell2.appointment.deposit.close': '关闭',
+    'pisell2.appointment.tips': '提示',
+    'pisell2.appointment.tips.content': function pisell2AppointmentTipsContent(x) {
+      return "\u8BF7\u4ED4\u7EC6\u67E5\u770B\u8D2D\u7269\u8F66\u4E2D\u7684\u5546\u54C1\uFF0C\u7136\u540E\u70B9\u51FB\u4E0B\u9762\u7684\u201C".concat(x, "\u201D\u6309\u94AE\u7EE7\u7EED\u4ED8\u6B3E\u3002");
+    },
+    'pisell2.appointment.fill-form': '填写信息',
     'pisell2.text.apply': '应用',
     'pisell2.text.goodpass': "商品券",
     'pisell2.text.goodpass.product-vouchers': "商品兑换券",
@@ -236,7 +262,7 @@ export default {
     'pisell2.event.close.tip': "退出後將丟失所有已填寫的信息，確定要退出嗎？",
     'pisell2.event.close.continue': "繼續",
     'pisell2.event.close.exit': "退出",
-    'pisell2.event.step': function pisell2EventStep(step) {
+    'pisell2.appointment.step': function pisell2AppointmentStep(step) {
       return "\u6B65\u9A5F ".concat(step);
     },
     'pisell2.event.select.category': function pisell2EventSelectCategory(val) {
@@ -306,6 +332,7 @@ export default {
     'pisell2.event.capacity.limit.reached.title': '活動名額已滿',
     'pisell2.event.capacity.limit.reached.tip': '購物車中有一個或多個活動已達預約上限，請將已滿額的活動從購物車中移除後再完成結算。',
     'pisell2.appointment.booking.empty.service': '暫無服務',
+    'pisell2.appointment.booking.empty.data': '暫無數據',
     'pisell2.appointment.booking.empty.time': '暫無時間',
     'pisell2.appointment.service.title': function pisell2AppointmentServiceTitle(val) {
       return "".concat(val, "\u4E2A\u670D\u52D9");
@@ -325,6 +352,18 @@ export default {
     'pisell2.appointment.sunday': '周日',
     'pisell2.appointment.any.professional': '隨機分配',
     'pisell2.appointment.for.maximum.availability': '立即匹配',
+    'pisell2.appointment.deposit': '定金',
+    'pisell2.appointment.deposit.agreed': '我已閱讀並同意 ',
+    'pisell2.appointment.deposit.agree.policy': '您需要同意協議才能繼續',
+    'pisell2.appointment.deposit.and': ' 和 ',
+    'pisell2.appointment.deposit.amount.tip1': '請支付 ',
+    'pisell2.appointment.deposit.amount.tip2': ' 定金。',
+    'pisell2.appointment.deposit.close': '关闭',
+    'pisell2.appointment.tips': '提示',
+    'pisell2.appointment.tips.content': function pisell2AppointmentTipsContent(x) {
+      return "\u8ACB\u4ED4\u7D30\u67E5\u770B\u8CFC\u7269\u8ECA\u4E2D\u7684\u5546\u54C1\uFF0C\u7136\u5F8C\u9EDE\u64CA\u4E0B\u9762\u7684\u201C".concat(x, "\u201D\u6309\u9215\u7E7C\u7E8C\u4ED8\u6B3E\u3002");
+    },
+    'pisell2.appointment.fill-form': '填寫資訊',
     'pisell2.text.apply': '應用',
     'pisell2.text.goodpass': "商品券",
     'pisell2.text.goodpass.product-vouchers': "商品兌換券",

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

@@ -84,3 +84,25 @@ export declare const isEmptyGuest: (carts: any[], accounts: any[]) => boolean;
  * @Date: 2025-04-15 21:51
  */
 export declare const isEmptyCartsResourceId: (carts: any[]) => boolean;
+/**
+ * @title: 定金合并的标点符号
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-21 17:52
+ */
+export declare const getPunctuationMark: (index: number, totalLength: number, isEn: boolean) => any;
+/**
+ * @title: 判断当前选中的资源中是否有 resource_form_id 表单id，如果有表单则下一步是选择表单
+ * @description:
+ * @param {any} array
+ * @param {any} resources
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-25 19:05
+ */
+export declare const hasResourceFormId: (array: any[]) => boolean | undefined;
+export declare const formatForms: (array: any[]) => ({
+    form_id: any;
+    policy_id: any;
+} | null)[];

package/es/components/appointmentBooking/utils.js

@@ -8,7 +8,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { getUniqueId } from "@pisell/utils";
+import { getUniqueId, locales } from "@pisell/utils";
 import useEngineContext from "../../hooks/useEngineContext";
 
 /**
@@ -133,34 +133,41 @@ export var formatGuest = function formatGuest(data, products) {
   });
 };
 export var formatCarts = function formatCarts(data, resources) {
-  var _utils$storage2;
-  var context = useEngineContext();
-  var utils = context.appHelper.utils || {};
-  var locale = (utils === null || utils === void 0 || (_utils$storage2 = utils.storage) === null || _utils$storage2 === void 0 ? void 0 : _utils$storage2.get('umi_locale')) || 'en-US';
-  var symbol = (utils === null || utils === void 0 ? void 0 : utils.getSymbolic()) || '$';
-  console.log(data, resources, 'formatCartsformatCarts');
-  return data === null || data === void 0 ? void 0 : data.map(function (d) {
-    var _currentResource$reso, _currentResources;
-    var currentResource = resources.find(function (r) {
-      return (d === null || d === void 0 ? void 0 : d._id) === (r === null || r === void 0 ? void 0 : r._id);
-    });
-    var currentResources = currentResource === null || currentResource === void 0 || (_currentResource$reso = currentResource.resources) === null || _currentResource$reso === void 0 || (_currentResource$reso = _currentResource$reso[0]) === null || _currentResource$reso === void 0 ? void 0 : _currentResource$reso.renderList;
-    currentResources = (_currentResources = currentResources) === null || _currentResources === void 0 ? void 0 : _currentResources.map(function (d) {
+  try {
+    // const context = useEngineContext();
+    // const utils = context.appHelper.utils || {};
+    // const locale = utils?.storage?.get('umi_locale') || 'en-US'
+    // const symbol = utils?.getSymbolic() || '$'
+    var locale = 'en-US';
+    var symbol = '$';
+    console.log(data, resources, 'formatCartsformatCarts');
+    return data === null || data === void 0 ? void 0 : data.map(function (d) {
+      var _currentResource$reso, _currentResources, _d$duration;
+      var currentResource = resources === null || resources === void 0 ? void 0 : resources.find(function (r) {
+        return (d === null || d === void 0 ? void 0 : d._id) === (r === null || r === void 0 ? void 0 : r._id);
+      });
+      var currentResources = currentResource === null || currentResource === void 0 || (_currentResource$reso = currentResource.resources) === null || _currentResource$reso === void 0 || (_currentResource$reso = _currentResource$reso[0]) === null || _currentResource$reso === void 0 ? void 0 : _currentResource$reso.renderList;
+      currentResources = (_currentResources = currentResources) === null || _currentResources === void 0 ? void 0 : _currentResources.map(function (d) {
+        return _objectSpread(_objectSpread({}, d), {}, {
+          label: (d === null || d === void 0 ? void 0 : d.main_field) || (d === null || d === void 0 ? void 0 : d.id)
+        });
+      });
       return _objectSpread(_objectSpread({}, d), {}, {
-        label: (d === null || d === void 0 ? void 0 : d.main_field) || (d === null || d === void 0 ? void 0 : d.id)
+        format: ['HH:mm', 'HH:mm'],
+        show_time: true,
+        duration_type: (d === null || d === void 0 || (_d$duration = d.duration) === null || _d$duration === void 0 ? void 0 : _d$duration.type) || 'minutes',
+        locale: locale,
+        symbol: symbol,
+        resources: currentResources,
+        is_hide_like: true,
+        holder_title: '',
+        holders: []
       });
     });
-    return _objectSpread(_objectSpread({}, d), {}, {
-      format: ['HH:mm', 'HH:mm'],
-      show_time: true,
-      duration_type: d.duration.type,
-      locale: locale,
-      symbol: symbol,
-      resources: currentResources,
-      is_hide_like: true,
-      holder_title: ''
-    });
-  });
+  } catch (error) {
+    console.log(error, 'formatCarts');
+    return [];
+  }
 };
 
 /**
@@ -280,4 +287,82 @@ export var isEmptyCartsResourceId = function isEmptyCartsResourceId(carts) {
   });
   console.log(isEmptyResourceId, 'isEmptyResourceId');
   return isEmptyResourceId;
+};
+
+/**
+ * @title: 定金合并的标点符号
+ * @description: 
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-21 17:52
+ */
+export var getPunctuationMark = function getPunctuationMark(index, totalLength, isEn) {
+  var isLastItem = index === totalLength - 1;
+  var isSecondLastItem = index === totalLength - 2;
+  if (isLastItem) {
+    return isEn ? '.' : '。';
+  }
+  if (isSecondLastItem) {
+    return locales.getText('pisell2.appointment.deposit.and');
+  }
+  return isEn ? ', ' : '、';
+};
+
+/**
+ * @title: 判断当前选中的资源中是否有 resource_form_id 表单id，如果有表单则下一步是选择表单
+ * @description: 
+ * @param {any} array
+ * @param {any} resources
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-25 19:05
+ */
+export var hasResourceFormId = function hasResourceFormId(array) {
+  try {
+    if (!(array !== null && array !== void 0 && array.length)) {
+      return false;
+    }
+
+    // 检查数组中的任何一个 resource_id 是否满足条件
+    return array.some(function (item) {
+      var _item$resources;
+      // 获取当前项的 resource_id
+      var resourceId = item.resource_id;
+
+      // 在 resources 中查找匹配的项
+      var foundResource = item === null || item === void 0 || (_item$resources = item.resources) === null || _item$resources === void 0 ? void 0 : _item$resources.find(function (resource) {
+        return resource.id === resourceId;
+      });
+      console.log(foundResource, item, 'foundResource');
+      // 如果找到匹配项并且其 resource_form_id 存在且有值
+      return foundResource && foundResource.resource_form_id;
+    });
+  } catch (error) {
+    console.log(error, 'hasResourceFormId');
+  }
+};
+export var formatForms = function formatForms(array) {
+  try {
+    if (!(array !== null && array !== void 0 && array.length)) {
+      return [];
+    }
+    var mappedResources = array.map(function (item) {
+      var _item$resources2;
+      // 在 resources 中查找匹配的项
+      var foundResource = item === null || item === void 0 || (_item$resources2 = item.resources) === null || _item$resources2 === void 0 ? void 0 : _item$resources2.find(function (resource) {
+        return resource.id === item.resource_id;
+      });
+      if (foundResource && (foundResource !== null && foundResource !== void 0 && foundResource.resource_form_id || foundResource !== null && foundResource !== void 0 && foundResource.policy_id)) {
+        return {
+          form_id: foundResource.resource_form_id,
+          policy_id: foundResource.policy_id
+        };
+      }
+      return null;
+    }).filter(Boolean);
+    return mappedResources;
+  } catch (error) {
+    console.log(error, 'hasResourceFormId');
+    return [];
+  }
 };

package/es/components/booking/addons/model.js

@@ -1,9 +1,9 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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 { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

package/es/components/booking/components/TabProduct/selectProductItem/index.js

@@ -6,7 +6,7 @@ import CollapsibleList from "../../collapsibleList";
 import { renderBundles } from "../../collapsibleList/utils";
 import "./index.less";
 var SelectProductItem = function SelectProductItem(_ref) {
-  var _item$_extend, _item$_extend$other, _item$_extend2, _item$_extend2$other;
+  var _item$_extend, _item$_extend2;
   var item = _ref.item,
     _onClick = _ref.onClick,
     onChangeQuantity = _ref.onChangeQuantity,
@@ -28,7 +28,7 @@ var SelectProductItem = function SelectProductItem(_ref) {
     style: style,
     className: classNames("server-select-product", className),
     onClick: function onClick() {
-      _onClick === null || _onClick === void 0 ? void 0 : _onClick(item);
+      _onClick === null || _onClick === void 0 || _onClick(item);
     }
   }, item.cover ? /*#__PURE__*/React.createElement("img", {
     src: image.ali(item.cover, 100),
@@ -39,11 +39,11 @@ var SelectProductItem = function SelectProductItem(_ref) {
     className: "server-select-product-title"
   }, item.title), /*#__PURE__*/React.createElement("div", {
     className: "server-select-product-subtitle"
-  }, item.subtitle || ""), (((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : (_item$_extend$other = _item$_extend.other) === null || _item$_extend$other === void 0 ? void 0 : _item$_extend$other.bundle) || []).length ? /*#__PURE__*/React.createElement(CollapsibleList, {
+  }, item.subtitle || ""), (((_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).length ? /*#__PURE__*/React.createElement(CollapsibleList, {
     style: {
       width: "100%"
     },
-    list: ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : (_item$_extend2$other = _item$_extend2.other) === null || _item$_extend2$other === void 0 ? void 0 : _item$_extend2$other.bundle) || [],
+    list: ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle) || [],
     renderItem: function renderItem(item) {
       return renderBundles(item, amountSymbol);
     }

package/es/components/booking/components/TabProduct/tabs/index.js

@@ -2,7 +2,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState, useEffect, forwardRef, useImperativeHandle } from "react";
 import classNames from "classnames";
@@ -13,6 +13,10 @@ import "./index.less";
 
 // tabs 子组件定义
 
+// 定义主键类型
+
+// Tabs 可传递的参数
+
 var Tabs = function Tabs(_ref, ref) {
   var renderTab = _ref.renderTab,
     rowKey = _ref.rowKey,

package/es/components/booking/components/browserSelect/index.js

@@ -29,7 +29,7 @@ var BrowserSelect = function BrowserSelect(props) {
     onChange: function onChange(e) {
       var _resetProps$onChange;
       e.persist();
-      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 ? void 0 : _resetProps$onChange.call(resetProps, e);
+      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 || _resetProps$onChange.call(resetProps, e);
     }
   }), _options);
 };

package/es/components/booking/components/footer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

package/es/components/booking/components/footer/index.js

@@ -45,7 +45,7 @@ import VoucherCard from "../voucher";
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _businessUtils$getApp, _state$addons4, _state$bookingDetail9;
+  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$addons4, _state$bookingDetail9;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -236,8 +236,10 @@ var Footer = function Footer(props) {
   }, [state, params]);
 
   // 是否安装商品券应用
-  var hasGoodPassApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
-  console.log('has goodpass app:', hasGoodPassApp);
+  var hasGoodPassApp = useMemo(function () {
+    var _businessUtils$getApp;
+    return !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
+  }, []);
 
   /**
    * @title: 跳转到 checkout页面
@@ -1173,7 +1175,7 @@ var Footer = function Footer(props) {
     round: true,
     loading: showFooter,
     active: true
-  }, hasGoodPassApp && source === 'info' ? /*#__PURE__*/React.createElement(VoucherCard, {
+  }, hasGoodPassApp ? /*#__PURE__*/React.createElement(VoucherCard, {
     state: state,
     dispatch: dispatch
   }) : null, /*#__PURE__*/React.createElement("div", {

package/es/components/booking/components/voucher/index.js

@@ -22,7 +22,6 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials';
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
-import { useMemoizedFn } from "ahooks";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -32,7 +31,6 @@ var ShopDiscountHooks = {
   onRulesListChange: 'shopDiscount:onRulesListChange',
   onLoadPrepareCalcResult: 'shopDiscount:onLoadPrepareCalcResult'
 };
-var services = {};
 var VoucherCard = function VoucherCard(props) {
   var _context$appHelper, _state$client$value;
   var context = useEngineContext();
@@ -55,7 +53,6 @@ var VoucherCard = function VoucherCard(props) {
   var productRef = useRef(state.service.value);
   var isBooking4Shop = useIsBooking4Shop(state);
   var shopDiscount = pisellos.getModule('shopDiscount');
-  services = state.service;
   var availableData = useMemo(function () {
     if (!isBooking4Shop) return [];
     var shopDiscount = pisellos.getModule('shopDiscount');
@@ -94,25 +91,18 @@ var VoucherCard = function VoucherCard(props) {
       productRef.current = val.productList;
       dispatch({
         type: 'setService',
-        payload: _objectSpread(_objectSpread({}, services), {}, {
+        payload: {
           value: val.productList
-        })
+        }
       });
     }
   }, [state.service.value, isBooking4Shop]);
-  var fn = useMemoizedFn(function (result) {
-    dispatch({
-      type: 'setService',
-      payload: _objectSpread(_objectSpread({}, services), {}, {
-        value: result.productList
-      })
-    });
-  });
 
   // 监听customer变化
   useEffect(function () {
     if (!isBooking4Shop) return;
     pisellos.effects.on(ShopDiscountHooks.onCustomerChange, function (customer) {
+      console.log(customer, 'customerChange');
       // 更新客户
       dispatch({
         type: 'setClient',
@@ -121,8 +111,16 @@ var VoucherCard = function VoucherCard(props) {
         }
       });
     });
-    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
+    pisellos.effects.on(ShopDiscountHooks.onLoadPrepareCalcResult, function (result) {
+      dispatch({
+        type: 'setService',
+        payload: {
+          value: result.productList
+        }
+      });
+    });
     pisellos.effects.on(ShopDiscountHooks.onDiscountListChange, function (discount) {
+      console.log(discount, 'discountChange');
       setDisCountList(discount);
     });
     return function () {
@@ -131,7 +129,7 @@ var VoucherCard = function VoucherCard(props) {
       pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult);
       pisellos.effects.off(ShopDiscountHooks.onDiscountListChange);
     };
-  }, [state.bookingId, isBooking4Shop, fn]);
+  }, [state.bookingId, isBooking4Shop]);
 
   // apply code
   var onScanCode = /*#__PURE__*/function () {

package/es/components/booking/forms/model.js

@@ -1,9 +1,9 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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 { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({