@pisell/private-materials 6.2.49 → 6.2.51

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

@@ -0,0 +1,147 @@
+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(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 React from 'react';
+import { Typography } from '@pisell/materials';
+import "./index.less";
+var Text = Typography.Text;
+function UsageRules(_ref) {
+  var _ref$className = _ref.className,
+    className = _ref$className === void 0 ? '' : _ref$className,
+    style = _ref.style,
+    rules = _ref.rules,
+    _ref$personalLimit = _ref.personalLimit,
+    personalLimit = _ref$personalLimit === void 0 ? {
+      total: 5,
+      remaining: 3,
+      note: '用完后此券将自动失效'
+    } : _ref$personalLimit,
+    locales = _ref.locales;
+  // Helper function to interpolate text with variables
+  var interpolateText = function interpolateText(text, variables) {
+    return text.replace(/\{(\w+)\}/g, function (match, key) {
+      return variables[key] !== undefined ? variables[key] : match;
+    });
+  };
+
+  // Get localized text with fallback
+  var getText = function getText(key, fallback) {
+    return (locales === null || locales === void 0 ? void 0 : locales.getText(key)) || fallback || key;
+  };
+
+  // Generate rule description with limit value
+  var getRuleDescription = function getRuleDescription(type, limit) {
+    // Handle unlimited case (limit = 0 means unlimited)
+    if (limit === 0 && type === 'monthly') {
+      return getText('page.wallet.monthlyLimitUnlimited', '无限制');
+    }
+    var templateKey = "page.wallet.".concat(type, "LimitDesc");
+    var template = getText(templateKey, '');
+    return interpolateText(template, {
+      limit: limit
+    });
+  };
+
+  // Generate rule reset time text
+  var getRuleResetTime = function getRuleResetTime(type) {
+    var resetKey = "page.wallet.".concat(type, "Reset");
+    return getText(resetKey, '');
+  };
+
+  // Default rules with localized text
+  var defaultRules = [{
+    type: 'daily',
+    limit: 3,
+    description: getRuleDescription('daily', 3),
+    resetTime: getRuleResetTime('daily')
+  }, {
+    type: 'weekly',
+    limit: 15,
+    description: getRuleDescription('weekly', 15),
+    resetTime: getRuleResetTime('weekly')
+  }, {
+    type: 'monthly',
+    limit: 60,
+    description: getRuleDescription('monthly', 60),
+    resetTime: getRuleResetTime('monthly')
+  }];
+
+  // Process rules to add localized descriptions
+  var processedRules = rules ? rules.map(function (rule) {
+    return _objectSpread(_objectSpread({}, rule), {}, {
+      description: getRuleDescription(rule.type, rule.limit),
+      resetTime: getRuleResetTime(rule.type)
+    });
+  }) : defaultRules;
+  var finalRules = processedRules;
+  var getRuleLabel = function getRuleLabel(type) {
+    switch (type) {
+      case 'daily':
+        return getText('page.wallet.dailyLimit', '每日限制:');
+      case 'weekly':
+        return getText('page.wallet.weeklyLimit', '每周限制:');
+      case 'monthly':
+        return getText('page.wallet.monthlyLimit', '每月限制:');
+      default:
+        return getText('page.wallet.dailyLimit', '限制:');
+    }
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "usage-rules ".concat(className),
+    style: style
+  }, /*#__PURE__*/React.createElement(Text, {
+    className: "usage-rules-title"
+  }, getText('page.wallet.usageRules', '使用规则')), /*#__PURE__*/React.createElement(Text, {
+    className: "usage-rules-subtitle"
+  }, getText('page.wallet.usageRulesSubtitle', '请仔细阅读以下使用条件')), /*#__PURE__*/React.createElement("div", {
+    className: "usage-rules-section"
+  }, /*#__PURE__*/React.createElement(Text, {
+    className: "usage-rules-section-title"
+  }, getText('page.wallet.timeUsageLimits', '时间使用限制')), /*#__PURE__*/React.createElement("div", {
+    className: "usage-rules-list"
+  }, finalRules.length > 0 ? finalRules.map(function (rule, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: index,
+      className: "usage-rules-item"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "usage-rules-item-content"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "usage-rules-item-main-line"
+    }, /*#__PURE__*/React.createElement(Text, {
+      className: "usage-rules-item-label"
+    }, getRuleLabel(rule.type)), /*#__PURE__*/React.createElement(Text, {
+      className: "usage-rules-item-description"
+    }, rule.description)), rule.resetTime && /*#__PURE__*/React.createElement(Text, {
+      className: "usage-rules-item-reset"
+    }, rule.resetTime)));
+  }) : /*#__PURE__*/React.createElement("div", {
+    className: "usage-rules-item"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "usage-rules-item-content"
+  }, /*#__PURE__*/React.createElement(Text, {
+    className: "usage-rules-item-description"
+  }, getText('page.wallet.monthlyLimitUnlimited', '无限制')))))), /*#__PURE__*/React.createElement("div", {
+    className: "usage-rules-section"
+  }, /*#__PURE__*/React.createElement(Text, {
+    className: "usage-rules-section-title"
+  }, getText('page.wallet.totalQuantityControl', '总量控制')), /*#__PURE__*/React.createElement("div", {
+    className: "usage-rules-item"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "usage-rules-item-content"
+  }, personalLimit.total > 0 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
+    className: "usage-rules-item-label"
+  }, getText('page.wallet.personalLimit', '个人限额:')), /*#__PURE__*/React.createElement(Text, {
+    className: "usage-rules-item-description"
+  }, interpolateText(getText('page.wallet.personalLimitDesc', '您最多可使用此券{total}次(剩余{remaining}次)'), {
+    total: personalLimit.total,
+    remaining: personalLimit.remaining
+  })), /*#__PURE__*/React.createElement(Text, {
+    className: "usage-rules-item-note"
+  }, getText('page.wallet.voucherExpireNote', '用完后此券将自动失效'))) : /*#__PURE__*/React.createElement(Text, {
+    className: "usage-rules-item-description"
+  }, getText('page.wallet.monthlyLimitUnlimited', '无限制'))))));
+}
+export default UsageRules;

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

@@ -0,0 +1,157 @@
+.usage-rules {
+  padding: 16px;
+  background: #ffffff;
+  border-radius: 8px;
+  border: 1px solid #f0f0f0;
+  margin-top: 16px;
+  margin-bottom: 20px;
+
+  // 确保所有Text组件都是块级元素
+  .ant-typography {
+    display: block !important;
+    width: 100% !important;
+    margin-bottom: 0 !important;
+  }
+
+  &-title {
+    font-size: 18px;
+    font-weight: 600;
+    color: #000000;
+    line-height: 24px;
+    margin-bottom: 8px;
+    display: block;
+    width: 100%;
+  }
+
+  &-subtitle {
+    font-size: 14px;
+    color: #6B7280;
+    line-height: 20px;
+    margin-bottom: 24px;
+    display: block;
+    width: 100%;
+  }
+
+  &-section {
+    margin-bottom: 24px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    &-title {
+      font-size: 16px;
+      font-weight: 500;
+      color: #6B7280;
+      line-height: 20px;
+      margin-bottom: 16px;
+      display: block;
+      width: 100%;
+    }
+  }
+
+  &-list {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+  }
+
+  &-item {
+    position: relative;
+    display: flex;
+    align-items: flex-start;
+
+    &::before {
+      content: '•';
+      color: #697281;
+      font-size: 16px;
+      line-height: 20px;
+      font-weight: bold;
+      margin-right: 8px;
+      flex-shrink: 0;
+      margin-top: 0;
+    }
+
+    &-content {
+      flex: 1;
+      min-width: 0;
+    }
+
+    &-main-line {
+      margin-bottom: 4px;
+    }
+
+    &-label {
+      font-size: 14px;
+      font-weight: 600;
+      color: #000000;
+      line-height: 20px;
+      display: inline;
+      margin-right: 4px;
+    }
+
+    &-description {
+      font-size: 14px;
+      color: #000000;
+      line-height: 20px;
+      display: inline;
+      word-wrap: break-word;
+    }
+
+    &-reset {
+      font-size: 14px;
+      color: #000000;
+      line-height: 20px;
+      display: block;
+      width: 100%;
+    }
+
+    &-note {
+      font-size: 14px;
+      color: #000000;
+      line-height: 20px;
+      margin-top: 4px;
+      display: block;
+      width: 100%;
+    }
+  }
+
+}
+
+// 响应式设计
+@media (max-width: 768px) {
+  .usage-rules {
+    padding: 12px;
+    margin-top: 12px;
+
+    &-title {
+      font-size: 16px;
+    }
+
+    &-subtitle {
+      font-size: 13px;
+    }
+
+    &-section {
+      margin-bottom: 20px;
+
+      &-title {
+        font-size: 15px;
+      }
+    }
+
+    &-item {
+      &::before {
+        font-size: 14px;
+        margin-right: 6px;
+      }
+
+      &-label,
+      &-description,
+      &-reset,
+      &-note {
+        font-size: 13px;
+      }
+    }
+  }
+}

package/es/components/wallet/components/WalletCard.js

@@ -1,3 +1,7 @@
+var _excluded = ["id", "tag", "product_title", "balance", "code", "encoded", "expire_date", "shop", "limit_status", "product_cover", "par_value", "unified_messages"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useMemo } from 'react';
 import { PisellWalletPassCard } from '@pisell/materials';
 import { isMobile } from '@pisell/utils';
@@ -35,7 +39,8 @@ var WalletCard = function WalletCard(_ref) {
     _item$par_value = item.par_value,
     par_value = _item$par_value === void 0 ? '' : _item$par_value,
     _item$unified_message = item.unified_messages,
-    unified_messages = _item$unified_message === void 0 ? {} : _item$unified_message;
+    unified_messages = _item$unified_message === void 0 ? {} : _item$unified_message,
+    rest = _objectWithoutProperties(item, _excluded);
 
   // 获取平台
   var platform = useMemo(function () {
@@ -52,7 +57,7 @@ var WalletCard = function WalletCard(_ref) {
   var isActive = id === currentId && platform === 'pc';
   // 是否禁用
   var isDisabled = limit_status !== 'enable';
-  return /*#__PURE__*/React.createElement(PisellWalletPassCard, {
+  return /*#__PURE__*/React.createElement(PisellWalletPassCard, _extends({}, rest, {
     balanceTitle: balanceTitle,
     showDetail: false,
     showRedeem: false,
@@ -77,6 +82,6 @@ var WalletCard = function WalletCard(_ref) {
     code: encoded,
     validDate: expire_date,
     onClick: onClick
-  });
+  }));
 };
 export default /*#__PURE__*/React.memo(WalletCard);

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

@@ -1,2 +1,3 @@
 export { default as WalletBar } from './WalletBar';
 export { default as FooterButtons } from './FooterButtons';
+export { default as UsageRules } from './UsageRules';

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

@@ -1,3 +1,4 @@
 // 导出所有公共组件
 export { default as WalletBar } from "./WalletBar";
-export { default as FooterButtons } from "./FooterButtons";
+export { default as FooterButtons } from "./FooterButtons";
+export { default as UsageRules } from "./UsageRules";

package/es/components/walletList/index.js

@@ -30,6 +30,7 @@ import "./index.less";
 import classNames from 'classnames';
 // 导入所有类型
 import { WalletCardItem, DEFAULT_CARD_CONFIG } from "./types";
+import PinModal from "../pinModal";
 
 // 添加 localStorage 相关的操作函数
 var STORAGE_KEY = 'pisell_wallet_list_data';
@@ -176,6 +177,9 @@ var WalletList = Provider(function (props) {
   var requestIdRef = useRef('');
   var pubsub = utils === null || utils === void 0 ? void 0 : utils.pubsub;
 
+  // pinModal的ref
+  var pinModalRef = useRef(null);
+
   //获取登录状态
   var isUserLoggedIn = useMemo(function () {
     var _utils$token, _utils$token$get;
@@ -586,6 +590,14 @@ var WalletList = Provider(function (props) {
       return _ref3.apply(this, arguments);
     };
   }();
+  var _onViewPinClick = function onViewPinClick(card) {
+    if (card !== null && card !== void 0 && card.id) {
+      var _pinModalRef$current;
+      (_pinModalRef$current = pinModalRef.current) === null || _pinModalRef$current === void 0 || _pinModalRef$current.open(card === null || card === void 0 ? void 0 : card.id);
+    } else {
+      console.error('onViewPinClick方法需要传入wallet_detail_id');
+    }
+  };
   var renderWalletCard = function renderWalletCard(item) {
     var _dvaStore$core;
     var code = item.code,
@@ -652,7 +664,11 @@ var WalletList = Provider(function (props) {
     });
     return /*#__PURE__*/React.createElement(WalletCard, _extends({
       key: id
-    }, cardProps));
+    }, cardProps, {
+      onViewPinClick: function onViewPinClick() {
+        return _onViewPinClick(item);
+      }
+    }));
   };
   var carouselProps = {
     className: classNames('pisell-lowcode__walletList'),
@@ -811,7 +827,9 @@ var WalletList = Provider(function (props) {
         fontSize: '24px',
         color: currentIndex === list.length - 1 ? '#D0D5DD' : '#101828'
       }
-    }))));
+    }))), /*#__PURE__*/React.createElement(PinModal, {
+      ref: pinModalRef
+    }));
   };
 
   // 最终返回组件内容

package/es/index.d.ts

@@ -52,3 +52,5 @@ export { default as NoteModal } from './plus/noteModal';
 export { default as SaasLogin } from './plus/saasLogin';
 export { default as SaasRegister } from './plus/saasRegister';
 export { default as SaasCreateOrganization } from './plus/saasCreateOrganization';
+export { default as PinModal } from './components/pinModal';
+export { default as PinVerifyModal } from './components/pinVerifyModal';

package/es/index.js

@@ -55,4 +55,6 @@ export { default as ComprehensiveSearch } from "./pro/comprehensiveSearch";
 export { default as NoteModal } from "./plus/noteModal";
 export { default as SaasLogin } from "./plus/saasLogin";
 export { default as SaasRegister } from "./plus/saasRegister";
-export { default as SaasCreateOrganization } from "./plus/saasCreateOrganization";
+export { default as SaasCreateOrganization } from "./plus/saasCreateOrganization";
+export { default as PinModal } from "./components/pinModal";
+export { default as PinVerifyModal } from "./components/pinVerifyModal";

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

@@ -43,9 +43,11 @@ var import_utils3 = require("./utils");
 var import_index = require("./index.less");
 var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   var _a, _b;
+  const hasSubscribedRef = (0, import_react.useRef)(false);
   const context = (0, import_useEngineContext.default)();
   const config = ((_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.constants) == null ? void 0 : _b.config) || {};
   const utils = (0, import_hooks.contextUtils)();
+  const { pubsub } = context.appHelper.utils;
   const { appointmentBooking, summary, isAgreeDepositPolicy, setLoading } = (0, import_context.useAppointmentBookingContext)();
   const { isRetailTemplate } = (0, import_hooks.useAppointmentBookingSetting)();
   const goPaymentFinish = (order_id, amount) => {
@@ -141,10 +143,28 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
       }, 50);
     }
   };
+  const handleSubmit = () => {
+    var _a2, _b2, _c, _d;
+    if ((_b2 = (_a2 = utils == null ? void 0 : utils.businessUtils) == null ? void 0 : _a2.isGuestUser) == null ? void 0 : _b2.call(_a2)) {
+      if (!hasSubscribedRef.current) {
+        pubsub.subscribe("bind.guest.user", handleNext);
+        hasSubscribedRef.current = true;
+      }
+      (_d = (_c = utils == null ? void 0 : utils.businessUtils) == null ? void 0 : _c.openRegisterModal) == null ? void 0 : _d.call(_c, true);
+      return;
+    }
+    handleNext();
+  };
+  (0, import_react.useEffect)(() => {
+    return () => {
+      pubsub.unsubscribe("bind.guest.user", handleNext);
+      hasSubscribedRef.current = false;
+    };
+  }, []);
   (0, import_react.useImperativeHandle)(ref, () => ({
-    next: handleNext
+    next: handleSubmit
   }));
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, { onNext: handleNext }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "image" }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, { onNext: handleSubmit }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "image" }, /* @__PURE__ */ import_react.default.createElement(
     "img",
     {
       src: `${config == null ? void 0 : config.awsStatic}/checkout_confirm.png`,

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

@@ -84,7 +84,7 @@ var Layout = () => {
   const context = (0, import_useEngineContext.default)();
   const { pubsub } = context.appHelper.utils;
   (0, import_react.useEffect)(() => {
-    const handleLoginSuccess = async () => {
+    const handleLoginSuccess = async (res) => {
       var _a2;
       if (!isFormSubject) {
         const user = JSON.parse(((_a2 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a2.get("customer")) || "{}");
@@ -100,7 +100,7 @@ var Layout = () => {
     };
     pubsub.subscribe("pisell1.login.success", handleLoginSuccess);
     return () => {
-      pubsub.unsubscribe("pisell1.login.success");
+      pubsub.unsubscribe("pisell1.login.success", handleLoginSuccess);
     };
   }, []);
   (0, import_react.useEffect)(() => {

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

@@ -95,20 +95,27 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
         delete product.option;
         if (isRetailTemplate) {
           if (data == null ? void 0 : data.isCancel) return;
-          appointmentBooking.storeProduct(product);
+          const res = appointmentBooking.storeProduct(product);
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
           return;
         }
         const session = data == null ? void 0 : data.session;
         if (session) {
           const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
           const endDate = (0, import_dayjs.default)(session == null ? void 0 : session.end_at).format("YYYY-MM-DD");
-          appointmentBooking.addProductToCart({
+          const res = appointmentBooking.addProductToCart({
             product: { ...product },
             date: {
               startTime: `${startDate} ${session == null ? void 0 : session.start_time}`,
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
+          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -121,7 +128,10 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               import_utils.locales.getText("pisell2.appointment.no.available.service")
             );
           }
-          appointmentBooking.storeProduct(product);
+          const res = appointmentBooking.storeProduct(product);
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
           if (type === "duration") {
             await appointmentBooking.getAvailableDate();
           }

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

@@ -133,7 +133,8 @@ var VoucherCard = (props) => {
     );
   }, []);
   const onScanCode = async () => {
-    const val = await shopDiscount.scanCode(code);
+    const customerId = currentUser.id;
+    const val = await shopDiscount.scanCode(code, customerId);
     if (val == null ? void 0 : val.isAvailable) {
       batchUpdateCart(val.productList);
       setCode("");

package/lib/components/appointmentBooking/hooks.js

@@ -189,6 +189,12 @@ var useAppointmentBookingStep = () => {
       if (!result) {
         return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.date"));
       }
+      const capacityResult = appointmentBooking.checkMaxDurationCapacity();
+      if (!capacityResult.success) {
+        const getMessage = import_utils.locales.getText("pisell2.appointment.unuse.capacity");
+        const message = typeof getMessage === "function" ? getMessage(capacityResult.minAvailableCount) : getMessage;
+        return (0, import_utils2.Toast)(message);
+      }
     }
     if (!isRetailTemplate && (currentKey == null ? void 0 : currentKey.startsWith("select-resource"))) {
       const { hasError, updatedCartList } = (0, import_utils2.checkAndMarkCartRenderError)(currentSelectedResources, appointmentBooking, utils);
@@ -266,8 +272,10 @@ var useAppointmentBookingStep = () => {
       const checkLogin = async () => {
         if (!isLogin) {
           const { pubsub } = utils;
-          pubsub.once("pisell1.login.success", () => {
-            checkHolder();
+          pubsub.once("pisell1.login.success", (res) => {
+            if (res === "success") {
+              checkHolder();
+            }
           });
           return openLoginModal({
             callback: (status) => {

package/lib/components/appointmentBooking/index.js

@@ -55,6 +55,12 @@ var AppointmentBooking = () => {
       if (!data.length) {
         const currentUser = (0, import_utils2.formatCurrentUser)(utils);
         appointmentBooking.addAccounts([currentUser]);
+      } else if (data.length >= 1) {
+        const meAccount = data == null ? void 0 : data.find((d) => !(d == null ? void 0 : d.isGuest));
+        const currentUser = (0, import_utils2.formatCurrentUser)(utils);
+        if (currentUser && meAccount.id !== currentUser.id) {
+          appointmentBooking.setLoginAccount(meAccount.id, currentUser);
+        }
       }
     });
   }, []);

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

@@ -281,7 +281,7 @@ var Footer = (props) => {
     type,
     messageShow = true
   }) => {
-    var _a2;
+    var _a2, _b2, _c2, _d2, _e2;
     if ((0, import_utils2.isDayBooking)(state)) {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
@@ -306,7 +306,20 @@ var Footer = (props) => {
         title: "saveBooking",
         content: [
           { key: "下单前数据", value: JSON.stringify(values) },
-          { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") }
+          { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
+          {
+            key: "店铺id",
+            value: (_e2 = (_d2 = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id
+          },
+          {
+            key: "shopApi",
+            value: JSON.stringify(window == null ? void 0 : window.shopApi, (key, value) => {
+              if (typeof value === "function") {
+                return "function";
+              }
+              return value;
+            })
+          }
         ]
       });
       if (addonsEdit) {

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

@@ -69,9 +69,7 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = pisellos.getModule("shopDiscount");
   services = state.service;
-  const {
-    selectCustomer
-  } = (0, import_pisellos.useCustomer)();
+  const { selectCustomer } = (0, import_pisellos.useCustomer)();
   (0, import_ahooks.useDebounceEffect)(
     () => {
       if (isBooking4Shop) {

package/lib/components/booking/editBookingModal/index.js

@@ -113,7 +113,12 @@ var EditBookingModal = (props, ref) => {
               _cloned[_idx] = _targetResource;
             }
           } else {
-            _cloned.push(_targetResource);
+            const _targetIdx = _cloned.findIndex((rs) => {
+              return rs.relation_id == (_targetResource == null ? void 0 : _targetResource.relation_id);
+            });
+            if (_targetIdx === -1) {
+              _cloned.push(_targetResource);
+            }
           }
           _initResourceVal = {
             ..._initResourceVal,

package/lib/components/booking/locales.d.ts

@@ -156,6 +156,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -458,6 +460,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -760,6 +764,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;