@pisell/pisellos 2.1.172 → 2.1.174

package/dist/solution/BookingByStep/index.js

@@ -118,7 +118,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   this.otherData = ((_data$this$otherParam = data[this.otherParams.cacheId]) === null || _data$this$otherParam === void 0 || (_data$this$otherParam = _data$this$otherParam[this.name]) === null || _data$this$otherParam === void 0 ? void 0 : _data$this$otherParam['otherData']) || {};
                 }
               }
-              moduleArr = ['accountList', 'cart', 'schedule', 'summary', 'step', 'products', 'date', 'order'];
+              moduleArr = ['accountList', 'holder', 'cart', 'schedule', 'summary', 'step', 'products', 'date', 'order'];
               moduleArr.forEach(function (step) {
                 var targetModule = createModule(step, _this2.name);
                 if (targetModule) {
@@ -644,14 +644,59 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return _fetchHolderAccountsAsync.apply(this, arguments);
       }
       return fetchHolderAccountsAsync;
-    }() // 设置日期范围,注入到日期模块中
+    }()
+    /**
+     * 获取 holder 表单 map
+     */
     )
   }, {
-    key: "setDateRange",
-    value: function () {
-      var _setDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(dateRange) {
+    key: "getHolderFormMap",
+    value: function getHolderFormMap() {
+      return this.store.holder.getHolderFormMap();
+    }
+
+    /**
+     * 登录后或外部触发时，按当前 holderMap 批量刷新所有表单的 records
+     */
+  }, {
+    key: "refreshAllHolderFormRecords",
+    value: (function () {
+      var _refreshAllHolderFormRecords = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              return _context10.abrupt("return", this.store.holder.refreshAllFormRecords({
+                customer_id: params === null || params === void 0 ? void 0 : params.customer_id,
+                useCache: false
+              }));
+            case 1:
+            case "end":
+              return _context10.stop();
+          }
+        }, _callee10, this);
+      }));
+      function refreshAllHolderFormRecords(_x12) {
+        return _refreshAllHolderFormRecords.apply(this, arguments);
+      }
+      return refreshAllHolderFormRecords;
+    }()
+    /**
+     * 添加表单记录
+     */
+    )
+  }, {
+    key: "appendFormRecord",
+    value: function appendFormRecord(params) {
+      return this.store.holder.appendFormRecord(params);
+    }
+
+    // 设置日期范围,注入到日期模块中
+  }, {
+    key: "setDateRange",
+    value: function () {
+      var _setDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(dateRange) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               this.store.date.setDateRange(dateRange);
               // 日期数据变更后，如果购物车里有数据，需要更新购物车里的报价单的价格
@@ -660,11 +705,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
-      function setDateRange(_x12) {
+      function setDateRange(_x13) {
         return _setDateRange.apply(this, arguments);
       }
       return setDateRange;
@@ -679,16 +724,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDateRange",
     value: function () {
-      var _getDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      var _getDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              return _context11.abrupt("return", this.store.date.getDateRange());
+              return _context12.abrupt("return", this.store.date.getDateRange());
             case 1:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function getDateRange() {
         return _getDateRange.apply(this, arguments);
@@ -705,7 +750,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAvailableDate",
     value: function () {
-      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
         var _this4 = this,
           _dateRange$,
           _dateRange$2,
@@ -727,11 +772,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           rules,
           resourcesMap,
           res,
-          _args12 = arguments;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+          _args13 = arguments;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              params = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
+              params = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
               products = params.products, startDate = params.startDate, endDate = params.endDate, type = params.type, _params$useCache = params.useCache, useCache = _params$useCache === void 0 ? true : _params$useCache; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
@@ -758,15 +803,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               tempStartDate = startDate || (dateRange === null || dateRange === void 0 || (_dateRange$ = dateRange[0]) === null || _dateRange$ === void 0 ? void 0 : _dateRange$.date);
               tempEndDate = endDate || (dateRange === null || dateRange === void 0 || (_dateRange$2 = dateRange[1]) === null || _dateRange$2 === void 0 ? void 0 : _dateRange$2.date) || (dateRange === null || dateRange === void 0 || (_dateRange$3 = dateRange[0]) === null || _dateRange$3 === void 0 ? void 0 : _dateRange$3.date);
               if (tempProducts.length) {
-                _context12.next = 11;
+                _context13.next = 11;
                 break;
               }
-              return _context12.abrupt("return", []);
+              return _context13.abrupt("return", []);
             case 11:
               // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
               _ref4 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref4.resourceIds, rules = _ref4.rules, resourcesMap = _ref4.resourcesMap;
               this.otherParams.currentResourcesMap = resourcesMap;
-              _context12.next = 15;
+              _context13.next = 15;
               return this.store.date.getResourceDates({
                 url: params.url,
                 query: {
@@ -779,13 +824,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 useCache: useCache
               });
             case 15:
-              res = _context12.sent;
-              return _context12.abrupt("return", res);
+              res = _context13.sent;
+              return _context13.abrupt("return", res);
             case 17:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function getAvailableDate() {
         return _getAvailableDate.apply(this, arguments);
@@ -798,22 +843,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSummary",
     value: (function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
         var cartItems, summary;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               cartItems = this.store.cart.getItems();
-              _context13.next = 3;
+              _context14.next = 3;
               return this.store.summary.getSummary(cartItems);
             case 3:
-              summary = _context13.sent;
-              return _context13.abrupt("return", summary);
+              summary = _context14.sent;
+              return _context14.abrupt("return", summary);
             case 5:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
       function getSummary() {
         return _getSummary.apply(this, arguments);
@@ -827,18 +872,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProtocol",
     value: (function () {
-      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(protocolId) {
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(protocolId) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              return _context14.abrupt("return", this.store.summary.getProtocol(protocolId));
+              return _context15.abrupt("return", this.store.summary.getProtocol(protocolId));
             case 1:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }));
-      function getProtocol(_x13) {
+      function getProtocol(_x14) {
         return _getProtocol.apply(this, arguments);
       }
       return getProtocol;
@@ -847,16 +892,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              return _context15.abrupt("return", this.store.products.getProducts());
+              return _context16.abrupt("return", this.store.products.getProducts());
             case 1:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -866,15 +911,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setLoginAccount",
     value: function () {
-      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(accountId, accountInfo) {
+      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(accountId, accountInfo) {
         var _this5 = this;
-        var account, stateAccountId, cartItems, _this$store$date$getD2, date, normalProductCartItem;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        var account, stateAccountId, cartItems, _this$store$date$getD2, date, normalProductCartItem, customerId;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               account = this.store.accountList.getAccount(accountId);
               if (!account) {
-                _context16.next = 11;
+                _context17.next = 23;
                 break;
               }
               stateAccountId = account.getId();
@@ -891,29 +936,47 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.store.accountList.updateAccountListById(stateAccountId, accountInfo);
-              if (cartItems.length) {
-                date = (_this$store$date$getD2 = this.store.date.getDateRange()) === null || _this$store$date$getD2 === void 0 || (_this$store$date$getD2 = _this$store$date$getD2[0]) === null || _this$store$date$getD2 === void 0 ? void 0 : _this$store$date$getD2.date;
-                if (!date) {
-                  // 如果没有日期，则应该是 session 类先选商品的流程，直接从购物车里拿 start_date
-                  // 不能从购物车里第一个找时间，而是找到购物车里第一个有 start_date 的时间
-                  normalProductCartItem = cartItems.find(function (n) {
-                    return !isNormalProduct(n._productOrigin);
-                  });
-                  date = (normalProductCartItem === null || normalProductCartItem === void 0 ? void 0 : normalProductCartItem.start_date) || '';
-                }
-                this.updateQuotationPriceAndCart(date);
+              if (!cartItems.length) {
+                _context17.next = 21;
+                break;
               }
-              _context16.next = 12;
+              date = (_this$store$date$getD2 = this.store.date.getDateRange()) === null || _this$store$date$getD2 === void 0 || (_this$store$date$getD2 = _this$store$date$getD2[0]) === null || _this$store$date$getD2 === void 0 ? void 0 : _this$store$date$getD2.date;
+              if (!date) {
+                // 如果没有日期，则应该是 session 类先选商品的流程，直接从购物车里拿 start_date
+                // 不能从购物车里第一个找时间，而是找到购物车里第一个有 start_date 的时间
+                normalProductCartItem = cartItems.find(function (n) {
+                  return !isNormalProduct(n._productOrigin);
+                });
+                date = (normalProductCartItem === null || normalProductCartItem === void 0 ? void 0 : normalProductCartItem.start_date) || '';
+              }
+              this.updateQuotationPriceAndCart(date);
+
+              // 登录后刷新 holder 表单
+              _context17.prev = 12;
+              customerId = Number(accountInfo.id);
+              _context17.next = 16;
+              return this.refreshAllHolderFormRecords({
+                customer_id: customerId
+              });
+            case 16:
+              _context17.next = 21;
               break;
-            case 11:
+            case 18:
+              _context17.prev = 18;
+              _context17.t0 = _context17["catch"](12);
+              console.error('[BookingByStep] 登录后刷新 holder 表单失败', _context17.t0);
+            case 21:
+              _context17.next = 24;
+              break;
+            case 23:
               throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
-            case 12:
+            case 24:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this, [[12, 18]]);
       }));
-      function setLoginAccount(_x14, _x15) {
+      function setLoginAccount(_x15, _x16) {
         return _setLoginAccount.apply(this, arguments);
       }
       return setLoginAccount;
@@ -921,14 +984,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "generateCartData",
     value: function () {
-      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17);
+        }, _callee18);
       }));
       function generateCartData() {
         return _generateCartData.apply(this, arguments);
@@ -938,23 +1001,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFreeProduct",
     value: function () {
-      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(id) {
+      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              _context18.next = 2;
+              _context19.next = 2;
               return this.request.post("/pay/order/free-pay/".concat(id));
             case 2:
-              res = _context18.sent;
-              return _context18.abrupt("return", res);
+              res = _context19.sent;
+              return _context19.abrupt("return", res);
             case 4:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18, this);
+        }, _callee19, this);
       }));
-      function getFreeProduct(_x16) {
+      function getFreeProduct(_x17) {
         return _getFreeProduct.apply(this, arguments);
       }
       return getFreeProduct;
@@ -977,11 +1040,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(extraData) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(extraData) {
         var _this$otherParams4;
         var cartItems, newCartItems, type;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               cartItems = this.store.cart.getItems();
               newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
@@ -1011,7 +1074,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }))) {
                 type = 'virtual';
               }
-              return _context19.abrupt("return", this.store.order.submitOrder({
+              return _context20.abrupt("return", this.store.order.submitOrder({
                 query: {
                   cartItems: newCartItems,
                   type: type,
@@ -1022,11 +1085,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }));
             case 6:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee19, this);
+        }, _callee20, this);
       }));
-      function submitOrder(_x17) {
+      function submitOrder(_x18) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -1034,14 +1097,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pay",
     value: function () {
-      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
-        }, _callee20);
+        }, _callee21);
       }));
       function pay() {
         return _pay.apply(this, arguments);
@@ -1051,14 +1114,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPayInfo",
     value: function () {
-      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee21);
+        }, _callee22);
       }));
       function getPayInfo() {
         return _getPayInfo.apply(this, arguments);
@@ -1068,15 +1131,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
         var _ref5,
           _ref5$cover,
           cover,
-          _args22 = arguments;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+          _args23 = arguments;
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              _ref5 = _args22.length > 1 && _args22[1] !== undefined ? _args22[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
+              _ref5 = _args23.length > 1 && _args23[1] !== undefined ? _args23[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -1084,11 +1147,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
-        }, _callee22, this);
+        }, _callee23, this);
       }));
-      function setOtherParams(_x18) {
+      function setOtherParams(_x19) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -1096,16 +1159,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOtherParams",
     value: function () {
-      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              return _context23.abrupt("return", this.otherParams);
+              return _context24.abrupt("return", this.otherParams);
             case 1:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
-        }, _callee23, this);
+        }, _callee24, this);
       }));
       function getOtherParams() {
         return _getOtherParams.apply(this, arguments);
@@ -1194,6 +1257,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           account = activeAccount;
         }
       }
+      try {
+        this.store.holder.ensureFormByProduct({
+          product: productData,
+          shop_id: (productData === null || productData === void 0 ? void 0 : productData.shop_id) || '',
+          useCache: true
+        });
+      } catch (error) {
+        console.error('[BookingByStep] 加载 holder 表单失败', error);
+      }
       var flag = this.store.cart.mergeCartItemByRowKey({
         rowKey: rowKey,
         quantity: quantity,
@@ -2008,7 +2080,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return n.code === resources_code;
             })) === null || _productResources$fin === void 0 ? void 0 : _productResources$fin.renderList;
             if (targetRenderList && targetRenderList.length > 0) {
-              var _item$_origin$resourc2;
+              var _item$_origin$resourc2, _dateRange$5, _item$duration2, _item$_productOrigin6;
               // 如果购物车里已经有同类型的 form_id 的资源了，则不处理
               if ((_item$_origin$resourc2 = item._origin.resources) !== null && _item$_origin$resourc2 !== void 0 && _item$_origin$resourc2.some(function (n) {
                 return n.form_id === targetRenderList[0].form_id;
@@ -2018,7 +2090,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var fastestResource = findFastestAvailableResource({
                 resources: targetRenderList,
                 currentCapacity: currentCapacity,
-                countMap: selectResourcesMap
+                countMap: selectResourcesMap,
+                targetDate: dateRange === null || dateRange === void 0 || (_dateRange$5 = dateRange[0]) === null || _dateRange$5 === void 0 ? void 0 : _dateRange$5.date,
+                durationMinutes: (item === null || item === void 0 || (_item$duration2 = item.duration) === null || _item$duration2 === void 0 ? void 0 : _item$duration2.value) || (item === null || item === void 0 || (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.value) || 10
               });
               var targetResource = fastestResource || targetRenderList[0];
               targetResource.capacity = currentCapacity;
@@ -2069,6 +2143,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         _cartItems$,
         _cartItems$2,
         _this$shopStore$get;
+      var split = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
       var dateRange = this.store.date.getDateRange();
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
@@ -2084,8 +2159,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var maxCutOffTime = undefined;
       var maxCutOffTimeValue = dayjs();
       cartItems.forEach(function (item) {
-        var _item$_productOrigin6, _item$_productOrigin7, _item$_productOrigin8, _item$_productOrigin9;
-        (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.product_resource) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.resources) === null || _item$_productOrigin6 === void 0 || _item$_productOrigin6.forEach(function (n) {
+        var _item$_productOrigin7, _item$_productOrigin8, _item$_productOrigin9, _item$_productOrigin10;
+        (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.product_resource) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.resources) === null || _item$_productOrigin7 === void 0 || _item$_productOrigin7.forEach(function (n) {
           // TODO： 少了个 status 的判断
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
@@ -2098,10 +2173,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (item.resource_id && !resourceIds.includes(item.resource_id)) {
           resourceIds.push(item.resource_id);
         }
-        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.product_resource) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.resources) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.find(function (n) {
+        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.resources) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.find(function (n) {
           return n.code === resources_code;
-        })) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.id;
-        if ((_item$_productOrigin8 = item._productOrigin) !== null && _item$_productOrigin8 !== void 0 && _item$_productOrigin8.cut_off_time && ((_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.cut_off_time.type) === 'advance') {
+        })) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.id;
+        if ((_item$_productOrigin9 = item._productOrigin) !== null && _item$_productOrigin9 !== void 0 && _item$_productOrigin9.cut_off_time && ((_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.cut_off_time.type) === 'advance') {
           var currentCutOffTime = dayjs().add(item._productOrigin.cut_off_time.unit, item._productOrigin.cut_off_time.unit_type);
           if (currentCutOffTime.isAfter(maxCutOffTimeValue, 'minute')) {
             maxCutOffTimeValue = currentCutOffTime;
@@ -2151,13 +2226,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         cartItems.forEach(function (item) {
           // 单个预约累加账号 多个预约取最大值
           if (isSingleResource) {
-            var _item$_productOrigin10;
-            accountDuration += ((_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.duration) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.value) || 10;
-          } else {
             var _item$_productOrigin11;
-            if (accountDuration < (((_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) || 10)) {
-              var _item$_productOrigin12;
-              accountDuration = ((_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.value) || 10;
+            accountDuration += ((_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) || 10;
+          } else {
+            var _item$_productOrigin12;
+            if (accountDuration < (((_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.value) || 10)) {
+              var _item$_productOrigin13;
+              accountDuration = ((_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.value) || 10;
             }
           }
         });
@@ -2194,8 +2269,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }
       var resourcesUseableMap = {};
       var hasFlexibleDuration = cartItems.some(function (item) {
-        var _item$_productOrigin13;
-        return ((_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.type) === 'flexible';
+        var _item$_productOrigin14;
+        return ((_item$_productOrigin14 = item._productOrigin) === null || _item$_productOrigin14 === void 0 || (_item$_productOrigin14 = _item$_productOrigin14.duration) === null || _item$_productOrigin14 === void 0 ? void 0 : _item$_productOrigin14.type) === 'flexible';
       });
       var operating_day_boundary = (_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.operating_day_boundary;
 
@@ -2203,11 +2278,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var maxBlockThreshold = 0;
       if (hasFlexibleDuration) {
         maxBlockThreshold = cartItems.reduce(function (max, item) {
-          var _item$_productOrigin14;
+          var _item$_productOrigin15;
           // 如果开启了灵活时长商品配置，则取 block_threshold 的值
-          if ((_item$_productOrigin14 = item._productOrigin) !== null && _item$_productOrigin14 !== void 0 && (_item$_productOrigin14 = _item$_productOrigin14.duration) !== null && _item$_productOrigin14 !== void 0 && (_item$_productOrigin14 = _item$_productOrigin14.flexible_config) !== null && _item$_productOrigin14 !== void 0 && _item$_productOrigin14.is_enable_minimum_duration) {
-            var _item$_productOrigin15;
-            return Math.max(max, ((_item$_productOrigin15 = item._productOrigin) === null || _item$_productOrigin15 === void 0 || (_item$_productOrigin15 = _item$_productOrigin15.duration) === null || _item$_productOrigin15 === void 0 || (_item$_productOrigin15 = _item$_productOrigin15.flexible_config) === null || _item$_productOrigin15 === void 0 ? void 0 : _item$_productOrigin15.block_threshold) || 0);
+          if ((_item$_productOrigin15 = item._productOrigin) !== null && _item$_productOrigin15 !== void 0 && (_item$_productOrigin15 = _item$_productOrigin15.duration) !== null && _item$_productOrigin15 !== void 0 && (_item$_productOrigin15 = _item$_productOrigin15.flexible_config) !== null && _item$_productOrigin15 !== void 0 && _item$_productOrigin15.is_enable_minimum_duration) {
+            var _item$_productOrigin16;
+            return Math.max(max, ((_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.duration) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.flexible_config) === null || _item$_productOrigin16 === void 0 ? void 0 : _item$_productOrigin16.block_threshold) || 0);
           }
           return 0;
         }, 0);
@@ -2252,7 +2327,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         resourcesMap: resourcesMap,
         duration: duration,
         currentDate: dateRange[0].date,
-        split: 10,
+        split: split,
         resourcesUseableMap: resourcesUseableMap,
         capacity: maxCapacity,
         cut_off_time: maxCutOffTime,
@@ -2266,14 +2341,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeSlotByAllResourcesForDate",
     value: function () {
-      var _getTimeSlotByAllResourcesForDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(_ref10) {
+      var _getTimeSlotByAllResourcesForDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(_ref10) {
         var _this13 = this,
           _cartItems$5,
           _cartItems$6,
           _this$shopStore$get2;
         var resources_code, startDate, endDate, resources, cartItems, resourceIds, resourcesTypeId, isSingleResource, maxCutOffTime, maxCutOffTimeValue, duration, accountList, checkDuration, resourcesUseableMap, hasFlexibleDuration, operating_day_boundary, maxBlockThreshold, calculateCapacityFromCartItems, maxCapacity, arr, today, _loop2, i;
-        return _regeneratorRuntime().wrap(function _callee24$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               resources_code = _ref10.resources_code, startDate = _ref10.startDate, endDate = _ref10.endDate;
               // 如果 end_date 距离start_date小于 30 天，自动追加 end_date 为今天往后的 30 天
@@ -2281,7 +2356,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 endDate = dayjs(startDate).add(30, 'day').format('YYYY-MM-DD');
               }
               // 预请求资源数据，防止日期超过之前选择的范围
-              _context25.next = 4;
+              _context26.next = 4;
               return this.getAvailableDate({
                 startDate: startDate,
                 endDate: endDate,
@@ -2299,8 +2374,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               maxCutOffTime = undefined;
               maxCutOffTimeValue = dayjs();
               cartItems.forEach(function (item) {
-                var _item$_productOrigin16, _item$_productOrigin17, _item$_productOrigin18, _item$_productOrigin19;
-                (_item$_productOrigin16 = item._productOrigin) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.product_resource) === null || _item$_productOrigin16 === void 0 || (_item$_productOrigin16 = _item$_productOrigin16.resources) === null || _item$_productOrigin16 === void 0 || _item$_productOrigin16.forEach(function (n) {
+                var _item$_productOrigin17, _item$_productOrigin18, _item$_productOrigin19, _item$_productOrigin20;
+                (_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.product_resource) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.resources) === null || _item$_productOrigin17 === void 0 || _item$_productOrigin17.forEach(function (n) {
                   // TODO： 少了个 status 的判断
                   if (n.code === resources_code) {
                     resources.push.apply(resources, _toConsumableArray(n.renderList || []));
@@ -2313,10 +2388,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 if (item.resource_id && !resourceIds.includes(item.resource_id)) {
                   resourceIds.push(item.resource_id);
                 }
-                resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.product_resource) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.resources) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.find(function (n) {
+                resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin18 = item._productOrigin) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.product_resource) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.resources) === null || _item$_productOrigin18 === void 0 || (_item$_productOrigin18 = _item$_productOrigin18.find(function (n) {
                   return n.code === resources_code;
-                })) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.id;
-                if ((_item$_productOrigin18 = item._productOrigin) !== null && _item$_productOrigin18 !== void 0 && _item$_productOrigin18.cut_off_time && ((_item$_productOrigin19 = item._productOrigin) === null || _item$_productOrigin19 === void 0 ? void 0 : _item$_productOrigin19.cut_off_time.type) === 'advance') {
+                })) === null || _item$_productOrigin18 === void 0 ? void 0 : _item$_productOrigin18.id;
+                if ((_item$_productOrigin19 = item._productOrigin) !== null && _item$_productOrigin19 !== void 0 && _item$_productOrigin19.cut_off_time && ((_item$_productOrigin20 = item._productOrigin) === null || _item$_productOrigin20 === void 0 ? void 0 : _item$_productOrigin20.cut_off_time.type) === 'advance') {
                   var currentCutOffTime = dayjs().add(item._productOrigin.cut_off_time.unit, item._productOrigin.cut_off_time.unit_type);
                   if (currentCutOffTime.isAfter(maxCutOffTimeValue, 'minute')) {
                     maxCutOffTimeValue = currentCutOffTime;
@@ -2327,10 +2402,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 保护： 如果 resources 为空则直接 return
               if (resources.length) {
-                _context25.next = 14;
+                _context26.next = 14;
                 break;
               }
-              return _context25.abrupt("return", []);
+              return _context26.abrupt("return", []);
             case 14:
               duration = 0; // duration = 不同账号的最长时间
               accountList = this.store.accountList.getAccounts();
@@ -2339,13 +2414,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 cartItems.forEach(function (item) {
                   // 单个预约累加账号 多个预约取最大值
                   if (isSingleResource) {
-                    var _item$_productOrigin20;
-                    accountDuration += ((_item$_productOrigin20 = item._productOrigin) === null || _item$_productOrigin20 === void 0 || (_item$_productOrigin20 = _item$_productOrigin20.duration) === null || _item$_productOrigin20 === void 0 ? void 0 : _item$_productOrigin20.value) || 10;
-                  } else {
                     var _item$_productOrigin21;
-                    if (accountDuration < (((_item$_productOrigin21 = item._productOrigin) === null || _item$_productOrigin21 === void 0 || (_item$_productOrigin21 = _item$_productOrigin21.duration) === null || _item$_productOrigin21 === void 0 ? void 0 : _item$_productOrigin21.value) || 10)) {
-                      var _item$_productOrigin22;
-                      accountDuration = ((_item$_productOrigin22 = item._productOrigin) === null || _item$_productOrigin22 === void 0 || (_item$_productOrigin22 = _item$_productOrigin22.duration) === null || _item$_productOrigin22 === void 0 ? void 0 : _item$_productOrigin22.value) || 10;
+                    accountDuration += ((_item$_productOrigin21 = item._productOrigin) === null || _item$_productOrigin21 === void 0 || (_item$_productOrigin21 = _item$_productOrigin21.duration) === null || _item$_productOrigin21 === void 0 ? void 0 : _item$_productOrigin21.value) || 10;
+                  } else {
+                    var _item$_productOrigin22;
+                    if (accountDuration < (((_item$_productOrigin22 = item._productOrigin) === null || _item$_productOrigin22 === void 0 || (_item$_productOrigin22 = _item$_productOrigin22.duration) === null || _item$_productOrigin22 === void 0 ? void 0 : _item$_productOrigin22.value) || 10)) {
+                      var _item$_productOrigin23;
+                      accountDuration = ((_item$_productOrigin23 = item._productOrigin) === null || _item$_productOrigin23 === void 0 || (_item$_productOrigin23 = _item$_productOrigin23.duration) === null || _item$_productOrigin23 === void 0 ? void 0 : _item$_productOrigin23.value) || 10;
                     }
                   }
                 });
@@ -2364,25 +2439,25 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 如果 cartItem 上既没有时间，也没有资源，认为外部属于异常调用，直接丢一个空数组出去
               // 同时 session 类商品的流程也不应该调用这个方法
               if (!(!(cartItems !== null && cartItems !== void 0 && (_cartItems$5 = cartItems[0]) !== null && _cartItems$5 !== void 0 && _cartItems$5.start_date) && !(cartItems !== null && cartItems !== void 0 && (_cartItems$6 = cartItems[0]) !== null && _cartItems$6 !== void 0 && _cartItems$6.resource_id) || !(cartItems !== null && cartItems !== void 0 && cartItems[0].duration))) {
-                _context25.next = 20;
+                _context26.next = 20;
                 break;
               }
-              return _context25.abrupt("return", []);
+              return _context26.abrupt("return", []);
             case 20:
               resourcesUseableMap = {};
               hasFlexibleDuration = cartItems.some(function (item) {
-                var _item$_productOrigin23;
-                return ((_item$_productOrigin23 = item._productOrigin) === null || _item$_productOrigin23 === void 0 || (_item$_productOrigin23 = _item$_productOrigin23.duration) === null || _item$_productOrigin23 === void 0 ? void 0 : _item$_productOrigin23.type) === 'flexible';
+                var _item$_productOrigin24;
+                return ((_item$_productOrigin24 = item._productOrigin) === null || _item$_productOrigin24 === void 0 || (_item$_productOrigin24 = _item$_productOrigin24.duration) === null || _item$_productOrigin24 === void 0 ? void 0 : _item$_productOrigin24.type) === 'flexible';
               });
               operating_day_boundary = (_this$shopStore$get2 = this.shopStore.get('core')) === null || _this$shopStore$get2 === void 0 || (_this$shopStore$get2 = _this$shopStore$get2.core) === null || _this$shopStore$get2 === void 0 ? void 0 : _this$shopStore$get2.operating_day_boundary; // 如果有 hasFlexibleDuration，需要把动态时长商品（可能是多个，取最长的那个最低禁止购买时长）的最低禁止购买时长作为 split 的值
               maxBlockThreshold = 0;
               if (hasFlexibleDuration) {
                 maxBlockThreshold = cartItems.reduce(function (max, item) {
-                  var _item$_productOrigin24;
+                  var _item$_productOrigin25;
                   // 如果开启了灵活时长商品配置，则取 block_threshold 的值
-                  if ((_item$_productOrigin24 = item._productOrigin) !== null && _item$_productOrigin24 !== void 0 && (_item$_productOrigin24 = _item$_productOrigin24.duration) !== null && _item$_productOrigin24 !== void 0 && (_item$_productOrigin24 = _item$_productOrigin24.flexible_config) !== null && _item$_productOrigin24 !== void 0 && _item$_productOrigin24.is_enable_minimum_duration) {
-                    var _item$_productOrigin25;
-                    return Math.max(max, ((_item$_productOrigin25 = item._productOrigin) === null || _item$_productOrigin25 === void 0 || (_item$_productOrigin25 = _item$_productOrigin25.duration) === null || _item$_productOrigin25 === void 0 || (_item$_productOrigin25 = _item$_productOrigin25.flexible_config) === null || _item$_productOrigin25 === void 0 ? void 0 : _item$_productOrigin25.block_threshold) || 0);
+                  if ((_item$_productOrigin25 = item._productOrigin) !== null && _item$_productOrigin25 !== void 0 && (_item$_productOrigin25 = _item$_productOrigin25.duration) !== null && _item$_productOrigin25 !== void 0 && (_item$_productOrigin25 = _item$_productOrigin25.flexible_config) !== null && _item$_productOrigin25 !== void 0 && _item$_productOrigin25.is_enable_minimum_duration) {
+                    var _item$_productOrigin26;
+                    return Math.max(max, ((_item$_productOrigin26 = item._productOrigin) === null || _item$_productOrigin26 === void 0 || (_item$_productOrigin26 = _item$_productOrigin26.duration) === null || _item$_productOrigin26 === void 0 || (_item$_productOrigin26 = _item$_productOrigin26.flexible_config) === null || _item$_productOrigin26 === void 0 ? void 0 : _item$_productOrigin26.block_threshold) || 0);
                   }
                   return 0;
                 }, 0);
@@ -2421,8 +2496,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               today = dayjs().startOf('day'); // 计算 start_date 到 end_date 之间的所有日期，遍历他们并且计算每一天的可用
               _loop2 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop2() {
                 var currentDate, theDateResources, resourcesMap, timeSlots;
-                return _regeneratorRuntime().wrap(function _loop2$(_context24) {
-                  while (1) switch (_context24.prev = _context24.next) {
+                return _regeneratorRuntime().wrap(function _loop2$(_context25) {
+                  while (1) switch (_context25.prev = _context25.next) {
                     case 0:
                       currentDate = i.format('YYYY-MM-DD');
                       theDateResources = _this13.store.date.getResourcesListByDate(currentDate);
@@ -2434,7 +2509,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                       });
                       resourcesMap = getResourcesMap(resources); // 如果日期已经过期则直接标记为不可用
                       if (!i.isBefore(today)) {
-                        _context24.next = 7;
+                        _context25.next = 7;
                         break;
                       }
                       arr.push({
@@ -2443,7 +2518,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                         week: i.format('ddd'),
                         weekNum: i.day()
                       });
-                      return _context24.abrupt("return", 1);
+                      return _context25.abrupt("return", 1);
                     case 7:
                       timeSlots = getTimeSlicesByResources({
                         resourceIds: resourceIds,
@@ -2475,36 +2550,36 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                       }
                     case 9:
                     case "end":
-                      return _context24.stop();
+                      return _context25.stop();
                   }
                 }, _loop2);
               });
               i = dayjs(startDate);
             case 32:
               if (!i.isBefore(dayjs(endDate))) {
-                _context25.next = 39;
+                _context26.next = 39;
                 break;
               }
-              return _context25.delegateYield(_loop2(), "t0", 34);
+              return _context26.delegateYield(_loop2(), "t0", 34);
             case 34:
-              if (!_context25.t0) {
-                _context25.next = 36;
+              if (!_context26.t0) {
+                _context26.next = 36;
                 break;
               }
-              return _context25.abrupt("continue", 36);
+              return _context26.abrupt("continue", 36);
             case 36:
               i = i.add(1, 'day');
-              _context25.next = 32;
+              _context26.next = 32;
               break;
             case 39:
-              return _context25.abrupt("return", arr);
+              return _context26.abrupt("return", arr);
             case 40:
             case "end":
-              return _context25.stop();
+              return _context26.stop();
           }
-        }, _callee24, this);
+        }, _callee25, this);
       }));
-      function getTimeSlotByAllResourcesForDate(_x19) {
+      function getTimeSlotByAllResourcesForDate(_x20) {
         return _getTimeSlotByAllResourcesForDate.apply(this, arguments);
       }
       return getTimeSlotByAllResourcesForDate;
@@ -2543,10 +2618,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var osWarnTips = [];
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin26;
+            var _item$_productOrigin27;
             // 如果商品配置的是灵活时长，开始时间设置为提交的时间，结束时间从资源的可用最晚时间和店铺营业结束时间里取一个最早的
-            if (((_item$_productOrigin26 = item._productOrigin) === null || _item$_productOrigin26 === void 0 || (_item$_productOrigin26 = _item$_productOrigin26.duration) === null || _item$_productOrigin26 === void 0 ? void 0 : _item$_productOrigin26.type) === 'flexible') {
-              var _allResources$find, _item$_productOrigin27, _item$_productOrigin28;
+            if (((_item$_productOrigin27 = item._productOrigin) === null || _item$_productOrigin27 === void 0 || (_item$_productOrigin27 = _item$_productOrigin27.duration) === null || _item$_productOrigin27 === void 0 ? void 0 : _item$_productOrigin27.type) === 'flexible') {
+              var _allResources$find, _item$_productOrigin28, _item$_productOrigin29;
               item.duration = {
                 type: 'minutes',
                 value: 10
@@ -2629,15 +2704,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               resource.endTime = formattedEndTime.format('YYYY-MM-DD HH:mm');
               // 如果是动态时长商品，并且当前选择的时间的结束时间小于了最低提示时长（warningThreshold），则追加一个提示
               // 如果currentStartTime + warningThreshold 大于 currentEndTime,且 osWarnTips 没有pisell2.product.card.closing-soon.warning 这一项，则加入这一项
-              if ((_item$_productOrigin27 = item._productOrigin) !== null && _item$_productOrigin27 !== void 0 && (_item$_productOrigin27 = _item$_productOrigin27.duration) !== null && _item$_productOrigin27 !== void 0 && (_item$_productOrigin27 = _item$_productOrigin27.flexible_config) !== null && _item$_productOrigin27 !== void 0 && _item$_productOrigin27.is_enable_minimum_duration && dayjs(currentStartTime).add(((_item$_productOrigin28 = item._productOrigin) === null || _item$_productOrigin28 === void 0 || (_item$_productOrigin28 = _item$_productOrigin28.duration) === null || _item$_productOrigin28 === void 0 || (_item$_productOrigin28 = _item$_productOrigin28.flexible_config) === null || _item$_productOrigin28 === void 0 ? void 0 : _item$_productOrigin28.warning_threshold) || 0, 'minutes').isAfter(dayjs(formattedEndTime))) {
+              if ((_item$_productOrigin28 = item._productOrigin) !== null && _item$_productOrigin28 !== void 0 && (_item$_productOrigin28 = _item$_productOrigin28.duration) !== null && _item$_productOrigin28 !== void 0 && (_item$_productOrigin28 = _item$_productOrigin28.flexible_config) !== null && _item$_productOrigin28 !== void 0 && _item$_productOrigin28.is_enable_minimum_duration && dayjs(currentStartTime).add(((_item$_productOrigin29 = item._productOrigin) === null || _item$_productOrigin29 === void 0 || (_item$_productOrigin29 = _item$_productOrigin29.duration) === null || _item$_productOrigin29 === void 0 || (_item$_productOrigin29 = _item$_productOrigin29.flexible_config) === null || _item$_productOrigin29 === void 0 ? void 0 : _item$_productOrigin29.warning_threshold) || 0, 'minutes').isAfter(dayjs(formattedEndTime))) {
                 if (!osWarnTips.includes('pisell2.product.card.closing-soon.warning')) {
                   osWarnTips.push('pisell2.product.card.closing-soon.warning');
                 }
               }
             } else {
-              var _item$_productOrigin29;
+              var _item$_productOrigin30;
               resource.startTime = currentStartTime;
-              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin29 = item._productOrigin) === null || _item$_productOrigin29 === void 0 || (_item$_productOrigin29 = _item$_productOrigin29.duration) === null || _item$_productOrigin29 === void 0 ? void 0 : _item$_productOrigin29.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
+              resource.endTime = dayjs(currentStartTime).add(((_item$_productOrigin30 = item._productOrigin) === null || _item$_productOrigin30 === void 0 || (_item$_productOrigin30 = _item$_productOrigin30.duration) === null || _item$_productOrigin30 === void 0 ? void 0 : _item$_productOrigin30.value) || 10, 'minutes').format('YYYY-MM-DD HH:mm');
             }
             // delete resource.times;
           });
@@ -2685,42 +2760,42 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "openProductDetail",
     value: function () {
-      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(productId) {
+      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(productId) {
         var targetProductData, newScheduleArr, dateRange;
-        return _regeneratorRuntime().wrap(function _callee25$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              _context26.next = 2;
+              _context27.next = 2;
               return this.store.products.getProduct(productId);
             case 2:
-              targetProductData = _context26.sent;
+              targetProductData = _context27.sent;
               if (!targetProductData) {
-                _context26.next = 17;
+                _context27.next = 17;
                 break;
               }
               this.store.currentProduct = targetProductData;
               this.store.currentProductMeta = {};
               // 资源预加载，如果是 duration 类型的商品，且是先选日期的流程，在这里预拉取资源数据
               if (!targetProductData['schedule.ids']) {
-                _context26.next = 12;
+                _context27.next = 12;
                 break;
               }
               newScheduleArr = this.getScheduleDataByIds(targetProductData['schedule.ids']);
               if (!this.store.currentProductMeta) this.store.currentProductMeta = {};
               this.store.currentProductMeta.schedule = newScheduleArr;
-              _context26.next = 17;
+              _context27.next = 17;
               break;
             case 12:
               if (!targetProductData.duration) {
-                _context26.next = 17;
+                _context27.next = 17;
                 break;
               }
               dateRange = this.store.date.getDateRange(); // 如果不是先选日期的流程 duration 商品就啥也不做
               if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
-                _context26.next = 16;
+                _context27.next = 16;
                 break;
               }
-              return _context26.abrupt("return");
+              return _context27.abrupt("return");
             case 16:
               // this.store.date.getResourceDates({
               //   query: {
@@ -2736,11 +2811,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 17:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
-      function openProductDetail(_x20) {
+      function openProductDetail(_x21) {
         return _openProductDetail.apply(this, arguments);
       }
       return openProductDetail;
@@ -3991,41 +4066,41 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductTypeById",
     value: function () {
-      var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(id) {
+      var _getProductTypeById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(id) {
         var productData, _productData$schedule;
-        return _regeneratorRuntime().wrap(function _callee26$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              _context27.next = 2;
+              _context28.next = 2;
               return this.store.products.getProduct(id);
             case 2:
-              productData = _context27.sent;
+              productData = _context28.sent;
               if (!productData) {
-                _context27.next = 9;
+                _context28.next = 9;
                 break;
               }
               if (!productData.duration) {
-                _context27.next = 6;
+                _context28.next = 6;
                 break;
               }
-              return _context27.abrupt("return", 'duration');
+              return _context28.abrupt("return", 'duration');
             case 6:
               if (!((_productData$schedule = productData['schedule.ids']) !== null && _productData$schedule !== void 0 && _productData$schedule.length)) {
-                _context27.next = 8;
+                _context28.next = 8;
                 break;
               }
-              return _context27.abrupt("return", 'session');
+              return _context28.abrupt("return", 'session');
             case 8:
-              return _context27.abrupt("return", 'normal');
+              return _context28.abrupt("return", 'normal');
             case 9:
-              return _context27.abrupt("return", 'normal');
+              return _context28.abrupt("return", 'normal');
             case 10:
             case "end":
-              return _context27.stop();
+              return _context28.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
-      function getProductTypeById(_x21) {
+      function getProductTypeById(_x22) {
         return _getProductTypeById.apply(this, arguments);
       }
       return getProductTypeById;
@@ -4145,10 +4220,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotsScheduleByDateRange",
     value: (function () {
-      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref16) {
+      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(_ref16) {
         var startDate, endDate, scheduleIds, resources, dates, currentDate, end, results, _i5, _dates, date;
-        return _regeneratorRuntime().wrap(function _callee27$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               startDate = _ref16.startDate, endDate = _ref16.endDate, scheduleIds = _ref16.scheduleIds, resources = _ref16.resources;
               console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
@@ -4175,14 +4250,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resources: resources
                 });
               }
-              return _context28.abrupt("return", results);
+              return _context29.abrupt("return", results);
             case 9:
             case "end":
-              return _context28.stop();
+              return _context29.stop();
           }
-        }, _callee27, this);
+        }, _callee28, this);
       }));
-      function getTimeslotsScheduleByDateRange(_x22) {
+      function getTimeslotsScheduleByDateRange(_x23) {
         return _getTimeslotsScheduleByDateRange.apply(this, arguments);
       }
       return getTimeslotsScheduleByDateRange;
@@ -4190,7 +4265,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAvailableDateForSessionOptimize",
     value: function () {
-      var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
+      var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
         var _this$store$currentPr3, _this$store$currentPr4, _tempProducts;
         var params,
           startDate,
@@ -4210,11 +4285,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           allProductResources,
           targetSchedules,
           _loop8,
-          _args30 = arguments;
-        return _regeneratorRuntime().wrap(function _callee28$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+          _args31 = arguments;
+        return _regeneratorRuntime().wrap(function _callee29$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              params = _args30.length > 0 && _args30[0] !== undefined ? _args30[0] : {};
+              params = _args31.length > 0 && _args31[0] !== undefined ? _args31[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
               startDate = params.startDate, endDate = params.endDate; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
@@ -4239,15 +4314,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
               cache = (_this$store$currentPr3 = this.store.currentProductMeta) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3['timeSlotBySchedule'];
               if (!cache) {
-                _context30.next = 13;
+                _context31.next = 13;
                 break;
               }
               if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
-                _context30.next = 13;
+                _context31.next = 13;
                 break;
               }
               this.store.date.setDateList(cache.dateList);
-              return _context30.abrupt("return", {
+              return _context31.abrupt("return", {
                 dateList: cache.dateList,
                 firstAvailableDate: cache.firstAvailableDate
               });
@@ -4257,7 +4332,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               schedule = (_this$store$currentPr4 = this.store.currentProductMeta) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4['schedule'];
               filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
               tempResourceIds = getResourcesIdsByProduct(tempProducts);
-              _context30.next = 19;
+              _context31.next = 19;
               return this.store.date.fetchResourceDates({
                 query: {
                   start_date: startDate || '',
@@ -4266,7 +4341,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 19:
-              res = _context30.sent;
+              res = _context31.sent;
               // 2. 商品 schedule 数据，确定日程在每一天的时间片
               // 3. 把后端返回的和 schedule 的数据进行合并，确定每一天的可用和使用情况
               dates = [];
@@ -4288,8 +4363,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               targetSchedules = this.store.schedule.getScheduleListByIds(tempProducts['schedule.ids']);
               _loop8 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop8() {
                 var currentDateStr, status, summaryCount, availableCount, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse, dateStatus, usageRatio;
-                return _regeneratorRuntime().wrap(function _loop8$(_context29) {
-                  while (1) switch (_context29.prev = _context29.next) {
+                return _regeneratorRuntime().wrap(function _loop8$(_context30) {
+                  while (1) switch (_context30.prev = _context30.next) {
                     case 0:
                       currentDateStr = currentDate.format('YYYY-MM-DD');
                       status = 'available';
@@ -4448,32 +4523,32 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
 
                       // 如果 firstAvailableDate 距离 startDate 大于 14 天了，则后面就不需要再找了，也是一种性能保护
                       if (!(firstAvailableDate && dayjs(currentDate).diff(dayjs(startDate), 'day') > 31)) {
-                        _context29.next = 12;
+                        _context30.next = 12;
                         break;
                       }
-                      return _context29.abrupt("return", 1);
+                      return _context30.abrupt("return", 1);
                     case 12:
                       currentDate = dayjs(currentDate).add(1, 'day');
                     case 13:
                     case "end":
-                      return _context29.stop();
+                      return _context30.stop();
                   }
                 }, _loop8);
               });
             case 28:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
-                _context30.next = 34;
+                _context31.next = 34;
                 break;
               }
-              return _context30.delegateYield(_loop8(), "t0", 30);
+              return _context31.delegateYield(_loop8(), "t0", 30);
             case 30:
-              if (!_context30.t0) {
-                _context30.next = 32;
+              if (!_context31.t0) {
+                _context31.next = 32;
                 break;
               }
-              return _context30.abrupt("break", 34);
+              return _context31.abrupt("break", 34);
             case 32:
-              _context30.next = 28;
+              _context31.next = 28;
               break;
             case 34:
               // 最终把资源数据也加到日期内
@@ -4488,15 +4563,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 startDate: startDate,
                 endDate: dayjs(currentDate).format('YYYY-MM-DD')
               };
-              return _context30.abrupt("return", {
+              return _context31.abrupt("return", {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
             case 39:
             case "end":
-              return _context30.stop();
+              return _context31.stop();
           }
-        }, _callee28, this);
+        }, _callee29, this);
       }));
       function getAvailableDateForSessionOptimize() {
         return _getAvailableDateForSessionOptimize.apply(this, arguments);
@@ -4543,18 +4618,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getContactInfo",
     value: (function () {
-      var _getContactInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
-        return _regeneratorRuntime().wrap(function _callee29$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+      var _getContactInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
+        return _regeneratorRuntime().wrap(function _callee30$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
-              return _context31.abrupt("return", this.request.get('/customer/metadata', params));
+              return _context32.abrupt("return", this.request.get('/customer/metadata', params));
             case 1:
             case "end":
-              return _context31.stop();
+              return _context32.stop();
           }
-        }, _callee29, this);
+        }, _callee30, this);
       }));
-      function getContactInfo(_x23) {
+      function getContactInfo(_x24) {
         return _getContactInfo.apply(this, arguments);
       }
       return getContactInfo;