@pisell/private-materials 6.5.22 → 6.5.23

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.
@@ -400,11 +400,14 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
400
400
  _extend.endDate = endDate;
401
401
  var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.session;
402
402
  if (isSessionProduct(cacheItem) && session) {
403
- _extend.start_date = session.start_at;
404
- _extend.startDate = session.start_at;
403
+ var startAt = dayjs("".concat(state.date.value.format('YYYY-MM-DD'), " ").concat(session.start_at.format('HH:mm:ss')));
404
+ var endAt = dayjs("".concat(state.date.value.format('YYYY-MM-DD'), " ").concat(session.end_at.format('HH:mm:ss')));
405
+ _extend.start_date = startAt;
406
+ _extend.startDate = startAt;
405
407
  _extend.start_time = session.start_time;
406
- _extend.end_date = session.end_at;
407
- _extend.endDate = session.end_at;
408
+ _extend.end_date = endAt;
409
+ _extend.endDate = endAt;
410
+ _extend.end_time = session.end_time;
408
411
  _extend.duration = getDays({
409
412
  _extend: _extend
410
413
  }, 'minutes');
@@ -737,7 +737,7 @@ var AddSerivce = function AddSerivce(props) {
737
737
  console.timeEnd("checkResourceAvailability");
738
738
  // 0ms
739
739
  // 如果不需要打开详情弹窗,直接添加服务
740
- if (item.isOpenDetailModal) {
740
+ if (!(!item.isOpenDetailModal && item.cartDetailValue)) {
741
741
  _context4.next = 11;
742
742
  break;
743
743
  }
@@ -131,10 +131,13 @@ export var useProducts = function useProducts(notAvailableRef) {
131
131
  _timePoint$split2 = _slicedToArray(_timePoint$split, 2),
132
132
  hours = _timePoint$split2[0],
133
133
  minutes = _timePoint$split2[1];
134
- var executeAt = dayjs().hour(parseInt(hours, 10)).minute(parseInt(minutes, 10)).second(4).format('YYYY-MM-DD HH:mm:ss');
134
+ var executeDayjs = dayjs().hour(parseInt(hours, 10)).minute(parseInt(minutes, 10)).second(4);
135
+ var executeAt = executeDayjs.format('YYYY-MM-DD HH:mm:ss');
136
+ var schedule_date = executeDayjs.format('YYYY-MM-DD');
135
137
  return {
136
138
  action: 'getProducts',
137
139
  payload: _objectSpread(_objectSpread({}, paramsRef.current), {}, {
140
+ schedule_date: schedule_date,
138
141
  schedule_datetime: executeAt
139
142
  }),
140
143
  scheduled: {
@@ -270,11 +270,14 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
270
270
  _extend.endDate = endDate;
271
271
  const session = (_e = (_d = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.session;
272
272
  if ((0, import_utils2.isSessionProduct)(cacheItem) && session) {
273
- _extend.start_date = session.start_at;
274
- _extend.startDate = session.start_at;
273
+ const startAt = (0, import_dayjs.default)(`${state.date.value.format("YYYY-MM-DD")} ${session.start_at.format("HH:mm:ss")}`);
274
+ const endAt = (0, import_dayjs.default)(`${state.date.value.format("YYYY-MM-DD")} ${session.end_at.format("HH:mm:ss")}`);
275
+ _extend.start_date = startAt;
276
+ _extend.startDate = startAt;
275
277
  _extend.start_time = session.start_time;
276
- _extend.end_date = session.end_at;
277
- _extend.endDate = session.end_at;
278
+ _extend.end_date = endAt;
279
+ _extend.endDate = endAt;
280
+ _extend.end_time = session.end_time;
278
281
  _extend.duration = (0, import_utils2.getDays)({ _extend }, "minutes");
279
282
  }
280
283
  return _extend;
@@ -513,7 +513,7 @@ var AddSerivce = (props) => {
513
513
  return;
514
514
  }
515
515
  console.timeEnd("checkResourceAvailability");
516
- if (!item.isOpenDetailModal) {
516
+ if (!item.isOpenDetailModal && item.cartDetailValue) {
517
517
  await handleDirectAddService(item);
518
518
  return;
519
519
  }
@@ -87,11 +87,14 @@ var useProducts = (notAvailableRef) => {
87
87
  });
88
88
  const tasks = scheduleTimePoints.map((timePoint) => {
89
89
  const [hours, minutes] = timePoint.split(":");
90
- const executeAt = (0, import_dayjs.default)().hour(parseInt(hours, 10)).minute(parseInt(minutes, 10)).second(4).format("YYYY-MM-DD HH:mm:ss");
90
+ const executeDayjs = (0, import_dayjs.default)().hour(parseInt(hours, 10)).minute(parseInt(minutes, 10)).second(4);
91
+ const executeAt = executeDayjs.format("YYYY-MM-DD HH:mm:ss");
92
+ const schedule_date = executeDayjs.format("YYYY-MM-DD");
91
93
  return {
92
94
  action: "getProducts",
93
95
  payload: {
94
96
  ...paramsRef.current,
97
+ schedule_date,
95
98
  schedule_datetime: executeAt
96
99
  },
97
100
  scheduled: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pisell/private-materials",
3
- "version": "6.5.22",
3
+ "version": "6.5.23",
4
4
  "scripts": {
5
5
  "dev": "father dev",
6
6
  "build": "father build",