@pisell/private-materials 3.3.57 → 3.3.59
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.js +2 -2
- package/build/lowcode/view.js +2 -2
- package/es/components/appointmentBooking/components/Content/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Header/index.d.ts +1 -0
- package/es/components/appointmentBooking/index.d.ts +1 -0
- package/es/components/booking/components/footer/index.js +29 -14
- package/es/components/booking/components/voucher/index.d.ts +1 -0
- package/es/components/booking/info/addServiceVariant/index.d.ts +1 -0
- package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts +1 -0
- package/es/components/booking/info/date/index.d.ts +1 -0
- package/es/components/booking/info/hooks/useInfoHolder.d.ts +1 -0
- package/es/components/booking/info/index.d.ts +1 -0
- package/es/components/booking/info/notes/index.d.ts +1 -0
- package/es/components/booking/info/service/Lists.d.ts +1 -0
- package/es/components/booking/info/service/actions/index.d.ts +1 -0
- package/es/components/booking/info/service/addService/index.d.ts +1 -0
- package/es/components/booking/info/service/addTimeModal/index.d.ts +1 -0
- package/es/components/booking/info/service/editService/BookingList/index.d.ts +1 -0
- package/es/components/booking/info/service/serviceItem/index.d.ts +1 -0
- package/es/components/booking/info/service/serviceList/index.d.ts +1 -0
- package/es/components/booking/info/service2/Lists.d.ts +1 -0
- package/es/components/booking/info2/service/actions/index.d.ts +1 -0
- package/es/components/booking/info2/service/addService/index.d.ts +1 -0
- package/es/components/booking/info2/service/addTimeModal/index.d.ts +1 -0
- package/es/components/booking/info2/service/editService/Resources/index.d.ts +4 -0
- package/es/components/booking/info2/service/serviceItem/index.d.ts +1 -0
- package/es/components/booking/info2/service/serviceList/index.d.ts +1 -0
- package/es/components/booking/materiels/holder/index.d.ts +1 -0
- package/es/components/eftposPay/hooks.d.ts +1 -1
- package/es/components/eftposPay/store/index.d.ts +3 -3
- package/es/components/eventBooking/components/Provider/Header/index.d.ts +1 -0
- package/es/components/eventBooking/index.d.ts +1 -0
- package/es/components/pay/toC/PaymentMethods/index.js +5 -4
- package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
- package/es/components/productExtension/fields/Actor/index.d.ts +1 -0
- package/es/components/productExtension/fields/SelectProducts/index.d.ts +1 -0
- package/es/components/productExtension/index.d.ts +1 -0
- package/es/components/productSelect/components/TabProduct/index.d.ts +1 -0
- package/es/components/ticketBooking/components/addServiceVariant/addService.d.ts +1 -0
- package/es/components/ticketBooking/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Content/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Header/index.d.ts +1 -0
- package/lib/components/appointmentBooking/index.d.ts +1 -0
- package/lib/components/booking/components/footer/index.js +13 -1
- package/lib/components/booking/components/voucher/index.d.ts +1 -0
- package/lib/components/booking/info/addServiceVariant/index.d.ts +1 -0
- package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts +1 -0
- package/lib/components/booking/info/date/index.d.ts +1 -0
- package/lib/components/booking/info/hooks/useInfoHolder.d.ts +1 -0
- package/lib/components/booking/info/index.d.ts +1 -0
- package/lib/components/booking/info/notes/index.d.ts +1 -0
- package/lib/components/booking/info/service/Lists.d.ts +1 -0
- package/lib/components/booking/info/service/actions/index.d.ts +1 -0
- package/lib/components/booking/info/service/addService/index.d.ts +1 -0
- package/lib/components/booking/info/service/addTimeModal/index.d.ts +1 -0
- package/lib/components/booking/info/service/editService/BookingList/index.d.ts +1 -0
- package/lib/components/booking/info/service/serviceItem/index.d.ts +1 -0
- package/lib/components/booking/info/service/serviceList/index.d.ts +1 -0
- package/lib/components/booking/info/service2/Lists.d.ts +1 -0
- package/lib/components/booking/info2/service/actions/index.d.ts +1 -0
- package/lib/components/booking/info2/service/addService/index.d.ts +1 -0
- package/lib/components/booking/info2/service/addTimeModal/index.d.ts +1 -0
- package/lib/components/booking/info2/service/editService/Resources/index.d.ts +4 -0
- package/lib/components/booking/info2/service/serviceItem/index.d.ts +1 -0
- package/lib/components/booking/info2/service/serviceList/index.d.ts +1 -0
- package/lib/components/booking/materiels/holder/index.d.ts +1 -0
- package/lib/components/eftposPay/hooks.d.ts +1 -1
- package/lib/components/eftposPay/store/index.d.ts +3 -3
- package/lib/components/eventBooking/components/Provider/Header/index.d.ts +1 -0
- package/lib/components/eventBooking/index.d.ts +1 -0
- package/lib/components/pay/toC/PaymentMethods/index.js +10 -9
- package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
- package/lib/components/productExtension/fields/Actor/index.d.ts +1 -0
- package/lib/components/productExtension/fields/SelectProducts/index.d.ts +1 -0
- package/lib/components/productExtension/index.d.ts +1 -0
- package/lib/components/productSelect/components/TabProduct/index.d.ts +1 -0
- package/lib/components/ticketBooking/components/addServiceVariant/addService.d.ts +1 -0
- package/lib/components/ticketBooking/index.d.ts +1 -0
- package/package.json +4 -4
|
@@ -36,7 +36,8 @@ import { checkHolderIsError, formatValues } from "./utils";
|
|
|
36
36
|
import VoucherCard from "../voucher";
|
|
37
37
|
import { SubTotal } from "../../../../index";
|
|
38
38
|
import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
|
|
39
|
-
|
|
39
|
+
import { sendWarningLog } from '@pisell/utils';
|
|
40
|
+
import dayjs from 'dayjs';
|
|
40
41
|
/**
|
|
41
42
|
* @title: 底部
|
|
42
43
|
* @description:
|
|
@@ -324,7 +325,8 @@ var Footer = function Footer(props) {
|
|
|
324
325
|
case 5:
|
|
325
326
|
_context2.next = 7;
|
|
326
327
|
return handleSave({
|
|
327
|
-
type: 'checkout'
|
|
328
|
+
type: 'checkout',
|
|
329
|
+
messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal())
|
|
328
330
|
});
|
|
329
331
|
case 7:
|
|
330
332
|
res = _context2.sent;
|
|
@@ -469,7 +471,19 @@ var Footer = function Footer(props) {
|
|
|
469
471
|
_context4.prev = 20;
|
|
470
472
|
callbackData = null; // 格式化提交的参数
|
|
471
473
|
values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
|
|
472
|
-
api = state.bookingId ? editApi : createApi; //
|
|
474
|
+
api = state.bookingId ? editApi : createApi; // 增加日志记录
|
|
475
|
+
sendWarningLog({
|
|
476
|
+
title: 'saveBooking',
|
|
477
|
+
content: [{
|
|
478
|
+
key: '下单前数据',
|
|
479
|
+
value: JSON.stringify(values)
|
|
480
|
+
}, {
|
|
481
|
+
key: '日期',
|
|
482
|
+
value: dayjs().format('YYYY-MM-DD HH:mm')
|
|
483
|
+
}]
|
|
484
|
+
});
|
|
485
|
+
|
|
486
|
+
// 活动预约新建时校验重复 -- 暂不处理
|
|
473
487
|
// if (!state.bookingId && state.renderType === 'eventBooking') {
|
|
474
488
|
// const { data } = await eventBookingCheck(values);
|
|
475
489
|
// if (data.list.length) {
|
|
@@ -496,45 +510,46 @@ var Footer = function Footer(props) {
|
|
|
496
510
|
// }
|
|
497
511
|
// }
|
|
498
512
|
// }
|
|
513
|
+
|
|
499
514
|
// 如果有addons改动, 则先保存
|
|
500
515
|
if (!addonsEdit) {
|
|
501
|
-
_context4.next =
|
|
516
|
+
_context4.next = 28;
|
|
502
517
|
break;
|
|
503
518
|
}
|
|
504
|
-
_context4.next =
|
|
519
|
+
_context4.next = 28;
|
|
505
520
|
return handleSaveAddons();
|
|
506
|
-
case
|
|
521
|
+
case 28:
|
|
507
522
|
if (!infoEdit) {
|
|
508
|
-
_context4.next =
|
|
523
|
+
_context4.next = 33;
|
|
509
524
|
break;
|
|
510
525
|
}
|
|
511
|
-
_context4.next =
|
|
526
|
+
_context4.next = 31;
|
|
512
527
|
return api(values, state.bookingId);
|
|
513
|
-
case
|
|
528
|
+
case 31:
|
|
514
529
|
callbackData = _context4.sent;
|
|
515
530
|
if (messageShow) {
|
|
516
531
|
message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
|
|
517
532
|
}
|
|
518
|
-
case
|
|
533
|
+
case 33:
|
|
519
534
|
// 回调关闭弹窗
|
|
520
535
|
state === null || state === void 0 || state.callback(callbackData, type);
|
|
521
536
|
_setLoading(false);
|
|
522
537
|
|
|
523
538
|
// return数据 checkout时需要
|
|
524
539
|
return _context4.abrupt("return", callbackData || values);
|
|
525
|
-
case
|
|
526
|
-
_context4.prev =
|
|
540
|
+
case 38:
|
|
541
|
+
_context4.prev = 38;
|
|
527
542
|
_context4.t1 = _context4["catch"](20);
|
|
528
543
|
console.log(_context4.t1);
|
|
529
544
|
if ((_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.code) === 70101) {
|
|
530
545
|
message.error(_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.message);
|
|
531
546
|
}
|
|
532
547
|
_setLoading(false);
|
|
533
|
-
case
|
|
548
|
+
case 43:
|
|
534
549
|
case "end":
|
|
535
550
|
return _context4.stop();
|
|
536
551
|
}
|
|
537
|
-
}, _callee4, null, [[20,
|
|
552
|
+
}, _callee4, null, [[20, 38]]);
|
|
538
553
|
}));
|
|
539
554
|
return function handleSave(_x2) {
|
|
540
555
|
return _ref5.apply(this, arguments);
|
|
@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
|
|
|
15
15
|
readonly numRef: React.MutableRefObject<string | number | undefined>;
|
|
16
16
|
readonly orderIdRef: React.MutableRefObject<string | number>;
|
|
17
17
|
readonly modeRef: React.MutableRefObject<ModeEnum>;
|
|
18
|
-
readonly statusRef: React.MutableRefObject<"success" | "loading" | "
|
|
18
|
+
readonly statusRef: React.MutableRefObject<"success" | "loading" | "fail" | "warn" | "pedding" | "resove" | "reject" | "question">;
|
|
19
19
|
readonly netRef: React.MutableRefObject<boolean | undefined>;
|
|
20
20
|
readonly symbolRef: React.MutableRefObject<string>;
|
|
21
21
|
readonly amountRef: React.MutableRefObject<string | number>;
|
|
@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
|
|
|
174
174
|
export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
|
|
175
175
|
type: EActionTypes;
|
|
176
176
|
payload: {
|
|
177
|
-
status: "success" | "loading" | "
|
|
177
|
+
status: "success" | "loading" | "fail" | "warn" | "question";
|
|
178
178
|
};
|
|
179
179
|
};
|
|
180
180
|
/**
|
|
@@ -303,12 +303,12 @@ export declare const backUpFree: (payload: Partial<State>) => {
|
|
|
303
303
|
step?: number | undefined;
|
|
304
304
|
title?: string | undefined;
|
|
305
305
|
subTitle?: string | undefined;
|
|
306
|
-
type?: "
|
|
306
|
+
type?: "step" | "unset" | undefined;
|
|
307
307
|
render?: boolean | undefined;
|
|
308
308
|
net?: boolean | undefined;
|
|
309
309
|
component?: string | undefined;
|
|
310
310
|
form?: string | undefined;
|
|
311
|
-
status?: "success" | "loading" | "
|
|
311
|
+
status?: "success" | "loading" | "fail" | "warn" | "pedding" | "resove" | "reject" | "question" | undefined;
|
|
312
312
|
warn?: string | undefined;
|
|
313
313
|
steps?: {
|
|
314
314
|
/** 用于重置当前步骤 */
|
|
@@ -36,7 +36,7 @@ var isOfflinePayment = function isOfflinePayment(type) {
|
|
|
36
36
|
return ['pisell.bank_deposit', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_bank_transfer'].includes(type);
|
|
37
37
|
};
|
|
38
38
|
var PaymentMethods = function PaymentMethods(props, ref) {
|
|
39
|
-
var _context$appHelper;
|
|
39
|
+
var _context$appHelper, _interaction$utils, _interaction$utils$is;
|
|
40
40
|
var MWCreditCardRef = useRef(null);
|
|
41
41
|
var SuperPayAliPayH5Ref = useRef(null);
|
|
42
42
|
var StripePayRef = useRef(null);
|
|
@@ -119,10 +119,11 @@ var PaymentMethods = function PaymentMethods(props, ref) {
|
|
|
119
119
|
return _ref2.apply(this, arguments);
|
|
120
120
|
};
|
|
121
121
|
}();
|
|
122
|
+
console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils), interaction, context);
|
|
122
123
|
useEffect(function () {
|
|
123
|
-
var _interaction$
|
|
124
|
-
console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$
|
|
125
|
-
if (interaction !== null && interaction !== void 0 && (_interaction$
|
|
124
|
+
var _interaction$utils2, _interaction$utils2$i, _interaction$utils3, _interaction$utils3$i;
|
|
125
|
+
console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$i = _interaction$utils2.isAppEnv) === null || _interaction$utils2$i === void 0 ? void 0 : _interaction$utils2$i.call(_interaction$utils2));
|
|
126
|
+
if (interaction !== null && interaction !== void 0 && (_interaction$utils3 = interaction.utils) !== null && _interaction$utils3 !== void 0 && (_interaction$utils3$i = _interaction$utils3.isAppEnv) !== null && _interaction$utils3$i !== void 0 && _interaction$utils3$i.call(_interaction$utils3)) {
|
|
126
127
|
interaction.utils.mountFunction('global', 'paymentResult', function (strResult) {
|
|
127
128
|
console.log('paymentResult', strResult);
|
|
128
129
|
if (!isJson(strResult)) return;
|
|
@@ -51,6 +51,8 @@ var import_utils3 = require("./utils");
|
|
|
51
51
|
var import_voucher = __toESM(require("../voucher"));
|
|
52
52
|
var import__ = require("../../../../index");
|
|
53
53
|
var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
|
|
54
|
+
var import_utils4 = require("@pisell/utils");
|
|
55
|
+
var import_dayjs = __toESM(require("dayjs"));
|
|
54
56
|
var Footer = (props) => {
|
|
55
57
|
var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
|
|
56
58
|
const { state, buttons, dispatch, source } = props;
|
|
@@ -222,7 +224,10 @@ var Footer = (props) => {
|
|
|
222
224
|
const isHasDayProducts = handleDaySubmit();
|
|
223
225
|
if (isHasDayProducts) return;
|
|
224
226
|
}
|
|
225
|
-
const res = await handleSave({
|
|
227
|
+
const res = await handleSave({
|
|
228
|
+
type: "checkout",
|
|
229
|
+
messageShow: !(isTerminal == null ? void 0 : isTerminal())
|
|
230
|
+
});
|
|
226
231
|
goCheckout((res == null ? void 0 : res.order_id) || state.bookingId);
|
|
227
232
|
return;
|
|
228
233
|
}
|
|
@@ -288,6 +293,13 @@ var Footer = (props) => {
|
|
|
288
293
|
let callbackData = null;
|
|
289
294
|
let values = (0, import_utils3.formatValues)({ ...state, ...saveOtherValue });
|
|
290
295
|
const api = state.bookingId ? editApi : createApi;
|
|
296
|
+
(0, import_utils4.sendWarningLog)({
|
|
297
|
+
title: "saveBooking",
|
|
298
|
+
content: [
|
|
299
|
+
{ key: "下单前数据", value: JSON.stringify(values) },
|
|
300
|
+
{ key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") }
|
|
301
|
+
]
|
|
302
|
+
});
|
|
291
303
|
if (addonsEdit) {
|
|
292
304
|
await handleSaveAddons();
|
|
293
305
|
}
|
|
@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
|
|
|
15
15
|
readonly numRef: React.MutableRefObject<string | number | undefined>;
|
|
16
16
|
readonly orderIdRef: React.MutableRefObject<string | number>;
|
|
17
17
|
readonly modeRef: React.MutableRefObject<ModeEnum>;
|
|
18
|
-
readonly statusRef: React.MutableRefObject<"success" | "loading" | "
|
|
18
|
+
readonly statusRef: React.MutableRefObject<"success" | "loading" | "fail" | "warn" | "pedding" | "resove" | "reject" | "question">;
|
|
19
19
|
readonly netRef: React.MutableRefObject<boolean | undefined>;
|
|
20
20
|
readonly symbolRef: React.MutableRefObject<string>;
|
|
21
21
|
readonly amountRef: React.MutableRefObject<string | number>;
|
|
@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
|
|
|
174
174
|
export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
|
|
175
175
|
type: EActionTypes;
|
|
176
176
|
payload: {
|
|
177
|
-
status: "success" | "loading" | "
|
|
177
|
+
status: "success" | "loading" | "fail" | "warn" | "question";
|
|
178
178
|
};
|
|
179
179
|
};
|
|
180
180
|
/**
|
|
@@ -303,12 +303,12 @@ export declare const backUpFree: (payload: Partial<State>) => {
|
|
|
303
303
|
step?: number | undefined;
|
|
304
304
|
title?: string | undefined;
|
|
305
305
|
subTitle?: string | undefined;
|
|
306
|
-
type?: "
|
|
306
|
+
type?: "step" | "unset" | undefined;
|
|
307
307
|
render?: boolean | undefined;
|
|
308
308
|
net?: boolean | undefined;
|
|
309
309
|
component?: string | undefined;
|
|
310
310
|
form?: string | undefined;
|
|
311
|
-
status?: "success" | "loading" | "
|
|
311
|
+
status?: "success" | "loading" | "fail" | "warn" | "pedding" | "resove" | "reject" | "question" | undefined;
|
|
312
312
|
warn?: string | undefined;
|
|
313
313
|
steps?: {
|
|
314
314
|
/** 用于重置当前步骤 */
|