@pisell/private-materials 3.3.62 → 3.3.64
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/build/lowcode/assets-daily.json +11 -11
- package/build/lowcode/assets-dev.json +2 -2
- package/build/lowcode/assets-prod.json +11 -11
- package/build/lowcode/meta.js +1 -1
- package/build/lowcode/render/default/view.css +1 -1
- package/build/lowcode/render/default/view.js +5 -5
- package/build/lowcode/view.css +1 -1
- package/build/lowcode/view.js +5 -5
- package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts +0 -1
- package/es/components/appointmentBooking/components/Cart/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Deposit/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Footer/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Voucher/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Voucher/index.less +0 -2
- package/es/components/appointmentBooking/deposit/index.d.ts +0 -1
- package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts +0 -1
- package/es/components/booking/components/footer/index.d.ts +0 -1
- package/es/components/booking/components/voucher/index.d.ts +0 -1
- package/es/components/booking/components/voucher/index.less +0 -1
- package/es/components/booking/forms/sendModal/useSendModal.d.ts +0 -1
- package/es/components/booking/hooks/useClearCart.d.ts +0 -1
- package/es/components/booking/info/dateRange/index.d.ts +0 -1
- package/es/components/booking/info/service/editService/BookingList/index.d.ts +0 -1
- package/es/components/booking/info/service/serviceItem/index.d.ts +0 -1
- package/es/components/booking/info2/service/serviceItem/index.d.ts +0 -1
- package/es/components/booking/info2/utilsByBooking.js +17 -10
- package/es/components/booking/utils.js +10 -4
- package/es/components/eventBooking/components/ErrorTip/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Cart/Item/Total.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Cart/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Event/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Footer/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Resource/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.less +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.less +0 -1
- package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +0 -1
- package/es/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts +0 -1
- package/es/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +0 -1
- package/es/components/eventBooking/components/timeResourceSelector/index.less +0 -1
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +0 -1
- package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +0 -1
- package/es/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +0 -1
- package/es/components/pisellSelectCustomerModal/index.d.ts +0 -1
- package/es/components/productSelect/components/TabProduct/index.d.ts +0 -1
- package/es/components/productSelect/components/productGroup/index.d.ts +0 -1
- package/es/components/schedules/calendar/index.less +158 -152
- package/es/components/shoppingCart/components/Cart/index.d.ts +0 -1
- package/es/components/shoppingCart/hooks/useAddService.d.ts +0 -1
- package/es/components/shoppingCart/hooks/useClearCart.d.ts +0 -1
- package/es/components/ticketBooking/components/ticketBooking/index.d.ts +1 -0
- package/es/components/ticketBooking/components/timeBar/index.d.ts +0 -1
- package/es/components/ticketBooking/index.d.ts +1 -0
- package/es/components/wallet/DiscountCard/index.less +0 -1
- package/es/components/wallet/PointCard/index.less +0 -1
- package/es/components/wallet/RechargeableCard/index.less +5 -9
- package/es/components/wallet/Voucher/index.less +0 -1
- package/es/components/wallet/index.less +0 -4
- package/es/components/walletList/index.js +55 -7
- package/es/components/walletList/index.less +17 -15
- package/es/components/walletList/locales.d.ts +18 -0
- package/es/components/walletList/locales.js +17 -0
- package/es/components/walletList/serve.d.ts +8 -0
- package/es/components/walletList/serve.js +38 -0
- package/es/components/walletList/status.d.ts +38 -0
- package/es/components/walletList/status.js +47 -0
- package/es/components/workSpaceList/components/Modal/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Cart/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Deposit/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Footer/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Voucher/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Voucher/index.less +0 -2
- package/lib/components/appointmentBooking/deposit/index.d.ts +0 -1
- package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts +0 -1
- package/lib/components/booking/components/footer/index.d.ts +0 -1
- package/lib/components/booking/components/voucher/index.d.ts +0 -1
- package/lib/components/booking/components/voucher/index.less +0 -1
- package/lib/components/booking/forms/sendModal/useSendModal.d.ts +0 -1
- package/lib/components/booking/hooks/useClearCart.d.ts +0 -1
- package/lib/components/booking/info/dateRange/index.d.ts +0 -1
- package/lib/components/booking/info/service/editService/BookingList/index.d.ts +0 -1
- package/lib/components/booking/info/service/serviceItem/index.d.ts +0 -1
- package/lib/components/booking/info2/service/serviceItem/index.d.ts +0 -1
- package/lib/components/booking/info2/utilsByBooking.js +7 -9
- package/lib/components/booking/utils.js +7 -3
- package/lib/components/eventBooking/components/ErrorTip/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Cart/Item/Total.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Cart/Item/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Cart/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Event/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Footer/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Resource/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.less +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.less +0 -1
- package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +0 -1
- package/lib/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts +0 -1
- package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +0 -1
- package/lib/components/eventBooking/components/timeResourceSelector/index.less +0 -1
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +0 -1
- package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +0 -1
- package/lib/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +0 -1
- package/lib/components/pisellSelectCustomerModal/index.d.ts +0 -1
- package/lib/components/productSelect/components/TabProduct/index.d.ts +0 -1
- package/lib/components/productSelect/components/productGroup/index.d.ts +0 -1
- package/lib/components/schedules/calendar/index.less +158 -152
- package/lib/components/shoppingCart/components/Cart/index.d.ts +0 -1
- package/lib/components/shoppingCart/hooks/useAddService.d.ts +0 -1
- package/lib/components/shoppingCart/hooks/useClearCart.d.ts +0 -1
- package/lib/components/ticketBooking/components/ticketBooking/index.d.ts +1 -0
- package/lib/components/ticketBooking/components/timeBar/index.d.ts +0 -1
- package/lib/components/ticketBooking/index.d.ts +1 -0
- package/lib/components/wallet/DiscountCard/index.less +0 -1
- package/lib/components/wallet/PointCard/index.less +0 -1
- package/lib/components/wallet/RechargeableCard/index.less +5 -9
- package/lib/components/wallet/Voucher/index.less +0 -1
- package/lib/components/wallet/index.less +0 -4
- package/lib/components/walletList/index.js +42 -14
- package/lib/components/walletList/index.less +17 -15
- package/lib/components/walletList/locales.d.ts +18 -0
- package/lib/components/walletList/locales.js +41 -0
- package/lib/components/walletList/serve.d.ts +8 -0
- package/lib/components/walletList/serve.js +15 -2
- package/lib/components/walletList/status.d.ts +38 -0
- package/lib/components/walletList/status.js +66 -0
- package/lib/components/workSpaceList/components/Modal/index.d.ts +0 -1
- package/package.json +3 -3
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
align-items: center;
|
|
10
10
|
gap: 10px;
|
|
11
11
|
color: var(--Gray-500, #667085);
|
|
12
|
-
font-family: Inter;
|
|
13
12
|
font-size: 14px;
|
|
14
13
|
font-style: normal;
|
|
15
14
|
font-weight: 600;
|
|
@@ -103,7 +102,6 @@
|
|
|
103
102
|
> div {
|
|
104
103
|
color: var(--Gray-500, #667085);
|
|
105
104
|
text-align: center;
|
|
106
|
-
font-family: Inter;
|
|
107
105
|
font-size: 16px;
|
|
108
106
|
font-style: normal;
|
|
109
107
|
font-weight: 600;
|
|
@@ -81,12 +81,13 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
|
|
|
81
81
|
*/
|
|
82
82
|
if (isFlexible) {
|
|
83
83
|
// 如果有event, 那么灵活时长时间只能在 最后一个event的结束时间 ~ time的结束时间内
|
|
84
|
-
if (eventList.length) {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
}
|
|
84
|
+
// if (eventList.length) {
|
|
85
|
+
// timeStartDate = (eventList).reduce((max: any, event: any) => {
|
|
86
|
+
// const endAt = dayjs(event.end_at);
|
|
87
|
+
// return endAt.isAfter(max) ? endAt : max;
|
|
88
|
+
// }, dayjs(eventList[0].end_at));
|
|
89
|
+
// }
|
|
90
|
+
|
|
90
91
|
isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
|
|
91
92
|
|
|
92
93
|
// 如果灵活时长不在范围内, 则认为是已约满
|
|
@@ -317,11 +318,17 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
|
|
|
317
318
|
if (lastServer) {
|
|
318
319
|
var lastServerStartDate = lastServer._extend.startDate;
|
|
319
320
|
var lastServerEndDate = lastServer._extend.endDate;
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
321
|
+
|
|
322
|
+
// 同时预约模式
|
|
323
|
+
if (appointmentTimingPreference === 'parallel') {
|
|
324
|
+
_extend.start_time = lastServerStartDate.format('HH:mm');
|
|
323
325
|
} else {
|
|
324
|
-
|
|
326
|
+
// 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段, 不跨天则取上一个的结束时间
|
|
327
|
+
if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
|
|
328
|
+
_extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
|
|
329
|
+
} else {
|
|
330
|
+
_extend.start_time = lastServerEndDate.format("HH:mm");
|
|
331
|
+
}
|
|
325
332
|
}
|
|
326
333
|
} else {
|
|
327
334
|
// 没有上一个商品 资源为 0
|
|
@@ -683,11 +683,17 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
|
|
|
683
683
|
_extend.resource = lastServer._extend.resource;
|
|
684
684
|
var lastServerStartDate = lastServer._extend.startDate;
|
|
685
685
|
var lastServerEndDate = lastServer._extend.endDate;
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
686
|
+
|
|
687
|
+
// 同时预约模式
|
|
688
|
+
if (appointmentTimingPreference === 'parallel') {
|
|
689
|
+
_extend.start_time = lastServerStartDate.format('HH:mm');
|
|
689
690
|
} else {
|
|
690
|
-
|
|
691
|
+
// 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段, 不跨天则取上一个的结束时间
|
|
692
|
+
if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
|
|
693
|
+
_extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
|
|
694
|
+
} else {
|
|
695
|
+
_extend.start_time = lastServerEndDate.format("HH:mm");
|
|
696
|
+
}
|
|
691
697
|
}
|
|
692
698
|
} else {
|
|
693
699
|
// 没有上一个商品 资源为 0
|