tplus-components-touch 3.32.1 → 3.32.5
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 +1 -1
- package/dist/components/billSearch/index.js.map +1 -1
- package/dist/components/cloudPrint/printDispatch.js +15 -18
- package/dist/components/cloudPrint/printDispatch.js.map +1 -1
- package/dist/components/deliverySearch/index.js +1 -1
- package/dist/components/deliverySearch/index.js.map +1 -1
- package/dist/components/inventorySearch/tab.js +1 -1
- package/dist/components/inventorySearch/tab.js.map +1 -1
- package/dist/components/loading/loadingContent.js +1 -1
- package/dist/components/loading/loadingContent.js.map +1 -1
- package/dist/components/loading/style.less +7 -7
- package/dist/components/settlement/settlement.js +10 -17
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlementStore.js +8 -9
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/touchTable/index.js +1 -1
- package/dist/components/touchTable/index.js.map +1 -1
- package/package.json +35 -35
|
@@ -324,7 +324,7 @@ var SettlementStore = (_class = function () {
|
|
|
324
324
|
var IsEnable = couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
|
|
325
325
|
|
|
326
326
|
var _ref2 = _mutantsUtil.platform || {},
|
|
327
|
-
|
|
327
|
+
isNewRetailBCPos = _ref2.isNewRetailBCPos;
|
|
328
328
|
|
|
329
329
|
_this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" ? nominalAmount : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
|
|
330
330
|
}
|
|
@@ -1203,13 +1203,13 @@ var SettlementStore = (_class = function () {
|
|
|
1203
1203
|
var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
|
|
1204
1204
|
var _this11 = this;
|
|
1205
1205
|
|
|
1206
|
-
var _enumController$getEn15, PayStyle, IPMSG, RetailTypeEnum, dtoParams, payList, amount, tradeType, ret, _ref11, type, data, msg;
|
|
1206
|
+
var _enumController$getEn15, PayStyle, TradeType, IPMSG, RetailTypeEnum, dtoParams, payList, amount, tradeType, ret, _ref11, type, data, msg;
|
|
1207
1207
|
|
|
1208
1208
|
return _regenerator2.default.wrap(function _callee4$(_context4) {
|
|
1209
1209
|
while (1) {
|
|
1210
1210
|
switch (_context4.prev = _context4.next) {
|
|
1211
1211
|
case 0:
|
|
1212
|
-
_enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle;
|
|
1212
|
+
_enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle, TradeType = _enumController$getEn15.TradeType;
|
|
1213
1213
|
|
|
1214
1214
|
(0, _mobx.runInAction)(function () {
|
|
1215
1215
|
_this11.dto.RetailPaymentDetails = [];
|
|
@@ -1293,7 +1293,7 @@ var SettlementStore = (_class = function () {
|
|
|
1293
1293
|
});
|
|
1294
1294
|
}
|
|
1295
1295
|
});
|
|
1296
|
-
console.log('
|
|
1296
|
+
console.log('\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
|
|
1297
1297
|
// cc结算调用
|
|
1298
1298
|
IPMSG = {};
|
|
1299
1299
|
|
|
@@ -1472,7 +1472,7 @@ var SettlementStore = (_class = function () {
|
|
|
1472
1472
|
var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
|
|
1473
1473
|
var _this12 = this;
|
|
1474
1474
|
|
|
1475
|
-
var dto, pay, _enumController$getEn16,
|
|
1475
|
+
var dto, pay, _enumController$getEn16, TradeType;
|
|
1476
1476
|
|
|
1477
1477
|
return _regenerator2.default.wrap(function _callee7$(_context7) {
|
|
1478
1478
|
while (1) {
|
|
@@ -1487,8 +1487,7 @@ var SettlementStore = (_class = function () {
|
|
|
1487
1487
|
setTimeout(function () {
|
|
1488
1488
|
_message2.default.warn("支付出现异常，将发起刷卡退款。", { duration: 4.5 });
|
|
1489
1489
|
}, 1000);
|
|
1490
|
-
_enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
|
|
1491
|
-
tradeType = _TradeType.REFUND;
|
|
1490
|
+
_enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn16.TradeType;
|
|
1492
1491
|
|
|
1493
1492
|
setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
|
|
1494
1493
|
var ret, _ref18, msg;
|
|
@@ -1498,7 +1497,7 @@ var SettlementStore = (_class = function () {
|
|
|
1498
1497
|
switch (_context6.prev = _context6.next) {
|
|
1499
1498
|
case 0:
|
|
1500
1499
|
_context6.next = 2;
|
|
1501
|
-
return _this12.thirdPay(
|
|
1500
|
+
return _this12.thirdPay(TradeType.REFUND, dto);
|
|
1502
1501
|
|
|
1503
1502
|
case 2:
|
|
1504
1503
|
ret = _context6.sent;
|
|
@@ -2433,7 +2432,7 @@ var Member = exports.Member = (_class5 = function () {
|
|
|
2433
2432
|
});
|
|
2434
2433
|
|
|
2435
2434
|
var _ref29 = _mutantsUtil.platform || {},
|
|
2436
|
-
|
|
2435
|
+
isNewRetailBCPos = _ref29.isNewRetailBCPos;
|
|
2437
2436
|
|
|
2438
2437
|
(0, _mobx.runInAction)(function () {
|
|
2439
2438
|
_this22.cardNo = m.CardCode;
|