@pisell/private-materials 3.4.83 → 3.4.85
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 +1 -1
- package/build/lowcode/view.css +1 -1
- package/build/lowcode/view.js +1 -1
- package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts +0 -1
- package/es/components/booking/info/header/index.js +7 -7
- package/es/components/booking/info/header/index.less +5 -5
- package/es/components/eftposPay/app.d.ts +1 -1
- package/es/components/eftposPay/component/fail/failCustom.js +17 -12
- package/es/components/eftposPay/component/fail/index.js +12 -5
- package/es/components/eftposPay/const.d.ts +2 -0
- package/es/components/eftposPay/const.js +1 -0
- package/es/components/eftposPay/hooks.d.ts +1 -0
- package/es/components/eftposPay/hooks.js +12 -0
- package/es/components/eftposPay/index.js +5 -1
- package/es/components/eftposPay/linkly/const.js +1 -1
- package/es/components/eftposPay/payo/config.js +1 -0
- package/es/components/eftposPay/payo/const.js +1 -1
- package/es/components/eftposPay/store/index.d.ts +3 -0
- package/es/components/eftposPay/tyro/const.js +1 -1
- package/es/components/eftposPay/tyro/hooks.d.ts +0 -1
- package/es/components/eftposPay/windcave/const.js +1 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts +0 -1
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts +0 -1
- package/es/components/shoppingCart/components/Empty/index.d.ts +0 -1
- package/es/plus/walletPassGallery/components/passList/index.js +4 -3
- package/es/plus/walletPassGallery/index.js +5 -4
- package/es/pro/Login2.0/Login2.js +8 -8
- package/es/pro/Login2.0/locales.d.ts +5 -0
- package/es/pro/Login2.0/locales.js +5 -0
- package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts +0 -1
- package/lib/components/booking/info/header/index.js +7 -7
- package/lib/components/booking/info/header/index.less +5 -5
- package/lib/components/eftposPay/app.d.ts +1 -1
- package/lib/components/eftposPay/component/fail/failCustom.js +15 -9
- package/lib/components/eftposPay/component/fail/index.js +4 -1
- package/lib/components/eftposPay/const.d.ts +2 -0
- package/lib/components/eftposPay/const.js +1 -0
- package/lib/components/eftposPay/hooks.d.ts +1 -0
- package/lib/components/eftposPay/hooks.js +16 -0
- package/lib/components/eftposPay/index.js +5 -1
- package/lib/components/eftposPay/linkly/const.js +1 -1
- package/lib/components/eftposPay/payo/config.js +1 -0
- package/lib/components/eftposPay/payo/const.js +1 -1
- package/lib/components/eftposPay/store/index.d.ts +3 -0
- package/lib/components/eftposPay/tyro/const.js +1 -1
- package/lib/components/eftposPay/tyro/hooks.d.ts +0 -1
- package/lib/components/eftposPay/windcave/const.js +1 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts +0 -1
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts +0 -1
- package/lib/components/shoppingCart/components/Empty/index.d.ts +0 -1
- package/lib/plus/walletPassGallery/components/passList/index.js +3 -2
- package/lib/plus/walletPassGallery/index.js +4 -3
- package/lib/pro/Login2.0/Login2.js +8 -8
- package/lib/pro/Login2.0/locales.d.ts +5 -0
- package/lib/pro/Login2.0/locales.js +5 -0
- package/lowcode/eco-cup-list/meta.ts +1 -1
- package/lowcode/eco-customer-list/meta.ts +1 -1
- package/package.json +3 -3
|
@@ -52,19 +52,19 @@ var header = function header(_ref) {
|
|
|
52
52
|
var statusList = [{
|
|
53
53
|
label: locales.getText('pisell2.text.status.new'),
|
|
54
54
|
key: 'new',
|
|
55
|
-
color: '#
|
|
55
|
+
color: '#91caff'
|
|
56
56
|
}, {
|
|
57
57
|
label: locales.getText('pisell2.text.status.confirmed'),
|
|
58
58
|
key: 'confirmed',
|
|
59
|
-
color: '#
|
|
59
|
+
color: '#b7eb8f'
|
|
60
60
|
}, {
|
|
61
61
|
label: locales.getText('pisell2.text.status.arrived'),
|
|
62
62
|
key: 'arrived',
|
|
63
|
-
color: '#
|
|
63
|
+
color: '#d3adf7'
|
|
64
64
|
}, {
|
|
65
65
|
label: locales.getText('pisell2.text.status.started'),
|
|
66
66
|
key: 'started',
|
|
67
|
-
color: '#
|
|
67
|
+
color: '#fffb8f'
|
|
68
68
|
}, {
|
|
69
69
|
label: /*#__PURE__*/React.createElement("span", {
|
|
70
70
|
style: {
|
|
@@ -72,7 +72,7 @@ var header = function header(_ref) {
|
|
|
72
72
|
}
|
|
73
73
|
}, locales.getText('pisell2.text.status.cancelled')),
|
|
74
74
|
key: 'cancelled',
|
|
75
|
-
color: '#
|
|
75
|
+
color: '#bfbfbf'
|
|
76
76
|
}, {
|
|
77
77
|
label: /*#__PURE__*/React.createElement("span", {
|
|
78
78
|
style: {
|
|
@@ -80,11 +80,11 @@ var header = function header(_ref) {
|
|
|
80
80
|
}
|
|
81
81
|
}, locales.getText('pisell2.text.status.no_show')),
|
|
82
82
|
key: 'no_show',
|
|
83
|
-
color: '#
|
|
83
|
+
color: '#ffa39e'
|
|
84
84
|
}, {
|
|
85
85
|
label: locales.getText('pisell2.text.status.completed'),
|
|
86
86
|
key: 'completed',
|
|
87
|
-
color: '#
|
|
87
|
+
color: '#ffd591'
|
|
88
88
|
}];
|
|
89
89
|
|
|
90
90
|
// 销售渠道
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
|
|
22
22
|
.booking-order-sales-channel {
|
|
23
23
|
width: 100%;
|
|
24
|
-
color: var(--
|
|
24
|
+
color: var(--Gray-900, #101828);
|
|
25
25
|
font-size: 14px;
|
|
26
26
|
font-style: normal;
|
|
27
27
|
font-weight: 400;
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
.booking-header-left {
|
|
40
|
-
color: var(--
|
|
40
|
+
color: var(--Gray-900, #101828);
|
|
41
41
|
font-size: 18px;
|
|
42
42
|
font-style: normal;
|
|
43
43
|
font-weight: 400;
|
|
@@ -48,17 +48,17 @@
|
|
|
48
48
|
display: flex;
|
|
49
49
|
align-items: center;
|
|
50
50
|
gap: 10px;
|
|
51
|
-
color: var(--
|
|
51
|
+
color: var(--Gray-900, #101828) !important;
|
|
52
52
|
font-size: 18px;
|
|
53
53
|
font-style: normal;
|
|
54
54
|
font-weight: 400;
|
|
55
55
|
cursor: pointer;
|
|
56
|
-
border: 1px solid #
|
|
56
|
+
border: 1px solid var(--Gray-900, #101828);
|
|
57
57
|
padding: 4px 12px;
|
|
58
58
|
border-radius: 24px;
|
|
59
59
|
|
|
60
60
|
span {
|
|
61
|
-
color: var(--
|
|
61
|
+
color: var(--Gray-900, #101828) !important;
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
.booking-header-right-status-icon {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { PosProps, RouteType } from './const';
|
|
3
|
-
declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "
|
|
3
|
+
declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
|
|
4
4
|
action: RouteType;
|
|
5
5
|
device_number: string | number;
|
|
6
6
|
api: ReturnType<PosProps['getApi']>;
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
6
|
+
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
1
7
|
/* eslint-disable no-nested-ternary */
|
|
2
8
|
import { locales } from '@pisell/utils';
|
|
3
9
|
import { useMount } from 'ahooks';
|
|
@@ -23,7 +29,8 @@ export default (function (_ref) {
|
|
|
23
29
|
order_id = _useContextData.order_id,
|
|
24
30
|
number = _useContextData.number,
|
|
25
31
|
device = _useContextData.device,
|
|
26
|
-
client = _useContextData.client
|
|
32
|
+
client = _useContextData.client,
|
|
33
|
+
originalParams = _useContextData.originalParams;
|
|
27
34
|
var failCustom = custom === null || custom === void 0 ? void 0 : custom.failCustom;
|
|
28
35
|
var dispatch = useDispatch();
|
|
29
36
|
|
|
@@ -34,20 +41,18 @@ export default (function (_ref) {
|
|
|
34
41
|
*/
|
|
35
42
|
var onRetry = function onRetry() {
|
|
36
43
|
onChange('page', 'pay');
|
|
37
|
-
|
|
44
|
+
var params = _objectSpread(_objectSpread({}, originalParams || {}), {}, {
|
|
38
45
|
mode: mode,
|
|
39
46
|
name: name,
|
|
40
47
|
symbol: symbol,
|
|
41
48
|
amount: amount,
|
|
42
49
|
order_id: order_id
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
number: ''
|
|
50
|
-
})));
|
|
50
|
+
});
|
|
51
|
+
// 非查询模式,清空支付流水号
|
|
52
|
+
if (mode !== ModeEnum.Query) {
|
|
53
|
+
params.number = '';
|
|
54
|
+
}
|
|
55
|
+
dispatch(updateState(getInitState(eftpos, params)));
|
|
51
56
|
};
|
|
52
57
|
|
|
53
58
|
/**
|
|
@@ -56,14 +61,14 @@ export default (function (_ref) {
|
|
|
56
61
|
* @Date: 2024-08-20 11:30
|
|
57
62
|
*/
|
|
58
63
|
var onModify = function onModify() {
|
|
59
|
-
dispatch(updateState(getInitState(eftpos, {
|
|
64
|
+
dispatch(updateState(getInitState(eftpos, _objectSpread(_objectSpread({}, originalParams || {}), {}, {
|
|
60
65
|
mode: mode,
|
|
61
66
|
name: name,
|
|
62
67
|
symbol: symbol,
|
|
63
68
|
amount: amount,
|
|
64
69
|
order_id: order_id,
|
|
65
70
|
number: ''
|
|
66
|
-
})));
|
|
71
|
+
}))));
|
|
67
72
|
onChange('page', 'amount');
|
|
68
73
|
};
|
|
69
74
|
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
6
|
+
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
1
7
|
/* eslint-disable no-nested-ternary */
|
|
2
8
|
import { locales } from '@pisell/utils';
|
|
3
9
|
import { Button } from 'antd';
|
|
@@ -25,7 +31,8 @@ export default (function (_ref) {
|
|
|
25
31
|
order_id = _useContextData.order_id,
|
|
26
32
|
number = _useContextData.number,
|
|
27
33
|
device = _useContextData.device,
|
|
28
|
-
client = _useContextData.client
|
|
34
|
+
client = _useContextData.client,
|
|
35
|
+
originalParams = _useContextData.originalParams;
|
|
29
36
|
var isPosNetworkError = ((_steps$step = steps[step]) === null || _steps$step === void 0 || (_steps$step = _steps$step.custom) === null || _steps$step === void 0 ? void 0 : _steps$step.isPosNetworkError) || false;
|
|
30
37
|
var dispatch = useDispatch();
|
|
31
38
|
|
|
@@ -36,14 +43,14 @@ export default (function (_ref) {
|
|
|
36
43
|
*/
|
|
37
44
|
var onRetry = function onRetry() {
|
|
38
45
|
onChange('page', 'pay');
|
|
39
|
-
dispatch(updateState(getInitState(eftpos, {
|
|
46
|
+
dispatch(updateState(getInitState(eftpos, _objectSpread(_objectSpread({}, originalParams || {}), {}, {
|
|
40
47
|
mode: mode,
|
|
41
48
|
name: name,
|
|
42
49
|
symbol: symbol,
|
|
43
50
|
amount: amount,
|
|
44
51
|
order_id: order_id,
|
|
45
52
|
number: ''
|
|
46
|
-
})));
|
|
53
|
+
}))));
|
|
47
54
|
};
|
|
48
55
|
|
|
49
56
|
/**
|
|
@@ -52,14 +59,14 @@ export default (function (_ref) {
|
|
|
52
59
|
* @Date: 2024-08-20 11:30
|
|
53
60
|
*/
|
|
54
61
|
var onModify = function onModify() {
|
|
55
|
-
dispatch(updateState(getInitState(eftpos, {
|
|
62
|
+
dispatch(updateState(getInitState(eftpos, _objectSpread(_objectSpread({}, originalParams || {}), {}, {
|
|
56
63
|
mode: mode,
|
|
57
64
|
name: name,
|
|
58
65
|
symbol: symbol,
|
|
59
66
|
amount: amount,
|
|
60
67
|
order_id: order_id,
|
|
61
68
|
number: ''
|
|
62
|
-
})));
|
|
69
|
+
}))));
|
|
63
70
|
onChange('page', 'amount');
|
|
64
71
|
};
|
|
65
72
|
|
|
@@ -154,6 +154,8 @@ export declare enum PayStatus {
|
|
|
154
154
|
'Unknown' = "701000",
|
|
155
155
|
/** 交易请求超时 */
|
|
156
156
|
'Timeout' = "701001",
|
|
157
|
+
/** 支付失败 */
|
|
158
|
+
'PaymentFailed' = "701002",
|
|
157
159
|
/** 繁忙 EFTPOS终端暂时不可用,因为EFTPOS正在处理另一个请求。 */
|
|
158
160
|
'PayOtherEftposFailed' = "701003",
|
|
159
161
|
/** 购物者没有出示卡片/卡片金额不足/在线拒绝/卡已过期/卡被锁定 */
|
|
@@ -68,6 +68,7 @@ export var PayStatus = /*#__PURE__*/function (PayStatus) {
|
|
|
68
68
|
PayStatus["PairingFailure"] = "606020";
|
|
69
69
|
PayStatus["Unknown"] = "701000";
|
|
70
70
|
PayStatus["Timeout"] = "701001";
|
|
71
|
+
PayStatus["PaymentFailed"] = "701002";
|
|
71
72
|
PayStatus["PayOtherEftposFailed"] = "701003";
|
|
72
73
|
PayStatus["PayCardErrorFailed"] = "701004";
|
|
73
74
|
PayStatus["NoNetWork"] = "701005";
|
|
@@ -314,6 +314,18 @@ export var useFail = function useFail(index) {
|
|
|
314
314
|
}));
|
|
315
315
|
return;
|
|
316
316
|
}
|
|
317
|
+
if (code === PayStatus.PaymentFailed) {
|
|
318
|
+
// 前往错误页 不可标记状态
|
|
319
|
+
steps[index].title = locales.getText('page.eftpos-pay.text.transaction.fail');
|
|
320
|
+
steps[index].fail = (res === null || res === void 0 ? void 0 : res.message) || locales.getText('page.eftpos-pay.text.failed')(modeRef.current);
|
|
321
|
+
steps[index].status = 'fail';
|
|
322
|
+
dispatch(updateSteps(steps));
|
|
323
|
+
dispatch(updateComponent('Fail'));
|
|
324
|
+
dispatch(updateCustom({
|
|
325
|
+
errorStatus: 'know' // unknow know
|
|
326
|
+
}));
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
317
329
|
|
|
318
330
|
// 其他场景前往未知错误页
|
|
319
331
|
steps[index].title = locales.getText('page.eftpos-pay.text.failed')(modeRef.current);
|
|
@@ -114,7 +114,7 @@ export default (function (props) {
|
|
|
114
114
|
if (props.source === RestoreEumn.Restore) {
|
|
115
115
|
return props.params;
|
|
116
116
|
}
|
|
117
|
-
|
|
117
|
+
var initState = getInitState(props.type, props.params ? _objectSpread(_objectSpread({
|
|
118
118
|
mode: mode
|
|
119
119
|
}, props.params), {}, {
|
|
120
120
|
symbol: current
|
|
@@ -122,6 +122,10 @@ export default (function (props) {
|
|
|
122
122
|
mode: mode,
|
|
123
123
|
symbol: current
|
|
124
124
|
});
|
|
125
|
+
// 手动将 originalParams 添加到 State 根级别
|
|
126
|
+
return _objectSpread(_objectSpread({}, initState || {}), {}, {
|
|
127
|
+
originalParams: props.params || {}
|
|
128
|
+
});
|
|
125
129
|
}, [mode, props.params, props.type, symbol]);
|
|
126
130
|
var stateRef = useRef(state);
|
|
127
131
|
useEffect(function () {
|
|
@@ -54,7 +54,7 @@ export default (function (params) {
|
|
|
54
54
|
status: StatusEnum.Loading,
|
|
55
55
|
steps: getStep(mode),
|
|
56
56
|
render: true,
|
|
57
|
-
client: client !== 'undefined' ? client : ClientEnum.Merchant,
|
|
57
|
+
client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
|
|
58
58
|
warn: '',
|
|
59
59
|
custom: other || {}
|
|
60
60
|
}, typeof net !== 'undefined' ? {
|
|
@@ -188,6 +188,7 @@ export var POS = function POS(_ref) {
|
|
|
188
188
|
card_reader_type: eftposRef.current,
|
|
189
189
|
card_reader_id: (_deviceRef$current3 = deviceRef.current) === null || _deviceRef$current3 === void 0 ? void 0 : _deviceRef$current3.id,
|
|
190
190
|
number: numRef.current,
|
|
191
|
+
original_payment_number: custom === null || custom === void 0 ? void 0 : custom.original_payment_number,
|
|
191
192
|
pay_param_base64: encodeURIComponent(btoa(encodeURIComponent(JSON.stringify(_objectSpread(_objectSpread({}, dataRef.current), {}, {
|
|
192
193
|
number: numRef.current
|
|
193
194
|
})))))
|
|
@@ -68,7 +68,7 @@ export default (function (params) {
|
|
|
68
68
|
status: StatusEnum.Loading,
|
|
69
69
|
steps: getStep(mode),
|
|
70
70
|
render: true,
|
|
71
|
-
client: client !== 'undefined' ? client : ClientEnum.Merchant,
|
|
71
|
+
client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
|
|
72
72
|
custom: other || {}
|
|
73
73
|
}, typeof net !== 'undefined' ? {
|
|
74
74
|
net: net
|
|
@@ -91,6 +91,8 @@ export declare type State = {
|
|
|
91
91
|
};
|
|
92
92
|
backup?: Omit<State, 'backup'>;
|
|
93
93
|
client: ClientEnum;
|
|
94
|
+
/** 支付原始参数 */
|
|
95
|
+
originalParams?: Record<string, any>;
|
|
94
96
|
};
|
|
95
97
|
export declare type Action = {
|
|
96
98
|
type: EActionTypes;
|
|
@@ -344,6 +346,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
|
|
|
344
346
|
} | undefined;
|
|
345
347
|
backup?: Omit<State, "backup"> | undefined;
|
|
346
348
|
client?: ClientEnum | undefined;
|
|
349
|
+
originalParams?: Record<string, any> | undefined;
|
|
347
350
|
};
|
|
348
351
|
};
|
|
349
352
|
export declare function reducers(state: State, action: Action): State;
|
|
@@ -45,7 +45,7 @@ export default (function (params) {
|
|
|
45
45
|
status: StatusEnum.Loading,
|
|
46
46
|
steps: [],
|
|
47
47
|
render: true,
|
|
48
|
-
client: client !== 'undefined' ? client : ClientEnum.Merchant,
|
|
48
|
+
client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
|
|
49
49
|
custom: other || {}
|
|
50
50
|
}, typeof net !== 'undefined' ? {
|
|
51
51
|
net: net
|
|
@@ -46,7 +46,7 @@ export default (function (params) {
|
|
|
46
46
|
status: StatusEnum.Loading,
|
|
47
47
|
steps: [],
|
|
48
48
|
render: true,
|
|
49
|
-
client: client !== 'undefined' ? client : ClientEnum.Merchant,
|
|
49
|
+
client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
|
|
50
50
|
custom: other ? _objectSpread(_objectSpread({}, other), {}, {
|
|
51
51
|
list: [],
|
|
52
52
|
step: StepStatusEnum.Free
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
var _excluded = ["id", "tag", "product_title", "balance", "code", "encoded", "expire_date", "shop", "limit_status", "product_cover", "par_value", "unified_messages", "holder", "metadata"];
|
|
1
|
+
var _excluded = ["id", "tag", "product_title", "balance", "code", "encoded", "expire_date", "shop", "limit_status", "product_cover", "par_value", "unified_available_status", "unified_messages", "holder", "metadata"];
|
|
2
2
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
3
3
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
4
4
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
@@ -68,6 +68,7 @@ var PassList = function PassList(props) {
|
|
|
68
68
|
product_cover = _item$product_cover === void 0 ? '' : _item$product_cover,
|
|
69
69
|
_item$par_value = item.par_value,
|
|
70
70
|
par_value = _item$par_value === void 0 ? '' : _item$par_value,
|
|
71
|
+
unified_available_status = item.unified_available_status,
|
|
71
72
|
_item$unified_message = item.unified_messages,
|
|
72
73
|
unified_messages = _item$unified_message === void 0 ? {} : _item$unified_message,
|
|
73
74
|
holder = item.holder,
|
|
@@ -101,8 +102,8 @@ var PassList = function PassList(props) {
|
|
|
101
102
|
showQrCode: true,
|
|
102
103
|
showBalance: !isDiscountCard,
|
|
103
104
|
cover: product_cover,
|
|
104
|
-
disabled:
|
|
105
|
-
showDisabledReason:
|
|
105
|
+
disabled: unified_available_status === 0,
|
|
106
|
+
showDisabledReason: unified_available_status === 0,
|
|
106
107
|
disabledReason: disabledReason,
|
|
107
108
|
style: {
|
|
108
109
|
marginBottom: 16,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
|
-
var _excluded = ["id", "product_name", "balance", "code", "encoded", "expire_date", "shop", "limit_status", "product_cover", "unified_messages", "par_value", "tag"];
|
|
2
|
+
var _excluded = ["id", "product_name", "balance", "code", "encoded", "expire_date", "shop", "limit_status", "product_cover", "unified_available_status", "unified_messages", "par_value", "tag"];
|
|
3
3
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
4
4
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
5
5
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
@@ -692,6 +692,7 @@ var WalletPassGallery = function WalletPassGallery(props) {
|
|
|
692
692
|
limit_status = item.limit_status,
|
|
693
693
|
_item$product_cover = item.product_cover,
|
|
694
694
|
product_cover = _item$product_cover === void 0 ? '' : _item$product_cover,
|
|
695
|
+
unified_available_status = item.unified_available_status,
|
|
695
696
|
_item$unified_message = item.unified_messages,
|
|
696
697
|
unified_messages = _item$unified_message === void 0 ? {} : _item$unified_message,
|
|
697
698
|
_item$par_value = item.par_value,
|
|
@@ -704,7 +705,7 @@ var WalletPassGallery = function WalletPassGallery(props) {
|
|
|
704
705
|
var _shop$name = shop.name,
|
|
705
706
|
name = _shop$name === void 0 ? '' : _shop$name;
|
|
706
707
|
var isActive = id === (currentUnbindItem === null || currentUnbindItem === void 0 ? void 0 : currentUnbindItem.id) && platform === 'pc';
|
|
707
|
-
var
|
|
708
|
+
var isDisabled = unified_available_status === 0;
|
|
708
709
|
var isDiscountCard = tag === 'product_discount_card';
|
|
709
710
|
var getBalanceTitle = function getBalanceTitle() {
|
|
710
711
|
if (tag === 'point_card') {
|
|
@@ -723,8 +724,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
|
|
|
723
724
|
showRedeem: false,
|
|
724
725
|
showQrCode: false,
|
|
725
726
|
cover: product_cover,
|
|
726
|
-
disabled:
|
|
727
|
-
showDisabledReason:
|
|
727
|
+
disabled: isDisabled,
|
|
728
|
+
showDisabledReason: isDisabled,
|
|
728
729
|
disabledReason: title,
|
|
729
730
|
propStyle: {
|
|
730
731
|
marginBottom: 10
|
|
@@ -1039,7 +1039,7 @@ var Login2 = function Login2(_ref) {
|
|
|
1039
1039
|
_context9.next = 10;
|
|
1040
1040
|
break;
|
|
1041
1041
|
}
|
|
1042
|
-
throw new Error((res === null || res === void 0 ? void 0 : res.message) || '
|
|
1042
|
+
throw new Error((res === null || res === void 0 ? void 0 : res.message) || locales.getText('pisell-forgot-password-failed'));
|
|
1043
1043
|
case 10:
|
|
1044
1044
|
// 重置成功后关闭忘记密码流程
|
|
1045
1045
|
handleCloseForgotPassword();
|
|
@@ -1085,7 +1085,7 @@ var Login2 = function Login2(_ref) {
|
|
|
1085
1085
|
case 16:
|
|
1086
1086
|
_context9.prev = 16;
|
|
1087
1087
|
_context9.t0 = _context9["catch"](0);
|
|
1088
|
-
message.error((_context9.t0 === null || _context9.t0 === void 0 ? void 0 : _context9.t0.message) || '
|
|
1088
|
+
message.error((_context9.t0 === null || _context9.t0 === void 0 ? void 0 : _context9.t0.message) || locales.getText('pisell-forgot-password-failed'));
|
|
1089
1089
|
// throw error;
|
|
1090
1090
|
case 19:
|
|
1091
1091
|
_context9.prev = 19;
|
|
@@ -1126,18 +1126,18 @@ var Login2 = function Login2(_ref) {
|
|
|
1126
1126
|
_context10.next = 8;
|
|
1127
1127
|
break;
|
|
1128
1128
|
}
|
|
1129
|
-
throw new Error((res === null || res === void 0 ? void 0 : res.message) || '
|
|
1129
|
+
throw new Error((res === null || res === void 0 ? void 0 : res.message) || locales.getText('pisell-forgot-password-failed'));
|
|
1130
1130
|
case 8:
|
|
1131
1131
|
// 重置成功后关闭忘记密码流程并重置邮件链接验证状态
|
|
1132
1132
|
handleCloseForgotPassword();
|
|
1133
1133
|
setEmailLinkVerifyStatus(null);
|
|
1134
|
-
message.success('
|
|
1134
|
+
message.success(locales.getText('pisell-forgot-password-success'));
|
|
1135
1135
|
_context10.next = 17;
|
|
1136
1136
|
break;
|
|
1137
1137
|
case 13:
|
|
1138
1138
|
_context10.prev = 13;
|
|
1139
1139
|
_context10.t0 = _context10["catch"](0);
|
|
1140
|
-
message.error((_context10.t0 === null || _context10.t0 === void 0 ? void 0 : _context10.t0.message) || '
|
|
1140
|
+
message.error((_context10.t0 === null || _context10.t0 === void 0 ? void 0 : _context10.t0.message) || locales.getText('pisell-forgot-password-failed'));
|
|
1141
1141
|
throw _context10.t0;
|
|
1142
1142
|
case 17:
|
|
1143
1143
|
_context10.prev = 17;
|
|
@@ -2085,7 +2085,7 @@ var Login2 = function Login2(_ref) {
|
|
|
2085
2085
|
case 4:
|
|
2086
2086
|
result = _context14.sent;
|
|
2087
2087
|
if (result.status) {
|
|
2088
|
-
message.success('
|
|
2088
|
+
message.success(locales.getText('pisell-forgot-password-success'));
|
|
2089
2089
|
// 重置状态
|
|
2090
2090
|
setEmailLinkVerifyStatus(null);
|
|
2091
2091
|
setEmailLinkError('');
|
|
@@ -2111,7 +2111,7 @@ var Login2 = function Login2(_ref) {
|
|
|
2111
2111
|
setLoginStep('account');
|
|
2112
2112
|
}
|
|
2113
2113
|
} else {
|
|
2114
|
-
message.error(result.message || '
|
|
2114
|
+
message.error(result.message || locales.getText('pisell-forgot-password-failed'));
|
|
2115
2115
|
}
|
|
2116
2116
|
_context14.next = 9;
|
|
2117
2117
|
break;
|
|
@@ -2123,7 +2123,7 @@ var Login2 = function Login2(_ref) {
|
|
|
2123
2123
|
case 11:
|
|
2124
2124
|
_context14.prev = 11;
|
|
2125
2125
|
_context14.t0 = _context14["catch"](0);
|
|
2126
|
-
message.error((_context14.t0 === null || _context14.t0 === void 0 ? void 0 : _context14.t0.message) || '
|
|
2126
|
+
message.error((_context14.t0 === null || _context14.t0 === void 0 ? void 0 : _context14.t0.message) || locales.getText('pisell-forgot-password-failed'));
|
|
2127
2127
|
case 14:
|
|
2128
2128
|
case "end":
|
|
2129
2129
|
return _context14.stop();
|
|
@@ -75,6 +75,7 @@ declare const _default: {
|
|
|
75
75
|
'pisell-forgot-password-send-link': string;
|
|
76
76
|
'pisell-forgot-password-link-sent': string;
|
|
77
77
|
'pisell-forgot-password-success': string;
|
|
78
|
+
'pisell-forgot-password-failed': string;
|
|
78
79
|
'pisell-forgot-password-verify': string;
|
|
79
80
|
'pisell-common-resend': string;
|
|
80
81
|
'pisell-common-verify': string;
|
|
@@ -255,6 +256,7 @@ declare const _default: {
|
|
|
255
256
|
'pisell-forgot-password-send-link': string;
|
|
256
257
|
'pisell-forgot-password-link-sent': string;
|
|
257
258
|
'pisell-forgot-password-success': string;
|
|
259
|
+
'pisell-forgot-password-failed': string;
|
|
258
260
|
'pisell-forgot-password-verify': string;
|
|
259
261
|
'pisell-common-resend': string;
|
|
260
262
|
'pisell-common-verify': string;
|
|
@@ -447,6 +449,7 @@ declare const _default: {
|
|
|
447
449
|
'pisell-forgot-password-send-link': string;
|
|
448
450
|
'pisell-forgot-password-link-sent': string;
|
|
449
451
|
'pisell-forgot-password-success': string;
|
|
452
|
+
'pisell-forgot-password-failed': string;
|
|
450
453
|
'pisell-forgot-password-verify': string;
|
|
451
454
|
'pisell-common-resend': string;
|
|
452
455
|
'pisell-common-verify': string;
|
|
@@ -615,6 +618,7 @@ declare const _default: {
|
|
|
615
618
|
'pisell-forgot-password-send-link': string;
|
|
616
619
|
'pisell-forgot-password-link-sent': string;
|
|
617
620
|
'pisell-forgot-password-success': string;
|
|
621
|
+
'pisell-forgot-password-failed': string;
|
|
618
622
|
'pisell-forgot-password-verify': string;
|
|
619
623
|
'pisell-common-resend': string;
|
|
620
624
|
'pisell-common-verify': string;
|
|
@@ -795,6 +799,7 @@ declare const _default: {
|
|
|
795
799
|
'pisell-forgot-password-send-link': string;
|
|
796
800
|
'pisell-forgot-password-link-sent': string;
|
|
797
801
|
'pisell-forgot-password-success': string;
|
|
802
|
+
'pisell-forgot-password-failed': string;
|
|
798
803
|
'pisell-forgot-password-verify': string;
|
|
799
804
|
'pisell-common-resend': string;
|
|
800
805
|
'pisell-common-verify': string;
|
|
@@ -85,6 +85,7 @@ export default {
|
|
|
85
85
|
'pisell-forgot-password-send-link': 'Send reset password link',
|
|
86
86
|
'pisell-forgot-password-link-sent': 'Reset password link sent',
|
|
87
87
|
'pisell-forgot-password-success': 'Password reset successfully',
|
|
88
|
+
'pisell-forgot-password-failed': 'Password reset failed',
|
|
88
89
|
'pisell-forgot-password-verify': 'Verify',
|
|
89
90
|
// Common buttons and actions
|
|
90
91
|
'pisell-common-resend': 'Resend',
|
|
@@ -291,6 +292,7 @@ export default {
|
|
|
291
292
|
'pisell-forgot-password-send-link': '发送重置密码链接',
|
|
292
293
|
'pisell-forgot-password-link-sent': '重置密码链接已发送',
|
|
293
294
|
'pisell-forgot-password-success': '密码重置成功',
|
|
295
|
+
'pisell-forgot-password-failed': '密码重置失败',
|
|
294
296
|
'pisell-forgot-password-verify': '验证',
|
|
295
297
|
// Common buttons and actions
|
|
296
298
|
'pisell-common-resend': '重新发送',
|
|
@@ -513,6 +515,7 @@ export default {
|
|
|
513
515
|
'pisell-forgot-password-send-link': '發送重置密碼連結',
|
|
514
516
|
'pisell-forgot-password-link-sent': '重置密碼連結已發送',
|
|
515
517
|
'pisell-forgot-password-success': '密碼重設成功',
|
|
518
|
+
'pisell-forgot-password-failed': '密碼重設失敗',
|
|
516
519
|
'pisell-forgot-password-verify': '驗證',
|
|
517
520
|
// Common buttons and actions
|
|
518
521
|
'pisell-common-resend': '重新發送',
|
|
@@ -695,6 +698,7 @@ export default {
|
|
|
695
698
|
'pisell-forgot-password-send-link': 'パスワードリセットリンクを送信',
|
|
696
699
|
'pisell-forgot-password-link-sent': 'パスワードリセットリンクが送信されました',
|
|
697
700
|
'pisell-forgot-password-success': 'パスワードリセット成功',
|
|
701
|
+
'pisell-forgot-password-failed': 'パスワードリセット失敗',
|
|
698
702
|
'pisell-forgot-password-verify': '確認',
|
|
699
703
|
'pisell-common-resend': '再送信',
|
|
700
704
|
'pisell-common-verify': '確認',
|
|
@@ -875,6 +879,7 @@ export default {
|
|
|
875
879
|
'pisell-forgot-password-send-link': 'Enviar link de redefinição de senha',
|
|
876
880
|
'pisell-forgot-password-link-sent': 'Link de redefinição de senha enviado',
|
|
877
881
|
'pisell-forgot-password-success': 'Redefinição de senha bem-sucedida',
|
|
882
|
+
'pisell-forgot-password-failed': 'Falha na redefinição de senha',
|
|
878
883
|
'pisell-forgot-password-verify': 'Verificar',
|
|
879
884
|
'pisell-common-resend': 'Reenviar',
|
|
880
885
|
'pisell-common-verify': 'Verificar',
|