tplus-components-touch 3.26.11 → 3.26.15

package/dist/components/settlement/settlementStore.js

@@ -681,7 +681,7 @@ var SettlementStore = (_class = function () {
             var address = '';
             if (isNewRetailBCPos) {
                 // address = '/member/memberProfile/FindByStorageCode/'+v;
-                address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
+                address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v;
                 return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
                     var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(result) {
                         var data, m;
@@ -1419,7 +1419,7 @@ var SettlementStore = (_class = function () {
         key: 'validePwd',
         value: function () {
             var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(value) {
-                var _ref16, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, result, count, _result;
+                var _ref16, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
                     while (1) {
@@ -1429,7 +1429,7 @@ var SettlementStore = (_class = function () {
                                 _context6.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context6.next = 27;
+                                    _context6.next = 33;
                                     break;
                                 }
 
@@ -1457,7 +1457,7 @@ var SettlementStore = (_class = function () {
                                 return _context6.abrupt('return', _promise2.default.resolve(message));
 
                             case 12:
-                                _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId;
+                                _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId, cardStatusEnum = _paymode$currentMode.cardStatusEnum;
                                 result = null;
 
                                 if (!(cardTypeEnum === 'BALANCE_CARD')) {
@@ -1470,17 +1470,31 @@ var SettlementStore = (_class = function () {
 
                             case 17:
                                 result = _context6.sent;
-                                _context6.next = 23;
+                                _context6.next = 29;
                                 break;
 
                             case 20:
-                                _context6.next = 22;
+                                if (!(cardStatusEnum === 'BINDING')) {
+                                    _context6.next = 26;
+                                    break;
+                                }
+
+                                _context6.next = 23;
+                                return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
+
+                            case 23:
+                                result = _context6.sent;
+                                _context6.next = 29;
+                                break;
+
+                            case 26:
+                                _context6.next = 28;
                                 return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
 
-                            case 22:
+                            case 28:
                                 result = _context6.sent;
 
-                            case 23:
+                            case 29:
                                 if (!result.data) {
                                     if (cook2) {
                                         if (cook2.hasOwnProperty(memberStorageId + "")) {
@@ -1499,32 +1513,32 @@ var SettlementStore = (_class = function () {
                                 }
                                 return _context6.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
-                            case 27:
-                                _context6.next = 29;
+                            case 33:
+                                _context6.next = 35;
                                 return (0, _tplusApi.tApi)({ "CheckoutParams": {
                                         "Idmember": value.id,
                                         "Password": value.pwd
                                     } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
 
-                            case 29:
+                            case 35:
                                 _result = _context6.sent;
                                 return _context6.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
-                            case 31:
-                                _context6.next = 36;
+                            case 37:
+                                _context6.next = 42;
                                 break;
 
-                            case 33:
-                                _context6.prev = 33;
+                            case 39:
+                                _context6.prev = 39;
                                 _context6.t0 = _context6['catch'](1);
                                 return _context6.abrupt('return', "failed");
 
-                            case 36:
+                            case 42:
                             case 'end':
                                 return _context6.stop();
                         }
                     }
-                }, _callee6, this, [[1, 33]]);
+                }, _callee6, this, [[1, 39]]);
             }));
 
             function validePwd(_x4) {
@@ -1750,6 +1764,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'updateCardInfo',
         value: function updateCardInfo(m) {
+            this.currentMode.cardStatusEnum = m.CardStatusEnum;
             this.currentMode.isNeedPassword = m.IsNeedPassword;
             this.currentMode.meStorageCardId = m.MeStorageCardId;
             this.currentMode.storageCardNo = m.StorageCardNo;