@pisell/private-materials 6.2.6 → 6.2.8
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 +7 -7
- package/build/lowcode/view.css +1 -1
- package/build/lowcode/view.js +7 -7
- package/es/components/Sales/Summary/utils.d.ts +1 -1
- package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts +1 -0
- package/es/components/appointmentBooking/components/Cart/Item/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Cart/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Deposit/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Footer/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Voucher/index.d.ts +1 -0
- package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +1 -0
- package/es/components/appointmentBooking/deposit/index.d.ts +1 -0
- package/es/components/appointmentBooking/index.d.ts +1 -0
- package/es/components/booking/components/TabProduct/index.d.ts +1 -0
- package/es/components/booking/components/TabProduct/productItem/index.d.ts +1 -0
- package/es/components/booking/components/footer/index.d.ts +1 -0
- package/es/components/booking/components/reloadResourceModal/index.d.ts +1 -0
- package/es/components/booking/components/voucher/index.d.ts +1 -0
- package/es/components/booking/deposit/index.d.ts +1 -0
- package/es/components/booking/forms/footer.d.ts +1 -0
- package/es/components/booking/forms/sendModal/useSendModal.d.ts +1 -0
- package/es/components/booking/forms/single/index.d.ts +1 -0
- package/es/components/booking/hooks/useClearCart.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/dateRange/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/info/utils.js +1 -1
- 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/serviceItem/index.d.ts +1 -0
- package/es/components/booking/info2/service/serviceList/index.d.ts +1 -0
- package/es/components/booking/materiels/duration/index.d.ts +1 -0
- package/es/components/booking/materiels/holder/index.d.ts +1 -0
- package/es/components/booking/materiels/startTime/index.d.ts +1 -0
- package/es/components/eftposPay/amount.d.ts +1 -1
- package/es/components/eftposPay/device.d.ts +1 -1
- package/es/components/eftposPay/hooks.d.ts +1 -1
- package/es/components/eftposPay/store/index.d.ts +3 -3
- package/es/components/eventBooking/components/ErrorTip/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Cart/Item/Total.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Cart/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Event/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Footer/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Information/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/Resource/index.d.ts +1 -0
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts +1 -0
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +1 -0
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +1 -0
- package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +1 -0
- package/es/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts +1 -0
- package/es/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +1 -0
- package/es/components/pay/toC/PaymentMethods/GlobePayAliPayH5/index.js +18 -3
- package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts +1 -2
- package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.js +7 -2
- package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.less +8 -0
- package/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js +44 -18
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +1 -0
- package/es/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js +18 -3
- package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
- package/es/components/pay/toC/locales.d.ts +3 -0
- package/es/components/pay/toC/locales.js +3 -0
- package/es/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +1 -0
- package/es/components/pisellSelectCustomerModal/index.d.ts +1 -0
- package/es/components/productExtension/fields/Actor/index.d.ts +1 -0
- package/es/components/productExtension/fields/Forms/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/productSelect/components/productGroup/index.d.ts +1 -0
- package/es/components/shoppingCart/components/Cart/Product.d.ts +1 -0
- package/es/components/shoppingCart/components/Cart/index.d.ts +1 -0
- package/es/components/shoppingCart/hooks/useAddService.d.ts +1 -0
- package/es/components/shoppingCart/hooks/useClearCart.d.ts +1 -0
- package/es/components/ticketBooking/components/addServiceVariant/addService.d.ts +1 -0
- package/es/components/ticketBooking/components/ticketBooking/index.d.ts +1 -0
- package/es/components/ticketBooking/components/timeBar/index.d.ts +1 -0
- package/es/components/ticketBooking/index.d.ts +1 -0
- package/es/components/workSpaceList/components/Modal/index.d.ts +1 -0
- package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts +1 -0
- package/lib/components/Sales/Summary/utils.d.ts +1 -1
- package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Cart/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Deposit/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Footer/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Voucher/index.d.ts +1 -0
- package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +1 -0
- package/lib/components/appointmentBooking/deposit/index.d.ts +1 -0
- package/lib/components/appointmentBooking/index.d.ts +1 -0
- package/lib/components/booking/components/TabProduct/index.d.ts +1 -0
- package/lib/components/booking/components/TabProduct/productItem/index.d.ts +1 -0
- package/lib/components/booking/components/footer/index.d.ts +1 -0
- package/lib/components/booking/components/reloadResourceModal/index.d.ts +1 -0
- package/lib/components/booking/components/voucher/index.d.ts +1 -0
- package/lib/components/booking/deposit/index.d.ts +1 -0
- package/lib/components/booking/forms/footer.d.ts +1 -0
- package/lib/components/booking/forms/sendModal/useSendModal.d.ts +1 -0
- package/lib/components/booking/forms/single/index.d.ts +1 -0
- package/lib/components/booking/hooks/useClearCart.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/dateRange/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/info/utils.js +2 -1
- 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/serviceItem/index.d.ts +1 -0
- package/lib/components/booking/info2/service/serviceList/index.d.ts +1 -0
- package/lib/components/booking/materiels/duration/index.d.ts +1 -0
- package/lib/components/booking/materiels/holder/index.d.ts +1 -0
- package/lib/components/booking/materiels/startTime/index.d.ts +1 -0
- package/lib/components/eftposPay/amount.d.ts +1 -1
- package/lib/components/eftposPay/device.d.ts +1 -1
- package/lib/components/eftposPay/hooks.d.ts +1 -1
- package/lib/components/eftposPay/store/index.d.ts +3 -3
- package/lib/components/eventBooking/components/ErrorTip/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Cart/Item/Total.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Cart/Item/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Cart/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Event/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Footer/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Information/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/Resource/index.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +1 -0
- package/lib/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts +1 -0
- package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +1 -0
- package/lib/components/pay/toC/PaymentMethods/GlobePayAliPayH5/index.js +13 -1
- package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts +1 -2
- package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.js +2 -2
- package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.less +8 -0
- package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js +66 -47
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +1 -0
- package/lib/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js +13 -1
- package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
- package/lib/components/pay/toC/locales.d.ts +3 -0
- package/lib/components/pay/toC/locales.js +3 -0
- package/lib/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +1 -0
- package/lib/components/pisellSelectCustomerModal/index.d.ts +1 -0
- package/lib/components/productExtension/fields/Actor/index.d.ts +1 -0
- package/lib/components/productExtension/fields/Forms/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/productSelect/components/productGroup/index.d.ts +1 -0
- package/lib/components/shoppingCart/components/Cart/Product.d.ts +1 -0
- package/lib/components/shoppingCart/components/Cart/index.d.ts +1 -0
- package/lib/components/shoppingCart/hooks/useAddService.d.ts +1 -0
- package/lib/components/shoppingCart/hooks/useClearCart.d.ts +1 -0
- package/lib/components/ticketBooking/components/addServiceVariant/addService.d.ts +1 -0
- package/lib/components/ticketBooking/components/ticketBooking/index.d.ts +1 -0
- package/lib/components/ticketBooking/components/timeBar/index.d.ts +1 -0
- package/lib/components/ticketBooking/index.d.ts +1 -0
- package/lib/components/workSpaceList/components/Modal/index.d.ts +1 -0
- package/lib/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts +1 -0
- package/package.json +2 -2
@@ -108,26 +108,32 @@ export var startPayment = /*#__PURE__*/function () {
|
|
108
108
|
return _context.abrupt("return");
|
109
109
|
case 24:
|
110
110
|
_context.next = 26;
|
111
|
-
return checkTDSAuth(step2, step3);
|
111
|
+
return checkTDSAuth(step2, step3, callback);
|
112
112
|
case 26:
|
113
113
|
step4 = _context.sent;
|
114
|
+
if (!(step4 === 0)) {
|
115
|
+
_context.next = 29;
|
116
|
+
break;
|
117
|
+
}
|
118
|
+
return _context.abrupt("return");
|
119
|
+
case 29:
|
114
120
|
paymentData.step4 = step4;
|
115
121
|
|
116
122
|
// 返回数据执行步骤5, 没有则略过 5&6
|
117
123
|
if (!step4) {
|
118
|
-
_context.next =
|
124
|
+
_context.next = 37;
|
119
125
|
break;
|
120
126
|
}
|
121
|
-
_context.next =
|
127
|
+
_context.next = 33;
|
122
128
|
return createChallengeIframe(step4, callback);
|
123
|
-
case
|
129
|
+
case 33:
|
124
130
|
step5 = _context.sent;
|
125
131
|
paymentData.step5 = step5;
|
126
132
|
|
127
133
|
// 步骤6, 换取token
|
128
|
-
_context.next =
|
134
|
+
_context.next = 37;
|
129
135
|
return checkPARes(step2, step4, step5);
|
130
|
-
case
|
136
|
+
case 37:
|
131
137
|
callback({
|
132
138
|
key: 'hideModal'
|
133
139
|
});
|
@@ -136,8 +142,8 @@ export var startPayment = /*#__PURE__*/function () {
|
|
136
142
|
status: 'success'
|
137
143
|
}, paymentInfo), callback);
|
138
144
|
return _context.abrupt("return", true);
|
139
|
-
case
|
140
|
-
_context.prev =
|
145
|
+
case 42:
|
146
|
+
_context.prev = 42;
|
141
147
|
_context.t1 = _context["catch"](2);
|
142
148
|
console.log('error', _context.t1);
|
143
149
|
callback({
|
@@ -145,21 +151,21 @@ export var startPayment = /*#__PURE__*/function () {
|
|
145
151
|
});
|
146
152
|
closeIframe();
|
147
153
|
if (!(_context.t1 === 0)) {
|
148
|
-
_context.next =
|
154
|
+
_context.next = 49;
|
149
155
|
break;
|
150
156
|
}
|
151
157
|
return _context.abrupt("return");
|
152
|
-
case
|
158
|
+
case 49:
|
153
159
|
paymentData.error = _context.t1;
|
154
160
|
paymentEnd(_objectSpread({
|
155
161
|
status: 'fail'
|
156
162
|
}, paymentInfo), callback);
|
157
163
|
return _context.abrupt("return", false);
|
158
|
-
case
|
164
|
+
case 52:
|
159
165
|
case "end":
|
160
166
|
return _context.stop();
|
161
167
|
}
|
162
|
-
}, _callee, null, [[2,
|
168
|
+
}, _callee, null, [[2, 42]]);
|
163
169
|
}));
|
164
170
|
return function startPayment(_x, _x2) {
|
165
171
|
return _ref2.apply(this, arguments);
|
@@ -334,6 +340,7 @@ export var checkTDSAuth = /*#__PURE__*/function () {
|
|
334
340
|
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
335
341
|
while (1) switch (_context4.prev = _context4.next) {
|
336
342
|
case 0:
|
343
|
+
_context4.prev = 0;
|
337
344
|
pay_number = step2.pay_number, order_id = step2.order_id, pay_info = step2.pay_info, amount = step2.amount, notifyURL = step2.notifyURL;
|
338
345
|
threeDSServerTransID = step3.threeDSServerTransID, threeDSCompInd = step3.threeDSCompInd;
|
339
346
|
currentData = new Date();
|
@@ -341,7 +348,7 @@ export var checkTDSAuth = /*#__PURE__*/function () {
|
|
341
348
|
if (REACT_APP_API_ENV === 'pre' && pay_info.check_tds_auth.card_name === 'aa bb') {
|
342
349
|
isPre = true;
|
343
350
|
}
|
344
|
-
_context4.next =
|
351
|
+
_context4.next = 8;
|
345
352
|
return request.getRequest().post('/h5/pay/order/mw-3ds-pay/v2/tds_auth_pay', {
|
346
353
|
order_id: order_id,
|
347
354
|
pay_number: pay_number,
|
@@ -379,21 +386,40 @@ export var checkTDSAuth = /*#__PURE__*/function () {
|
|
379
386
|
notifyURL: notifyURL
|
380
387
|
}
|
381
388
|
});
|
382
|
-
case
|
389
|
+
case 8:
|
383
390
|
_yield$request$getReq2 = _context4.sent;
|
384
391
|
data = _yield$request$getReq2.data;
|
385
392
|
if (data) {
|
386
|
-
_context4.next =
|
393
|
+
_context4.next = 12;
|
387
394
|
break;
|
388
395
|
}
|
389
396
|
return _context4.abrupt("return", null);
|
390
|
-
case 11:
|
391
|
-
return _context4.abrupt("return", data);
|
392
397
|
case 12:
|
398
|
+
return _context4.abrupt("return", data);
|
399
|
+
case 15:
|
400
|
+
_context4.prev = 15;
|
401
|
+
_context4.t0 = _context4["catch"](0);
|
402
|
+
// 记录卡失败的原因
|
403
|
+
log({
|
404
|
+
msg: _context4.t0,
|
405
|
+
data: paymentData
|
406
|
+
});
|
407
|
+
PisellToast({
|
408
|
+
content: (_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || '',
|
409
|
+
duration: 1000 * 200,
|
410
|
+
onClose: function onClose() {
|
411
|
+
callback({
|
412
|
+
key: 'hideModal'
|
413
|
+
});
|
414
|
+
closeIframe();
|
415
|
+
}
|
416
|
+
});
|
417
|
+
return _context4.abrupt("return", 0);
|
418
|
+
case 20:
|
393
419
|
case "end":
|
394
420
|
return _context4.stop();
|
395
421
|
}
|
396
|
-
}, _callee4);
|
422
|
+
}, _callee4, null, [[0, 15]]);
|
397
423
|
}));
|
398
424
|
return function checkTDSAuth(_x8, _x9, _x10) {
|
399
425
|
return _ref5.apply(this, arguments);
|
@@ -8,11 +8,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
8
8
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
9
9
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
10
10
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
11
|
-
import React, { useState, useImperativeHandle, forwardRef } from 'react';
|
11
|
+
import React, { useState, useImperativeHandle, forwardRef, useContext } from 'react';
|
12
12
|
import { PisellModal } from '@pisell/materials';
|
13
13
|
import { locales } from '@pisell/utils';
|
14
14
|
import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
|
15
15
|
import { getAliPayUrl } from "./serve";
|
16
|
+
import { Context } from "../../model";
|
16
17
|
import { getPayGroupParamsFromStorage, setPayNumber } from "../../payGroup";
|
17
18
|
import "./index.less";
|
18
19
|
import useEngineContext from "../../../../../hooks/useEngineContext";
|
@@ -26,11 +27,17 @@ import { clientPayment } from "../../utils";
|
|
26
27
|
*/
|
27
28
|
var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
|
28
29
|
var _context$appHelper;
|
30
|
+
var _useContext = useContext(Context),
|
31
|
+
state = _useContext.state;
|
29
32
|
var onChange = props.onChange;
|
30
33
|
var _useState = useState(false),
|
31
34
|
_useState2 = _slicedToArray(_useState, 2),
|
32
35
|
open = _useState2[0],
|
33
36
|
setOpen = _useState2[1];
|
37
|
+
var _useState3 = useState(false),
|
38
|
+
_useState4 = _slicedToArray(_useState3, 2),
|
39
|
+
showSuccessBackButton = _useState4[0],
|
40
|
+
setShowSuccessBackButton = _useState4[1];
|
34
41
|
var context = useEngineContext();
|
35
42
|
var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
|
36
43
|
interaction = _context$appHelper$ut.interaction;
|
@@ -80,7 +87,7 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
|
|
80
87
|
if (data !== null && data !== void 0 && data.pay_url) {
|
81
88
|
// 设置交易号
|
82
89
|
setPayNumber(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, data === null || data === void 0 ? void 0 : data.pay_number);
|
83
|
-
|
90
|
+
setShowSuccessBackButton(true);
|
84
91
|
// 跳转
|
85
92
|
window.location.href = data === null || data === void 0 ? void 0 : data.pay_url;
|
86
93
|
} else {
|
@@ -107,6 +114,12 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
|
|
107
114
|
init: init
|
108
115
|
};
|
109
116
|
});
|
117
|
+
var handleSuccessBack = function handleSuccessBack() {
|
118
|
+
var _state$payCallback;
|
119
|
+
(_state$payCallback = state.payCallback) === null || _state$payCallback === void 0 || _state$payCallback.call(state, {
|
120
|
+
key: 'success'
|
121
|
+
});
|
122
|
+
};
|
110
123
|
return /*#__PURE__*/React.createElement(PisellModal, {
|
111
124
|
platform: 'h5',
|
112
125
|
open: open,
|
@@ -119,7 +132,9 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
|
|
119
132
|
}, /*#__PURE__*/React.createElement("div", {
|
120
133
|
className: ""
|
121
134
|
}, /*#__PURE__*/React.createElement(ThreedsLoading, {
|
122
|
-
title: locales.getText('tocPay.text.redirectingToAlipay')
|
135
|
+
title: locales.getText('tocPay.text.redirectingToAlipay'),
|
136
|
+
onSuccessBack: handleSuccessBack,
|
137
|
+
showSuccessBackButton: showSuccessBackButton
|
123
138
|
})));
|
124
139
|
};
|
125
140
|
export default /*#__PURE__*/forwardRef(SuperPayAliPayH5);
|
@@ -35,6 +35,7 @@ declare const _default: {
|
|
35
35
|
'tocPay.text.done': string;
|
36
36
|
'tocPay.text.manageCard': string;
|
37
37
|
'tocPay.text.waitingForBankVerification': string;
|
38
|
+
'tocPay.text.successBack': string;
|
38
39
|
'tocPay.text.redirectingToAlipay': string;
|
39
40
|
'tocPay.text.redirectingToPaypal': string;
|
40
41
|
'tocPay.text.redirectingToWeChatPay': string;
|
@@ -130,6 +131,7 @@ declare const _default: {
|
|
130
131
|
'tocPay.text.done': string;
|
131
132
|
'tocPay.text.manageCard': string;
|
132
133
|
'tocPay.text.waitingForBankVerification': string;
|
134
|
+
'tocPay.text.successBack': string;
|
133
135
|
'tocPay.text.redirectingToAlipay': string;
|
134
136
|
'tocPay.text.redirectingToPaypal': string;
|
135
137
|
'tocPay.text.redirectingToWeChatPay': string;
|
@@ -224,6 +226,7 @@ declare const _default: {
|
|
224
226
|
'tocPay.text.done': string;
|
225
227
|
'tocPay.text.manageCard': string;
|
226
228
|
'tocPay.text.waitingForBankVerification': string;
|
229
|
+
'tocPay.text.successBack': string;
|
227
230
|
'tocPay.text.redirectingToAlipay': string;
|
228
231
|
'tocPay.text.redirectingToPaypal': string;
|
229
232
|
'tocPay.text.redirectingToWeChatPay': string;
|
@@ -35,6 +35,7 @@ export default {
|
|
35
35
|
'tocPay.text.done': 'Done',
|
36
36
|
'tocPay.text.manageCard': 'Manage card',
|
37
37
|
'tocPay.text.waitingForBankVerification': 'Waiting for bank verification, please wait for 5-10 seconds. You may be redirected to the card issuing bank’s verification page to authorize this payment.',
|
38
|
+
'tocPay.text.successBack': 'Payment completed, return to order',
|
38
39
|
'tocPay.text.redirectingToAlipay': 'Redirecting to Alipay, please wait...',
|
39
40
|
'tocPay.text.redirectingToPaypal': 'Redirecting to Paypal, please wait...',
|
40
41
|
'tocPay.text.redirectingToWeChatPay': 'Redirecting to WeChat Pay, please wait...',
|
@@ -150,6 +151,7 @@ export default {
|
|
150
151
|
'tocPay.text.done': '完成',
|
151
152
|
'tocPay.text.manageCard': '管理卡片',
|
152
153
|
'tocPay.text.waitingForBankVerification': '正在等待银行校验,请静候5-10秒左右。您可能被转入开卡行的持卡人校验页面来授权本次支付。',
|
154
|
+
'tocPay.text.successBack': '已支付完成返回查看订单',
|
153
155
|
'tocPay.text.redirectingToAlipay': '正在转入支付宝支付,请稍候...',
|
154
156
|
'tocPay.text.redirectingToPaypal': '正在转入Paypal支付,请稍候...',
|
155
157
|
'tocPay.text.redirectingToWeChatPay': '正在转入微信支付,请稍候...',
|
@@ -264,6 +266,7 @@ export default {
|
|
264
266
|
'tocPay.text.done': '完成',
|
265
267
|
'tocPay.text.manageCard': '管理卡片',
|
266
268
|
'tocPay.text.waitingForBankVerification': '正在等待銀行校驗,請靜候5-10秒左右。您可能被轉入開卡行的持卡人校驗頁面來授權本次支付。',
|
269
|
+
'tocPay.text.successBack': '已支付完成返回查看訂單',
|
267
270
|
'tocPay.text.redirectingToAlipay': '正在轉入支付寶支付,請稍候...',
|
268
271
|
'tocPay.text.redirectingToPaypal': '正在轉入Paypal支付,請稍候...',
|
269
272
|
'tocPay.text.redirectingToWeChatPay': '正在轉入微信支付,請稍候...',
|
@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
|
|
30
30
|
* @return {*}
|
31
31
|
* @Author: xiangfeng.xue
|
32
32
|
*/
|
33
|
-
export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00"
|
33
|
+
export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
|
34
34
|
/**
|
35
35
|
* 计算所有价格明细
|
36
36
|
* @param items - 购物车商品数组
|
@@ -143,7 +143,8 @@ var isBooking4Shop = (shopId, renderType, businessUtils) => {
|
|
143
143
|
8872,
|
144
144
|
6930,
|
145
145
|
8824,
|
146
|
-
8913
|
146
|
+
8913,
|
147
|
+
8918
|
147
148
|
];
|
148
149
|
return booking4Shops.includes(shopId) || (businessUtils == null ? void 0 : businessUtils.getAppByModal("resourcekit"));
|
149
150
|
};
|