tplus-components-touch 3.26.3 → 3.26.7

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 (6) hide show
  1. package/dist/components/settlement/settlement.js +317 -308
  2. package/dist/components/settlement/settlement.js.map +1 -1
  3. package/dist/components/settlement/settlement.less +3 -0
  4. package/dist/components/settlement/settlementStore.js +242 -195
  5. package/dist/components/settlement/settlementStore.js.map +1 -1
  6. package/package.json +1 -1
package/dist/components/settlement/settlementStore.js CHANGED
@@ -182,6 +182,40 @@ var SettlementStore = (_class = function () {
182
182
 
183
183
  _initDefineProp(this, 'updateCardInfo', _descriptor4, this);
184
184
 
185
+ this.handleCzkData = function (m) {
186
+ if (!m || !m.StorageCardNo) {
187
+ (0, _mobx.runInAction)(function () {
188
+ _this2.paymode.currentMode.errinfo = "无效的会员卡号";
189
+ });
190
+ } else {
191
+ (0, _mobx.runInAction)(function () {
192
+ _this2.paymode.currentMode.errinfo = "";
193
+ _this2.paymode.currentMode.memberId = m.ID;
194
+ _this2.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this2.brefund ? _this2.paymode.receivable : Math.max(_this2.paymode.receivable, 0));
195
+ _this2.updateEvent();
196
+ var message = '';
197
+ var sum = (0, _reduce3.default)(_this2.paymode.thePaymodes, function (total, cur) {
198
+ return total + cur.value;
199
+ }, 0);
200
+ // 对于卡不用判断会员的一些信息
201
+ // if (global.CheckMemberStorageProcessorBlock ) {
202
+ // message= CheckMemberStorageProcessorBlock.execute(m);
203
+ // }
204
+ if (!String.isNullOrEmpty(message)) {
205
+ _this2.paymode.currentMode.errinfo = message;
206
+ } else if (_this2.checkReceived(_this2.paymode.currentMode, "balance")) {
207
+ _this2.paymode.currentMode.errinfo = "余额不足";
208
+ } else if (_this2.paymode.amount > 0 && parseFloat(_this2.paymode.amount) !== sum && _this2.paymode.currentMode.value == 0) {
209
+ _this2.paymode.currentMode.errinfo = "实收金额必须录入";
210
+ } else {
211
+ // 查询成功后将焦点移入下一个输入框
212
+ var nextInput = document.querySelector('.czk .received .input');
213
+ nextInput && nextInput.select();
214
+ }
215
+ });
216
+ }
217
+ };
218
+
185
219
  this.getCouponList = function (coupon_code) {
186
220
  var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
187
221
  PayStyle = _enumController$getEn.PayStyle,
@@ -545,13 +579,23 @@ var SettlementStore = (_class = function () {
545
579
  }
546
580
  });
547
581
  (0, _each3.default)(this.dto.RetailStorageDetails, function (detail) {
548
- var balanceAmount = detail.Member.BalanceStorage;
549
- balanceAmount = balanceAmount - detail.StoragePaymentAmount;
582
+ var balanceAmount = null;
583
+ var storageCardNo = null;
584
+ var meStorageCardId = null;
585
+ detail.DynamicPropertyKeys.forEach(function (ele, index) {
586
+ if (ele === "mestoragecard") {
587
+ balanceAmount = detail.DynamicPropertyValues[index].BalanceStorage - detail.StoragePaymentAmount;
588
+ storageCardNo = detail.DynamicPropertyValues[index].StorageCardNo;
589
+ meStorageCardId = detail.DynamicPropertyValues[index].meStorageCardId;
590
+ }
591
+ });
550
592
  var newmode = (0, _extends3.default)({}, _this5.genNewMode(PayStyle.hyczk, false, detail.StoragePaymentAmount), {
551
- member: new Member(detail.Member),
552
- authCode: detail.Password,
593
+ member: new Member(detail.Member ? detail.Member : null),
594
+ authCode: detail.Password ? detail.Password : null,
553
595
  balance: balanceAmount,
554
- boriginReturn: true
596
+ boriginReturn: true,
597
+ meStorageCardId: meStorageCardId ? meStorageCardId : detail.MeStorageCardId,
598
+ storageCardNo: storageCardNo ? storageCardNo : detail.StorageCardNo
555
599
  });
556
600
  _this5.paymode.thePaymodes.push(newmode);
557
601
  });
@@ -641,43 +685,51 @@ var SettlementStore = (_class = function () {
641
685
  var address = '';
642
686
  if (isNewRetailBCPos) {
643
687
  // address = '/member/memberProfile/FindByStorageCode/'+v;
644
- address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v;
645
- return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function (result) {
646
- var data = result.data;
647
- var m = data && data.length && data[0];
648
- _this7.paymode.updateCardInfo(m);
649
- if (!m || !m.StorageCardNo) {
650
- (0, _mobx.runInAction)(function () {
651
- _this7.paymode.currentMode.errinfo = "无效的会员卡号";
652
- });
653
- } else {
654
- (0, _mobx.runInAction)(function () {
655
- _this7.paymode.currentMode.errinfo = "";
656
- _this7.paymode.currentMode.memberId = m.ID;
657
- _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
658
- _this7.updateEvent();
659
- var message = '';
660
- var sum = (0, _reduce3.default)(_this7.paymode.thePaymodes, function (total, cur) {
661
- return total + cur.value;
662
- }, 0);
663
- // 对于卡不用判断会员的一些信息
664
- // if (global.CheckMemberStorageProcessorBlock ) {
665
- // message= CheckMemberStorageProcessorBlock.execute(m);
666
- // }
667
- if (!String.isNullOrEmpty(message)) {
668
- _this7.paymode.currentMode.errinfo = message;
669
- } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
670
- _this7.paymode.currentMode.errinfo = "余额不足";
671
- } else if (_this7.paymode.amount > 0 && parseFloat(_this7.paymode.amount) !== sum && _this7.paymode.currentMode.value == 0) {
672
- _this7.paymode.currentMode.errinfo = "实收金额必须录入";
673
- } else {
674
- // 查询成功后将焦点移入下一个输入框
675
- var nextInput = document.querySelector('.czk .received .input');
676
- nextInput && nextInput.select();
688
+ address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
689
+ return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
690
+ var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(result) {
691
+ var data, m;
692
+ return _regenerator2.default.wrap(function _callee2$(_context2) {
693
+ while (1) {
694
+ switch (_context2.prev = _context2.next) {
695
+ case 0:
696
+ data = result.data;
697
+ m = data && data.length && data[0];
698
+
699
+ if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
700
+ _context2.next = 7;
701
+ break;
702
+ }
703
+
704
+ _this7.paymode.updateCardInfo(m);
705
+ _this7.handleCzkData(m);
706
+ _context2.next = 9;
707
+ break;
708
+
709
+ case 7:
710
+ _context2.next = 9;
711
+ return (0, _tplusApi.ccApi)({ dto: _this7.dto, meStorageCardId: m.MeStorageCardId }, '/retail/RetailPos/validateRetailStorageCard', false, false).then(function (result1) {
712
+ var data1 = result1.data ? JSON.parse(result1.data)[0] : {};
713
+ if (data1.enable) {
714
+ _this7.paymode.updateCardInfo(m);
715
+ _this7.handleCzkData(m);
716
+ } else {
717
+ _message2.default.warn(data1.disableReason);
718
+ }
719
+ });
720
+
721
+ case 9:
722
+ case 'end':
723
+ return _context2.stop();
724
+ }
677
725
  }
678
- });
679
- }
680
- });
726
+ }, _callee2, _this7);
727
+ }));
728
+
729
+ return function (_x2) {
730
+ return _ref9.apply(this, arguments);
731
+ };
732
+ }());
681
733
  } else {
682
734
  address = 'AA.DR.newRetailMember.SearchMember';
683
735
  return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
@@ -993,80 +1045,80 @@ var SettlementStore = (_class = function () {
993
1045
  }, {
994
1046
  key: 'commit',
995
1047
  value: function () {
996
- var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
997
- var _ref10, isNewRetailBCPos;
1048
+ var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(bTest) {
1049
+ var _ref11, isNewRetailBCPos;
998
1050
 
999
- return _regenerator2.default.wrap(function _callee2$(_context2) {
1051
+ return _regenerator2.default.wrap(function _callee3$(_context3) {
1000
1052
  while (1) {
1001
- switch (_context2.prev = _context2.next) {
1053
+ switch (_context3.prev = _context3.next) {
1002
1054
  case 0:
1003
1055
  console.log('settlementStore.commit开始，参数：' + bTest);
1004
1056
 
1005
1057
  if (!bTest) {
1006
- _context2.next = 3;
1058
+ _context3.next = 3;
1007
1059
  break;
1008
1060
  }
1009
1061
 
1010
- return _context2.abrupt('return', _promise2.default.resolve(true));
1062
+ return _context3.abrupt('return', _promise2.default.resolve(true));
1011
1063
 
1012
1064
  case 3:
1013
- _ref10 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref10.isNewRetailBCPos;
1014
- _context2.prev = 4;
1065
+ _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
1066
+ _context3.prev = 4;
1015
1067
 
1016
1068
  if (!(this.type == 1)) {
1017
- _context2.next = 10;
1069
+ _context3.next = 10;
1018
1070
  break;
1019
1071
  }
1020
1072
 
1021
- _context2.next = 8;
1073
+ _context3.next = 8;
1022
1074
  return this.saveMember();
1023
1075
 
1024
1076
  case 8:
1025
- _context2.next = 18;
1077
+ _context3.next = 18;
1026
1078
  break;
1027
1079
 
1028
1080
  case 10:
1029
1081
  if (!isNewRetailBCPos) {
1030
- _context2.next = 13;
1082
+ _context3.next = 13;
1031
1083
  break;
1032
1084
  }
1033
1085
 
1034
- _context2.next = 13;
1086
+ _context3.next = 13;
1035
1087
  return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
1036
1088
 
1037
1089
  case 13:
1038
- _context2.next = 15;
1090
+ _context3.next = 15;
1039
1091
  return this.save();
1040
1092
 
1041
1093
  case 15:
1042
1094
  if (!isNewRetailBCPos) {
1043
- _context2.next = 18;
1095
+ _context3.next = 18;
1044
1096
  break;
1045
1097
  }
1046
1098
 
1047
- _context2.next = 18;
1099
+ _context3.next = 18;
1048
1100
  return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
1049
1101
 
1050
1102
  case 18:
1051
- return _context2.abrupt('return', _promise2.default.resolve(true));
1103
+ return _context3.abrupt('return', _promise2.default.resolve(true));
1052
1104
 
1053
1105
  case 21:
1054
- _context2.prev = 21;
1055
- _context2.t0 = _context2['catch'](4);
1106
+ _context3.prev = 21;
1107
+ _context3.t0 = _context3['catch'](4);
1056
1108
 
1057
- console.error('settlementStore.commit失败，错误信息：' + _context2.t0);
1058
- return _context2.abrupt('return', _promise2.default.resolve(_context2.t0));
1109
+ console.error('settlementStore.commit失败，错误信息：' + _context3.t0);
1110
+ return _context3.abrupt('return', _promise2.default.resolve(_context3.t0));
1059
1111
 
1060
1112
  case 25:
1061
1113
  case 'end':
1062
- return _context2.stop();
1114
+ return _context3.stop();
1063
1115
  }
1064
1116
  }
1065
- }, _callee2, this, [[4, 21]]);
1117
+ }, _callee3, this, [[4, 21]]);
1066
1118
  }));
1067
1119
 
1068
- function commit(_x2) {
1069
- return _ref9.apply(this, arguments);
1120
+ function commit(_x3) {
1121
+ return _ref10.apply(this, arguments);
1070
1122
  }
1071
1123
 
1072
1124
  return commit;
@@ -1124,14 +1176,14 @@ var SettlementStore = (_class = function () {
1124
1176
  }, {
1125
1177
  key: 'save',
1126
1178
  value: function () {
1127
- var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
1179
+ var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
1128
1180
  var _this11 = this;
1129
1181
 
1130
- var _enumController$getEn14, PayStyle, _ref13, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1182
+ var _enumController$getEn14, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1131
1183
 
1132
- return _regenerator2.default.wrap(function _callee3$(_context3) {
1184
+ return _regenerator2.default.wrap(function _callee4$(_context4) {
1133
1185
  while (1) {
1134
- switch (_context3.prev = _context3.next) {
1186
+ switch (_context4.prev = _context4.next) {
1135
1187
  case 0:
1136
1188
  _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle;
1137
1189
 
@@ -1140,7 +1192,6 @@ var SettlementStore = (_class = function () {
1140
1192
  _this11.dto.RetailStorageDetails = [];
1141
1193
  _this11.dto.RetailCouponDetails = [];
1142
1194
  var czkSum = 0;
1143
- var Idmember = _this11.dto.Idmember;
1144
1195
  var count = 0;
1145
1196
  var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
1146
1197
  return parseFloat(mode.value) != 0;
@@ -1148,9 +1199,6 @@ var SettlementStore = (_class = function () {
1148
1199
  (0, _each3.default)(thePaymodes, function (mode, index) {
1149
1200
  var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
1150
1201
  if (mode.paymentType == PayStyle.hyczk) {
1151
- if (!Idmember) {
1152
- Idmember = mode.memberId;
1153
- }
1154
1202
  czkSum = Math.Add(czkSum, mode.value);
1155
1203
  _this11.dto.RetailStorageDetails.push({
1156
1204
  Code: mode.paymethodId,
@@ -1206,8 +1254,8 @@ var SettlementStore = (_class = function () {
1206
1254
  }
1207
1255
  });
1208
1256
 
1209
- var _ref12 = _mutantsUtil.platform || {},
1210
- isNewRetailBCPos = _ref12.isNewRetailBCPos;
1257
+ var _ref13 = _mutantsUtil.platform || {},
1258
+ isNewRetailBCPos = _ref13.isNewRetailBCPos;
1211
1259
 
1212
1260
  if (_this11.dto.RetailStorageDetails.length > 0) {
1213
1261
  var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
@@ -1235,15 +1283,14 @@ var SettlementStore = (_class = function () {
1235
1283
  DataSource: { Id: _this11.dataSource }
1236
1284
  });
1237
1285
  }
1238
- _this11.dto.Idmember = Idmember;
1239
1286
  }
1240
1287
  });
1241
- _ref13 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref13.isNewRetailBCPos;
1288
+ _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
1242
1289
 
1243
1290
  console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
1244
1291
 
1245
1292
  if (!isNewRetailBCPos) {
1246
- _context3.next = 20;
1293
+ _context4.next = 20;
1247
1294
  break;
1248
1295
  }
1249
1296
 
@@ -1254,61 +1301,61 @@ var SettlementStore = (_class = function () {
1254
1301
  IPMSG = JSON.parse(window.localStorage.IPMSG);
1255
1302
  }
1256
1303
  RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
1257
- _context3.t1 = this.dto.IdbusiType == 37;
1304
+ _context4.t1 = this.dto.IdbusiType == 37;
1258
1305
 
1259
- if (!_context3.t1) {
1260
- _context3.next = 13;
1306
+ if (!_context4.t1) {
1307
+ _context4.next = 13;
1261
1308
  break;
1262
1309
  }
1263
1310
 
1264
- _context3.next = 12;
1311
+ _context4.next = 12;
1265
1312
  return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
1266
1313
 
1267
1314
  case 12:
1268
- _context3.t1 = _context3.sent;
1315
+ _context4.t1 = _context4.sent;
1269
1316
 
1270
1317
  case 13:
1271
- _context3.t0 = _context3.t1;
1318
+ _context4.t0 = _context4.t1;
1272
1319
 
1273
- if (_context3.t0) {
1274
- _context3.next = 16;
1320
+ if (_context4.t0) {
1321
+ _context4.next = 16;
1275
1322
  break;
1276
1323
  }
1277
1324
 
1278
- _context3.t0 = this.dto.IdbusiType != 37;
1325
+ _context4.t0 = this.dto.IdbusiType != 37;
1279
1326
 
1280
1327
  case 16:
1281
- if (!_context3.t0) {
1282
- _context3.next = 18;
1328
+ if (!_context4.t0) {
1329
+ _context4.next = 18;
1283
1330
  break;
1284
1331
  }
1285
1332
 
1286
- return _context3.abrupt('return', (0, _tplusApi.ccApi)({ dto: (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } }), cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
1333
+ return _context4.abrupt('return', (0, _tplusApi.ccApi)({ dto: (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } }), cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
1287
1334
  _this11.setDtoID(resp.ID);
1288
1335
  _this11.paymode.checkList = [];
1289
1336
  _this11.billID = resp.ID;
1290
1337
  }));
1291
1338
 
1292
1339
  case 18:
1293
- _context3.next = 21;
1340
+ _context4.next = 21;
1294
1341
  break;
1295
1342
 
1296
1343
  case 20:
1297
- return _context3.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
1344
+ return _context4.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
1298
1345
  _this11.setDtoID(resp.ID);
1299
1346
  _this11.billID = resp.ID;
1300
1347
  }));
1301
1348
 
1302
1349
  case 21:
1303
1350
  case 'end':
1304
- return _context3.stop();
1351
+ return _context4.stop();
1305
1352
  }
1306
1353
  }
1307
- }, _callee3, this);
1354
+ }, _callee4, this);
1308
1355
  }));
1309
1356
 
1310
1357
  function save() {
1311
- return _ref11.apply(this, arguments);
1358
+ return _ref12.apply(this, arguments);
1312
1359
  }
1313
1360
 
1314
1361
  return save;
@@ -1321,35 +1368,35 @@ var SettlementStore = (_class = function () {
1321
1368
  }, {
1322
1369
  key: 'querySettleResult',
1323
1370
  value: function () {
1324
- var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
1325
- return _regenerator2.default.wrap(function _callee4$(_context4) {
1371
+ var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
1372
+ return _regenerator2.default.wrap(function _callee5$(_context5) {
1326
1373
  while (1) {
1327
- switch (_context4.prev = _context4.next) {
1374
+ switch (_context5.prev = _context5.next) {
1328
1375
  case 0:
1329
- _context4.prev = 0;
1330
- _context4.t0 = _promise2.default;
1331
- _context4.next = 4;
1376
+ _context5.prev = 0;
1377
+ _context5.t0 = _promise2.default;
1378
+ _context5.next = 4;
1332
1379
  return (0, _tplusApi.tApi)({ RetailCode: this.dto.Code }, 'chanjet.RE.newRetail.QuerySettleResult', false, false, { timeout_skip: true });
1333
1380
 
1334
1381
  case 4:
1335
- _context4.t1 = _context4.sent;
1336
- return _context4.abrupt('return', _context4.t0.resolve.call(_context4.t0, _context4.t1));
1382
+ _context5.t1 = _context5.sent;
1383
+ return _context5.abrupt('return', _context5.t0.resolve.call(_context5.t0, _context5.t1));
1337
1384
 
1338
1385
  case 8:
1339
- _context4.prev = 8;
1340
- _context4.t2 = _context4['catch'](0);
1341
- return _context4.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
1386
+ _context5.prev = 8;
1387
+ _context5.t2 = _context5['catch'](0);
1388
+ return _context5.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
1342
1389
 
1343
1390
  case 11:
1344
1391
  case 'end':
1345
- return _context4.stop();
1392
+ return _context5.stop();
1346
1393
  }
1347
1394
  }
1348
- }, _callee4, this, [[0, 8]]);
1395
+ }, _callee5, this, [[0, 8]]);
1349
1396
  }));
1350
1397
 
1351
1398
  function querySettleResult() {
1352
- return _ref14.apply(this, arguments);
1399
+ return _ref15.apply(this, arguments);
1353
1400
  }
1354
1401
 
1355
1402
  return querySettleResult;
@@ -1375,18 +1422,18 @@ var SettlementStore = (_class = function () {
1375
1422
  }, {
1376
1423
  key: 'validePwd',
1377
1424
  value: function () {
1378
- var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
1379
- var _ref16, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, result, count, _result;
1425
+ var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(value) {
1426
+ var _ref17, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, result, count, _result;
1380
1427
 
1381
- return _regenerator2.default.wrap(function _callee5$(_context5) {
1428
+ return _regenerator2.default.wrap(function _callee6$(_context6) {
1382
1429
  while (1) {
1383
- switch (_context5.prev = _context5.next) {
1430
+ switch (_context6.prev = _context6.next) {
1384
1431
  case 0:
1385
- _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
1386
- _context5.prev = 1;
1432
+ _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
1433
+ _context6.prev = 1;
1387
1434
 
1388
1435
  if (!isNewRetailBCPos) {
1389
- _context5.next = 27;
1436
+ _context6.next = 27;
1390
1437
  break;
1391
1438
  }
1392
1439
 
@@ -1396,46 +1443,46 @@ var SettlementStore = (_class = function () {
1396
1443
  memberStorageId = this.paymode.currentMode.meStorageCardId;
1397
1444
 
1398
1445
  if (!cook2) {
1399
- _context5.next = 12;
1446
+ _context6.next = 12;
1400
1447
  break;
1401
1448
  }
1402
1449
 
1403
1450
  if (!cook2.hasOwnProperty(memberStorageId + "")) {
1404
- _context5.next = 12;
1451
+ _context6.next = 12;
1405
1452
  break;
1406
1453
  }
1407
1454
 
1408
1455
  if (!(cook2[memberStorageId] > 3)) {
1409
- _context5.next = 12;
1456
+ _context6.next = 12;
1410
1457
  break;
1411
1458
  }
1412
1459
 
1413
1460
  message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
1414
- return _context5.abrupt('return', _promise2.default.resolve(message));
1461
+ return _context6.abrupt('return', _promise2.default.resolve(message));
1415
1462
 
1416
1463
  case 12:
1417
- _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId;
1464
+ _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId;
1418
1465
  result = null;
1419
1466
 
1420
1467
  if (!(cardTypeEnum === 'BALANCE_CARD')) {
1421
- _context5.next = 20;
1468
+ _context6.next = 20;
1422
1469
  break;
1423
1470
  }
1424
1471
 
1425
- _context5.next = 17;
1426
- return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd) }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
1472
+ _context6.next = 17;
1473
+ return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
1427
1474
 
1428
1475
  case 17:
1429
- result = _context5.sent;
1430
- _context5.next = 23;
1476
+ result = _context6.sent;
1477
+ _context6.next = 23;
1431
1478
  break;
1432
1479
 
1433
1480
  case 20:
1434
- _context5.next = 22;
1435
- return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd) }, '/marketingtool/MeStorageCard/updateStorageKey', false, false);
1481
+ _context6.next = 22;
1482
+ return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
1436
1483
 
1437
1484
  case 22:
1438
- result = _context5.sent;
1485
+ result = _context6.sent;
1439
1486
 
1440
1487
  case 23:
1441
1488
  if (!result.data) {
@@ -1454,38 +1501,38 @@ var SettlementStore = (_class = function () {
1454
1501
  this.setCookie('errorPwd', '', -1);
1455
1502
  this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
1456
1503
  }
1457
- return _context5.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
1504
+ return _context6.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
1458
1505
 
1459
1506
  case 27:
1460
- _context5.next = 29;
1507
+ _context6.next = 29;
1461
1508
  return (0, _tplusApi.tApi)({ "CheckoutParams": {
1462
1509
  "Idmember": value.id,
1463
1510
  "Password": value.pwd
1464
1511
  } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
1465
1512
 
1466
1513
  case 29:
1467
- _result = _context5.sent;
1468
- return _context5.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
1514
+ _result = _context6.sent;
1515
+ return _context6.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
1469
1516
 
1470
1517
  case 31:
1471
- _context5.next = 36;
1518
+ _context6.next = 36;
1472
1519
  break;
1473
1520
 
1474
1521
  case 33:
1475
- _context5.prev = 33;
1476
- _context5.t0 = _context5['catch'](1);
1477
- return _context5.abrupt('return', "failed");
1522
+ _context6.prev = 33;
1523
+ _context6.t0 = _context6['catch'](1);
1524
+ return _context6.abrupt('return', "failed");
1478
1525
 
1479
1526
  case 36:
1480
1527
  case 'end':
1481
- return _context5.stop();
1528
+ return _context6.stop();
1482
1529
  }
1483
1530
  }
1484
- }, _callee5, this, [[1, 33]]);
1531
+ }, _callee6, this, [[1, 33]]);
1485
1532
  }));
1486
1533
 
1487
- function validePwd(_x3) {
1488
- return _ref15.apply(this, arguments);
1534
+ function validePwd(_x4) {
1535
+ return _ref16.apply(this, arguments);
1489
1536
  }
1490
1537
 
1491
1538
  return validePwd;
@@ -1524,34 +1571,34 @@ var SettlementStore = (_class = function () {
1524
1571
  var _this13 = this;
1525
1572
 
1526
1573
  return function () {
1527
- var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
1574
+ var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(_this) {
1528
1575
  var _getLoginInfo, IdStore, StoreCode, resp;
1529
1576
 
1530
- return _regenerator2.default.wrap(function _callee6$(_context6) {
1577
+ return _regenerator2.default.wrap(function _callee7$(_context7) {
1531
1578
  while (1) {
1532
- switch (_context6.prev = _context6.next) {
1579
+ switch (_context7.prev = _context7.next) {
1533
1580
  case 0:
1534
1581
  _getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
1535
- _context6.next = 3;
1582
+ _context7.next = 3;
1536
1583
  return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
1537
1584
 
1538
1585
  case 3:
1539
- resp = _context6.sent;
1586
+ resp = _context7.sent;
1540
1587
 
1541
1588
  _this.member = resp;
1542
1589
  _this.paymode.currentMode.storageCardNo = resp.StorageCardNo;
1543
- return _context6.abrupt('return', _promise2.default.resolve(resp));
1590
+ return _context7.abrupt('return', _promise2.default.resolve(resp));
1544
1591
 
1545
1592
  case 7:
1546
1593
  case 'end':
1547
- return _context6.stop();
1594
+ return _context7.stop();
1548
1595
  }
1549
1596
  }
1550
- }, _callee6, _this13);
1597
+ }, _callee7, _this13);
1551
1598
  }));
1552
1599
 
1553
- return function (_x4) {
1554
- return _ref17.apply(this, arguments);
1600
+ return function (_x5) {
1601
+ return _ref18.apply(this, arguments);
1555
1602
  };
1556
1603
  }();
1557
1604
  }
@@ -1561,17 +1608,17 @@ var SettlementStore = (_class = function () {
1561
1608
  var _this14 = this;
1562
1609
 
1563
1610
  return function () {
1564
- var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(memberId) {
1611
+ var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(memberId) {
1565
1612
  var result;
1566
- return _regenerator2.default.wrap(function _callee7$(_context7) {
1613
+ return _regenerator2.default.wrap(function _callee8$(_context8) {
1567
1614
  while (1) {
1568
- switch (_context7.prev = _context7.next) {
1615
+ switch (_context8.prev = _context8.next) {
1569
1616
  case 0:
1570
- _context7.next = 2;
1617
+ _context8.next = 2;
1571
1618
  return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId, false, false, { method: 'get' });
1572
1619
 
1573
1620
  case 2:
1574
- result = _context7.sent;
1621
+ result = _context8.sent;
1575
1622
 
1576
1623
  if (result && result.data.length) {
1577
1624
  result.data.forEach(function (m) {
@@ -1584,14 +1631,14 @@ var SettlementStore = (_class = function () {
1584
1631
 
1585
1632
  case 4:
1586
1633
  case 'end':
1587
- return _context7.stop();
1634
+ return _context8.stop();
1588
1635
  }
1589
1636
  }
1590
- }, _callee7, _this14);
1637
+ }, _callee8, _this14);
1591
1638
  }));
1592
1639
 
1593
- return function (_x5) {
1594
- return _ref18.apply(this, arguments);
1640
+ return function (_x6) {
1641
+ return _ref19.apply(this, arguments);
1595
1642
  };
1596
1643
  }();
1597
1644
  }
@@ -1600,27 +1647,27 @@ var SettlementStore = (_class = function () {
1600
1647
  initializer: function initializer() {
1601
1648
  var _this15 = this;
1602
1649
 
1603
- return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
1650
+ return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
1604
1651
  var address, result;
1605
- return _regenerator2.default.wrap(function _callee8$(_context8) {
1652
+ return _regenerator2.default.wrap(function _callee9$(_context9) {
1606
1653
  while (1) {
1607
- switch (_context8.prev = _context8.next) {
1654
+ switch (_context9.prev = _context9.next) {
1608
1655
  case 0:
1609
1656
  address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this15.paymode.currentMode.storageCardNo;
1610
- _context8.next = 3;
1657
+ _context9.next = 3;
1611
1658
  return (0, _tplusApi.ccApi)({}, address, false, false, { method: 'get', timeout_skip: true });
1612
1659
 
1613
1660
  case 3:
1614
- result = _context8.sent;
1661
+ result = _context9.sent;
1615
1662
 
1616
1663
  _this15.paymode.updateCardInfo(result.data);
1617
1664
 
1618
1665
  case 5:
1619
1666
  case 'end':
1620
- return _context8.stop();
1667
+ return _context9.stop();
1621
1668
  }
1622
1669
  }
1623
- }, _callee8, _this15);
1670
+ }, _callee9, _this15);
1624
1671
  }));
1625
1672
  }
1626
1673
  }), _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);
@@ -1727,8 +1774,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
1727
1774
  this.checkList = [];
1728
1775
  }
1729
1776
 
1730
- var _ref20 = _mutantsUtil.platform || {},
1731
- isNewRetailBCPos = _ref20.isNewRetailBCPos;
1777
+ var _ref21 = _mutantsUtil.platform || {},
1778
+ isNewRetailBCPos = _ref21.isNewRetailBCPos;
1732
1779
 
1733
1780
  var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
1734
1781
  PayStyle = _enumController$getEn15.PayStyle,
@@ -1838,18 +1885,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
1838
1885
  }
1839
1886
  });
1840
1887
 
1841
- var _ref21 = element || {},
1842
- couponCode = _ref21.couponCode,
1843
- name = _ref21.name,
1844
- tieredAmountResult = _ref21.tieredAmountResult,
1845
- fromDate = _ref21.fromDate,
1846
- dateMount = _ref21.dateMount,
1847
- promoMethodEnum = _ref21.promoMethodEnum,
1848
- discountPct = _ref21.discountPct,
1849
- nominalAmount = _ref21.nominalAmount,
1850
- promoId = _ref21.promoId,
1851
- id = _ref21.id,
1852
- doorsill = _ref21.doorsill;
1888
+ var _ref22 = element || {},
1889
+ couponCode = _ref22.couponCode,
1890
+ name = _ref22.name,
1891
+ tieredAmountResult = _ref22.tieredAmountResult,
1892
+ fromDate = _ref22.fromDate,
1893
+ dateMount = _ref22.dateMount,
1894
+ promoMethodEnum = _ref22.promoMethodEnum,
1895
+ discountPct = _ref22.discountPct,
1896
+ nominalAmount = _ref22.nominalAmount,
1897
+ promoId = _ref22.promoId,
1898
+ id = _ref22.id,
1899
+ doorsill = _ref22.doorsill;
1853
1900
 
1854
1901
  var condValue = tieredAmountResult.condValue,
1855
1902
  promoDiscount = tieredAmountResult.promoDiscount,
@@ -1893,8 +1940,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
1893
1940
  }, {
1894
1941
  key: 'calcDjqValue',
1895
1942
  value: function calcDjqValue(q1) {
1896
- var _ref22 = _mutantsUtil.platform || {},
1897
- isNewRetailBCPos = _ref22.isNewRetailBCPos;
1943
+ var _ref23 = _mutantsUtil.platform || {},
1944
+ isNewRetailBCPos = _ref23.isNewRetailBCPos;
1898
1945
 
1899
1946
  var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
1900
1947
  Differentiate = _enumController$getEn16.Differentiate;
@@ -1984,23 +2031,23 @@ var PayMode = exports.PayMode = (_class3 = function () {
1984
2031
  }, {
1985
2032
  key: 'setPaymodes',
1986
2033
  value: function () {
1987
- var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type, isIntegralExchange) {
2034
+ var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(type, isIntegralExchange) {
1988
2035
  var _this17 = this;
1989
2036
 
1990
2037
  var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
1991
2038
 
1992
- return _regenerator2.default.wrap(function _callee9$(_context9) {
2039
+ return _regenerator2.default.wrap(function _callee10$(_context10) {
1993
2040
  while (1) {
1994
- switch (_context9.prev = _context9.next) {
2041
+ switch (_context10.prev = _context10.next) {
1995
2042
  case 0:
1996
2043
  _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
1997
2044
  memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
1998
2045
  param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
1999
- _context9.next = 5;
2046
+ _context10.next = 5;
2000
2047
  return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
2001
2048
 
2002
2049
  case 5:
2003
- modes = _context9.sent;
2050
+ modes = _context10.sent;
2004
2051
 
2005
2052
  if (modes) {
2006
2053
  (0, _mobx.runInAction)(function () {
@@ -2032,14 +2079,14 @@ var PayMode = exports.PayMode = (_class3 = function () {
2032
2079
 
2033
2080
  case 7:
2034
2081
  case 'end':
2035
- return _context9.stop();
2082
+ return _context10.stop();
2036
2083
  }
2037
2084
  }
2038
- }, _callee9, this);
2085
+ }, _callee10, this);
2039
2086
  }));
2040
2087
 
2041
- function setPaymodes(_x6, _x7) {
2042
- return _ref23.apply(this, arguments);
2088
+ function setPaymodes(_x7, _x8) {
2089
+ return _ref24.apply(this, arguments);
2043
2090
  }
2044
2091
 
2045
2092
  return setPaymodes;
@@ -2170,8 +2217,8 @@ var Member = exports.Member = (_class5 = function () {
2170
2217
  return key == 'canusedbalancestorage';
2171
2218
  });
2172
2219
 
2173
- var _ref24 = _mutantsUtil.platform || {},
2174
- isNewRetailBCPos = _ref24.isNewRetailBCPos;
2220
+ var _ref25 = _mutantsUtil.platform || {},
2221
+ isNewRetailBCPos = _ref25.isNewRetailBCPos;
2175
2222
 
2176
2223
  (0, _mobx.runInAction)(function () {
2177
2224
  _this21.cardNo = m.CardCode;