@pisell/pisellos 0.0.360 → 0.0.361

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/solution/RegisterAndLogin/config.js

@@ -189,7 +189,8 @@ var onlineStoreConfig = {
       return {
         phone: String(params.phone),
         code: params.code,
-        country_calling_code: String(params.country_calling_code)
+        country_calling_code: String(params.country_calling_code),
+        action: params.action
       };
     }
   },
@@ -344,7 +345,7 @@ var onlineStoreConfig = {
     method: 'POST',
     transformParams: function transformParams(params) {
       return {
-        token: params.token
+        code: params.code
       };
     }
   }
@@ -511,7 +512,8 @@ var defaultConfig = {
       return {
         phone: String(params.phone),
         code: params.code,
-        country_calling_code: String(params.country_calling_code)
+        country_calling_code: String(params.country_calling_code),
+        action: params.action
       };
     }
   },
@@ -666,7 +668,7 @@ var defaultConfig = {
     method: 'POST',
     transformParams: function transformParams(params) {
       return {
-        token: params.token
+        code: params.code
       };
     }
   }

package/dist/solution/RegisterAndLogin/index.js

@@ -2250,44 +2250,63 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee35$(_context35) {
           while (1) switch (_context35.prev = _context35.next) {
             case 0:
-              _context35.next = 2;
+              console.log('[RegisterAndLogin] Facebook 登录开始', {
+                tokenLength: (token === null || token === void 0 ? void 0 : token.length) || 0,
+                timestamp: Date.now()
+              });
+              _context35.next = 3;
               return this.initFacebookSDK(token);
-            case 2:
+            case 3:
+              console.log('[RegisterAndLogin] Facebook SDK 初始化完成，准备调用 FB.login');
               return _context35.abrupt("return", new Promise(function (resolve, reject) {
+                console.log('[RegisterAndLogin] 调用 FB.login', {
+                  scope: 'email,public_profile'
+                });
                 window.FB.login( /*#__PURE__*/function () {
                   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(response) {
                     var result;
                     return _regeneratorRuntime().wrap(function _callee34$(_context34) {
                       while (1) switch (_context34.prev = _context34.next) {
                         case 0:
+                          console.log('[RegisterAndLogin] FB.login 回调触发', {
+                            hasAuthResponse: Boolean(response === null || response === void 0 ? void 0 : response.authResponse),
+                            status: response === null || response === void 0 ? void 0 : response.status
+                          });
                           if (!response.authResponse) {
-                            _context34.next = 13;
+                            _context34.next = 17;
                             break;
                           }
-                          _context34.prev = 1;
-                          _context34.next = 4;
+                          _context34.prev = 2;
+                          // 直接调用 /auth/facebook/login 接口
+                          console.log('[RegisterAndLogin] 调用后端 facebookLogin 接口');
+                          _context34.next = 6;
                           return _this2.apiCaller.call('facebookLogin', {
                             token: response.authResponse.accessToken
                           });
-                        case 4:
+                        case 6:
                           result = _context34.sent;
+                          console.log('[RegisterAndLogin] facebookLogin 接口返回成功', {
+                            hasResult: Boolean(result)
+                          });
                           resolve(result);
-                          _context34.next = 11;
+                          _context34.next = 15;
                           break;
-                        case 8:
-                          _context34.prev = 8;
-                          _context34.t0 = _context34["catch"](1);
-                          reject(_context34.t0);
                         case 11:
-                          _context34.next = 14;
+                          _context34.prev = 11;
+                          _context34.t0 = _context34["catch"](2);
+                          console.error('[RegisterAndLogin] facebookLogin 接口调用失败', _context34.t0);
+                          reject(_context34.t0);
+                        case 15:
+                          _context34.next = 19;
                           break;
-                        case 13:
+                        case 17:
+                          console.warn('[RegisterAndLogin] FB.login 用户取消授权或无 authResponse', response);
                           reject(new Error('facebook_login_cancel'));
-                        case 14:
+                        case 19:
                         case "end":
                           return _context34.stop();
                       }
-                    }, _callee34, null, [[1, 8]]);
+                    }, _callee34, null, [[2, 11]]);
                   }));
                   return function (_x31) {
                     return _ref.apply(this, arguments);
@@ -2296,7 +2315,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                   scope: 'email,public_profile'
                 });
               }));
-            case 3:
+            case 5:
             case "end":
               return _context35.stop();
           }
@@ -2319,13 +2338,20 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee37$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
             case 0:
-              _context37.next = 2;
+              // 先加载 Apple SDK
+              console.log('[RegisterAndLogin] Apple 登录开始', {
+                tokenLength: (token === null || token === void 0 ? void 0 : token.length) || 0,
+                timestamp: Date.now()
+              });
+              _context37.next = 3;
               return this.initAppleSDK();
-            case 2:
+            case 3:
+              console.log('[RegisterAndLogin] Apple SDK 初始化完成');
               return _context37.abrupt("return", new Promise(function (resolve, reject) {
                 try {
                   var _AppleID, _AppleID2;
                   // 动态创建 Apple 登录按钮元素
+                  console.log('[RegisterAndLogin] 创建临时 Apple SignIn 按钮节点');
                   var appleSignInDiv = document.createElement('div');
                   appleSignInDiv.id = 'appleid-signin-temp';
                   appleSignInDiv.setAttribute('data-color', 'black');
@@ -2342,9 +2368,11 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
 
                   // 将元素添加到 body 中
                   document.body.appendChild(appleSignInDiv);
+                  console.log('[RegisterAndLogin] Apple SignIn 按钮已添加到文档');
 
                   // 初始化 Apple ID 按钮
                   if ((_AppleID = window.AppleID) !== null && _AppleID !== void 0 && (_AppleID = _AppleID.auth) !== null && _AppleID !== void 0 && _AppleID.init) {
+                    console.log('[RegisterAndLogin] 调用 AppleID.auth.init');
                     window.AppleID.auth.init({
                       clientId: token,
                       // 使用传入的 token 作为 clientId
@@ -2353,10 +2381,13 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                       state: 'signin',
                       usePopup: true
                     });
+                  } else {
+                    console.warn('[RegisterAndLogin] AppleID.auth.init 方法不可用');
                   }
 
                   // 直接调用 Apple ID 登录，并处理 Promise
                   if ((_AppleID2 = window.AppleID) !== null && _AppleID2 !== void 0 && (_AppleID2 = _AppleID2.auth) !== null && _AppleID2 !== void 0 && _AppleID2.signIn) {
+                    console.log('[RegisterAndLogin] 调用 AppleID.auth.signIn');
                     window.AppleID.auth.signIn().then( /*#__PURE__*/function () {
                       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(authResult) {
                         var _authResult$authoriza, _authResult$authoriza2, authorizationCode, identityToken, result;
@@ -2368,28 +2399,44 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                               if (document.body.contains(appleSignInDiv)) {
                                 document.body.removeChild(appleSignInDiv);
                               }
+                              console.log('[RegisterAndLogin] Apple SignIn 成功，临时节点已移除', {
+                                hasAuthorization: Boolean(authResult === null || authResult === void 0 ? void 0 : authResult.authorization),
+                                hasUser: Boolean(authResult === null || authResult === void 0 ? void 0 : authResult.user)
+                              });
 
                               // 获取授权码或令牌
                               authorizationCode = (_authResult$authoriza = authResult.authorization) === null || _authResult$authoriza === void 0 ? void 0 : _authResult$authoriza.code;
-                              identityToken = (_authResult$authoriza2 = authResult.authorization) === null || _authResult$authoriza2 === void 0 ? void 0 : _authResult$authoriza2.id_token; // 使用授权码或身份令牌调用后端接口
-                              _context36.next = 6;
+                              identityToken = (_authResult$authoriza2 = authResult.authorization) === null || _authResult$authoriza2 === void 0 ? void 0 : _authResult$authoriza2.id_token;
+                              console.log('[RegisterAndLogin] Apple 授权结果解析', {
+                                hasAuthorizationCode: Boolean(authorizationCode),
+                                hasIdentityToken: Boolean(identityToken)
+                              });
+
+                              // 使用授权码或身份令牌调用后端接口
+                              console.log('[RegisterAndLogin] 调用后端 appleLogin 接口');
+                              _context36.next = 9;
                               return _this3.apiCaller.call('appleLogin', {
-                                token: authorizationCode || identityToken
+                                code: identityToken || authorizationCode,
+                                login_channel: _this3.channel
                               });
-                            case 6:
+                            case 9:
                               result = _context36.sent;
+                              console.log('[RegisterAndLogin] appleLogin 接口返回成功', {
+                                hasResult: Boolean(result)
+                              });
                               resolve(result);
-                              _context36.next = 13;
+                              _context36.next = 18;
                               break;
-                            case 10:
-                              _context36.prev = 10;
+                            case 14:
+                              _context36.prev = 14;
                               _context36.t0 = _context36["catch"](0);
+                              console.error('[RegisterAndLogin] 处理 Apple 登录结果失败', _context36.t0);
                               reject(_context36.t0);
-                            case 13:
+                            case 18:
                             case "end":
                               return _context36.stop();
                           }
-                        }, _callee36, null, [[0, 10]]);
+                        }, _callee36, null, [[0, 14]]);
                       }));
                       return function (_x33) {
                         return _ref2.apply(this, arguments);
@@ -2399,16 +2446,19 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                       if (document.body.contains(appleSignInDiv)) {
                         document.body.removeChild(appleSignInDiv);
                       }
+                      console.error('[RegisterAndLogin] Apple SignIn Promise 拒绝', error);
                       reject(new Error('Apple 登录失败: ' + ((error === null || error === void 0 ? void 0 : error.error) || (error === null || error === void 0 ? void 0 : error.message) || '未知错误')));
                     });
                   } else {
+                    console.error('[RegisterAndLogin] AppleID.auth.signIn 方法不可用');
                     reject(new Error('Apple SDK 未正确加载'));
                   }
                 } catch (error) {
+                  console.error('[RegisterAndLogin] Apple 登录流程异常', error);
                   reject(error);
                 }
               }));
-            case 3:
+            case 5:
             case "end":
               return _context37.stop();
           }

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

@@ -328,6 +328,7 @@ export interface CheckMobileCodeParams {
     shop_id: number;
     code: string;
     country_calling_code: string;
+    action: string;
 }
 /**
  * 验证码有效性检查响应接口

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/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

@@ -157,7 +157,8 @@ var onlineStoreConfig = {
     transformParams: (params) => ({
       phone: String(params.phone),
       code: params.code,
-      country_calling_code: String(params.country_calling_code)
+      country_calling_code: String(params.country_calling_code),
+      action: params.action
     })
   },
   phonePasswordLogin: {
@@ -276,7 +277,7 @@ var onlineStoreConfig = {
     url: "/auth/apple/login",
     method: "POST",
     transformParams: (params) => ({
-      token: params.token
+      code: params.code
     })
   }
 };
@@ -407,7 +408,8 @@ var defaultConfig = {
     transformParams: (params) => ({
       phone: String(params.phone),
       code: params.code,
-      country_calling_code: String(params.country_calling_code)
+      country_calling_code: String(params.country_calling_code),
+      action: params.action
     })
   },
   phonePasswordLogin: {
@@ -526,7 +528,7 @@ var defaultConfig = {
     url: "/auth/apple/login",
     method: "POST",
     transformParams: (params) => ({
-      token: params.token
+      code: params.code
     })
   }
 };

package/lib/solution/RegisterAndLogin/index.js

@@ -1358,20 +1358,38 @@ var RegisterAndLoginImpl = class extends import_BaseModule.BaseModule {
    * Facebook 登录
    */
   async loginWithFacebook(token) {
+    console.log("[RegisterAndLogin] Facebook 登录开始", {
+      tokenLength: (token == null ? void 0 : token.length) || 0,
+      timestamp: Date.now()
+    });
     await this.initFacebookSDK(token);
+    console.log("[RegisterAndLogin] Facebook SDK 初始化完成，准备调用 FB.login");
     return new Promise((resolve, reject) => {
+      console.log("[RegisterAndLogin] 调用 FB.login", {
+        scope: "email,public_profile"
+      });
       window.FB.login(
         async (response) => {
+          console.log("[RegisterAndLogin] FB.login 回调触发", {
+            hasAuthResponse: Boolean(response == null ? void 0 : response.authResponse),
+            status: response == null ? void 0 : response.status
+          });
           if (response.authResponse) {
             try {
+              console.log("[RegisterAndLogin] 调用后端 facebookLogin 接口");
               const result = await this.apiCaller.call("facebookLogin", {
                 token: response.authResponse.accessToken
               });
+              console.log("[RegisterAndLogin] facebookLogin 接口返回成功", {
+                hasResult: Boolean(result)
+              });
               resolve(result);
             } catch (error) {
+              console.error("[RegisterAndLogin] facebookLogin 接口调用失败", error);
               reject(error);
             }
           } else {
+            console.warn("[RegisterAndLogin] FB.login 用户取消授权或无 authResponse", response);
             reject(new Error("facebook_login_cancel"));
           }
         },
@@ -1383,10 +1401,16 @@ var RegisterAndLoginImpl = class extends import_BaseModule.BaseModule {
    * Apple 登录（需要在支持的环境中使用）
    */
   async loginWithApple(token) {
+    console.log("[RegisterAndLogin] Apple 登录开始", {
+      tokenLength: (token == null ? void 0 : token.length) || 0,
+      timestamp: Date.now()
+    });
     await this.initAppleSDK();
+    console.log("[RegisterAndLogin] Apple SDK 初始化完成");
     return new Promise((resolve, reject) => {
       var _a, _b, _c, _d;
       try {
+        console.log("[RegisterAndLogin] 创建临时 Apple SignIn 按钮节点");
         const appleSignInDiv = document.createElement("div");
         appleSignInDiv.id = "appleid-signin-temp";
         appleSignInDiv.setAttribute("data-color", "black");
@@ -1401,7 +1425,9 @@ var RegisterAndLoginImpl = class extends import_BaseModule.BaseModule {
         appleSignInDiv.style.width = "1px";
         appleSignInDiv.style.height = "1px";
         document.body.appendChild(appleSignInDiv);
+        console.log("[RegisterAndLogin] Apple SignIn 按钮已添加到文档");
         if ((_b = (_a = window.AppleID) == null ? void 0 : _a.auth) == null ? void 0 : _b.init) {
+          console.log("[RegisterAndLogin] 调用 AppleID.auth.init");
           window.AppleID.auth.init({
             clientId: token,
             // 使用传入的 token 作为 clientId
@@ -1410,33 +1436,53 @@ var RegisterAndLoginImpl = class extends import_BaseModule.BaseModule {
             state: "signin",
             usePopup: true
           });
+        } else {
+          console.warn("[RegisterAndLogin] AppleID.auth.init 方法不可用");
         }
         if ((_d = (_c = window.AppleID) == null ? void 0 : _c.auth) == null ? void 0 : _d.signIn) {
+          console.log("[RegisterAndLogin] 调用 AppleID.auth.signIn");
           window.AppleID.auth.signIn().then(async (authResult) => {
             var _a2, _b2;
             try {
               if (document.body.contains(appleSignInDiv)) {
                 document.body.removeChild(appleSignInDiv);
               }
+              console.log("[RegisterAndLogin] Apple SignIn 成功，临时节点已移除", {
+                hasAuthorization: Boolean(authResult == null ? void 0 : authResult.authorization),
+                hasUser: Boolean(authResult == null ? void 0 : authResult.user)
+              });
               const authorizationCode = (_a2 = authResult.authorization) == null ? void 0 : _a2.code;
               const identityToken = (_b2 = authResult.authorization) == null ? void 0 : _b2.id_token;
+              console.log("[RegisterAndLogin] Apple 授权结果解析", {
+                hasAuthorizationCode: Boolean(authorizationCode),
+                hasIdentityToken: Boolean(identityToken)
+              });
+              console.log("[RegisterAndLogin] 调用后端 appleLogin 接口");
               const result = await this.apiCaller.call("appleLogin", {
-                token: authorizationCode || identityToken
+                code: identityToken || authorizationCode,
+                login_channel: this.channel
+              });
+              console.log("[RegisterAndLogin] appleLogin 接口返回成功", {
+                hasResult: Boolean(result)
               });
               resolve(result);
             } catch (error) {
+              console.error("[RegisterAndLogin] 处理 Apple 登录结果失败", error);
               reject(error);
             }
           }).catch((error) => {
             if (document.body.contains(appleSignInDiv)) {
               document.body.removeChild(appleSignInDiv);
             }
+            console.error("[RegisterAndLogin] Apple SignIn Promise 拒绝", error);
             reject(new Error("Apple 登录失败: " + ((error == null ? void 0 : error.error) || (error == null ? void 0 : error.message) || "未知错误")));
           });
         } else {
+          console.error("[RegisterAndLogin] AppleID.auth.signIn 方法不可用");
           reject(new Error("Apple SDK 未正确加载"));
         }
       } catch (error) {
+        console.error("[RegisterAndLogin] Apple 登录流程异常", error);
         reject(error);
       }
     });

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

@@ -328,6 +328,7 @@ export interface CheckMobileCodeParams {
     shop_id: number;
     code: string;
     country_calling_code: string;
+    action: string;
 }
 /**
  * 验证码有效性检查响应接口

package/package.json

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