@pisell/private-materials 3.2.21 → 3.2.23

package/es/components/appointmentBooking/components/Guest/index.js

@@ -6,14 +6,10 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState } from 'react';
 import { Dropdown } from 'antd';
-import { Button, Iconfont, PisellCard, PisellAvatar } from '@pisell/materials';
+import { Button, Iconfont, PisellCard, PisellAvatar, PisellToast } from '@pisell/materials';
 import { locales, isMobile, getUniqueId } from '@pisell/utils';
-// import SelectHolderModal from '../Provider/SelectHolderModal';
-// import InformationOptionsModal from '../Provider/InformationOptionsModal/index';
-// import RemoveOptionConfirmModal from '../Provider/RemoveOptionConfirmModal';
-import { useAppointmentBookingAccount } from "../../hooks";
 import { useAppointmentBookingContext } from "../../context";
-// import appointmentBookingAccount from '../../hooks';
+import { useAppointmentBookingAccount } from "../../hooks";
 import { formatGuest } from "../../utils";
 import "./index.less";
 var Guest = function Guest() {
@@ -21,19 +17,6 @@ var Guest = function Guest() {
     _useState2 = _slicedToArray(_useState, 2),
     openOption = _useState2[0],
     setOpenOption = _useState2[1];
-  // 编辑哪个holder
-  var _useState3 = useState(null),
-    _useState4 = _slicedToArray(_useState3, 2),
-    holderItem = _useState4[0],
-    setHolderItem = _useState4[1];
-  // 移除确认
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    removeOpen = _useState6[0],
-    setRemoveOpen = _useState6[1];
-
-  // const appointmentBooking = useAppointmentBooking();
-  // const { products } = useAppointmentBookingCart();
   var _useAppointmentBookin = useAppointmentBookingContext(),
     carts = _useAppointmentBookin.carts,
     appointmentBooking = _useAppointmentBookin.appointmentBooking;
@@ -104,7 +87,6 @@ var Guest = function Guest() {
       return /*#__PURE__*/React.createElement(Button, {
         size: "large",
         onClick: function onClick() {
-          setHolderItem(item);
           setOpenOption(true);
         }
       }, locales.getText('pisell2.event.option'));
@@ -113,7 +95,6 @@ var Guest = function Guest() {
       menu: {
         items: _options,
         onClick: function onClick(e) {
-          setHolderItem(item);
           handleClick(e, item);
         }
       },
@@ -122,6 +103,12 @@ var Guest = function Guest() {
     }, /*#__PURE__*/React.createElement(Button, null, locales.getText('pisell2.event.option')));
   };
   var handleAddGuest = function handleAddGuest() {
+    // 最多添加6个人
+    if (accountLists.length >= 6) {
+      return PisellToast({
+        content: locales.getText('pisell2.appointment.max.guest')
+      });
+    }
     var guest = {
       id: getUniqueId(),
       username: "Guest".concat(accountLists.length + 1),

package/es/components/appointmentBooking/components/Header/index.js

@@ -1,14 +1,35 @@
-import React from 'react';
+import React, { useMemo } from 'react';
+import { locales } from '@pisell/utils';
 import ProgressBar from "../../../eventBooking/components/progressBar";
 import { useAppointmentBookingContext } from "../../context";
 import "./index.less";
 var Header = function Header() {
-  var _currentStep$step, _currentStep$step2;
-  // const appointmentBooking = useAppointmentBooking();
-  // const { currentStep } = useAppointmentBookingStep();
+  var _currentStep$step3, _currentStep$step5;
   var _useAppointmentBookin = useAppointmentBookingContext(),
     currentStep = _useAppointmentBookin.currentStep,
-    appointmentBooking = _useAppointmentBookin.appointmentBooking;
+    appointmentBooking = _useAppointmentBookin.appointmentBooking,
+    resources = _useAppointmentBookin.resources;
+
+  /**
+   * @title: 获取资源名称
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-04-15 21:37
+   */
+  var stepName = useMemo(function () {
+    var _currentStep$step, _currentStep$step2;
+    var key = currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key;
+
+    // 选择资源则获取资源列表的第一个名称
+    if (key === 'select-resource') {
+      var _resources$;
+      var name = (resources === null || resources === void 0 || (_resources$ = resources[0]) === null || _resources$ === void 0 || (_resources$ = _resources$.resources) === null || _resources$ === void 0 || (_resources$ = _resources$[0]) === null || _resources$ === void 0 ? void 0 : _resources$.title) || '';
+      return locales.getText('pisell2.event.select.category')(name);
+    }
+    return currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.description;
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key, resources]);
 
   /**
    * @title: 返回
@@ -18,6 +39,22 @@ var Header = function Header() {
    * @Date: 2025-01-18 22:28
    */
   var handleBack = function handleBack() {
+    var _currentStep$step4;
+    var key = currentStep === null || currentStep === void 0 || (_currentStep$step4 = currentStep.step) === null || _currentStep$step4 === void 0 ? void 0 : _currentStep$step4.key;
+
+    // 删除缓存
+    var types = {
+      'select-time': 'time',
+      'select-resource': 'resource'
+    };
+    if (types[key]) {
+      appointmentBooking.deleteCartItemInfo(types[key]);
+    }
+
+    // 清空选中的日期
+    if (key === 'select-date') {
+      appointmentBooking.clearDateRange();
+    }
     appointmentBooking.back();
   };
 
@@ -32,8 +69,8 @@ var Header = function Header() {
     appointmentBooking.close();
   };
   return /*#__PURE__*/React.createElement(ProgressBar, {
-    title: currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.title,
-    description: currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.description,
+    title: currentStep === null || currentStep === void 0 || (_currentStep$step5 = currentStep.step) === null || _currentStep$step5 === void 0 ? void 0 : _currentStep$step5.title,
+    description: stepName,
     showBack: (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) > 0,
     onBack: function onBack() {
       return handleBack();

package/es/components/appointmentBooking/components/Resource/index.d.ts

@@ -1,3 +1,3 @@
 import './index.less';
-declare const Resource: ({ onChange }: any) => JSX.Element;
+declare const Resource: () => JSX.Element;
 export default Resource;

package/es/components/appointmentBooking/components/Resource/index.js

@@ -7,13 +7,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useEffect, useMemo } from 'react';
 import { Skeleton } from 'antd';
 import ResourceDisplay from "../../../eventBooking/components/resourceDisplay";
-import { PisellCustomCheckboxGroup } from '@pisell/materials';
+import { PisellCustomCheckboxGroup, PisellToast } from '@pisell/materials';
 import { useAppointmentBookingResource } from "../../hooks";
 import { useAppointmentBookingContext } from "../../context";
-import { isMobile } from '@pisell/utils';
+import guestsImg from "../../assets/guests.svg";
+import { isMobile, locales } from '@pisell/utils';
 import "./index.less";
-var Resource = function Resource(_ref) {
-  var onChange = _ref.onChange;
+var Resource = function Resource() {
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     selectedResource = _useState2[0],
@@ -26,33 +26,34 @@ var Resource = function Resource(_ref) {
     resourceOtherParams = _useAppointmentBookin.resourceOtherParams;
   var _useAppointmentBookin2 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin2.getResourceList,
-    getResourceTimeSlot = _useAppointmentBookin2.getResourceTimeSlot,
     autoSelectAllProductResources = _useAppointmentBookin2.autoSelectAllProductResources;
-  // const { products } = useAppointmentBookingCart();
   console.log(resources, carts, appointmentBooking, 'lists, products');
   useEffect(function () {
+    var _resources$;
     var _resources = getResourceList();
-    autoSelectAllProductResources('resources');
+    var code = _resources === null || _resources === void 0 || (_resources$ = _resources[0]) === null || _resources$ === void 0 || (_resources$ = _resources$.resources) === null || _resources$ === void 0 || (_resources$ = _resources$[0]) === null || _resources$ === void 0 ? void 0 : _resources$.code;
+    autoSelectAllProductResources(code);
   }, []);
   useEffect(function () {
     var _resourceOtherParams$;
-    console.log(resourceOtherParams === null || resourceOtherParams === void 0 ? void 0 : resourceOtherParams.errorList, 'errorListerrorListerrorList');
+    // 无可用时间提示
     if ((resourceOtherParams === null || resourceOtherParams === void 0 || (_resourceOtherParams$ = resourceOtherParams.errorList) === null || _resourceOtherParams$ === void 0 ? void 0 : _resourceOtherParams$.length) > 0) {
-      return;
+      return PisellToast({
+        content: locales.getText('pisell2.appointment.no.available.time')
+      });
     }
   }, [resourceOtherParams === null || resourceOtherParams === void 0 ? void 0 : resourceOtherParams.errorList]);
   var anyResource = [{
     id: 0,
-    image: 'https://cdn-partners-api.fresha.com/employee-avatars/processed/399178/medium/3b77991b-0ee2-4d0f-9d6f-a7501b39afcd-tempImageHYe20U.jpg',
+    image: guestsImg,
     title: 'Any professional',
     subtitle: 'for maximum availability'
   }];
   var currentResource = useMemo(function () {
     if (resources.length && carts.length) {
-      console.log(resources, carts, 'lists, products');
       if (carts.length === 1) {
-        var _resources$;
-        return (_resources$ = resources[0]) === null || _resources$ === void 0 || (_resources$ = _resources$.resources) === null || _resources$ === void 0 ? void 0 : _resources$[0];
+        var _resources$2;
+        return (_resources$2 = resources[0]) === null || _resources$2 === void 0 || (_resources$2 = _resources$2.resources) === null || _resources$2 === void 0 ? void 0 : _resources$2[0];
       } else {
         return {
           renderList: []
@@ -66,15 +67,21 @@ var Resource = function Resource(_ref) {
   }, [currentResource]);
   var _onClick = function onClick(e) {
     setSelectedResource(e.id);
-    console.log(currentResource, e, 'whcurrentResourcecurrentResource');
+    console.log(currentResource, e, carts, 'whcurrentResourcecurrentResource');
     if (e.id) {
-      var _resources$2;
-      getResourceTimeSlot({
-        product: resources === null || resources === void 0 || (_resources$2 = resources[0]) === null || _resources$2 === void 0 ? void 0 : _resources$2.product,
-        resources: currentResource === null || currentResource === void 0 ? void 0 : currentResource.renderList,
-        currentResourceId: e.id
+      var _carts$;
+      // getResourceTimeSlot('resources');
+      return appointmentBooking.updateCart({
+        _id: carts === null || carts === void 0 || (_carts$ = carts[0]) === null || _carts$ === void 0 ? void 0 : _carts$._id,
+        resources: [e]
       });
 
+      // getResourceTimeSlot({
+      //   product: resources?.[0]?.product,
+      //   resources: currentResource?.renderList,
+      //   currentResourceId: e.id,
+      // });
+
       // onChange({
       //   times: times,
       //   product: resources?.[0]?.product,
@@ -97,7 +104,8 @@ var Resource = function Resource(_ref) {
         dataSource: item,
         direction: "vertical",
         children: !(item !== null && item !== void 0 && item.image) ? item === null || item === void 0 || (_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title.charAt(0).toUpperCase() : null,
-        selected: selectedResource === (item === null || item === void 0 ? void 0 : item.id)
+        selected: selectedResource === (item === null || item === void 0 ? void 0 : item.id),
+        className: !item.id ? 'appointment-resource-guest-card' : ''
       });
     },
     columns: isMobile() ? 2 : 3,

package/es/components/appointmentBooking/components/Resource/index.less

@@ -3,4 +3,9 @@
   .pisell-lowcode-card {
     min-height: 166px !important;
   }
+
+  .appointment-resource-guest-card .pisell-lowcode-avatar-image img {
+    width: 50%;
+    height: 50%;
+  }
 }

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

@@ -11,14 +11,16 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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, { useRef, useState, useMemo, useEffect } from 'react';
+import { Input } from 'antd';
 import SearchLg from '@pisell/icon/es/SearchLg';
 import { locales } from '@pisell/utils';
-import { PisellEmpty } from '@pisell/materials';
-import { Input } from 'antd';
+import { PisellEmpty, PisellToast } from '@pisell/materials';
 import TabProduct from "../../../booking/components/TabProduct";
 import { formatProductListByCategory } from "../../../booking/utils";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useAppointmentBookingContext } from "../../context";
+import { useAppointmentBookingAccount, useAppointmentBooking } from "../../hooks";
+import { formatCurrentUser } from "../../utils";
 import "./index.less";
 var Services = function Services() {
   var searchRef = useRef();
@@ -29,11 +31,23 @@ var Services = function Services() {
   var context = useEngineContext();
   var _ref = context.appHelper || {},
     utils = _ref.utils;
+  var appointmentBooking = useAppointmentBooking();
   var _useAppointmentBookin = useAppointmentBookingContext(),
-    appointmentBooking = _useAppointmentBookin.appointmentBooking,
     products = _useAppointmentBookin.products,
     setProducts = _useAppointmentBookin.setProducts;
+  var _useAppointmentBookin2 = useAppointmentBookingAccount(),
+    accountLists = _useAppointmentBookin2.accountLists;
+  var accountRef = useRef(accountLists);
+  var currentUser = formatCurrentUser();
   useEffect(function () {
+    console.log(accountLists, accountRef, 'wh978896786');
+  }, [accountLists, accountRef]);
+  useEffect(function () {
+    var _accountRef$current;
+    console.log(accountRef.current, currentUser, 'accountRef');
+    if (!((_accountRef$current = accountRef.current) !== null && _accountRef$current !== void 0 && _accountRef$current.length) && currentUser) {
+      appointmentBooking.addAccount([currentUser]);
+    }
     var _ref2 = appointmentBooking.otherParams || {},
       productModuleParams = _ref2.productModuleParams;
     appointmentBooking.loadProducts(productModuleParams).then(function (res) {
@@ -53,12 +67,9 @@ var Services = function Services() {
           return item.status === 1;
         });
         if (!activeStatus) {
-          // console.log(PisellToast, 'PisellToast');
-          // return PisellToast({
-          //   content: locales.getText(
-          //     'pisell2.appointment.no.available.service'
-          //   ),
-          // });
+          return PisellToast({
+            content: locales.getText('pisell2.appointment.no.available.service')
+          });
         }
         var product = _objectSpread(_objectSpread({}, data), {}, {
           options: (data === null || data === void 0 ? void 0 : data.option) || []

package/es/components/appointmentBooking/components/TimeSlicing/index.js

@@ -8,8 +8,9 @@ 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, { useState } from 'react';
-import { Iconfont } from '@pisell/materials';
+import React, { useEffect, useState } from 'react';
+import { Iconfont, PisellEmpty } from '@pisell/materials';
+import { locales } from '@pisell/utils';
 import { useAppointmentBookingContext } from "../../context";
 import "./index.less";
 var Resource = function Resource(_ref) {
@@ -22,49 +23,61 @@ var Resource = function Resource(_ref) {
     times = _useAppointmentBookin.times,
     resources = _useAppointmentBookin.resources,
     appointmentBooking = _useAppointmentBookin.appointmentBooking,
-    carts = _useAppointmentBookin.carts;
+    carts = _useAppointmentBookin.carts,
+    setSelectedTime = _useAppointmentBookin.setSelectedTime;
   console.log(params, resources, times, 'wh8765');
-  var _onClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
-      var _resources$;
-      var data, _resources$2, _resources$3, _resources, aa;
+  var getAutoSelect = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(val) {
+      var _yield$appointmentBoo, errorList, result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setSelectedResource(e === null || e === void 0 ? void 0 : e.start_time);
+            setSelectedTime(val);
             _context.next = 3;
-            return appointmentBooking.autoSelectResource({
-              resourceProductData: resources === null || resources === void 0 ? void 0 : resources[0],
-              resources: resources === null || resources === void 0 || (_resources$ = resources[0]) === null || _resources$ === void 0 || (_resources$ = _resources$.resources) === null || _resources$ === void 0 || (_resources$ = _resources$[1]) === null || _resources$ === void 0 ? void 0 : _resources$.renderList,
-              timeSlots: e
-            });
+            return appointmentBooking.autoSelectAllProductResources('sites', val);
           case 3:
-            data = _context.sent;
-            if (!data) {
-              _context.next = 10;
-              break;
-            }
-            _resources = [resources === null || resources === void 0 || (_resources$2 = resources[0]) === null || _resources$2 === void 0 || (_resources$2 = _resources$2.resources) === null || _resources$2 === void 0 || (_resources$2 = _resources$2[0]) === null || _resources$2 === void 0 || (_resources$2 = _resources$2.renderList) === null || _resources$2 === void 0 ? void 0 : _resources$2[0], resources === null || resources === void 0 || (_resources$3 = resources[0]) === null || _resources$3 === void 0 || (_resources$3 = _resources$3.resources) === null || _resources$3 === void 0 || (_resources$3 = _resources$3[1]) === null || _resources$3 === void 0 || (_resources$3 = _resources$3.renderList) === null || _resources$3 === void 0 ? void 0 : _resources$3[0]];
-            _context.next = 8;
-            return appointmentBooking.submitTimeSlot({
-              resourceProductData: resources === null || resources === void 0 ? void 0 : resources[0],
-              selectedResources: _resources,
-              timeSlots: e
-            });
-          case 8:
-            aa = _context.sent;
-            console.log(data, _resources, aa, 'wh9879676');
-          case 10:
+            _yield$appointmentBoo = _context.sent;
+            errorList = _yield$appointmentBoo.errorList;
+            _context.next = 7;
+            return appointmentBooking.submitTimeSlot(val);
+          case 7:
+            result = _context.sent;
+            console.log(errorList, result, 'wh9896788');
+          case 9:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function onClick(_x) {
+    return function getAutoSelect(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
-  return /*#__PURE__*/React.createElement("div", {
+  useEffect(function () {
+    if ((times === null || times === void 0 ? void 0 : times.length) > 0) {
+      var _times$;
+      setSelectedResource(times === null || times === void 0 || (_times$ = times[0]) === null || _times$ === void 0 ? void 0 : _times$.start_time);
+      getAutoSelect(times === null || times === void 0 ? void 0 : times[0]);
+    }
+  }, [times]);
+  var _onClick = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            setSelectedResource(e === null || e === void 0 ? void 0 : e.start_time);
+            getAutoSelect(e);
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onClick(_x2) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  return (times === null || times === void 0 ? void 0 : times.length) > 0 ? /*#__PURE__*/React.createElement("div", {
     className: 'appointment-time-slicing-wrap'
   }, times.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
@@ -77,6 +90,8 @@ var Resource = function Resource(_ref) {
       type: "pisell2-chevron-right",
       className: "icon"
     }));
-  }));
+  })) : /*#__PURE__*/React.createElement(PisellEmpty, {
+    description: locales.getText('pisell2.appointment.booking.empty.time')
+  });
 };
 export default Resource;

package/es/components/appointmentBooking/components/TimeSlicing/index.less

@@ -18,6 +18,10 @@
 
     &:hover {
       background-color: #f1f1f1;
+      cursor: pointer;
+    }
+    &.active {
+      background-color: #f1f1f1;
     }
   }
 }

package/es/components/appointmentBooking/components/Voucher/index.d.ts

@@ -0,0 +1,4 @@
+import '../../../booking/components/voucher/index.less';
+import './index.less';
+declare const VoucherCard: (props: any) => JSX.Element;
+export default VoucherCard;