@pisell/pisellos 0.0.11 → 0.0.14

package/dist/solution/BookingByStep/index.js

@@ -138,35 +138,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
 
     // 获取购物车里 temp.xxx的方法
-  }, {
-    key: "getStoreCart",
-    value: function () {
-      var _getStoreCart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key) {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              return _context2.abrupt("return", this.store.cart.getTemp(key));
-            case 1:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function getStoreCart(_x3) {
-        return _getStoreCart.apply(this, arguments);
-      }
-      return getStoreCart;
-    }() // 加载商品，然后导到商品列表里去
+    // async getStoreCart(key?: string) {
+    //   return this.store.cart.getTemp(key);
+    // }
+
+    // 加载商品，然后导到商品列表里去
   }, {
     key: "loadProducts",
     value: function () {
-      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
+      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
         var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, productsData;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        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;
-              _context3.next = 3;
+              _context2.next = 3;
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 1,
@@ -179,16 +165,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 collection: collection
               });
             case 3:
-              productsData = _context3.sent;
+              productsData = _context2.sent;
               this.store.products.addProduct(productsData.data.list);
-              return _context3.abrupt("return", productsData.data.list);
+              return _context2.abrupt("return", productsData.data.list);
             case 6:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
-      function loadProducts(_x4) {
+      function loadProducts(_x3) {
         return _loadProducts.apply(this, arguments);
       }
       return loadProducts;
@@ -196,15 +182,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "storeProduct",
     value: function () {
-      var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(productData) {
+      var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(productData) {
         var activeAccount, _ref2, bundle, options, origin, product_variant_id, product;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               // 往购物车加商品数据的时候，默认用当前 activeAccount 填充到 product 的 account 里面
               activeAccount = this.getActiveAccount();
               if (activeAccount) {
-                _context4.next = 3;
+                _context3.next = 3;
                 break;
               }
               throw new Error("没有找到当前账户");
@@ -221,11 +207,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
-      function storeProduct(_x5) {
+      function storeProduct(_x4) {
         return _storeProduct.apply(this, arguments);
       }
       return storeProduct;
@@ -233,21 +219,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addAccount",
     value: function () {
-      var _addAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(accounts) {
+      var _addAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(accounts) {
         var _this3 = this;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               accounts.forEach(function (account) {
                 _this3.store.accountList.addAccount(account);
               });
             case 1:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5);
+        }, _callee4);
       }));
-      function addAccount(_x6) {
+      function addAccount(_x5) {
         return _addAccount.apply(this, arguments);
       }
       return addAccount;
@@ -255,20 +241,20 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAccounts",
     value: function () {
-      var _getAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var _getAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var accounts;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               accounts = this.store.accountList.getAccounts();
-              return _context6.abrupt("return", accounts.map(function (account) {
+              return _context5.abrupt("return", accounts.map(function (account) {
                 return account.getAccount();
               }));
             case 2:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
-        }, _callee6, this);
+        }, _callee5, this);
       }));
       function getAccounts() {
         return _getAccounts.apply(this, arguments);
@@ -306,18 +292,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDateRange",
     value: function () {
-      var _setDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(dateRange) {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _setDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(dateRange) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               this.store.date.setDateRange(dateRange);
             case 1:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7, this);
+        }, _callee6, this);
       }));
-      function setDateRange(_x7) {
+      function setDateRange(_x6) {
         return _setDateRange.apply(this, arguments);
       }
       return setDateRange;
@@ -325,16 +311,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getRangeDate",
     value: function () {
-      var _getRangeDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _getRangeDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              return _context8.abrupt("return", "2024-01-01");
+              return _context7.abrupt("return", "2024-01-01");
             case 1:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
-        }, _callee8);
+        }, _callee7);
       }));
       function getRangeDate() {
         return _getRangeDate.apply(this, arguments);
@@ -344,16 +330,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getCart",
     value: function () {
-      var _getCart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _getCart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              return _context9.abrupt("return", this.store.cart.getItems());
+              return _context8.abrupt("return", this.store.cart.getItems());
             case 1:
             case "end":
-              return _context9.stop();
+              return _context8.stop();
           }
-        }, _callee9, this);
+        }, _callee8, this);
       }));
       function getCart() {
         return _getCart.apply(this, arguments);
@@ -363,7 +349,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAvailableDate",
     value: function () {
-      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var _getAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
         var _this$otherParams, _this$otherParams2;
         var params,
           products,
@@ -377,11 +363,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           rules,
           resourcesMap,
           res,
-          _args10 = arguments;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+          _args9 = arguments;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              params = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : {};
+              params = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
               // 开始日期如果小于今天，直接以今天当做开始日期
               products = params.products, startDate = params.startDate, endDate = params.endDate;
               tempProducts = products || this.store.cart.getItems().map(function (p) {
@@ -390,16 +376,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               tempStartDate = startDate || ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 || (_this$otherParams = _this$otherParams.dateRange) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams[0]);
               tempEndDate = endDate || ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 || (_this$otherParams2 = _this$otherParams2.dateRange) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2[1]);
               if (tempProducts.length) {
-                _context10.next = 7;
+                _context9.next = 7;
                 break;
               }
-              return _context10.abrupt("return", []);
+              return _context9.abrupt("return", []);
             case 7:
               // 在这里需要把能收集到的数据都收集上来，拼装好给 date 模块去查询
               _ref3 = getAvailableProductResources(tempProducts) || {}, resourceIds = _ref3.resourceIds, rules = _ref3.rules, resourcesMap = _ref3.resourcesMap;
               console.log("resourceIds", tempProducts);
               this.otherParams.currentResourcesMap = resourcesMap;
-              _context10.next = 12;
+              _context9.next = 12;
               return this.store.date.getMonthDates({
                 query: {
                   start_date: tempStartDate,
@@ -409,13 +395,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 rules: rules
               });
             case 12:
-              res = _context10.sent;
-              return _context10.abrupt("return", res);
+              res = _context9.sent;
+              return _context9.abrupt("return", res);
             case 14:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
-        }, _callee10, this);
+        }, _callee9, this);
       }));
       function getAvailableDate() {
         return _getAvailableDate.apply(this, arguments);
@@ -428,22 +414,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSummary",
     value: (function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
         var cartItems, summary;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               cartItems = this.store.cart.getItems();
-              _context11.next = 3;
+              _context10.next = 3;
               return this.store.summary.getSummary(cartItems);
             case 3:
-              summary = _context11.sent;
-              return _context11.abrupt("return", summary);
+              summary = _context10.sent;
+              return _context10.abrupt("return", summary);
             case 5:
             case "end":
-              return _context11.stop();
+              return _context10.stop();
           }
-        }, _callee11, this);
+        }, _callee10, this);
       }));
       function getSummary() {
         return _getSummary.apply(this, arguments);
@@ -454,16 +440,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              return _context12.abrupt("return", this.store.products.getProducts());
+              return _context11.abrupt("return", this.store.products.getProducts());
             case 1:
             case "end":
-              return _context12.stop();
+              return _context11.stop();
           }
-        }, _callee12, this);
+        }, _callee11, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -473,15 +459,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setLoginAccount",
     value: function () {
-      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(accountId, accountInfo) {
+      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(accountId, accountInfo) {
         var _this4 = this;
         var account, cartItems;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
               account = this.store.accountList.getAccount(accountId);
               if (!account) {
-                _context13.next = 7;
+                _context12.next = 7;
                 break;
               }
               account.setAccountInfo(accountInfo);
@@ -495,17 +481,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   });
                 }
               });
-              _context13.next = 8;
+              _context12.next = 8;
               break;
             case 7:
               throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
             case 8:
             case "end":
-              return _context13.stop();
+              return _context12.stop();
           }
-        }, _callee13, this);
+        }, _callee12, this);
       }));
-      function setLoginAccount(_x8, _x9) {
+      function setLoginAccount(_x7, _x8) {
         return _setLoginAccount.apply(this, arguments);
       }
       return setLoginAccount;
@@ -513,14 +499,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "generateCartData",
     value: function () {
-      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
             case "end":
-              return _context14.stop();
+              return _context13.stop();
           }
-        }, _callee14);
+        }, _callee13);
       }));
       function generateCartData() {
         return _generateCartData.apply(this, arguments);
@@ -530,10 +516,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
         var cartItems;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               cartItems = this.store.cart.getItems(); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
               cartItems.forEach(function (item) {
@@ -545,16 +531,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread({}, newResourcesItem);
                 });
               });
-              return _context15.abrupt("return", this.store.order.commitOrder({
+              return _context14.abrupt("return", this.store.order.commitOrder({
                 query: {
                   cartItems: cartItems
                 }
               }));
             case 3:
             case "end":
-              return _context15.stop();
+              return _context14.stop();
           }
-        }, _callee15, this);
+        }, _callee14, this);
       }));
       function submitOrder() {
         return _submitOrder.apply(this, arguments);
@@ -564,14 +550,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pay",
     value: function () {
-      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
             case "end":
-              return _context16.stop();
+              return _context15.stop();
           }
-        }, _callee16);
+        }, _callee15);
       }));
       function pay() {
         return _pay.apply(this, arguments);
@@ -581,14 +567,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPayInfo",
     value: function () {
-      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
             case "end":
-              return _context17.stop();
+              return _context16.stop();
           }
-        }, _callee17);
+        }, _callee16);
       }));
       function getPayInfo() {
         return _getPayInfo.apply(this, arguments);
@@ -598,15 +584,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
         var _ref4,
           _ref4$cover,
           cover,
-          _args18 = arguments;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+          _args17 = arguments;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              _ref4 = _args18.length > 1 && _args18[1] !== undefined ? _args18[1] : {}, _ref4$cover = _ref4.cover, cover = _ref4$cover === void 0 ? false : _ref4$cover;
+              _ref4 = _args17.length > 1 && _args17[1] !== undefined ? _args17[1] : {}, _ref4$cover = _ref4.cover, cover = _ref4$cover === void 0 ? false : _ref4$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -614,11 +600,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context18.stop();
+              return _context17.stop();
           }
-        }, _callee18, this);
+        }, _callee17, this);
       }));
-      function setOtherParams(_x10) {
+      function setOtherParams(_x9) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -626,16 +612,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOtherParams",
     value: function () {
-      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              return _context19.abrupt("return", this.otherParams);
+              return _context18.abrupt("return", this.otherParams);
             case 1:
             case "end":
-              return _context19.stop();
+              return _context18.stop();
           }
-        }, _callee19, this);
+        }, _callee18, this);
       }));
       function getOtherParams() {
         return _getOtherParams.apply(this, arguments);
@@ -803,7 +789,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "autoSelectAccountResources",
     value: function autoSelectAccountResources(_ref7) {
-      var _accountCartItems$;
+      var _accountCartItems$0$_, _accountCartItems$;
       var holder_id = _ref7.holder_id,
         resources_code = _ref7.resources_code,
         timeSlots = _ref7.timeSlots;
@@ -812,18 +798,25 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 取到账号下所有的商品，然后根据商品的 duration 和资源列表，获取所有可用的资源
       var accountCartItems = cartItems.filter(function (n) {
         return n.holder_id === holder_id;
-      });
+      }) || [];
+      // 账号下没商品则不用处理
+      if (!accountCartItems.length) {
+        return {
+          selectedResource: null
+        };
+      }
       // duration=所有商品时间的集合
       var duration = accountCartItems.reduce(function (acc, n) {
-        return acc + n._productOrigin.duration.value;
+        var _n$_productOrigin$dur, _n$_productOrigin;
+        return acc + ((_n$_productOrigin$dur = (_n$_productOrigin = n._productOrigin) === null || _n$_productOrigin === void 0 || (_n$_productOrigin = _n$_productOrigin.duration) === null || _n$_productOrigin === void 0 ? void 0 : _n$_productOrigin.value) !== null && _n$_productOrigin$dur !== void 0 ? _n$_productOrigin$dur : 0);
       }, 0);
       // 正常来说，能进这个业务的所有商品的 duration 类型都是一样的，所以这里取第一个商品的 duration 类型
-      var durationType = (accountCartItems === null || accountCartItems === void 0 || (_accountCartItems$ = accountCartItems[0]) === null || _accountCartItems$ === void 0 ? void 0 : _accountCartItems$._productOrigin.duration.type) || "minutes";
+      var durationType = (_accountCartItems$0$_ = (_accountCartItems$ = accountCartItems[0]) === null || _accountCartItems$ === void 0 || (_accountCartItems$ = _accountCartItems$._productOrigin) === null || _accountCartItems$ === void 0 || (_accountCartItems$ = _accountCartItems$.duration) === null || _accountCartItems$ === void 0 ? void 0 : _accountCartItems$.type) !== null && _accountCartItems$0$_ !== void 0 ? _accountCartItems$0$_ : "minutes";
       // 取出账号下所对应类型的所有的可用资源
       var resources = [];
       accountCartItems.forEach(function (item) {
-        var _item$_productOrigin$;
-        (_item$_productOrigin$ = item._productOrigin.product_resource) === null || _item$_productOrigin$ === void 0 || (_item$_productOrigin$ = _item$_productOrigin$.resources) === null || _item$_productOrigin$ === void 0 || _item$_productOrigin$.forEach(function (n) {
+        var _item$_productOrigin;
+        (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 || (_item$_productOrigin = _item$_productOrigin.product_resource) === null || _item$_productOrigin === void 0 || (_item$_productOrigin = _item$_productOrigin.resources) === null || _item$_productOrigin === void 0 || _item$_productOrigin.forEach(function (n) {
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
           }
@@ -920,7 +913,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               console.log(_this5.store.cart.getItems());
               _this5.store.cart.updateItem({
                 _id: item._id,
-                resources: [].concat(_toConsumableArray(item._origin.resources || []), [res.selectedResource])
+                // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
+                resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
+                  return existingRes.resourceType !== res.selectedResource.resourceType;
+                })), [res.selectedResource])
               });
               console.log(_this5.store.cart.getItems());
             } else {
@@ -938,7 +934,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             if (targetRenderList && targetRenderList.length > 0) {
               _this5.store.cart.updateItem({
                 _id: item._id,
-                resources: [].concat(_toConsumableArray(item._origin.resources || []), [targetRenderList[0]])
+                resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
+                  return existingRes.resourceType !== targetRenderList[0].resourceType;
+                })), [targetRenderList[0]])
               });
             } else {
               // 如果没有可用的技师了，推到错误列表里让 UI 去提示
@@ -962,8 +960,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var cartItems = this.store.cart.getItems();
       var resourceIds = [];
       cartItems.forEach(function (item) {
-        var _item$_productOrigin$2, _item$_origin$resourc;
-        (_item$_productOrigin$2 = item._productOrigin.product_resource) === null || _item$_productOrigin$2 === void 0 || (_item$_productOrigin$2 = _item$_productOrigin$2.resources) === null || _item$_productOrigin$2 === void 0 || _item$_productOrigin$2.forEach(function (n) {
+        var _item$_productOrigin2, _item$_origin$resourc;
+        (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 || (_item$_productOrigin2 = _item$_productOrigin2.product_resource) === null || _item$_productOrigin2 === void 0 || (_item$_productOrigin2 = _item$_productOrigin2.resources) === null || _item$_productOrigin2 === void 0 || _item$_productOrigin2.forEach(function (n) {
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
           }
@@ -979,7 +977,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var accountDuration = 0;
         var cartItems = _this6.store.cart.getCartByAccount(account.getId());
         cartItems.forEach(function (item) {
-          accountDuration += item._productOrigin.duration.value;
+          var _item$_productOrigin$, _item$_productOrigin3;
+          accountDuration += (_item$_productOrigin$ = (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0;
         });
         if (accountDuration > duration) {
           duration = accountDuration;
@@ -1029,8 +1028,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       cartItems.forEach(function (item) {
         var newResources = cloneDeep(item._origin.resources);
         newResources.forEach(function (n) {
+          var _item$_productOrigin$2, _item$_productOrigin4, _ref8, _item$_productOrigin5;
           n.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-          n.endTime = dayjs(n.startTime).add(item._productOrigin.duration.value, item._productOrigin.duration.type).format("YYYY-MM-DD HH:mm");
+          n.endTime = dayjs(n.startTime).add((_item$_productOrigin$2 = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref8 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.type) !== null && _ref8 !== void 0 ? _ref8 : "minutes").format("YYYY-MM-DD HH:mm");
           delete n.times;
         });
         _this7.store.cart.updateItem({

package/dist/solution/BookingByStep/utils/resources.js

@@ -231,12 +231,14 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
         }
         return childAcc;
       }, []);
-
       // 合并渲染
       item.renderList = optional_resource.concat(default_resource);
       // renderList里 times 的每一项需要匹配一下当前时间，如果 times 里最小的end_at小于当前时间，则这个资源应该从 renderList 删除
       item.renderList = item.renderList.filter(function (d) {
-        return dayjs(d.times[0].end_at).isAfter(dayjs());
+        var latestTime = d.times.reduce(function (latest, current) {
+          return dayjs(current.end_at).isAfter(dayjs(latest.end_at)) ? current : latest;
+        }, d.times[0]);
+        return dayjs(latestTime.end_at).isAfter(dayjs());
       });
       item.form_id = form_id;
       acc.push(item);