@pisell/private-materials 3.3.43 → 3.3.45

package/es/components/appointmentBooking/hooks.js

@@ -17,9 +17,9 @@ import { useState, useEffect, useMemo } from 'react';
 import { locales } from "@pisell/utils";
 import { usePisellOS } from "../../hooks/useEngineContext";
 import useEngineContext from "../../hooks/useEngineContext";
-import { sortResources, getCustomer, formatCartsResources, checkHasFormStep } from "./utils";
+import { sortResources, getCustomer, currentAppointmentBoard, currentRenderLists, getFormInsertBeforeKey, checkAndGoNext, checkAndMarkCartRenderError, formatCustomer, formatHolder, Toast } from "./utils";
 import { useAppointmentBookingContext } from "./context";
-import { checkHolder } from "./components/Cart/utils";
+import { scrollToFirstErrorCard } from "./components/Resource/utils";
 export var useAppointmentBooking = function useAppointmentBooking() {
   var pisellOS = usePisellOS();
   return pisellOS.getModule('appointmentBooking');
@@ -45,14 +45,27 @@ export var contextUtils = function contextUtils() {
 export var useAppointmentBookingStep = function useAppointmentBookingStep() {
   var _appointmentBooking$s;
   var pisellOS = usePisellOS();
-  var _useAppointmentBookin = useAppointmentBookingContext(),
-    appointmentBooking = _useAppointmentBookin.appointmentBooking,
-    setCurrentStep = _useAppointmentBookin.setCurrentStep,
-    policyIdsRef = _useAppointmentBookin.policyIdsRef,
-    openPolicy = _useAppointmentBookin.openPolicy;
-  var _useAppointmentBookin2 = useAppointmentBookingSetting(),
-    isRetailTemplate = _useAppointmentBookin2.isRetailTemplate;
+  var _ref = useAppointmentBookingContext(),
+    appointmentBooking = _ref.appointmentBooking,
+    setCurrentStep = _ref.setCurrentStep,
+    carts = _ref.carts,
+    openPolicy = _ref.openPolicy,
+    setLoading = _ref.setLoading,
+    setCurrentSelectedResources = _ref.setCurrentSelectedResources,
+    currentStepParams = _ref.currentStepParams,
+    setIsErrorHolder = _ref.setIsErrorHolder;
+  var _useAppointmentBookin = useAppointmentBookingSetting(),
+    isRetailTemplate = _useAppointmentBookin.isRetailTemplate;
   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 _useAppointmentBookin2 = useAppointmentBookingLogin(),
+    isLogin = _useAppointmentBookin2.isLogin,
+    openLoginModal = _useAppointmentBookin2.openLoginModal;
+  var _useAppointmentBookin3 = useAppointmentBookingSetting(),
+    isFormSubject = _useAppointmentBookin3.isFormSubject;
+  var _useAppointmentBookin4 = useAppointmentBookingAccount(),
+    getHolders = _useAppointmentBookin4.getHolders,
+    checkAccount = _useAppointmentBookin4.checkAccount;
+  var utils = contextUtils();
 
   // 判断是否是最后一步
   var getCurrentAndLastStep = function getCurrentAndLastStep() {
@@ -62,7 +75,7 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
   useEffect(function () {
     getCurrentAndLastStep();
     pisellOS.effects.on('appointmentBooking_step:changed', /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -76,7 +89,7 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
         }, _callee);
       }));
       return function (_x) {
-        return _ref.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }());
   }, []);
@@ -124,36 +137,180 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
 
   // 下一步
   var nextStep = function nextStep() {
-    var _appointmentBooking$s2;
-    if (isRetailTemplate) {
-      return appointmentBooking.next();
+    var _nextStep, _nextStep2, _nextStep3;
+    var stepList = appointmentBooking.getStepList() || [];
+    var currentKey = currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key;
+    var nextStep = stepList[(currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.index) + 1];
+    var currentSelectedResources = appointmentBooking.getOtherData('current_selected_resources');
+
+    // 判断选定的日期是否存在可用的预约
+    if (((_nextStep = nextStep) === null || _nextStep === void 0 ? void 0 : _nextStep.key) === 'select-resource') {
+      var result = appointmentBooking.checkResourceListForDate();
+      if (!result) {
+        return Toast(locales.getText('pisell2.appointment.unuse.date'));
+      }
     }
-    var currentStep = appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.getCurrentStep();
-    var 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) || [];
-
-    // 倒数第二步
-    if ((currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2 >= (stepList === null || stepList === void 0 ? void 0 : stepList.length)) {
-      var _policyIdsRef$current;
-      // 如果没有同意资源上挂接的协议，则打开协议弹窗
-      if (policyIdsRef !== null && policyIdsRef !== void 0 && (_policyIdsRef$current = policyIdsRef.current) !== null && _policyIdsRef$current !== void 0 && _policyIdsRef$current.length) {
-        // 依次弹出所有协议
-        var idx = 0;
-        var showNextPolicy = function showNextPolicy() {
-          if (idx < policyIdsRef.current.length) {
-            openPolicy({
-              id: policyIdsRef.current[idx]
-            }, function () {
-              idx++;
-              showNextPolicy();
-            });
-          } else {
-            // 全部同意后，进入下一步
-            appointmentBooking.next();
-          }
-        };
-        showNextPolicy();
+    if (currentKey !== null && currentKey !== void 0 && currentKey.startsWith('select-resource')) {
+      var _currentSelectedResou;
+      // 1. 检测购物车中是否选择了资源
+      var _checkAndMarkCartRend = checkAndMarkCartRenderError(currentSelectedResources, appointmentBooking, utils),
+        hasError = _checkAndMarkCartRend.hasError,
+        updatedCartList = _checkAndMarkCartRend.updatedCartList;
+      if (hasError) {
+        setCurrentSelectedResources(updatedCartList);
+        scrollToFirstErrorCard();
         return;
       }
+
+      // 2. 插入表单步骤
+      currentSelectedResources === null || currentSelectedResources === void 0 || currentSelectedResources.forEach(function (cart) {
+        var _selectedResource$ren, _selectedResource$ren2;
+        var selectedResource = cart === null || cart === void 0 ? void 0 : cart.currentSelectedResource;
+        var resourceItem = (selectedResource === null || selectedResource === void 0 ? void 0 : selectedResource.resourceItem) || {};
+        var formId = selectedResource === null || selectedResource === void 0 || (_selectedResource$ren = selectedResource.renderItem) === null || _selectedResource$ren === void 0 ? void 0 : _selectedResource$ren.resource_form_id;
+        var policyId = selectedResource === null || selectedResource === void 0 || (_selectedResource$ren2 = selectedResource.renderItem) === null || _selectedResource$ren2 === void 0 ? void 0 : _selectedResource$ren2.policy_id;
+        var formKey = "fill-form_@".concat(resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_id, "-").concat(resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.code, "-").concat(cart === null || cart === void 0 ? void 0 : cart._id, "-").concat(formId, "-").concat(policyId);
+
+        // 如果有表单id则插入表单步骤
+        if (formId) {
+          var description = locales.getText('pisell2.appointment.fill-form');
+          var beforeKey = getFormInsertBeforeKey(currentKey, stepList);
+          appointmentBooking.addStep({
+            key: formKey,
+            description: description
+          }, beforeKey);
+        } else {
+          appointmentBooking.removeStep(formKey);
+        }
+      });
+
+      // 3. 插入下一个资源步骤
+      stepList = appointmentBooking.getStepList();
+      var selectedResource = currentSelectedResources === null || currentSelectedResources === void 0 || (_currentSelectedResou = currentSelectedResources[0]) === null || _currentSelectedResou === void 0 ? void 0 : _currentSelectedResou.currentSelectedResource;
+      if (selectedResource) {
+        var _selectedResource$res;
+        var originRenderLists = (selectedResource === null || selectedResource === void 0 || (_selectedResource$res = selectedResource.resourceItem) === null || _selectedResource$res === void 0 ? void 0 : _selectedResource$res.originRenderLists) || [];
+        var currentResourceIndex = originRenderLists === null || originRenderLists === void 0 ? void 0 : originRenderLists.findIndex(function (item) {
+          var _selectedResource$ren3;
+          return item.id === (selectedResource === null || selectedResource === void 0 || (_selectedResource$ren3 = selectedResource.renderItem) === null || _selectedResource$ren3 === void 0 ? void 0 : _selectedResource$ren3.form_id);
+        });
+        var nextResource = originRenderLists === null || originRenderLists === void 0 ? void 0 : originRenderLists[currentResourceIndex + 1];
+        var resourceKey = "select-resource_@".concat(nextResource === null || nextResource === void 0 ? void 0 : nextResource.form_id, "-").concat(nextResource === null || nextResource === void 0 ? void 0 : nextResource.code);
+
+        // 如果有下一个资源数据，则插入下一个资源步骤
+        if (nextResource) {
+          var _stepList;
+          var beforeKey = (_stepList = stepList[stepList.length - 2]) === null || _stepList === void 0 ? void 0 : _stepList.key;
+          appointmentBooking.addStep({
+            key: resourceKey,
+            description: ''
+          }, beforeKey);
+        } else {
+          appointmentBooking.removeStep(resourceKey);
+        }
+      }
+    }
+
+    // 4. 检测是否登录和打开协议弹窗
+    stepList = appointmentBooking.getStepList();
+    nextStep = stepList[(currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.index) + 1];
+    if ((_nextStep2 = nextStep) !== null && _nextStep2 !== void 0 && (_nextStep2 = _nextStep2.key) !== null && _nextStep2 !== void 0 && _nextStep2.startsWith('select-resource_') || ((_nextStep3 = nextStep) === null || _nextStep3 === void 0 ? void 0 : _nextStep3.key) === 'confirm-information') {
+      var _currentSelectedResou2, _nextStep4;
+      var _selectedResource = (currentSelectedResources === null || currentSelectedResources === void 0 || (_currentSelectedResou2 = currentSelectedResources[0]) === null || _currentSelectedResou2 === void 0 ? void 0 : _currentSelectedResou2.currentSelectedResource) || {};
+      var renderItem = (_selectedResource === null || _selectedResource === void 0 ? void 0 : _selectedResource.renderItem) || {};
+
+      // 监测holder数据
+      var checkHolder = function checkHolder() {
+        setLoading(false);
+
+        // 零售订单不需要验证holder
+        if (isRetailTemplate) {
+          return appointmentBooking.next();
+        }
+        var _checkAndGoNext = checkAndGoNext(isFormSubject, checkAccount, carts),
+          hasError = _checkAndGoNext.hasError;
+        setIsErrorHolder(hasError);
+        if (hasError) {
+          return;
+        }
+        if (!!(renderItem !== null && renderItem !== void 0 && renderItem.policy_id)) {
+          openPolicy({
+            id: renderItem === null || renderItem === void 0 ? void 0 : renderItem.policy_id
+          }, function () {
+            return appointmentBooking.next();
+          });
+        } else {
+          return appointmentBooking.next();
+        }
+      };
+
+      // 检测是否登录
+      var checkLogin = /*#__PURE__*/function () {
+        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          var accountLists;
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                if (isLogin) {
+                  _context2.next = 7;
+                  break;
+                }
+                _context2.next = 3;
+                return appointmentBooking.getAccounts();
+              case 3:
+                accountLists = _context2.sent;
+                return _context2.abrupt("return", openLoginModal({
+                  callback: function callback(status) {
+                    if (status === 'success') {
+                      if (!isFormSubject) {
+                        var _utils$storage;
+                        var user = JSON.parse((utils === null || utils === void 0 || (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('customer')) || '{}');
+                        var currentUser = formatCustomer(user);
+                        var meAccount = accountLists === null || accountLists === void 0 ? void 0 : accountLists.find(function (d) {
+                          return !(d !== null && d !== void 0 && d.isGuest);
+                        });
+                        appointmentBooking.setLoginAccount(meAccount === null || meAccount === void 0 ? void 0 : meAccount.id, currentUser);
+                      } else {
+                        getHolders();
+                      }
+
+                      // 继续后续流程
+                      checkHolder();
+                    }
+                  }
+                }));
+              case 7:
+                return _context2.abrupt("return", checkHolder());
+              case 8:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2);
+        }));
+        return function checkLogin() {
+          return _ref3.apply(this, arguments);
+        };
+      }();
+
+      // 如果下一步不是确认信息，则打开协议弹窗
+      if (((_nextStep4 = nextStep) === null || _nextStep4 === void 0 ? void 0 : _nextStep4.key) !== 'confirm-information') {
+        if (!(renderItem !== null && renderItem !== void 0 && renderItem.policy_id)) {
+          return appointmentBooking.next();
+        }
+        return openPolicy({
+          id: renderItem === null || renderItem === void 0 ? void 0 : renderItem.policy_id
+        }, function () {
+          // 触发购物车数据发生改变，重新得出当前的资源
+          var cartItem = carts === null || carts === void 0 ? void 0 : carts[0];
+          appointmentBooking.updateCart(_objectSpread({
+            _id: cartItem === null || cartItem === void 0 ? void 0 : cartItem._id
+          }, cartItem));
+          appointmentBooking.next();
+        });
+      } else {
+        // 如果下一步是确认信息，则检测是否需要登录和检测holder数据
+        return checkLogin();
+      }
     }
     appointmentBooking.next();
   };
@@ -175,81 +332,81 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
  * @Date: 2025-04-15 11:12
  */
 export var useAppointmentBookingProduct = function useAppointmentBookingProduct() {
-  var _ref2 = useAppointmentBookingContext(),
-    appointmentBooking = _ref2.appointmentBooking;
-  var _ref3 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {},
-    productModuleParams = _ref3.productModuleParams;
-  var _ref4 = productModuleParams || {},
-    bookingProcess = _ref4.bookingProcess;
+  var _ref4 = useAppointmentBookingContext(),
+    appointmentBooking = _ref4.appointmentBooking;
+  var _ref5 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {},
+    productModuleParams = _ref5.productModuleParams;
+  var _ref6 = productModuleParams || {},
+    bookingProcess = _ref6.bookingProcess;
 
   // 获取商品列表
   var getProducts = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _dates$, dates, _ref6, _productModuleParams, _productList, _ref7, productModuleParams, productList;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _dates$, dates, _ref8, _productModuleParams, _productList, _ref9, productModuleParams, productList;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             if (!(bookingProcess === 'date_first')) {
-              _context2.next = 11;
+              _context3.next = 11;
               break;
             }
-            _context2.next = 3;
+            _context3.next = 3;
             return appointmentBooking.getDateRange();
           case 3:
-            dates = _context2.sent;
+            dates = _context3.sent;
             if (!(!dates || !dates.length)) {
-              _context2.next = 6;
+              _context3.next = 6;
               break;
             }
-            return _context2.abrupt("return");
+            return _context3.abrupt("return");
           case 6:
-            _ref6 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {}, _productModuleParams = _ref6.productModuleParams;
-            _context2.next = 9;
+            _ref8 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {}, _productModuleParams = _ref8.productModuleParams;
+            _context3.next = 9;
             return appointmentBooking.loadProductByScheduleDate(_objectSpread({
               date: (_dates$ = dates[0]) === null || _dates$ === void 0 ? void 0 : _dates$.date
             }, _productModuleParams));
           case 9:
-            _productList = _context2.sent;
-            return _context2.abrupt("return", _productList);
+            _productList = _context3.sent;
+            return _context3.abrupt("return", _productList);
           case 11:
             // 先选商品
-            _ref7 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {}, productModuleParams = _ref7.productModuleParams;
-            _context2.next = 14;
+            _ref9 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {}, productModuleParams = _ref9.productModuleParams;
+            _context3.next = 14;
             return appointmentBooking.loadProducts(productModuleParams);
           case 14:
-            productList = _context2.sent;
-            return _context2.abrupt("return", productList);
+            productList = _context3.sent;
+            return _context3.abrupt("return", productList);
           case 16:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function getProducts() {
-      return _ref5.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
   // 检测商品类型
   var checkProductType = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(productId) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(productId) {
       var result;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context3.next = 2;
+            _context4.next = 2;
             return appointmentBooking.getProductTypeById(productId);
           case 2:
-            result = _context3.sent;
-            return _context3.abrupt("return", result);
+            result = _context4.sent;
+            return _context4.abrupt("return", result);
           case 4:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function checkProductType(_x2) {
-      return _ref8.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   return {
@@ -269,61 +426,78 @@ export var useAppointmentBookingCart = function useAppointmentBookingCart() {
   var _appointmentBooking$o;
   var pisellOS = usePisellOS();
   var utils = contextUtils();
-  var _useAppointmentBookin3 = useAppointmentBookingContext(),
-    appointmentBooking = _useAppointmentBookin3.appointmentBooking,
-    setCarts = _useAppointmentBookin3.setCarts,
-    setSummary = _useAppointmentBookin3.setSummary,
-    setIsAgreeDepositPolicy = _useAppointmentBookin3.setIsAgreeDepositPolicy;
-  var _ref9 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.productModuleParams) || {},
-    bookingSubject = _ref9.bookingSubject;
+  var _ref11 = useAppointmentBookingContext(),
+    appointmentBooking = _ref11.appointmentBooking,
+    setCarts = _ref11.setCarts,
+    setSummary = _ref11.setSummary,
+    setIsAgreeDepositPolicy = _ref11.setIsAgreeDepositPolicy;
+  var _ref12 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.productModuleParams) || {},
+    bookingSubject = _ref12.bookingSubject;
   var getCartAndSummary = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var carts, newCarts, summary;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var _utils$storage2;
+      var locale, symbol, carts, accountLists, newCarts, summary;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.next = 2;
+            locale = (utils === null || utils === void 0 || (_utils$storage2 = utils.storage) === null || _utils$storage2 === void 0 ? void 0 : _utils$storage2.get('umi_locale')) || 'en-US';
+            symbol = (utils === null || utils === void 0 ? void 0 : utils.getSymbolic()) || '$';
+            _context5.next = 4;
             return appointmentBooking.getCart();
-          case 2:
-            carts = _context4.sent;
+          case 4:
+            carts = _context5.sent;
+            _context5.next = 7;
+            return appointmentBooking.getAccounts();
+          case 7:
+            accountLists = _context5.sent;
             newCarts = carts === null || carts === void 0 ? void 0 : carts.map(function (item) {
+              var _item$duration;
               return _objectSpread(_objectSpread({}, item), {}, {
-                addHolderButtonText: utils === null || utils === void 0 ? void 0 : utils.translation(bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_name)
+                addHolderButtonText: utils === null || utils === void 0 ? void 0 : utils.translation(bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_name),
+                format: ['HH:mm', 'HH:mm'],
+                show_time: true,
+                duration_type: (item === null || item === void 0 || (_item$duration = item.duration) === null || _item$duration === void 0 ? void 0 : _item$duration.type) || 'minutes',
+                locale: locale,
+                symbol: symbol,
+                holders: formatHolder(accountLists),
+                allowClearHolder: true,
+                allowClearResource: true,
+                isMultipleResource: true
               });
             });
             setCarts(newCarts || []);
-            _context4.next = 7;
+            _context5.next = 12;
             return appointmentBooking.getSummary();
-          case 7:
-            summary = _context4.sent;
+          case 12:
+            summary = _context5.sent;
             setSummary(summary || {});
 
             // 清空勾选定金协议
             if (!carts.length) {
               setIsAgreeDepositPolicy(false);
             }
-          case 10:
+          case 15:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
     return function getCartAndSummary() {
-      return _ref10.apply(this, arguments);
+      return _ref13.apply(this, arguments);
     };
   }();
   useEffect(function () {
     getCartAndSummary();
-    pisellOS.effects.on('appointmentBooking_cart:changed', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+    pisellOS.effects.on('appointmentBooking_cart:changed', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             getCartAndSummary();
           case 1:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     })));
   }, []);
 };
@@ -340,8 +514,8 @@ export var useAppointmentBookingLogin = function useAppointmentBookingLogin() {
   var utils = contextUtils();
   var isLogin = !!(utils !== null && utils !== void 0 && (_utils$token = utils.token) !== null && _utils$token !== void 0 && (_utils$token$get = _utils$token.get) !== null && _utils$token$get !== void 0 && _utils$token$get.call(_utils$token));
   var openLoginModal = function openLoginModal(params) {
-    var _ref12 = params || {},
-      callback = _ref12.callback;
+    var _ref15 = params || {},
+      callback = _ref15.callback;
     utils.action({
       type: 'pisell1.login',
       data: {
@@ -372,70 +546,69 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
     _useState2 = _slicedToArray(_useState, 2),
     accountLists = _useState2[0],
     setAccountLists = _useState2[1];
-  var _ref13 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o2 = appointmentBooking.otherParams) === null || _appointmentBooking$o2 === void 0 ? void 0 : _appointmentBooking$o2.productModuleParams) || {},
-    bookingSubject = _ref13.bookingSubject;
+  var _ref16 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o2 = appointmentBooking.otherParams) === null || _appointmentBooking$o2 === void 0 ? void 0 : _appointmentBooking$o2.productModuleParams) || {},
+    bookingSubject = _ref16.bookingSubject;
   var form_id = bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id;
 
   // 获取账户列表数据
   var getAccountLists = /*#__PURE__*/function () {
-    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
       var data;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _context6.next = 2;
+            _context7.next = 2;
             return appointmentBooking.getAccounts();
           case 2:
-            data = _context6.sent;
+            data = _context7.sent;
             setAccountLists(data || []);
           case 4:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return function getAccountLists() {
-      return _ref14.apply(this, arguments);
+      return _ref17.apply(this, arguments);
     };
   }();
   useEffect(function () {
     getAccountLists();
     pisellOS.effects.on('appointmentBooking_accountList:changed', /*#__PURE__*/function () {
-      var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(res) {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (res.path === 'accounts') {
-                console.log('appointmentBooking_accountList:changed', res);
                 getAccountLists();
               }
             case 1:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7);
+        }, _callee8);
       }));
       return function (_x3) {
-        return _ref15.apply(this, arguments);
+        return _ref18.apply(this, arguments);
       };
     }());
   }, []);
 
   // 获取表单数据
   var getHolders = /*#__PURE__*/function () {
-    var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+    var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
       var _utils$getStore$getSt;
       var shop_id, customer, params, data, newData;
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
             shop_id = (_utils$getStore$getSt = utils.getStore().getState()) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.global) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.shop) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.id;
             customer = getCustomer(utils);
             if (!(!shop_id || !form_id || !(customer !== null && customer !== void 0 && customer.id))) {
-              _context8.next = 4;
+              _context9.next = 4;
               break;
             }
-            return _context8.abrupt("return", []);
+            return _context9.abrupt("return", []);
           case 4:
             params = {
               url: '/form/data/v1',
@@ -445,52 +618,52 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
                 shop_id: shop_id
               }
             };
-            _context8.next = 7;
+            _context9.next = 7;
             return appointmentBooking.fetchHolderAccountsAsync(params);
           case 7:
-            data = _context8.sent;
+            data = _context9.sent;
             newData = data === null || data === void 0 ? void 0 : data.map(function (item) {
               return {
                 id: item === null || item === void 0 ? void 0 : item.form_record_id,
                 label: item === null || item === void 0 ? void 0 : item.main_field
               };
             });
-            return _context8.abrupt("return", newData || []);
+            return _context9.abrupt("return", newData || []);
           case 10:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8);
+      }, _callee9);
     }));
     return function getHolders() {
-      return _ref16.apply(this, arguments);
+      return _ref19.apply(this, arguments);
     };
   }();
 
   // 添加账户
   var addAccount = /*#__PURE__*/function () {
-    var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(val, type) {
+    var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(val, type) {
       var customer, result;
-      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
           case 0:
             customer = getCustomer(utils);
-            _context9.next = 3;
+            _context10.next = 3;
             return appointmentBooking.addAccount(val, {
               type: type,
               customerId: customer === null || customer === void 0 ? void 0 : customer.id
             });
           case 3:
-            result = _context9.sent;
-            return _context9.abrupt("return", result);
+            result = _context10.sent;
+            return _context10.abrupt("return", result);
           case 5:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
-      }, _callee9);
+      }, _callee10);
     }));
     return function addAccount(_x4, _x5) {
-      return _ref17.apply(this, arguments);
+      return _ref20.apply(this, arguments);
     };
   }();
 
@@ -515,14 +688,12 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
  * @Date: 2025-04-15 11:29
  */
 export var useAppointmentBookingResource = function useAppointmentBookingResource() {
-  var _useAppointmentBookin4 = useAppointmentBookingContext(),
-    appointmentBooking = _useAppointmentBookin4.appointmentBooking,
-    setResources = _useAppointmentBookin4.setResources,
-    setTimes = _useAppointmentBookin4.setTimes,
-    setResourceOtherParams = _useAppointmentBookin4.setResourceOtherParams,
-    resourceOtherParams = _useAppointmentBookin4.resourceOtherParams;
-  var _ref18 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {},
-    resourceSort = _ref18.resourceSort;
+  var _ref21 = useAppointmentBookingContext(),
+    appointmentBooking = _ref21.appointmentBooking,
+    setResources = _ref21.setResources,
+    setTimes = _ref21.setTimes;
+  var _ref22 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {},
+    resourceSort = _ref22.resourceSort;
 
   // 设置资源列表
   var getResourceList = function getResourceList() {
@@ -546,64 +717,31 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
 
   // 设置时间切片
   var getResourceTimeSlot = /*#__PURE__*/function () {
-    var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(index) {
+    var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(index) {
       var _getResourceList, resourceCodes, code, data;
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
-          case 0:
-            _getResourceList = getResourceList(), resourceCodes = _getResourceList.resourceCodes;
-            code = resourceCodes === null || resourceCodes === void 0 ? void 0 : resourceCodes[index || 0];
-            _context10.next = 4;
-            return appointmentBooking.getTimeSlotByAllResources(code);
-          case 4:
-            data = _context10.sent;
-            setTimes(data || []);
-          case 6:
-          case "end":
-            return _context10.stop();
-        }
-      }, _callee10);
-    }));
-    return function getResourceTimeSlot(_x6) {
-      return _ref19.apply(this, arguments);
-    };
-  }();
-
-  // 获取自动分配
-  var autoSelectAllProductResources = /*#__PURE__*/function () {
-    var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(index) {
-      var _getResourceList2, resourceCodes, code, data, res;
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            _getResourceList2 = getResourceList(), resourceCodes = _getResourceList2.resourceCodes;
-            code = resourceCodes === null || resourceCodes === void 0 ? void 0 : resourceCodes[index || 0]; // 获取时间切片
+            _getResourceList = getResourceList(), resourceCodes = _getResourceList.resourceCodes;
+            code = resourceCodes === null || resourceCodes === void 0 ? void 0 : resourceCodes[index || 0];
             _context11.next = 4;
             return appointmentBooking.getTimeSlotByAllResources(code);
           case 4:
             data = _context11.sent;
-            _context11.next = 7;
-            return appointmentBooking.autoSelectAllProductResources(code);
-          case 7:
-            res = _context11.sent;
-            setResourceOtherParams(_objectSpread(_objectSpread(_objectSpread({}, resourceOtherParams), res), {}, {
-              resourceCodes: resourceCodes
-            }));
-            return _context11.abrupt("return", res);
-          case 10:
+            setTimes(data || []);
+          case 6:
           case "end":
             return _context11.stop();
         }
       }, _callee11);
     }));
-    return function autoSelectAllProductResources(_x7) {
-      return _ref20.apply(this, arguments);
+    return function getResourceTimeSlot(_x6) {
+      return _ref23.apply(this, arguments);
     };
   }();
   return {
     getResourceTimeSlot: getResourceTimeSlot,
-    getResourceList: getResourceList,
-    autoSelectAllProductResources: autoSelectAllProductResources
+    getResourceList: getResourceList
   };
 };
 
@@ -615,103 +753,73 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
  * @Date: 2025-04-21 11:47
  */
 export var useIsSkipResourceStep = function useIsSkipResourceStep() {
-  var _appointmentBooking$s3;
-  var _useAppointmentBookin5 = useAppointmentBookingContext(),
-    currentStep = _useAppointmentBookin5.currentStep,
-    setCarts = _useAppointmentBookin5.setCarts,
-    setPolicyIds = _useAppointmentBookin5.setPolicyIds,
-    setIsErrorHolder = _useAppointmentBookin5.setIsErrorHolder;
-  var _useAppointmentBookin6 = useAppointmentBookingResource(),
-    getResourceList = _useAppointmentBookin6.getResourceList,
-    autoSelectAllProductResources = _useAppointmentBookin6.autoSelectAllProductResources;
-  var _useAppointmentBookin7 = useAppointmentBookingSetting(),
-    isFormSubject = _useAppointmentBookin7.isFormSubject;
+  var _ref24 = useAppointmentBookingContext(),
+    currentStepParams = _ref24.currentStepParams;
+  var _useAppointmentBookin5 = useAppointmentBookingResource(),
+    getResourceList = _useAppointmentBookin5.getResourceList;
+  var _useAppointmentBookin6 = useAppointmentBookingSetting(),
+    isFormSubject = _useAppointmentBookin6.isFormSubject;
   var appointmentBooking = useAppointmentBooking();
-  var stepList = (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 _useAppointmentBookin8 = useAppointmentBookingLogin(),
-    isLogin = _useAppointmentBookin8.isLogin,
-    openLoginModal = _useAppointmentBookin8.openLoginModal;
-  var _useAppointmentBookin9 = useAppointmentBookingAccount(),
-    getHolders = _useAppointmentBookin9.getHolders,
-    checkAccount = _useAppointmentBookin9.checkAccount;
-  var _useAppointmentBookin10 = useAppointmentBookingStep(),
-    nextStep = _useAppointmentBookin10.nextStep;
-  var utils = contextUtils();
+  var _useAppointmentBookin7 = useAppointmentBookingStep(),
+    nextStep = _useAppointmentBookin7.nextStep;
   var checkSkipResourceStep = /*#__PURE__*/function () {
-    var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(isSkipUpdateFormStep) {
-      var accountLists, carts, _res$errorList, _resources$, res, _getResourceList3, resources, resultCarts;
+    var _ref25 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var _getResourceList2, resources, accountLists, _currentAppointmentBo, isSystem, isSkip, form_code, renderLists, _isSkip;
       return _regeneratorRuntime().wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
             _context12.prev = 0;
-            _context12.next = 3;
+            _getResourceList2 = getResourceList(), resources = _getResourceList2.resources;
+            _context12.next = 4;
             return appointmentBooking.getAccounts();
-          case 3:
+          case 4:
             accountLists = _context12.sent;
-            _context12.next = 6;
-            return appointmentBooking.getCart();
-          case 6:
-            carts = _context12.sent;
-            if (!((accountLists === null || accountLists === void 0 ? void 0 : accountLists.length) === 1 || isFormSubject)) {
-              _context12.next = 20;
+            _currentAppointmentBo = currentAppointmentBoard(currentStepParams.key, resources, appointmentBooking), isSystem = _currentAppointmentBo.isSystem, isSkip = _currentAppointmentBo.isSkip, form_code = _currentAppointmentBo.form_code; // 客户不可选择资源，系统自动分派
+            if (!isSystem) {
+              _context12.next = 9;
               break;
             }
-            _context12.next = 10;
-            return autoSelectAllProductResources();
-          case 10:
-            res = _context12.sent;
-            _getResourceList3 = getResourceList(), resources = _getResourceList3.resources; // 如果分配成功，并且只有一个资源则跳过资源选择步骤，默认选中该资源
-            if (!(!(res !== null && res !== void 0 && (_res$errorList = res.errorList) !== null && _res$errorList !== void 0 && _res$errorList.length) && (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 || (_resources$ = _resources$.renderList) === null || _resources$ === void 0 ? void 0 : _resources$.length) === 1)) {
-              _context12.next = 17;
+            nextStep();
+            return _context12.abrupt("return", true);
+          case 9:
+            if (!((accountLists === null || accountLists === void 0 ? void 0 : accountLists.length) === 1 || isFormSubject)) {
+              _context12.next = 19;
               break;
             }
-            if (!isSkipUpdateFormStep) {
-              resultCarts = formatCartsResources(carts, resources, setPolicyIds); // 如果当前资源有表单，则添加表单步骤，否则删除表单步骤
-              checkHasFormStep({
-                setIsErrorHolder: setIsErrorHolder,
-                nextStep: nextStep,
-                isSkip: true,
-                openLoginModal: openLoginModal,
-                utils: utils,
-                accountLists: accountLists,
-                getHolders: getHolders,
-                checkHolder: checkHolder,
-                setCarts: setCarts,
-                checkAccount: checkAccount,
-                carts: carts,
-                isFormSubject: isFormSubject,
-                hasResourceFormId: (resultCarts === null || resultCarts === void 0 ? void 0 : resultCarts.length) > 0,
-                currentStep: currentStep,
-                stepList: stepList,
-                appointmentBooking: appointmentBooking,
-                locales: locales,
-                isLogin: isLogin
-              });
+            renderLists = currentRenderLists(resources, form_code);
+            _isSkip = false;
+            if ((renderLists === null || renderLists === void 0 ? void 0 : renderLists.length) === 1) {
+              _isSkip = isSkip || false;
+            } else {
+              _isSkip = false;
+            }
+
+            // 如果跳过资源选择步骤，则执行跳过的逻辑
+            if (!_isSkip) {
+              _context12.next = 16;
+              break;
             }
+            nextStep();
             return _context12.abrupt("return", true);
-          case 17:
+          case 16:
+            return _context12.abrupt("return", _isSkip);
+          case 19:
             return _context12.abrupt("return", false);
-          case 18:
-            _context12.next = 21;
-            break;
           case 20:
-            return _context12.abrupt("return", false);
-          case 21:
-            _context12.next = 27;
+            _context12.next = 25;
             break;
-          case 23:
-            _context12.prev = 23;
+          case 22:
+            _context12.prev = 22;
             _context12.t0 = _context12["catch"](0);
-            console.log(_context12.t0, 'checkSkipResourceStep33');
             return _context12.abrupt("return", false);
-          case 27:
+          case 25:
           case "end":
             return _context12.stop();
         }
-      }, _callee12, null, [[0, 23]]);
+      }, _callee12, null, [[0, 22]]);
     }));
-    return function checkSkipResourceStep(_x8) {
-      return _ref21.apply(this, arguments);
+    return function checkSkipResourceStep() {
+      return _ref25.apply(this, arguments);
     };
   }();
   return {
@@ -729,13 +837,13 @@ export var useIsSkipResourceStep = function useIsSkipResourceStep() {
 export var useAppointmentBookingSetting = function useAppointmentBookingSetting() {
   var _appointmentBooking$o3, _appointmentBooking$o4;
   var utils = contextUtils();
-  var _ref22 = useAppointmentBookingContext(),
-    appointmentBooking = _ref22.appointmentBooking;
-  var _ref23 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o3 = appointmentBooking.otherParams) === null || _appointmentBooking$o3 === void 0 ? void 0 : _appointmentBooking$o3.productModuleParams) || {},
-    bookingProcess = _ref23.bookingProcess,
-    bookingSubject = _ref23.bookingSubject,
-    customPageId = _ref23.customPageId,
-    channel = _ref23.channel;
+  var _ref26 = useAppointmentBookingContext(),
+    appointmentBooking = _ref26.appointmentBooking;
+  var _ref27 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o3 = appointmentBooking.otherParams) === null || _appointmentBooking$o3 === void 0 ? void 0 : _appointmentBooking$o3.productModuleParams) || {},
+    bookingProcess = _ref27.bookingProcess,
+    bookingSubject = _ref27.bookingSubject,
+    customPageId = _ref27.customPageId,
+    channel = _ref27.channel;
 
   // 设置缓存
   var setOtherData = function setOtherData(key, val) {