@pisell/pisellos 0.0.26 → 0.0.27

package/dist/modules/Cart/index.js

@@ -61,7 +61,6 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
-              debugger;
               if (Array.isArray((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.list)) {
                 this.store.list = options.initialState.list;
                 this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
@@ -80,20 +79,20 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
               this.request = core.getPlugin("request");
               this.window = core.getPlugin("window");
               if (this.request) {
-                _context.next = 10;
+                _context.next = 9;
                 break;
               }
               throw new Error("购物车模块需要 request 插件支持");
-            case 10:
+            case 9:
               if (this.window) {
-                _context.next = 12;
+                _context.next = 11;
                 break;
               }
               throw new Error("购物车模块需要 window 插件支持");
-            case 12:
+            case 11:
               // this.store.temp = {};
               console.log("[CartModule] 初始化完成");
-            case 13:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -116,7 +115,6 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              debugger;
               account = params.account, product = params.product, bundle = params.bundle, options = params.options; // 生成一个唯一的 ID
               cartItem = {
                 _id: getUniqueId(),
@@ -143,9 +141,9 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
               this.store.list = items;
 
               // 触发事件
-              _context2.next = 9;
+              _context2.next = 8;
               return this.core.effects.emit("".concat(this.name, ":onAddItem"), cartItem);
-            case 9:
+            case 8:
             case "end":
               return _context2.stop();
           }

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

@@ -1,5 +1,6 @@
 import { Module, PisellCore } from "../../types";
 import { BaseModule } from "../../modules/BaseModule";
+import { Response } from "../../plugins";
 import { BookingByStepState } from "./types";
 import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
 import { Account } from "../../modules/Account/types";
@@ -59,6 +60,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getProducts(): Promise<ProductData[]>;
     setLoginAccount(accountId: string, accountInfo: Account): Promise<void>;
     generateCartData(): Promise<void>;
+    getFreeProduct(id: string | number): Promise<Response<any>>;
     submitOrder(): Promise<void>;
     pay(): Promise<void>;
     getPayInfo(): Promise<void>;

package/dist/solution/BookingByStep/index.js

@@ -75,8 +75,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("bookingByStep解决方案需要 request 插件支持");
             case 9:
-              debugger;
-
               // 如果有传 cacheid，默认需要收集上面这些模块里用户操作选中的数据
               // 并且在上面 registerModule 的时候，读取 sessionStroage 里的数据，塞进默认值
               targetCacheData = {};
@@ -107,7 +105,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.core.effects.emit(BookingByStepHooks.onInited, {});
-            case 15:
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -533,17 +531,42 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return _generateCartData.apply(this, arguments);
       }
       return generateCartData;
-    }() // 购物车提交订单
+    }() // 免费领取商品相关逻辑，上线了来不及加了，先放在这，后面要做到 payment 里面的
   }, {
-    key: "submitOrder",
+    key: "getFreeProduct",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        var cartItems;
+      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(id) {
+        var res;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              cartItems = this.store.cart.getItems(); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
-              cartItems.forEach(function (item) {
+              _context13.next = 2;
+              return this.request.post("/pay/order/free-pay/".concat(id));
+            case 2:
+              res = _context13.sent;
+              return _context13.abrupt("return", res);
+            case 4:
+            case "end":
+              return _context13.stop();
+          }
+        }, _callee13, this);
+      }));
+      function getFreeProduct(_x9) {
+        return _getFreeProduct.apply(this, arguments);
+      }
+      return getFreeProduct;
+    }() // 购物车提交订单
+  }, {
+    key: "submitOrder",
+    value: function () {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+        var cartItems, newCartItems;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
+            case 0:
+              cartItems = this.store.cart.getItems();
+              newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
+              newCartItems.forEach(function (item) {
                 item._origin.resources = item._origin.resources.map(function (n) {
                   var newResourcesItem = cloneDeep(n);
                   delete newResourcesItem.id;
@@ -552,16 +575,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread({}, newResourcesItem);
                 });
               });
-              return _context13.abrupt("return", this.store.order.commitOrder({
+              return _context14.abrupt("return", this.store.order.commitOrder({
                 query: {
-                  cartItems: cartItems
+                  cartItems: newCartItems
                 }
               }));
-            case 3:
+            case 4:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
       function submitOrder() {
         return _submitOrder.apply(this, arguments);
@@ -571,14 +594,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pay",
     value: function () {
-      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.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 _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14);
+        }, _callee15);
       }));
       function pay() {
         return _pay.apply(this, arguments);
@@ -588,14 +611,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPayInfo",
     value: function () {
-      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.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 _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15);
+        }, _callee16);
       }));
       function getPayInfo() {
         return _getPayInfo.apply(this, arguments);
@@ -605,15 +628,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
         var _ref4,
           _ref4$cover,
           cover,
-          _args16 = arguments;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+          _args17 = arguments;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              _ref4 = _args16.length > 1 && _args16[1] !== undefined ? _args16[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 {
@@ -621,11 +644,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
-      function setOtherParams(_x9) {
+      function setOtherParams(_x10) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -633,16 +656,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOtherParams",
     value: function () {
-      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.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 _context17.abrupt("return", this.otherParams);
+              return _context18.abrupt("return", this.otherParams);
             case 1:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17, this);
+        }, _callee18, this);
       }));
       function getOtherParams() {
         return _getOtherParams.apply(this, arguments);

package/dist/solution/ShopDiscount/index.js

@@ -165,7 +165,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           targetCacheData = data[this.options.otherParams.cacheId];
         }
       }
-      debugger;
       // 注册优惠模块
       var discount = new DiscountModule("".concat(this.name, "_discount"));
       this.core.registerModule(discount, {

package/lib/modules/Cart/index.js

@@ -42,7 +42,6 @@ var CartModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     this.core = core;
     this.store = options.store;
-    debugger;
     if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
       this.store.list = options.initialState.list;
       this.core.effects.emit(`${this.name}:changed`, this.store.list);
@@ -70,7 +69,6 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 添加商品到购物车
    */
   async addItem(params) {
-    debugger;
     const { account, product, bundle, options } = params;
     let cartItem = {
       _id: (0, import_utils.getUniqueId)(),

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

@@ -1,5 +1,6 @@
 import { Module, PisellCore } from "../../types";
 import { BaseModule } from "../../modules/BaseModule";
+import { Response } from "../../plugins";
 import { BookingByStepState } from "./types";
 import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
 import { Account } from "../../modules/Account/types";
@@ -59,6 +60,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getProducts(): Promise<ProductData[]>;
     setLoginAccount(accountId: string, accountInfo: Account): Promise<void>;
     generateCartData(): Promise<void>;
+    getFreeProduct(id: string | number): Promise<Response<any>>;
     submitOrder(): Promise<void>;
     pay(): Promise<void>;
     getPayInfo(): Promise<void>;

package/lib/solution/BookingByStep/index.js

@@ -59,7 +59,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!this.request) {
       throw new Error("bookingByStep解决方案需要 request 插件支持");
     }
-    debugger;
     let targetCacheData = {};
     if ((_a = this.otherParams) == null ? void 0 : _a.cacheId) {
       const sessionData = this.window.sessionStorage.getItem(this.name);
@@ -257,10 +256,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 生成购物车的正规数据
   async generateCartData() {
   }
+  // 免费领取商品相关逻辑，上线了来不及加了，先放在这，后面要做到 payment 里面的
+  async getFreeProduct(id) {
+    const res = await this.request.post(`/pay/order/free-pay/${id}`);
+    return res;
+  }
   // 购物车提交订单
   async submitOrder() {
     const cartItems = this.store.cart.getItems();
-    cartItems.forEach((item) => {
+    const newCartItems = (0, import_lodash_es.cloneDeep)(cartItems);
+    newCartItems.forEach((item) => {
       item._origin.resources = item._origin.resources.map((n) => {
         const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
         delete newResourcesItem.id;
@@ -269,7 +274,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return { ...newResourcesItem };
       });
     });
-    return this.store.order.commitOrder({ query: { cartItems } });
+    return this.store.order.commitOrder({ query: { cartItems: newCartItems } });
   }
   // 拉起支付模块
   async pay() {

package/lib/solution/ShopDiscount/index.js

@@ -91,7 +91,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         targetCacheData = data[this.options.otherParams.cacheId];
       }
     }
-    debugger;
     const discount = new import_Discount.DiscountModule(`${this.name}_discount`);
     this.core.registerModule(discount, {
       initialState: targetCacheData == null ? void 0 : targetCacheData[discount.name],

package/package.json

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