tplus-components-touch 3.26.13 → 3.26.17

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 (5) hide show
  1. package/dist/components/settlement/settlement.js +10 -3
  2. package/dist/components/settlement/settlement.js.map +1 -1
  3. package/dist/components/settlement/settlementStore.js +33 -18
  4. package/dist/components/settlement/settlementStore.js.map +1 -1
  5. package/package.json +1 -1
package/dist/components/settlement/settlementStore.js CHANGED
@@ -681,7 +681,7 @@ var SettlementStore = (_class = function () {
681
681
  var address = '';
682
682
  if (isNewRetailBCPos) {
683
683
  // address = '/member/memberProfile/FindByStorageCode/'+v;
684
- address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
684
+ address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v;
685
685
  return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
686
686
  var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(result) {
687
687
  var data, m;
@@ -1419,7 +1419,7 @@ var SettlementStore = (_class = function () {
1419
1419
  key: 'validePwd',
1420
1420
  value: function () {
1421
1421
  var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(value) {
1422
- var _ref16, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, result, count, _result;
1422
+ var _ref16, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
1423
1423
 
1424
1424
  return _regenerator2.default.wrap(function _callee6$(_context6) {
1425
1425
  while (1) {
@@ -1429,7 +1429,7 @@ var SettlementStore = (_class = function () {
1429
1429
  _context6.prev = 1;
1430
1430
 
1431
1431
  if (!isNewRetailBCPos) {
1432
- _context6.next = 27;
1432
+ _context6.next = 33;
1433
1433
  break;
1434
1434
  }
1435
1435
 
@@ -1457,7 +1457,7 @@ var SettlementStore = (_class = function () {
1457
1457
  return _context6.abrupt('return', _promise2.default.resolve(message));
1458
1458
 
1459
1459
  case 12:
1460
- _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId;
1460
+ _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId, cardStatusEnum = _paymode$currentMode.cardStatusEnum;
1461
1461
  result = null;
1462
1462
 
1463
1463
  if (!(cardTypeEnum === 'BALANCE_CARD')) {
@@ -1466,21 +1466,35 @@ var SettlementStore = (_class = function () {
1466
1466
  }
1467
1467
 
1468
1468
  _context6.next = 17;
1469
- return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
1469
+ return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
1470
1470
 
1471
1471
  case 17:
1472
1472
  result = _context6.sent;
1473
- _context6.next = 23;
1473
+ _context6.next = 29;
1474
1474
  break;
1475
1475
 
1476
1476
  case 20:
1477
- _context6.next = 22;
1477
+ if (!(cardStatusEnum === 'BINDING')) {
1478
+ _context6.next = 26;
1479
+ break;
1480
+ }
1481
+
1482
+ _context6.next = 23;
1483
+ return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
1484
+
1485
+ case 23:
1486
+ result = _context6.sent;
1487
+ _context6.next = 29;
1488
+ break;
1489
+
1490
+ case 26:
1491
+ _context6.next = 28;
1478
1492
  return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
1479
1493
 
1480
- case 22:
1494
+ case 28:
1481
1495
  result = _context6.sent;
1482
1496
 
1483
- case 23:
1497
+ case 29:
1484
1498
  if (!result.data) {
1485
1499
  if (cook2) {
1486
1500
  if (cook2.hasOwnProperty(memberStorageId + "")) {
@@ -1499,32 +1513,32 @@ var SettlementStore = (_class = function () {
1499
1513
  }
1500
1514
  return _context6.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
1501
1515
 
1502
- case 27:
1503
- _context6.next = 29;
1516
+ case 33:
1517
+ _context6.next = 35;
1504
1518
  return (0, _tplusApi.tApi)({ "CheckoutParams": {
1505
1519
  "Idmember": value.id,
1506
1520
  "Password": value.pwd
1507
1521
  } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
1508
1522
 
1509
- case 29:
1523
+ case 35:
1510
1524
  _result = _context6.sent;
1511
1525
  return _context6.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
1512
1526
 
1513
- case 31:
1514
- _context6.next = 36;
1527
+ case 37:
1528
+ _context6.next = 42;
1515
1529
  break;
1516
1530
 
1517
- case 33:
1518
- _context6.prev = 33;
1531
+ case 39:
1532
+ _context6.prev = 39;
1519
1533
  _context6.t0 = _context6['catch'](1);
1520
1534
  return _context6.abrupt('return', "failed");
1521
1535
 
1522
- case 36:
1536
+ case 42:
1523
1537
  case 'end':
1524
1538
  return _context6.stop();
1525
1539
  }
1526
1540
  }
1527
- }, _callee6, this, [[1, 33]]);
1541
+ }, _callee6, this, [[1, 39]]);
1528
1542
  }));
1529
1543
 
1530
1544
  function validePwd(_x4) {
@@ -1750,6 +1764,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1750
1764
  }, {
1751
1765
  key: 'updateCardInfo',
1752
1766
  value: function updateCardInfo(m) {
1767
+ this.currentMode.cardStatusEnum = m.CardStatusEnum;
1753
1768
  this.currentMode.isNeedPassword = m.IsNeedPassword;
1754
1769
  this.currentMode.meStorageCardId = m.MeStorageCardId;
1755
1770
  this.currentMode.storageCardNo = m.StorageCardNo;