tplus-components-touch 3.44.1 → 3.45.2
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/dist/components/billSearch/index.js +15 -38
- package/dist/components/billSearch/index.js.map +1 -1
- package/dist/components/deliverySearch/index.js +5 -1
- package/dist/components/deliverySearch/index.js.map +1 -1
- package/dist/components/inventorySearch/tab.js +6 -1
- package/dist/components/inventorySearch/tab.js.map +1 -1
- package/dist/components/loading/loadingContent.js +5 -2
- package/dist/components/loading/loadingContent.js.map +1 -1
- package/dist/components/message/index.js +4 -6
- package/dist/components/message/index.js.map +1 -1
- package/dist/components/modalWraper/index.js +16 -1
- package/dist/components/modalWraper/index.js.map +1 -1
- package/dist/components/modalWraper/style.less +6 -0
- package/dist/components/notification/index.js +11 -12
- package/dist/components/notification/index.js.map +1 -1
- package/dist/components/progressState/EmptyAndErrorView.js +5 -7
- package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
- package/dist/components/settlement/asyncModal.js +4 -1
- package/dist/components/settlement/asyncModal.js.map +1 -1
- package/dist/components/settlement/settlement.js +287 -248
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlement.less +3 -0
- package/dist/components/settlement/settlementApi.js +512 -0
- package/dist/components/settlement/settlementApi.js.map +1 -0
- package/dist/components/settlement/settlementStore.js +722 -729
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/ticon/iconfont/demo.css +539 -539
- package/dist/components/touchTable/index.js +25 -18
- package/dist/components/touchTable/index.js.map +1 -1
- package/dist/index.js +8 -3
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
@@ -227,6 +227,7 @@ var hasElectron = _mutantsMicrofx.env.platform === _mutantsMicrofx.env.constant.
|
|
227
227
|
var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_React$Component) {
|
228
228
|
(0, _inherits3.default)(Settlement, _React$Component);
|
229
229
|
|
230
|
+
// 复核结算方式快捷键列表
|
230
231
|
function Settlement(props) {
|
231
232
|
var _this3 = this;
|
232
233
|
|
@@ -269,14 +270,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
269
270
|
czkValue: null,
|
270
271
|
isInputMember: false,
|
271
272
|
selectedRowIndex: 0,
|
272
|
-
isNotAutoFocus: true
|
273
|
-
// 复核结算方式快捷键列表
|
274
|
-
};
|
273
|
+
isNotAutoFocus: true };
|
275
274
|
_this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
|
276
275
|
return key.toLocaleUpperCase();
|
277
276
|
});
|
278
277
|
_this2.hotkeydebounced = null;
|
279
278
|
_this2.hotkeydebouncedPayMode = "";
|
279
|
+
_this2.voucherRunningFast = false;
|
280
280
|
_this2.currentInput = null;
|
281
281
|
|
282
282
|
_this2.getIsReturn = function () {
|
@@ -1024,11 +1024,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1024
1024
|
}, 200);
|
1025
1025
|
|
1026
1026
|
// TODO: 测试优惠券支付
|
1027
|
-
|
1028
|
-
var _ref10 = _mutantsUtil.platform || {},
|
1029
|
-
isNewRetailBCPos = _ref10.isNewRetailBCPos;
|
1030
|
-
|
1031
|
-
if (isNewRetailBCPos && !_this2.store.paymode.currentMode.boriginReturn) {
|
1027
|
+
if (!_this2.store.paymode.currentMode.boriginReturn) {
|
1032
1028
|
_this2.store.getCouponList();
|
1033
1029
|
}
|
1034
1030
|
};
|
@@ -1110,8 +1106,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1110
1106
|
};
|
1111
1107
|
|
1112
1108
|
_this2.checkOfflineEnable = function (paymode, key) {
|
1113
|
-
var
|
1114
|
-
paymodes =
|
1109
|
+
var _ref10 = paymode || {},
|
1110
|
+
paymodes = _ref10.paymodes;
|
1115
1111
|
|
1116
1112
|
var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
|
1117
1113
|
|
@@ -1464,15 +1460,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1464
1460
|
_message2.default.info('\u539F\u5355\u9000\u8D27\u65F6' + Differentiate.COUPON + '\u4E0D\u53EF\u4EE5\u53D6\u6D88\u3002');
|
1465
1461
|
return;
|
1466
1462
|
}
|
1467
|
-
|
1468
|
-
var _ref12 = _mutantsUtil.platform || {},
|
1469
|
-
isNewRetailBCPos = _ref12.isNewRetailBCPos;
|
1470
|
-
|
1471
|
-
if (isNewRetailBCPos) {
|
1472
|
-
_this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
|
1473
|
-
} else {
|
1474
|
-
_this2.store.paymode.calcDjqValue(q);
|
1475
|
-
}
|
1463
|
+
_this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
|
1476
1464
|
// this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.couponCategoryEnum !== 'RIGHT'}));
|
1477
1465
|
// this.props.onGetCouponList && this.props.onGetCouponList(this.store.dto, _filter(this.store.paymode.currentMode.djqs,(djq)=>{return djq.checked}), this.store.paymode.currentMode.djqs);
|
1478
1466
|
};
|
@@ -1834,7 +1822,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1834
1822
|
};
|
1835
1823
|
|
1836
1824
|
_this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
|
1837
|
-
var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen,
|
1825
|
+
var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, isFull, resp1;
|
1838
1826
|
|
1839
1827
|
return _regenerator2.default.wrap(function _callee8$(_context8) {
|
1840
1828
|
while (1) {
|
@@ -1894,31 +1882,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1894
1882
|
}
|
1895
1883
|
};
|
1896
1884
|
|
1897
|
-
|
1898
|
-
|
1899
|
-
|
1900
|
-
|
1901
|
-
if (!(type !== 1)) {
|
1902
|
-
_context8.next = 20;
|
1903
|
-
break;
|
1904
|
-
}
|
1905
|
-
|
1906
|
-
_context8.prev = 11;
|
1907
|
-
_context8.next = 14;
|
1908
|
-
return getSettleGift();
|
1885
|
+
isFull = _this2.store.isFull;
|
1886
|
+
_context8.next = 10;
|
1887
|
+
return _this2.settleGiftOpenedInRunningFast();
|
1909
1888
|
|
1910
|
-
case
|
1889
|
+
case 10:
|
1911
1890
|
resp1 = _context8.sent;
|
1912
|
-
_context8.next = 20;
|
1913
|
-
break;
|
1914
1891
|
|
1915
|
-
case 17:
|
1916
|
-
_context8.prev = 17;
|
1917
|
-
_context8.t0 = _context8['catch'](11);
|
1918
|
-
|
1919
|
-
console.log("获取支付礼包getSettleGift失败");
|
1920
|
-
|
1921
|
-
case 20:
|
1922
1892
|
|
1923
1893
|
setTimeout(function () {
|
1924
1894
|
if (window.__loadingModal) {
|
@@ -1952,25 +1922,80 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
1952
1922
|
_this2.cancelState();
|
1953
1923
|
}, 0);
|
1954
1924
|
|
1955
|
-
case
|
1925
|
+
case 12:
|
1956
1926
|
case 'end':
|
1957
1927
|
return _context8.stop();
|
1958
1928
|
}
|
1959
1929
|
}
|
1960
|
-
}, _callee8, _this3
|
1930
|
+
}, _callee8, _this3);
|
1931
|
+
}));
|
1932
|
+
_this2.settleGiftOpenedInRunningFast = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
|
1933
|
+
var resp, isCheckGift, vocherPayGift, getSettleGift, type;
|
1934
|
+
return _regenerator2.default.wrap(function _callee9$(_context9) {
|
1935
|
+
while (1) {
|
1936
|
+
switch (_context9.prev = _context9.next) {
|
1937
|
+
case 0:
|
1938
|
+
resp = false;
|
1939
|
+
isCheckGift = true;
|
1940
|
+
|
1941
|
+
if (_this2.voucherRunningFast) {
|
1942
|
+
vocherPayGift = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('vocherPayGift');
|
1943
|
+
|
1944
|
+
if (!vocherPayGift || vocherPayGift == 'false') {
|
1945
|
+
isCheckGift = false;
|
1946
|
+
}
|
1947
|
+
}
|
1948
|
+
|
1949
|
+
if (!isCheckGift) {
|
1950
|
+
_context9.next = 16;
|
1951
|
+
break;
|
1952
|
+
}
|
1953
|
+
|
1954
|
+
getSettleGift = _this2.store.getSettleGift;
|
1955
|
+
type = _this2.props.type;
|
1956
|
+
|
1957
|
+
if (!(type != 1)) {
|
1958
|
+
_context9.next = 16;
|
1959
|
+
break;
|
1960
|
+
}
|
1961
|
+
|
1962
|
+
_context9.prev = 7;
|
1963
|
+
_context9.next = 10;
|
1964
|
+
return getSettleGift();
|
1965
|
+
|
1966
|
+
case 10:
|
1967
|
+
resp = _context9.sent;
|
1968
|
+
_context9.next = 16;
|
1969
|
+
break;
|
1970
|
+
|
1971
|
+
case 13:
|
1972
|
+
_context9.prev = 13;
|
1973
|
+
_context9.t0 = _context9['catch'](7);
|
1974
|
+
|
1975
|
+
console.log("获取支付礼包getSettleGift失败");
|
1976
|
+
|
1977
|
+
case 16:
|
1978
|
+
return _context9.abrupt('return', resp);
|
1979
|
+
|
1980
|
+
case 17:
|
1981
|
+
case 'end':
|
1982
|
+
return _context9.stop();
|
1983
|
+
}
|
1984
|
+
}
|
1985
|
+
}, _callee9, _this3, [[7, 13]]);
|
1961
1986
|
}));
|
1962
1987
|
|
1963
1988
|
_this2.handleGuestShow = function (dtype, value) {
|
1964
1989
|
if (_this2.hasElectron === false) return;
|
1965
1990
|
var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
|
1966
1991
|
|
1967
|
-
var
|
1968
|
-
guestshow_enable =
|
1969
|
-
guestshow_clear =
|
1970
|
-
guestshow_welcome =
|
1971
|
-
guestshow_collect =
|
1972
|
-
guestshow_refund =
|
1973
|
-
guestshow_change =
|
1992
|
+
var _ref15 = dt || {},
|
1993
|
+
guestshow_enable = _ref15.guestshow_enable,
|
1994
|
+
guestshow_clear = _ref15.guestshow_clear,
|
1995
|
+
guestshow_welcome = _ref15.guestshow_welcome,
|
1996
|
+
guestshow_collect = _ref15.guestshow_collect,
|
1997
|
+
guestshow_refund = _ref15.guestshow_refund,
|
1998
|
+
guestshow_change = _ref15.guestshow_change;
|
1974
1999
|
|
1975
2000
|
var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
|
1976
2001
|
if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
|
@@ -2005,115 +2030,115 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2005
2030
|
};
|
2006
2031
|
|
2007
2032
|
_this2.handleSettle = function () {
|
2008
|
-
var
|
2033
|
+
var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(args) {
|
2009
2034
|
var handleUserInputs = function () {
|
2010
|
-
var
|
2035
|
+
var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(promises) {
|
2011
2036
|
var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
|
2012
2037
|
|
2013
|
-
return _regenerator2.default.wrap(function
|
2038
|
+
return _regenerator2.default.wrap(function _callee11$(_context11) {
|
2014
2039
|
while (1) {
|
2015
|
-
switch (
|
2040
|
+
switch (_context11.prev = _context11.next) {
|
2016
2041
|
case 0:
|
2017
2042
|
results = [];
|
2018
|
-
|
2043
|
+
_context11.prev = 1;
|
2019
2044
|
_iteratorNormalCompletion = true;
|
2020
2045
|
_didIteratorError = false;
|
2021
2046
|
_iteratorError = undefined;
|
2022
|
-
|
2047
|
+
_context11.prev = 5;
|
2023
2048
|
_iterator = (0, _getIterator3.default)(promises);
|
2024
2049
|
|
2025
2050
|
case 7:
|
2026
2051
|
if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
|
2027
|
-
|
2052
|
+
_context11.next = 16;
|
2028
2053
|
break;
|
2029
2054
|
}
|
2030
2055
|
|
2031
2056
|
p = _step.value;
|
2032
|
-
|
2057
|
+
_context11.next = 11;
|
2033
2058
|
return p;
|
2034
2059
|
|
2035
2060
|
case 11:
|
2036
|
-
_result =
|
2061
|
+
_result = _context11.sent;
|
2037
2062
|
|
2038
2063
|
results.push(_result);
|
2039
2064
|
|
2040
2065
|
case 13:
|
2041
2066
|
_iteratorNormalCompletion = true;
|
2042
|
-
|
2067
|
+
_context11.next = 7;
|
2043
2068
|
break;
|
2044
2069
|
|
2045
2070
|
case 16:
|
2046
|
-
|
2071
|
+
_context11.next = 22;
|
2047
2072
|
break;
|
2048
2073
|
|
2049
2074
|
case 18:
|
2050
|
-
|
2051
|
-
|
2075
|
+
_context11.prev = 18;
|
2076
|
+
_context11.t0 = _context11['catch'](5);
|
2052
2077
|
_didIteratorError = true;
|
2053
|
-
_iteratorError =
|
2078
|
+
_iteratorError = _context11.t0;
|
2054
2079
|
|
2055
2080
|
case 22:
|
2056
|
-
|
2057
|
-
|
2081
|
+
_context11.prev = 22;
|
2082
|
+
_context11.prev = 23;
|
2058
2083
|
|
2059
2084
|
if (!_iteratorNormalCompletion && _iterator.return) {
|
2060
2085
|
_iterator.return();
|
2061
2086
|
}
|
2062
2087
|
|
2063
2088
|
case 25:
|
2064
|
-
|
2089
|
+
_context11.prev = 25;
|
2065
2090
|
|
2066
2091
|
if (!_didIteratorError) {
|
2067
|
-
|
2092
|
+
_context11.next = 28;
|
2068
2093
|
break;
|
2069
2094
|
}
|
2070
2095
|
|
2071
2096
|
throw _iteratorError;
|
2072
2097
|
|
2073
2098
|
case 28:
|
2074
|
-
return
|
2099
|
+
return _context11.finish(25);
|
2075
2100
|
|
2076
2101
|
case 29:
|
2077
|
-
return
|
2102
|
+
return _context11.finish(22);
|
2078
2103
|
|
2079
2104
|
case 30:
|
2080
2105
|
window.__loadingModal = (0, _utils.openLoadingModal)();
|
2081
|
-
|
2106
|
+
_context11.next = 33;
|
2082
2107
|
return commit(results);
|
2083
2108
|
|
2084
2109
|
case 33:
|
2085
|
-
|
2110
|
+
_context11.next = 37;
|
2086
2111
|
break;
|
2087
2112
|
|
2088
2113
|
case 35:
|
2089
|
-
|
2090
|
-
|
2114
|
+
_context11.prev = 35;
|
2115
|
+
_context11.t1 = _context11['catch'](1);
|
2091
2116
|
|
2092
2117
|
case 37:
|
2093
2118
|
case 'end':
|
2094
|
-
return
|
2119
|
+
return _context11.stop();
|
2095
2120
|
}
|
2096
2121
|
}
|
2097
|
-
},
|
2122
|
+
}, _callee11, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
|
2098
2123
|
}));
|
2099
2124
|
|
2100
2125
|
return function handleUserInputs(_x6) {
|
2101
|
-
return
|
2126
|
+
return _ref18.apply(this, arguments);
|
2102
2127
|
};
|
2103
2128
|
}();
|
2104
2129
|
|
2105
|
-
var _enumController$getEn21, PayStyle, _this2$
|
2130
|
+
var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
|
2106
2131
|
|
2107
|
-
return _regenerator2.default.wrap(function
|
2132
|
+
return _regenerator2.default.wrap(function _callee12$(_context12) {
|
2108
2133
|
while (1) {
|
2109
|
-
switch (
|
2134
|
+
switch (_context12.prev = _context12.next) {
|
2110
2135
|
case 0:
|
2111
2136
|
_this2.setState({
|
2112
2137
|
settleDisabled: true
|
2113
2138
|
});
|
2114
2139
|
console.log("settlement.handleSettle开始执行,参数:", +args);
|
2115
2140
|
_enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
|
2116
|
-
_this2$
|
2141
|
+
_this2$store6 = _this2.store, paymode = _this2$store6.paymode, brefund = _this2$store6.brefund, boriginReturn = _this2$store6.boriginReturn, newStyle = _this2$store6.newStyle;
|
2117
2142
|
isQuickPay = args === 'quickPay';
|
2118
2143
|
that = _this2;
|
2119
2144
|
status = false;
|
@@ -2128,7 +2153,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2128
2153
|
});
|
2129
2154
|
|
2130
2155
|
if (!(that.checkCharge() && Math.abs(paymode.receivable) > that.props.initData("posChangeUpperAmount"))) {
|
2131
|
-
|
2156
|
+
_context12.next = 13;
|
2132
2157
|
break;
|
2133
2158
|
}
|
2134
2159
|
|
@@ -2136,11 +2161,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2136
2161
|
_this2.setState({
|
2137
2162
|
settleDisabled: false
|
2138
2163
|
});
|
2139
|
-
return
|
2164
|
+
return _context12.abrupt('return');
|
2140
2165
|
|
2141
2166
|
case 13:
|
2142
2167
|
if (!(args !== "zero" && !newStyle)) {
|
2143
|
-
|
2168
|
+
_context12.next = 19;
|
2144
2169
|
break;
|
2145
2170
|
}
|
2146
2171
|
|
@@ -2149,7 +2174,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2149
2174
|
});
|
2150
2175
|
|
2151
2176
|
if (!zeromode) {
|
2152
|
-
|
2177
|
+
_context12.next = 19;
|
2153
2178
|
break;
|
2154
2179
|
}
|
2155
2180
|
|
@@ -2157,7 +2182,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2157
2182
|
settleDisabled: false
|
2158
2183
|
});
|
2159
2184
|
_message2.default.error(zeromode.name + ' 的结算金额为零,不可以结算。');
|
2160
|
-
return
|
2185
|
+
return _context12.abrupt('return');
|
2161
2186
|
|
2162
2187
|
case 19:
|
2163
2188
|
promises = [];
|
@@ -2166,14 +2191,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2166
2191
|
}) : paymode.thePaymodes, 'orderBy');
|
2167
2192
|
|
2168
2193
|
if (!isQuickPay) {
|
2169
|
-
|
2194
|
+
_context12.next = 27;
|
2170
2195
|
break;
|
2171
2196
|
}
|
2172
2197
|
|
2173
2198
|
quickmode = thePaymodes[0];
|
2174
2199
|
|
2175
2200
|
if (!_this2.checkModeDisabled(quickmode.paymentType, brefund, boriginReturn)) {
|
2176
|
-
|
2201
|
+
_context12.next = 27;
|
2177
2202
|
break;
|
2178
2203
|
}
|
2179
2204
|
|
@@ -2181,7 +2206,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2181
2206
|
settleDisabled: false
|
2182
2207
|
});
|
2183
2208
|
_message2.default.error('退款不能使用' + quickmode.name + '结算,请使用其他结算方式!');
|
2184
|
-
return
|
2209
|
+
return _context12.abrupt('return');
|
2185
2210
|
|
2186
2211
|
case 27:
|
2187
2212
|
(0, _forEach3.default)(thePaymodes, function (mode) {
|
@@ -2191,27 +2216,27 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2191
2216
|
});
|
2192
2217
|
|
2193
2218
|
commit = function () {
|
2194
|
-
var
|
2219
|
+
var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(values) {
|
2195
2220
|
var result;
|
2196
|
-
return _regenerator2.default.wrap(function
|
2221
|
+
return _regenerator2.default.wrap(function _callee10$(_context10) {
|
2197
2222
|
while (1) {
|
2198
|
-
switch (
|
2223
|
+
switch (_context10.prev = _context10.next) {
|
2199
2224
|
case 0:
|
2200
|
-
|
2225
|
+
_context10.next = 2;
|
2201
2226
|
return _this2.store.commit(_this2.props.bTest);
|
2202
2227
|
|
2203
2228
|
case 2:
|
2204
|
-
result =
|
2229
|
+
result = _context10.sent;
|
2205
2230
|
|
2206
2231
|
if (!(result === true)) {
|
2207
|
-
|
2232
|
+
_context10.next = 8;
|
2208
2233
|
break;
|
2209
2234
|
}
|
2210
2235
|
|
2211
2236
|
//成功
|
2212
2237
|
that.settleSuccess();
|
2213
2238
|
_promise2.default.resolve();
|
2214
|
-
|
2239
|
+
_context10.next = 23;
|
2215
2240
|
break;
|
2216
2241
|
|
2217
2242
|
case 8:
|
@@ -2228,24 +2253,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2228
2253
|
}, 0);
|
2229
2254
|
|
2230
2255
|
if (!(result && (result.Code || result.code))) {
|
2231
|
-
|
2256
|
+
_context10.next = 20;
|
2232
2257
|
break;
|
2233
2258
|
}
|
2234
2259
|
|
2235
|
-
|
2236
|
-
|
2260
|
+
_context10.t0 = result.Code || result.code;
|
2261
|
+
_context10.next = _context10.t0 === 'RE_Settle_UnReturn' ? 14 : _context10.t0 === 'ECONNABORTED' ? 18 : 20;
|
2237
2262
|
break;
|
2238
2263
|
|
2239
2264
|
case 14:
|
2240
2265
|
console.log('settlement--RE_Settle_UnReturn--调用清除数据==Focus==');
|
2241
2266
|
_this2.props.clearVoucherData && _this2.props.clearVoucherData();
|
2242
2267
|
_this2.cancelState();
|
2243
|
-
return
|
2268
|
+
return _context10.abrupt('break', 20);
|
2244
2269
|
|
2245
2270
|
case 18:
|
2246
2271
|
//error.code === 'ECONNABORTED' && error.message.indexOf('timeout')
|
2247
2272
|
result.message.indexOf('timeout') > -1 && that.settleUnReturn();
|
2248
|
-
return
|
2273
|
+
return _context10.abrupt('break', 20);
|
2249
2274
|
|
2250
2275
|
case 20:
|
2251
2276
|
if (isQuickPay) {
|
@@ -2253,19 +2278,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2253
2278
|
that.cancelState();
|
2254
2279
|
}
|
2255
2280
|
|
2256
|
-
|
2281
|
+
_context10.next = 23;
|
2257
2282
|
return _promise2.default.reject();
|
2258
2283
|
|
2259
2284
|
case 23:
|
2260
2285
|
case 'end':
|
2261
|
-
return
|
2286
|
+
return _context10.stop();
|
2262
2287
|
}
|
2263
2288
|
}
|
2264
|
-
},
|
2289
|
+
}, _callee10, _this3);
|
2265
2290
|
}));
|
2266
2291
|
|
2267
2292
|
return function commit(_x5) {
|
2268
|
-
return
|
2293
|
+
return _ref17.apply(this, arguments);
|
2269
2294
|
};
|
2270
2295
|
}();
|
2271
2296
|
|
@@ -2273,102 +2298,102 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2273
2298
|
|
2274
2299
|
case 30:
|
2275
2300
|
case 'end':
|
2276
|
-
return
|
2301
|
+
return _context12.stop();
|
2277
2302
|
}
|
2278
2303
|
}
|
2279
|
-
},
|
2304
|
+
}, _callee12, _this3);
|
2280
2305
|
}));
|
2281
2306
|
|
2282
2307
|
return function (_x4) {
|
2283
|
-
return
|
2308
|
+
return _ref16.apply(this, arguments);
|
2284
2309
|
};
|
2285
2310
|
}();
|
2286
2311
|
|
2287
|
-
_this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function
|
2312
|
+
_this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15() {
|
2288
2313
|
var handleUserInputs = function () {
|
2289
|
-
var
|
2314
|
+
var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(promises) {
|
2290
2315
|
var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
|
2291
2316
|
|
2292
|
-
return _regenerator2.default.wrap(function
|
2317
|
+
return _regenerator2.default.wrap(function _callee14$(_context14) {
|
2293
2318
|
while (1) {
|
2294
|
-
switch (
|
2319
|
+
switch (_context14.prev = _context14.next) {
|
2295
2320
|
case 0:
|
2296
2321
|
results = [];
|
2297
|
-
|
2322
|
+
_context14.prev = 1;
|
2298
2323
|
_iteratorNormalCompletion2 = true;
|
2299
2324
|
_didIteratorError2 = false;
|
2300
2325
|
_iteratorError2 = undefined;
|
2301
|
-
|
2326
|
+
_context14.prev = 5;
|
2302
2327
|
_iterator2 = (0, _getIterator3.default)(promises);
|
2303
2328
|
|
2304
2329
|
case 7:
|
2305
2330
|
if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
|
2306
|
-
|
2331
|
+
_context14.next = 16;
|
2307
2332
|
break;
|
2308
2333
|
}
|
2309
2334
|
|
2310
2335
|
p = _step2.value;
|
2311
|
-
|
2336
|
+
_context14.next = 11;
|
2312
2337
|
return p;
|
2313
2338
|
|
2314
2339
|
case 11:
|
2315
|
-
_result2 =
|
2340
|
+
_result2 = _context14.sent;
|
2316
2341
|
|
2317
2342
|
results.push(_result2);
|
2318
2343
|
|
2319
2344
|
case 13:
|
2320
2345
|
_iteratorNormalCompletion2 = true;
|
2321
|
-
|
2346
|
+
_context14.next = 7;
|
2322
2347
|
break;
|
2323
2348
|
|
2324
2349
|
case 16:
|
2325
|
-
|
2350
|
+
_context14.next = 22;
|
2326
2351
|
break;
|
2327
2352
|
|
2328
2353
|
case 18:
|
2329
|
-
|
2330
|
-
|
2354
|
+
_context14.prev = 18;
|
2355
|
+
_context14.t0 = _context14['catch'](5);
|
2331
2356
|
_didIteratorError2 = true;
|
2332
|
-
_iteratorError2 =
|
2357
|
+
_iteratorError2 = _context14.t0;
|
2333
2358
|
|
2334
2359
|
case 22:
|
2335
|
-
|
2336
|
-
|
2360
|
+
_context14.prev = 22;
|
2361
|
+
_context14.prev = 23;
|
2337
2362
|
|
2338
2363
|
if (!_iteratorNormalCompletion2 && _iterator2.return) {
|
2339
2364
|
_iterator2.return();
|
2340
2365
|
}
|
2341
2366
|
|
2342
2367
|
case 25:
|
2343
|
-
|
2368
|
+
_context14.prev = 25;
|
2344
2369
|
|
2345
2370
|
if (!_didIteratorError2) {
|
2346
|
-
|
2371
|
+
_context14.next = 28;
|
2347
2372
|
break;
|
2348
2373
|
}
|
2349
2374
|
|
2350
2375
|
throw _iteratorError2;
|
2351
2376
|
|
2352
2377
|
case 28:
|
2353
|
-
return
|
2378
|
+
return _context14.finish(25);
|
2354
2379
|
|
2355
2380
|
case 29:
|
2356
|
-
return
|
2381
|
+
return _context14.finish(22);
|
2357
2382
|
|
2358
2383
|
case 30:
|
2359
|
-
|
2384
|
+
_context14.next = 32;
|
2360
2385
|
return commit(results);
|
2361
2386
|
|
2362
2387
|
case 32:
|
2363
|
-
|
2388
|
+
_context14.next = 37;
|
2364
2389
|
break;
|
2365
2390
|
|
2366
2391
|
case 34:
|
2367
|
-
|
2368
|
-
|
2392
|
+
_context14.prev = 34;
|
2393
|
+
_context14.t1 = _context14['catch'](1);
|
2369
2394
|
|
2370
|
-
if (
|
2371
|
-
_message2.default.error(
|
2395
|
+
if (_context14.t1 != "cancelpwd") {
|
2396
|
+
_message2.default.error(_context14.t1);
|
2372
2397
|
setTimeout(function () {
|
2373
2398
|
that.handleCzk();
|
2374
2399
|
}, 500);
|
@@ -2376,74 +2401,67 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2376
2401
|
|
2377
2402
|
case 37:
|
2378
2403
|
case 'end':
|
2379
|
-
return
|
2404
|
+
return _context14.stop();
|
2380
2405
|
}
|
2381
2406
|
}
|
2382
|
-
},
|
2407
|
+
}, _callee14, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
|
2383
2408
|
}));
|
2384
2409
|
|
2385
2410
|
return function handleUserInputs(_x8) {
|
2386
|
-
return
|
2411
|
+
return _ref21.apply(this, arguments);
|
2387
2412
|
};
|
2388
2413
|
}();
|
2389
2414
|
|
2390
|
-
var that, curmode, promises,
|
2415
|
+
var that, curmode, promises, _enumController$getEn22, PayStyle, commit;
|
2391
2416
|
|
2392
|
-
return _regenerator2.default.wrap(function
|
2417
|
+
return _regenerator2.default.wrap(function _callee15$(_context15) {
|
2393
2418
|
while (1) {
|
2394
|
-
switch (
|
2419
|
+
switch (_context15.prev = _context15.next) {
|
2395
2420
|
case 0:
|
2396
2421
|
that = _this2;
|
2397
2422
|
curmode = _this2.store.paymode.currentMode;
|
2398
2423
|
promises = [];
|
2399
|
-
_ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
|
2400
2424
|
|
2401
|
-
if (
|
2402
|
-
|
2403
|
-
_enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
|
2425
|
+
if (curmode.value > 0) {
|
2426
|
+
_enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
|
2404
2427
|
|
2405
|
-
|
2406
|
-
|
2407
|
-
|
2408
|
-
|
2409
|
-
|
2410
|
-
}
|
2428
|
+
if (curmode.paymentType === PayStyle.hyczk) {
|
2429
|
+
if (curmode.cardTypeEnum === 'BALANCE_CARD') {
|
2430
|
+
!curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
|
2431
|
+
} else {
|
2432
|
+
curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
|
2411
2433
|
}
|
2412
2434
|
}
|
2413
|
-
} else {
|
2414
|
-
if (curmode.member.needPwd && curmode.value > 0) {
|
2415
|
-
promises.push(that.inputPwd(curmode));
|
2416
|
-
}
|
2417
2435
|
}
|
2418
2436
|
|
2419
2437
|
commit = function () {
|
2420
|
-
var
|
2438
|
+
var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(values) {
|
2421
2439
|
var result;
|
2422
|
-
return _regenerator2.default.wrap(function
|
2440
|
+
return _regenerator2.default.wrap(function _callee13$(_context13) {
|
2423
2441
|
while (1) {
|
2424
|
-
switch (
|
2442
|
+
switch (_context13.prev = _context13.next) {
|
2425
2443
|
case 0:
|
2426
2444
|
if (!(values.length > 0)) {
|
2427
|
-
|
2445
|
+
_context13.next = 6;
|
2428
2446
|
break;
|
2429
2447
|
}
|
2430
2448
|
|
2431
|
-
|
2449
|
+
_context13.next = 3;
|
2432
2450
|
return that.store.validePwd(values[0]);
|
2433
2451
|
|
2434
2452
|
case 3:
|
2435
|
-
|
2436
|
-
|
2453
|
+
_context13.t0 = _context13.sent;
|
2454
|
+
_context13.next = 7;
|
2437
2455
|
break;
|
2438
2456
|
|
2439
2457
|
case 6:
|
2440
|
-
|
2458
|
+
_context13.t0 = "";
|
2441
2459
|
|
2442
2460
|
case 7:
|
2443
|
-
result =
|
2461
|
+
result = _context13.t0;
|
2444
2462
|
|
2445
2463
|
if (!(result == "")) {
|
2446
|
-
|
2464
|
+
_context13.next = 13;
|
2447
2465
|
break;
|
2448
2466
|
}
|
2449
2467
|
|
@@ -2451,34 +2469,34 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2451
2469
|
//返回
|
2452
2470
|
that.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
|
2453
2471
|
_promise2.default.resolve();
|
2454
|
-
|
2472
|
+
_context13.next = 15;
|
2455
2473
|
break;
|
2456
2474
|
|
2457
2475
|
case 13:
|
2458
|
-
|
2476
|
+
_context13.next = 15;
|
2459
2477
|
return _promise2.default.reject(result);
|
2460
2478
|
|
2461
2479
|
case 15:
|
2462
2480
|
case 'end':
|
2463
|
-
return
|
2481
|
+
return _context13.stop();
|
2464
2482
|
}
|
2465
2483
|
}
|
2466
|
-
},
|
2484
|
+
}, _callee13, _this3);
|
2467
2485
|
}));
|
2468
2486
|
|
2469
2487
|
return function commit(_x7) {
|
2470
|
-
return
|
2488
|
+
return _ref20.apply(this, arguments);
|
2471
2489
|
};
|
2472
2490
|
}();
|
2473
2491
|
|
2474
2492
|
handleUserInputs(promises);
|
2475
2493
|
|
2476
|
-
case
|
2494
|
+
case 6:
|
2477
2495
|
case 'end':
|
2478
|
-
return
|
2496
|
+
return _context15.stop();
|
2479
2497
|
}
|
2480
2498
|
}
|
2481
|
-
},
|
2499
|
+
}, _callee15, _this3);
|
2482
2500
|
}));
|
2483
2501
|
|
2484
2502
|
_this2.fKeyboardOnOk = function (paymethodeId) {
|
@@ -2518,15 +2536,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2518
2536
|
};
|
2519
2537
|
|
2520
2538
|
_this2.inputPwd = function () {
|
2521
|
-
var
|
2539
|
+
var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(paymode) {
|
2522
2540
|
var that, confirmPwd;
|
2523
|
-
return _regenerator2.default.wrap(function
|
2541
|
+
return _regenerator2.default.wrap(function _callee16$(_context16) {
|
2524
2542
|
while (1) {
|
2525
|
-
switch (
|
2543
|
+
switch (_context16.prev = _context16.next) {
|
2526
2544
|
case 0:
|
2527
2545
|
that = _this2;
|
2528
2546
|
confirmPwd = _this2.state.confirmPwd;
|
2529
|
-
return
|
2547
|
+
return _context16.abrupt('return', new _promise2.default(function (resolve, reject) {
|
2530
2548
|
var modal = (0, _asyncModal2.default)({
|
2531
2549
|
onPressEnter: function onPressEnter() {
|
2532
2550
|
_keyboard2.default.close();
|
@@ -2534,8 +2552,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2534
2552
|
// if (v !== '') {
|
2535
2553
|
modal.destroy();
|
2536
2554
|
|
2537
|
-
var
|
2538
|
-
confirmPwd =
|
2555
|
+
var _ref23 = that.state || {},
|
2556
|
+
confirmPwd = _ref23.confirmPwd;
|
2539
2557
|
|
2540
2558
|
setTimeout(function () {
|
2541
2559
|
paymode.authCode = v;
|
@@ -2626,8 +2644,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2626
2644
|
type: 'primary', size: 'large', onClick: function onClick() {
|
2627
2645
|
var v = (0, _trim3.default)(that['inputAmount']['input']['value']);
|
2628
2646
|
|
2629
|
-
var
|
2630
|
-
confirmPwd =
|
2647
|
+
var _ref24 = that.state || {},
|
2648
|
+
confirmPwd = _ref24.confirmPwd;
|
2631
2649
|
// if (v !== '') {
|
2632
2650
|
|
2633
2651
|
|
@@ -2661,24 +2679,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2661
2679
|
|
2662
2680
|
case 3:
|
2663
2681
|
case 'end':
|
2664
|
-
return
|
2682
|
+
return _context16.stop();
|
2665
2683
|
}
|
2666
2684
|
}
|
2667
|
-
},
|
2685
|
+
}, _callee16, _this3);
|
2668
2686
|
}));
|
2669
2687
|
|
2670
2688
|
return function (_x9) {
|
2671
|
-
return
|
2689
|
+
return _ref22.apply(this, arguments);
|
2672
2690
|
};
|
2673
2691
|
}();
|
2674
2692
|
|
2675
2693
|
_this2.btnDebounced = function () {
|
2676
|
-
var
|
2677
|
-
var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, _enumController$getEn23, PayStyle, _this2$
|
2694
|
+
var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(type, bquick) {
|
2695
|
+
var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, productStore, checkResult, _enumController$getEn23, PayStyle, _this2$store7, paymode, brefund, boriginReturn, newStyle, status;
|
2678
2696
|
|
2679
|
-
return _regenerator2.default.wrap(function
|
2697
|
+
return _regenerator2.default.wrap(function _callee17$(_context17) {
|
2680
2698
|
while (1) {
|
2681
|
-
switch (
|
2699
|
+
switch (_context17.prev = _context17.next) {
|
2682
2700
|
case 0:
|
2683
2701
|
IdbusiType = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.IdbusiType;
|
2684
2702
|
CustomerPhone = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.CustomerPhone;
|
@@ -2687,7 +2705,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2687
2705
|
//预订时,若没录入买家手机号,或配送方式为快递时,弹框买家信息确认框
|
2688
2706
|
|
2689
2707
|
if (!(IdbusiType == 38)) {
|
2690
|
-
|
2708
|
+
_context17.next = 14;
|
2691
2709
|
break;
|
2692
2710
|
}
|
2693
2711
|
|
@@ -2698,11 +2716,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2698
2716
|
});
|
2699
2717
|
|
2700
2718
|
if (!(isEnableSerialNumber && resultObj && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE'))) {
|
2701
|
-
|
2719
|
+
_context17.next = 9;
|
2702
2720
|
break;
|
2703
2721
|
}
|
2704
2722
|
|
2705
|
-
return
|
2723
|
+
return _context17.abrupt('return', _message2.default.error('启用了序列号管理和批号/有效期管理的商品,不支持快递和同城配送'));
|
2706
2724
|
|
2707
2725
|
case 9:
|
2708
2726
|
|
@@ -2711,31 +2729,49 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2711
2729
|
}
|
2712
2730
|
|
2713
2731
|
if (!(!CustomerPhone && !_this2.context.viewModel.data.Member.Mobilephone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
|
2714
|
-
|
2732
|
+
_context17.next = 14;
|
2715
2733
|
break;
|
2716
2734
|
}
|
2717
2735
|
|
2718
2736
|
title = (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && Address ? '收货地址确认' : '收货人';
|
2719
|
-
|
2737
|
+
_context17.next = 14;
|
2720
2738
|
return _this2.props.openBuyerModal(title);
|
2721
2739
|
|
2722
2740
|
case 14:
|
2723
2741
|
|
2742
|
+
// 极速模式错误校验
|
2743
|
+
|
2744
|
+
productStore = _mutantsMicrofx.stores.productStore;
|
2745
|
+
_context17.next = 17;
|
2746
|
+
return productStore.checkShouldSettlement();
|
2747
|
+
|
2748
|
+
case 17:
|
2749
|
+
checkResult = _context17.sent;
|
2750
|
+
|
2751
|
+
if (checkResult) {
|
2752
|
+
_context17.next = 20;
|
2753
|
+
break;
|
2754
|
+
}
|
2755
|
+
|
2756
|
+
return _context17.abrupt('return', false);
|
2757
|
+
|
2758
|
+
case 20:
|
2759
|
+
|
2724
2760
|
_this2.setState({
|
2725
2761
|
bquick: bquick,
|
2726
2762
|
isInputMember: true
|
2727
2763
|
});
|
2728
2764
|
_enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn23.PayStyle;
|
2729
|
-
_this2$
|
2765
|
+
_this2$store7 = _this2.store, paymode = _this2$store7.paymode, brefund = _this2$store7.brefund, boriginReturn = _this2$store7.boriginReturn, newStyle = _this2$store7.newStyle;
|
2730
2766
|
|
2731
2767
|
if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
|
2732
|
-
|
2768
|
+
_context17.next = 25;
|
2733
2769
|
break;
|
2734
2770
|
}
|
2735
2771
|
|
2736
|
-
return
|
2772
|
+
return _context17.abrupt('return', false);
|
2737
2773
|
|
2738
|
-
case
|
2774
|
+
case 25:
|
2739
2775
|
status = false;
|
2740
2776
|
|
2741
2777
|
paymode.thePaymodes.forEach(function (v) {
|
@@ -2748,13 +2784,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2748
2784
|
});
|
2749
2785
|
|
2750
2786
|
if (!_this2.btndebounced) {
|
2751
|
-
|
2787
|
+
_context17.next = 30;
|
2752
2788
|
break;
|
2753
2789
|
}
|
2754
2790
|
|
2755
|
-
return
|
2791
|
+
return _context17.abrupt('return');
|
2756
2792
|
|
2757
|
-
case
|
2793
|
+
case 30:
|
2758
2794
|
_this2.btndebounced = (0, _debounce3.default)(function () {
|
2759
2795
|
if (bquick) {
|
2760
2796
|
_this2.quickSettle(type);
|
@@ -2771,23 +2807,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
2771
2807
|
_this2.btndebounced = null;
|
2772
2808
|
}, 2000);
|
2773
2809
|
|
2774
|
-
case
|
2810
|
+
case 33:
|
2775
2811
|
case 'end':
|
2776
|
-
return
|
2812
|
+
return _context17.stop();
|
2777
2813
|
}
|
2778
2814
|
}
|
2779
|
-
},
|
2815
|
+
}, _callee17, _this3);
|
2780
2816
|
}));
|
2781
2817
|
|
2782
2818
|
return function (_x10, _x11) {
|
2783
|
-
return
|
2819
|
+
return _ref25.apply(this, arguments);
|
2784
2820
|
};
|
2785
2821
|
}();
|
2786
2822
|
|
2787
2823
|
_this2.onCzkChange = function (v) {
|
2788
2824
|
// console.log("czk change:"+new Date().toLocaleTimeString())
|
2789
|
-
var
|
2790
|
-
isNewRetailBCPos =
|
2825
|
+
var _ref26 = _mutantsUtil.platform || {},
|
2826
|
+
isNewRetailBCPos = _ref26.isNewRetailBCPos;
|
2791
2827
|
|
2792
2828
|
if (!isNewRetailBCPos) {
|
2793
2829
|
_this2.store.paymode.currentMode.member.setCardNo(v);
|
@@ -3000,7 +3036,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3000
3036
|
keyboard: false,
|
3001
3037
|
closable: false,
|
3002
3038
|
backdropStyle: {
|
3003
|
-
'
|
3039
|
+
'zIndex': '1004'
|
3004
3040
|
},
|
3005
3041
|
width: 440,
|
3006
3042
|
content: _react2.default.createElement(
|
@@ -3217,9 +3253,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3217
3253
|
};
|
3218
3254
|
|
3219
3255
|
_this2.checkCurrentModeHaveMutex = function (type) {
|
3220
|
-
var _this2$
|
3221
|
-
paymode = _this2$
|
3222
|
-
newStyle = _this2$
|
3256
|
+
var _this2$store8 = _this2.store,
|
3257
|
+
paymode = _this2$store8.paymode,
|
3258
|
+
newStyle = _this2$store8.newStyle;
|
3223
3259
|
|
3224
3260
|
var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
|
3225
3261
|
PayStyle = _enumController$getEn28.PayStyle;
|
@@ -3395,12 +3431,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3395
3431
|
|
3396
3432
|
_this2.hasElectron = hasElectron;
|
3397
3433
|
|
3398
|
-
var
|
3399
|
-
MemberMeStorageCardInputByKeyBoard =
|
3400
|
-
ICCardServer =
|
3401
|
-
ICCardPassword =
|
3402
|
-
PreSellOrBook =
|
3403
|
-
PercentageWhenBook =
|
3434
|
+
var _ref27 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
|
3435
|
+
MemberMeStorageCardInputByKeyBoard = _ref27.MemberMeStorageCardInputByKeyBoard,
|
3436
|
+
ICCardServer = _ref27.ICCardServer,
|
3437
|
+
ICCardPassword = _ref27.ICCardPassword,
|
3438
|
+
PreSellOrBook = _ref27.PreSellOrBook,
|
3439
|
+
PercentageWhenBook = _ref27.PercentageWhenBook;
|
3404
3440
|
|
3405
3441
|
_this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入,'0'为不禁用 '1'为禁用
|
3406
3442
|
_this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
|
@@ -3409,9 +3445,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3409
3445
|
_this2.percentageWhenBook = PercentageWhenBook;
|
3410
3446
|
//移动端环境下,没有读取IC卡的方式。
|
3411
3447
|
|
3412
|
-
var
|
3413
|
-
isHorizontalPad =
|
3414
|
-
isHorizontalSunMi =
|
3448
|
+
var _ref28 = _mutantsUtil.platform || {},
|
3449
|
+
isHorizontalPad = _ref28.isHorizontalPad,
|
3450
|
+
isHorizontalSunMi = _ref28.isHorizontalSunMi;
|
3415
3451
|
|
3416
3452
|
_this2.isHorizontalPad = !!isHorizontalPad;
|
3417
3453
|
_this2.isHorizontalSunMi = !!isHorizontalSunMi;
|
@@ -3420,6 +3456,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3420
3456
|
_this2.setTimer = null;
|
3421
3457
|
_this2.keypressStime = null;
|
3422
3458
|
_this2.store = !(props.type == 1) ? _mutantsMicrofx.stores.settlementVoucherStore : _mutantsMicrofx.stores.settlementMemberStore;
|
3459
|
+
_this2.voucherRunningFast = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('vocherRunningFast') == '1';
|
3423
3460
|
return _this2;
|
3424
3461
|
}
|
3425
3462
|
|
@@ -3559,6 +3596,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3559
3596
|
* @param {*} symbol 从当前currenIndex开始 还是从当前currenIndex截止
|
3560
3597
|
*/
|
3561
3598
|
|
3599
|
+
// 极速模式下是否开启了支付有礼功能
|
3600
|
+
|
3562
3601
|
// 处理客显显示功能
|
3563
3602
|
|
3564
3603
|
|
@@ -3567,8 +3606,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3567
3606
|
}, {
|
3568
3607
|
key: 'isNoProductTip',
|
3569
3608
|
value: function isNoProductTip(nonProductMap) {
|
3570
|
-
var
|
3571
|
-
RetailDetails =
|
3609
|
+
var _ref29 = this.context.viewModel.data || {},
|
3610
|
+
RetailDetails = _ref29.RetailDetails;
|
3572
3611
|
|
3573
3612
|
var temphtml = [];
|
3574
3613
|
if ((0, _keys2.default)(nonProductMap).length > 0) {
|
@@ -3839,11 +3878,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
3839
3878
|
quantity4 = 0;
|
3840
3879
|
var sumQuantity = 0; //数量总和的值,包括称重的。
|
3841
3880
|
|
3842
|
-
var
|
3843
|
-
|
3844
|
-
buyQuantity =
|
3845
|
-
|
3846
|
-
returnQuantity =
|
3881
|
+
var _ref30 = quantityDetail || {},
|
3882
|
+
_ref30$buyQuantity = _ref30.buyQuantity,
|
3883
|
+
buyQuantity = _ref30$buyQuantity === undefined ? 0 : _ref30$buyQuantity,
|
3884
|
+
_ref30$returnQuantity = _ref30.returnQuantity,
|
3885
|
+
returnQuantity = _ref30$returnQuantity === undefined ? 0 : _ref30$returnQuantity;
|
3847
3886
|
|
3848
3887
|
var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
|
3849
3888
|
quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
|
@@ -4035,7 +4074,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4035
4074
|
onClose: this.handleCancel,
|
4036
4075
|
visible: this.state.visible,
|
4037
4076
|
destroyOnClose: true,
|
4038
|
-
className: 'settlement-wraper',
|
4077
|
+
className: 'settlement-wraper ' + (this.voucherRunningFast ? 'no-zoom' : null),
|
4039
4078
|
style: { 'zIndex': 1006 }
|
4040
4079
|
},
|
4041
4080
|
_react2.default.createElement(
|
@@ -4306,7 +4345,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4306
4345
|
onClose: this.handleCancel,
|
4307
4346
|
visible: this.state.visible,
|
4308
4347
|
destroyOnClose: true,
|
4309
|
-
className: 'settlement-wraper',
|
4348
|
+
className: 'settlement-wraper ' + (this.voucherRunningFast ? 'no-zoom' : ''),
|
4310
4349
|
style: { 'zIndex': 1006 }
|
4311
4350
|
},
|
4312
4351
|
_react2.default.createElement(
|
@@ -4616,7 +4655,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4616
4655
|
_react2.default.createElement(
|
4617
4656
|
_modal2.default,
|
4618
4657
|
{
|
4619
|
-
wrapClassName: 'czk ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
4658
|
+
wrapClassName: 'czk ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
4620
4659
|
width: '400px',
|
4621
4660
|
visible: this.state.czkVisible,
|
4622
4661
|
maskClosable: false,
|
@@ -4728,22 +4767,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4728
4767
|
return _this8.czkInput = input;
|
4729
4768
|
},
|
4730
4769
|
onKeyDown: function () {
|
4731
|
-
var
|
4770
|
+
var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee18(e) {
|
4732
4771
|
var time, _paymode;
|
4733
4772
|
|
4734
|
-
return _regenerator2.default.wrap(function
|
4773
|
+
return _regenerator2.default.wrap(function _callee18$(_context18) {
|
4735
4774
|
while (1) {
|
4736
|
-
switch (
|
4775
|
+
switch (_context18.prev = _context18.next) {
|
4737
4776
|
case 0:
|
4738
4777
|
if (!(e.keyCode == 13)) {
|
4739
|
-
|
4778
|
+
_context18.next = 14;
|
4740
4779
|
break;
|
4741
4780
|
}
|
4742
4781
|
|
4743
4782
|
time = Date.parse(new Date());
|
4744
4783
|
|
4745
4784
|
if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
|
4746
|
-
|
4785
|
+
_context18.next = 7;
|
4747
4786
|
break;
|
4748
4787
|
}
|
4749
4788
|
|
@@ -4752,11 +4791,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4752
4791
|
_this8.setState({
|
4753
4792
|
czkValue: null
|
4754
4793
|
});
|
4755
|
-
return
|
4794
|
+
return _context18.abrupt('return');
|
4756
4795
|
|
4757
4796
|
case 7:
|
4758
4797
|
_this8.keypressStime = null;
|
4759
|
-
|
4798
|
+
_context18.next = 10;
|
4760
4799
|
return _this8.loadCzk(e.target.value);
|
4761
4800
|
|
4762
4801
|
case 10:
|
@@ -4767,7 +4806,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4767
4806
|
czkvalue: null
|
4768
4807
|
});
|
4769
4808
|
}
|
4770
|
-
|
4809
|
+
_context18.next = 15;
|
4771
4810
|
break;
|
4772
4811
|
|
4773
4812
|
case 14:
|
@@ -4777,14 +4816,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4777
4816
|
|
4778
4817
|
case 15:
|
4779
4818
|
case 'end':
|
4780
|
-
return
|
4819
|
+
return _context18.stop();
|
4781
4820
|
}
|
4782
4821
|
}
|
4783
|
-
},
|
4822
|
+
}, _callee18, _this8);
|
4784
4823
|
}));
|
4785
4824
|
|
4786
4825
|
return function (_x13) {
|
4787
|
-
return
|
4826
|
+
return _ref31.apply(this, arguments);
|
4788
4827
|
};
|
4789
4828
|
}(),
|
4790
4829
|
onFocus: function onFocus(e) {
|
@@ -4841,8 +4880,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4841
4880
|
_this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
|
4842
4881
|
},
|
4843
4882
|
defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)),
|
4844
|
-
ref: function ref(
|
4845
|
-
return _this8["inputCzkAmount"] =
|
4883
|
+
ref: function ref(_ref32) {
|
4884
|
+
return _this8["inputCzkAmount"] = _ref32;
|
4846
4885
|
},
|
4847
4886
|
onFocus: function onFocus(e) {
|
4848
4887
|
_this8.inputkey = "inputCzkAmount";
|
@@ -4894,7 +4933,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4894
4933
|
_react2.default.createElement(
|
4895
4934
|
_modal2.default,
|
4896
4935
|
{
|
4897
|
-
wrapClassName: _index.hotKey.hotKeyBindClass('5', 'moreCzkModal') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
4936
|
+
wrapClassName: _index.hotKey.hotKeyBindClass('5', 'moreCzkModal') + ' ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
4898
4937
|
width: '400px',
|
4899
4938
|
visible: this.state.moreCzkVisible,
|
4900
4939
|
maskClosable: false,
|
@@ -4936,7 +4975,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
4936
4975
|
_react2.default.createElement(
|
4937
4976
|
_modal2.default,
|
4938
4977
|
(0, _defineProperty3.default)({
|
4939
|
-
wrapClassName: 'djq ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' passwordContainer',
|
4978
|
+
wrapClassName: 'djq ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' passwordContainer',
|
4940
4979
|
width: '400px',
|
4941
4980
|
visible: this.state.showSetPwdModal,
|
4942
4981
|
backdropClosable: false,
|
@@ -5033,7 +5072,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
5033
5072
|
_react2.default.createElement(
|
5034
5073
|
_modal2.default,
|
5035
5074
|
{
|
5036
|
-
wrapClassName: 'djq ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
5075
|
+
wrapClassName: 'djq ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
5037
5076
|
width: '810px',
|
5038
5077
|
visible: this.state.djqVisible,
|
5039
5078
|
maskClosable: false,
|
@@ -5357,7 +5396,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
5357
5396
|
_react2.default.createElement(
|
5358
5397
|
_modal2.default,
|
5359
5398
|
{
|
5360
|
-
wrapClassName: 'czk ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
5399
|
+
wrapClassName: 'czk ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
|
5361
5400
|
width: '420px',
|
5362
5401
|
visible: this.state.jfdxVisible,
|
5363
5402
|
maskClosable: false,
|
@@ -5512,8 +5551,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
5512
5551
|
_this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
|
5513
5552
|
},
|
5514
5553
|
defaultValue: currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
|
5515
|
-
ref: function ref(
|
5516
|
-
return _this8["inputJfdxAmount"] =
|
5554
|
+
ref: function ref(_ref33) {
|
5555
|
+
return _this8["inputJfdxAmount"] = _ref33;
|
5517
5556
|
},
|
5518
5557
|
onFocus: function onFocus(e) {
|
5519
5558
|
_this8.inputkey = "inputJfdxAmount";
|