@pisell/private-materials 6.2.9 → 6.2.11

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

@@ -4,45 +4,49 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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(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 from 'react';
+import React, { useMemo } from 'react';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import { DatePicker, SelectTime } from '@pisell/materials';
+import { useMemoizedFn } from "ahooks";
 import { Button } from 'antd';
 import classNames from 'classnames';
 import { locales } from '@pisell/utils';
 import "./index.less";
 var TimeBar = function TimeBar(props) {
-  var _state$modalState4, _state$modalState5;
+  var _state$modalState7;
   var state = props.globalState,
     setGlobalState = props.setGlobalState,
     locale = props.locale;
-  var _onClickNext = function _onClickNext() {
+  var _onClickNext = useMemoizedFn(function () {
     var _state$modalState, _props$onDateChange, _props$setIntervalTim;
     var currentTime = (_state$modalState = state.modalState) === null || _state$modalState === void 0 || (_state$modalState = _state$modalState.date) === null || _state$modalState === void 0 ? void 0 : _state$modalState.value;
     var newTime = currentTime['add'](1, 'day');
     (_props$onDateChange = props.onDateChange) === null || _props$onDateChange === void 0 || _props$onDateChange.call(props, newTime, newTime.format('YYYY-MM-DD HH:mm:ss'));
     (_props$setIntervalTim = props.setIntervalTime) === null || _props$setIntervalTim === void 0 || _props$setIntervalTim.call(props, false);
-  };
-  var _onClickPre = function _onClickPre() {
+  });
+  var _onClickPre = useMemoizedFn(function () {
     var _state$modalState2, _props$onDateChange2, _props$setIntervalTim2;
     var currentTime = (_state$modalState2 = state.modalState) === null || _state$modalState2 === void 0 || (_state$modalState2 = _state$modalState2.date) === null || _state$modalState2 === void 0 ? void 0 : _state$modalState2.value;
     var newTime = currentTime['subtract'](1, 'day');
     (_props$onDateChange2 = props.onDateChange) === null || _props$onDateChange2 === void 0 || _props$onDateChange2.call(props, newTime, newTime.format('YYYY-MM-DD HH:mm:ss'));
     (_props$setIntervalTim2 = props.setIntervalTime) === null || _props$setIntervalTim2 === void 0 || _props$setIntervalTim2.call(props, false);
-  };
-  var _onClickToday = function _onClickToday() {
-    var _props$setIntervalTim3;
-    (_props$setIntervalTim3 = props.setIntervalTime) === null || _props$setIntervalTim3 === void 0 || _props$setIntervalTim3.call(props, true);
-  };
-  var _onClickNow = function _onClickNow() {
+  });
+  var _onClickToday = useMemoizedFn(function () {
+    var _state$modalState3, _props$onDateChange3, _props$setIntervalTim3;
+    var currentTime = (_state$modalState3 = state.modalState) === null || _state$modalState3 === void 0 || (_state$modalState3 = _state$modalState3.date) === null || _state$modalState3 === void 0 ? void 0 : _state$modalState3.value;
+    var newTime = currentTime['subtract'](1, 'day');
+    (_props$onDateChange3 = props.onDateChange) === null || _props$onDateChange3 === void 0 || _props$onDateChange3.call(props, newTime, newTime.format('YYYY-MM-DD HH:mm:ss'));
+    (_props$setIntervalTim3 = props.setIntervalTime) === null || _props$setIntervalTim3 === void 0 || _props$setIntervalTim3.call(props, false);
+  });
+  var _onClickNow = useMemoizedFn(function () {
     var _props$setIntervalTim4;
     (_props$setIntervalTim4 = props.setIntervalTime) === null || _props$setIntervalTim4 === void 0 || _props$setIntervalTim4.call(props, true);
-  };
+  });
 
   // 时间选择变更事件
-  var _onDateTimeChange = function _onDateTimeChange(timeString) {
-    var _state$modalState3, _props$onDateTimeChan, _props$setIntervalTim5;
-    var currentTime = (_state$modalState3 = state.modalState) === null || _state$modalState3 === void 0 || (_state$modalState3 = _state$modalState3.date) === null || _state$modalState3 === void 0 ? void 0 : _state$modalState3.value;
+  var _onDateTimeChange = useMemoizedFn(function (timeString) {
+    var _state$modalState4, _props$onDateTimeChan, _props$setIntervalTim5;
+    var currentTime = (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value;
     var _timeString$split$map = timeString.split(':').map(Number),
       _timeString$split$map2 = _slicedToArray(_timeString$split$map, 2),
       hours = _timeString$split$map2[0],
@@ -53,63 +57,66 @@ var TimeBar = function TimeBar(props) {
       isTimeChange: true
     });
     (_props$setIntervalTim5 = props.setIntervalTime) === null || _props$setIntervalTim5 === void 0 || _props$setIntervalTim5.call(props, false);
-  };
-  return /*#__PURE__*/React.createElement("div", {
-    className: "pisell-ticket-booking-time-bar"
-  }, /*#__PURE__*/React.createElement(Button, {
-    icon: /*#__PURE__*/React.createElement(LeftOutlined, null),
-    onClick: _onClickPre,
-    size: "large"
-  }), /*#__PURE__*/React.createElement(Button, {
-    onClick: _onClickToday,
-    size: "large",
-    style: state.intervalSetTime ? {
-      background: '#000',
-      color: '#fff'
-    } : undefined
-  }, locales.getText('pisell2.ticket-booking.today')), /*#__PURE__*/React.createElement("div", {
-    className: classNames({
-      'booking-page-date-picker-select': state.isDateChange
-    }),
-    style: {
-      width: 200,
-      flexShrink: 0
-    }
-  }, /*#__PURE__*/React.createElement(DatePicker, {
-    inputReadOnly: true,
-    value: state === null || state === void 0 || (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value,
-    format: locale === 'en' ? 'dddd, DD MMM YYYY' : 'YYYY年MM月DD日',
-    onChange: props === null || props === void 0 ? void 0 : props.onDateChange,
-    size: "large",
-    style: {
-      width: '100%'
-    }
-  })), /*#__PURE__*/React.createElement(Button, {
-    icon: /*#__PURE__*/React.createElement(RightOutlined, null),
-    onClick: _onClickNext,
-    size: "large"
-  }), /*#__PURE__*/React.createElement("div", {
-    className: classNames({
-      'booking-page-date-picker-select': state.isTimeChange
-    })
-  }, /*#__PURE__*/React.createElement(SelectTime, {
-    value: state === null || state === void 0 || (_state$modalState5 = state.modalState) === null || _state$modalState5 === void 0 || (_state$modalState5 = _state$modalState5.date) === null || _state$modalState5 === void 0 ? void 0 : _state$modalState5.value.format('HH:mm'),
-    onChange: _onDateTimeChange,
-    popoverProps: {
+  });
+  return useMemo(function () {
+    var _state$modalState5, _state$modalState6;
+    return /*#__PURE__*/React.createElement("div", {
+      className: "pisell-ticket-booking-time-bar"
+    }, /*#__PURE__*/React.createElement(Button, {
+      icon: /*#__PURE__*/React.createElement(LeftOutlined, null),
+      onClick: _onClickPre,
+      size: "large"
+    }), /*#__PURE__*/React.createElement(Button, {
+      onClick: _onClickToday,
+      size: "large",
+      style: state.intervalSetTime ? {
+        background: '#000',
+        color: '#fff'
+      } : undefined
+    }, locales.getText('pisell2.ticket-booking.today')), /*#__PURE__*/React.createElement("div", {
+      className: classNames({
+        'booking-page-date-picker-select': state.isDateChange
+      }),
+      style: {
+        width: 200,
+        flexShrink: 0
+      }
+    }, /*#__PURE__*/React.createElement(DatePicker, {
+      inputReadOnly: true,
+      value: state === null || state === void 0 || (_state$modalState5 = state.modalState) === null || _state$modalState5 === void 0 || (_state$modalState5 = _state$modalState5.date) === null || _state$modalState5 === void 0 ? void 0 : _state$modalState5.value,
+      format: locale === 'en' ? 'dddd, DD MMM YYYY' : 'YYYY年MM月DD日',
+      onChange: props === null || props === void 0 ? void 0 : props.onDateChange,
+      size: "large",
       style: {
-        zoom: 0.8
+        width: '100%'
       }
-    },
-    timePickerProps: {},
-    timeProps: {},
-    slice: 5
-  })), /*#__PURE__*/React.createElement(Button, {
-    onClick: _onClickNow,
-    size: "large",
-    style: state.intervalSetTime ? {
-      background: '#000',
-      color: '#fff'
-    } : undefined
-  }, locales.getText('pisell2.ticket-booking.now')));
+    })), /*#__PURE__*/React.createElement(Button, {
+      icon: /*#__PURE__*/React.createElement(RightOutlined, null),
+      onClick: _onClickNext,
+      size: "large"
+    }), /*#__PURE__*/React.createElement("div", {
+      className: classNames({
+        'booking-page-date-picker-select': state.isTimeChange
+      })
+    }, /*#__PURE__*/React.createElement(SelectTime, {
+      value: state === null || state === void 0 || (_state$modalState6 = state.modalState) === null || _state$modalState6 === void 0 || (_state$modalState6 = _state$modalState6.date) === null || _state$modalState6 === void 0 ? void 0 : _state$modalState6.value.format('HH:mm'),
+      onChange: _onDateTimeChange,
+      popoverProps: {
+        style: {
+          zoom: 0.8
+        }
+      },
+      timePickerProps: {},
+      timeProps: {},
+      slice: 5
+    })), /*#__PURE__*/React.createElement(Button, {
+      onClick: _onClickNow,
+      size: "large",
+      style: state.intervalSetTime ? {
+        background: '#000',
+        color: '#fff'
+      } : undefined
+    }, locales.getText('pisell2.ticket-booking.now')));
+  }, [(_state$modalState7 = state.modalState) === null || _state$modalState7 === void 0 || (_state$modalState7 = _state$modalState7.date) === null || _state$modalState7 === void 0 ? void 0 : _state$modalState7.value, state.intervalSetTime, state.isTimeChange, state.isDateChange, locale]);
 };
 export default TimeBar;

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

@@ -54,6 +54,7 @@ declare const _default: {
         'pisell2.product.card.day': (val: number) => string;
         'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.minute': (val: number) => string;
+        "pisell2.ticket-booking.reload": string;
     };
     'zh-CN': {
         'pisell2.ticket-booking.info': string;
@@ -110,6 +111,7 @@ declare const _default: {
         'pisell2.product.card.day': (val: number) => string;
         'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.minute': (val: number) => string;
+        "pisell2.ticket-booking.reload": string;
     };
     'zh-HK': {
         'pisell2.ticket-booking.info': string;
@@ -166,6 +168,7 @@ declare const _default: {
         'pisell2.product.card.day': (val: number) => string;
         'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.minute': (val: number) => string;
+        "pisell2.ticket-booking.reload": string;
     };
 };
 export default _default;

package/es/components/ticketBooking/locales.js

@@ -65,7 +65,8 @@ export default {
     },
     'pisell2.product.card.minute': function pisell2ProductCardMinute(val) {
       return "".concat(val > 1 ? ' minutes' : ' minute');
-    }
+    },
+    "pisell2.ticket-booking.reload": 'Reload'
   },
   'zh-CN': {
     'pisell2.ticket-booking.info': '信息',
@@ -133,7 +134,8 @@ export default {
     },
     'pisell2.product.card.minute': function pisell2ProductCardMinute(val) {
       return '分钟';
-    }
+    },
+    "pisell2.ticket-booking.reload": '重新加载'
   },
   'zh-HK': {
     'pisell2.ticket-booking.info': '資訊',
@@ -201,6 +203,7 @@ export default {
     },
     'pisell2.product.card.minute': function pisell2ProductCardMinute(val) {
       return '分鐘';
-    }
+    },
+    "pisell2.ticket-booking.reload": '重新載入'
   }
 };

package/es/components/walletList/index.js

@@ -141,7 +141,7 @@ var DEFAULT_BALANCE = {
   discount_card_count: 0
 };
 var WalletList = Provider(function (props) {
-  var _utils$getStore, _dvaStore$core, _store$getState;
+  var _utils$getStore, _context$engine, _store$getState;
   var _props$globalState = props.globalState,
     globalState = _props$globalState === void 0 ? {} : _props$globalState; // 接收globalState属性
   var _useContext = useContext(Context),
@@ -152,8 +152,8 @@ var WalletList = Provider(function (props) {
     constants = _ref.constants,
     utils = _ref.utils;
   var dvaStore = utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 ? void 0 : _utils$getStore.getState();
-  locales.init(localeTexts, (dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en');
   // 添加组件挂载状态引用
+  locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en'); // 添加组件挂载状态引用
   var isMountedRef = useRef(true);
   var carouselRef = useRef(null);
   var store = utils.store;
@@ -587,7 +587,7 @@ var WalletList = Provider(function (props) {
     };
   }();
   var renderWalletCard = function renderWalletCard(item) {
-    var _dvaStore$core2;
+    var _dvaStore$core;
     var code = item.code,
       shop = item.shop,
       wallet = item.wallet,
@@ -643,7 +643,7 @@ var WalletList = Provider(function (props) {
       iconImg: icon,
       symbol: symbol,
       cardNo: code,
-      walletName: getLocalizedName(name, dvaStore === null || dvaStore === void 0 || (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.translateLocale),
+      walletName: getLocalizedName(name, dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale),
       shopName: shopName,
       codeType: barcodetype,
       items: cardItems,

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

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

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

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

package/es/hooks/useComponents.js

@@ -8,7 +8,7 @@ var useComponents = function useComponents(params) {
     var _utils$getComponents;
     var _ref = appHelper || {},
       utils = _ref.utils;
-    return (utils === null || utils === void 0 ? void 0 : (_utils$getComponents = utils.getComponents) === null || _utils$getComponents === void 0 ? void 0 : _utils$getComponents.call(utils, components)) || [];
+    return (utils === null || utils === void 0 || (_utils$getComponents = utils.getComponents) === null || _utils$getComponents === void 0 ? void 0 : _utils$getComponents.call(utils, components)) || [];
   }, [components]);
   return Cpt;
 };

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/utils.js

@@ -25,7 +25,6 @@ __export(utils_exports, {
   handleAddHolder: () => handleAddHolder
 });
 module.exports = __toCommonJS(utils_exports);
-var import_utils = require("../../utils");
 var checkLogin = async ({
   isLogin,
   openLoginModal,
@@ -38,16 +37,7 @@ var checkLogin = async ({
   if (!isLogin) {
     openLoginModal({
       callback: (status) => {
-        var _a;
         if (status === "success") {
-          if (!isFormSubject) {
-            const user = JSON.parse(((_a = utils == null ? void 0 : utils.storage) == null ? void 0 : _a.get("customer")) || "{}");
-            const currentUser = (0, import_utils.formatCustomer)(user);
-            const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
-            appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
-          } else {
-            getHolders();
-          }
         }
       }
     });

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

@@ -48,8 +48,11 @@ var import_context = require("../../context");
 var import_PolicyModal = __toESM(require("../../deposit/components/PolicyModal"));
 var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
+var import_useComponents = __toESM(require("../../../../hooks/useComponents"));
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_utils2 = require("../../utils");
 var Layout = () => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const stepRef = (0, import_react.useRef)();
   const {
     currentStep,
@@ -68,9 +71,37 @@ var Layout = () => {
   const { getHolders } = (0, import_hooks.useAppointmentBookingAccount)();
   const { removeStep } = (0, import_hooks.useAppointmentBookingStep)();
   const { shopDiscount } = (0, import_hooks.useShopDiscount)();
+  const { customPageData } = (_a = (0, import_useEngineContext.default)().engine) == null ? void 0 : _a.props;
+  const [CustomComponent] = (0, import_useComponents.default)({
+    components: ["CustomComponent"]
+  });
+  console.log("CustomComponent:", CustomComponent, typeof CustomComponent, CustomComponent == null ? void 0 : CustomComponent.$$typeof);
   (0, import_hooks.useAppointmentBookingCart)();
   (0, import_hooks.useAppointmentBookingStep)();
   const [params, setParams] = (0, import_react.useState)({});
+  const utils = (0, import_hooks.contextUtils)();
+  const context = (0, import_useEngineContext.default)();
+  const { pubsub } = context.appHelper.utils;
+  (0, import_react.useEffect)(() => {
+    const handleLoginSuccess = async () => {
+      var _a2;
+      if (!isFormSubject) {
+        const user = JSON.parse(((_a2 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a2.get("customer")) || "{}");
+        const currentUser = (0, import_utils2.formatCustomer)(user);
+        const accountLists = await appointmentBooking.getAccounts();
+        const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
+        appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
+      } else {
+        if (!isRetailTemplate) {
+          getHolders();
+        }
+      }
+    };
+    pubsub.subscribe("pisell1.login.success", handleLoginSuccess);
+    return () => {
+      pubsub.unsubscribe("pisell1.login.success");
+    };
+  }, []);
   (0, import_react.useEffect)(() => {
     appointmentBooking.removeStep("fill-form");
     return () => {
@@ -126,7 +157,7 @@ var Layout = () => {
       top: 0,
       behavior: "smooth"
     });
-  }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key]);
+  }, [(_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key]);
   const components = {
     // 选择服务
     "select-service": import_Services.default,
@@ -151,8 +182,14 @@ var Layout = () => {
     } else {
       Com2 = components[key];
     }
-    return /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef });
-  }, [(_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key]);
+    if (key === "select-service") {
+      return /* @__PURE__ */ import_react.default.createElement(CustomComponent, { block: customPageData == null ? void 0 : customPageData.block, customComponents: {
+        product_list: /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef })
+      } });
+    } else {
+      return /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef });
+    }
+  }, [(_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key]);
   (0, import_react.useEffect)(() => {
     var _a2, _b2;
     if ((0, import_utils.isMobile)()) {
@@ -170,7 +207,7 @@ var Layout = () => {
         content.style.overflowY = "auto";
       }
     }
-  }, [(_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key]);
+  }, [(_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key]);
   const isShowCartCom = (0, import_react.useMemo)(() => {
     var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
@@ -182,14 +219,14 @@ var Layout = () => {
       var _a3, _b2;
       return (_b2 = (_a3 = stepRef == null ? void 0 : stepRef.current) == null ? void 0 : _a3.next) == null ? void 0 : _b2.call(_a3);
     } }));
-  }, [isDateSelectedFirst, (_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key]);
+  }, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
   const isFooter = (0, import_react.useMemo)(() => {
     var _a2;
     if (!(0, import_utils.isMobile)()) return false;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     if (isDateSelectedFirst && key === "select-date") return false;
     return key !== "confirm-information";
-  }, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
+  }, [isDateSelectedFirst, (_f = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _f.key]);
   const depositProtocolRequest = (id) => {
     var _a2;
     return (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a2.call(appointmentBooking, id);

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

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

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

@@ -166,12 +166,17 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
     }
     return (productListBlock == null ? void 0 : productListBlock.setting) || {};
   }, [context]);
+  const _isMobile = (0, import_react.useMemo)(() => {
+    if (typeof import_utils.isMobile === "function") return (0, import_utils.isMobile)();
+    return import_utils.isMobile;
+  }, import_utils.isMobile);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     import_productSelect.default,
     {
       dataSource: products,
       onChange: handleSelectProduct,
-      scrollDom: (0, import_utils.isMobile)() ? ".parallel-content-wrap" : ".parallel-booking-wrap",
+      scrollDom: _isMobile ? ".parallel-content-wrap" : ".parallel-booking-wrap",
+      offsetDom: _isMobile ? "" : ".pisell-section-headers",
       loading: productLoading,
       emptyDescription: import_utils.locales.getText(
         "pisell2.appointment.booking.empty.service"

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

@@ -41,7 +41,6 @@ var import_utils = require("@pisell/utils");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
-var import_utils2 = require("../../utils");
 var import_voucher = require("../../../booking/components/voucher/index.less");
 var import_index = require("./index.less");
 var ShopDiscountHooks = {
@@ -154,16 +153,6 @@ var VoucherCard = (props) => {
           if (!action) return;
           openLoginModal({
             callback: (status) => {
-              var _a2, _b2, _c;
-              const user = (_c = (_b2 = (_a2 = utils.store) == null ? void 0 : _a2.getState()) == null ? void 0 : _b2.global) == null ? void 0 : _c.userInfo;
-              const currentUser2 = (0, import_utils2.formatCustomer)(user);
-              const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
-              if (status === "success") {
-                appointmentBooking.setLoginAccount(
-                  meAccount == null ? void 0 : meAccount.id,
-                  currentUser2
-                );
-              }
             }
           });
         }

package/lib/components/appointmentBooking/hooks.js

@@ -265,23 +265,12 @@ var useAppointmentBookingStep = () => {
       };
       const checkLogin = async () => {
         if (!isLogin) {
-          const accountLists = await appointmentBooking.getAccounts();
+          const { pubsub } = utils;
+          pubsub.once("pisell1.login.success", () => {
+            checkHolder();
+          });
           return openLoginModal({
             callback: (status) => {
-              var _a3;
-              if (status === "success") {
-                if (!isFormSubject) {
-                  const user = JSON.parse(((_a3 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a3.get("customer")) || "{}");
-                  const currentUser = (0, import_utils2.formatCustomer)(user);
-                  const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
-                  appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
-                } else {
-                  if (!isRetailTemplate) {
-                    getHolders();
-                  }
-                }
-                checkHolder();
-              }
             }
           });
         } else {
@@ -390,7 +379,7 @@ var useAppointmentBookingLogin = () => {
     utils.action({
       type: "pisell1.login",
       data: {
-        type: "plugin"
+        // type: 'plugin'
       },
       callback
     });

package/lib/components/booking/components/TabProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

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

@@ -78,6 +78,7 @@ var CustomSelect = (props, ref) => {
     handleOpenModal: propsHandleOpenModal,
     handleDayChange
   } = props;
+  console.log("custom select");
   const searchRef = (0, import_react.useRef)();
   const [_value, set_value] = (0, import_react.useState)([]);
   const [search, setSearch] = (0, import_react.useState)("");

package/lib/components/booking/components/formItemChildrenWrap/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

package/lib/components/booking/forms/table/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/lib/components/booking/hooks/useClearCart.js

@@ -37,7 +37,7 @@ var import_classnames = __toESM(require("classnames"));
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var useClearCart = (state, dispatch) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const handleClear = () => {
     dispatch({
       type: "setService",
@@ -46,17 +46,20 @@ var useClearCart = (state, dispatch) => {
       }
     });
   };
-  return !!((_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
-    "span",
-    {
-      className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {
-        ["pisell-lowcode__booking-service-clear-btn-disabled"]: !((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length)
-      }),
-      onClick: handleClear
-    },
-    /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
-    " ",
-    /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
-  );
+  return (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c, _d;
+    return !!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
+      "span",
+      {
+        className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {
+          ["pisell-lowcode__booking-service-clear-btn-disabled"]: !((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length)
+        }),
+        onClick: handleClear
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
+      " ",
+      /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
+    );
+  }, [(_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length, state.channelDisabledEdit]);
 };
 var useClearCart_default = useClearCart;