tplus-member 3.26.20 → 3.26.24
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/api.js +5 -5
- package/dist/api.js.map +1 -1
- package/dist/controllers/FeedbackController.js.map +1 -1
- package/dist/controllers/MemberOrderController.js +12 -12
- package/dist/controllers/MemberOrderController.js.map +1 -1
- package/dist/controllers/OpenCardController.js +7 -7
- package/dist/controllers/OpenCardController.js.map +1 -1
- package/dist/controllers/defaultConfig.js.map +1 -1
- package/dist/dataProvider/member.js +7 -7
- package/dist/dataProvider/member.js.map +1 -1
- package/dist/dataProvider/openCard.js.map +1 -1
- package/dist/domain/member/AuthProcess.js.map +1 -1
- package/dist/domain/member/CardCodeChangedProcessor.js +2 -2
- package/dist/domain/member/CardCodeChangedProcessor.js.map +1 -1
- package/dist/domain/member/CheckCardCodeAndCodeProcessor.js +2 -2
- package/dist/domain/member/CheckCardCodeAndCodeProcessor.js.map +1 -1
- package/dist/domain/member/CheckMobilephoneFormatProcessor.js +2 -2
- package/dist/domain/member/CheckMobilephoneFormatProcessor.js.map +1 -1
- package/dist/domain/member/CheckPresentAmountProcessor.js +2 -2
- package/dist/domain/member/CheckPresentAmountProcessor.js.map +1 -1
- package/dist/domain/member/EffectiveDateChangedProcessor.js +2 -2
- package/dist/domain/member/EffectiveDateChangedProcessor.js.map +1 -1
- package/dist/domain/member/GetThisPresentAmountProcessor.js +2 -2
- package/dist/domain/member/GetThisPresentAmountProcessor.js.map +1 -1
- package/dist/domain/member/InitDataProcessor.js +123 -123
- package/dist/domain/member/InitDataProcessor.js.map +1 -1
- package/dist/domain/member/IsMemberEffectiveProcessor.js +2 -2
- package/dist/domain/member/IsMemberEffectiveProcessor.js.map +1 -1
- package/dist/domain/member/IsMemberEnableProcessor.js +2 -2
- package/dist/domain/member/IsMemberEnableProcessor.js.map +1 -1
- package/dist/domain/member/IsMemberExpirationProcessor.js +2 -2
- package/dist/domain/member/IsMemberExpirationProcessor.js.map +1 -1
- package/dist/domain/member/IsMemberPasswordSameProcessor.js +2 -2
- package/dist/domain/member/IsMemberPasswordSameProcessor.js.map +1 -1
- package/dist/domain/member/IsMemberStorageForStoreProcessor.js +3 -3
- package/dist/domain/member/IsMemberStorageForStoreProcessor.js.map +1 -1
- package/dist/domain/member/MemberTypeChangedProcessor.js +4 -4
- package/dist/domain/member/MemberTypeChangedProcessor.js.map +1 -1
- package/dist/domain/member/MobilephoneChangedProcessor.js +4 -4
- package/dist/domain/member/MobilephoneChangedProcessor.js.map +1 -1
- package/dist/domain/member/PersonProcesser.js.map +1 -1
- package/dist/domain/member/PriuserdefChangedProcessor.js +2 -2
- package/dist/domain/member/PriuserdefChangedProcessor.js.map +1 -1
- package/dist/domain/operationLog/AddLogProcessor.js +6 -6
- package/dist/domain/operationLog/AddLogProcessor.js.map +1 -1
- package/dist/domain/operationLog/OperationConfig.js.map +1 -1
- package/dist/domain/operationLog/OperationLog.js.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/member/MemberCardList.js +2 -2
- package/dist/member/MemberCardList.js.map +1 -1
- package/dist/member/MemberPhoto.js.map +1 -1
- package/dist/member/MemberShow.js.map +1 -1
- package/dist/member/ShopMember.js.map +1 -1
- package/dist/member/ShopMember.less +600 -600
- package/dist/member/ShopMemberStorage.js +20 -13
- package/dist/member/ShopMemberStorage.js.map +1 -1
- package/dist/member/api.js +2 -2
- package/dist/member/api.js.map +1 -1
- package/dist/member/color.less +31 -31
- package/dist/member/index.js +5 -5
- package/dist/member/index.js.map +1 -1
- package/dist/member/index.less +570 -570
- package/dist/member/memberMenu/bindCard/index.js.map +1 -1
- package/dist/member/memberMenu/bindCard/style.less +7 -7
- package/dist/member/memberMenu/changeMemberCard/index.js.map +1 -1
- package/dist/member/memberMenu/changeMemberCard/style.less +42 -42
- package/dist/member/memberMenu/index.js.map +1 -1
- package/dist/member/memberMenu/modifyPass/index.js.map +1 -1
- package/dist/member/memberMenu/modifyPass/store.js.map +1 -1
- package/dist/member/memberMenu/modifyPass/style.less +96 -96
- package/dist/member/memberMenu/style.less +126 -126
- package/dist/member/memberMenuStorage/bindCard/index.js.map +1 -1
- package/dist/member/memberMenuStorage/bindCard/style.less +7 -7
- package/dist/member/memberMenuStorage/changeMemberCard/index.js.map +1 -1
- package/dist/member/memberMenuStorage/changeMemberCard/style.less +42 -42
- package/dist/member/memberMenuStorage/index.js +121 -82
- package/dist/member/memberMenuStorage/index.js.map +1 -1
- package/dist/member/memberMenuStorage/modifyPass/index.js.map +1 -1
- package/dist/member/memberMenuStorage/modifyPass/store.js.map +1 -1
- package/dist/member/memberMenuStorage/modifyPass/style.less +96 -96
- package/dist/member/memberMenuStorage/style.less +128 -128
- package/dist/member/memberTab/MemberCardInfo.js.map +1 -1
- package/dist/member/memberTab/MemberManager.js.map +1 -1
- package/dist/member/memberTab/MemberStorage.js.map +1 -1
- package/dist/member/memberTab/index.js.map +1 -1
- package/dist/member/memberTab.js.map +1 -1
- package/dist/socket.js +13 -13
- package/dist/socket.js.map +1 -1
- package/dist/stores/MemberStore.js.map +1 -1
- package/dist/stores/index.js.map +1 -1
- package/dist/utils.js.map +1 -1
- package/dist/viewController/MemberOrderViewController.js.map +1 -1
- package/dist/viewDoMain/CheckMemberProcessorBlock.js +2 -2
- package/dist/viewDoMain/CheckMemberProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/CheckMemberStorageProcessorBlock.js +2 -2
- package/dist/viewDoMain/CheckMemberStorageProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/CheckSelectMemberProcessorBlock.js +2 -2
- package/dist/viewDoMain/CheckSelectMemberProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/CheckUpdatePasswordProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/MemberDataChangedProcessorBlock.js +2 -2
- package/dist/viewDoMain/MemberDataChangedProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/MemberDataPreSaveProcessorBlock.js +2 -2
- package/dist/viewDoMain/MemberDataPreSaveProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/StorageAmountChangedProcessorBlock.js +2 -2
- package/dist/viewDoMain/StorageAmountChangedProcessorBlock.js.map +1 -1
- package/dist/viewModels/memberVoucher.js +3 -3
- package/dist/viewModels/memberVoucher.js.map +1 -1
- package/dist/views/MemberOrderView.js +5 -5
- package/dist/views/MemberOrderView.js.map +1 -1
- package/dist/views/MemberStore.less +143 -143
- package/dist/views/MemberStoreNew.less +230 -230
- package/dist/views/MemberStoreNewView.js.map +1 -1
- package/dist/views/MemberStoreView.js.map +1 -1
- package/dist/views/MemberStoreViewContainer.js.map +1 -1
- package/dist/views/PresentDetail.less +118 -118
- package/dist/views/PresetDetailView.js.map +1 -1
- package/dist/views/memberOrder.less +54 -54
- package/locales/zh/tplus-portsetting.json +1 -1
- package/locales/zh-CN/tplus-portsetting.json +1 -1
- package/package.json +29 -29
@@ -487,10 +487,9 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
487
487
|
var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
|
488
488
|
var cardInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
489
489
|
var storageAmount = arguments[1];
|
490
|
-
var
|
491
|
-
var isCash = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
490
|
+
var lastesStorageResult = arguments[2];
|
492
491
|
|
493
|
-
var store, _store$data, data, MeStorageCardId, StorageCardNo, ID, _cardInfo$PresentAmou, PresentAmount, _props9, getCardList, _props9$cardList, cardList, _ref10,
|
492
|
+
var store, _store$data, data, MeStorageCardId, StorageCardNo, ID, _cardInfo$PresentAmou, PresentAmount, _props9, getCardList, _props9$cardList, cardList, _ref10, _ref10$isCanRefund, isCanRefund, _ref10$storageInfos, storageInfos, params, _ref11, finAccountId, paymentTypeId, ret, _ref12, isSuccess, ex;
|
494
493
|
|
495
494
|
return _regenerator2.default.wrap(function _callee4$(_context4) {
|
496
495
|
while (1) {
|
@@ -508,7 +507,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
508
507
|
_store$data = store.data, data = _store$data === undefined ? {} : _store$data;
|
509
508
|
MeStorageCardId = cardInfo.MeStorageCardId, StorageCardNo = cardInfo.StorageCardNo, ID = cardInfo.ID, _cardInfo$PresentAmou = cardInfo.PresentAmount, PresentAmount = _cardInfo$PresentAmou === undefined ? 0 : _cardInfo$PresentAmou;
|
510
509
|
_props9 = this.props, getCardList = _props9.getCardList, _props9$cardList = _props9.cardList, cardList = _props9$cardList === undefined ? [] : _props9$cardList;
|
511
|
-
_ref10 =
|
510
|
+
_ref10 = lastesStorageResult || {}, _ref10$isCanRefund = _ref10.isCanRefund, isCanRefund = _ref10$isCanRefund === undefined ? false : _ref10$isCanRefund, _ref10$storageInfos = _ref10.storageInfos, storageInfos = _ref10$storageInfos === undefined ? [] : _ref10$storageInfos;
|
512
511
|
params = (0, _extends3.default)({}, data, {
|
513
512
|
StorageDetails: [{
|
514
513
|
Idmember: ID,
|
@@ -520,8 +519,14 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
520
519
|
}],
|
521
520
|
redBlueFlagEnum: 'RED',
|
522
521
|
storageAmount: storageAmount,
|
523
|
-
tradeTypeEnum: 'REFUND_CARD'
|
524
|
-
|
522
|
+
tradeTypeEnum: 'REFUND_CARD'
|
523
|
+
|
524
|
+
// 如果isCanRefund是false的话,说明是需要退现金,入参的计算方式明细金额是需要退的总金额
|
525
|
+
});
|
526
|
+
if (!isCanRefund) {
|
527
|
+
_ref11 = storageInfos[0] || {}, finAccountId = _ref11.finAccountId, paymentTypeId = _ref11.paymentTypeId;
|
528
|
+
|
529
|
+
params.StorageMutiSettleDetails = [{
|
525
530
|
"StorageAmount": storageAmount,
|
526
531
|
"PaymentCode": "",
|
527
532
|
"DynamicPropertyValues": [],
|
@@ -530,53 +535,69 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
530
535
|
"IdsettleStyle": paymentTypeId,
|
531
536
|
"DynamicPropertyKeys": [],
|
532
537
|
"DataSource": {}
|
533
|
-
}]
|
534
|
-
}
|
535
|
-
|
538
|
+
}];
|
539
|
+
} else {
|
540
|
+
params.StorageMutiSettleDetails = storageInfos.map(function (item) {
|
541
|
+
return {
|
542
|
+
"StorageAmount": '-' + item.latestStorageAmount,
|
543
|
+
"PaymentCode": "",
|
544
|
+
"DynamicPropertyValues": [],
|
545
|
+
"IdbankAccount": item.finAccountId,
|
546
|
+
"Code": 1,
|
547
|
+
"IdsettleStyle": item.paymentTypeId,
|
548
|
+
"DynamicPropertyKeys": [],
|
549
|
+
"DataSource": {},
|
550
|
+
"OrigPayAmount": item.latestStorageAmount,
|
551
|
+
"OrigTradeNo": item.outTradeNo
|
552
|
+
};
|
553
|
+
});
|
554
|
+
}
|
555
|
+
|
556
|
+
_context4.next = 11;
|
536
557
|
return this.setState({
|
537
558
|
refundBtnDisabled: true
|
538
559
|
});
|
539
560
|
|
540
|
-
case
|
541
|
-
_context4.prev =
|
542
|
-
_context4.next =
|
561
|
+
case 11:
|
562
|
+
_context4.prev = 11;
|
563
|
+
_context4.next = 14;
|
543
564
|
return this.api.ReturnedStorage(params);
|
544
565
|
|
545
|
-
case
|
566
|
+
case 14:
|
546
567
|
ret = _context4.sent;
|
547
|
-
|
568
|
+
_ref12 = ret.data || {}, isSuccess = _ref12.isSuccess, ex = _ref12.ex;
|
548
569
|
|
549
570
|
if (isSuccess === true || isSuccess === 'true') {
|
550
571
|
getCardList && getCardList(cardList && cardList.length > 1 ? cardList[0].MemberMobile : StorageCardNo);
|
551
572
|
_tplusComponentsTouch.Message.success('退储值成功!');
|
552
573
|
} else {
|
553
|
-
this.returnedCash('\
|
574
|
+
this.returnedCash('\u53EA\u80FD\u9000\u73B0\u91D1\uFF0C\u662F\u5426\u7EE7\u7EED', storageAmount);
|
554
575
|
}
|
555
576
|
|
556
|
-
_context4.next =
|
577
|
+
_context4.next = 19;
|
557
578
|
return this.setState({
|
558
579
|
refundBtnDisabled: false,
|
559
580
|
refundShow: false
|
560
581
|
});
|
561
582
|
|
562
|
-
case
|
563
|
-
_context4.next =
|
583
|
+
case 19:
|
584
|
+
_context4.next = 25;
|
564
585
|
break;
|
565
586
|
|
566
|
-
case
|
567
|
-
_context4.prev =
|
568
|
-
_context4.t0 = _context4['catch'](
|
569
|
-
_context4.next =
|
587
|
+
case 21:
|
588
|
+
_context4.prev = 21;
|
589
|
+
_context4.t0 = _context4['catch'](11);
|
590
|
+
_context4.next = 25;
|
570
591
|
return this.setState({
|
571
592
|
refundBtnDisabled: false
|
572
593
|
});
|
573
594
|
|
574
|
-
case
|
595
|
+
case 25:
|
575
596
|
case 'end':
|
576
597
|
return _context4.stop();
|
577
598
|
}
|
578
599
|
}
|
579
|
-
}, _callee4, this, [[
|
600
|
+
}, _callee4, this, [[11, 21]]);
|
580
601
|
}));
|
581
602
|
|
582
603
|
function submitRefundStorage() {
|
@@ -631,8 +652,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
631
652
|
});
|
632
653
|
}
|
633
654
|
if (ret === true) {
|
634
|
-
var
|
635
|
-
isHorizontalSunMi =
|
655
|
+
var _ref13 = _mutantsUtil.platform || {},
|
656
|
+
isHorizontalSunMi = _ref13.isHorizontalSunMi;
|
636
657
|
|
637
658
|
switch (key) {
|
638
659
|
case 'storage':
|
@@ -683,16 +704,16 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
683
704
|
_props10$cardList = _props10.cardList,
|
684
705
|
cardList = _props10$cardList === undefined ? [] : _props10$cardList;
|
685
706
|
|
686
|
-
var
|
687
|
-
Id =
|
688
|
-
|
689
|
-
BalanceStorage =
|
690
|
-
|
691
|
-
PresentAmount =
|
692
|
-
WalletEnabled =
|
693
|
-
CardTypeEnum =
|
694
|
-
CardStatusEnum =
|
695
|
-
StorageCardNo =
|
707
|
+
var _ref14 = cardList.length && cardList[selected] || {},
|
708
|
+
Id = _ref14.Id,
|
709
|
+
_ref14$BalanceStorage = _ref14.BalanceStorage,
|
710
|
+
BalanceStorage = _ref14$BalanceStorage === undefined ? 0 : _ref14$BalanceStorage,
|
711
|
+
_ref14$PresentAmount = _ref14.PresentAmount,
|
712
|
+
PresentAmount = _ref14$PresentAmount === undefined ? 0 : _ref14$PresentAmount,
|
713
|
+
WalletEnabled = _ref14.WalletEnabled,
|
714
|
+
CardTypeEnum = _ref14.CardTypeEnum,
|
715
|
+
CardStatusEnum = _ref14.CardStatusEnum,
|
716
|
+
StorageCardNo = _ref14.StorageCardNo;
|
696
717
|
|
697
718
|
return _react2.default.createElement(
|
698
719
|
'div',
|
@@ -733,10 +754,10 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
733
754
|
cancel: this.changePasswordCancel,
|
734
755
|
btnDissabled: btnDissabled
|
735
756
|
},
|
736
|
-
passwordTitle === '换卡' ? _react2.default.createElement(_changeMemberCard2.default, { cardList: cardList && cardList.length && cardList[selected], modifyMember: modifyMember, member: member, ref: function ref(
|
737
|
-
return _this4.modifyPass = _ref14;
|
738
|
-
}, cancelModal: this.changePasswordCancel }) : _react2.default.createElement(_modifyPass2.default, { menuKey: menuKey, cardListCopy: cardList, cardList: cardList && cardList.length && cardList[selected], changeBtnDisabled: this.changeBtnDisabled, loadUserInfo: getCardList, selected: selected, storageInit: this.storageInit, passwordTitle: CardTypeEnum === 'BALANCE_CARD' && !WalletEnabled ? '设置密码' : passwordTitle, modifyMember: modifyMember, ref: function ref(_ref15) {
|
757
|
+
passwordTitle === '换卡' ? _react2.default.createElement(_changeMemberCard2.default, { cardList: cardList && cardList.length && cardList[selected], modifyMember: modifyMember, member: member, ref: function ref(_ref15) {
|
739
758
|
return _this4.modifyPass = _ref15;
|
759
|
+
}, cancelModal: this.changePasswordCancel }) : _react2.default.createElement(_modifyPass2.default, { menuKey: menuKey, cardListCopy: cardList, cardList: cardList && cardList.length && cardList[selected], changeBtnDisabled: this.changeBtnDisabled, loadUserInfo: getCardList, selected: selected, storageInit: this.storageInit, passwordTitle: CardTypeEnum === 'BALANCE_CARD' && !WalletEnabled ? '设置密码' : passwordTitle, modifyMember: modifyMember, ref: function ref(_ref16) {
|
760
|
+
return _this4.modifyPass = _ref16;
|
740
761
|
}, member: member, cancelModal: this.changePasswordCancel })
|
741
762
|
),
|
742
763
|
_react2.default.createElement(
|
@@ -751,8 +772,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
751
772
|
btnDissabled: bindCardBtnDisabled
|
752
773
|
},
|
753
774
|
_react2.default.createElement(_bindCard2.default, {
|
754
|
-
ref: function ref(
|
755
|
-
return _this4.bindCardRef =
|
775
|
+
ref: function ref(_ref17) {
|
776
|
+
return _this4.bindCardRef = _ref17;
|
756
777
|
},
|
757
778
|
bindCardClick: this.bindCardClick,
|
758
779
|
changeBindCardBtnDisabled: this.changeBindCardBtnDisabled
|
@@ -874,8 +895,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
874
895
|
_props12$selected = _props12.selected,
|
875
896
|
selected = _props12$selected === undefined ? 0 : _props12$selected;
|
876
897
|
|
877
|
-
var
|
878
|
-
StorageCardNo =
|
898
|
+
var _ref18 = cardList[selected] || {},
|
899
|
+
StorageCardNo = _ref18.StorageCardNo;
|
879
900
|
|
880
901
|
_mutantsMicrofx.stores.memberStore.init({
|
881
902
|
cardInfo: cardList[selected],
|
@@ -918,7 +939,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
918
939
|
title: '提示',
|
919
940
|
content: '确定要挂失该会员卡吗?',
|
920
941
|
onOk: function () {
|
921
|
-
var
|
942
|
+
var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
|
922
943
|
return _regenerator2.default.wrap(function _callee5$(_context5) {
|
923
944
|
while (1) {
|
924
945
|
switch (_context5.prev = _context5.next) {
|
@@ -950,7 +971,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
950
971
|
}));
|
951
972
|
|
952
973
|
return function onOk() {
|
953
|
-
return
|
974
|
+
return _ref19.apply(this, arguments);
|
954
975
|
};
|
955
976
|
}(),
|
956
977
|
onCancel: function onCancel() {},
|
@@ -970,7 +991,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
970
991
|
title: '提示',
|
971
992
|
content: '确定要取消挂失该会员卡吗?',
|
972
993
|
onOk: function () {
|
973
|
-
var
|
994
|
+
var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
|
974
995
|
return _regenerator2.default.wrap(function _callee6$(_context6) {
|
975
996
|
while (1) {
|
976
997
|
switch (_context6.prev = _context6.next) {
|
@@ -1002,7 +1023,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
1002
1023
|
}));
|
1003
1024
|
|
1004
1025
|
return function onOk() {
|
1005
|
-
return
|
1026
|
+
return _ref20.apply(this, arguments);
|
1006
1027
|
};
|
1007
1028
|
}(),
|
1008
1029
|
onCancel: function onCancel() {},
|
@@ -1019,12 +1040,12 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
1019
1040
|
selected = _props15$selected === undefined ? 0 : _props15$selected,
|
1020
1041
|
memberEnumState = _props15.memberEnumState;
|
1021
1042
|
|
1022
|
-
var
|
1023
|
-
ID =
|
1024
|
-
|
1043
|
+
var _ref21 = member || {},
|
1044
|
+
ID = _ref21.ID,
|
1045
|
+
_ref21$MemberType = _ref21.MemberType;
|
1025
1046
|
|
1026
|
-
|
1027
|
-
var IsStorage =
|
1047
|
+
_ref21$MemberType = _ref21$MemberType === undefined ? {} : _ref21$MemberType;
|
1048
|
+
var IsStorage = _ref21$MemberType.IsStorage;
|
1028
1049
|
|
1029
1050
|
memberStore.GetMemberDTO(ID, false).then(function (ret) {
|
1030
1051
|
_mutantsMicrofx.stores.selectMemberStore.setCurMemberInfo(ret);
|
@@ -1065,8 +1086,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
1065
1086
|
_props16$selected = _props16.selected,
|
1066
1087
|
selected = _props16$selected === undefined ? 0 : _props16$selected;
|
1067
1088
|
|
1068
|
-
var
|
1069
|
-
ID =
|
1089
|
+
var _ref22 = cardList[selected] || {},
|
1090
|
+
ID = _ref22.ID;
|
1070
1091
|
|
1071
1092
|
if (!!ID) {
|
1072
1093
|
_tplusComponentsTouch.Message.error('该储值卡已经绑定,不能再次进行绑定');
|
@@ -1103,45 +1124,63 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
1103
1124
|
};
|
1104
1125
|
|
1105
1126
|
this.changeRefundOk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
|
1106
|
-
var _props17, _props17$cardList, cardList, _props17$selected, selected,
|
1127
|
+
var _props17, _props17$cardList, cardList, _props17$selected, selected, _ref24, MeStorageCardId, _ref24$BalanceStorage, BalanceStorage, _ref24$PresentAmount, PresentAmount, StorageCardNo, ID, refundable, storageAmount, lastesStorageResult, _ref25, _ref25$isCanRefund, isCanRefund, _ref25$storageInfos, storageInfos, latestStorageAmount;
|
1107
1128
|
|
1108
1129
|
return _regenerator2.default.wrap(function _callee7$(_context7) {
|
1109
1130
|
while (1) {
|
1110
1131
|
switch (_context7.prev = _context7.next) {
|
1111
1132
|
case 0:
|
1112
1133
|
_props17 = _this5.props, _props17$cardList = _props17.cardList, cardList = _props17$cardList === undefined ? [] : _props17$cardList, _props17$selected = _props17.selected, selected = _props17$selected === undefined ? 0 : _props17$selected;
|
1113
|
-
|
1114
|
-
_context7.next = 4;
|
1115
|
-
return _this5.api.getLatestStorageAmount(MeStorageCardId);
|
1116
|
-
|
1117
|
-
case 4:
|
1118
|
-
lastesStorageResult = _context7.sent;
|
1119
|
-
_ref24 = lastesStorageResult.data || {}, latestStorageAmount = _ref24.latestStorageAmount;
|
1134
|
+
_ref24 = cardList.length && cardList[selected] || {}, MeStorageCardId = _ref24.MeStorageCardId, _ref24$BalanceStorage = _ref24.BalanceStorage, BalanceStorage = _ref24$BalanceStorage === undefined ? 0 : _ref24$BalanceStorage, _ref24$PresentAmount = _ref24.PresentAmount, PresentAmount = _ref24$PresentAmount === undefined ? 0 : _ref24$PresentAmount, StorageCardNo = _ref24.StorageCardNo, ID = _ref24.ID;
|
1120
1135
|
refundable = parseFloat((0, _utils.getFixedNumber)(BalanceStorage - PresentAmount));
|
1121
1136
|
storageAmount = (0, _utils.getFixedNumber)(0 - (BalanceStorage - PresentAmount));
|
1122
|
-
|
1137
|
+
_context7.next = 6;
|
1138
|
+
return _this5.api.getLatestStorageAmount({ cardId: MeStorageCardId, inputRefundAmount: refundable });
|
1123
1139
|
|
1124
|
-
|
1140
|
+
case 6:
|
1141
|
+
lastesStorageResult = _context7.sent;
|
1142
|
+
_ref25 = lastesStorageResult.data || {}, _ref25$isCanRefund = _ref25.isCanRefund, isCanRefund = _ref25$isCanRefund === undefined ? false : _ref25$isCanRefund, _ref25$storageInfos = _ref25.storageInfos, storageInfos = _ref25$storageInfos === undefined ? [] : _ref25$storageInfos;
|
1143
|
+
|
1144
|
+
// 退款金额小于等于0,不允许退款
|
1145
|
+
|
1146
|
+
if (!(Number(refundable) <= 0)) {
|
1125
1147
|
_context7.next = 11;
|
1126
1148
|
break;
|
1127
1149
|
}
|
1128
1150
|
|
1129
|
-
|
1151
|
+
_tplusComponentsTouch.Message.error('无可退金额,不支持退款!');
|
1130
1152
|
return _context7.abrupt('return');
|
1131
1153
|
|
1132
1154
|
case 11:
|
1133
|
-
if (
|
1155
|
+
if (isCanRefund) {
|
1134
1156
|
_context7.next = 14;
|
1135
1157
|
break;
|
1136
1158
|
}
|
1137
1159
|
|
1138
|
-
|
1160
|
+
_this5.returnedCash('\u53EA\u80FD\u9000\u73B0\u91D1\uFF0C\u662F\u5426\u7EE7\u7EED', storageAmount);
|
1139
1161
|
return _context7.abrupt('return');
|
1140
1162
|
|
1141
1163
|
case 14:
|
1164
|
+
|
1165
|
+
// 计算最后一次储值的总金额,
|
1166
|
+
latestStorageAmount = storageInfos.reduce(function (total, cur) {
|
1167
|
+
return total + cur.latestStorageAmount;
|
1168
|
+
}, 0);
|
1169
|
+
// 退款只支持退最后一次储值的金额,如果最后一次储值的金额小于可退金额,弹出提示。
|
1170
|
+
|
1171
|
+
if (!(latestStorageAmount && latestStorageAmount < refundable)) {
|
1172
|
+
_context7.next = 18;
|
1173
|
+
break;
|
1174
|
+
}
|
1175
|
+
|
1176
|
+
_this5.returnedCash('\u9000\u6B3E\u5927\u4E8E\u6700\u540E\u4E00\u6B21\u50A8\u503C\u91D1\u989D\uFF0C\u65E0\u6CD5\u539F\u8DEF\u9000\u56DE\uFF0C\u53EA\u53EF\u9000\u73B0\u91D1\uFF01\u662F\u5426\u9000\u6B3E\uFF1F', storageAmount);
|
1177
|
+
return _context7.abrupt('return');
|
1178
|
+
|
1179
|
+
case 18:
|
1180
|
+
|
1142
1181
|
_this5.submitRefundStorage(cardList[selected], storageAmount, lastesStorageResult.data);
|
1143
1182
|
|
1144
|
-
case
|
1183
|
+
case 19:
|
1145
1184
|
case 'end':
|
1146
1185
|
return _context7.stop();
|
1147
1186
|
}
|
@@ -1156,8 +1195,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
1156
1195
|
_props18$selected = _props18.selected,
|
1157
1196
|
selected = _props18$selected === undefined ? 0 : _props18$selected;
|
1158
1197
|
|
1159
|
-
var
|
1160
|
-
Id =
|
1198
|
+
var _ref26 = cardList[selected] || {},
|
1199
|
+
Id = _ref26.Id;
|
1161
1200
|
|
1162
1201
|
cardList[selected].meMemberId = Id;
|
1163
1202
|
cardList[selected].isRefundStorage = 1; // 自己添加参数,用来判断是储值还是退储值
|
@@ -1179,11 +1218,11 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
1179
1218
|
_props19$selected = _props19.selected,
|
1180
1219
|
selected = _props19$selected === undefined ? 0 : _props19$selected;
|
1181
1220
|
|
1182
|
-
var
|
1183
|
-
StorageCardNo =
|
1184
|
-
MemberMobile =
|
1185
|
-
MemberName =
|
1186
|
-
ID =
|
1221
|
+
var _ref27 = cardList[selected] || {},
|
1222
|
+
StorageCardNo = _ref27.StorageCardNo,
|
1223
|
+
MemberMobile = _ref27.MemberMobile,
|
1224
|
+
MemberName = _ref27.MemberName,
|
1225
|
+
ID = _ref27.ID;
|
1187
1226
|
|
1188
1227
|
if (!ID) {
|
1189
1228
|
_tplusComponentsTouch.Message.error('该卡未绑定会员');
|
@@ -1194,7 +1233,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
1194
1233
|
content: '\u6B64\u5361\u5C5E\u4E8E' + (MemberName || MemberMobile) + '\u4F1A\u5458\uFF0C\u786E\u8BA4\u89E3\u7ED1\u5417\uFF1F',
|
1195
1234
|
confirmLoading: _this5.state.memberUnBindCardLoading,
|
1196
1235
|
onOk: function () {
|
1197
|
-
var
|
1236
|
+
var _ref28 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
|
1198
1237
|
return _regenerator2.default.wrap(function _callee8$(_context8) {
|
1199
1238
|
while (1) {
|
1200
1239
|
switch (_context8.prev = _context8.next) {
|
@@ -1225,7 +1264,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
1225
1264
|
}));
|
1226
1265
|
|
1227
1266
|
return function onOk() {
|
1228
|
-
return
|
1267
|
+
return _ref28.apply(this, arguments);
|
1229
1268
|
};
|
1230
1269
|
}()
|
1231
1270
|
});
|
@@ -1245,14 +1284,14 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
|
|
1245
1284
|
_props20$selected = _props20.selected,
|
1246
1285
|
selected = _props20$selected === undefined ? 0 : _props20$selected;
|
1247
1286
|
|
1248
|
-
var
|
1249
|
-
setPwdShortKey =
|
1287
|
+
var _ref29 = _this5.state || {},
|
1288
|
+
setPwdShortKey = _ref29.setPwdShortKey;
|
1250
1289
|
|
1251
1290
|
var newStyle = _mutantsUtil.localStore && _mutantsUtil.localStore.get('voucherDefaultPosMode') == 'voucher';
|
1252
1291
|
|
1253
|
-
var
|
1254
|
-
WalletEnabled =
|
1255
|
-
CardTypeEnum =
|
1292
|
+
var _ref30 = cardList && cardList.length && cardList[selected] || {},
|
1293
|
+
WalletEnabled = _ref30.WalletEnabled,
|
1294
|
+
CardTypeEnum = _ref30.CardTypeEnum;
|
1256
1295
|
// 控制显示修改密码还是设置密码
|
1257
1296
|
|
1258
1297
|
|