tplus-member 3.26.14 → 3.26.18

Sign up to get free protection for your applications and to get access to all the features.
Files changed (121) hide show
  1. package/dist/api.js +5 -5
  2. package/dist/api.js.map +1 -1
  3. package/dist/controllers/FeedbackController.js.map +1 -1
  4. package/dist/controllers/MemberOrderController.js +12 -12
  5. package/dist/controllers/MemberOrderController.js.map +1 -1
  6. package/dist/controllers/OpenCardController.js +7 -7
  7. package/dist/controllers/OpenCardController.js.map +1 -1
  8. package/dist/controllers/defaultConfig.js.map +1 -1
  9. package/dist/dataProvider/member.js +7 -7
  10. package/dist/dataProvider/member.js.map +1 -1
  11. package/dist/dataProvider/openCard.js.map +1 -1
  12. package/dist/domain/member/AuthProcess.js.map +1 -1
  13. package/dist/domain/member/CardCodeChangedProcessor.js +2 -2
  14. package/dist/domain/member/CardCodeChangedProcessor.js.map +1 -1
  15. package/dist/domain/member/CheckCardCodeAndCodeProcessor.js +2 -2
  16. package/dist/domain/member/CheckCardCodeAndCodeProcessor.js.map +1 -1
  17. package/dist/domain/member/CheckMobilephoneFormatProcessor.js +2 -2
  18. package/dist/domain/member/CheckMobilephoneFormatProcessor.js.map +1 -1
  19. package/dist/domain/member/CheckPresentAmountProcessor.js +2 -2
  20. package/dist/domain/member/CheckPresentAmountProcessor.js.map +1 -1
  21. package/dist/domain/member/EffectiveDateChangedProcessor.js +2 -2
  22. package/dist/domain/member/EffectiveDateChangedProcessor.js.map +1 -1
  23. package/dist/domain/member/GetThisPresentAmountProcessor.js +2 -2
  24. package/dist/domain/member/GetThisPresentAmountProcessor.js.map +1 -1
  25. package/dist/domain/member/InitDataProcessor.js +123 -123
  26. package/dist/domain/member/InitDataProcessor.js.map +1 -1
  27. package/dist/domain/member/IsMemberEffectiveProcessor.js +2 -2
  28. package/dist/domain/member/IsMemberEffectiveProcessor.js.map +1 -1
  29. package/dist/domain/member/IsMemberEnableProcessor.js +2 -2
  30. package/dist/domain/member/IsMemberEnableProcessor.js.map +1 -1
  31. package/dist/domain/member/IsMemberExpirationProcessor.js +2 -2
  32. package/dist/domain/member/IsMemberExpirationProcessor.js.map +1 -1
  33. package/dist/domain/member/IsMemberPasswordSameProcessor.js +2 -2
  34. package/dist/domain/member/IsMemberPasswordSameProcessor.js.map +1 -1
  35. package/dist/domain/member/IsMemberStorageForStoreProcessor.js +3 -3
  36. package/dist/domain/member/IsMemberStorageForStoreProcessor.js.map +1 -1
  37. package/dist/domain/member/MemberTypeChangedProcessor.js +4 -4
  38. package/dist/domain/member/MemberTypeChangedProcessor.js.map +1 -1
  39. package/dist/domain/member/MobilephoneChangedProcessor.js +4 -4
  40. package/dist/domain/member/MobilephoneChangedProcessor.js.map +1 -1
  41. package/dist/domain/member/PersonProcesser.js.map +1 -1
  42. package/dist/domain/member/PriuserdefChangedProcessor.js +2 -2
  43. package/dist/domain/member/PriuserdefChangedProcessor.js.map +1 -1
  44. package/dist/domain/operationLog/AddLogProcessor.js +6 -6
  45. package/dist/domain/operationLog/AddLogProcessor.js.map +1 -1
  46. package/dist/domain/operationLog/OperationConfig.js.map +1 -1
  47. package/dist/domain/operationLog/OperationLog.js.map +1 -1
  48. package/dist/index.js.map +1 -1
  49. package/dist/member/MemberCardList.js +2 -2
  50. package/dist/member/MemberCardList.js.map +1 -1
  51. package/dist/member/MemberPhoto.js.map +1 -1
  52. package/dist/member/MemberShow.js.map +1 -1
  53. package/dist/member/ShopMember.js.map +1 -1
  54. package/dist/member/ShopMember.less +600 -594
  55. package/dist/member/ShopMemberStorage.js +1 -1
  56. package/dist/member/ShopMemberStorage.js.map +1 -1
  57. package/dist/member/api.js +4 -4
  58. package/dist/member/api.js.map +1 -1
  59. package/dist/member/color.less +31 -31
  60. package/dist/member/index.js +4 -4
  61. package/dist/member/index.js.map +1 -1
  62. package/dist/member/index.less +570 -570
  63. package/dist/member/memberMenu/bindCard/index.js.map +1 -1
  64. package/dist/member/memberMenu/bindCard/style.less +7 -7
  65. package/dist/member/memberMenu/changeMemberCard/index.js.map +1 -1
  66. package/dist/member/memberMenu/changeMemberCard/style.less +42 -42
  67. package/dist/member/memberMenu/index.js.map +1 -1
  68. package/dist/member/memberMenu/modifyPass/index.js.map +1 -1
  69. package/dist/member/memberMenu/modifyPass/store.js.map +1 -1
  70. package/dist/member/memberMenu/modifyPass/style.less +96 -96
  71. package/dist/member/memberMenu/style.less +126 -126
  72. package/dist/member/memberMenuStorage/bindCard/index.js.map +1 -1
  73. package/dist/member/memberMenuStorage/bindCard/style.less +7 -7
  74. package/dist/member/memberMenuStorage/changeMemberCard/index.js.map +1 -1
  75. package/dist/member/memberMenuStorage/changeMemberCard/style.less +42 -42
  76. package/dist/member/memberMenuStorage/index.js +99 -103
  77. package/dist/member/memberMenuStorage/index.js.map +1 -1
  78. package/dist/member/memberMenuStorage/modifyPass/index.js.map +1 -1
  79. package/dist/member/memberMenuStorage/modifyPass/store.js.map +1 -1
  80. package/dist/member/memberMenuStorage/modifyPass/style.less +96 -96
  81. package/dist/member/memberMenuStorage/style.less +128 -126
  82. package/dist/member/memberTab/MemberCardInfo.js.map +1 -1
  83. package/dist/member/memberTab/MemberManager.js.map +1 -1
  84. package/dist/member/memberTab/MemberStorage.js.map +1 -1
  85. package/dist/member/memberTab/index.js.map +1 -1
  86. package/dist/member/memberTab.js.map +1 -1
  87. package/dist/socket.js +13 -13
  88. package/dist/socket.js.map +1 -1
  89. package/dist/stores/MemberStore.js +11 -6
  90. package/dist/stores/MemberStore.js.map +1 -1
  91. package/dist/stores/index.js.map +1 -1
  92. package/dist/utils.js.map +1 -1
  93. package/dist/viewController/MemberOrderViewController.js.map +1 -1
  94. package/dist/viewDoMain/CheckMemberProcessorBlock.js +2 -2
  95. package/dist/viewDoMain/CheckMemberProcessorBlock.js.map +1 -1
  96. package/dist/viewDoMain/CheckMemberStorageProcessorBlock.js +2 -2
  97. package/dist/viewDoMain/CheckMemberStorageProcessorBlock.js.map +1 -1
  98. package/dist/viewDoMain/CheckSelectMemberProcessorBlock.js +2 -2
  99. package/dist/viewDoMain/CheckSelectMemberProcessorBlock.js.map +1 -1
  100. package/dist/viewDoMain/CheckUpdatePasswordProcessorBlock.js.map +1 -1
  101. package/dist/viewDoMain/MemberDataChangedProcessorBlock.js +2 -2
  102. package/dist/viewDoMain/MemberDataChangedProcessorBlock.js.map +1 -1
  103. package/dist/viewDoMain/MemberDataPreSaveProcessorBlock.js +2 -2
  104. package/dist/viewDoMain/MemberDataPreSaveProcessorBlock.js.map +1 -1
  105. package/dist/viewDoMain/StorageAmountChangedProcessorBlock.js +2 -2
  106. package/dist/viewDoMain/StorageAmountChangedProcessorBlock.js.map +1 -1
  107. package/dist/viewModels/memberVoucher.js +3 -3
  108. package/dist/viewModels/memberVoucher.js.map +1 -1
  109. package/dist/views/MemberOrderView.js +5 -5
  110. package/dist/views/MemberOrderView.js.map +1 -1
  111. package/dist/views/MemberStore.less +143 -143
  112. package/dist/views/MemberStoreNew.less +230 -230
  113. package/dist/views/MemberStoreNewView.js.map +1 -1
  114. package/dist/views/MemberStoreView.js.map +1 -1
  115. package/dist/views/MemberStoreViewContainer.js.map +1 -1
  116. package/dist/views/PresentDetail.less +118 -118
  117. package/dist/views/PresetDetailView.js.map +1 -1
  118. package/dist/views/memberOrder.less +54 -54
  119. package/locales/zh/tplus-portsetting.json +1 -1
  120. package/locales/zh-CN/tplus-portsetting.json +1 -1
  121. package/package.json +29 -29
@@ -9,10 +9,6 @@ var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
9
9
 
10
10
  var _defineProperty3 = _interopRequireDefault(_defineProperty2);
11
11
 
12
- var _modal = require('antd/es/modal');
13
-
14
- var _modal2 = _interopRequireDefault(_modal);
15
-
16
12
  var _extends2 = require('babel-runtime/helpers/extends');
17
13
 
18
14
  var _extends3 = _interopRequireDefault(_extends2);
@@ -47,8 +43,6 @@ var _inherits3 = _interopRequireDefault(_inherits2);
47
43
 
48
44
  var _class, _class2, _temp, _initialiseProps;
49
45
 
50
- require('antd/es/modal/style');
51
-
52
46
  var _react = require('react');
53
47
 
54
48
  var _react2 = _interopRequireDefault(_react);
@@ -493,9 +487,10 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
493
487
  var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
494
488
  var cardInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
495
489
  var storageAmount = arguments[1];
496
- var isCash = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
490
+ var lastesStorage = arguments[2];
491
+ var isCash = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
497
492
 
498
- var store, _store$data, data, MeStorageCardId, StorageCardNo, ID, _cardInfo$LatestStora, latestStorageAmount, paymentTypeId, finAccountId, _props9, getCardList, _props9$cardList, cardList, params, ret;
493
+ var store, _store$data, data, MeStorageCardId, StorageCardNo, ID, _cardInfo$PresentAmou, PresentAmount, _props9, getCardList, _props9$cardList, cardList, _ref10, paymentTypeId, finAccountId, params, ret, _ref11, isSuccess, ex;
499
494
 
500
495
  return _regenerator2.default.wrap(function _callee4$(_context4) {
501
496
  while (1) {
@@ -511,79 +506,77 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
511
506
  case 2:
512
507
  store = _mutantsMicrofx.stores.memberStore;
513
508
  _store$data = store.data, data = _store$data === undefined ? {} : _store$data;
514
- MeStorageCardId = cardInfo.MeStorageCardId, StorageCardNo = cardInfo.StorageCardNo, ID = cardInfo.ID, _cardInfo$LatestStora = cardInfo.LatestStorageInfo;
515
- _cardInfo$LatestStora = _cardInfo$LatestStora === undefined ? {} : _cardInfo$LatestStora;
516
- latestStorageAmount = _cardInfo$LatestStora.latestStorageAmount, paymentTypeId = _cardInfo$LatestStora.paymentTypeId, finAccountId = _cardInfo$LatestStora.finAccountId;
509
+ MeStorageCardId = cardInfo.MeStorageCardId, StorageCardNo = cardInfo.StorageCardNo, ID = cardInfo.ID, _cardInfo$PresentAmou = cardInfo.PresentAmount, PresentAmount = _cardInfo$PresentAmou === undefined ? 0 : _cardInfo$PresentAmou;
517
510
  _props9 = this.props, getCardList = _props9.getCardList, _props9$cardList = _props9.cardList, cardList = _props9$cardList === undefined ? [] : _props9$cardList;
511
+ _ref10 = lastesStorage || {}, paymentTypeId = _ref10.paymentTypeId, finAccountId = _ref10.finAccountId;
518
512
  params = (0, _extends3.default)({}, data, {
519
513
  StorageDetails: [{
520
514
  Idmember: ID,
521
515
  ThisStorageAmount: storageAmount,
522
516
  StorageType: {},
523
517
  meStorageCardId: MeStorageCardId,
524
- isPresentGiftpack: false
518
+ isPresentGiftpack: data.StorageDetails[0].isPresentGiftpack,
519
+ ThisPresentAmount: (0, _utils.getFixedNumber)(0 - PresentAmount)
525
520
  }],
526
521
  redBlueFlagEnum: 'RED',
527
522
  storageAmount: storageAmount,
528
523
  tradeTypeEnum: 'REFUND_CARD',
529
- StorageMutiSettleDetails: []
530
- // if (isCash) {
524
+ StorageMutiSettleDetails: [{
525
+ "StorageAmount": storageAmount,
526
+ "PaymentCode": "",
527
+ "DynamicPropertyValues": [],
528
+ "IdbankAccount": finAccountId,
529
+ "Code": 1,
530
+ "IdsettleStyle": paymentTypeId,
531
+ "DynamicPropertyKeys": [],
532
+ "DataSource": {}
533
+ }]
531
534
  });
532
- params.StorageMutiSettleDetails = [{
533
- "StorageAmount": storageAmount,
534
- "PaymentCode": "",
535
- "DynamicPropertyValues": [],
536
- "IdbankAccount": finAccountId,
537
- "Code": 1,
538
- "IdsettleStyle": paymentTypeId,
539
- "DynamicPropertyKeys": [],
540
- "DataSource": {}
541
- }];
542
- // }
543
- _context4.next = 12;
535
+ _context4.next = 10;
544
536
  return this.setState({
545
537
  refundBtnDisabled: true
546
538
  });
547
539
 
548
- case 12:
549
- _context4.prev = 12;
550
- _context4.next = 15;
540
+ case 10:
541
+ _context4.prev = 10;
542
+ _context4.next = 13;
551
543
  return this.api.ReturnedStorage(params);
552
544
 
553
- case 15:
545
+ case 13:
554
546
  ret = _context4.sent;
547
+ _ref11 = ret.data || {}, isSuccess = _ref11.isSuccess, ex = _ref11.ex;
548
+
549
+ if (isSuccess != false) {
550
+ getCardList && getCardList(cardList && cardList.length > 1 ? cardList[0].MemberMobile : StorageCardNo);
551
+ _tplusComponentsTouch.Message.success('退储值成功!');
552
+ } else {
553
+ this.returnedCash('\u9000\u6B3E\u5931\u8D25\uFF0C\u53EA\u80FD\u9000\u73B0\u91D1\uFF0C\u662F\u5426\u7EE7\u7EED', storageAmount);
554
+ }
555
555
 
556
- getCardList && getCardList(cardList && cardList.length > 1 ? cardList[0].MemberMobile : StorageCardNo);
557
- _tplusComponentsTouch.Message.success('退储值成功!');
558
- _context4.next = 20;
556
+ _context4.next = 18;
559
557
  return this.setState({
560
558
  refundBtnDisabled: false,
561
559
  refundShow: false
562
560
  });
563
561
 
564
- case 20:
565
- _context4.next = 28;
562
+ case 18:
563
+ _context4.next = 24;
566
564
  break;
567
565
 
568
- case 22:
569
- _context4.prev = 22;
570
- _context4.t0 = _context4['catch'](12);
571
-
572
- console.log(_context4.t0);
573
- _context4.next = 27;
566
+ case 20:
567
+ _context4.prev = 20;
568
+ _context4.t0 = _context4['catch'](10);
569
+ _context4.next = 24;
574
570
  return this.setState({
575
571
  refundBtnDisabled: false
576
572
  });
577
573
 
578
- case 27:
579
- this.returnedCash('\u9000\u6B3E\u5931\u8D25\uFF0C\u53EA\u80FD\u9000\u73B0\u91D1\uFF0C\u662F\u5426\u7EE7\u7EED', storageAmount);
580
-
581
- case 28:
574
+ case 24:
582
575
  case 'end':
583
576
  return _context4.stop();
584
577
  }
585
578
  }
586
- }, _callee4, this, [[12, 22]]);
579
+ }, _callee4, this, [[10, 20]]);
587
580
  }));
588
581
 
589
582
  function submitRefundStorage() {
@@ -597,7 +590,6 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
597
590
  }, {
598
591
  key: 'returnedCash',
599
592
  value: function returnedCash(content, storageAmount) {
600
- _modal2.default.destroyAll();
601
593
  var that = this;
602
594
  _tplusComponentsTouch.ModalWraper.confirm({
603
595
  title: '提示',
@@ -639,8 +631,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
639
631
  });
640
632
  }
641
633
  if (ret === true) {
642
- var _ref10 = _mutantsUtil.platform || {},
643
- isHorizontalSunMi = _ref10.isHorizontalSunMi;
634
+ var _ref12 = _mutantsUtil.platform || {},
635
+ isHorizontalSunMi = _ref12.isHorizontalSunMi;
644
636
 
645
637
  switch (key) {
646
638
  case 'storage':
@@ -691,16 +683,16 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
691
683
  _props10$cardList = _props10.cardList,
692
684
  cardList = _props10$cardList === undefined ? [] : _props10$cardList;
693
685
 
694
- var _ref11 = cardList.length && cardList[selected] || {},
695
- Id = _ref11.Id,
696
- _ref11$BalanceStorage = _ref11.BalanceStorage,
697
- BalanceStorage = _ref11$BalanceStorage === undefined ? 0 : _ref11$BalanceStorage,
698
- _ref11$PresentAmount = _ref11.PresentAmount,
699
- PresentAmount = _ref11$PresentAmount === undefined ? 0 : _ref11$PresentAmount,
700
- WalletEnabled = _ref11.WalletEnabled,
701
- CardTypeEnum = _ref11.CardTypeEnum,
702
- CardStatusEnum = _ref11.CardStatusEnum,
703
- StorageCardNo = _ref11.StorageCardNo;
686
+ var _ref13 = cardList.length && cardList[selected] || {},
687
+ Id = _ref13.Id,
688
+ _ref13$BalanceStorage = _ref13.BalanceStorage,
689
+ BalanceStorage = _ref13$BalanceStorage === undefined ? 0 : _ref13$BalanceStorage,
690
+ _ref13$PresentAmount = _ref13.PresentAmount,
691
+ PresentAmount = _ref13$PresentAmount === undefined ? 0 : _ref13$PresentAmount,
692
+ WalletEnabled = _ref13.WalletEnabled,
693
+ CardTypeEnum = _ref13.CardTypeEnum,
694
+ CardStatusEnum = _ref13.CardStatusEnum,
695
+ StorageCardNo = _ref13.StorageCardNo;
704
696
 
705
697
  return _react2.default.createElement(
706
698
  'div',
@@ -741,10 +733,10 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
741
733
  cancel: this.changePasswordCancel,
742
734
  btnDissabled: btnDissabled
743
735
  },
744
- passwordTitle === '换卡' ? _react2.default.createElement(_changeMemberCard2.default, { cardList: cardList && cardList.length && cardList[selected], modifyMember: modifyMember, member: member, ref: function ref(_ref12) {
745
- return _this4.modifyPass = _ref12;
746
- }, 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(_ref13) {
747
- return _this4.modifyPass = _ref13;
736
+ passwordTitle === '换卡' ? _react2.default.createElement(_changeMemberCard2.default, { cardList: cardList && cardList.length && cardList[selected], modifyMember: modifyMember, member: member, ref: function ref(_ref14) {
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) {
739
+ return _this4.modifyPass = _ref15;
748
740
  }, member: member, cancelModal: this.changePasswordCancel })
749
741
  ),
750
742
  _react2.default.createElement(
@@ -759,8 +751,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
759
751
  btnDissabled: bindCardBtnDisabled
760
752
  },
761
753
  _react2.default.createElement(_bindCard2.default, {
762
- ref: function ref(_ref14) {
763
- return _this4.bindCardRef = _ref14;
754
+ ref: function ref(_ref16) {
755
+ return _this4.bindCardRef = _ref16;
764
756
  },
765
757
  bindCardClick: this.bindCardClick,
766
758
  changeBindCardBtnDisabled: this.changeBindCardBtnDisabled
@@ -882,8 +874,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
882
874
  _props12$selected = _props12.selected,
883
875
  selected = _props12$selected === undefined ? 0 : _props12$selected;
884
876
 
885
- var _ref15 = cardList[selected] || {},
886
- StorageCardNo = _ref15.StorageCardNo;
877
+ var _ref17 = cardList[selected] || {},
878
+ StorageCardNo = _ref17.StorageCardNo;
887
879
 
888
880
  _mutantsMicrofx.stores.memberStore.init({
889
881
  cardInfo: cardList[selected],
@@ -926,7 +918,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
926
918
  title: '提示',
927
919
  content: '确定要挂失该会员卡吗?',
928
920
  onOk: function () {
929
- var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
921
+ var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
930
922
  return _regenerator2.default.wrap(function _callee5$(_context5) {
931
923
  while (1) {
932
924
  switch (_context5.prev = _context5.next) {
@@ -958,7 +950,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
958
950
  }));
959
951
 
960
952
  return function onOk() {
961
- return _ref16.apply(this, arguments);
953
+ return _ref18.apply(this, arguments);
962
954
  };
963
955
  }(),
964
956
  onCancel: function onCancel() {},
@@ -978,7 +970,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
978
970
  title: '提示',
979
971
  content: '确定要取消挂失该会员卡吗?',
980
972
  onOk: function () {
981
- var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
973
+ var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
982
974
  return _regenerator2.default.wrap(function _callee6$(_context6) {
983
975
  while (1) {
984
976
  switch (_context6.prev = _context6.next) {
@@ -1010,7 +1002,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
1010
1002
  }));
1011
1003
 
1012
1004
  return function onOk() {
1013
- return _ref17.apply(this, arguments);
1005
+ return _ref19.apply(this, arguments);
1014
1006
  };
1015
1007
  }(),
1016
1008
  onCancel: function onCancel() {},
@@ -1027,12 +1019,12 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
1027
1019
  selected = _props15$selected === undefined ? 0 : _props15$selected,
1028
1020
  memberEnumState = _props15.memberEnumState;
1029
1021
 
1030
- var _ref18 = member || {},
1031
- ID = _ref18.ID,
1032
- _ref18$MemberType = _ref18.MemberType;
1022
+ var _ref20 = member || {},
1023
+ ID = _ref20.ID,
1024
+ _ref20$MemberType = _ref20.MemberType;
1033
1025
 
1034
- _ref18$MemberType = _ref18$MemberType === undefined ? {} : _ref18$MemberType;
1035
- var IsStorage = _ref18$MemberType.IsStorage;
1026
+ _ref20$MemberType = _ref20$MemberType === undefined ? {} : _ref20$MemberType;
1027
+ var IsStorage = _ref20$MemberType.IsStorage;
1036
1028
 
1037
1029
  memberStore.GetMemberDTO(ID, false).then(function (ret) {
1038
1030
  _mutantsMicrofx.stores.selectMemberStore.setCurMemberInfo(ret);
@@ -1073,8 +1065,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
1073
1065
  _props16$selected = _props16.selected,
1074
1066
  selected = _props16$selected === undefined ? 0 : _props16$selected;
1075
1067
 
1076
- var _ref19 = cardList[selected] || {},
1077
- ID = _ref19.ID;
1068
+ var _ref21 = cardList[selected] || {},
1069
+ ID = _ref21.ID;
1078
1070
 
1079
1071
  if (!!ID) {
1080
1072
  _tplusComponentsTouch.Message.error('该储值卡已经绑定,不能再次进行绑定');
@@ -1111,41 +1103,45 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
1111
1103
  };
1112
1104
 
1113
1105
  this.changeRefundOk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
1114
- var _props17, _props17$cardList, cardList, _props17$selected, selected, _ref21, MeStorageCardId, _ref21$BalanceStorage, BalanceStorage, _ref21$PresentAmount, PresentAmount, StorageCardNo, ID, _ref21$LatestStorageI, latestStorageAmount, paymentTypeId, finAccountId, refundable, storageAmount;
1106
+ var _props17, _props17$cardList, cardList, _props17$selected, selected, _ref23, MeStorageCardId, _ref23$BalanceStorage, BalanceStorage, _ref23$PresentAmount, PresentAmount, StorageCardNo, ID, lastesStorageResult, _ref24, latestStorageAmount, refundable, storageAmount;
1115
1107
 
1116
1108
  return _regenerator2.default.wrap(function _callee7$(_context7) {
1117
1109
  while (1) {
1118
1110
  switch (_context7.prev = _context7.next) {
1119
1111
  case 0:
1120
1112
  _props17 = _this5.props, _props17$cardList = _props17.cardList, cardList = _props17$cardList === undefined ? [] : _props17$cardList, _props17$selected = _props17.selected, selected = _props17$selected === undefined ? 0 : _props17$selected;
1121
- _ref21 = cardList.length && cardList[selected] || {}, MeStorageCardId = _ref21.MeStorageCardId, _ref21$BalanceStorage = _ref21.BalanceStorage, BalanceStorage = _ref21$BalanceStorage === undefined ? 0 : _ref21$BalanceStorage, _ref21$PresentAmount = _ref21.PresentAmount, PresentAmount = _ref21$PresentAmount === undefined ? 0 : _ref21$PresentAmount, StorageCardNo = _ref21.StorageCardNo, ID = _ref21.ID, _ref21$LatestStorageI = _ref21.LatestStorageInfo;
1122
- _ref21$LatestStorageI = _ref21$LatestStorageI === undefined ? {} : _ref21$LatestStorageI;
1123
- latestStorageAmount = _ref21$LatestStorageI.latestStorageAmount, paymentTypeId = _ref21$LatestStorageI.paymentTypeId, finAccountId = _ref21$LatestStorageI.finAccountId;
1113
+ _ref23 = cardList.length && cardList[selected] || {}, MeStorageCardId = _ref23.MeStorageCardId, _ref23$BalanceStorage = _ref23.BalanceStorage, BalanceStorage = _ref23$BalanceStorage === undefined ? 0 : _ref23$BalanceStorage, _ref23$PresentAmount = _ref23.PresentAmount, PresentAmount = _ref23$PresentAmount === undefined ? 0 : _ref23$PresentAmount, StorageCardNo = _ref23.StorageCardNo, ID = _ref23.ID;
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;
1124
1120
  refundable = parseFloat((0, _utils.getFixedNumber)(BalanceStorage - PresentAmount));
1125
1121
  storageAmount = (0, _utils.getFixedNumber)(0 - (BalanceStorage - PresentAmount));
1126
1122
  // 退款只支持退最后一次储值的金额,如果最后一次储值的金额小于可退金额,弹出提示。
1127
1123
 
1128
1124
  if (!(latestStorageAmount && latestStorageAmount < refundable)) {
1129
- _context7.next = 9;
1125
+ _context7.next = 11;
1130
1126
  break;
1131
1127
  }
1132
1128
 
1133
1129
  _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);
1134
1130
  return _context7.abrupt('return');
1135
1131
 
1136
- case 9:
1137
- if (!(Number(storageAmount) === 0)) {
1138
- _context7.next = 12;
1132
+ case 11:
1133
+ if (!(Number(refundable) <= 0)) {
1134
+ _context7.next = 14;
1139
1135
  break;
1140
1136
  }
1141
1137
 
1142
1138
  _tplusComponentsTouch.Message.error('无可退金额,不支持退款!');
1143
1139
  return _context7.abrupt('return');
1144
1140
 
1145
- case 12:
1146
- _this5.submitRefundStorage(cardList[selected], storageAmount);
1141
+ case 14:
1142
+ _this5.submitRefundStorage(cardList[selected], storageAmount, lastesStorageResult.data);
1147
1143
 
1148
- case 13:
1144
+ case 15:
1149
1145
  case 'end':
1150
1146
  return _context7.stop();
1151
1147
  }
@@ -1160,8 +1156,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
1160
1156
  _props18$selected = _props18.selected,
1161
1157
  selected = _props18$selected === undefined ? 0 : _props18$selected;
1162
1158
 
1163
- var _ref22 = cardList[selected] || {},
1164
- Id = _ref22.Id;
1159
+ var _ref25 = cardList[selected] || {},
1160
+ Id = _ref25.Id;
1165
1161
 
1166
1162
  cardList[selected].meMemberId = Id;
1167
1163
  cardList[selected].isRefundStorage = 1; // 自己添加参数,用来判断是储值还是退储值
@@ -1183,11 +1179,11 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
1183
1179
  _props19$selected = _props19.selected,
1184
1180
  selected = _props19$selected === undefined ? 0 : _props19$selected;
1185
1181
 
1186
- var _ref23 = cardList[selected] || {},
1187
- StorageCardNo = _ref23.StorageCardNo,
1188
- MemberMobile = _ref23.MemberMobile,
1189
- MemberName = _ref23.MemberName,
1190
- ID = _ref23.ID;
1182
+ var _ref26 = cardList[selected] || {},
1183
+ StorageCardNo = _ref26.StorageCardNo,
1184
+ MemberMobile = _ref26.MemberMobile,
1185
+ MemberName = _ref26.MemberName,
1186
+ ID = _ref26.ID;
1191
1187
 
1192
1188
  if (!ID) {
1193
1189
  _tplusComponentsTouch.Message.error('该卡未绑定会员');
@@ -1198,7 +1194,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
1198
1194
  content: '\u6B64\u5361\u5C5E\u4E8E' + (MemberName || MemberMobile) + '\u4F1A\u5458\uFF0C\u786E\u8BA4\u89E3\u7ED1\u5417\uFF1F',
1199
1195
  confirmLoading: _this5.state.memberUnBindCardLoading,
1200
1196
  onOk: function () {
1201
- var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
1197
+ var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
1202
1198
  return _regenerator2.default.wrap(function _callee8$(_context8) {
1203
1199
  while (1) {
1204
1200
  switch (_context8.prev = _context8.next) {
@@ -1229,7 +1225,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
1229
1225
  }));
1230
1226
 
1231
1227
  return function onOk() {
1232
- return _ref24.apply(this, arguments);
1228
+ return _ref27.apply(this, arguments);
1233
1229
  };
1234
1230
  }()
1235
1231
  });
@@ -1249,14 +1245,14 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
1249
1245
  _props20$selected = _props20.selected,
1250
1246
  selected = _props20$selected === undefined ? 0 : _props20$selected;
1251
1247
 
1252
- var _ref25 = _this5.state || {},
1253
- setPwdShortKey = _ref25.setPwdShortKey;
1248
+ var _ref28 = _this5.state || {},
1249
+ setPwdShortKey = _ref28.setPwdShortKey;
1254
1250
 
1255
1251
  var newStyle = _mutantsUtil.localStore && _mutantsUtil.localStore.get('voucherDefaultPosMode') == 'voucher';
1256
1252
 
1257
- var _ref26 = cardList && cardList.length && cardList[selected] || {},
1258
- WalletEnabled = _ref26.WalletEnabled,
1259
- CardTypeEnum = _ref26.CardTypeEnum;
1253
+ var _ref29 = cardList && cardList.length && cardList[selected] || {},
1254
+ WalletEnabled = _ref29.WalletEnabled,
1255
+ CardTypeEnum = _ref29.CardTypeEnum;
1260
1256
  // 控制显示修改密码还是设置密码
1261
1257
 
1262
1258