tplus-components-touch 3.26.2 → 3.26.6

package/dist/components/settlement/settlement.less

@@ -1400,6 +1400,9 @@
   .ant-modal-body{
     padding:0 0 24px;
   }
+  .ant-modal {
+    top: none !important;
+  }
   .no{
     padding-top: 30px;
     padding-left: 40px;

package/dist/components/settlement/settlementStore.js

@@ -545,13 +545,23 @@ var SettlementStore = (_class = function () {
                 }
             });
             (0, _each3.default)(this.dto.RetailStorageDetails, function (detail) {
-                var balanceAmount = detail.Member.BalanceStorage;
-                balanceAmount = balanceAmount - detail.StoragePaymentAmount;
+                var balanceAmount = null;
+                var storageCardNo = null;
+                var meStorageCardId = null;
+                detail.DynamicPropertyKeys.forEach(function (ele, index) {
+                    if (ele === "mestoragecard") {
+                        balanceAmount = detail.DynamicPropertyValues[index].BalanceStorage - detail.StoragePaymentAmount;
+                        storageCardNo = detail.DynamicPropertyValues[index].StorageCardNo;
+                        meStorageCardId = detail.DynamicPropertyValues[index].meStorageCardId;
+                    }
+                });
                 var newmode = (0, _extends3.default)({}, _this5.genNewMode(PayStyle.hyczk, false, detail.StoragePaymentAmount), {
-                    member: new Member(detail.Member),
-                    authCode: detail.Password,
+                    member: new Member(detail.Member ? detail.Member : null),
+                    authCode: detail.Password ? detail.Password : null,
                     balance: balanceAmount,
-                    boriginReturn: true
+                    boriginReturn: true,
+                    meStorageCardId: meStorageCardId ? meStorageCardId : detail.MeStorageCardId,
+                    storageCardNo: storageCardNo ? storageCardNo : detail.StorageCardNo
                 });
                 _this5.paymode.thePaymodes.push(newmode);
             });
@@ -641,10 +651,10 @@ var SettlementStore = (_class = function () {
             var address = '';
             if (isNewRetailBCPos) {
                 // address = '/member/memberProfile/FindByStorageCode/'+v;
-                address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v;
+                address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
                 return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function (result) {
                     var data = result.data;
-                    var m = data;
+                    var m = data && data.length && data[0];
                     _this7.paymode.updateCardInfo(m);
                     if (!m || !m.StorageCardNo) {
                         (0, _mobx.runInAction)(function () {
@@ -1376,7 +1386,7 @@ var SettlementStore = (_class = function () {
         key: 'validePwd',
         value: function () {
             var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
-                var _ref16, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, result, count, _result;
+                var _ref16, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
@@ -1414,7 +1424,7 @@ var SettlementStore = (_class = function () {
                                 return _context5.abrupt('return', _promise2.default.resolve(message));
 
                             case 12:
-                                _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId;
+                                _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId;
                                 result = null;
 
                                 if (!(cardTypeEnum === 'BALANCE_CARD')) {
@@ -1423,7 +1433,7 @@ var SettlementStore = (_class = function () {
                                 }
 
                                 _context5.next = 17;
-                                return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd) }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
+                                return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
 
                             case 17:
                                 result = _context5.sent;
@@ -1432,7 +1442,7 @@ var SettlementStore = (_class = function () {
 
                             case 20:
                                 _context5.next = 22;
-                                return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd) }, '/marketingtool/MeStorageCard/updateStorageKey', false, false);
+                                return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
 
                             case 22:
                                 result = _context5.sent;