tplus-components-touch 3.20.2 → 3.20.3
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.
|
@@ -431,6 +431,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
431
431
|
//有赠品的情况，不在考虑是否促销
|
|
432
432
|
if (item.IsPresent) {
|
|
433
433
|
item.badge = { text: '赠', position: 'leftTop', className: '' };
|
|
434
|
+
} else if (item.IsGWPBuyGift) {
|
|
435
|
+
item.badge = { text: '换', position: 'leftTop', className: '' };
|
|
434
436
|
} else if (item.PromotionDetails && item.PromotionDetails.length > 0) {
|
|
435
437
|
item.badge = { text: '促', position: 'leftTop', className: '' };
|
|
436
438
|
} else {
|
|
@@ -616,7 +618,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
616
618
|
|
|
617
619
|
_this2.handleCzkOk = function () {
|
|
618
620
|
var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(e) {
|
|
619
|
-
var _enumController$getEn3, PayStyle;
|
|
621
|
+
var sMember, _enumController$getEn3, PayStyle;
|
|
620
622
|
|
|
621
623
|
return _regenerator2.default.wrap(function _callee$(_context) {
|
|
622
624
|
while (1) {
|
|
@@ -630,46 +632,57 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
630
632
|
// });
|
|
631
633
|
// return;
|
|
632
634
|
// }
|
|
635
|
+
sMember = _this2.store.member;
|
|
636
|
+
|
|
637
|
+
if (sMember.StorageCardEnable) {
|
|
638
|
+
_context.next = 4;
|
|
639
|
+
break;
|
|
640
|
+
}
|
|
641
|
+
|
|
642
|
+
_message2.default.warn("该储值卡已停用");
|
|
643
|
+
return _context.abrupt('return');
|
|
644
|
+
|
|
645
|
+
case 4:
|
|
633
646
|
_enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
|
|
634
647
|
|
|
635
648
|
if (_this2.store.paymode.currentMode.member.id) {
|
|
636
|
-
_context.next =
|
|
649
|
+
_context.next = 8;
|
|
637
650
|
break;
|
|
638
651
|
}
|
|
639
652
|
|
|
640
|
-
_context.next =
|
|
653
|
+
_context.next = 8;
|
|
641
654
|
return _this2.store.loadCzk(_this2.czkInput.input.value);
|
|
642
655
|
|
|
643
|
-
case
|
|
656
|
+
case 8:
|
|
644
657
|
if (_this2.store.paymode.currentMode.member.id) {
|
|
645
|
-
_context.next =
|
|
658
|
+
_context.next = 11;
|
|
646
659
|
break;
|
|
647
660
|
}
|
|
648
661
|
|
|
649
662
|
_message2.default.error("请录入储值卡！");
|
|
650
663
|
return _context.abrupt('return');
|
|
651
664
|
|
|
652
|
-
case
|
|
665
|
+
case 11:
|
|
653
666
|
if (!(0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
|
|
654
667
|
return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.member.id == _this2.store.paymode.currentMode.member.id;
|
|
655
668
|
})) {
|
|
656
|
-
_context.next =
|
|
669
|
+
_context.next = 14;
|
|
657
670
|
break;
|
|
658
671
|
}
|
|
659
672
|
|
|
660
673
|
_message2.default.error("该储值卡已使用。");
|
|
661
674
|
return _context.abrupt('return');
|
|
662
675
|
|
|
663
|
-
case
|
|
676
|
+
case 14:
|
|
664
677
|
if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
|
|
665
|
-
_context.next =
|
|
678
|
+
_context.next = 17;
|
|
666
679
|
break;
|
|
667
680
|
}
|
|
668
681
|
|
|
669
682
|
_message2.default.error("实收金额应等于应收金额。");
|
|
670
683
|
return _context.abrupt('return');
|
|
671
684
|
|
|
672
|
-
case
|
|
685
|
+
case 17:
|
|
673
686
|
|
|
674
687
|
_this2.setState({
|
|
675
688
|
czkVisible: false
|
|
@@ -678,7 +691,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
678
691
|
_this2.store.paymode.calcMemberBalance();
|
|
679
692
|
_this2.handleCzk();
|
|
680
693
|
|
|
681
|
-
case
|
|
694
|
+
case 21:
|
|
682
695
|
case 'end':
|
|
683
696
|
return _context.stop();
|
|
684
697
|
}
|
|
@@ -4684,6 +4697,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
4684
4697
|
}, _this8.keyboardOnOk, _this8.keyboardOnClose)();
|
|
4685
4698
|
},
|
|
4686
4699
|
onBlur: function onBlur(e) {
|
|
4700
|
+
var sMember = _this8.store.member;
|
|
4701
|
+
if (!sMember.StorageCardEnable) {
|
|
4702
|
+
_message2.default.warn("该储值卡已停用");
|
|
4703
|
+
return;
|
|
4704
|
+
}
|
|
4687
4705
|
_keyboard2.default.close();
|
|
4688
4706
|
_this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.member.balance));
|
|
4689
4707
|
}
|