@pisell/pisellos 0.0.360 → 0.0.362

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

@@ -344,8 +344,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         resourcesInType.forEach(function (resource) {
           // 过滤出在时间段内的资源时间片
           var availableTimes = resource.times.filter(function (time) {
-            var _time$event_list;
-            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute') && ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.length) === 0;
+            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
           });
           if (availableTimes.length > 0) {
             availableResourceCount++;

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/BookingByStep/index.d.ts

@@ -299,6 +299,12 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         errorList: any[];
     };
     getTimeSlotByAllResources(resources_code: string): any[];
+    getTimeSlotByAllResourcesForDate(resources_code: string, start_date: string, end_date: string): Promise<{
+        date: string;
+        status: string;
+        week: string;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
+    }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;

package/lib/solution/BookingByStep/index.js

@@ -1545,6 +1545,157 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     return timeSlots;
   }
+  // 从购物车中获取已经分配好第一步资源的所有时间片，批量版本，用于给日期提供能否高亮的判断
+  async getTimeSlotByAllResourcesForDate(resources_code, start_date, end_date) {
+    var _a, _b, _c, _d;
+    if ((0, import_dayjs.default)(end_date).diff((0, import_dayjs.default)(start_date), "day") < 30) {
+      end_date = (0, import_dayjs.default)(start_date).add(30, "day").format("YYYY-MM-DD");
+    }
+    await this.getAvailableDate({
+      startDate: start_date,
+      endDate: end_date,
+      useCache: true
+    });
+    const resources = [];
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
+    const resourceIds = [];
+    let resourcesTypeId = void 0;
+    let isSingleResource = false;
+    let maxCutOffTime = void 0;
+    let maxCutOffTimeValue = (0, import_dayjs.default)();
+    cartItems.forEach((item) => {
+      var _a2, _b2, _c2, _d2, _e, _f, _g, _h, _i;
+      (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
+        if (n.code === resources_code) {
+          resources.push(...n.renderList || []);
+          isSingleResource = n.type === "single";
+        }
+      });
+      if (item.resource_id && !resourceIds.includes(item.resource_id)) {
+        resourceIds.push(item.resource_id);
+      }
+      resourcesTypeId = (_g = (_f = (_e = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e.resources) == null ? void 0 : _f.find(
+        (n) => n.code === resources_code
+      )) == null ? void 0 : _g.id;
+      if (((_h = item._productOrigin) == null ? void 0 : _h.cut_off_time) && ((_i = item._productOrigin) == null ? void 0 : _i.cut_off_time.type) === "advance") {
+        const currentCutOffTime = (0, import_dayjs.default)().add(
+          item._productOrigin.cut_off_time.unit,
+          item._productOrigin.cut_off_time.unit_type
+        );
+        if (currentCutOffTime.isAfter(maxCutOffTimeValue, "minute")) {
+          maxCutOffTimeValue = currentCutOffTime;
+          maxCutOffTime = item._productOrigin.cut_off_time;
+        }
+      }
+    });
+    const resourcesMap = (0, import_utils2.getResourcesMap)(resources);
+    let duration = 0;
+    const accountList = this.store.accountList.getAccounts();
+    const checkDuration = (cartItems2) => {
+      let accountDuration = 0;
+      cartItems2.forEach((item) => {
+        var _a2, _b2, _c2, _d2, _e, _f;
+        if (isSingleResource) {
+          accountDuration += ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10;
+        } else {
+          if (accountDuration < (((_d2 = (_c2 = item._productOrigin) == null ? void 0 : _c2.duration) == null ? void 0 : _d2.value) || 10)) {
+            accountDuration = ((_f = (_e = item._productOrigin) == null ? void 0 : _e.duration) == null ? void 0 : _f.value) || 10;
+          }
+        }
+      });
+      if (accountDuration > duration) {
+        duration = accountDuration;
+      }
+    };
+    if (cartItems == null ? void 0 : cartItems[0].holder_id) {
+      accountList.forEach((account) => {
+        const cartItems2 = this.store.cart.getCartByAccount(account.getId());
+        checkDuration(cartItems2);
+      });
+    } else {
+      checkDuration(cartItems);
+    }
+    if (!((_a = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _a.start_date) && !((_b = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _b.resource_id) || !(cartItems == null ? void 0 : cartItems[0].duration)) {
+      return [];
+    }
+    const resourcesUseableMap = {};
+    const hasFlexibleDuration = cartItems.some(
+      (item) => {
+        var _a2, _b2;
+        return ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.type) === "flexible";
+      }
+    );
+    let operating_day_boundary = (_d = (_c = this.shopStore.get("core")) == null ? void 0 : _c.core) == null ? void 0 : _d.operating_day_boundary;
+    let maxBlockThreshold = 0;
+    if (hasFlexibleDuration) {
+      maxBlockThreshold = cartItems.reduce((max, item) => {
+        var _a2, _b2, _c2, _d2, _e, _f;
+        if ((_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.flexible_config) == null ? void 0 : _c2.is_enable_minimum_duration) {
+          return Math.max(max, ((_f = (_e = (_d2 = item._productOrigin) == null ? void 0 : _d2.duration) == null ? void 0 : _e.flexible_config) == null ? void 0 : _f.block_threshold) || 0);
+        }
+        return 0;
+      }, 0);
+    }
+    const calculateCapacityFromCartItems = (items) => {
+      return items.reduce((total, item) => {
+        return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
+      }, 0);
+    };
+    let maxCapacity = 1;
+    if (cartItems == null ? void 0 : cartItems[0].holder_id) {
+      accountList.forEach((account) => {
+        const accountCartItems = this.store.cart.getCartByAccount(account.getId());
+        const currentCapacity = calculateCapacityFromCartItems(accountCartItems);
+        if (currentCapacity > maxCapacity) {
+          maxCapacity = currentCapacity;
+        }
+      });
+    } else {
+      maxCapacity = calculateCapacityFromCartItems(cartItems);
+    }
+    const arr = [];
+    const today = (0, import_dayjs.default)().startOf("day");
+    for (let i = (0, import_dayjs.default)(start_date); i.isBefore((0, import_dayjs.default)(end_date)); i = i.add(1, "day")) {
+      if (i.isBefore(today)) {
+        arr.push({
+          date: i.format("YYYY-MM-DD"),
+          status: "unavailable",
+          week: i.format("ddd"),
+          weekNum: i.day()
+        });
+        continue;
+      }
+      const timeSlots = (0, import_resources.getTimeSlicesByResources)({
+        resourceIds,
+        resourcesMap,
+        duration,
+        currentDate: i.format("YYYY-MM-DD"),
+        split: 10,
+        resourcesUseableMap,
+        capacity: maxCapacity,
+        cut_off_time: maxCutOffTime,
+        hasFlexibleDuration,
+        operating_day_boundary,
+        maxBlockThreshold
+      });
+      if (timeSlots.length > 0) {
+        arr.push({
+          date: i.format("YYYY-MM-DD"),
+          status: "available",
+          week: i.format("ddd"),
+          weekNum: i.day()
+        });
+      } else {
+        arr.push({
+          date: i.format("YYYY-MM-DD"),
+          status: "unavailable",
+          week: i.format("ddd"),
+          weekNum: i.day()
+        });
+      }
+    }
+    return arr;
+  }
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车---只有 duration 商品
   submitTimeSlot(timeSlots) {
     var _a, _b;
@@ -1783,6 +1934,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
       const cartItems2 = this.store.cart.getItems();
       productResources.forEach((n) => {
+        debugger;
         if (n.type === "single") {
           const currentResourcesSet = /* @__PURE__ */ new Set([...n.optional_resource, ...n.default_resource]);
           const sameCartItems = cartItems2.filter((m) => {
@@ -1793,13 +1945,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             bookingLeft = 0;
             count = 0;
           }
-          const otherCartItems = cartItems2.filter((m) => {
-            var _a2, _b2, _c2;
-            return ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.id) == null ? void 0 : _b2.toString()) !== ((_c2 = targetProductData == null ? void 0 : targetProductData.id) == null ? void 0 : _c2.toString()) && `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end;
-          });
+          let otherCartItems = cartItems2.filter(
+            (m) => {
+              var _a2, _b2, _c2, _d2, _e2, _f;
+              const isTimeMatch = ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.id) == null ? void 0 : _b2.toString()) !== ((_c2 = targetProductData == null ? void 0 : targetProductData.id) == null ? void 0 : _c2.toString()) && `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end;
+              const isResourceMatch = (_f = (_e2 = (_d2 = m._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f.find((m2) => m2.type === n.type && m2.status === 1);
+              return isTimeMatch && isResourceMatch;
+            }
+          );
           otherCartItems.forEach((m) => {
             var _a2, _b2, _c2;
-            const sameTypeResources = (_c2 = (_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.find((m2) => m2.type === n.type);
+            const sameTypeResources = (_c2 = (_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.find((m2) => m2.type === n.type && m2.status === 1);
             const sameTypeResourcesSet = /* @__PURE__ */ new Set([...(sameTypeResources == null ? void 0 : sameTypeResources.optional_resource) || [], ...(sameTypeResources == null ? void 0 : sameTypeResources.default_resource) || []]);
             sameTypeResourcesSet.forEach((resource) => currentResourcesSet.add(resource));
           });

package/lib/solution/BookingByStep/utils/capacity.js

@@ -249,8 +249,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       let availableResourceCount = 0;
       resourcesInType.forEach((resource) => {
         const availableTimes = resource.times.filter((time) => {
-          var _a2;
-          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && ((_a2 = time.event_list) == null ? void 0 : _a2.length) === 0;
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
         });
         if (availableTimes.length > 0) {
           availableResourceCount++;

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
     })
   }
 };