@pisell/private-materials 3.2.23 → 3.2.26

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

@@ -8,6 +8,7 @@ import React, { useMemo, useState } from 'react';
 import { Dropdown } from 'antd';
 import { Button, Iconfont, PisellCard, PisellAvatar, PisellToast } from '@pisell/materials';
 import { locales, isMobile, getUniqueId } from '@pisell/utils';
+import InformationOptionsModal from "./components/InformationOptionsModal";
 import { useAppointmentBookingContext } from "../../context";
 import { useAppointmentBookingAccount } from "../../hooks";
 import { formatGuest } from "../../utils";
@@ -17,6 +18,11 @@ 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 _useAppointmentBookin = useAppointmentBookingContext(),
     carts = _useAppointmentBookin.carts,
     appointmentBooking = _useAppointmentBookin.appointmentBooking;
@@ -56,6 +62,7 @@ var Guest = function Guest() {
    */
   var handleClick = function handleClick(_ref, item) {
     var key = _ref.key;
+    console.log(key, item, 'wh978967');
     // 编辑holder
     if (key === 'edit') {
       appointmentBooking.setActiveAccount(item.id);
@@ -87,6 +94,7 @@ var Guest = function Guest() {
       return /*#__PURE__*/React.createElement(Button, {
         size: "large",
         onClick: function onClick() {
+          setHolderItem(item);
           setOpenOption(true);
         }
       }, locales.getText('pisell2.event.option'));
@@ -95,11 +103,12 @@ var Guest = function Guest() {
       menu: {
         items: _options,
         onClick: function onClick(e) {
+          setHolderItem(item);
           handleClick(e, item);
         }
       },
       placement: "bottomRight",
-      overlayClassName: "provider-information-custom-dropdown-menu"
+      overlayClassName: "appointment-guest-custom-dropdown-menu"
     }, /*#__PURE__*/React.createElement(Button, null, locales.getText('pisell2.event.option')));
   };
   var handleAddGuest = function handleAddGuest() {
@@ -119,7 +128,7 @@ var Guest = function Guest() {
     appointmentBooking.back();
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "provider-information-wrap"
+    className: "appointment-guest-wrap"
   }, lists === null || lists === void 0 ? void 0 : lists.map(function (item) {
     var _item$children;
     return /*#__PURE__*/React.createElement(PisellCard, {
@@ -145,12 +154,23 @@ var Guest = function Guest() {
       width: 'max-content'
     },
     onClick: handleAddGuest,
-    className: "provider-information-add-button"
+    className: "appointment-guest-add-button"
   }, /*#__PURE__*/React.createElement(Iconfont, {
     type: "pisell2-plus",
     style: {
       fontSize: '20px'
     }
-  }), locales.getText('pisell2.appointment.add.guest'))));
+  }), locales.getText('pisell2.appointment.add.guest'))), openOption ? /*#__PURE__*/React.createElement(InformationOptionsModal, {
+    options: options,
+    open: openOption,
+    holderItem: holderItem,
+    onCancel: function onCancel() {
+      return setOpenOption(false);
+    },
+    onClick: function onClick(e) {
+      handleClick(e, holderItem);
+      setOpenOption(false);
+    }
+  }) : null);
 };
 export default Guest;

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

@@ -1,4 +1,4 @@
-.provider-information-wrap {
+.appointment-guest-wrap {
   padding: 16px;
   display: flex;
   flex-direction: column;
@@ -7,7 +7,7 @@
   margin-top: 16px;
   width: 100%;
 
-  .provider-information-add-button {
+  .appointment-guest-add-button {
     display: flex;
     align-items: center;
     .pisell-lowcode-image-mask-info {
@@ -64,7 +64,7 @@
   }
 }
 
-.provider-information-custom-dropdown-menu {
+.appointment-guest-custom-dropdown-menu {
   .pisell-lowcode-dropdown-menu {
     padding: 6px;
     border-bottom: 1px solid var(--Gray-200, #eaecf0);

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

@@ -2,6 +2,8 @@ import React, { useMemo } from 'react';
 import { locales } from '@pisell/utils';
 import ProgressBar from "../../../eventBooking/components/progressBar";
 import { useAppointmentBookingContext } from "../../context";
+import { useShopDiscount } from "../../hooks";
+import useEngineContext from "../../../../hooks/useEngineContext";
 import "./index.less";
 var Header = function Header() {
   var _currentStep$step3, _currentStep$step5;
@@ -9,6 +11,8 @@ var Header = function Header() {
     currentStep = _useAppointmentBookin.currentStep,
     appointmentBooking = _useAppointmentBookin.appointmentBooking,
     resources = _useAppointmentBookin.resources;
+  var shopDiscount = useShopDiscount();
+  var context = useEngineContext();
 
   /**
    * @title: 获取资源名称
@@ -66,7 +70,11 @@ var Header = function Header() {
    * @Date: 2025-01-22 13:43
    */
   var handleClose = function handleClose() {
-    appointmentBooking.close();
+    var _utils$history;
+    appointmentBooking.destroy();
+    shopDiscount.destroy();
+    var utils = context.appHelper.utils || {};
+    utils === null || utils === void 0 || (_utils$history = utils.history) === null || _utils$history === void 0 || _utils$history.replace('/');
   };
   return /*#__PURE__*/React.createElement(ProgressBar, {
     title: currentStep === null || currentStep === void 0 || (_currentStep$step5 = currentStep.step) === null || _currentStep$step5 === void 0 ? void 0 : _currentStep$step5.title,

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

@@ -18,7 +18,6 @@ var Resource = function Resource() {
     _useState2 = _slicedToArray(_useState, 2),
     selectedResource = _useState2[0],
     setSelectedResource = _useState2[1];
-  // const appointmentBooking = useAppointmentBooking();
   var _useAppointmentBookin = useAppointmentBookingContext(),
     appointmentBooking = _useAppointmentBookin.appointmentBooking,
     resources = _useAppointmentBookin.resources,
@@ -27,12 +26,10 @@ var Resource = function Resource() {
   var _useAppointmentBookin2 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin2.getResourceList,
     autoSelectAllProductResources = _useAppointmentBookin2.autoSelectAllProductResources;
-  console.log(resources, carts, appointmentBooking, 'lists, products');
   useEffect(function () {
-    var _resources$;
     var _resources = getResourceList();
-    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);
+    autoSelectAllProductResources();
+    getResourceList();
   }, []);
   useEffect(function () {
     var _resourceOtherParams$;
@@ -46,14 +43,14 @@ var Resource = function Resource() {
   var anyResource = [{
     id: 0,
     image: guestsImg,
-    title: 'Any professional',
-    subtitle: 'for maximum availability'
+    title: locales.getText('pisell2.appointment.any.professional'),
+    subtitle: locales.getText('pisell2.appointment.for.maximum.availability')
   }];
   var currentResource = useMemo(function () {
     if (resources.length && carts.length) {
       if (carts.length === 1) {
-        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];
+        var _resources$;
+        return (_resources$ = resources[0]) === null || _resources$ === void 0 || (_resources$ = _resources$.resources) === null || _resources$ === void 0 ? void 0 : _resources$[0];
       } else {
         return {
           renderList: []
@@ -62,31 +59,16 @@ var Resource = function Resource() {
     }
   }, [resources, carts]);
   var resourcesResult = useMemo(function () {
-    console.log(currentResource, resources, 'wh98765756');
     return anyResource.concat((currentResource === null || currentResource === void 0 ? void 0 : currentResource.renderList) || []);
   }, [currentResource]);
   var _onClick = function onClick(e) {
     setSelectedResource(e.id);
-    console.log(currentResource, e, carts, 'whcurrentResourcecurrentResource');
     if (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,
-      //   resources: resources[0]?.resources?.[1]?.renderList || [],
-      // });
     }
   };
   return /*#__PURE__*/React.createElement("div", {

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

@@ -1,5 +1,4 @@
 .appointment-resource-wrap {
-  padding-top: 16px;
   .pisell-lowcode-card {
     min-height: 166px !important;
   }

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

@@ -19,8 +19,7 @@ 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 { useAppointmentBooking } from "../../hooks";
 import "./index.less";
 var Services = function Services() {
   var searchRef = useRef();
@@ -35,19 +34,7 @@ var Services = function Services() {
   var _useAppointmentBookin = useAppointmentBookingContext(),
     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) {

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

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

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

@@ -12,45 +12,50 @@ import React, { useEffect, useState } from 'react';
 import { Iconfont, PisellEmpty } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import { useAppointmentBookingContext } from "../../context";
+import { useAppointmentBookingResource } from "../../hooks";
 import "./index.less";
-var Resource = function Resource(_ref) {
-  var params = _ref.params;
+var Resource = function Resource() {
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     selectedResource = _useState2[0],
     setSelectedResource = _useState2[1];
   var _useAppointmentBookin = useAppointmentBookingContext(),
     times = _useAppointmentBookin.times,
-    resources = _useAppointmentBookin.resources,
     appointmentBooking = _useAppointmentBookin.appointmentBooking,
-    carts = _useAppointmentBookin.carts,
-    setSelectedTime = _useAppointmentBookin.setSelectedTime;
-  console.log(params, resources, times, 'wh8765');
+    setSelectedTime = _useAppointmentBookin.setSelectedTime,
+    resourceOtherParams = _useAppointmentBookin.resourceOtherParams;
+  var _useAppointmentBookin2 = useAppointmentBookingResource(),
+    getResourceTimeSlot = _useAppointmentBookin2.getResourceTimeSlot,
+    getResourceList = _useAppointmentBookin2.getResourceList;
+  useEffect(function () {
+    getResourceTimeSlot();
+  }, []);
   var getAutoSelect = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(val) {
-      var _yield$appointmentBoo, errorList, result;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(val) {
+      var _getResourceList, resourceCodes, _yield$appointmentBoo, errorList, result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setSelectedTime(val);
-            _context.next = 3;
-            return appointmentBooking.autoSelectAllProductResources('sites', val);
-          case 3:
+            _getResourceList = getResourceList(), resourceCodes = _getResourceList.resourceCodes;
+            _context.next = 4;
+            return appointmentBooking.autoSelectAllProductResources(resourceCodes === null || resourceCodes === void 0 ? void 0 : resourceCodes[1], val);
+          case 4:
             _yield$appointmentBoo = _context.sent;
             errorList = _yield$appointmentBoo.errorList;
-            _context.next = 7;
+            _context.next = 8;
             return appointmentBooking.submitTimeSlot(val);
-          case 7:
+          case 8:
             result = _context.sent;
             console.log(errorList, result, 'wh9896788');
-          case 9:
+          case 10:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function getAutoSelect(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
   useEffect(function () {
@@ -61,7 +66,7 @@ var Resource = function Resource(_ref) {
     }
   }, [times]);
   var _onClick = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -74,7 +79,7 @@ var Resource = function Resource(_ref) {
       }, _callee2);
     }));
     return function onClick(_x2) {
-      return _ref3.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   return (times === null || times === void 0 ? void 0 : times.length) > 0 ? /*#__PURE__*/React.createElement("div", {

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

@@ -1,4 +1,5 @@
 .appointment-time-slicing-wrap {
+  padding-top: 20px;
   .item {
     cursor: pointer;
     padding: 25px 20px;

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

@@ -20,8 +20,7 @@ import classNames from 'classnames';
 import { Button } from 'antd';
 import { locales } from '@pisell/utils';
 import useEngineContext from "../../../../hooks/useEngineContext";
-import { PisellInput, PisellTooltip, PisellGoodPassCard, PisellText, PisellToast } from '@pisell/materials';
-import { QuestionCircleOutlined } from '@ant-design/icons';
+import { PisellInput, PisellGoodPassCard, PisellText, PisellToast } from '@pisell/materials';
 import { useAppointmentBooking, useShopDiscount, useAppointmentBookingLogin, useAppointmentBookingAccount } from "../../hooks";
 import { formatCustomer } from "../../utils";
 import "../../../booking/components/voucher/index.less";
@@ -126,6 +125,7 @@ var VoucherCard = function VoucherCard(props) {
             val = _context.sent;
             if (val !== null && val !== void 0 && val.isAvailable) {
               cart === null || cart === void 0 || cart.batchSetItems(val.productList);
+              setCode('');
             } else {
               PisellToast({
                 content: locales.getText('pisell2.text.goodpass.code-invalid')
@@ -217,14 +217,14 @@ var VoucherCard = function VoucherCard(props) {
         setCode((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
       },
       size: "small",
-      placeholder: locales.getText('pisell2.text.goodpass.enter-code'),
-      suffix: /*#__PURE__*/React.createElement(PisellTooltip, {
-        title: ""
-      }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, {
-        style: {
-          color: 'rgba(0,0,0,.45)'
-        }
-      }))
+      placeholder: locales.getText('pisell2.text.goodpass.enter-code')
+      // suffix={
+      //   <PisellTooltip title="">
+      //     <QuestionCircleOutlined
+      //       style={{ color: 'rgba(0,0,0,.45)' }}
+      //     />
+      //   </PisellTooltip>
+      // }
     })), /*#__PURE__*/React.createElement(Button, {
       size: "small",
       onClick: onScanCode,

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

@@ -55,7 +55,10 @@ export declare const useAppointmentBookingAccount: () => {
  * @Date: 2025-04-15 11:29
  */
 export declare const useAppointmentBookingResource: () => {
-    getResourceTimeSlot: (params: any) => Promise<void>;
-    getResourceList: () => any;
-    autoSelectAllProductResources: (code: string) => Promise<any>;
+    getResourceTimeSlot: (index?: number) => Promise<void>;
+    getResourceList: () => {
+        resources: any;
+        resourceCodes: any;
+    };
+    autoSelectAllProductResources: (index?: number) => Promise<any>;
 };

package/es/components/appointmentBooking/hooks.js

@@ -42,17 +42,20 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
     setCurrentStep = _useAppointmentBookin.setCurrentStep,
     setIsLastStep = _useAppointmentBookin.setIsLastStep;
   var stepList = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s = appointmentBooking.store) === null || _appointmentBooking$s === void 0 || (_appointmentBooking$s = _appointmentBooking$s.step) === null || _appointmentBooking$s === void 0 || (_appointmentBooking$s = _appointmentBooking$s.store) === null || _appointmentBooking$s === void 0 ? void 0 : _appointmentBooking$s.stepList) || [];
+  var getCurrentAndLastStep = function getCurrentAndLastStep() {
+    var _currentStep = appointmentBooking.getCurrentStep();
+    setCurrentStep(_currentStep);
+    setIsLastStep((_currentStep === null || _currentStep === void 0 ? void 0 : _currentStep.index) === stepList.length - 1);
+  };
   useEffect(function () {
+    getCurrentAndLastStep();
     pisellOS.effects.on('appointmentBooking_step:changed', /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
-        var _currentStep;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (res.path === 'currentStep') {
-                _currentStep = appointmentBooking.getCurrentStep();
-                setCurrentStep(_currentStep);
-                setIsLastStep((_currentStep === null || _currentStep === void 0 ? void 0 : _currentStep.index) === stepList.length - 1);
+                getCurrentAndLastStep();
               }
             case 1:
             case "end":
@@ -187,7 +190,6 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
     setAccountLists = _useState2[1];
   var getAccountLists = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _appointmentBooking$s2;
       var data;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -196,8 +198,8 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
             return appointmentBooking.getAccounts();
           case 2:
             data = _context4.sent;
+            console.log('appointmentBooking_accountList:changed', data);
             setAccountLists(data || []);
-            console.log('currentUser4455777', appointmentBooking, (_appointmentBooking$s2 = appointmentBooking.store) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.accountList) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.store) === null || _appointmentBooking$s2 === void 0 ? void 0 : _appointmentBooking$s2.accountList, data);
           case 5:
           case "end":
             return _context4.stop();
@@ -209,12 +211,14 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
     };
   }();
   useEffect(function () {
+    getAccountLists();
     pisellOS.effects.on('appointmentBooking_accountList:changed', /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(res) {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               if (res.path === 'accounts') {
+                console.log('appointmentBooking_accountList:changed', res);
                 getAccountLists();
               }
             case 1:
@@ -227,7 +231,6 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
         return _ref6.apply(this, arguments);
       };
     }());
-    getAccountLists();
   }, []);
   return {
     accountLists: accountLists
@@ -251,19 +254,41 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
   var _ref7 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {},
     resourceSort = _ref7.resourceSort;
 
+  // 设置资源列表
+  var getResourceList = function getResourceList() {
+    var _resources2;
+    var resources = appointmentBooking.getResourcesList();
+    resources = resources.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        resources: sortResources((item === null || item === void 0 ? void 0 : item.resources) || [], resourceSort)
+      });
+    });
+    var _resources = ((_resources2 = resources) === null || _resources2 === void 0 || (_resources2 = _resources2[0]) === null || _resources2 === void 0 ? void 0 : _resources2.resources) || [];
+    var resourceCodes = _resources.map(function (item) {
+      return item.code;
+    });
+    setResources(resources || []);
+    return {
+      resources: resources,
+      resourceCodes: resourceCodes
+    };
+  };
+
   // 设置时间切片
   var getResourceTimeSlot = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
-      var data;
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(index) {
+      var _getResourceList, resourceCodes, code, data;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context6.next = 2;
-            return appointmentBooking.getTimeSlotByAllResources(params);
-          case 2:
+            _getResourceList = getResourceList(), resourceCodes = _getResourceList.resourceCodes;
+            code = resourceCodes === null || resourceCodes === void 0 ? void 0 : resourceCodes[index || 0];
+            _context6.next = 4;
+            return appointmentBooking.getTimeSlotByAllResources(code);
+          case 4:
             data = _context6.sent;
             setTimes(data || []);
-          case 4:
+          case 6:
           case "end":
             return _context6.stop();
         }
@@ -274,33 +299,28 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
     };
   }();
 
-  // 设置资源列表
-  var getResourceList = function getResourceList() {
-    var resources = appointmentBooking.getResourcesList();
-    resources = resources.map(function (item) {
-      return _objectSpread(_objectSpread({}, item), {}, {
-        resources: sortResources((item === null || item === void 0 ? void 0 : item.resources) || [], resourceSort)
-      });
-    });
-    setResources(resources || []);
-    console.log(resources, 'resourcesresources');
-    return resources;
-  };
-
   // 获取自动分配
   var autoSelectAllProductResources = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(code) {
-      var res;
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(index) {
+      var _getResourceList2, resourceCodes, code, data, res;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _context7.next = 2;
+            _getResourceList2 = getResourceList(), resourceCodes = _getResourceList2.resourceCodes;
+            code = resourceCodes === null || resourceCodes === void 0 ? void 0 : resourceCodes[index || 0];
+            _context7.next = 4;
+            return appointmentBooking.getTimeSlotByAllResources(code);
+          case 4:
+            data = _context7.sent;
+            _context7.next = 7;
             return appointmentBooking.autoSelectAllProductResources(code);
-          case 2:
+          case 7:
             res = _context7.sent;
-            setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), res));
+            setResourceOtherParams(_objectSpread(_objectSpread(_objectSpread({}, resourceOtherParams), res), {}, {
+              resourceCodes: resourceCodes
+            }));
             return _context7.abrupt("return", res);
-          case 5:
+          case 10:
           case "end":
             return _context7.stop();
         }

package/es/components/appointmentBooking/index.js

@@ -4,7 +4,8 @@ import useEngineContext from "../../hooks/useEngineContext";
 import { AppointmentBookingProvider } from "./context";
 import Content from "./components/Content";
 import localeTexts from "./locales";
-import { useAppointmentBooking, useAppointmentBookingAccount } from "./hooks";
+import { useAppointmentBooking } from "./hooks";
+import { formatCurrentUser } from "./utils";
 import "./index.less";
 var AppointmentBooking = function AppointmentBooking() {
   var _utils$storage;
@@ -12,16 +13,14 @@ var AppointmentBooking = function AppointmentBooking() {
   var utils = context.appHelper.utils || {};
   locales.init(localeTexts, (utils === null || utils === void 0 || (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('umi_locale')) || 'en');
   var appointmentBooking = useAppointmentBooking();
-  var _useAppointmentBookin = useAppointmentBookingAccount(),
-    accountLists = _useAppointmentBookin.accountLists;
-  console.log(appointmentBooking, 'wh97886786currentUser4455777');
+  var currentUser = formatCurrentUser();
   useEffect(function () {
-    var res = appointmentBooking.getAccounts();
-    console.log(res, 'wh98867');
+    appointmentBooking.getAccounts().then(function (data) {
+      if (!data.length) {
+        appointmentBooking.addAccount([currentUser]);
+      }
+    });
   }, []);
-  useEffect(function () {
-    console.log(accountLists, 'wh98867555');
-  }, [accountLists]);
   return /*#__PURE__*/React.createElement("div", {
     className: "parallel-booking-wrap ".concat(isMobile() ? 'parallel-booking-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement(AppointmentBookingProvider, null, /*#__PURE__*/React.createElement(Content, null)));

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

@@ -85,6 +85,8 @@ declare const _default: {
         'pisell2.appointment.friday': string;
         'pisell2.appointment.saturday': string;
         'pisell2.appointment.sunday': string;
+        'pisell2.appointment.any.professional': string;
+        'pisell2.appointment.for.maximum.availability': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -181,6 +183,8 @@ declare const _default: {
         'pisell2.appointment.friday': string;
         'pisell2.appointment.saturday': string;
         'pisell2.appointment.sunday': string;
+        'pisell2.appointment.any.professional': string;
+        'pisell2.appointment.for.maximum.availability': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -277,6 +281,8 @@ declare const _default: {
         'pisell2.appointment.friday': string;
         'pisell2.appointment.saturday': string;
         'pisell2.appointment.sunday': string;
+        'pisell2.appointment.any.professional': string;
+        'pisell2.appointment.for.maximum.availability': string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;

package/es/components/appointmentBooking/locales.js

@@ -99,6 +99,8 @@ export default {
     'pisell2.appointment.friday': 'Fri',
     'pisell2.appointment.saturday': 'Sat',
     'pisell2.appointment.sunday': 'Sun',
+    'pisell2.appointment.any.professional': 'Any professional',
+    'pisell2.appointment.for.maximum.availability': 'for maximum availability',
     'pisell2.text.apply': 'Apply',
     'pisell2.text.goodpass': "GoodPass",
     'pisell2.text.goodpass.product-vouchers': "Product Vouchers",
@@ -209,6 +211,8 @@ export default {
     'pisell2.appointment.friday': '周五',
     'pisell2.appointment.saturday': '周六',
     'pisell2.appointment.sunday': '周日',
+    'pisell2.appointment.any.professional': '随机分配',
+    'pisell2.appointment.for.maximum.availability': '立即匹配',
     'pisell2.text.apply': '应用',
     'pisell2.text.goodpass': "商品券",
     'pisell2.text.goodpass.product-vouchers': "商品兑换券",
@@ -319,6 +323,8 @@ export default {
     'pisell2.appointment.friday': '周五',
     'pisell2.appointment.saturday': '周六',
     'pisell2.appointment.sunday': '周日',
+    'pisell2.appointment.any.professional': '隨機分配',
+    'pisell2.appointment.for.maximum.availability': '立即匹配',
     'pisell2.text.apply': '應用',
     'pisell2.text.goodpass': "商品券",
     'pisell2.text.goodpass.product-vouchers': "商品兌換券",