@pisell/pisellos 3.0.34 → 3.0.35

package/dist/modules/Schedule/index.d.ts

@@ -14,5 +14,7 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     getScheduleListByIds(ids: number[]): ScheduleItem[];
     setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;
     getAvailabilityScheduleDateList(): ScheduleAvailabilityDateItem[];
+    setOtherProductsIds(ids: number[]): void;
+    getOtherProductsIds(): number[];
     storeChange(): void;
 }

package/dist/modules/Schedule/index.js

@@ -92,6 +92,16 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     value: function getAvailabilityScheduleDateList() {
       return this.store.availabilityDateList;
     }
+  }, {
+    key: "setOtherProductsIds",
+    value: function setOtherProductsIds(ids) {
+      this.store.otherProductsIds = ids;
+    }
+  }, {
+    key: "getOtherProductsIds",
+    value: function getOtherProductsIds() {
+      return this.store.otherProductsIds;
+    }
   }, {
     key: "storeChange",
     value: function storeChange() {

package/dist/modules/Schedule/types.d.ts

@@ -2,6 +2,7 @@ import dayjs from 'dayjs';
 export interface ScheduleState {
     scheduleList: ScheduleItem[];
     availabilityDateList: ScheduleAvailabilityDateItem[];
+    otherProductsIds: number[];
 }
 export type ScheduleAvailabilityDateItem = {
     date: string;

package/dist/solution/BookingByStep/index.d.ts

@@ -42,12 +42,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 更新step
      */
     updateStep(key: string, step: IStep): void;
-    loadProducts({ category_ids, product_ids, collection, schedule_ids, schedule_date, }: {
+    loadProducts({ category_ids, product_ids, collection, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
-        schedule_ids?: number[];
-        schedule_date?: string;
     }): Promise<any>;
     loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;
@@ -200,6 +198,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         start_at: dayjs.Dayjs;
         end_at: dayjs.Dayjs;
         count: number;
+        left: number;
     }[];
     addProductToCart({ product, date, account, }: {
         product: ProductData;

package/dist/solution/BookingByStep/index.js

@@ -1,10 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -208,24 +208,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _schedule_ids;
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$schedule_ids, schedule_ids, schedule_date, schedule_ids_data, userPlugin, customer_id, _userPlugin$get, productsData;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, userPlugin, customer_id, _userPlugin$get, productsData;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$schedule_ids = _ref.schedule_ids, schedule_ids = _ref$schedule_ids === void 0 ? [] : _ref$schedule_ids, schedule_date = _ref.schedule_date;
-              // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
-              if (!((_schedule_ids = schedule_ids) !== null && _schedule_ids !== void 0 && _schedule_ids.length)) {
-                schedule_ids_data = this.store.schedule.getScheduleListByIds(schedule_ids).map(function (n) {
-                  return n.id;
-                });
-                if (schedule_ids_data.length) {
-                  schedule_ids = schedule_ids_data;
-                } else if (schedule_date) {
-                  // 后端说如果 schedule_ids 如果为空，需要给[0]
-                  schedule_ids = [0];
-                }
-              }
+              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection;
+              // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
+              // if (!schedule_ids?.length) {
+              //   const schedule_ids_data = this.store.schedule
+              //     .getScheduleListByIds(schedule_ids)
+              //     .map((n) => n.id);
+              //   if (schedule_ids_data.length) {
+              //     schedule_ids = schedule_ids_data;
+              //   } else if (schedule_date) {
+              //     // 后端说如果 schedule_ids 如果为空，需要给[0]
+              //     schedule_ids = [0];
+              //   }
+              // }
               userPlugin = this.core.getPlugin('user');
               customer_id = undefined;
               try {
@@ -234,7 +233,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 console.error(error);
               }
               // 如果没传schedule_date，则从
-              _context2.next = 7;
+              _context2.next = 6;
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
@@ -247,17 +246,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 category_ids: category_ids,
                 ids: product_ids,
                 collection: collection,
-                front_end_cache_id: this.cacheId,
-                client_schedule_ids: schedule_ids,
-                schedule_date: schedule_date
+                front_end_cache_id: this.cacheId
+                // client_schedule_ids: schedule_ids,
+                // schedule_date,
               }, {
                 useCache: true
               });
-            case 7:
+            case 6:
               productsData = _context2.sent;
               this.store.products.addProduct(productsData.data.list);
               return _context2.abrupt("return", productsData.data.list);
-            case 10:
+            case 9:
             case "end":
               return _context2.stop();
           }
@@ -273,11 +272,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
         var _product_ids;
-        var date, product_ids, _ref2$category_ids, category_ids, scheduleList, scheduleIds, _schedule$product_ids, schedule;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, _schedule$product_ids, schedule, otherProductsIds, allProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              date = _ref2.date, product_ids = _ref2.product_ids, _ref2$category_ids = _ref2.category_ids, category_ids = _ref2$category_ids === void 0 ? [] : _ref2$category_ids;
+              date = _ref2.date, _ref2$product_ids = _ref2.product_ids, product_ids = _ref2$product_ids === void 0 ? [] : _ref2$product_ids, _ref2$category_ids = _ref2.category_ids, category_ids = _ref2$category_ids === void 0 ? [] : _ref2$category_ids;
               scheduleList = this.store.schedule.getAvailabilityScheduleDateList(); // 缓存下这次选择的结果，如果是先选日期再选 duration 类商品，后面用得到
               this.setDateRange([{
                 date: date,
@@ -290,13 +289,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 week: '',
                 weekNum: 0
               }]);
-              scheduleIds = scheduleList.filter(function (n) {
-                return n.date === date;
-              }).flatMap(function (n) {
-                return n.schedule_id;
-              }).filter(function (n) {
-                return n !== null && n !== undefined;
-              }); // 如果外面没传 product_ids，尝试从对应 schedule 里拿 product_ids
+              // const scheduleIds = scheduleList
+              //   .filter((n) => n.date === date)
+              //   .flatMap((n) => n.schedule_id)
+              //   .filter((n) => n !== null && n !== undefined);
+
+              // 如果外面没传 product_ids，尝试从对应 schedule 里拿 product_ids
               if (!((_product_ids = product_ids) !== null && _product_ids !== void 0 && _product_ids.length)) {
                 schedule = scheduleList.find(function (n) {
                   return n.date === date;
@@ -305,16 +303,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   product_ids = schedule.product_ids;
                 }
               }
-              _context3.next = 7;
+              // 尝试去拿schedule 里的 other_product_ids 和 product_ids 拼在一起去重
+              otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
+              allProductIds = [].concat(_toConsumableArray(product_ids), _toConsumableArray(otherProductsIds)).filter(function (n, index, self) {
+                return self.indexOf(n) === index;
+              });
+              _context3.next = 8;
               return this.loadProducts({
-                schedule_ids: scheduleIds,
-                product_ids: product_ids,
-                category_ids: category_ids,
-                schedule_date: date
+                // schedule_ids: scheduleIds,
+                product_ids: allProductIds,
+                category_ids: category_ids
+                // schedule_date: date,
               });
-            case 7:
-              return _context3.abrupt("return", _context3.sent);
             case 8:
+              return _context3.abrupt("return", _context3.sent);
+            case 9:
             case "end":
               return _context3.stop();
           }
@@ -472,7 +475,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadScheduleAvailableDate",
     value: function () {
       var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref3) {
-        var _res$data$date_list;
+        var _res$data$date_list, _res$data$other_produ, _res$data$other_produ2;
         var startDate, endDate, custom_page_id, channel, dates, res;
         return _regeneratorRuntime().wrap(function _callee6$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
@@ -493,7 +496,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return _context7.abrupt("return", dates);
             case 6:
               _context7.next = 8;
-              return this.request.get("/schedule/product/availability", {
+              return this.request.get("/schedule/product/availability/v2", {
                 start_date: startDate,
                 end_date: endDate,
                 custom_page_id: custom_page_id,
@@ -502,24 +505,32 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             case 8:
               res = _context7.sent;
               this.store.schedule.setAvailabilityScheduleDateList(res.data.date_list);
+              this.store.schedule.setOtherProductsIds(res.data.other_product_ids || []);
               // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
-              if (!(!((_res$data$date_list = res.data.date_list) !== null && _res$data$date_list !== void 0 && _res$data$date_list.length) || dayjs(endDate).isBefore(dayjs(), 'day'))) {
-                _context7.next = 12;
+              if (!(!((_res$data$date_list = res.data.date_list) !== null && _res$data$date_list !== void 0 && _res$data$date_list.length) && !((_res$data$other_produ = res.data.other_product_ids) !== null && _res$data$other_produ !== void 0 && _res$data$other_produ.length) || dayjs(endDate).isBefore(dayjs(), 'day'))) {
+                _context7.next = 13;
                 break;
               }
               return _context7.abrupt("return", dates);
-            case 12:
-              res.data.date_list.forEach(function (n) {
-                var index = dates.findIndex(function (m) {
-                  return m.date === n.date;
+            case 13:
+              if ((_res$data$other_produ2 = res.data.other_product_ids) !== null && _res$data$other_produ2 !== void 0 && _res$data$other_produ2.length) {
+                // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
+                dates.forEach(function (n) {
+                  n.status = 'available';
                 });
-                if (index !== -1) {
-                  dates[index].status = 'available';
-                }
-              });
+              } else {
+                res.data.date_list.forEach(function (n) {
+                  var index = dates.findIndex(function (m) {
+                    return m.date === n.date;
+                  });
+                  if (index !== -1) {
+                    dates[index].status = 'available';
+                  }
+                });
+              }
               dates = disableDatesBeforeOneDay(dates);
               return _context7.abrupt("return", dates);
-            case 15:
+            case 16:
             case "end":
               return _context7.stop();
           }
@@ -1957,9 +1968,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             var currentResourceConfig = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.product_resource) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.resources) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.find(function (n) {
               return n.code === resources_code;
             });
-            var resourceBookingType = (currentResourceConfig === null || currentResourceConfig === void 0 ? void 0 : currentResourceConfig.type) || 'single';
             // 只有 duration 类商品需要这个操作
-            if (index !== 0 && recordTimeSlots && resourceBookingType === 'single' && (_item$_productOrigin5 = item._productOrigin) !== null && _item$_productOrigin5 !== void 0 && _item$_productOrigin5.duration) {
+            if (index !== 0 && recordTimeSlots && (currentResourceConfig === null || currentResourceConfig === void 0 ? void 0 : currentResourceConfig.type) === 'single' && (_item$_productOrigin5 = item._productOrigin) !== null && _item$_productOrigin5 !== void 0 && _item$_productOrigin5.duration) {
               var _item$_productOrigin$, _item$_productOrigin6, _ref9, _item$_productOrigin7, _item$_productOrigin$2, _item$_productOrigin8, _ref10, _item$_productOrigin9;
               var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.duration) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
               var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.duration) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.duration) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
@@ -2382,6 +2392,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         // 用来计算资源的可使用情况，针对单个schedule 时间片
         var resourcesUseableMap = {};
         var count = 0;
+        var bookingLeft = 0;
         // 遍历所有资源
         allProductResources === null || allProductResources === void 0 || allProductResources.forEach(function (m) {
           // 遍历所有资源的上工时间片
@@ -2423,8 +2434,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
           if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
             return n === false;
-          }) && currentResourcesCount >= count) {
-            count = currentResourcesCount;
+          })) {
+            if (currentResourcesCount >= count) {
+              count = currentResourcesCount;
+            }
+            if (!m.onlyComputed) {
+              bookingLeft += 1;
+            }
           }
         });
         var startDayJs = dayjs(item.start);
@@ -2434,7 +2450,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           end_time: endDayJs.format('HH:mm'),
           start_at: startDayJs,
           end_at: endDayJs,
-          count: count
+          count: count,
+          left: bookingLeft
         };
       });
       return formatScheduleTimeSlots;
@@ -2850,7 +2867,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               openResources = ((_tempProducts = tempProducts) === null || _tempProducts === void 0 || (_tempProducts = _tempProducts.product_resource) === null || _tempProducts === void 0 || (_tempProducts = _tempProducts.resources) === null || _tempProducts === void 0 ? void 0 : _tempProducts.filter(function (m) {
                 return m.status === 1;
               })) || []; // res.data 返回的一定是启用商品的资源列表，不需要再过滤了
-              allProductResources = sortCombinedResources(res.data);
+              allProductResources = sortCombinedResources(res.data); // allProductResources 需要根据商品里的资源的单个预约多个预约补充resourceType
+              allProductResources.forEach(function (m) {
+                var _tempProducts2;
+                var resource = (_tempProducts2 = tempProducts) === null || _tempProducts2 === void 0 || (_tempProducts2 = _tempProducts2.product_resource) === null || _tempProducts2 === void 0 || (_tempProducts2 = _tempProducts2.resources) === null || _tempProducts2 === void 0 ? void 0 : _tempProducts2.find(function (n) {
+                  return n.id === m.form_id;
+                });
+                if (resource) {
+                  m.resourceType = resource.type;
+                }
+              });
               targetSchedules = this.store.schedule.getScheduleListByIds(tempProducts['schedule.ids']);
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var currentDateStr, status, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse;
@@ -2907,7 +2933,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                                 return;
                               }
                               var targetCanUseTimes = mTimes.some(function (childTiem) {
-                                var _tempProducts2;
+                                var _tempProducts3;
                                 // 挨个去匹配某个工作时间段结合当前日程时间，资源能不能用，有多少容量能用
                                 var res = getIsUsableByTimeItem({
                                   timeSlice: {
@@ -2920,7 +2946,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                                   resource: m,
                                   currentCount: 1,
                                   resourcesUseableMap: resourcesUseableMap,
-                                  cut_off_time: (_tempProducts2 = tempProducts) === null || _tempProducts2 === void 0 ? void 0 : _tempProducts2.cut_off_time
+                                  cut_off_time: (_tempProducts3 = tempProducts) === null || _tempProducts3 === void 0 ? void 0 : _tempProducts3.cut_off_time
                                 });
                                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
                                   resourcesUseableMap[m.id] = res.usable;
@@ -2959,22 +2985,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 }, _loop3);
               });
-            case 22:
+            case 23:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
-                _context32.next = 28;
+                _context32.next = 29;
                 break;
               }
-              return _context32.delegateYield(_loop3(), "t0", 24);
-            case 24:
+              return _context32.delegateYield(_loop3(), "t0", 25);
+            case 25:
               if (!_context32.t0) {
-                _context32.next = 26;
+                _context32.next = 27;
                 break;
               }
-              return _context32.abrupt("break", 28);
-            case 26:
-              _context32.next = 22;
+              return _context32.abrupt("break", 29);
+            case 27:
+              _context32.next = 23;
               break;
-            case 28:
+            case 29:
               // 最终把资源数据也加到日期内
               dates = handleAvailableDateByResource(res.data, dates);
               this.store.date.setDateList(dates);
@@ -2990,7 +3016,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 32:
+            case 33:
             case "end":
               return _context32.stop();
           }

package/lib/modules/Schedule/index.d.ts

@@ -14,5 +14,7 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     getScheduleListByIds(ids: number[]): ScheduleItem[];
     setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;
     getAvailabilityScheduleDateList(): ScheduleAvailabilityDateItem[];
+    setOtherProductsIds(ids: number[]): void;
+    getOtherProductsIds(): number[];
     storeChange(): void;
 }

package/lib/modules/Schedule/index.js

@@ -63,6 +63,12 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
   getAvailabilityScheduleDateList() {
     return this.store.availabilityDateList;
   }
+  setOtherProductsIds(ids) {
+    this.store.otherProductsIds = ids;
+  }
+  getOtherProductsIds() {
+    return this.store.otherProductsIds;
+  }
   storeChange() {
     if (this.openCache) {
       const store = (0, import_lodash_es.cloneDeep)(this.store);

package/lib/modules/Schedule/types.d.ts

@@ -2,6 +2,7 @@ import dayjs from 'dayjs';
 export interface ScheduleState {
     scheduleList: ScheduleItem[];
     availabilityDateList: ScheduleAvailabilityDateItem[];
+    otherProductsIds: number[];
 }
 export type ScheduleAvailabilityDateItem = {
     date: string;

package/lib/solution/BookingByStep/index.d.ts

@@ -42,12 +42,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 更新step
      */
     updateStep(key: string, step: IStep): void;
-    loadProducts({ category_ids, product_ids, collection, schedule_ids, schedule_date, }: {
+    loadProducts({ category_ids, product_ids, collection, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
-        schedule_ids?: number[];
-        schedule_date?: string;
     }): Promise<any>;
     loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;
@@ -200,6 +198,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         start_at: dayjs.Dayjs;
         end_at: dayjs.Dayjs;
         count: number;
+        left: number;
     }[];
     addProductToCart({ product, date, account, }: {
         product: ProductData;

package/lib/solution/BookingByStep/index.js

@@ -162,19 +162,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async loadProducts({
     category_ids = [],
     product_ids = [],
-    collection = [],
-    schedule_ids = [],
-    schedule_date
+    collection = []
+    // schedule_ids = [],
+    // schedule_date,
   }) {
     var _a;
-    if (!(schedule_ids == null ? void 0 : schedule_ids.length)) {
-      const schedule_ids_data = this.store.schedule.getScheduleListByIds(schedule_ids).map((n) => n.id);
-      if (schedule_ids_data.length) {
-        schedule_ids = schedule_ids_data;
-      } else if (schedule_date) {
-        schedule_ids = [0];
-      }
-    }
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
@@ -202,9 +194,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         category_ids,
         ids: product_ids,
         collection,
-        front_end_cache_id: this.cacheId,
-        client_schedule_ids: schedule_ids,
-        schedule_date
+        front_end_cache_id: this.cacheId
+        // client_schedule_ids: schedule_ids,
+        // schedule_date,
       },
       { useCache: true }
     );
@@ -213,7 +205,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   async loadProductByScheduleDate({
     date,
-    product_ids,
+    product_ids = [],
     category_ids = []
   }) {
     var _a;
@@ -222,18 +214,21 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       { date, status: "available", week: "", weekNum: 0 },
       { date, status: "available", week: "", weekNum: 0 }
     ]);
-    const scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id).filter((n) => n !== null && n !== void 0);
     if (!(product_ids == null ? void 0 : product_ids.length)) {
       const schedule = scheduleList.find((n) => n.date === date);
       if (schedule && ((_a = schedule.product_ids) == null ? void 0 : _a.length)) {
         product_ids = schedule.product_ids;
       }
     }
+    const otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
+    const allProductIds = [...product_ids, ...otherProductsIds].filter(
+      (n, index, self) => self.indexOf(n) === index
+    );
     return await this.loadProducts({
-      schedule_ids: scheduleIds,
-      product_ids,
-      category_ids,
-      schedule_date: date
+      // schedule_ids: scheduleIds,
+      product_ids: allProductIds,
+      category_ids
+      // schedule_date: date,
     });
   }
   async updateQuotationPriceAndCart(date) {
@@ -305,7 +300,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     custom_page_id,
     channel
   }) {
-    var _a;
+    var _a, _b, _c;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
@@ -315,7 +310,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       return dates;
     }
     const res = await this.request.get(
-      `/schedule/product/availability`,
+      `/schedule/product/availability/v2`,
       {
         start_date: startDate,
         end_date: endDate,
@@ -324,15 +319,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     );
     this.store.schedule.setAvailabilityScheduleDateList(res.data.date_list);
-    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+    this.store.schedule.setOtherProductsIds(res.data.other_product_ids || []);
+    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) && !((_b = res.data.other_product_ids) == null ? void 0 : _b.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
       return dates;
     }
-    res.data.date_list.forEach((n) => {
-      const index = dates.findIndex((m) => m.date === n.date);
-      if (index !== -1) {
-        dates[index].status = "available";
-      }
-    });
+    if ((_c = res.data.other_product_ids) == null ? void 0 : _c.length) {
+      dates.forEach((n) => {
+        n.status = "available";
+      });
+    } else {
+      res.data.date_list.forEach((n) => {
+        const index = dates.findIndex((m) => m.date === n.date);
+        if (index !== -1) {
+          dates[index].status = "available";
+        }
+      });
+    }
     dates = (0, import_utils3.disableDatesBeforeOneDay)(dates);
     return dates;
   }
@@ -1276,8 +1278,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const currentResourceConfig = (_d = (_c = (_b = item._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find(
             (n) => n.code === resources_code
           );
-          const resourceBookingType = (currentResourceConfig == null ? void 0 : currentResourceConfig.type) || "single";
-          if (index !== 0 && recordTimeSlots && resourceBookingType === "single" && ((_e = item._productOrigin) == null ? void 0 : _e.duration)) {
+          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_e = item._productOrigin) == null ? void 0 : _e.duration)) {
             let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
               ((_g = (_f = item._productOrigin) == null ? void 0 : _f.duration) == null ? void 0 : _g.value) ?? 0,
               ((_i = (_h = item._productOrigin) == null ? void 0 : _h.duration) == null ? void 0 : _i.type) ?? "minutes"
@@ -1668,6 +1669,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
       let count = 0;
+      let bookingLeft = 0;
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
         let currentResourcesCount = 0;
         const currentResourcesTimeSlotCanUsedArr = [];
@@ -1699,10 +1701,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
-        if (!currentResourcesTimeSlotCanUsedArr.some(
-          (n) => n === false
-        ) && currentResourcesCount >= count) {
-          count = currentResourcesCount;
+        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false)) {
+          if (currentResourcesCount >= count) {
+            count = currentResourcesCount;
+          }
+          if (!m.onlyComputed) {
+            bookingLeft += 1;
+          }
         }
       });
       const startDayJs = (0, import_dayjs.default)(item.start);
@@ -1712,7 +1717,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         end_time: endDayJs.format("HH:mm"),
         start_at: startDayJs,
         end_at: endDayJs,
-        count
+        count,
+        left: bookingLeft
       };
     });
     return formatScheduleTimeSlots;
@@ -2017,6 +2023,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       (m) => m.status === 1
     )) || [];
     const allProductResources = (0, import_resources.sortCombinedResources)(res.data);
+    allProductResources.forEach((m) => {
+      var _a2, _b2;
+      const resource = (_b2 = (_a2 = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _a2.resources) == null ? void 0 : _b2.find(
+        (n) => n.id === m.form_id
+      );
+      if (resource) {
+        m.resourceType = resource.type;
+      }
+    });
     const targetSchedules = this.store.schedule.getScheduleListByIds(
       tempProducts["schedule.ids"]
     );

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "3.0.34",
+  "version": "3.0.35",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",