@pisell/private-materials 3.0.173 → 3.0.175

package/es/components/booking/info/utils.js

@@ -88,6 +88,6 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320];
+  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087];
   return booking4Shops.includes(shopId);
 };

package/es/components/booking/info2/service/addService/utils.js

@@ -32,8 +32,9 @@ export var getUsableTime = function getUsableTime(cacheItem) {
 
     // 取最小的时间
     var minEndAt = items.reduce(function (pre, event) {
-      var endAt = dayjs(event.end_at);
-      return endAt.isBefore(pre.end_at) ? event : pre;
+      var _event$_extend, _event$_extend$usable, _pre$_extend, _pre$_extend$usableTi;
+      var endAt = dayjs((_event$_extend = event._extend) === null || _event$_extend === void 0 ? void 0 : (_event$_extend$usable = _event$_extend.usableTime) === null || _event$_extend$usable === void 0 ? void 0 : _event$_extend$usable.end_at);
+      return endAt.isBefore((_pre$_extend = pre._extend) === null || _pre$_extend === void 0 ? void 0 : (_pre$_extend$usableTi = _pre$_extend.usableTime) === null || _pre$_extend$usableTi === void 0 ? void 0 : _pre$_extend$usableTi.end_at) ? event : pre;
     }, items[0]);
     return minEndAt;
   } catch (err) {

package/es/components/booking/info2/service/addTimeModal/utils.js

@@ -51,11 +51,11 @@ export var getAddTimeSplits = function getAddTimeSplits(product, cacheItem) {
 
   // 灵活时长
   if (add_time.additional_time_options === 'unlimited') {
-    var _getUsableTime;
+    var _getUsableTime, _getUsableTime$_exten, _getUsableTime$_exten2;
     // 1. 当前服务的时长和结束时间
     // 2. 当前资源的结束时间
     // 3. 当前店铺的结束时间
-    var maxEndDate = getEndDate(cacheItem._extend.startDate, 'flexible', (_getUsableTime = getUsableTime(cacheItem)) === null || _getUsableTime === void 0 ? void 0 : _getUsableTime.end_at);
+    var maxEndDate = getEndDate(cacheItem._extend.startDate, 'flexible', (_getUsableTime = getUsableTime(cacheItem)) === null || _getUsableTime === void 0 ? void 0 : (_getUsableTime$_exten = _getUsableTime._extend) === null || _getUsableTime$_exten === void 0 ? void 0 : (_getUsableTime$_exten2 = _getUsableTime$_exten.usableTime) === null || _getUsableTime$_exten2 === void 0 ? void 0 : _getUsableTime$_exten2.end_at);
     var _value = maxEndDate.diff(cacheItem._extend.endDate, 'minute');
     // 店铺营业时间大于当前服务的结束时间, 则取店铺营业时间, 否则就不可选
     if (_value > 0) {

package/es/components/booking/utils.js

@@ -414,6 +414,7 @@ export var getEndDate = function getEndDate(startDate, duration, endDate) {
     if (!endDate) {
       return openingDate;
     }
+    endDate = dayjs(endDate);
 
     // 如果最佳time时间 大于 店铺营业结束时间,  则 取店铺营业时间, 否则为time的结束时间
     if (endDate.isAfter(openingDate)) {

package/lib/components/booking/info/utils.js

@@ -83,7 +83,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320];
+  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087];
   return booking4Shops.includes(shopId);
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/booking/info2/service/addService/utils.js

@@ -57,8 +57,9 @@ var getUsableTime = (cacheItem) => {
       );
     }
     const minEndAt = items.reduce((pre, event) => {
-      const endAt = (0, import_dayjs.default)(event.end_at);
-      return endAt.isBefore(pre.end_at) ? event : pre;
+      var _a, _b, _c, _d;
+      const endAt = (0, import_dayjs.default)((_b = (_a = event._extend) == null ? void 0 : _a.usableTime) == null ? void 0 : _b.end_at);
+      return endAt.isBefore((_d = (_c = pre._extend) == null ? void 0 : _c.usableTime) == null ? void 0 : _d.end_at) ? event : pre;
     }, items[0]);
     return minEndAt;
   } catch (err) {

package/lib/components/booking/info2/service/addTimeModal/utils.js

@@ -40,7 +40,7 @@ var import_utils2 = require("@pisell/utils");
 var import_lodash = require("lodash");
 var import_utils3 = require("../addService/utils");
 var getAddTimeSplits = (product, cacheItem) => {
-  var _a;
+  var _a, _b, _c;
   const { add_time = {
     calculate_type: "select_quantity",
     // 最大时长
@@ -53,7 +53,7 @@ var getAddTimeSplits = (product, cacheItem) => {
     unit_duration: 30
   }, price = 0 } = product;
   if (add_time.additional_time_options === "unlimited") {
-    let maxEndDate = (0, import_utils.getEndDate)(cacheItem._extend.startDate, "flexible", (_a = (0, import_utils3.getUsableTime)(cacheItem)) == null ? void 0 : _a.end_at);
+    let maxEndDate = (0, import_utils.getEndDate)(cacheItem._extend.startDate, "flexible", (_c = (_b = (_a = (0, import_utils3.getUsableTime)(cacheItem)) == null ? void 0 : _a._extend) == null ? void 0 : _b.usableTime) == null ? void 0 : _c.end_at);
     let _value = maxEndDate.diff(cacheItem._extend.endDate, "minute");
     if (_value > 0) {
       return [

package/lib/components/booking/utils.js

@@ -350,6 +350,7 @@ var getEndDate = (startDate, duration, endDate) => {
     if (!endDate) {
       return openingDate;
     }
+    endDate = (0, import_dayjs.default)(endDate);
     if (endDate.isAfter(openingDate)) {
       return openingDate;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.173",
+  "version": "3.0.175",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",