@pisell/pisellos 0.0.340 → 0.0.342

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/modules/ProductList/index.js

@@ -141,9 +141,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
               });
+              if (sortedList.length) {
+                sortedList.forEach(function (n) {
+                  if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
+                    n.is_eject = 1;
+                  }
+                });
+              }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 10:
+            case 11:
             case "end":
               return _context3.stop();
           }

package/dist/solution/BookingByStep/index.js

@@ -1197,7 +1197,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         date: date
       });
       // 如果 quantity 大于 1，且是预约商品，则进入购物车拆散成多条数据
-      if (addItemParams.quantity > 1 && !isNormalProduct(productData.origin)) {
+      if (addItemParams.quantity > 1 && !isNormalProduct(productData)) {
         for (var i = 0; i < addItemParams.quantity; i++) {
           var newAddItemParams = cloneDeep(addItemParams);
           newAddItemParams.quantity = 1;

package/dist/solution/RegisterAndLogin/config.js

@@ -154,10 +154,8 @@ var onlineStoreConfig = {
   guestLogin: {
     url: '/auth/guest/login',
     method: 'POST',
-    transformParams: function transformParams(channel) {
-      return {
-        login_channel: channel
-      };
+    transformParams: function transformParams(params) {
+      return params;
     }
   },
   checkEmailExists: {

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

@@ -106,6 +106,7 @@ export declare class RegisterAndLoginImpl extends BaseModule implements Module {
     sendSmsLoginCode(params: SendSmsLoginCodeParams): Promise<ApiResponse>;
     /** 手机号+短信验证码登录 */
     phoneCodeLogin(params: PhoneCodeLoginParams): Promise<ApiResponse<LoginResponse>>;
+    private formatLoginParams;
     /** Guest 登录 */
     guestLogin(): Promise<ApiResponse<GuestLoginResponse>>;
     /** 检查邮箱是否已注册 */

package/dist/solution/RegisterAndLogin/index.js

@@ -1671,12 +1671,28 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
         return _phoneCodeLogin.apply(this, arguments);
       }
       return phoneCodeLogin;
-    }() /** Guest 登录 */)
+    }())
+  }, {
+    key: "formatLoginParams",
+    value: function formatLoginParams(params) {
+      // 获取当前浏览器窗口的 URL
+      var currentUrl = this.window.location.href;
+      // 使用 URL 对象解析 URL
+      var urlObj = new URL(currentUrl || '');
+      // 获取 customer 参数的值
+      var source_customer_id = urlObj.searchParams.get('customer');
+      if (source_customer_id) {
+        params.source_customer_id = parseInt(source_customer_id);
+      }
+      return params;
+    }
+
+    /** Guest 登录 */
   }, {
     key: "guestLogin",
     value: (function () {
       var _guestLogin = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
-        var response;
+        var guestCode, param, response;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -1686,9 +1702,20 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
               this.core.effects.emit(RegisterAndLoginHooks.onLoginStarted, {
                 type: 'guest'
               });
-              _context25.next = 6;
-              return this.apiCaller.call('guestLogin', this.channel);
-            case 6:
+              // 匿名登录 code
+              guestCode = this.window.localStorage.getItem('guest_code') || '';
+              param = {
+                login_channel: this.channel
+              };
+              if (guestCode) {
+                param.guest_code = guestCode;
+              }
+
+              // 获取邀请id
+              param = this.formatLoginParams(param);
+              _context25.next = 10;
+              return this.apiCaller.call('guestLogin', param);
+            case 10:
               response = _context25.sent;
               if (response.status && response.data) {
                 // 保存用户信息和 token
@@ -1713,8 +1740,8 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               }
               return _context25.abrupt("return", response);
-            case 11:
-              _context25.prev = 11;
+            case 15:
+              _context25.prev = 15;
               _context25.t0 = _context25["catch"](0);
               this.store.error = 'Guest 登录失败';
               this.core.effects.emit(RegisterAndLoginHooks.onLoginFailed, {
@@ -1722,15 +1749,15 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                 loginType: 'guest'
               });
               return _context25.abrupt("return", _context25.t0);
-            case 16:
-              _context25.prev = 16;
+            case 20:
+              _context25.prev = 20;
               this.store.isLoading = false;
-              return _context25.finish(16);
-            case 19:
+              return _context25.finish(20);
+            case 23:
             case "end":
               return _context25.stop();
           }
-        }, _callee25, this, [[0, 11, 16, 19]]);
+        }, _callee25, this, [[0, 15, 20, 23]]);
       }));
       function guestLogin() {
         return _guestLogin.apply(this, arguments);

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/modules/ProductList/index.js

@@ -103,6 +103,13 @@ var ProductList = class extends import_BaseModule.BaseModule {
       { useCache: true }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    if (sortedList.length) {
+      sortedList.forEach((n) => {
+        if (n.is_eject !== 1 && n["schedule.ids"] && n["schedule.ids"].length) {
+          n.is_eject = 1;
+        }
+      });
+    }
     this.addProduct(sortedList);
     return sortedList;
   }

package/lib/solution/BookingByStep/index.js

@@ -637,7 +637,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       addItemParams.account = account;
     }
     this.addProductCheck({ date });
-    if (addItemParams.quantity > 1 && !(0, import_utils5.isNormalProduct)(productData.origin)) {
+    if (addItemParams.quantity > 1 && !(0, import_utils5.isNormalProduct)(productData)) {
       for (let i = 0; i < addItemParams.quantity; i++) {
         const newAddItemParams = (0, import_lodash_es.cloneDeep)(addItemParams);
         newAddItemParams.quantity = 1;

package/lib/solution/BookingTicket/index.js

@@ -122,6 +122,12 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  /**
+   * 初始化外设扫码结果监听
+   */
+  initPeripheralsListener() {
+    this.scan.initPeripheralsListener();
+  }
   /**
    * 获取商品列表（不加载到模块中）
    * @returns 商品列表

package/lib/solution/RegisterAndLogin/config.js

@@ -129,9 +129,7 @@ var onlineStoreConfig = {
   guestLogin: {
     url: "/auth/guest/login",
     method: "POST",
-    transformParams: (channel) => ({
-      login_channel: channel
-    })
+    transformParams: (params) => params
   },
   checkEmailExists: {
     url: "/auth/email/check-email",

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

@@ -106,6 +106,7 @@ export declare class RegisterAndLoginImpl extends BaseModule implements Module {
     sendSmsLoginCode(params: SendSmsLoginCodeParams): Promise<ApiResponse>;
     /** 手机号+短信验证码登录 */
     phoneCodeLogin(params: PhoneCodeLoginParams): Promise<ApiResponse<LoginResponse>>;
+    private formatLoginParams;
     /** Guest 登录 */
     guestLogin(): Promise<ApiResponse<GuestLoginResponse>>;
     /** 检查邮箱是否已注册 */

package/lib/solution/RegisterAndLogin/index.js

@@ -1015,6 +1015,15 @@ var RegisterAndLoginImpl = class extends import_BaseModule.BaseModule {
       this.store.isLoading = false;
     }
   }
+  formatLoginParams(params) {
+    const currentUrl = this.window.location.href;
+    let urlObj = new URL(currentUrl || "");
+    let source_customer_id = urlObj.searchParams.get("customer");
+    if (source_customer_id) {
+      params.source_customer_id = parseInt(source_customer_id);
+    }
+    return params;
+  }
   /** Guest 登录 */
   async guestLogin() {
     try {
@@ -1023,7 +1032,15 @@ var RegisterAndLoginImpl = class extends import_BaseModule.BaseModule {
       this.core.effects.emit(import_types.RegisterAndLoginHooks.onLoginStarted, {
         type: "guest"
       });
-      const response = await this.apiCaller.call("guestLogin", this.channel);
+      let guestCode = this.window.localStorage.getItem("guest_code") || "";
+      let param = {
+        login_channel: this.channel
+      };
+      if (guestCode) {
+        param.guest_code = guestCode;
+      }
+      param = this.formatLoginParams(param);
+      const response = await this.apiCaller.call("guestLogin", param);
       if (response.status && response.data) {
         this.store.isLoggedIn = true;
         this.store.userInfo = response.data.user;

package/package.json

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