@pisell/private-materials 3.3.33 → 3.3.35

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

@@ -28,15 +28,16 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
     utils = _ref.utils;
   var appointmentBooking = useAppointmentBooking();
   var _useAppointmentBookin = useAppointmentBookingSetting(),
-    isDateSelectedFirst = _useAppointmentBookin.isDateSelectedFirst;
+    isDateSelectedFirst = _useAppointmentBookin.isDateSelectedFirst,
+    isRetailTemplate = _useAppointmentBookin.isRetailTemplate;
   var _useAppointmentBookin2 = useAppointmentBookingProduct(),
     getProducts = _useAppointmentBookin2.getProducts,
     checkProductType = _useAppointmentBookin2.checkProductType;
   var _useAppointmentBookin3 = useAppointmentBookingStep(),
     removeStep = _useAppointmentBookin3.removeStep,
     nextStep = _useAppointmentBookin3.nextStep;
-  var _useAppointmentBookin4 = useAppointmentBookingContext(),
-    currentStep = _useAppointmentBookin4.currentStep;
+  var _ref2 = useAppointmentBookingContext(),
+    currentStep = _ref2.currentStep;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     products = _useState2[0],
@@ -63,18 +64,25 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
     });
   }, [isDateSelectedFirst]);
   var handleSelectProduct = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
       var type;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
+            // 不是零售模版才触发检测商品
+            type = '';
+            if (isRetailTemplate) {
+              _context2.next = 6;
+              break;
+            }
+            _context2.next = 4;
             return checkProductType(item === null || item === void 0 ? void 0 : item.id);
-          case 2:
+          case 4:
             type = _context2.sent;
             if (type === 'session') {
               appointmentBooking.openProductDetail(item.id);
             }
+          case 6:
             utils === null || utils === void 0 || utils.action({
               type: 'pisell1.productDetail',
               data: {
@@ -84,12 +92,31 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
               },
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-                  var session, product, startDate, endDate, _data$origin, resources, activeStatus, index, description;
+                  var product, session, startDate, endDate, _data$origin, resources, activeStatus, index, description;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
+                        product = _objectSpread(_objectSpread({}, data), {}, {
+                          options: (data === null || data === void 0 ? void 0 : data.option) || []
+                        });
+                        delete product.option;
+
+                        // 零售模版，直接加入购物车
+                        if (!isRetailTemplate) {
+                          _context.next = 7;
+                          break;
+                        }
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
-                          _context.next = 3;
+                          _context.next = 5;
+                          break;
+                        }
+                        return _context.abrupt("return");
+                      case 5:
+                        appointmentBooking.storeProduct(product);
+                        return _context.abrupt("return");
+                      case 7:
+                        if (!(data !== null && data !== void 0 && data.isCancel)) {
+                          _context.next = 10;
                           break;
                         }
                         if (type === 'session') {
@@ -97,14 +124,10 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                           appointmentBooking.getAvailableDate();
                         }
                         return _context.abrupt("return");
-                      case 3:
+                      case 10:
                         session = data === null || data === void 0 ? void 0 : data.session;
-                        product = _objectSpread(_objectSpread({}, data), {}, {
-                          options: (data === null || data === void 0 ? void 0 : data.option) || []
-                        });
-                        delete product.option;
                         if (!session) {
-                          _context.next = 14;
+                          _context.next = 20;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
@@ -117,32 +140,34 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                           }
                         });
                         appointmentBooking.closeProductDetail();
-                        appointmentBooking.getAvailableDate({
+                        _context.next = 18;
+                        return appointmentBooking.getAvailableDate({
                           startDate: startDate,
                           endDate: endDate
                         });
-                        _context.next = 22;
+                      case 18:
+                        _context.next = 28;
                         break;
-                      case 14:
+                      case 20:
                         resources = (data === null || data === void 0 || (_data$origin = data.origin) === null || _data$origin === void 0 || (_data$origin = _data$origin.product_resource) === null || _data$origin === void 0 ? void 0 : _data$origin.resources) || [];
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
                         if (activeStatus) {
-                          _context.next = 18;
+                          _context.next = 24;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 18:
+                      case 24:
                         appointmentBooking.storeProduct(product);
                         // duration 类型的商品，要获取一下资源
                         if (!(type === 'duration')) {
-                          _context.next = 22;
+                          _context.next = 28;
                           break;
                         }
-                        _context.next = 22;
+                        _context.next = 28;
                         return appointmentBooking.getAvailableDate();
-                      case 22:
+                      case 28:
                         // 先选择日期流程
                         if (isDateSelectedFirst) {
                           index = (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2; //先选择日期流程：如果商品类型是duration的商品，则需要增加选择时间步骤
@@ -163,7 +188,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             removeStep('select-time');
                           }
                         }
-                      case 23:
+                      case 29:
                       case "end":
                         return _context.stop();
                     }
@@ -175,14 +200,14 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                 return callback;
               }()
             });
-          case 5:
+          case 7:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
     return function handleSelectProduct(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement("div", {

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

@@ -48,16 +48,23 @@ var TimeSlicing = /*#__PURE__*/forwardRef(function (props, ref) {
   }, []);
   var getAutoSelect = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(val) {
-      var result;
+      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;
+            _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 = 8;
             return appointmentBooking.submitTimeSlot(val);
-          case 3:
+          case 8:
             result = _context.sent;
-          case 4:
+            console.log(errorList, result, 'wh9896788');
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -77,7 +84,7 @@ var TimeSlicing = /*#__PURE__*/forwardRef(function (props, ref) {
       // 如果没有选择时间，则默认选中第一个时间
       getAutoSelect(times === null || times === void 0 ? void 0 : times[0]);
     }
-  }, [times, carts]);
+  }, [times]);
   var _onClick = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../booking/components/voucher/index.less';
 import './index.less';
 declare const VoucherCard: (props: any) => JSX.Element;

package/es/components/appointmentBooking/context.js

@@ -8,12 +8,10 @@ import React, { createContext, useContext, useState, useEffect, useMemo, useRef
 import { useAppointmentBooking } from "./hooks";
 import useEngineContext from "../../hooks/useEngineContext";
 import { TasksManager } from "../../utils/tasks";
-import { getCartCurrentResourceData } from "./utils";
 var AppointmentBookingContext = /*#__PURE__*/createContext(undefined);
 export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref) {
-  var _appHelper$utils, _appointmentBooking$s2, _currentStep$step2, _appointmentBooking$s3, _currentStep$step4;
+  var _appHelper$utils, _currentStep$step2, _appointmentBooking$s;
   var children = _ref.children;
-  var currentSelectedResourcesRef = useRef(null);
   var policyIdsRef = useRef([]);
   var appointmentBooking = useAppointmentBooking();
   // 总计计算
@@ -126,10 +124,6 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
       policyParams.callback();
     }
   };
-  var stepLists = useMemo(function () {
-    var _appointmentBooking$s;
-    return (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) || [];
-  }, [appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s2 = appointmentBooking.store) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.step) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.store) === null || _appointmentBooking$s2 === void 0 ? void 0 : _appointmentBooking$s2.stepList]);
 
   /**
    * @title: 是否是最后一步
@@ -143,39 +137,7 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
     var _currentStep$step;
     var key = currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key;
     return key === 'confirm-information';
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key, appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s3 = appointmentBooking.store) === null || _appointmentBooking$s3 === void 0 || (_appointmentBooking$s3 = _appointmentBooking$s3.step) === null || _appointmentBooking$s3 === void 0 || (_appointmentBooking$s3 = _appointmentBooking$s3.store) === null || _appointmentBooking$s3 === void 0 ? void 0 : _appointmentBooking$s3.stepList]);
-  var currentStepParams = useMemo(function () {
-    var _currentStep$step3;
-    var key = currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key;
-    var index = stepLists.findIndex(function (item) {
-      return item.key === key;
-    });
-    return {
-      key: key,
-      index: index,
-      stepLists: stepLists
-    };
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step4 = currentStep.step) === null || _currentStep$step4 === void 0 ? void 0 : _currentStep$step4.key, stepLists]);
-  useEffect(function () {
-    var _currentStepParams$ke;
-    // 如果当前步骤是选择资源，则更新当前资源的数据
-    if (currentStepParams !== null && currentStepParams !== void 0 && (_currentStepParams$ke = currentStepParams.key) !== null && _currentStepParams$ke !== void 0 && _currentStepParams$ke.startsWith('select-resource')) {
-      var currentSelectedResources = carts.map(function (item) {
-        return {
-          _id: item === null || item === void 0 ? void 0 : item._id,
-          currentSelectedResource: getCartCurrentResourceData(item, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key, resources)
-        };
-      });
-      currentSelectedResourcesRef.current = currentSelectedResources;
-
-      // 并且将当前资源的数据设置到本地
-      appointmentBooking.setOtherData('current_selected_resources', currentSelectedResources);
-    }
-  }, [currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key, resources, carts]);
-  useEffect(function () {
-    var currentSelectedResources = appointmentBooking.getOtherData('current_selected_resources');
-    currentSelectedResourcesRef.current = currentSelectedResources || [];
-  }, []);
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key, 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 value = {
     appointmentBooking: appointmentBooking,
     times: times,
@@ -209,9 +171,7 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
     policyIdsRef: policyIdsRef,
     setPolicyIds: setPolicyIds,
     openPolicy: openPolicy,
-    closePolicy: closePolicy,
-    currentStepParams: currentStepParams,
-    currentSelectedResourcesRef: currentSelectedResourcesRef
+    closePolicy: closePolicy
   };
   return /*#__PURE__*/React.createElement(AppointmentBookingContext.Provider, {
     value: value

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

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

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

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

@@ -75,6 +75,7 @@ export declare const useAppointmentBookingResource: () => {
         resources: any;
         resourceCodes: any;
     };
+    autoSelectAllProductResources: (index?: number) => Promise<any>;
 };
 /**
  * @title: 是否跳过资源选择步骤
@@ -84,7 +85,7 @@ export declare const useAppointmentBookingResource: () => {
  * @Date: 2025-04-21 11:47
  */
 export declare const useIsSkipResourceStep: () => {
-    checkSkipResourceStep: () => Promise<boolean>;
+    checkSkipResourceStep: (isSkipUpdateFormStep?: boolean) => Promise<boolean>;
 };
 /**
  * @title: 获取预约配置
@@ -96,6 +97,7 @@ export declare const useIsSkipResourceStep: () => {
 export declare const useAppointmentBookingSetting: () => {
     isDateSelectedFirst: boolean;
     isFormSubject: boolean;
+    isRetailTemplate: any;
     customPageId: any;
     channel: any;
     bookingSubject: any;