@pisell/private-materials 3.3.40 → 3.3.41

package/es/components/appointmentBooking/components/Cart/ContinueButton/index.js

@@ -32,7 +32,7 @@ var ContinueButton = function ContinueButton(_ref) {
     isLastStep = _ref2.isLastStep;
   var _useAppointmentBookin3 = useAppointmentBookingSetting(),
     isFormSubject = _useAppointmentBookin3.isFormSubject,
-    isDateSelectedFirst = _useAppointmentBookin3.isDateSelectedFirst;
+    isRetailTemplate = _useAppointmentBookin3.isRetailTemplate;
   var stepList = 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;
@@ -46,7 +46,8 @@ var ContinueButton = function ContinueButton(_ref) {
    * @Date: 2025-04-28 11:41
    */
   var handleCheckAccount = function handleCheckAccount() {
-    if (isDateSelectedFirst) return false;
+    // 如果是零售订单，则不需要验证holder
+    if (isRetailTemplate) return false;
     var result = checkHolder({
       isFormSubject: isFormSubject,
       checkAccount: checkAccount,

package/es/components/appointmentBooking/hooks.js

@@ -132,7 +132,7 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
     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)) {
+    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) {

package/lib/components/appointmentBooking/components/Cart/ContinueButton/index.js

@@ -55,13 +55,13 @@ var ContinueButton = ({ onNext }) => {
     setIsErrorHolder,
     isLastStep
   } = (0, import_context.useAppointmentBookingContext)();
-  const { isFormSubject, isDateSelectedFirst } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { isFormSubject, isRetailTemplate } = (0, import_hooks.useAppointmentBookingSetting)();
   const stepList = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return (_c2 = (_b2 = (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a2.step) == null ? void 0 : _b2.store) == null ? void 0 : _c2.stepList;
   }, [(_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList]);
   const handleCheckAccount = () => {
-    if (isDateSelectedFirst) return false;
+    if (isRetailTemplate) return false;
     const result = (0, import_utils2.checkHolder)({
       isFormSubject,
       checkAccount,

package/lib/components/appointmentBooking/hooks.js

@@ -121,7 +121,7 @@ var useAppointmentBookingStep = () => {
     }
     const currentStep = appointmentBooking == null ? void 0 : appointmentBooking.getCurrentStep();
     const stepList2 = ((_c2 = (_b2 = (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a2.step) == null ? void 0 : _b2.store) == null ? void 0 : _c2.stepList) || [];
-    if ((currentStep == null ? void 0 : currentStep.index) + 2 === (stepList2 == null ? void 0 : stepList2.length)) {
+    if ((currentStep == null ? void 0 : currentStep.index) + 2 >= (stepList2 == null ? void 0 : stepList2.length)) {
       if ((_d = policyIdsRef == null ? void 0 : policyIdsRef.current) == null ? void 0 : _d.length) {
         let idx = 0;
         const showNextPolicy = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.40",
+  "version": "3.3.41",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,8 +61,8 @@
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
     "@pisell/materials": "3.3.14",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.2"
+    "@pisell/date-picker": "3.0.2",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",