tplus-components-touch 3.19.1 → 3.20.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/dist/components/cloudPrint/api.js +1 -1
  2. package/dist/components/cloudPrint/api.js.map +1 -1
  3. package/dist/components/cloudPrint/index.js +24 -48
  4. package/dist/components/cloudPrint/index.js.map +1 -1
  5. package/dist/components/inventorySearch/index.js +12 -3
  6. package/dist/components/inventorySearch/index.js.map +1 -1
  7. package/dist/components/inventorySearch/index.less +6 -2
  8. package/dist/components/keyboard/index.js +1 -1
  9. package/dist/components/keyboard/index.js.map +1 -1
  10. package/dist/components/settlement/asyncModal.js +4 -0
  11. package/dist/components/settlement/asyncModal.js.map +1 -1
  12. package/dist/components/settlement/prototypeTable/index.js +349 -0
  13. package/dist/components/settlement/prototypeTable/index.js.map +1 -0
  14. package/dist/components/settlement/prototypeTable/style.less +59 -0
  15. package/dist/components/settlement/prototypeTable/utils.js +14 -0
  16. package/dist/components/settlement/prototypeTable/utils.js.map +1 -0
  17. package/dist/components/settlement/settlement.js +469 -149
  18. package/dist/components/settlement/settlement.js.map +1 -1
  19. package/dist/components/settlement/settlement.less +48 -3
  20. package/dist/components/settlement/settlementStore.js +185 -79
  21. package/dist/components/settlement/settlementStore.js.map +1 -1
  22. package/dist/components/ticon/iconfont/demo.css +539 -539
  23. package/dist/components/ticon/iconfont/demo_index.html +325 -3
  24. package/dist/components/ticon/iconfont/iconfont.css +59 -3
  25. package/dist/components/ticon/iconfont/iconfont.js +12 -10
  26. package/dist/components/ticon/iconfont/iconfont.js.map +1 -1
  27. package/dist/components/ticon/iconfont/iconfont.json +98 -0
  28. package/dist/components/ticon/iconfont/iconfont.ttf +0 -0
  29. package/dist/components/ticon/iconfont/iconfont.woff +0 -0
  30. package/dist/components/ticon/iconfont/iconfont.woff2 +0 -0
  31. package/dist/index.js +2 -17
  32. package/dist/index.js.map +1 -1
  33. package/package.json +35 -35
  34. package/dist/components/cloudPrint/printDispatch.js +0 -223
  35. package/dist/components/cloudPrint/printDispatch.js.map +0 -1
@@ -31,7 +31,7 @@
31
31
 
32
32
  .scanInput {
33
33
  // border-top:1px solid #E6E6EB;
34
- padding-top:20px;
34
+ // padding-top:20px;
35
35
  border-radius: 6px;
36
36
  .icon{
37
37
  text-align: center;
@@ -127,6 +127,21 @@
127
127
  padding-left:0px;
128
128
  }
129
129
  }
130
+ .prototype {
131
+ padding-bottom: 10px;
132
+ .economize {
133
+ font-size: 18px;
134
+ }
135
+ .prototypeDetailed {
136
+ font-size: 18px;
137
+ position: relative;
138
+ .iconfont {
139
+ font-size: 10px;
140
+ position: absolute;
141
+ top: 6px;
142
+ }
143
+ }
144
+ }
130
145
  }
131
146
  .buttonRegion2{
132
147
  margin-top:14px !important;
@@ -503,6 +518,9 @@
503
518
  .settlement-wraper2[role='dialog']{
504
519
  z-index: 1006 !important;
505
520
  }
521
+ .protoWraper[role='dialog'] {
522
+ z-index: 1006 !important;
523
+ }
506
524
  .settlement-wraper2{
507
525
  .ant-modal-body{
508
526
  padding:0px !important;
@@ -516,7 +534,6 @@
516
534
  }
517
535
  .settlement{
518
536
  width:100%;
519
-
520
537
  .settlementTop {
521
538
  display : flex;
522
539
  align-items: center;
@@ -525,6 +542,10 @@
525
542
  height: calc(~"100vh - 115px");
526
543
  display: flex;
527
544
  flex-flow: column;
545
+ .prototypeDetailed {
546
+ font-size: 18px;
547
+ margin-bottom: 0 !important;
548
+ }
528
549
  }
529
550
  .newstyle2{
530
551
  .name {
@@ -546,6 +567,18 @@
546
567
  // max-height: calc(~"100% - 200px");
547
568
  // max-height: 200px;
548
569
  overflow-y: auto;
570
+ .prototypeDetailed {
571
+ text-align: right;
572
+ font-size: 18px;
573
+ margin-bottom: 26px;
574
+ display: flex;
575
+ justify-content: flex-end;
576
+ align-items: center;
577
+ cursor: pointer;
578
+ .icon-shouqi1 {
579
+ font-size: 6px;
580
+ }
581
+ }
549
582
  .detailempty{
550
583
  padding-top:200px;
551
584
  }
@@ -650,7 +683,7 @@
650
683
  background: #EAF6FE;
651
684
  border-radius: 6px;
652
685
  padding: 16px 16px 0px 16px;
653
- margin-bottom: 24px;
686
+ margin-bottom: 8px;
654
687
  }
655
688
 
656
689
  .keyboard {
@@ -1395,6 +1428,18 @@
1395
1428
  border: 1px solid #C8C8CD;
1396
1429
  border-radius: 2px;
1397
1430
  }
1431
+ .economize {
1432
+ font-size: 18px;
1433
+ }
1434
+ .prototypeDetailed {
1435
+ font-size: 18px;
1436
+ position: relative;
1437
+ .iconfont {
1438
+ font-size: 10px;
1439
+ position: absolute;
1440
+ top: 6px;
1441
+ }
1442
+ }
1398
1443
  }
1399
1444
  .error{
1400
1445
  height:16px;
@@ -99,12 +99,12 @@ var _message2 = _interopRequireDefault(_message);
99
99
 
100
100
  var _mutantsUtil = require('mutants-util');
101
101
 
102
- var _tplusComponentsTouch = require('tplus-components-touch');
103
-
104
102
  var _moment = require('moment');
105
103
 
106
104
  var _moment2 = _interopRequireDefault(_moment);
107
105
 
106
+ var _tplusComponentsTouch = require('tplus-components-touch');
107
+
108
108
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
109
109
 
110
110
  function _initDefineProp(target, property, descriptor, context) {
@@ -398,6 +398,7 @@ var SettlementStore = (_class = function () {
398
398
  this.paymode = new PayMode();
399
399
  var params = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('cloudPrintArguments');
400
400
  if (params) this.cloudPrintArguments = params;
401
+ this.printUtil = new _tplusComponentsTouch.PrintUtil();
401
402
  this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
402
403
  }
403
404
 
@@ -620,49 +621,93 @@ var SettlementStore = (_class = function () {
620
621
 
621
622
  var address = '';
622
623
  if (isNewRetailBCPos) {
623
- address = 'chanjet.AA.DR.INewRetailMember.SearchMember';
624
+ // address = '/member/memberProfile/FindByStorageCode/'+v;
625
+ address = '/member/MeMemberWallet/FindByStorageCode';
626
+ return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function (result) {
627
+ var data = result.data;
628
+ var m = data;
629
+
630
+ var _ref8 = _mutantsUtil.platform || {},
631
+ isNewRetailBCPos = _ref8.isNewRetailBCPos;
632
+
633
+ if (isNewRetailBCPos) {
634
+ _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
635
+ _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
636
+ _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
637
+ _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
638
+ }
639
+ if (!m || !m.ID) {
640
+ (0, _mobx.runInAction)(function () {
641
+ _this7.paymode.currentMode.errinfo = "无效的会员卡号";
642
+ });
643
+ } else {
644
+ (0, _mobx.runInAction)(function () {
645
+ _this7.paymode.currentMode.errinfo = "";
646
+ _this7.paymode.currentMode.member = new Member(m);
647
+ _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
648
+ _this7.updateEvent();
649
+ var message = '';
650
+ if (global.CheckMemberStorageProcessorBlock) {
651
+ message = CheckMemberStorageProcessorBlock.execute(m);
652
+ }
653
+ if (!String.isNullOrEmpty(message)) {
654
+ _this7.paymode.currentMode.errinfo = message;
655
+ } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
656
+ _this7.paymode.currentMode.errinfo = "余额不足";
657
+ } else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
658
+ _this7.paymode.currentMode.errinfo = "实收金额必须录入";
659
+ } else {
660
+ // 查询成功后将焦点移入下一个输入框
661
+ var nextInput = document.querySelector('.czk .received .input');
662
+ nextInput && nextInput.focus();
663
+ }
664
+ });
665
+ }
666
+ });
624
667
  } else {
625
668
  address = 'AA.DR.newRetailMember.SearchMember';
669
+ return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
670
+ var data = JSON.parse(result.Data);
671
+ var m = data && data.length > 0 && data[0];
672
+
673
+ var _ref9 = _mutantsUtil.platform || {},
674
+ isNewRetailBCPos = _ref9.isNewRetailBCPos;
675
+
676
+ if (isNewRetailBCPos) {
677
+ _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
678
+ _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
679
+ _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
680
+ _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
681
+ }
682
+ if (!m || !m.ID) {
683
+ (0, _mobx.runInAction)(function () {
684
+ _this7.paymode.currentMode.errinfo = "无效的会员卡号";
685
+ });
686
+ } else {
687
+ (0, _mobx.runInAction)(function () {
688
+ _this7.paymode.currentMode.errinfo = "";
689
+ _this7.paymode.currentMode.member = new Member(m);
690
+ _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
691
+ _this7.updateEvent();
692
+ var message = '';
693
+ if (global.CheckMemberStorageProcessorBlock) {
694
+ message = CheckMemberStorageProcessorBlock.execute(data[0]);
695
+ }
696
+ if (!String.isNullOrEmpty(message)) {
697
+ _this7.paymode.currentMode.errinfo = message;
698
+ } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
699
+ _this7.paymode.currentMode.errinfo = "余额不足";
700
+ } else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
701
+ _this7.paymode.currentMode.errinfo = "实收金额必须录入";
702
+ } else {
703
+ // 查询成功后将焦点移入下一个输入框
704
+ var nextInput = document.querySelector('.czk .received .input');
705
+ nextInput && nextInput.focus();
706
+ }
707
+ });
708
+ }
709
+ });
626
710
  }
627
- return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
628
- var data = JSON.parse(result.Data);
629
- var m = data && data.length > 0 && data[0];
630
-
631
- var _ref8 = _mutantsUtil.platform || {},
632
- isNewRetailBCPos = _ref8.isNewRetailBCPos;
633
-
634
- if (isNewRetailBCPos) {
635
- _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
636
- _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
637
- }
638
- if (!m || !m.ID) {
639
- (0, _mobx.runInAction)(function () {
640
- _this7.paymode.currentMode.errinfo = "无效的会员卡号";
641
- });
642
- } else {
643
- (0, _mobx.runInAction)(function () {
644
- _this7.paymode.currentMode.errinfo = "";
645
- _this7.paymode.currentMode.member = new Member(m);
646
- _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
647
- _this7.updateEvent();
648
- var message = '';
649
- if (global.CheckMemberStorageProcessorBlock) {
650
- message = CheckMemberStorageProcessorBlock.execute(data[0]);
651
- }
652
- if (!String.isNullOrEmpty(message)) {
653
- _this7.paymode.currentMode.errinfo = message;
654
- } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
655
- _this7.paymode.currentMode.errinfo = "余额不足";
656
- } else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
657
- _this7.paymode.currentMode.errinfo = "实收金额必须录入";
658
- } else {
659
- // 查询成功后将焦点移入下一个输入框
660
- var nextInput = document.querySelector('.czk .received .input');
661
- nextInput && nextInput.focus();
662
- }
663
- });
664
- }
665
- });
666
711
  }
667
712
  }, {
668
713
  key: 'addDjq',
@@ -912,7 +957,7 @@ var SettlementStore = (_class = function () {
912
957
  }, {
913
958
  key: 'commit',
914
959
  value: function () {
915
- var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
960
+ var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
916
961
  return _regenerator2.default.wrap(function _callee2$(_context2) {
917
962
  while (1) {
918
963
  switch (_context2.prev = _context2.next) {
@@ -967,17 +1012,11 @@ var SettlementStore = (_class = function () {
967
1012
  }));
968
1013
 
969
1014
  function commit(_x2) {
970
- return _ref9.apply(this, arguments);
1015
+ return _ref10.apply(this, arguments);
971
1016
  }
972
1017
 
973
1018
  return commit;
974
1019
  }()
975
- }, {
976
- key: 'handlePrint',
977
- value: function handlePrint(resp) {
978
- // 储值打印
979
- return (0, _tplusComponentsTouch.printDispatch)(_tplusComponentsTouch.DoNameList.DO_STORAGE_PRINT, resp.ID, {});
980
- }
981
1020
  }, {
982
1021
  key: 'saveMember',
983
1022
  value: function saveMember() {
@@ -1019,16 +1058,80 @@ var SettlementStore = (_class = function () {
1019
1058
  IPMSG = JSON.parse(window.localStorage.IPMSG);
1020
1059
  }
1021
1060
  return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
1022
- _this10.handlePrint(resp);
1061
+ var _ref11 = _mutantsUtil.platform || {},
1062
+ isHorizontalPad = _ref11.isHorizontalPad,
1063
+ isHorizontalSunMi = _ref11.isHorizontalSunMi;
1064
+
1065
+ if (isHorizontalPad === true) {
1066
+ // pad打印
1067
+ //执行移动端云打印
1068
+ if (_this10.cloudPrintArguments) {
1069
+ var _ref12 = _this10.cloudPrintArguments || {},
1070
+ Open = _ref12.Open,
1071
+ Key = _ref12.Key,
1072
+ Sign = _ref12.Sign,
1073
+ Name = _ref12.Name,
1074
+ Card = _ref12.Card;
1075
+
1076
+ if (!Open) {
1077
+ _message2.default.warn(t('云打印未启用,请设置。'));
1078
+ return;
1079
+ }
1080
+ _this10.printUtil.doStoragePrint({ Key: Key, Sign: Sign, Name: Name, Card: Card }, resp.ID, function (s) {
1081
+ var msg = s.msg,
1082
+ ret = s.ret;
1083
+
1084
+ if (ret === 0) {
1085
+ _message2.default.success(t('打印储值小票成功。'));
1086
+ } else if (ret === -1) {
1087
+ _message2.default.error(t(msg));
1088
+ } else {
1089
+ _message2.default.error(t('打印储值小票失败。'));
1090
+ }
1091
+ });
1092
+ } else {
1093
+ _message2.default.warn(t('云打印未启用,请设置。'));
1094
+ }
1095
+ return;
1096
+ } else if (isHorizontalSunMi === true) {
1097
+ _this10.printUtil.doStoragePrint({}, resp.ID, function (s) {
1098
+ var msg = s.msg,
1099
+ ret = s.ret;
1100
+
1101
+ if (ret === 0) {
1102
+ _message2.default.success(t('打印储值小票成功。'));
1103
+ } else if (ret === -1) {
1104
+ _message2.default.error(t(msg));
1105
+ } else {
1106
+ _message2.default.error(t('打印储值小票失败。'));
1107
+ }
1108
+ });
1109
+ return;
1110
+ } else {
1111
+ if (global.StoragePrintProcessBlock) {
1112
+ var _ref13 = _mutantsUtil.platform || {},
1113
+ isNewRetailBCPos = _ref13.isNewRetailBCPos;
1114
+
1115
+ if (isNewRetailBCPos) {
1116
+ global.StoragePrintProcessBlock.execute(resp);
1117
+ } else {
1118
+ global.StoragePrintProcessBlock.execute(resp.ID);
1119
+ }
1120
+ return;
1121
+ } else {
1122
+ _message2.default.warn(t('打印小票只能在客户端中执行'));
1123
+ return;
1124
+ }
1125
+ }
1023
1126
  });
1024
1127
  }
1025
1128
  }, {
1026
1129
  key: 'save',
1027
1130
  value: function () {
1028
- var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
1131
+ var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
1029
1132
  var _this11 = this;
1030
1133
 
1031
- var _enumController$getEn13, PayStyle, _ref12, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1134
+ var _enumController$getEn13, PayStyle, _ref16, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1032
1135
 
1033
1136
  return _regenerator2.default.wrap(function _callee3$(_context3) {
1034
1137
  while (1) {
@@ -1042,19 +1145,21 @@ var SettlementStore = (_class = function () {
1042
1145
  _this11.dto.RetailCouponDetails = [];
1043
1146
  var czkSum = 0;
1044
1147
  var Idmember = _this11.dto.Idmember;
1148
+ var count = 0;
1045
1149
  var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
1046
1150
  return parseFloat(mode.value) != 0;
1047
1151
  }) : _this11.paymode.thePaymodes;
1048
- (0, _each3.default)(thePaymodes, function (mode) {
1152
+ (0, _each3.default)(thePaymodes, function (mode, index) {
1049
1153
  var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
1050
1154
  if (mode.paymentType == PayStyle.hyczk) {
1051
1155
  if (!Idmember) {
1052
1156
  Idmember = mode.member.id;
1053
1157
  }
1054
1158
  czkSum = Math.Add(czkSum, mode.value);
1055
-
1159
+ var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this11.member.MeStorageCardId;
1056
1160
  _this11.dto.RetailStorageDetails.push({
1057
1161
  Code: mode.paymethodId,
1162
+ MeStorageCardId: MeStorageCardId,
1058
1163
  StoragePaymentAmount: mode.value,
1059
1164
  IsOrigReturn: false,
1060
1165
  BalanceStorage: mode.balance,
@@ -1108,15 +1213,15 @@ var SettlementStore = (_class = function () {
1108
1213
  }
1109
1214
  });
1110
1215
 
1111
- var _ref11 = _mutantsUtil.platform || {},
1112
- isNewRetailBCPos = _ref11.isNewRetailBCPos;
1216
+ var _ref15 = _mutantsUtil.platform || {},
1217
+ isNewRetailBCPos = _ref15.isNewRetailBCPos;
1113
1218
 
1114
1219
  if (_this11.dto.RetailStorageDetails.length > 0) {
1115
1220
  var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
1116
1221
  if (isNewRetailBCPos) {
1117
- _this11.dto.RetailStorageDetails && _this11.dto.RetailStorageDetails.forEach(function (value) {
1118
- value.MeStorageCardId = _this11.member.MeStorageCardId;
1119
- });
1222
+ // this.dto.RetailStorageDetails && this.dto.RetailStorageDetails.forEach((value, index) => {
1223
+ // value.MeStorageCardId = (mode.MeStorageCardId ? mode.MeStorageCardId : this.member.MeStorageCardId);
1224
+ // })
1120
1225
  _this11.dto.RetailPaymentDetails.push({
1121
1226
  Code: _this11.paymode.counter,
1122
1227
  OrigAmount: czkSum,
@@ -1143,7 +1248,7 @@ var SettlementStore = (_class = function () {
1143
1248
  _this11.dto.Idmember = Idmember;
1144
1249
  }
1145
1250
  });
1146
- _ref12 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref12.isNewRetailBCPos;
1251
+ _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
1147
1252
 
1148
1253
  console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
1149
1254
 
@@ -1212,7 +1317,7 @@ var SettlementStore = (_class = function () {
1212
1317
  }));
1213
1318
 
1214
1319
  function save() {
1215
- return _ref10.apply(this, arguments);
1320
+ return _ref14.apply(this, arguments);
1216
1321
  }
1217
1322
 
1218
1323
  return save;
@@ -1225,7 +1330,7 @@ var SettlementStore = (_class = function () {
1225
1330
  }, {
1226
1331
  key: 'querySettleResult',
1227
1332
  value: function () {
1228
- var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
1333
+ var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
1229
1334
  return _regenerator2.default.wrap(function _callee4$(_context4) {
1230
1335
  while (1) {
1231
1336
  switch (_context4.prev = _context4.next) {
@@ -1253,7 +1358,7 @@ var SettlementStore = (_class = function () {
1253
1358
  }));
1254
1359
 
1255
1360
  function querySettleResult() {
1256
- return _ref13.apply(this, arguments);
1361
+ return _ref17.apply(this, arguments);
1257
1362
  }
1258
1363
 
1259
1364
  return querySettleResult;
@@ -1279,14 +1384,14 @@ var SettlementStore = (_class = function () {
1279
1384
  }, {
1280
1385
  key: 'validePwd',
1281
1386
  value: function () {
1282
- var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
1283
- var _ref15, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
1387
+ var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
1388
+ var _ref19, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
1284
1389
 
1285
1390
  return _regenerator2.default.wrap(function _callee5$(_context5) {
1286
1391
  while (1) {
1287
1392
  switch (_context5.prev = _context5.next) {
1288
1393
  case 0:
1289
- _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
1394
+ _ref19 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref19.isNewRetailBCPos;
1290
1395
  _context5.prev = 1;
1291
1396
 
1292
1397
  if (!isNewRetailBCPos) {
@@ -1370,7 +1475,7 @@ var SettlementStore = (_class = function () {
1370
1475
  }));
1371
1476
 
1372
1477
  function validePwd(_x3) {
1373
- return _ref14.apply(this, arguments);
1478
+ return _ref18.apply(this, arguments);
1374
1479
  }
1375
1480
 
1376
1481
  return validePwd;
@@ -1409,7 +1514,7 @@ var SettlementStore = (_class = function () {
1409
1514
  var _this13 = this;
1410
1515
 
1411
1516
  return function () {
1412
- var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
1517
+ var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
1413
1518
  var _getLoginInfo, IdStore, StoreCode, resp;
1414
1519
 
1415
1520
  return _regenerator2.default.wrap(function _callee6$(_context6) {
@@ -1436,7 +1541,7 @@ var SettlementStore = (_class = function () {
1436
1541
  }));
1437
1542
 
1438
1543
  return function (_x4) {
1439
- return _ref16.apply(this, arguments);
1544
+ return _ref20.apply(this, arguments);
1440
1545
  };
1441
1546
  }();
1442
1547
  }
@@ -1507,8 +1612,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
1507
1612
  value: function calcDjqValue(q1) {
1508
1613
  var _this14 = this;
1509
1614
 
1510
- var _ref17 = _mutantsUtil.platform || {},
1511
- isNewRetailBCPos = _ref17.isNewRetailBCPos;
1615
+ var _ref21 = _mutantsUtil.platform || {},
1616
+ isNewRetailBCPos = _ref21.isNewRetailBCPos;
1512
1617
 
1513
1618
  var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
1514
1619
  Differentiate = _enumController$getEn14.Differentiate;
@@ -1585,7 +1690,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1585
1690
  }, {
1586
1691
  key: 'setPaymodes',
1587
1692
  value: function () {
1588
- var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
1693
+ var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
1589
1694
  var _this15 = this;
1590
1695
 
1591
1696
  var _enumController$getEn15, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
@@ -1639,7 +1744,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1639
1744
  }));
1640
1745
 
1641
1746
  function setPaymodes(_x5, _x6) {
1642
- return _ref18.apply(this, arguments);
1747
+ return _ref22.apply(this, arguments);
1643
1748
  }
1644
1749
 
1645
1750
  return setPaymodes;
@@ -1694,7 +1799,7 @@ var Member = exports.Member = (_class5 = function () {
1694
1799
 
1695
1800
  _initDefineProp(this, 'exchangable', _descriptor10, this);
1696
1801
 
1697
- _initDefineProp(this, 'meStorageCardId', _descriptor11, this);
1802
+ _initDefineProp(this, 'MeStorageCardId', _descriptor11, this);
1698
1803
 
1699
1804
  _initDefineProp(this, 'StorageCardNo', _descriptor12, this);
1700
1805
 
@@ -1707,10 +1812,11 @@ var Member = exports.Member = (_class5 = function () {
1707
1812
  return key == 'canusedbalancestorage';
1708
1813
  });
1709
1814
 
1710
- var _ref19 = _mutantsUtil.platform || {},
1711
- isNewRetailBCPos = _ref19.isNewRetailBCPos;
1815
+ var _ref23 = _mutantsUtil.platform || {},
1816
+ isNewRetailBCPos = _ref23.isNewRetailBCPos;
1712
1817
 
1713
1818
  m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
1819
+ m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
1714
1820
  (0, _mobx.runInAction)(function () {
1715
1821
  _this16.cardNo = m.CardCode;
1716
1822
  if (index >= 0) {
@@ -1739,7 +1845,7 @@ var Member = exports.Member = (_class5 = function () {
1739
1845
  }, {
1740
1846
  key: 'setMeStorageCardId',
1741
1847
  value: function setMeStorageCardId(v) {
1742
- this.meStorageCardId = v;
1848
+ this.MeStorageCardId = v;
1743
1849
  }
1744
1850
  }, {
1745
1851
  key: 'setStorageCardNo',
@@ -1757,7 +1863,7 @@ var Member = exports.Member = (_class5 = function () {
1757
1863
  }), _descriptor10 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
1758
1864
  enumerable: true,
1759
1865
  initializer: null
1760
- }), _descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
1866
+ }), _descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
1761
1867
  enumerable: true,
1762
1868
  initializer: null
1763
1869
  }), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {