@pisell/private-materials 3.3.45 → 3.3.47

package/es/components/appointmentBooking/hooks.js

@@ -140,17 +140,74 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
     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 (!isRetailTemplate && currentKey === "select-service") {
+      var _appointmentBooking$o, _stepList, _stepList2;
+      var _ref3 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.productModuleParams) || {},
+        bookingProcess = _ref3.bookingProcess;
+      var isDateSelectedFirst = bookingProcess === "date_first";
+      var hasResourceStep = (_stepList = stepList) === null || _stepList === void 0 ? void 0 : _stepList.find(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.key) === "select-resource";
+      });
+      var hasSelectGuestStep = (_stepList2 = stepList) === null || _stepList2 === void 0 || (_stepList2 = _stepList2.find(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.key) === "select-guest";
+      })) === null || _stepList2 === void 0 ? void 0 : _stepList2.key;
+      // 判断购物车里是否全是是普通商品
+      var isAllNormalProduct = appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isCartAllNormalProducts();
+      if (isAllNormalProduct) {
+        removeStep("select-resource");
+        removeStep("select-time");
+        removeStep('fill-form');
+        if (!isDateSelectedFirst) {
+          removeStep("select-date");
+        }
+      } else if (!hasResourceStep) {
+        // 如果不全是普通商品，并且还没有选择资源步骤，证明之前被删除过，要给她加回来
+        // 判断当前步骤里有没有添加预约人，如果有的话则应该是在添加预约人之后添加步骤
+        var targetKey = hasSelectGuestStep ? hasSelectGuestStep : "select-service";
+        var isHasDurationProduct = appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isCartHasDurationProduct();
+        // 如果购物车里有 duration 商品（目前来说，只能是纯 duration 商品）
+        if (isHasDurationProduct) {
+          // 如果是先选商品，则添加日期、资源、时间步骤
+          if (!isDateSelectedFirst) {
+            appointmentBooking.addStep({
+              key: "select-date",
+              description: locales.getText("pisell2.appointment.select.date")
+            }, targetKey);
+            targetKey = "select-date";
+          }
+          // 如果是先选日期，则添加资源、时间
+          appointmentBooking.addStep({
+            key: "select-resource",
+            description: locales.getText("pisell2.appointment.select.resource")
+          }, targetKey);
+          targetKey = "select-resource";
+          appointmentBooking.addStep({
+            key: "select-time",
+            description: locales.getText("pisell2.appointment.select.time")
+          }, targetKey);
+        } else {
+          // 如果购物车里是session 商品，则只添加选择资源步骤
+          appointmentBooking.addStep({
+            key: "select-resource",
+            description: locales.getText("pisell2.appointment.select.resource")
+          }, targetKey);
+        }
+      }
+      stepList = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.getStepList()) || [];
+    }
+    var nextStep = stepList[(currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.index) + 1];
+
     // 判断选定的日期是否存在可用的预约
-    if (((_nextStep = nextStep) === null || _nextStep === void 0 ? void 0 : _nextStep.key) === 'select-resource') {
+    if (!isRetailTemplate && ((_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'));
       }
     }
-    if (currentKey !== null && currentKey !== void 0 && currentKey.startsWith('select-resource')) {
+    if (!isRetailTemplate && currentKey !== null && currentKey !== void 0 && currentKey.startsWith('select-resource')) {
       var _currentSelectedResou;
       // 1. 检测购物车中是否选择了资源
       var _checkAndMarkCartRend = checkAndMarkCartRenderError(currentSelectedResources, appointmentBooking, utils),
@@ -161,7 +218,6 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
         scrollToFirstErrorCard();
         return;
       }
-
       // 2. 插入表单步骤
       currentSelectedResources === null || currentSelectedResources === void 0 || currentSelectedResources.forEach(function (cart) {
         var _selectedResource$ren, _selectedResource$ren2;
@@ -199,8 +255,8 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
 
         // 如果有下一个资源数据，则插入下一个资源步骤
         if (nextResource) {
-          var _stepList;
-          var beforeKey = (_stepList = stepList[stepList.length - 2]) === null || _stepList === void 0 ? void 0 : _stepList.key;
+          var _stepList3;
+          var beforeKey = (_stepList3 = stepList[stepList.length - 2]) === null || _stepList3 === void 0 ? void 0 : _stepList3.key;
           appointmentBooking.addStep({
             key: resourceKey,
             description: ''
@@ -224,10 +280,13 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
         setLoading(false);
 
         // 零售订单不需要验证holder
-        if (isRetailTemplate) {
+        if (isRetailTemplate || appointmentBooking !== null && appointmentBooking !== void 0 && appointmentBooking.isCartAllNormalProducts()) {
           return appointmentBooking.next();
         }
-        var _checkAndGoNext = checkAndGoNext(isFormSubject, checkAccount, carts),
+        var appoimentCarts = carts.filter(function (n) {
+          return !(appointmentBooking !== null && appointmentBooking !== void 0 && appointmentBooking.isTargetCartIdNormalProduct(n._id));
+        });
+        var _checkAndGoNext = checkAndGoNext(isFormSubject, checkAccount, appoimentCarts),
           hasError = _checkAndGoNext.hasError;
         setIsErrorHolder(hasError);
         if (hasError) {
@@ -246,7 +305,7 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
 
       // 检测是否登录
       var checkLogin = /*#__PURE__*/function () {
-        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
           var accountLists;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
@@ -271,7 +330,9 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
                         });
                         appointmentBooking.setLoginAccount(meAccount === null || meAccount === void 0 ? void 0 : meAccount.id, currentUser);
                       } else {
-                        getHolders();
+                        if (!isRetailTemplate) {
+                          getHolders();
+                        }
                       }
 
                       // 继续后续流程
@@ -288,7 +349,7 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
           }, _callee2);
         }));
         return function checkLogin() {
-          return _ref3.apply(this, arguments);
+          return _ref4.apply(this, arguments);
         };
       }();
 
@@ -332,17 +393,17 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
  * @Date: 2025-04-15 11:12
  */
 export var useAppointmentBookingProduct = function useAppointmentBookingProduct() {
-  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 _ref5 = useAppointmentBookingContext(),
+    appointmentBooking = _ref5.appointmentBooking;
+  var _ref6 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {},
+    productModuleParams = _ref6.productModuleParams;
+  var _ref7 = productModuleParams || {},
+    bookingProcess = _ref7.bookingProcess;
 
   // 获取商品列表
   var getProducts = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var _dates$, dates, _ref8, _productModuleParams, _productList, _ref9, productModuleParams, productList;
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _dates$, dates, _ref9, _productModuleParams, _productList, _ref10, productModuleParams, productList;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -360,7 +421,7 @@ export var useAppointmentBookingProduct = function useAppointmentBookingProduct(
             }
             return _context3.abrupt("return");
           case 6:
-            _ref8 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {}, _productModuleParams = _ref8.productModuleParams;
+            _ref9 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {}, _productModuleParams = _ref9.productModuleParams;
             _context3.next = 9;
             return appointmentBooking.loadProductByScheduleDate(_objectSpread({
               date: (_dates$ = dates[0]) === null || _dates$ === void 0 ? void 0 : _dates$.date
@@ -370,7 +431,7 @@ export var useAppointmentBookingProduct = function useAppointmentBookingProduct(
             return _context3.abrupt("return", _productList);
           case 11:
             // 先选商品
-            _ref9 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {}, productModuleParams = _ref9.productModuleParams;
+            _ref10 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {}, productModuleParams = _ref10.productModuleParams;
             _context3.next = 14;
             return appointmentBooking.loadProducts(productModuleParams);
           case 14:
@@ -383,13 +444,13 @@ export var useAppointmentBookingProduct = function useAppointmentBookingProduct(
       }, _callee3);
     }));
     return function getProducts() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
   // 检测商品类型
   var checkProductType = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(productId) {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(productId) {
       var result;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -406,7 +467,7 @@ export var useAppointmentBookingProduct = function useAppointmentBookingProduct(
       }, _callee4);
     }));
     return function checkProductType(_x2) {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
   return {
@@ -423,18 +484,18 @@ export var useAppointmentBookingProduct = function useAppointmentBookingProduct(
  * @Date: 2025-04-15 11:12
  */
 export var useAppointmentBookingCart = function useAppointmentBookingCart() {
-  var _appointmentBooking$o;
+  var _appointmentBooking$o2;
   var pisellOS = usePisellOS();
   var utils = contextUtils();
-  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 _ref12 = useAppointmentBookingContext(),
+    appointmentBooking = _ref12.appointmentBooking,
+    setCarts = _ref12.setCarts,
+    setSummary = _ref12.setSummary,
+    setIsAgreeDepositPolicy = _ref12.setIsAgreeDepositPolicy;
+  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 getCartAndSummary = /*#__PURE__*/function () {
-    var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _utils$storage2;
       var locale, symbol, carts, accountLists, newCarts, summary;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -483,7 +544,7 @@ export var useAppointmentBookingCart = function useAppointmentBookingCart() {
       }, _callee5);
     }));
     return function getCartAndSummary() {
-      return _ref13.apply(this, arguments);
+      return _ref14.apply(this, arguments);
     };
   }();
   useEffect(function () {
@@ -514,8 +575,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 _ref15 = params || {},
-      callback = _ref15.callback;
+    var _ref16 = params || {},
+      callback = _ref16.callback;
     utils.action({
       type: 'pisell1.login',
       data: {
@@ -538,7 +599,7 @@ export var useAppointmentBookingLogin = function useAppointmentBookingLogin() {
  * @Date: 2025-04-15 11:15
  */
 export var useAppointmentBookingAccount = function useAppointmentBookingAccount() {
-  var _appointmentBooking$o2;
+  var _appointmentBooking$o3;
   var utils = contextUtils();
   var pisellOS = usePisellOS();
   var appointmentBooking = useAppointmentBooking();
@@ -546,13 +607,13 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
     _useState2 = _slicedToArray(_useState, 2),
     accountLists = _useState2[0],
     setAccountLists = _useState2[1];
-  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 _ref17 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o3 = appointmentBooking.otherParams) === null || _appointmentBooking$o3 === void 0 ? void 0 : _appointmentBooking$o3.productModuleParams) || {},
+    bookingSubject = _ref17.bookingSubject;
   var form_id = bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id;
 
   // 获取账户列表数据
   var getAccountLists = /*#__PURE__*/function () {
-    var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+    var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
       var data;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
@@ -569,13 +630,13 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
       }, _callee7);
     }));
     return function getAccountLists() {
-      return _ref17.apply(this, arguments);
+      return _ref18.apply(this, arguments);
     };
   }();
   useEffect(function () {
     getAccountLists();
     pisellOS.effects.on('appointmentBooking_accountList:changed', /*#__PURE__*/function () {
-      var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
+      var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -589,14 +650,14 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
         }, _callee8);
       }));
       return function (_x3) {
-        return _ref18.apply(this, arguments);
+        return _ref19.apply(this, arguments);
       };
     }());
   }, []);
 
   // 获取表单数据
   var getHolders = /*#__PURE__*/function () {
-    var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+    var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
       var _utils$getStore$getSt;
       var shop_id, customer, params, data, newData;
       return _regeneratorRuntime().wrap(function _callee9$(_context9) {
@@ -636,13 +697,13 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
       }, _callee9);
     }));
     return function getHolders() {
-      return _ref19.apply(this, arguments);
+      return _ref20.apply(this, arguments);
     };
   }();
 
   // 添加账户
   var addAccount = /*#__PURE__*/function () {
-    var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(val, type) {
+    var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(val, type) {
       var customer, result;
       return _regeneratorRuntime().wrap(function _callee10$(_context10) {
         while (1) switch (_context10.prev = _context10.next) {
@@ -663,7 +724,7 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
       }, _callee10);
     }));
     return function addAccount(_x4, _x5) {
-      return _ref20.apply(this, arguments);
+      return _ref21.apply(this, arguments);
     };
   }();
 
@@ -688,12 +749,12 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
  * @Date: 2025-04-15 11:29
  */
 export var useAppointmentBookingResource = function useAppointmentBookingResource() {
-  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 _ref22 = useAppointmentBookingContext(),
+    appointmentBooking = _ref22.appointmentBooking,
+    setResources = _ref22.setResources,
+    setTimes = _ref22.setTimes;
+  var _ref23 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {},
+    resourceSort = _ref23.resourceSort;
 
   // 设置资源列表
   var getResourceList = function getResourceList() {
@@ -717,7 +778,7 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
 
   // 设置时间切片
   var getResourceTimeSlot = /*#__PURE__*/function () {
-    var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(index) {
+    var _ref24 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(index) {
       var _getResourceList, resourceCodes, code, data;
       return _regeneratorRuntime().wrap(function _callee11$(_context11) {
         while (1) switch (_context11.prev = _context11.next) {
@@ -736,7 +797,7 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
       }, _callee11);
     }));
     return function getResourceTimeSlot(_x6) {
-      return _ref23.apply(this, arguments);
+      return _ref24.apply(this, arguments);
     };
   }();
   return {
@@ -753,8 +814,8 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
  * @Date: 2025-04-21 11:47
  */
 export var useIsSkipResourceStep = function useIsSkipResourceStep() {
-  var _ref24 = useAppointmentBookingContext(),
-    currentStepParams = _ref24.currentStepParams;
+  var _ref25 = useAppointmentBookingContext(),
+    currentStepParams = _ref25.currentStepParams;
   var _useAppointmentBookin5 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin5.getResourceList;
   var _useAppointmentBookin6 = useAppointmentBookingSetting(),
@@ -763,7 +824,7 @@ export var useIsSkipResourceStep = function useIsSkipResourceStep() {
   var _useAppointmentBookin7 = useAppointmentBookingStep(),
     nextStep = _useAppointmentBookin7.nextStep;
   var checkSkipResourceStep = /*#__PURE__*/function () {
-    var _ref25 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+    var _ref26 = _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) {
@@ -819,7 +880,7 @@ export var useIsSkipResourceStep = function useIsSkipResourceStep() {
       }, _callee12, null, [[0, 22]]);
     }));
     return function checkSkipResourceStep() {
-      return _ref25.apply(this, arguments);
+      return _ref26.apply(this, arguments);
     };
   }();
   return {
@@ -835,15 +896,15 @@ export var useIsSkipResourceStep = function useIsSkipResourceStep() {
  * @Date: 2025-04-24 18:15
  */
 export var useAppointmentBookingSetting = function useAppointmentBookingSetting() {
-  var _appointmentBooking$o3, _appointmentBooking$o4;
+  var _appointmentBooking$o4, _appointmentBooking$o5;
   var utils = contextUtils();
-  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 _ref27 = useAppointmentBookingContext(),
+    appointmentBooking = _ref27.appointmentBooking;
+  var _ref28 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o4 = appointmentBooking.otherParams) === null || _appointmentBooking$o4 === void 0 ? void 0 : _appointmentBooking$o4.productModuleParams) || {},
+    bookingProcess = _ref28.bookingProcess,
+    bookingSubject = _ref28.bookingSubject,
+    customPageId = _ref28.customPageId,
+    channel = _ref28.channel;
 
   // 设置缓存
   var setOtherData = function setOtherData(key, val) {
@@ -863,7 +924,7 @@ export var useAppointmentBookingSetting = function useAppointmentBookingSetting(
     // 主体是否是表单
     isFormSubject: (bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.type) === 'form',
     // 是否是零售模版
-    isRetailTemplate: (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o4 = appointmentBooking.otherParams) === null || _appointmentBooking$o4 === void 0 ? void 0 : _appointmentBooking$o4.isRetailTemplate) || false,
+    isRetailTemplate: (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o5 = appointmentBooking.otherParams) === null || _appointmentBooking$o5 === void 0 ? void 0 : _appointmentBooking$o5.isRetailTemplate) || false,
     customPageId: customPageId,
     channel: channel,
     bookingSubject: bookingSubject,

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

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

package/es/components/appointmentBooking/utils.js

@@ -600,8 +600,12 @@ export var getResourceTitle = function getResourceTitle(appointmentBooking, code
  */
 export var checkAndMarkCartRenderError = function checkAndMarkCartRenderError(carts, appointmentBooking, utils) {
   try {
+    var _carts;
     var hasError = false;
-    var updatedCartList = carts === null || carts === void 0 ? void 0 : carts.map(function (cart) {
+    carts = carts.filter(function (n) {
+      return !appointmentBooking.isTargetCartIdNormalProduct(n._id);
+    });
+    var updatedCartList = (_carts = carts) === null || _carts === void 0 ? void 0 : _carts.map(function (cart) {
       var currentResource = cart === null || cart === void 0 ? void 0 : cart.currentSelectedResource;
       if (!(currentResource !== null && currentResource !== void 0 && currentResource.renderItem)) {
         hasError = true;
@@ -623,6 +627,7 @@ export var checkAndMarkCartRenderError = function checkAndMarkCartRenderError(ca
       updatedCartList: updatedCartList
     };
   } catch (error) {
+    console.error(error);
     return {};
   }
 };

package/es/components/booking/addons/index.js

@@ -35,20 +35,21 @@ import ProductItem from "../components/TabProduct/selectProductItem";
 import TabProduct from "../components/TabProduct";
 import EmptyBooking from "../components/emptyBooking";
 import Footer from "../components/footer";
-import { formatProductBundle } from "../components/footer/utils";
-import { formatProductListByCategory, getProductTotalPrice, isSessionProduct, request } from "../utils";
+import { formatProductBundle, formatProductOption, formatProductPrice } from "../components/footer/utils";
+import { formatProductListByCategory, getIsEject, getProductTotalPrice, isSessionProduct, request } from "../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import "./index.less";
 import useEngineContext from "../../../hooks/useEngineContext";
 export var formatProducts = function formatProducts(values) {
   var arr = [];
   arr = values.map(function (item) {
-    var _item$_extend, _item$_extend2;
+    var _item$_extend, _item$_extend2, _item$_extend3, _item$_extend4;
     return {
       order_detail_id: item.order_detail_id || 0,
       num: item._extend.quantity,
-      price: item._extend.price,
+      price: formatProductPrice(item),
       product_id: item.id,
+      discount_list: (item === null || item === void 0 ? void 0 : item.discount_list) || [],
       discount_amount: 0,
       product_discount_reason: '',
       is_charge_tax: item.is_charge_tax,
@@ -56,7 +57,9 @@ export var formatProducts = function formatProducts(values) {
       discountway: 'num',
       discount_type: 'discount',
       bundle_edit: (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle_edit,
-      product_bundle: formatProductBundle((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle)
+      product_bundle: formatProductBundle((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.bundle),
+      "product_option_item": formatProductOption((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.option),
+      "product_variant_id": ((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.product_variant_id) || 0
     };
   });
   return arr;
@@ -83,7 +86,7 @@ var restoreProductOtherData = function restoreProductOtherData(data) {
         })
       });
     }),
-    product_variant_id: 0,
+    product_variant_id: detail.product_variant_id || 0,
     quantity: Number(detail.product_quantity)
   };
 };
@@ -284,23 +287,23 @@ var Addons = Provider(function (props) {
     var isSession = isSessionProduct(item);
 
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === 'detail' || item.bundle_group_count > 0 || isSession;
+    var isEject = getIsEject(item, type);
     state.action({
       type: 'pisell1.handleOpenProductModal',
       data: {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: true
         },
         is_eject: isEject ? 1 : 0,
         isOS: isSession
       },
       callback: function callback(e, extension_type, detail) {
-        console.log('e', e);
         var _detail = detail || item;
         var product = _objectSpread(_objectSpread({}, _detail), {}, {
           _id: getUniqueId(),
@@ -308,19 +311,19 @@ var Addons = Provider(function (props) {
           _extend: {
             price: _detail.price,
             other: e,
-            quantity: 1
+            quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1
           },
-          quantity: 1
+          quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1
         });
         var _total = getProductTotalPrice(product);
         product._extend.total = _total;
         var _item = _list.find(function (d) {
-          return d._extend.other.key === e.key;
+          return d._extend.other.rowKey === e.rowKey;
         });
 
         // 如果已添加, 则数量+1
         if (_item) {
-          _item._extend.quantity = _item.quantity + 1;
+          _item._extend.quantity = _item._extend.quantity + product.quantity;
         } else {
           // 否则 push
           _list.push(product);
@@ -353,22 +356,20 @@ var Addons = Provider(function (props) {
     // 0 则移除
     if (quantity == 0) {
       _list = _list.filter(function (d) {
-        return d.id !== item.id;
+        return d._id !== item._id;
       });
     } else {
-      var _item$_extend3;
+      var _item$_extend5;
       var _item = _objectSpread(_objectSpread({}, item), {}, {
         _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
           quantity: Number(e.target.value)
         })
       });
-      var _total = getProductTotalPrice(_item);
-      _item._extend.total = _total;
-      if (((_item$_extend3 = _item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.bundle_edit) !== undefined) {
+      if (((_item$_extend5 = _item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.bundle_edit) !== undefined) {
         _item._extend.bundle_edit = 1;
       }
       _list = _list.map(function (d) {
-        return d.id === item.id ? _item : d;
+        return d._id === item._id ? _item : d;
       });
     }
     dispatch({
@@ -497,10 +498,11 @@ var Addons = Provider(function (props) {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: false,
+          option: true,
           session: isSession,
-          variant: false,
-          package: true
+          variant: true,
+          package: true,
+          number: true
         },
         value: item._extend.other,
         isOS: isSession
@@ -508,9 +510,12 @@ var Addons = Provider(function (props) {
       callback: function callback(e, extension_type, detail) {
         var _product$_extend;
         var _detail = detail || item;
-        var product = _objectSpread(_objectSpread({}, _detail), {}, {
+        var product = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
+          // 编辑商品时清除折扣信息
+          discount_list: [],
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-            other: e
+            other: e,
+            quantity: (e === null || e === void 0 ? void 0 : e.quantity) || 1
           })
         });
         if (((_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.bundle_edit) !== undefined) {

package/es/components/booking/components/footer/amount.js

@@ -9,7 +9,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { getDiscountTime, flexibleObj } from "../../utils";
 import { formatAmount } from '@pisell/utils';
-import { isDayBooking, isDayBookingProduct } from "../../info/service2/utils";
+import { isDayBooking, isDayBookingProduct, isNormalProductByDurationSchedule } from "../../info/service2/utils";
 export var getRelationDetailsTotal = function getRelationDetailsTotal(relation_details) {
   var total = 0;
   var _iterator = _createForOfIteratorHelper(relation_details),
@@ -47,7 +47,7 @@ var getProductAmount = function getProductAmount(state, isEdit) {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var _item = _step2.value;
           // 跨日预约
-          if (isDay) {
+          if (isDay || isNormalProductByDurationSchedule(_item)) {
             var quantity = _item._extend.quantity || 1;
             price += Number(_item._extend.total) * Number(quantity);
 

package/es/components/booking/components/footer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部