tplus-components-touch 3.26.1 → 3.26.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.
Files changed (185) hide show
  1. package/README.md +16 -16
  2. package/dist/components/acCitySelect/CitySelect.js +18 -18
  3. package/dist/components/acCitySelect/CitySelect.js.map +1 -1
  4. package/dist/components/acCitySelect/CitySelect.less +9 -9
  5. package/dist/components/acCitySelect/citys.js.map +1 -1
  6. package/dist/components/acCitySelect/index.js.map +1 -1
  7. package/dist/components/acCitySelect/provinceData.js +7 -7
  8. package/dist/components/acCitySelect/provinceData.js.map +1 -1
  9. package/dist/components/addLog/AddLogProcessor.js +6 -6
  10. package/dist/components/addLog/AddLogProcessor.js.map +1 -1
  11. package/dist/components/addLog/OperationLogApi.js +3 -3
  12. package/dist/components/addLog/OperationLogApi.js.map +1 -1
  13. package/dist/components/autoComplete/index.js +14 -14
  14. package/dist/components/autoComplete/index.js.map +1 -1
  15. package/dist/components/autoComplete/index.less +89 -89
  16. package/dist/components/autoComplete/option.js.map +1 -1
  17. package/dist/components/autoCompleteWithKeyboard/index.js +14 -14
  18. package/dist/components/autoCompleteWithKeyboard/index.js.map +1 -1
  19. package/dist/components/autoCompleteWithKeyboard/index.less +7 -7
  20. package/dist/components/billSearch/api.js +29 -29
  21. package/dist/components/billSearch/api.js.map +1 -1
  22. package/dist/components/billSearch/index.js +6 -6
  23. package/dist/components/billSearch/index.js.map +1 -1
  24. package/dist/components/billSearch/index.less +373 -373
  25. package/dist/components/cloudPrint/BTPrintFormatUtil.js +17 -17
  26. package/dist/components/cloudPrint/BTPrintFormatUtil.js.map +1 -1
  27. package/dist/components/cloudPrint/api.js.map +1 -1
  28. package/dist/components/cloudPrint/index.js.map +1 -1
  29. package/dist/components/cloudPrint/printDispatch.js +7 -7
  30. package/dist/components/cloudPrint/printDispatch.js.map +1 -1
  31. package/dist/components/commonForm/addressPicker/index.js +7 -7
  32. package/dist/components/commonForm/addressPicker/index.js.map +1 -1
  33. package/dist/components/commonForm/addressPicker/style.less +10 -10
  34. package/dist/components/commonForm/autoComplete/index.js.map +1 -1
  35. package/dist/components/commonForm/autoComplete/style.less +2 -2
  36. package/dist/components/commonForm/datePicker/index.js.map +1 -1
  37. package/dist/components/commonForm/datePicker/style.less +4 -4
  38. package/dist/components/commonForm/formControl/index.js.map +1 -1
  39. package/dist/components/commonForm/index.js +4 -4
  40. package/dist/components/commonForm/index.js.map +1 -1
  41. package/dist/components/commonForm/inputNumber/index.js.map +1 -1
  42. package/dist/components/commonForm/inputNumber/style.less +10 -10
  43. package/dist/components/commonForm/radio/index.js.map +1 -1
  44. package/dist/components/commonForm/style.less +1 -1
  45. package/dist/components/deliverySearch/api.js +21 -21
  46. package/dist/components/deliverySearch/api.js.map +1 -1
  47. package/dist/components/deliverySearch/index.js +6 -6
  48. package/dist/components/deliverySearch/index.js.map +1 -1
  49. package/dist/components/deliverySearch/index.less +553 -553
  50. package/dist/components/form/index.js.map +1 -1
  51. package/dist/components/hardwareAPI/index.js.map +1 -1
  52. package/dist/components/hotKey/config.js +23 -23
  53. package/dist/components/hotKey/config.js.map +1 -1
  54. package/dist/components/hotKey/hotKeyModal.js.map +1 -1
  55. package/dist/components/hotKey/index.js +26 -26
  56. package/dist/components/hotKey/index.js.map +1 -1
  57. package/dist/components/hotKey/localConfig.js +12 -12
  58. package/dist/components/hotKey/localConfig.js.map +1 -1
  59. package/dist/components/hotKey/style.less +96 -96
  60. package/dist/components/hotKey/utils.js.map +1 -1
  61. package/dist/components/input/index.js +6 -6
  62. package/dist/components/input/index.js.map +1 -1
  63. package/dist/components/input/style.less +99 -99
  64. package/dist/components/input/tplusInput/index.js +30 -30
  65. package/dist/components/input/tplusInput/index.js.map +1 -1
  66. package/dist/components/input/tplusInput/inputContent.js.map +1 -1
  67. package/dist/components/input/tplusInput/inputs.js.map +1 -1
  68. package/dist/components/input/tplusInput/style.less +132 -132
  69. package/dist/components/input/utils/index.js.map +1 -1
  70. package/dist/components/inventorySearch/api.js +58 -58
  71. package/dist/components/inventorySearch/api.js.map +1 -1
  72. package/dist/components/inventorySearch/index.js +3 -3
  73. package/dist/components/inventorySearch/index.js.map +1 -1
  74. package/dist/components/inventorySearch/index.less +119 -119
  75. package/dist/components/inventorySearch/store.js.map +1 -1
  76. package/dist/components/inventorySearch/tab.js.map +1 -1
  77. package/dist/components/keyboard/index.js.map +1 -1
  78. package/dist/components/keyboard/index.less +469 -469
  79. package/dist/components/keyboard/letterKeyboard.js +2 -2
  80. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  81. package/dist/components/keyboard/numKeyboard.js +4 -4
  82. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  83. package/dist/components/keyboard/numKeyboardScan.js.map +1 -1
  84. package/dist/components/keyboard/numberButton_input.js +5 -5
  85. package/dist/components/keyboard/numberButton_input.js.map +1 -1
  86. package/dist/components/keyboard/numkeyboardPassword.js +4 -4
  87. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  88. package/dist/components/keyboard/onlyKeyboard.js +7 -7
  89. package/dist/components/keyboard/onlyKeyboard.js.map +1 -1
  90. package/dist/components/keyboard/onlyLetterButton.js +2 -2
  91. package/dist/components/keyboard/onlyLetterButton.js.map +1 -1
  92. package/dist/components/keyboard/onlyLetterButton2.js +2 -2
  93. package/dist/components/keyboard/onlyLetterButton2.js.map +1 -1
  94. package/dist/components/keyboard/onlyLetterButton2.less +161 -161
  95. package/dist/components/keyboard/onlyNumberButton.js +2 -2
  96. package/dist/components/keyboard/onlyNumberButton.js.map +1 -1
  97. package/dist/components/keyboard/onlyNumberButton2.js +3 -3
  98. package/dist/components/keyboard/onlyNumberButton2.js.map +1 -1
  99. package/dist/components/keyboard/textKeyboard.js.map +1 -1
  100. package/dist/components/layout/hamburger.js.map +1 -1
  101. package/dist/components/layout/index.js +10 -10
  102. package/dist/components/layout/index.js.map +1 -1
  103. package/dist/components/layout/layout.js.map +1 -1
  104. package/dist/components/layout/sider.js +12 -12
  105. package/dist/components/layout/sider.js.map +1 -1
  106. package/dist/components/layout/style.less +82 -82
  107. package/dist/components/loading/index.js +15 -15
  108. package/dist/components/loading/index.js.map +1 -1
  109. package/dist/components/loading/loadingContent.js.map +1 -1
  110. package/dist/components/loading/style.less +61 -61
  111. package/dist/components/loading/utils.js.map +1 -1
  112. package/dist/components/message/index.js +8 -8
  113. package/dist/components/message/index.js.map +1 -1
  114. package/dist/components/message/index.less +101 -101
  115. package/dist/components/modal/index.js.map +1 -1
  116. package/dist/components/modal/index.less +19 -19
  117. package/dist/components/modalVertical/index.js +7 -7
  118. package/dist/components/modalVertical/index.js.map +1 -1
  119. package/dist/components/modalVertical/style.less +60 -60
  120. package/dist/components/modalWraper/index.js +15 -15
  121. package/dist/components/modalWraper/index.js.map +1 -1
  122. package/dist/components/modalWraper/style.less +257 -257
  123. package/dist/components/modalWraper/utils.js.map +1 -1
  124. package/dist/components/notification/index.js +4 -4
  125. package/dist/components/notification/index.js.map +1 -1
  126. package/dist/components/notification/index.less +51 -51
  127. package/dist/components/overflowTip/index.js +15 -15
  128. package/dist/components/overflowTip/index.js.map +1 -1
  129. package/dist/components/overflowTip/style.less +66 -66
  130. package/dist/components/page/index.js.map +1 -1
  131. package/dist/components/page/index.less +21 -21
  132. package/dist/components/product/detail.js +7 -7
  133. package/dist/components/product/detail.js.map +1 -1
  134. package/dist/components/product/getCard.js +5 -5
  135. package/dist/components/product/getCard.js.map +1 -1
  136. package/dist/components/product/index.less +128 -128
  137. package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
  138. package/dist/components/progressState/ProgressState.js +10 -10
  139. package/dist/components/progressState/ProgressState.js.map +1 -1
  140. package/dist/components/progressState/index.js.map +1 -1
  141. package/dist/components/progressState/style.less +65 -65
  142. package/dist/components/scan/index.js.map +1 -1
  143. package/dist/components/scan/index.less +33 -33
  144. package/dist/components/select/index.js.map +1 -1
  145. package/dist/components/select/index.less +11 -11
  146. package/dist/components/settlement/asyncModal.js.map +1 -1
  147. package/dist/components/settlement/index.js.map +1 -1
  148. package/dist/components/settlement/prototypeTable/index.js.map +1 -1
  149. package/dist/components/settlement/prototypeTable/style.less +58 -58
  150. package/dist/components/settlement/prototypeTable/utils.js.map +1 -1
  151. package/dist/components/settlement/settlement.js +496 -451
  152. package/dist/components/settlement/settlement.js.map +1 -1
  153. package/dist/components/settlement/settlement.less +1646 -1640
  154. package/dist/components/settlement/settlementStore.js +279 -163
  155. package/dist/components/settlement/settlementStore.js.map +1 -1
  156. package/dist/components/settlement/utils.js.map +1 -1
  157. package/dist/components/socket/index.js +11 -11
  158. package/dist/components/socket/index.js.map +1 -1
  159. package/dist/components/spin/index.js +6 -6
  160. package/dist/components/spin/index.js.map +1 -1
  161. package/dist/components/spin/spin-style.less +436 -436
  162. package/dist/components/test/index.js +3 -3
  163. package/dist/components/test/index.js.map +1 -1
  164. package/dist/components/ticon/iconfont/demo_index.html +5248 -5248
  165. package/dist/components/ticon/iconfont/iconfont.css +895 -895
  166. package/dist/components/ticon/iconfont/iconfont.json +1549 -1549
  167. package/dist/components/ticon/iconfont/iconfont.svg +593 -593
  168. package/dist/components/ticon/index.js.map +1 -1
  169. package/dist/components/touchScroll/index.js +9 -9
  170. package/dist/components/touchScroll/index.js.map +1 -1
  171. package/dist/components/touchTable/AuthProcess.js.map +1 -1
  172. package/dist/components/touchTable/generateWater.js.map +1 -1
  173. package/dist/components/touchTable/index.js +9 -9
  174. package/dist/components/touchTable/index.js.map +1 -1
  175. package/dist/components/touchTable/index.less +369 -369
  176. package/dist/components/touchTable/utils.js.map +1 -1
  177. package/dist/demo/PopOverDemo.js.map +1 -1
  178. package/dist/index.js +7 -7
  179. package/dist/index.js.map +1 -1
  180. package/dist/util/tools.js.map +1 -1
  181. package/locales/zh/tplus-components-touch.json +1 -1
  182. package/locales/zh-CN/tplus-components-touch.json +1 -1
  183. package/mocks/memberInfo.json +79 -79
  184. package/package.json +1 -1
  185. package/tsconfig.json +26 -26
@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
41
41
 
42
42
  var _createClass3 = _interopRequireDefault(_createClass2);
43
43
 
44
- var _desc, _value, _class, _descriptor, _descriptor2, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _desc3, _value3, _class5, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15;
44
+ var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _desc2, _value2, _class3, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _desc3, _value3, _class5, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19;
45
45
 
46
46
  var _mobx = require('mobx');
47
47
 
@@ -178,6 +178,10 @@ var SettlementStore = (_class = function () {
178
178
 
179
179
  _initDefineProp(this, 'updateMemberInfo', _descriptor2, this);
180
180
 
181
+ _initDefineProp(this, 'updateCurrentMode', _descriptor3, this);
182
+
183
+ _initDefineProp(this, 'updateCardInfo', _descriptor4, this);
184
+
181
185
  this.getCouponList = function (coupon_code) {
182
186
  var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
183
187
  PayStyle = _enumController$getEn.PayStyle,
@@ -541,13 +545,18 @@ var SettlementStore = (_class = function () {
541
545
  }
542
546
  });
543
547
  (0, _each3.default)(this.dto.RetailStorageDetails, function (detail) {
544
- var balanceAmount = detail.Member.BalanceStorage;
545
- balanceAmount = balanceAmount - detail.StoragePaymentAmount;
548
+ var balanceAmount = null;
549
+ detail.DynamicPropertyKeys.forEach(function (ele, index) {
550
+ if (ele === "mestoragecard") {
551
+ balanceAmount = detail.DynamicPropertyValues[index].BalanceStorage - detail.StoragePaymentAmount;
552
+ }
553
+ });
546
554
  var newmode = (0, _extends3.default)({}, _this5.genNewMode(PayStyle.hyczk, false, detail.StoragePaymentAmount), {
547
- member: new Member(detail.Member),
548
- authCode: detail.Password,
555
+ member: new Member(detail.Member ? detail.Member : null),
556
+ authCode: detail.Password ? detail.Password : null,
549
557
  balance: balanceAmount,
550
- boriginReturn: true
558
+ boriginReturn: true,
559
+ meStorageCardId: detail.meStorageCardId
551
560
  });
552
561
  _this5.paymode.thePaymodes.push(newmode);
553
562
  });
@@ -591,7 +600,7 @@ var SettlementStore = (_class = function () {
591
600
 
592
601
  //抵现积分
593
602
  (0, _tplusApi.tApi)({ IntegralSteadCashParams: {
594
- Idmember: this.paymode.currentMode.member.id,
603
+ Idmember: this.paymode.currentMode.memberId,
595
604
  TotalTaxAmount: this.paymode.amount,
596
605
  BalanceTaxAmount: this.paymode.currentMode.value
597
606
  } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
@@ -624,7 +633,6 @@ var SettlementStore = (_class = function () {
624
633
 
625
634
  if ((0, _trim3.default)(v) === "") {
626
635
  (0, _mobx.runInAction)(function () {
627
- _this7.paymode.currentMode.member = new Member(null);
628
636
  _this7.paymode.currentMode.errinfo = "请输入储值卡";
629
637
  });
630
638
  return;
@@ -638,31 +646,29 @@ var SettlementStore = (_class = function () {
638
646
  var address = '';
639
647
  if (isNewRetailBCPos) {
640
648
  // address = '/member/memberProfile/FindByStorageCode/'+v;
641
- address = '/member/MeMemberWallet/FindByStorageCode';
649
+ address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
642
650
  return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function (result) {
643
651
  var data = result.data;
644
- var m = data;
645
- _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
646
- _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
647
- _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
648
- _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
649
- if (!m || !m.ID) {
652
+ var m = data && data.length && data[0];
653
+ _this7.paymode.updateCardInfo(m);
654
+ if (!m || !m.StorageCardNo) {
650
655
  (0, _mobx.runInAction)(function () {
651
656
  _this7.paymode.currentMode.errinfo = "无效的会员卡号";
652
657
  });
653
658
  } else {
654
659
  (0, _mobx.runInAction)(function () {
655
660
  _this7.paymode.currentMode.errinfo = "";
656
- _this7.paymode.currentMode.member = new Member(m);
661
+ _this7.paymode.currentMode.memberId = m.ID;
657
662
  _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
658
663
  _this7.updateEvent();
659
664
  var message = '';
660
665
  var sum = (0, _reduce3.default)(_this7.paymode.thePaymodes, function (total, cur) {
661
666
  return total + cur.value;
662
667
  }, 0);
663
- if (global.CheckMemberStorageProcessorBlock) {
664
- message = CheckMemberStorageProcessorBlock.execute(m);
665
- }
668
+ // 对于卡不用判断会员的一些信息
669
+ // if (global.CheckMemberStorageProcessorBlock ) {
670
+ // message= CheckMemberStorageProcessorBlock.execute(m);
671
+ // }
666
672
  if (!String.isNullOrEmpty(message)) {
667
673
  _this7.paymode.currentMode.errinfo = message;
668
674
  } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
@@ -682,16 +688,6 @@ var SettlementStore = (_class = function () {
682
688
  return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
683
689
  var data = JSON.parse(result.Data);
684
690
  var m = data && data.length > 0 && data[0];
685
-
686
- var _ref9 = _mutantsUtil.platform || {},
687
- isNewRetailBCPos = _ref9.isNewRetailBCPos;
688
-
689
- if (isNewRetailBCPos) {
690
- _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
691
- _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
692
- _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
693
- _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
694
- }
695
691
  if (!m || !m.ID) {
696
692
  (0, _mobx.runInAction)(function () {
697
693
  _this7.paymode.currentMode.errinfo = "无效的会员卡号";
@@ -787,7 +783,7 @@ var SettlementStore = (_class = function () {
787
783
  }
788
784
 
789
785
  (0, _tplusApi.tApi)({ IntegralSteadCashParams: {
790
- Idmember: this.paymode.currentMode.member.id,
786
+ Idmember: this.paymode.currentMode.memberId,
791
787
  TotalTaxAmount: this.paymode.amount,
792
788
  BalanceTaxAmount: this.paymode.amount
793
789
  } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
@@ -814,6 +810,22 @@ var SettlementStore = (_class = function () {
814
810
 
815
811
  var value = (0, _utils.getFixedNumber)(v || (this.brefund ? this.paymode.receivable : Math.max(this.paymode.receivable, 0)));
816
812
  var themode = (0, _find3.default)(this.paymode.paymodes, { 'paymentType': type });
813
+ var balance = null;
814
+ var rawbalance = null;
815
+ var storageCardNo = null;
816
+ var memberId = this.member && this.member.ID ? this.member.ID : null;
817
+ var cardTypeEnum = null;
818
+ var walletEnabled = null;
819
+ var meStorageCardId = null;
820
+ if (type === PayStyle.hyczk) {
821
+ // 会员概念改为卡,把这些字段都放开
822
+ cardTypeEnum = this.member.CardTypeEnum ? this.member.CardTypeEnum : null;
823
+ walletEnabled = this.member.WalletEnabled ? this.member.WalletEnabled : null;
824
+ storageCardNo = this.member.StorageCardNo ? this.member.StorageCardNo : null;
825
+ balance = this.member.BalanceStorage ? this.member.BalanceStorage : null;
826
+ rawbalance = this.member.BalanceStorage ? this.member.BalanceStorage : null;
827
+ meStorageCardId = this.member.MeStorageCardId ? this.member.MeStorageCardId : null;
828
+ }
817
829
  var mode = (0, _mobx.observable)({
818
830
  paymethodId: this.paymode.counter,
819
831
  name: themode.name,
@@ -825,6 +837,14 @@ var SettlementStore = (_class = function () {
825
837
  order: this.paymode.thePaymodes.length + 1,
826
838
  paymentType: type,
827
839
  djqs: [],
840
+ card: null,
841
+ cardTypeEnum: !notwithm ? cardTypeEnum : null,
842
+ walletEnabled: !notwithm ? walletEnabled : null,
843
+ memberId: !notwithm ? memberId : null,
844
+ meStorageCardId: !notwithm ? meStorageCardId : null,
845
+ storageCardNo: !notwithm ? storageCardNo : null,
846
+ balance: !notwithm ? balance : null,
847
+ rawbalance: !notwithm ? rawbalance : null,
828
848
  member: new Member(!notwithm ? this.member : null),
829
849
  authCode: '',
830
850
  steadCashIntegral: null,
@@ -832,7 +852,7 @@ var SettlementStore = (_class = function () {
832
852
  maxamount: this.paymode.amount
833
853
  });
834
854
  if (type == PayStyle.hyczk) {
835
- if (!mode.member.id || !mode.member.StorageCardNo) {
855
+ if (!mode.storageCardNo) {
836
856
  (0, _mobx.runInAction)(function () {
837
857
  mode.errinfo = '未录入储值卡';
838
858
  });
@@ -978,8 +998,8 @@ var SettlementStore = (_class = function () {
978
998
  }, {
979
999
  key: 'commit',
980
1000
  value: function () {
981
- var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
982
- var _ref11, isNewRetailBCPos;
1001
+ var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
1002
+ var _ref10, isNewRetailBCPos;
983
1003
 
984
1004
  return _regenerator2.default.wrap(function _callee2$(_context2) {
985
1005
  while (1) {
@@ -995,7 +1015,7 @@ var SettlementStore = (_class = function () {
995
1015
  return _context2.abrupt('return', _promise2.default.resolve(true));
996
1016
 
997
1017
  case 3:
998
- _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
1018
+ _ref10 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref10.isNewRetailBCPos;
999
1019
  _context2.prev = 4;
1000
1020
 
1001
1021
  if (!(this.type == 1)) {
@@ -1051,7 +1071,7 @@ var SettlementStore = (_class = function () {
1051
1071
  }));
1052
1072
 
1053
1073
  function commit(_x2) {
1054
- return _ref10.apply(this, arguments);
1074
+ return _ref9.apply(this, arguments);
1055
1075
  }
1056
1076
 
1057
1077
  return commit;
@@ -1109,10 +1129,10 @@ var SettlementStore = (_class = function () {
1109
1129
  }, {
1110
1130
  key: 'save',
1111
1131
  value: function () {
1112
- var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
1132
+ var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
1113
1133
  var _this11 = this;
1114
1134
 
1115
- var _enumController$getEn14, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1135
+ var _enumController$getEn14, PayStyle, _ref13, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1116
1136
 
1117
1137
  return _regenerator2.default.wrap(function _callee3$(_context3) {
1118
1138
  while (1) {
@@ -1134,17 +1154,16 @@ var SettlementStore = (_class = function () {
1134
1154
  var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
1135
1155
  if (mode.paymentType == PayStyle.hyczk) {
1136
1156
  if (!Idmember) {
1137
- Idmember = mode.member.id;
1157
+ Idmember = mode.memberId;
1138
1158
  }
1139
1159
  czkSum = Math.Add(czkSum, mode.value);
1140
- var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this11.member.MeStorageCardId;
1141
1160
  _this11.dto.RetailStorageDetails.push({
1142
1161
  Code: mode.paymethodId,
1143
- MeStorageCardId: MeStorageCardId,
1162
+ MeStorageCardId: mode.meStorageCardId,
1144
1163
  StoragePaymentAmount: mode.value,
1145
1164
  IsOrigReturn: false,
1146
1165
  BalanceStorage: mode.balance,
1147
- Idmember: mode.member.id,
1166
+ Idmember: mode.memberId,
1148
1167
  DynamicPropertyKeys: [],
1149
1168
  DynamicPropertyValues: [],
1150
1169
  DataSource: { Id: _this11.dataSource },
@@ -1180,7 +1199,7 @@ var SettlementStore = (_class = function () {
1180
1199
  ReductionAmount: djq.amount,
1181
1200
  EnableAmount: djq.doorsill,
1182
1201
  CouponTitle: djq.name,
1183
- IdMember: djq.UMemberID ? mode.member.id : null,
1202
+ IdMember: djq.UMemberID ? mode.memberId : null,
1184
1203
  LastTS: djq.LastTS,
1185
1204
  PromotionId: djq.promoId,
1186
1205
  PromotionRuleId: djq.promoRuleId,
@@ -1192,15 +1211,12 @@ var SettlementStore = (_class = function () {
1192
1211
  }
1193
1212
  });
1194
1213
 
1195
- var _ref13 = _mutantsUtil.platform || {},
1196
- isNewRetailBCPos = _ref13.isNewRetailBCPos;
1214
+ var _ref12 = _mutantsUtil.platform || {},
1215
+ isNewRetailBCPos = _ref12.isNewRetailBCPos;
1197
1216
 
1198
1217
  if (_this11.dto.RetailStorageDetails.length > 0) {
1199
1218
  var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
1200
1219
  if (isNewRetailBCPos) {
1201
- // this.dto.RetailStorageDetails && this.dto.RetailStorageDetails.forEach((value, index) => {
1202
- // value.MeStorageCardId = (mode.MeStorageCardId ? mode.MeStorageCardId : this.member.MeStorageCardId);
1203
- // })
1204
1220
  _this11.dto.RetailPaymentDetails.push({
1205
1221
  Code: _this11.paymode.counter,
1206
1222
  OrigAmount: czkSum,
@@ -1227,7 +1243,7 @@ var SettlementStore = (_class = function () {
1227
1243
  _this11.dto.Idmember = Idmember;
1228
1244
  }
1229
1245
  });
1230
- _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
1246
+ _ref13 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref13.isNewRetailBCPos;
1231
1247
 
1232
1248
  console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
1233
1249
 
@@ -1297,7 +1313,7 @@ var SettlementStore = (_class = function () {
1297
1313
  }));
1298
1314
 
1299
1315
  function save() {
1300
- return _ref12.apply(this, arguments);
1316
+ return _ref11.apply(this, arguments);
1301
1317
  }
1302
1318
 
1303
1319
  return save;
@@ -1310,7 +1326,7 @@ var SettlementStore = (_class = function () {
1310
1326
  }, {
1311
1327
  key: 'querySettleResult',
1312
1328
  value: function () {
1313
- var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
1329
+ var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
1314
1330
  return _regenerator2.default.wrap(function _callee4$(_context4) {
1315
1331
  while (1) {
1316
1332
  switch (_context4.prev = _context4.next) {
@@ -1338,7 +1354,7 @@ var SettlementStore = (_class = function () {
1338
1354
  }));
1339
1355
 
1340
1356
  function querySettleResult() {
1341
- return _ref15.apply(this, arguments);
1357
+ return _ref14.apply(this, arguments);
1342
1358
  }
1343
1359
 
1344
1360
  return querySettleResult;
@@ -1364,37 +1380,37 @@ var SettlementStore = (_class = function () {
1364
1380
  }, {
1365
1381
  key: 'validePwd',
1366
1382
  value: function () {
1367
- var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
1368
- var _ref17, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
1383
+ var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
1384
+ var _ref16, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, result, count, _result;
1369
1385
 
1370
1386
  return _regenerator2.default.wrap(function _callee5$(_context5) {
1371
1387
  while (1) {
1372
1388
  switch (_context5.prev = _context5.next) {
1373
1389
  case 0:
1374
- _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
1390
+ _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
1375
1391
  _context5.prev = 1;
1376
1392
 
1377
1393
  if (!isNewRetailBCPos) {
1378
- _context5.next = 19;
1394
+ _context5.next = 27;
1379
1395
  break;
1380
1396
  }
1381
1397
 
1382
1398
  cook1 = this.getAllCookies()['errorPwd'];
1383
1399
  cook2 = cook1 && JSON.parse(cook1);
1384
1400
  message = '密码输入错误';
1385
- memberId = this.paymode.currentMode.member.MeStorageCardId;
1401
+ memberStorageId = this.paymode.currentMode.meStorageCardId;
1386
1402
 
1387
1403
  if (!cook2) {
1388
1404
  _context5.next = 12;
1389
1405
  break;
1390
1406
  }
1391
1407
 
1392
- if (!cook2.hasOwnProperty(memberId + "")) {
1408
+ if (!cook2.hasOwnProperty(memberStorageId + "")) {
1393
1409
  _context5.next = 12;
1394
1410
  break;
1395
1411
  }
1396
1412
 
1397
- if (!(cook2[memberId] > 3)) {
1413
+ if (!(cook2[memberStorageId] > 3)) {
1398
1414
  _context5.next = 12;
1399
1415
  break;
1400
1416
  }
@@ -1403,60 +1419,78 @@ var SettlementStore = (_class = function () {
1403
1419
  return _context5.abrupt('return', _promise2.default.resolve(message));
1404
1420
 
1405
1421
  case 12:
1406
- _context5.next = 14;
1407
- return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd) }, '/member/MeMemberWallet/checkPaymentPassword/' + value.id, false, false);
1422
+ _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId;
1423
+ result = null;
1424
+
1425
+ if (!(cardTypeEnum === 'BALANCE_CARD')) {
1426
+ _context5.next = 20;
1427
+ break;
1428
+ }
1429
+
1430
+ _context5.next = 17;
1431
+ return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
1408
1432
 
1409
- case 14:
1433
+ case 17:
1410
1434
  result = _context5.sent;
1435
+ _context5.next = 23;
1436
+ break;
1437
+
1438
+ case 20:
1439
+ _context5.next = 22;
1440
+ return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
1411
1441
 
1442
+ case 22:
1443
+ result = _context5.sent;
1444
+
1445
+ case 23:
1412
1446
  if (!result.data) {
1413
1447
  if (cook2) {
1414
- if (cook2.hasOwnProperty(memberId + "")) {
1415
- count = cook2[memberId];
1448
+ if (cook2.hasOwnProperty(memberStorageId + "")) {
1449
+ count = cook2[memberStorageId];
1416
1450
 
1417
- cook2[memberId] = count + 1;
1451
+ cook2[memberStorageId] = count + 1;
1418
1452
  } else {
1419
- cook2[memberId] = 1;
1453
+ cook2[memberStorageId] = 1;
1420
1454
  }
1421
1455
  } else {
1422
1456
  cook2 = {};
1423
- cook2[memberId] = 1;
1457
+ cook2[memberStorageId] = 1;
1424
1458
  }
1425
1459
  this.setCookie('errorPwd', '', -1);
1426
1460
  this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
1427
1461
  }
1428
1462
  return _context5.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
1429
1463
 
1430
- case 19:
1431
- _context5.next = 21;
1464
+ case 27:
1465
+ _context5.next = 29;
1432
1466
  return (0, _tplusApi.tApi)({ "CheckoutParams": {
1433
1467
  "Idmember": value.id,
1434
1468
  "Password": value.pwd
1435
1469
  } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
1436
1470
 
1437
- case 21:
1471
+ case 29:
1438
1472
  _result = _context5.sent;
1439
1473
  return _context5.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
1440
1474
 
1441
- case 23:
1442
- _context5.next = 28;
1475
+ case 31:
1476
+ _context5.next = 36;
1443
1477
  break;
1444
1478
 
1445
- case 25:
1446
- _context5.prev = 25;
1479
+ case 33:
1480
+ _context5.prev = 33;
1447
1481
  _context5.t0 = _context5['catch'](1);
1448
1482
  return _context5.abrupt('return', "failed");
1449
1483
 
1450
- case 28:
1484
+ case 36:
1451
1485
  case 'end':
1452
1486
  return _context5.stop();
1453
1487
  }
1454
1488
  }
1455
- }, _callee5, this, [[1, 25]]);
1489
+ }, _callee5, this, [[1, 33]]);
1456
1490
  }));
1457
1491
 
1458
1492
  function validePwd(_x3) {
1459
- return _ref16.apply(this, arguments);
1493
+ return _ref15.apply(this, arguments);
1460
1494
  }
1461
1495
 
1462
1496
  return validePwd;
@@ -1478,7 +1512,7 @@ var SettlementStore = (_class = function () {
1478
1512
  var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
1479
1513
  return (0, _tplusApi.ccApi)({
1480
1514
  Idstore: idstore,
1481
- meMemberId: _this12.member.ID,
1515
+ meMemberId: _this12.paymode.currentMode.memberId,
1482
1516
  oldPassword: null,
1483
1517
  newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
1484
1518
  dataSource: "POS"
@@ -1495,7 +1529,7 @@ var SettlementStore = (_class = function () {
1495
1529
  var _this13 = this;
1496
1530
 
1497
1531
  return function () {
1498
- var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
1532
+ var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
1499
1533
  var _getLoginInfo, IdStore, StoreCode, resp;
1500
1534
 
1501
1535
  return _regenerator2.default.wrap(function _callee6$(_context6) {
@@ -1510,7 +1544,7 @@ var SettlementStore = (_class = function () {
1510
1544
  resp = _context6.sent;
1511
1545
 
1512
1546
  _this.member = resp;
1513
- _this.paymode.currentMode.member.setStorageCardNo(resp.StorageCardNo);
1547
+ _this.paymode.currentMode.storageCardNo = resp.StorageCardNo;
1514
1548
  return _context6.abrupt('return', _promise2.default.resolve(resp));
1515
1549
 
1516
1550
  case 7:
@@ -1522,10 +1556,78 @@ var SettlementStore = (_class = function () {
1522
1556
  }));
1523
1557
 
1524
1558
  return function (_x4) {
1559
+ return _ref17.apply(this, arguments);
1560
+ };
1561
+ }();
1562
+ }
1563
+ }), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'updateCurrentMode', [_mobx.action], {
1564
+ enumerable: true,
1565
+ initializer: function initializer() {
1566
+ var _this14 = this;
1567
+
1568
+ return function () {
1569
+ var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(memberId) {
1570
+ var result;
1571
+ return _regenerator2.default.wrap(function _callee7$(_context7) {
1572
+ while (1) {
1573
+ switch (_context7.prev = _context7.next) {
1574
+ case 0:
1575
+ _context7.next = 2;
1576
+ return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId, false, false, { method: 'get' });
1577
+
1578
+ case 2:
1579
+ result = _context7.sent;
1580
+
1581
+ if (result && result.data.length) {
1582
+ result.data.forEach(function (m) {
1583
+ if (m.CardTypeEnum === 'BALANCE_CARD') {
1584
+ // 会员概念改为卡,把这些字段都放开
1585
+ _this14.paymode.updateCardInfo(m);
1586
+ }
1587
+ });
1588
+ }
1589
+
1590
+ case 4:
1591
+ case 'end':
1592
+ return _context7.stop();
1593
+ }
1594
+ }
1595
+ }, _callee7, _this14);
1596
+ }));
1597
+
1598
+ return function (_x5) {
1525
1599
  return _ref18.apply(this, arguments);
1526
1600
  };
1527
1601
  }();
1528
1602
  }
1603
+ }), _descriptor4 = _applyDecoratedDescriptor(_class.prototype, 'updateCardInfo', [_mobx.action], {
1604
+ enumerable: true,
1605
+ initializer: function initializer() {
1606
+ var _this15 = this;
1607
+
1608
+ return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
1609
+ var address, result;
1610
+ return _regenerator2.default.wrap(function _callee8$(_context8) {
1611
+ while (1) {
1612
+ switch (_context8.prev = _context8.next) {
1613
+ case 0:
1614
+ address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this15.paymode.currentMode.storageCardNo;
1615
+ _context8.next = 3;
1616
+ return (0, _tplusApi.ccApi)({}, address, false, false, { method: 'get', timeout_skip: true });
1617
+
1618
+ case 3:
1619
+ result = _context8.sent;
1620
+
1621
+ _this15.paymode.updateCardInfo(result.data);
1622
+
1623
+ case 5:
1624
+ case 'end':
1625
+ return _context8.stop();
1626
+ }
1627
+ }
1628
+ }, _callee8, _this15);
1629
+ }));
1630
+ }
1529
1631
  }), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
1530
1632
  exports.default = SettlementStore;
1531
1633
  var PayMode = exports.PayMode = (_class3 = function () {
@@ -1540,15 +1642,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
1540
1642
  this.onlineamount = 0;
1541
1643
  this.maxamount = 0;
1542
1644
 
1543
- _initDefineProp(this, 'currentFocus', _descriptor3, this);
1645
+ _initDefineProp(this, 'currentFocus', _descriptor5, this);
1646
+
1647
+ _initDefineProp(this, 'received', _descriptor6, this);
1648
+
1649
+ _initDefineProp(this, 'receivable', _descriptor7, this);
1544
1650
 
1545
- _initDefineProp(this, 'received', _descriptor4, this);
1651
+ _initDefineProp(this, 'paymodes', _descriptor8, this);
1546
1652
 
1547
- _initDefineProp(this, 'receivable', _descriptor5, this);
1653
+ _initDefineProp(this, 'thePaymodes', _descriptor9, this);
1548
1654
 
1549
- _initDefineProp(this, 'paymodes', _descriptor6, this);
1655
+ _initDefineProp(this, 'storageCardNo', _descriptor10, this);
1550
1656
 
1551
- _initDefineProp(this, 'thePaymodes', _descriptor7, this);
1657
+ _initDefineProp(this, 'balance', _descriptor11, this);
1552
1658
 
1553
1659
  this.currentMode = null;
1554
1660
  this.checkList = [];
@@ -1557,11 +1663,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
1557
1663
  hotKey: "Ctrl+M"
1558
1664
  };
1559
1665
 
1560
- _initDefineProp(this, 'calcCheckList', _descriptor8, this);
1666
+ _initDefineProp(this, 'calcCheckList', _descriptor12, this);
1561
1667
 
1562
- _initDefineProp(this, 'setCouponNum', _descriptor9, this);
1668
+ _initDefineProp(this, 'setCouponNum', _descriptor13, this);
1563
1669
 
1564
- _initDefineProp(this, 'addDjqs', _descriptor10, this);
1670
+ _initDefineProp(this, 'addDjqs', _descriptor14, this);
1565
1671
  }
1566
1672
  // @observable store = null;
1567
1673
 
@@ -1597,10 +1703,22 @@ var PayMode = exports.PayMode = (_class3 = function () {
1597
1703
  this.received = (0, _utils.getFixedNumber)(sum);
1598
1704
  this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
1599
1705
  }
1706
+ }, {
1707
+ key: 'updateCardInfo',
1708
+ value: function updateCardInfo(m) {
1709
+ this.currentMode.isNeedPassword = m.IsNeedPassword;
1710
+ this.currentMode.meStorageCardId = m.MeStorageCardId;
1711
+ this.currentMode.storageCardNo = m.StorageCardNo;
1712
+ this.currentMode.balance = m.BalanceStorage;
1713
+ this.currentMode.rawbalance = m.BalanceStorage;
1714
+ this.currentMode.cardTypeEnum = m.CardTypeEnum;
1715
+ this.currentMode.walletEnabled = m.WalletEnabled;
1716
+ this.currentMode.memberId = m.ID;
1717
+ }
1600
1718
  }, {
1601
1719
  key: 'calcDjqCheckValue',
1602
1720
  value: function calcDjqCheckValue(q1, dto, params) {
1603
- var _this14 = this;
1721
+ var _this16 = this;
1604
1722
 
1605
1723
  var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
1606
1724
  var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -1614,8 +1732,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
1614
1732
  this.checkList = [];
1615
1733
  }
1616
1734
 
1617
- var _ref19 = _mutantsUtil.platform || {},
1618
- isNewRetailBCPos = _ref19.isNewRetailBCPos;
1735
+ var _ref20 = _mutantsUtil.platform || {},
1736
+ isNewRetailBCPos = _ref20.isNewRetailBCPos;
1619
1737
 
1620
1738
  var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
1621
1739
  PayStyle = _enumController$getEn15.PayStyle,
@@ -1647,7 +1765,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1647
1765
  if (!q1.checked) {
1648
1766
  this.checkList.forEach(function (ele, i) {
1649
1767
  if (ele.id === q1.id) {
1650
- _this14.checkList.splice(i, 1);
1768
+ _this16.checkList.splice(i, 1);
1651
1769
  }
1652
1770
  });
1653
1771
  } else {
@@ -1719,24 +1837,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
1719
1837
  if (result && result.length != 0) {
1720
1838
  result.forEach(function (element, index) {
1721
1839
  var djq1 = false;
1722
- _this14.currentMode.djqs.forEach(function (djq) {
1840
+ _this16.currentMode.djqs.forEach(function (djq) {
1723
1841
  if (element.id === djq.id) {
1724
1842
  djq1 = true;
1725
1843
  }
1726
1844
  });
1727
1845
 
1728
- var _ref20 = element || {},
1729
- couponCode = _ref20.couponCode,
1730
- name = _ref20.name,
1731
- tieredAmountResult = _ref20.tieredAmountResult,
1732
- fromDate = _ref20.fromDate,
1733
- dateMount = _ref20.dateMount,
1734
- promoMethodEnum = _ref20.promoMethodEnum,
1735
- discountPct = _ref20.discountPct,
1736
- nominalAmount = _ref20.nominalAmount,
1737
- promoId = _ref20.promoId,
1738
- id = _ref20.id,
1739
- doorsill = _ref20.doorsill;
1846
+ var _ref21 = element || {},
1847
+ couponCode = _ref21.couponCode,
1848
+ name = _ref21.name,
1849
+ tieredAmountResult = _ref21.tieredAmountResult,
1850
+ fromDate = _ref21.fromDate,
1851
+ dateMount = _ref21.dateMount,
1852
+ promoMethodEnum = _ref21.promoMethodEnum,
1853
+ discountPct = _ref21.discountPct,
1854
+ nominalAmount = _ref21.nominalAmount,
1855
+ promoId = _ref21.promoId,
1856
+ id = _ref21.id,
1857
+ doorsill = _ref21.doorsill;
1740
1858
 
1741
1859
  var condValue = tieredAmountResult.condValue,
1742
1860
  promoDiscount = tieredAmountResult.promoDiscount,
@@ -1764,10 +1882,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
1764
1882
  // couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
1765
1883
  // id
1766
1884
  // })
1767
- _this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
1885
+ _this16.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
1768
1886
  djq1 = false;
1769
1887
  } else {
1770
- _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
1888
+ _this16.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
1771
1889
  // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
1772
1890
  // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
1773
1891
  }
@@ -1780,8 +1898,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
1780
1898
  }, {
1781
1899
  key: 'calcDjqValue',
1782
1900
  value: function calcDjqValue(q1) {
1783
- var _ref21 = _mutantsUtil.platform || {},
1784
- isNewRetailBCPos = _ref21.isNewRetailBCPos;
1901
+ var _ref22 = _mutantsUtil.platform || {},
1902
+ isNewRetailBCPos = _ref22.isNewRetailBCPos;
1785
1903
 
1786
1904
  var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
1787
1905
  Differentiate = _enumController$getEn16.Differentiate;
@@ -1866,28 +1984,28 @@ var PayMode = exports.PayMode = (_class3 = function () {
1866
1984
  }, {
1867
1985
  key: 'calcMemberBalance',
1868
1986
  value: function calcMemberBalance() {
1869
- this.currentMode.balance = this.currentMode.member.rawbalance - this.currentMode.value;
1987
+ this.currentMode.balance = this.currentMode.rawbalance - this.currentMode.value;
1870
1988
  }
1871
1989
  }, {
1872
1990
  key: 'setPaymodes',
1873
1991
  value: function () {
1874
- var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
1875
- var _this15 = this;
1992
+ var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type, isIntegralExchange) {
1993
+ var _this17 = this;
1876
1994
 
1877
1995
  var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
1878
1996
 
1879
- return _regenerator2.default.wrap(function _callee7$(_context7) {
1997
+ return _regenerator2.default.wrap(function _callee9$(_context9) {
1880
1998
  while (1) {
1881
- switch (_context7.prev = _context7.next) {
1999
+ switch (_context9.prev = _context9.next) {
1882
2000
  case 0:
1883
2001
  _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
1884
2002
  memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
1885
2003
  param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
1886
- _context7.next = 5;
2004
+ _context9.next = 5;
1887
2005
  return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
1888
2006
 
1889
2007
  case 5:
1890
- modes = _context7.sent;
2008
+ modes = _context9.sent;
1891
2009
 
1892
2010
  if (modes) {
1893
2011
  (0, _mobx.runInAction)(function () {
@@ -1912,21 +2030,21 @@ var PayMode = exports.PayMode = (_class3 = function () {
1912
2030
  calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
1913
2031
  });
1914
2032
  });
1915
- _this15.paymodes = paymodes;
2033
+ _this17.paymodes = paymodes;
1916
2034
  //modes.QuickSettleStyles
1917
2035
  });
1918
2036
  }
1919
2037
 
1920
2038
  case 7:
1921
2039
  case 'end':
1922
- return _context7.stop();
2040
+ return _context9.stop();
1923
2041
  }
1924
2042
  }
1925
- }, _callee7, this);
2043
+ }, _callee9, this);
1926
2044
  }));
1927
2045
 
1928
- function setPaymodes(_x5, _x6) {
1929
- return _ref22.apply(this, arguments);
2046
+ function setPaymodes(_x6, _x7) {
2047
+ return _ref23.apply(this, arguments);
1930
2048
  }
1931
2049
 
1932
2050
  return setPaymodes;
@@ -1943,47 +2061,57 @@ var PayMode = exports.PayMode = (_class3 = function () {
1943
2061
  }
1944
2062
  }]);
1945
2063
  return PayMode;
1946
- }(), (_descriptor3 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
2064
+ }(), (_descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
1947
2065
  enumerable: true,
1948
2066
  initializer: function initializer() {
1949
2067
  return "";
1950
2068
  }
1951
- }), _descriptor4 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
2069
+ }), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
1952
2070
  enumerable: true,
1953
2071
  initializer: function initializer() {
1954
2072
  return 0;
1955
2073
  }
1956
- }), _descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
2074
+ }), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
1957
2075
  enumerable: true,
1958
2076
  initializer: function initializer() {
1959
2077
  return 0;
1960
2078
  }
1961
- }), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
2079
+ }), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
1962
2080
  enumerable: true,
1963
2081
  initializer: function initializer() {
1964
2082
  return [];
1965
2083
  }
1966
- }), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
2084
+ }), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
1967
2085
  enumerable: true,
1968
2086
  initializer: function initializer() {
1969
2087
  return [];
1970
2088
  }
1971
- }), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
2089
+ }), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
1972
2090
  enumerable: true,
1973
2091
  initializer: function initializer() {
1974
- var _this16 = this;
2092
+ return null;
2093
+ }
2094
+ }), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
2095
+ enumerable: true,
2096
+ initializer: function initializer() {
2097
+ return null;
2098
+ }
2099
+ }), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
2100
+ enumerable: true,
2101
+ initializer: function initializer() {
2102
+ var _this18 = this;
1975
2103
 
1976
2104
  return function () {
1977
- _this16.checkList = [];
2105
+ _this18.checkList = [];
1978
2106
  };
1979
2107
  }
1980
- }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
2108
+ }), _applyDecoratedDescriptor(_class3.prototype, 'updateCardInfo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateCardInfo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor13 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
1981
2109
  enumerable: true,
1982
2110
  initializer: function initializer() {
1983
- var _this17 = this;
2111
+ var _this19 = this;
1984
2112
 
1985
2113
  return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
1986
- _this17.currentMode.djqs.forEach(function (ele) {
2114
+ _this19.currentMode.djqs.forEach(function (ele) {
1987
2115
  if (ele.id === id) {
1988
2116
  promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
1989
2117
  ele.couponCategoryEnum = couponNum;
@@ -1993,10 +2121,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
1993
2121
  });
1994
2122
  };
1995
2123
  }
1996
- }), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
2124
+ }), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
1997
2125
  enumerable: true,
1998
2126
  initializer: function initializer() {
1999
- var _this18 = this;
2127
+ var _this20 = this;
2000
2128
 
2001
2129
  return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
2002
2130
  var djq = {
@@ -2018,25 +2146,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
2018
2146
  couponCategoryEnum: couponCategoryEnum,
2019
2147
  id: id
2020
2148
  };
2021
- _this18.currentMode.djqs.push(djq);
2149
+ _this20.currentMode.djqs.push(djq);
2022
2150
  };
2023
2151
  }
2024
2152
  }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
2025
2153
  var Member = exports.Member = (_class5 = function () {
2026
2154
  function Member(m) {
2027
- var _this19 = this;
2155
+ var _this21 = this;
2028
2156
 
2029
2157
  (0, _classCallCheck3.default)(this, Member);
2030
2158
 
2031
- _initDefineProp(this, 'cardNo', _descriptor11, this);
2159
+ _initDefineProp(this, 'cardNo', _descriptor15, this);
2032
2160
 
2033
- _initDefineProp(this, 'balance', _descriptor12, this);
2161
+ _initDefineProp(this, 'balance', _descriptor16, this);
2034
2162
 
2035
- _initDefineProp(this, 'exchangable', _descriptor13, this);
2163
+ _initDefineProp(this, 'exchangable', _descriptor17, this);
2036
2164
 
2037
- _initDefineProp(this, 'MeStorageCardId', _descriptor14, this);
2165
+ _initDefineProp(this, 'meStorageCardId', _descriptor18, this);
2038
2166
 
2039
- _initDefineProp(this, 'StorageCardNo', _descriptor15, this);
2167
+ _initDefineProp(this, 'storageCardNo', _descriptor19, this);
2040
2168
 
2041
2169
  if (m) {
2042
2170
  this.id = m.ID;
@@ -2047,17 +2175,15 @@ var Member = exports.Member = (_class5 = function () {
2047
2175
  return key == 'canusedbalancestorage';
2048
2176
  });
2049
2177
 
2050
- var _ref23 = _mutantsUtil.platform || {},
2051
- isNewRetailBCPos = _ref23.isNewRetailBCPos;
2178
+ var _ref24 = _mutantsUtil.platform || {},
2179
+ isNewRetailBCPos = _ref24.isNewRetailBCPos;
2052
2180
 
2053
- m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
2054
- m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
2055
2181
  (0, _mobx.runInAction)(function () {
2056
- _this19.cardNo = m.CardCode;
2182
+ _this21.cardNo = m.CardCode;
2057
2183
  if (index >= 0) {
2058
- _this19.balance = parseFloat(m.DynamicPropertyValues[index]);
2184
+ _this21.balance = parseFloat(m.DynamicPropertyValues[index]);
2059
2185
  } else {
2060
- _this19.balance = _this19.rawbalance;
2186
+ _this21.balance = _this21.rawbalance;
2061
2187
  }
2062
2188
  });
2063
2189
  this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2077,32 +2203,22 @@ var Member = exports.Member = (_class5 = function () {
2077
2203
  this.cardNo = v;
2078
2204
  this.id = null;
2079
2205
  }
2080
- }, {
2081
- key: 'setMeStorageCardId',
2082
- value: function setMeStorageCardId(v) {
2083
- this.MeStorageCardId = v;
2084
- }
2085
- }, {
2086
- key: 'setStorageCardNo',
2087
- value: function setStorageCardNo(v) {
2088
- this.StorageCardNo = v;
2089
- }
2090
2206
  }]);
2091
2207
  return Member;
2092
- }(), (_descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
2208
+ }(), (_descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
2093
2209
  enumerable: true,
2094
2210
  initializer: null
2095
- }), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
2211
+ }), _descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
2096
2212
  enumerable: true,
2097
2213
  initializer: null
2098
- }), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
2214
+ }), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
2099
2215
  enumerable: true,
2100
2216
  initializer: null
2101
- }), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
2217
+ }), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
2102
2218
  enumerable: true,
2103
2219
  initializer: null
2104
- }), _descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
2220
+ }), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'storageCardNo', [_mobx.observable], {
2105
2221
  enumerable: true,
2106
2222
  initializer: null
2107
- }), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setMeStorageCardId', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setMeStorageCardId'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setStorageCardNo'), _class5.prototype)), _class5);
2223
+ }), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype)), _class5);
2108
2224
  //# sourceMappingURL=settlementStore.js.map