@pisell/private-materials 3.0.209 → 3.0.211

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.
Files changed (69) hide show
  1. package/build/lowcode/assets-daily.json +11 -11
  2. package/build/lowcode/assets-dev.json +2 -2
  3. package/build/lowcode/assets-prod.json +11 -11
  4. package/build/lowcode/index.js +1 -1
  5. package/build/lowcode/meta.js +1 -1
  6. package/build/lowcode/preview.js +6 -14
  7. package/build/lowcode/render/default/view.css +1 -1
  8. package/build/lowcode/render/default/view.js +4 -4
  9. package/build/lowcode/view.css +1 -1
  10. package/build/lowcode/view.js +7 -7
  11. package/es/components/Sales/Cart/index.d.ts +8 -5
  12. package/es/components/Sales/Cart/index.js +158 -37
  13. package/es/components/Sales/Cart/serve.d.ts +1 -0
  14. package/es/components/Sales/Cart/serve.js +5 -0
  15. package/es/components/Sales/Cart/types.d.ts +19 -0
  16. package/es/components/Sales/Cart/types.js +1 -0
  17. package/es/components/Sales/Checkout/index.js +3 -0
  18. package/es/components/booking/info/pet/index.js +3 -3
  19. package/es/components/booking/info/service2/utils.d.ts +1 -1
  20. package/es/components/eftposPay/amount.d.ts +1 -1
  21. package/es/components/eftposPay/app.d.ts +1 -1
  22. package/es/components/eftposPay/device.d.ts +1 -1
  23. package/es/components/eftposPay/store/index.d.ts +2 -2
  24. package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.js +153 -37
  25. package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +4 -0
  26. package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.js +35 -0
  27. package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.less +17 -0
  28. package/es/components/eventBooking/components/Provider/Event/index.js +8 -1
  29. package/es/components/eventBooking/components/Provider/OrderProductModal/index.js +12 -35
  30. package/es/components/eventBooking/components/Provider/Resource/index.js +22 -11
  31. package/es/components/eventBooking/components/Provider/SelectHolderModal.js +4 -1
  32. package/es/components/eventBooking/components/bookingDetailModal/index.js +55 -9
  33. package/es/components/eventBooking/components/progressBar/index.js +18 -2
  34. package/es/components/eventBooking/components/scheduleCalendar/calendarItem.js +8 -0
  35. package/es/components/eventBooking/components/scheduleCalendar/index.less +12 -0
  36. package/es/components/eventBooking/index.js +1 -15
  37. package/es/components/eventBooking/locales.d.ts +33 -3
  38. package/es/components/eventBooking/locales.js +42 -6
  39. package/es/components/shoppingCart/components/Cart/Product.js +2 -2
  40. package/lib/components/Sales/Cart/index.d.ts +8 -5
  41. package/lib/components/Sales/Cart/index.js +97 -13
  42. package/lib/components/Sales/Cart/serve.d.ts +1 -0
  43. package/lib/components/Sales/Cart/serve.js +5 -0
  44. package/lib/components/Sales/Cart/types.d.ts +19 -0
  45. package/lib/components/Sales/Cart/types.js +17 -0
  46. package/lib/components/Sales/Checkout/index.js +1 -0
  47. package/lib/components/booking/info/pet/index.js +3 -3
  48. package/lib/components/booking/info/service2/utils.d.ts +1 -1
  49. package/lib/components/eftposPay/amount.d.ts +1 -1
  50. package/lib/components/eftposPay/app.d.ts +1 -1
  51. package/lib/components/eftposPay/device.d.ts +1 -1
  52. package/lib/components/eftposPay/store/index.d.ts +2 -2
  53. package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.js +62 -14
  54. package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +4 -0
  55. package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.js +61 -0
  56. package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.less +17 -0
  57. package/lib/components/eventBooking/components/Provider/Event/index.js +20 -11
  58. package/lib/components/eventBooking/components/Provider/OrderProductModal/index.js +11 -26
  59. package/lib/components/eventBooking/components/Provider/Resource/index.js +12 -7
  60. package/lib/components/eventBooking/components/Provider/SelectHolderModal.js +2 -0
  61. package/lib/components/eventBooking/components/bookingDetailModal/index.js +21 -5
  62. package/lib/components/eventBooking/components/progressBar/index.js +8 -4
  63. package/lib/components/eventBooking/components/scheduleCalendar/calendarItem.js +8 -0
  64. package/lib/components/eventBooking/components/scheduleCalendar/index.less +12 -0
  65. package/lib/components/eventBooking/index.js +0 -8
  66. package/lib/components/eventBooking/locales.d.ts +33 -3
  67. package/lib/components/eventBooking/locales.js +36 -6
  68. package/lib/components/shoppingCart/components/Cart/Product.js +2 -2
  69. package/package.json +2 -2
@@ -11,12 +11,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
11
11
  import React, { useMemo, useState } from 'react';
12
12
  import { locales } from '@pisell/utils';
13
13
  import { Button } from '@pisell/materials';
14
- import { useCart, useHolder, useStep, useCheckout, useSales } from "../../../../../Sales";
14
+ import { useCart, useHolder, useStep, useCheckout, useSales, useCustomer } from "../../../../../Sales";
15
15
  import { formatValues } from "../../../../../Sales/Checkout/utils";
16
16
  import OrderProductModal from "../../OrderProductModal/index";
17
+ import EmptyHolderModal from "../../EmptyHolderModal";
17
18
  import "./index.less";
18
19
  var ContinueButton = function ContinueButton() {
19
- var _cartData$cartItems, _cartData$cartItems2;
20
+ var _cartData$cartItems;
20
21
  var _useSales = useSales(),
21
22
  data = _useSales.data;
22
23
  var _useHolder = useHolder(),
@@ -24,7 +25,8 @@ var ContinueButton = function ContinueButton() {
24
25
  var _useCart = useCart(),
25
26
  checkHolder = _useCart.checkHolder,
26
27
  onCloseCart = _useCart.onCloseCart,
27
- cartData = _useCart.cartData;
28
+ cartData = _useCart.cartData,
29
+ getWithoutCartItemsHolderNames = _useCart.getWithoutCartItemsHolderNames;
28
30
  var _useStep = useStep(),
29
31
  currentStepData = _useStep.currentStepData,
30
32
  nextStep = _useStep.nextStep,
@@ -34,6 +36,9 @@ var ContinueButton = function ContinueButton() {
34
36
  createBooking = _useCheckout.createBooking,
35
37
  onCheckBeforeBooking = _useCheckout.onCheckBeforeBooking,
36
38
  checkBeforeBooking = _useCheckout.checkBeforeBooking;
39
+ var _useCustomer = useCustomer(),
40
+ openLoginModal = _useCustomer.openLoginModal,
41
+ isLogin = _useCustomer.isLogin;
37
42
 
38
43
  // 下单之前是否检测失败
39
44
  var _useState = useState(false),
@@ -45,58 +50,167 @@ var ContinueButton = function ContinueButton() {
45
50
  _useState4 = _slicedToArray(_useState3, 2),
46
51
  checkedNumber = _useState4[0],
47
52
  setCheckedNumber = _useState4[1];
53
+ var _useState5 = useState(false),
54
+ _useState6 = _slicedToArray(_useState5, 2),
55
+ openEmptyHolder = _useState6[0],
56
+ setOpenEmptyHolder = _useState6[1];
57
+ var _useSales2 = useSales(),
58
+ removeSessionStorage = _useSales2.removeSessionStorage;
48
59
 
49
60
  /**
50
- * @title: 点击继续
61
+ * @title: 下单
51
62
  * @description:
52
63
  * @return {*}
53
64
  * @Author: WangHan
54
- * @Date: 2025-01-16 16:30
65
+ * @Date: 2025-02-10 17:54
55
66
  */
56
- var handleContinue = /*#__PURE__*/function () {
67
+ var handleCheckout = /*#__PURE__*/function () {
57
68
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
58
- var value, _data, isHolder;
69
+ var value, result;
59
70
  return _regeneratorRuntime().wrap(function _callee$(_context) {
60
71
  while (1) switch (_context.prev = _context.next) {
72
+ case 0:
73
+ value = formatValues(data); // 如果检测成功,则直接下单
74
+ _context.next = 3;
75
+ return onCheckout(value);
76
+ case 3:
77
+ result = _context.sent;
78
+ // 清空数据
79
+ if (result !== null && result !== void 0 && result.success) {
80
+ removeSessionStorage();
81
+ }
82
+ case 5:
83
+ case "end":
84
+ return _context.stop();
85
+ }
86
+ }, _callee);
87
+ }));
88
+ return function handleCheckout() {
89
+ return _ref.apply(this, arguments);
90
+ };
91
+ }();
92
+
93
+ /**
94
+ * @title: 下一步
95
+ * @description:
96
+ * @return {*}
97
+ * @Author: WangHan
98
+ * @Date: 2025-02-08 18:57
99
+ */
100
+ var handleNextStep = /*#__PURE__*/function () {
101
+ var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
102
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
103
+ while (1) switch (_context2.prev = _context2.next) {
61
104
  case 0:
62
105
  onCloseCart();
106
+ setOpenEmptyHolder(false);
63
107
 
64
108
  // 如果当前是确认信息页面,则到结算页面
65
109
  if (!isLastStep) {
66
- _context.next = 7;
110
+ _context2.next = 4;
67
111
  break;
68
112
  }
69
- value = formatValues(data); // const checkRes = await onCheckBeforeBooking(value);
70
- // // 如果检测失败,则打开失败弹窗
71
- // if (checkRes?.result === false) {
72
- // setCheckedNumber(checkRes?.num);
73
- // setOpenCheckout(true);
74
- // return;
75
- // }
76
- // 如果检测成功,则直接下单
77
- _context.next = 5;
78
- return onCheckout(value);
113
+ return _context2.abrupt("return", handleCheckout());
114
+ case 4:
115
+ nextStep();
79
116
  case 5:
80
- _data = _context.sent;
81
- return _context.abrupt("return");
82
- case 7:
83
- isHolder = checkHolder(); // 如果没有绑定holder,则打开绑定holder弹窗
84
- if (isHolder) {
85
- _context.next = 11;
117
+ case "end":
118
+ return _context2.stop();
119
+ }
120
+ }, _callee2);
121
+ }));
122
+ return function handleNextStep() {
123
+ return _ref2.apply(this, arguments);
124
+ };
125
+ }();
126
+
127
+ /**
128
+ * @title: 判断是打开holder弹窗还是进行下一步
129
+ * @description:
130
+ * @return {*}
131
+ * @Author: WangHan
132
+ * @Date: 2025-02-08 14:00
133
+ */
134
+ var handleHolder = function handleHolder() {
135
+ var isHolder = checkHolder();
136
+ // 如果没有绑定holder,则打开绑定holder弹窗
137
+ if (!isHolder) {
138
+ onHolderOpen();
139
+ return;
140
+ }
141
+
142
+ // 验证holder是否为空
143
+ var emptyHolders = getWithoutCartItemsHolderNames();
144
+ if ((emptyHolders === null || emptyHolders === void 0 ? void 0 : emptyHolders.length) > 0) {
145
+ return setOpenEmptyHolder(true);
146
+ }
147
+ handleNextStep();
148
+ };
149
+
150
+ /**
151
+ * @title: 点击继续
152
+ * @description:
153
+ * @return {*}
154
+ * @Author: WangHan
155
+ * @Date: 2025-01-16 16:30
156
+ */
157
+ var handleContinue = /*#__PURE__*/function () {
158
+ var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
159
+ var value, checkRes, emptyHolders;
160
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
161
+ while (1) switch (_context3.prev = _context3.next) {
162
+ case 0:
163
+ if (!isLastStep) {
164
+ _context3.next = 14;
86
165
  break;
87
166
  }
88
- onHolderOpen();
89
- return _context.abrupt("return");
90
- case 11:
91
- nextStep();
167
+ value = formatValues(data); // 检测商品是否可以下单
168
+ _context3.next = 4;
169
+ return onCheckBeforeBooking(value);
170
+ case 4:
171
+ checkRes = _context3.sent;
172
+ if (!((checkRes === null || checkRes === void 0 ? void 0 : checkRes.result) === false)) {
173
+ _context3.next = 9;
174
+ break;
175
+ }
176
+ setCheckedNumber(checkRes === null || checkRes === void 0 ? void 0 : checkRes.num);
177
+ setOpenCheckout(true);
178
+ return _context3.abrupt("return");
179
+ case 9:
180
+ // 验证holder是否为空
181
+ emptyHolders = getWithoutCartItemsHolderNames();
182
+ if (!((emptyHolders === null || emptyHolders === void 0 ? void 0 : emptyHolders.length) > 0)) {
183
+ _context3.next = 12;
184
+ break;
185
+ }
186
+ return _context3.abrupt("return", setOpenEmptyHolder(true));
92
187
  case 12:
188
+ // 关闭购物车弹窗
189
+ onCloseCart();
190
+ return _context3.abrupt("return", handleCheckout());
191
+ case 14:
192
+ if (isLogin()) {
193
+ _context3.next = 17;
194
+ break;
195
+ }
196
+ onCloseCart();
197
+ return _context3.abrupt("return", openLoginModal({
198
+ callback: function callback(status) {
199
+ if (status === 'success') {
200
+ handleHolder();
201
+ }
202
+ }
203
+ }));
204
+ case 17:
205
+ handleHolder();
206
+ case 18:
93
207
  case "end":
94
- return _context.stop();
208
+ return _context3.stop();
95
209
  }
96
- }, _callee);
210
+ }, _callee3);
97
211
  }));
98
212
  return function handleContinue() {
99
- return _ref.apply(this, arguments);
213
+ return _ref3.apply(this, arguments);
100
214
  };
101
215
  }();
102
216
 
@@ -138,16 +252,18 @@ var ContinueButton = function ContinueButton() {
138
252
  loading: confirmLoading
139
253
  }, continueText), /*#__PURE__*/React.createElement(OrderProductModal, {
140
254
  open: openCheckout,
255
+ type: "checkout",
141
256
  onCancel: function onCancel() {
142
257
  return setOpenCheckout(false);
258
+ }
259
+ }), /*#__PURE__*/React.createElement(EmptyHolderModal, {
260
+ open: openEmptyHolder,
261
+ lists: getWithoutCartItemsHolderNames(),
262
+ onCancel: function onCancel() {
263
+ return setOpenEmptyHolder(false);
143
264
  },
144
- number: checkedNumber
145
- // 全部禁用则不显示确认按钮
146
- ,
147
- okVisible: checkedNumber > 0 && checkedNumber !== (cartData === null || cartData === void 0 ? void 0 : (_cartData$cartItems2 = cartData.cartItems) === null || _cartData$cartItems2 === void 0 ? void 0 : _cartData$cartItems2.length),
148
265
  onOk: function onOk() {
149
- setOpenCheckout(false);
150
- onCheckout(formatValues(data, true));
266
+ return handleNextStep();
151
267
  }
152
268
  }));
153
269
  };
@@ -0,0 +1,4 @@
1
+ import React from 'react';
2
+ import './index.less';
3
+ declare const EmptyHolderModal: (props: any) => React.JSX.Element;
4
+ export default EmptyHolderModal;
@@ -0,0 +1,35 @@
1
+ import React, { useMemo } from 'react';
2
+ import { PisellModal } from '@pisell/materials';
3
+ import { locales } from '@pisell/utils';
4
+ import "./index.less";
5
+ var EmptyHolderModal = function EmptyHolderModal(props) {
6
+ var open = props.open,
7
+ _onCancel = props.onCancel,
8
+ _onOk = props.onOk,
9
+ lists = props.lists;
10
+ var content = useMemo(function () {
11
+ return /*#__PURE__*/React.createElement("div", {
12
+ className: "event-booking-empty-holder-describe"
13
+ }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.event.empty.holder.tip')), /*#__PURE__*/React.createElement("ul", null, lists.map(function (item, index) {
14
+ return /*#__PURE__*/React.createElement("li", {
15
+ key: index
16
+ }, item);
17
+ })), /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.event.empty.holder.continue.tip')));
18
+ }, [lists]);
19
+ return /*#__PURE__*/React.createElement(PisellModal.Information, {
20
+ open: open,
21
+ title: locales.getText('pisell2.event.empty.holder.title'),
22
+ describe: content,
23
+ okText: locales.getText('pisell2.event.empty.holder.continue.anyway'),
24
+ cancelText: locales.getText('pisell2.event.empty.holder.go.back'),
25
+ closable: true,
26
+ onCancel: function onCancel() {
27
+ return _onCancel();
28
+ },
29
+ onOk: function onOk() {
30
+ return _onOk();
31
+ },
32
+ mobileModalHeight: '80vh'
33
+ });
34
+ };
35
+ export default EmptyHolderModal;
@@ -0,0 +1,17 @@
1
+ .event-booking-empty-holder-describe {
2
+ color: var(--Gray-900, #101828);
3
+ font-size: 16px;
4
+ font-weight: 400;
5
+ line-height: 24px;
6
+ display: flex;
7
+ flex-direction: column;
8
+ gap: 4px;
9
+
10
+ ul {
11
+ list-style-type: disc !important;
12
+ padding-left: 20px;
13
+ li {
14
+ list-style-type: disc !important;
15
+ }
16
+ }
17
+ }
@@ -6,6 +6,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
6
6
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
7
  import React, { useEffect, useState } from 'react';
8
8
  import { isMobile, locales } from '@pisell/utils';
9
+ import { Skeleton } from 'antd';
9
10
  import { useEvent, useSales, useEventDetail } from "../../../../Sales";
10
11
  import BookingServiceList from "../../bookingServiceList";
11
12
  import BookingDetailModal from "../../bookingDetailModal";
@@ -69,6 +70,12 @@ var Event = function Event() {
69
70
  };
70
71
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
71
72
  className: "event-interface-service-wrap ".concat(isMobile() ? 'event-interface-service-mobile-wrap' : '')
73
+ }, /*#__PURE__*/React.createElement(Skeleton, {
74
+ active: true,
75
+ loading: getEventList.loading,
76
+ style: {
77
+ padding: '16px'
78
+ }
72
79
  }, /*#__PURE__*/React.createElement(BookingServiceList, {
73
80
  dataSource: lists,
74
81
  showSearch: true,
@@ -79,7 +86,7 @@ var Event = function Event() {
79
86
  placeholder: locales.getText('pisell2.event.search'),
80
87
  isShowEmpty: !getEventList.loading,
81
88
  description: locales.getText('pisell2.event.empty.event')
82
- })), /*#__PURE__*/React.createElement(BookingDetailModal, {
89
+ }))), /*#__PURE__*/React.createElement(BookingDetailModal, {
83
90
  open: open
84
91
  }));
85
92
  };
@@ -5,47 +5,24 @@ import "./index.less";
5
5
  var OrderProductModal = function OrderProductModal(props) {
6
6
  var open = props.open,
7
7
  _onCancel = props.onCancel,
8
- _onOk = props.onOk,
9
- number = props.number,
10
- okVisible = props.okVisible;
11
- var renderStyle = function renderStyle() {
12
- return {
13
- border: '1px solid var(--Error-600, #D92D20)',
14
- background: 'var(--Error-600, #D92D20)',
15
- boxShadow: '0px 1px 2px 0px rgba(16, 24, 40, 0.05)',
16
- color: '#fff'
17
- };
18
- };
19
- return /*#__PURE__*/React.createElement(PisellModal, {
8
+ _props$type = props.type,
9
+ type = _props$type === void 0 ? 'cart' : _props$type;
10
+ return /*#__PURE__*/React.createElement(PisellModal.Information, {
20
11
  open: open,
21
- platform: 'pc',
22
- bodyStyle: {
23
- padding: '0 24px 16px'
24
- },
25
- headerDivider: false,
26
- okVisible: okVisible,
27
- okText: locales.getText('pisell2.event.order.items.error.continue'),
28
- cancelText: locales.getText('pisell2.event.order.items.error.back'),
12
+ title: type === 'cart' ? locales.getText('pisell2.event.event.full.title') : locales.getText('pisell2.event.capacity.limit.reached.title'),
13
+ describe: type === 'cart' ? locales.getText('pisell2.event.event.full.tip') : locales.getText('pisell2.event.capacity.limit.reached.tip'),
14
+ okText: locales.getText('pisell2.event.event.full.ok'),
15
+ cancelText: "",
16
+ cancelVisible: false,
29
17
  closable: true,
30
18
  onCancel: function onCancel() {
31
19
  return _onCancel();
32
20
  },
33
- okButtonProps: {
34
- style: renderStyle()
35
- },
36
- cancelButtonProps: {
37
- style: !okVisible ? renderStyle() : {}
38
- },
39
21
  onOk: function onOk() {
40
- return _onOk();
22
+ return _onCancel();
41
23
  },
42
- className: "event-booking-order-product-modal"
43
- }, /*#__PURE__*/React.createElement("div", {
44
- className: "event-booking-order-product-modal-content"
45
- }, /*#__PURE__*/React.createElement("span", {
46
- className: "event-booking-order-product-modal-content-title"
47
- }, locales.getText('pisell2.event.order.items.error.title')), /*#__PURE__*/React.createElement("div", {
48
- className: "event-booking-order-product-modal-content-describe"
49
- }, /*#__PURE__*/React.createElement("span", null, !okVisible ? locales.getText('pisell2.event.order.items.error.all.tip') : locales.getText('pisell2.event.order.items.error.tip')(number)), okVisible ? /*#__PURE__*/React.createElement("ul", null, /*#__PURE__*/React.createElement("li", null, locales.getText('pisell2.event.order.items.error.proceed')), /*#__PURE__*/React.createElement("li", null, locales.getText('pisell2.event.order.items.error.return'))) : null)));
24
+ mobileModalHeight: '80vh',
25
+ zIndex: 1001
26
+ });
50
27
  };
51
28
  export default OrderProductModal;
@@ -1,11 +1,12 @@
1
- import React from 'react';
1
+ import React, { useMemo } from 'react';
2
2
  import { PisellViewGrid } from '@pisell/materials';
3
3
  import { isMobile, locales } from '@pisell/utils';
4
- import { useResource, useSales, useCart, useStep, useCustomer } from "../../../../Sales";
4
+ import { useResource, useSales, useCart, useStep } from "../../../../Sales";
5
+ import useEngineContext from "../../../../../hooks/useEngineContext";
5
6
  import ResourceDisplay from "../../resourceDisplay";
6
7
  import "./index.less";
7
8
  var Resource = function Resource() {
8
- var _data$resourceData, _data$resourceData$re;
9
+ var _data$initData2, _data$resourceData, _data$resourceData$re;
9
10
  var _useSales = useSales(),
10
11
  data = _useSales.data;
11
12
  var _useResource = useResource(),
@@ -15,9 +16,7 @@ var Resource = function Resource() {
15
16
  createCartItem = _useCart.createCartItem;
16
17
  var _useStep = useStep(),
17
18
  nextStep = _useStep.nextStep;
18
- var _useCustomer = useCustomer(),
19
- openLoginModal = _useCustomer.openLoginModal,
20
- isLogin = _useCustomer.isLogin;
19
+ var context = useEngineContext();
21
20
 
22
21
  /**
23
22
  * @title: 选择资源
@@ -28,10 +27,6 @@ var Resource = function Resource() {
28
27
  * @Date: 2025-01-15 18:08
29
28
  */
30
29
  var handleClick = function handleClick(item) {
31
- // 没有登录则打开登录弹窗
32
- if (!isLogin()) {
33
- return openLoginModal({});
34
- }
35
30
  createCartItem();
36
31
  selectResource(item);
37
32
  nextStep();
@@ -59,11 +54,27 @@ var Resource = function Resource() {
59
54
  }
60
55
  });
61
56
  };
57
+
58
+ /**
59
+ * @title: 资源名称
60
+ * @description:
61
+ * @param {*} useMemo
62
+ * @return {*}
63
+ * @Author: WangHan
64
+ * @Date: 2025-02-08 15:28
65
+ */
66
+ var resourceTitle = useMemo(function () {
67
+ var _data$initData, _data$initData$boardS, _data$initData$boardS2, _form$setting, _context$appHelper, _context$appHelper$ut, _translation;
68
+ var form = data === null || data === void 0 ? void 0 : (_data$initData = data.initData) === null || _data$initData === void 0 ? void 0 : (_data$initData$boardS = _data$initData.boardSetting) === null || _data$initData$boardS === void 0 ? void 0 : (_data$initData$boardS2 = _data$initData$boardS.event_v2_form) === null || _data$initData$boardS2 === void 0 ? void 0 : _data$initData$boardS2.form;
69
+ var title = (form === null || form === void 0 ? void 0 : (_form$setting = form.setting) === null || _form$setting === void 0 ? void 0 : _form$setting.title) || (form === null || form === void 0 ? void 0 : form.title);
70
+ var translation = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : (_context$appHelper$ut = _context$appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.translation;
71
+ return (_translation = translation(title)) === null || _translation === void 0 ? void 0 : _translation.toLowerCase();
72
+ }, [data === null || data === void 0 ? void 0 : (_data$initData2 = data.initData) === null || _data$initData2 === void 0 ? void 0 : _data$initData2.boardSetting]);
62
73
  return /*#__PURE__*/React.createElement("div", {
63
74
  className: "event-interface-resource-wrap ".concat(isMobile() ? 'event-interface-resource-mobile-wrap' : '')
64
75
  }, /*#__PURE__*/React.createElement("span", {
65
76
  className: "title"
66
- }, locales.getText('pisell2.event.select.campus')), /*#__PURE__*/React.createElement("div", {
77
+ }, locales.getText('pisell2.event.select.campus')(resourceTitle)), /*#__PURE__*/React.createElement("div", {
67
78
  className: "content"
68
79
  }, data === null || data === void 0 ? void 0 : (_data$resourceData = data.resourceData) === null || _data$resourceData === void 0 ? void 0 : (_data$resourceData$re = _data$resourceData.resourceList) === null || _data$resourceData$re === void 0 ? void 0 : _data$resourceData$re.map(function (item, index) {
69
80
  return /*#__PURE__*/React.createElement("div", {
@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
7
  import React, { useEffect, useState } from 'react';
8
8
  import SelectHolder from "../selectHolder";
9
9
  import { locales } from '@pisell/utils';
10
- import { useHolder, useSales, useStep } from "../../../Sales";
10
+ import { useHolder, useSales, useStep, useCart } from "../../../Sales";
11
11
  var SelectHolderModal = function SelectHolderModal(props) {
12
12
  var _holderData$holderLis;
13
13
  var open = props.open;
@@ -28,6 +28,8 @@ var SelectHolderModal = function SelectHolderModal(props) {
28
28
  _useState2 = _slicedToArray(_useState, 2),
29
29
  selectedHolder = _useState2[0],
30
30
  setSelectedHolder = _useState2[1];
31
+ var _useCart = useCart(),
32
+ onCloseCart = _useCart.onCloseCart;
31
33
  useEffect(function () {
32
34
  setSelectedHolder(defaultSelectedHolder);
33
35
  }, [defaultSelectedHolder]);
@@ -73,6 +75,7 @@ var SelectHolderModal = function SelectHolderModal(props) {
73
75
  disabled: !(holderData !== null && holderData !== void 0 && (_holderData$holderLis = holderData.holderList) !== null && _holderData$holderLis !== void 0 && _holderData$holderLis.length) || !(selectedHolder !== null && selectedHolder !== void 0 && selectedHolder.id),
74
76
  errorTipText: locales.getText('pisell2.event.error.holder'),
75
77
  onOk: function onOk() {
78
+ onCloseCart();
76
79
  var isEvent = (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key) === 'select-event';
77
80
  selectHolder(selectedHolder, isEvent ? 'addToCart' : 'createCartItem');
78
81
  if (isEvent) {
@@ -1,3 +1,7 @@
1
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
2
+ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
3
+ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
4
+ function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
1
5
  function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
2
6
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
3
7
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -13,6 +17,7 @@ import { isMobile, locales } from '@pisell/utils';
13
17
  import Schedule from "./components/Schedule";
14
18
  import Resource from "./components/Resource";
15
19
  import BookingOptions from "./components/BookingOptions";
20
+ import OrderProductModal from "../Provider/OrderProductModal/index";
16
21
  import "./index.less";
17
22
  var BookingDetailModal = function BookingDetailModal(props) {
18
23
  var _detail$introduction2;
@@ -25,7 +30,9 @@ var BookingDetailModal = function BookingDetailModal(props) {
25
30
  onCloseEventDetail = _useEventDetail.onCloseEventDetail,
26
31
  onSelectEventDetail = _useEventDetail.onSelectEventDetail;
27
32
  var _useCart = useCart(),
28
- addToCart = _useCart.addToCart;
33
+ addToCart = _useCart.addToCart,
34
+ checkBeforeAddToCart = _useCart.checkBeforeAddToCart,
35
+ checkBeforeAddToCartResquest = _useCart.checkBeforeAddToCartResquest;
29
36
  var _useState = useState('introduction'),
30
37
  _useState2 = _slicedToArray(_useState, 2),
31
38
  activeTab = _useState2[0],
@@ -34,6 +41,11 @@ var BookingDetailModal = function BookingDetailModal(props) {
34
41
  _useState4 = _slicedToArray(_useState3, 2),
35
42
  isScrolling = _useState4[0],
36
43
  setIsScrolling = _useState4[1];
44
+ // 下单之前是否检测失败
45
+ var _useState5 = useState(false),
46
+ _useState6 = _slicedToArray(_useState5, 2),
47
+ openCheckout = _useState6[0],
48
+ setOpenCheckout = _useState6[1];
37
49
 
38
50
  /**
39
51
  * @title: 详情锚点
@@ -179,13 +191,39 @@ var BookingDetailModal = function BookingDetailModal(props) {
179
191
  * @Author: WangHan
180
192
  * @Date: 2025-01-15 23:08
181
193
  */
182
- var handleOk = function handleOk() {
183
- onSelectEventDetail();
194
+ var handleOk = /*#__PURE__*/function () {
195
+ var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
196
+ var checkRes;
197
+ return _regeneratorRuntime().wrap(function _callee$(_context) {
198
+ while (1) switch (_context.prev = _context.next) {
199
+ case 0:
200
+ onSelectEventDetail();
184
201
 
185
- // 加入购物车
186
- addToCart();
187
- };
188
- return /*#__PURE__*/React.createElement(PisellModal, {
202
+ // 检测商品是否可以下单
203
+ _context.next = 3;
204
+ return checkBeforeAddToCart();
205
+ case 3:
206
+ checkRes = _context.sent;
207
+ if (!((checkRes === null || checkRes === void 0 ? void 0 : checkRes.result) === false)) {
208
+ _context.next = 7;
209
+ break;
210
+ }
211
+ setOpenCheckout(true);
212
+ return _context.abrupt("return");
213
+ case 7:
214
+ // 加入购物车
215
+ addToCart();
216
+ case 8:
217
+ case "end":
218
+ return _context.stop();
219
+ }
220
+ }, _callee);
221
+ }));
222
+ return function handleOk() {
223
+ return _ref.apply(this, arguments);
224
+ };
225
+ }();
226
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellModal, {
189
227
  open: open,
190
228
  title: locales.getText('pisell2.event.details'),
191
229
  platform: isMobile() ? 'h5' : 'pc',
@@ -202,7 +240,15 @@ var BookingDetailModal = function BookingDetailModal(props) {
202
240
  okText: locales.getText('pisell2.event.add.to.cart'),
203
241
  cancelVisible: false,
204
242
  onOk: handleOk,
205
- width: isMobile() ? '100%' : 600
206
- }, content());
243
+ width: isMobile() ? '100%' : 600,
244
+ okButtonProps: {
245
+ loading: checkBeforeAddToCartResquest === null || checkBeforeAddToCartResquest === void 0 ? void 0 : checkBeforeAddToCartResquest.loading
246
+ }
247
+ }, content()), /*#__PURE__*/React.createElement(OrderProductModal, {
248
+ open: openCheckout,
249
+ onCancel: function onCancel() {
250
+ return setOpenCheckout(false);
251
+ }
252
+ }));
207
253
  };
208
254
  export default BookingDetailModal;