@pisell/pisellos 2.1.38 → 2.1.40

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

@@ -166,7 +166,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @returns boolean
      */
     checkBeforeSubmitOrder(type: 'holder' | 'account'): boolean;
-    submitOrder(): Promise<void>;
+    submitOrder(extraData?: Record<string, any>): Promise<void>;
     pay(): Promise<void>;
     getPayInfo(): Promise<void>;
     setOtherParams(params: Record<string, any>, { cover }?: {
@@ -342,7 +342,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *
@@ -374,4 +374,8 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     isCartHasDurationProduct(): boolean;
     isTargetNormalProduct(product: ProductData): boolean;
     isTargetCartIdNormalProduct(id: string): boolean | undefined;
+    /**
+     * 获取联系信息
+    */
+    getContactInfo(params: any): Promise<any>;
 }

package/dist/solution/BookingByStep/index.js

@@ -29,7 +29,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../../modules/BaseModule";
-import { BookingByStepHooks, createModule } from "./types";
+import { createModule } from "./types";
 import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct, formatDateToCartItem, formatAccountToCartItem } from "../../modules/Cart/utils";
 import { getAvailableProductResources } from "./utils/products";
 import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
@@ -137,7 +137,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.store.schedule.loadAllSchedule();
-              this.core.effects.emit(BookingByStepHooks.onInited, {});
+              this.core.effects.emit("".concat(this.name, ":onInited"), {});
             case 19:
             case "end":
               return _context.stop();
@@ -966,7 +966,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(extraData) {
         var cartItems, newCartItems, type;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
@@ -1003,7 +1003,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 query: {
                   cartItems: newCartItems,
                   type: type,
-                  platform: this.platform
+                  platform: this.platform,
+                  extraData: extraData
                 }
               }));
             case 6:
@@ -1012,7 +1013,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee19, this);
       }));
-      function submitOrder() {
+      function submitOrder(_x17) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -1074,7 +1075,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee22, this);
       }));
-      function setOtherParams(_x17) {
+      function setOtherParams(_x18) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -2377,7 +2378,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee24, this);
       }));
-      function openProductDetail(_x18) {
+      function openProductDetail(_x19) {
         return _openProductDetail.apply(this, arguments);
       }
       return openProductDetail;
@@ -3563,7 +3564,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee25, this);
       }));
-      function getProductTypeById(_x19) {
+      function getProductTypeById(_x20) {
         return _getProductTypeById.apply(this, arguments);
       }
       return getProductTypeById;
@@ -3720,7 +3721,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee26, this);
       }));
-      function getTimeslotsScheduleByDateRange(_x20) {
+      function getTimeslotsScheduleByDateRange(_x21) {
         return _getTimeslotsScheduleByDateRange.apply(this, arguments);
       }
       return getTimeslotsScheduleByDateRange;
@@ -4007,6 +4008,29 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       });
       return cartItem && isNormalProduct(cartItem._productOrigin);
     }
+
+    /**
+     * 获取联系信息
+    */
+  }, {
+    key: "getContactInfo",
+    value: (function () {
+      var _getContactInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
+            case 0:
+              return _context29.abrupt("return", this.request.get('/customer/metadata', params));
+            case 1:
+            case "end":
+              return _context29.stop();
+          }
+        }, _callee28, this);
+      }));
+      function getContactInfo(_x22) {
+        return _getContactInfo.apply(this, arguments);
+      }
+      return getContactInfo;
+    }())
   }]);
   return BookingByStepImpl;
 }(BaseModule);

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

@@ -22,6 +22,10 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * @returns 商品列表
      */
     loadProducts(params?: ILoadProductsParams): Promise<any>;
+    /**
+     * 初始化外设扫码结果监听
+     */
+    initPeripheralsListener(): void;
     /**
      * 获取商品列表（不加载到模块中）
      * @returns 商品列表

package/dist/solution/BookingTicket/index.js

@@ -18,7 +18,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../../modules/BaseModule";
-import { BookingTicketHooks, createModule } from "./types";
+import { createModule } from "./types";
 import Scan from "./utils/scan";
 import { handleGlobalScan, handleCustomerScan, handleUniversalScan } from "./utils/scan/handleScan";
 import scanCache from "./utils/scan/scanCache";
@@ -109,7 +109,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
                   throw new Error("\u6A21\u5757 ".concat(step, " \u4E0D\u5B58\u5728"));
                 }
               });
-              this.core.effects.emit(BookingTicketHooks.onInited, {});
+              this.core.effects.emit("".concat(this.name, ":onInited"), {});
             case 19:
             case "end":
               return _context.stop();
@@ -152,7 +152,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
               }));
             case 5:
               result = _context2.sent;
-              this.core.effects.emit(BookingTicketHooks.onProductsLoaded, result);
+              this.core.effects.emit("".concat(this.name, ":onProductsLoaded"), result);
               return _context2.abrupt("return", result);
             case 10:
               _context2.prev = 10;
@@ -170,11 +170,20 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return loadProducts;
     }()
+    /**
+     * 初始化外设扫码结果监听
+     */
+    )
+  }, {
+    key: "initPeripheralsListener",
+    value: function initPeripheralsListener() {
+      this.scan.initPeripheralsListener();
+    }
+
     /**
      * 获取商品列表（不加载到模块中）
      * @returns 商品列表
      */
-    )
   }, {
     key: "getProducts",
     value: (function () {
@@ -242,7 +251,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setActiveCustomer",
     value: function setActiveCustomer(customer) {
       this.store.customer.setSelectedCustomer(customer);
-      this.core.effects.emit(BookingTicketHooks.onCustomerSelected, {
+      this.core.effects.emit("".concat(this.name, ":onCustomerSelected"), {
         customer: customer
       });
     }
@@ -267,7 +276,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
       var customer = this.store.customer.getCustomerById(customerId);
       if (customer) {
         this.store.customer.setSelectedCustomer(customer);
-        this.core.effects.emit(BookingTicketHooks.onCustomerSelected, {
+        this.core.effects.emit("".concat(this.name, ":onCustomerSelected"), {
           customer: customer
         });
       }
@@ -398,7 +407,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
               return this.store.customer.loadMoreCustomers();
             case 3:
               result = _context6.sent;
-              this.core.effects.emit(BookingTicketHooks.onCustomerListUpdate, result);
+              this.core.effects.emit("".concat(this.name, ":onCustomerListUpdate"), result);
               return _context6.abrupt("return", result);
             case 8:
               _context6.prev = 8;
@@ -438,7 +447,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseModule) {
               return this.store.customer.resetAndLoadCustomers(params);
             case 4:
               result = _context7.sent;
-              this.core.effects.emit(BookingTicketHooks.onCustomerListReset, result);
+              this.core.effects.emit("".concat(this.name, ":onCustomerListReset"), result);
               return _context7.abrupt("return", result);
             case 9:
               _context7.prev = 9;

package/dist/solution/BookingTicket/utils/scan/index.d.ts

@@ -18,6 +18,10 @@ export default class Scan {
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
+    /**
+     * 初始化外设扫码结果监听
+     */
+    initPeripheralsListener(): void;
     /**
      * 处理扫码事件
      * @param eventKey 事件key

package/dist/solution/BookingTicket/utils/scan/index.js

@@ -18,9 +18,6 @@ var ScanResultType = /*#__PURE__*/function (ScanResultType) {
 }(ScanResultType || {});
 var Scan = /*#__PURE__*/function () {
   function Scan(solution, watchKey) {
-    var _this$solution,
-      _this$solution$mountF,
-      _this = this;
     _classCallCheck(this, Scan);
     _defineProperty(this, "solution", void 0);
     _defineProperty(this, "watchKey", void 0);
@@ -28,24 +25,36 @@ var Scan = /*#__PURE__*/function () {
     this.solution = solution;
     this.watchKey = watchKey;
 
-    // 监听扫码结果
-    (_this$solution = this.solution) === null || _this$solution === void 0 || (_this$solution = _this$solution.window) === null || _this$solution === void 0 || (_this$solution = _this$solution.interaction) === null || _this$solution === void 0 || (_this$solution = _this$solution.utils) === null || _this$solution === void 0 || (_this$solution$mountF = _this$solution.mountFunction) === null || _this$solution$mountF === void 0 || _this$solution$mountF.call(_this$solution, 'global', 'peripheralsResult', function (strVal) {
-      try {
-        var _result = JSON.parse(strVal);
-        console.log('nativeScannerResult>>>>>>>', _result);
-        _this.handleScan(_result);
-      } catch (err) {
-        console.error(err);
-      }
-    });
+    // 初始化扫码监听
+    this.initPeripheralsListener();
   }
 
   /**
-   * 处理扫码事件
-   * @param eventKey 事件key
-   * @param value 扫码结果
+   * 初始化外设扫码结果监听
    */
   _createClass(Scan, [{
+    key: "initPeripheralsListener",
+    value: function initPeripheralsListener() {
+      var _this$solution,
+        _this$solution$mountF,
+        _this = this;
+      (_this$solution = this.solution) === null || _this$solution === void 0 || (_this$solution = _this$solution.window) === null || _this$solution === void 0 || (_this$solution = _this$solution.interaction) === null || _this$solution === void 0 || (_this$solution = _this$solution.utils) === null || _this$solution === void 0 || (_this$solution$mountF = _this$solution.mountFunction) === null || _this$solution$mountF === void 0 || _this$solution$mountF.call(_this$solution, 'global', 'peripheralsResult', function (strVal) {
+        try {
+          var _result = JSON.parse(strVal);
+          console.log('nativeScannerResult>>>>>>>', _result);
+          _this.handleScan(_result);
+        } catch (err) {
+          console.error(err);
+        }
+      });
+    }
+
+    /**
+     * 处理扫码事件
+     * @param eventKey 事件key
+     * @param value 扫码结果
+     */
+  }, {
     key: "handleScan",
     value: function handleScan(result) {
       var lastEnableEventKey = watch.getLastEnableEventKey(this.watchKey);

package/dist/solution/BuyTickets/index.js

@@ -24,7 +24,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { ProductList } from "../../modules/";
-import { BuyTicketsHooks } from "./types";
 import { BaseModule } from "../../modules/BaseModule";
 export * from "./types";
 export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
@@ -72,7 +71,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               return this.loadProductsByIds(this.otherParams.prodctIds);
             case 11:
               _context.next = 13;
-              return this.core.effects.emit(BuyTicketsHooks.onInited, {});
+              return this.core.effects.emit("".concat(this.name, ":onInited"), {});
             case 13:
             case "end":
               return _context.stop();
@@ -112,7 +111,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.mainProducts = mainProducts;
               _context2.next = 8;
-              return this.core.effects.emit(BuyTicketsHooks.onMainProductsLoaded, {});
+              return this.core.effects.emit("".concat(this.name, ":onMainProductsLoaded"), {});
             case 8:
             case "end":
               return _context2.stop();
@@ -149,7 +148,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _context4.next = 2;
-              return this.core.effects.emit(BuyTicketsHooks.onDestroy, {});
+              return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 2:
               console.log('[BuyTickets] 已销毁');
             case 3:
@@ -195,7 +194,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
             case 11:
               otherData = _context5.t1;
               _context5.next = 14;
-              return this.core.effects.emit(BuyTicketsHooks.OnGetProducts, [].concat(_toConsumableArray(mainData), _toConsumableArray(otherData)));
+              return this.core.effects.emit("".concat(this.name, ":onGetProducts"), [].concat(_toConsumableArray(mainData), _toConsumableArray(otherData)));
             case 14:
               return _context5.abrupt("return", [].concat(_toConsumableArray(mainData), _toConsumableArray(otherData)));
             case 15:
@@ -259,7 +258,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.next = 2;
-              return this.core.effects.emit(BuyTicketsHooks.onListSubmit, _objectSpread(_objectSpread({}, data), {}, {
+              return this.core.effects.emit("".concat(this.name, ":onListSubmit"), _objectSpread(_objectSpread({}, data), {}, {
                 products: this.getProducts()
               }));
             case 2:
@@ -298,7 +297,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _context8.next = 2;
-              return this.core.effects.emit(BuyTicketsHooks.onCartSubmit, _objectSpread(_objectSpread({}, data), {}, {
+              return this.core.effects.emit("".concat(this.name, ":onCartSubmit"), _objectSpread(_objectSpread({}, data), {}, {
                 products: this.getProducts()
               }));
             case 2:
@@ -320,7 +319,7 @@ export var BuyTicketsImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.next = 2;
-              return this.core.effects.emit(BuyTicketsHooks.onCheckoutSubmit, _objectSpread(_objectSpread({}, data), {}, {
+              return this.core.effects.emit("".concat(this.name, ":onCheckoutSubmit"), _objectSpread(_objectSpread({}, data), {}, {
                 products: this.getProducts()
               }));
             case 2: