@pisell/pisellos 2.1.5 → 2.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/Schedule/index.d.ts +1 -1
- package/dist/modules/Schedule/index.js +9 -0
- package/dist/solution/BookingTicket/index.d.ts +1 -1
- package/dist/solution/Checkout/index.js +1 -1
- package/lib/modules/Schedule/index.d.ts +1 -1
- package/lib/modules/Schedule/index.js +9 -0
- package/lib/solution/BookingTicket/index.d.ts +1 -1
- package/lib/solution/Checkout/index.js +1 -1
- package/package.json +1 -1
|
@@ -254,6 +254,15 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
254
254
|
var _schedule$repeat_rule, _schedule$repeat_rule2;
|
|
255
255
|
var date = _ref2.date,
|
|
256
256
|
schedule = _ref2.schedule;
|
|
257
|
+
if (schedule.start_time && schedule.end_time) {
|
|
258
|
+
var isBeforeStartTime = dayjs(date).isBefore(dayjs(schedule.start_time));
|
|
259
|
+
var isAfterEndTime = dayjs(date).isAfter(dayjs(schedule.end_time));
|
|
260
|
+
// 如果不在 schedule 日期区间内直接返回false
|
|
261
|
+
if (isBeforeStartTime || isAfterEndTime) {
|
|
262
|
+
return false;
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
|
|
257
266
|
// 节约性能, 强制将schedule的时间范围改为前后一天,避免大量计算.
|
|
258
267
|
var _schedule = _objectSpread(_objectSpread({}, schedule), {}, {
|
|
259
268
|
// 开始时间向前推一天
|
|
@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
|
|
|
111
111
|
* 获取当前的客户搜索条件
|
|
112
112
|
* @returns 当前搜索条件
|
|
113
113
|
*/
|
|
114
|
-
getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "
|
|
114
|
+
getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
|
|
115
115
|
/**
|
|
116
116
|
* 获取客户列表状态(包含滚动加载相关状态)
|
|
117
117
|
* @returns 客户状态
|
|
@@ -1532,7 +1532,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
1532
1532
|
}
|
|
1533
1533
|
return _context22.abrupt("return");
|
|
1534
1534
|
case 8:
|
|
1535
|
-
this.
|
|
1535
|
+
this.logInfo('[Checkout] 设置自定义支付金额:', {
|
|
1536
1536
|
oldAmount: oldAmount,
|
|
1537
1537
|
newAmount: formattedAmount
|
|
1538
1538
|
});
|
|
@@ -169,6 +169,15 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
|
|
|
169
169
|
schedule
|
|
170
170
|
}) {
|
|
171
171
|
var _a, _b, _c, _d;
|
|
172
|
+
if (schedule.start_time && schedule.end_time) {
|
|
173
|
+
const isBeforeStartTime = (0, import_dayjs.default)(date).isBefore(
|
|
174
|
+
(0, import_dayjs.default)(schedule.start_time)
|
|
175
|
+
);
|
|
176
|
+
const isAfterEndTime = (0, import_dayjs.default)(date).isAfter((0, import_dayjs.default)(schedule.end_time));
|
|
177
|
+
if (isBeforeStartTime || isAfterEndTime) {
|
|
178
|
+
return false;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
172
181
|
let _schedule = {
|
|
173
182
|
...schedule,
|
|
174
183
|
// 开始时间向前推一天
|
|
@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
|
|
|
111
111
|
* 获取当前的客户搜索条件
|
|
112
112
|
* @returns 当前搜索条件
|
|
113
113
|
*/
|
|
114
|
-
getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "
|
|
114
|
+
getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
|
|
115
115
|
/**
|
|
116
116
|
* 获取客户列表状态(包含滚动加载相关状态)
|
|
117
117
|
* @returns 客户状态
|
|
@@ -890,7 +890,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
|
|
|
890
890
|
if (oldAmount === formattedAmount) {
|
|
891
891
|
return;
|
|
892
892
|
}
|
|
893
|
-
this.
|
|
893
|
+
this.logInfo("[Checkout] 设置自定义支付金额:", {
|
|
894
894
|
oldAmount,
|
|
895
895
|
newAmount: formattedAmount
|
|
896
896
|
});
|