tplus-components-touch 3.26.9 → 3.26.10
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.
|
@@ -556,7 +556,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
556
556
|
|
|
557
557
|
_this2.showCzkModal = function () {
|
|
558
558
|
var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id, append, params) {
|
|
559
|
-
var _enumController$getEn2, PayStyle, currentMode, maxamount, brefund, value11
|
|
559
|
+
var _enumController$getEn2, PayStyle, currentMode, maxamount, brefund, value11;
|
|
560
560
|
|
|
561
561
|
return _regenerator2.default.wrap(function _callee$(_context) {
|
|
562
562
|
while (1) {
|
|
@@ -565,51 +565,38 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
565
565
|
_enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
|
|
566
566
|
|
|
567
567
|
_this2.store.setCurrentMode(id, PayStyle.hyczk, append);
|
|
568
|
+
_context.next = 4;
|
|
569
|
+
return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
|
|
570
|
+
|
|
571
|
+
case 4:
|
|
568
572
|
_this2._val = _this2.store.paymode.currentMode.value;
|
|
569
573
|
currentMode = _this2.store.paymode.currentMode;
|
|
570
574
|
maxamount = Math.min(currentMode.maxamount, currentMode.balance);
|
|
571
575
|
|
|
572
|
-
if (
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
}
|
|
576
|
-
|
|
577
|
-
_message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
|
|
578
|
-
duration: 4
|
|
579
|
-
});
|
|
580
|
-
_context.next = 18;
|
|
581
|
-
break;
|
|
582
|
-
|
|
583
|
-
case 9:
|
|
584
|
-
_this2.setState({
|
|
585
|
-
czkVisible: true
|
|
586
|
-
});
|
|
587
|
-
brefund = _this2.store.brefund;
|
|
588
|
-
value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance));
|
|
589
|
-
|
|
590
|
-
_this2.setState({
|
|
591
|
-
storageValue: value11
|
|
592
|
-
});
|
|
593
|
-
if (currentMode.storageCardNo) {
|
|
594
|
-
_this2.setState({
|
|
595
|
-
czkValue: currentMode.storageCardNo
|
|
576
|
+
if (_this2.store.bquick && currentMode.storageCardNo && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
|
|
577
|
+
_message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
|
|
578
|
+
duration: 4
|
|
596
579
|
});
|
|
597
580
|
} else {
|
|
598
581
|
_this2.setState({
|
|
599
|
-
|
|
582
|
+
czkVisible: true
|
|
600
583
|
});
|
|
601
|
-
|
|
602
|
-
|
|
584
|
+
brefund = _this2.store.brefund;
|
|
585
|
+
value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance));
|
|
603
586
|
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
587
|
+
_this2.setState({
|
|
588
|
+
storageValue: value11
|
|
589
|
+
});
|
|
590
|
+
if (currentMode.storageCardNo) {
|
|
591
|
+
_this2.setState({
|
|
592
|
+
czkValue: currentMode.storageCardNo
|
|
593
|
+
});
|
|
594
|
+
} else {
|
|
595
|
+
_this2.setState({
|
|
596
|
+
czkValue: null
|
|
597
|
+
});
|
|
598
|
+
}
|
|
607
599
|
}
|
|
608
|
-
|
|
609
|
-
_context.next = 18;
|
|
610
|
-
return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
|
|
611
|
-
|
|
612
|
-
case 18:
|
|
613
600
|
setTimeout(function () {
|
|
614
601
|
if (!currentMode.storageCardNo) {
|
|
615
602
|
_this2.czkInput && _this2.czkInput.input.focus();
|
|
@@ -622,7 +609,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
622
609
|
}, 500);
|
|
623
610
|
_this2.connectRfCard();
|
|
624
611
|
|
|
625
|
-
case
|
|
612
|
+
case 10:
|
|
626
613
|
case 'end':
|
|
627
614
|
return _context.stop();
|
|
628
615
|
}
|
|
@@ -714,18 +701,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
714
701
|
// 判断是否有密码
|
|
715
702
|
_this2$store$paymode$ = _this2.store.paymode.currentMode, walletEnabled = _this2$store$paymode$.walletEnabled, cardTypeEnum = _this2$store$paymode$.cardTypeEnum;
|
|
716
703
|
|
|
717
|
-
_this2.
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
// })
|
|
726
|
-
// } else {
|
|
727
|
-
// // this.handleCzkData();
|
|
728
|
-
// }
|
|
704
|
+
if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled && !_this2.store.dto.FreePaymentPasswordStore) {
|
|
705
|
+
_this2.setState({
|
|
706
|
+
showSetPwdModal: true,
|
|
707
|
+
btnDissabled: true
|
|
708
|
+
});
|
|
709
|
+
} else {
|
|
710
|
+
_this2.handleCzkData();
|
|
711
|
+
}
|
|
729
712
|
|
|
730
713
|
case 2:
|
|
731
714
|
case 'end':
|
|
@@ -2297,7 +2280,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
|
|
|
2297
2280
|
_enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
|
|
2298
2281
|
|
|
2299
2282
|
if (curmode.paymentType === PayStyle.hyczk) {
|
|
2300
|
-
if (curmode.cardTypeEnum === 'BALANCE_CARD' || curmode.isNeedPassword) {
|
|
2283
|
+
if (curmode.cardTypeEnum === 'BALANCE_CARD' && !_this2.store.dto.FreePaymentPasswordStore || curmode.isNeedPassword) {
|
|
2301
2284
|
promises.push(that.inputPwd(curmode));
|
|
2302
2285
|
}
|
|
2303
2286
|
}
|