tplus-components-touch 3.36.1 → 3.37.2

package/dist/components/settlement/settlement.js

@@ -160,10 +160,6 @@ var _modalWraper2 = _interopRequireDefault(_modalWraper);
 
 var _utils = require('./utils');
 
-var _settlementStore = require('./settlementStore');
-
-var _settlementStore2 = _interopRequireDefault(_settlementStore);
-
 var _keyboard = require('../keyboard');
 
 var _keyboard2 = _interopRequireDefault(_keyboard);
@@ -208,6 +204,12 @@ var _index2 = require('./prototypeTable/index');
 
 var _index3 = _interopRequireDefault(_index2);
 
+var _tplusComponentsTouch = require('tplus-components-touch');
+
+var _moreCzkTable = require('./moreCzkTable');
+
+var _moreCzkTable2 = _interopRequireDefault(_moreCzkTable);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var hasElectron = _mutantsMicrofx.env.platform === _mutantsMicrofx.env.constant.platform.electron;
@@ -228,6 +230,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       czkVisible: false,
       djqVisible: false,
       jfdxVisible: false,
+      moreCzkVisible: false,
       showSetPwdModal: false,
       prototypeVisible: false, // 优惠明细弹出框
       currentIndex: 0,
@@ -246,6 +249,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       protytypeCount: null,
       isPrototypeClick: false,
       dataSource: [],
+      memberdata1: [],
       discountTotalAmount: null,
       discountRetailTotalAount: null,
       discountPrototypeTotalAmount: null,
@@ -253,14 +257,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       currentKey: null,
       couponLight: true,
       storageValue: '0.00',
-      czkValue: null };
+      czkValue: null,
+      isInputMember: false,
+      selectedRowIndex: 0 };
     _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
       return key.toLocaleUpperCase();
     });
     _this2.hotkeydebounced = null;
     _this2.hotkeydebouncedPayMode = "";
     _this2.currentInput = null;
-    _this2.store = new _settlementStore2.default();
+    _this2.store = _mutantsMicrofx.stores.settlementStore;
 
     _this2.resizeSettlementToolBtns = function () {
       var newStyle = _this2.store.newStyle;
@@ -300,12 +306,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _this2.inputkey = "inputJfdxAmount";
         _this2["inputJfdxAmount"].input.value = currentMode && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable));
         _this2.setCurrentModeValue(_this2.inputJfdxAmount.input.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
-      } else if (_this2.state.czkVisible && currentMode && currentMode.value >= 0 && currentMode.member.balance !== undefined) {
+      } else if (_this2.state.czkVisible && currentMode && currentMode.value >= 0 && currentMode.balance !== undefined) {
         _this2.inputkey = "inputCzkAmount";
-        _this2["inputCzkAmount"] && _this2["inputCzkAmount"].input && (_this2["inputCzkAmount"].input.value = (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)));
-        var maxamount = Math.min(currentMode.maxamount, currentMode.member.balance);
+        _this2["inputCzkAmount"] && _this2["inputCzkAmount"].input && (_this2["inputCzkAmount"].input.value = (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)));
+        var maxamount = Math.min(currentMode.maxamount, currentMode.balance);
         _this2.inputCzkAmount && _this2.inputCzkAmount.input && _this2.setCurrentModeValue(_this2.inputCzkAmount.input.value, maxamount);
-        if (_this2.store.bquick && currentMode.member.id && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
+        if (_this2.store.bquick && currentMode.storageCardNo && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
           _message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
             duration: 4
           });
@@ -325,7 +331,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn.PayStyle;
 
-      _this2.store.init(_this2.props.type == 1 ? null : _this2.context, _this2.props.onHandleAmount, _this2.props.dataSource.Code_02, _this2.props.storeInfo, true, _this2.props.amount, _this2.props.type, _this2.props.dto);
+      _this2.store.init(_this2.props.type == 1 ? null : _this2.context, _this2.props.onHandleAmount, _this2.props.dataSource.Code_02, _this2.props.storeInfo, true, _this2.props.amount, _this2.props.type, _this2.props.dto, currentKey);
       var amount = _this2.store.paymode.amount;
       if (amount == 0) {
         _this2.settleZero();
@@ -355,7 +361,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           isReturn = _this2$props.isReturn,
           type = _this2$props.type;
 
-      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate()).then(function (result) {
+      _promise2.default.resolve(!_this2.props.onValidate || _this2.props.onValidate({ isNotAutoFocus: true })).then(function (result) {
         if (result) {
           _this2.setState({
             settleDisabled: false
@@ -450,7 +456,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }
         item.InventoryName = item.Inventory.Name;
         item.Discount = (0, _utils.getRoundValue)(item.RetailPrice - item.TaxPrice, pricePrecision);
-        item.TotalDiscount = (0, _utils.getFixedNumber)(item.Discount * item.Quantity);
+        //item.TotalDiscount = getFixedNumber(item.Discount * item.Quantity);
+        item.TotalDiscount = item.DetailDiscountAmount;
         item.nAmount = (0, _utils.getFixedNumber)(item.TaxAmount);
         item.UnitName = item.Unit.Name;
         item.nQuantity = (0, _utils.getRoundValue)(item.Quantity, quantityPrecision);
@@ -553,68 +560,30 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       });
     };
 
-    _this2.showCzkModal = function (id, append, params) {
-      var _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn2.PayStyle;
-
-      var _ref = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref.isNewRetailBCPos;
-
-      _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
+    _this2.handleCzkMoreData = function (params) {
       _this2._val = _this2.store.paymode.currentMode.value;
       var currentMode = _this2.store.paymode.currentMode;
 
-      var maxamount = Math.min(currentMode.maxamount, currentMode.member.balance);
-      if (_this2.store.bquick && currentMode.member.id && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
+      var maxamount = Math.min(currentMode.maxamount, currentMode.balance);
+      if (_this2.store.bquick && currentMode.storageCardNo && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
         _message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
           duration: 4
         });
       } else {
-        // if (isNewRetailBCPos) {
-        //   let { isReturn } = this.props;
-        //   let sMember = this.store.member;
-        //   if (!sMember.StorageCardEnable) {
-        //     Message.warn("该储值卡已停用");
-        //     return;
-        //   }
-        //   if (sMember && sMember.ID) {
-        //     // noPlaySetPwd 点击结算方式设置密码，点加号不设置
-        //     if (!sMember.WalletEnabled && params !== 'noPlaySetPwd' && !isReturn) {
-        //       this.setState({
-        //         newPass: '',
-        //         newPassConfirm: '',
-        //         showSetPwdModal: true
-        //       })
-        //     } else {
-        //       this.setState({
-        //         showSetPwdModal: false,
-        //         czkVisible: true
-        //       })
-        //     }
-        //   } 
-        //   // else {
-        //   //   Message.warn('请先录入会员');
-        //   // } 
-        //   // this.setState({
-        // //   czkVisible: true,
-        // // });
-        // } else {
-        //   this.setState({
-        //     czkVisible: true,
-        //   });
-        // }
-        _this2.setState({
-          czkVisible: true
-        });
+        if (params) {
+          _this2.setState({
+            czkVisible: true
+          });
+        }
         var brefund = _this2.store.brefund;
 
-        var value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance));
+        var value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance));
         _this2.setState({
           storageValue: value11
         });
-        if (currentMode.member.id) {
+        if (currentMode.storageCardNo) {
           _this2.setState({
-            czkValue: currentMode.member.StorageCardNo
+            czkValue: currentMode.storageCardNo
           });
         } else {
           _this2.setState({
@@ -622,86 +591,68 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           });
         }
       }
-      setTimeout(function () {
-        if (!currentMode.member || !currentMode.member.id) {
-          _this2.czkInput && _this2.czkInput.input.focus();
-        } else {
-          if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
-            _this2.inputCzkAmount.input.focus();
-            _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
+      if (params) {
+        setTimeout(function () {
+          if (!currentMode.storageCardNo) {
+            _this2.czkInput && _this2.czkInput.input.focus();
+          } else {
+            if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
+              _this2.inputCzkAmount.input.focus();
+              _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
+            }
           }
-        }
-      }, 500);
-      _this2.connectRfCard();
+        }, 500);
+      }
     };
 
-    _this2.handleCzkOk = function () {
-      var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(e) {
-        var _enumController$getEn3, PayStyle;
+    _this2.showCzkModal = function () {
+      var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id, append) {
+        var _enumController$getEn2, PayStyle, _ref2, isInputMember, memberdata1;
 
         return _regenerator2.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                // const maxamount=Math.min(this.store.paymode.currentMode.maxamount,this.store.paymode.currentMode.member.balance);
-                // if(this.store.bquick && this.store.paymode.amount>maxamount){
-                //   Message.error("本单最大可用储值卡结算金额为："+getFixedNumber(maxamount)+"，请使用复合结算！");
-                //   this.setState({
-                //     czkVisible: false,
-                //   });
-                //   return;
-                // }
-                _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
-
-                if (_this2.store.paymode.currentMode.member.id) {
-                  _context.next = 4;
-                  break;
-                }
+                _this2.connectRfCard();
+                _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
 
-                _context.next = 4;
-                return _this2.store.loadCzk(_this2.czkInput.input.value);
+                _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
+                _ref2 = _this2.state || {}, isInputMember = _ref2.isInputMember;
+                _context.t0 = isInputMember && _this2.store.paymode.currentMode.memberId;
 
-              case 4:
-                if (_this2.store.paymode.currentMode.member.id) {
-                  _context.next = 7;
+                if (!_context.t0) {
+                  _context.next = 9;
                   break;
                 }
 
-                _message2.default.error("请录入储值卡！");
-                return _context.abrupt('return');
+                _context.next = 8;
+                return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
 
-              case 7:
-                if (!(0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
-                  return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.member.id == _this2.store.paymode.currentMode.member.id;
-                })) {
-                  _context.next = 10;
-                  break;
-                }
+              case 8:
+                _context.t0 = _context.sent;
 
-                _message2.default.error("该储值卡已使用。");
-                return _context.abrupt('return');
-
-              case 10:
-                if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
-                  _context.next = 13;
-                  break;
-                }
-
-                _message2.default.error("实收金额应等于应收金额。");
-                return _context.abrupt('return');
-
-              case 13:
+              case 9:
+                memberdata1 = _context.t0;
 
                 _this2.setState({
-                  czkVisible: false,
-                  storageValue: '0.00',
-                  czkvalue: null
+                  czkVisible: true
                 });
-                _this2.closeRfCard();
-                _this2.store.paymode.calcMemberBalance();
-                _this2.handleCzk();
+                if (memberdata1 && memberdata1.length === 1) {
+                  _this2.handleCzkMoreData(true);
+                  _this2.store.handleCzkData(memberdata1[0]);
+                } else if (memberdata1 && memberdata1.length >= 1) {
+                  _this2.setState({
+                    moreCzkVisible: true,
+                    memberdata1: memberdata1
+                  });
+                } else {
+                  _this2.setState({});
+                  setTimeout(function () {
+                    _this2.czkInput && _this2.czkInput.input.focus();
+                  }, 300);
+                }
 
-              case 17:
+              case 12:
               case 'end':
                 return _context.stop();
             }
@@ -709,8 +660,141 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }, _callee, _this3);
       }));
 
-      return function (_x) {
-        return _ref2.apply(this, arguments);
+      return function (_x, _x2) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+
+    _this2.handleMoreCzkCancel = function () {
+      _this2.setState({
+        moreCzkVisible: false,
+        selectedRowIndex: 0
+      });
+      setTimeout(function () {
+        _this2.czkInput && _this2.czkInput.input.focus();
+      }, 300);
+    };
+
+    _this2.setMoreCzkIndex = function (index) {
+      _this2.setState({
+        selectedRowIndex: index
+      });
+    };
+
+    _this2.handleMoreCzkOk = function () {
+      var _this2$state = _this2.state,
+          memberdata1 = _this2$state.memberdata1,
+          selectedRowIndex = _this2$state.selectedRowIndex;
+
+      _this2.store.paymode.updateCardInfo(memberdata1[selectedRowIndex]);
+      _this2.handleCzkMoreData();
+      _this2.store.handleCzkData(memberdata1[selectedRowIndex]);
+      _this2.setState({
+        moreCzkVisible: false,
+        selectedRowIndex: 0
+      });
+    };
+
+    _this2.handleCzkData = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+      var _enumController$getEn3, PayStyle;
+
+      return _regenerator2.default.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _this2.setState({
+                isInputMember: false
+              });
+              _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
+
+              if (_this2.store.paymode.currentMode.storageCardNo) {
+                _context2.next = 5;
+                break;
+              }
+
+              _context2.next = 5;
+              return _this2.store.loadCzk(_this2.czkInput.input.value);
+
+            case 5:
+              if (_this2.store.paymode.currentMode.storageCardNo) {
+                _context2.next = 8;
+                break;
+              }
+
+              _message2.default.error("请录入储值卡！");
+              return _context2.abrupt('return');
+
+            case 8:
+              if (!(0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
+                return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.storageCardNo == _this2.store.paymode.currentMode.storageCardNo;
+              })) {
+                _context2.next = 11;
+                break;
+              }
+
+              _message2.default.error("该储值卡已使用。");
+              return _context2.abrupt('return');
+
+            case 11:
+              if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
+                _context2.next = 14;
+                break;
+              }
+
+              _message2.default.error("实收金额应等于应收金额。");
+              return _context2.abrupt('return');
+
+            case 14:
+
+              _this2.setState({
+                czkVisible: false,
+                storageValue: '0.00',
+                czkValue: null
+              });
+              _this2.closeRfCard();
+              _this2.store.paymode.calcMemberBalance();
+              _this2.handleCzk();
+
+            case 18:
+            case 'end':
+              return _context2.stop();
+          }
+        }
+      }, _callee2, _this3);
+    }));
+
+    _this2.handleCzkOk = function () {
+      var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(e) {
+        var _this2$store$paymode$, walletEnabled, cardTypeEnum, freePaymentPasswordStore, isNeedPassword;
+
+        return _regenerator2.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                // 判断是否有密码
+                _this2$store$paymode$ = _this2.store.paymode.currentMode, walletEnabled = _this2$store$paymode$.walletEnabled, cardTypeEnum = _this2$store$paymode$.cardTypeEnum, freePaymentPasswordStore = _this2$store$paymode$.freePaymentPasswordStore, isNeedPassword = _this2$store$paymode$.isNeedPassword;
+
+                if (cardTypeEnum === 'BALANCE_CARD' && freePaymentPasswordStore) {
+                  _this2.handleCzkData();
+                } else if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled) {
+                  _this2.setState({
+                    showSetPwdModal: true,
+                    btnDissabled: true
+                  });
+                } else {
+                  _this2.handleCzkData();
+                }
+
+              case 2:
+              case 'end':
+                return _context3.stop();
+            }
+          }
+        }, _callee3, _this3);
+      }));
+
+      return function (_x3) {
+        return _ref4.apply(this, arguments);
       };
     }();
 
@@ -722,7 +806,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.setState({
         czkVisible: false,
         storageValue: '0.00',
-        czkvalue: null
+        czkValue: null
       });
       _this2.closeRfCard();
       _keyboard2.default.close();
@@ -735,23 +819,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       });
     };
 
-    _this2.handleSetModal = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-      var _this2$state, newPass, newPassConfirm, updataMemberInfo, result, currentMode, resp;
+    _this2.handleSetModal = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+      var _this2$state2, newPass, newPassConfirm, isInputMember, updataMemberInfo, result, cardTypeEnum, resp;
 
-      return _regenerator2.default.wrap(function _callee2$(_context2) {
+      return _regenerator2.default.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
-              _this2$state = _this2.state, newPass = _this2$state.newPass, newPassConfirm = _this2$state.newPassConfirm;
+              _this2$state2 = _this2.state, newPass = _this2$state2.newPass, newPassConfirm = _this2$state2.newPassConfirm, isInputMember = _this2$state2.isInputMember;
               updataMemberInfo = _this2.props.updataMemberInfo;
-              _context2.next = 4;
+              _context4.next = 4;
               return _this2.store.queryPwd(newPass, newPassConfirm);
 
             case 4:
-              result = _context2.sent;
+              result = _context4.sent;
+              cardTypeEnum = _this2.store.paymode.currentMode.cardTypeEnum;
 
               if (!result) {
-                _context2.next = 15;
+                _context4.next = 18;
                 break;
               }
 
@@ -762,42 +847,68 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 newPassConfirm: ''
               });
               _message2.default.warn('设置成功');
-              currentMode = _this2.store.paymode.currentMode;
-
+              _this2.handleCzkData();
               setTimeout(function () {
-                if (!currentMode.member || !currentMode.member.id) {
-                  _this2.czkInput && _this2.czkInput.input.focus();
-                } else {
-                  if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
-                    _this2.inputCzkAmount.input.focus();
-                    _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
-                  }
+                if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
+                  _this2.inputCzkAmount.input.focus();
+                  _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
                 }
               }, 350);
-              _this2.connectRfCard();
-              _context2.next = 13;
+
+              if (!(isInputMember && _this2.store.member.ID)) {
+                _context4.next = 16;
+                break;
+              }
+
+              _context4.next = 14;
               return _this2.store.updateMemberInfo(_this2.store);
 
-            case 13:
-              resp = _context2.sent;
+            case 14:
+              resp = _context4.sent;
 
               updataMemberInfo(resp);
 
-            case 15:
+            case 16:
+              if (cardTypeEnum === 'BALANCE_CARD') {
+                _this2.store.paymode.updateCardInfo();
+              }
+              _this2.setState({
+                isInputMember: false
+              });
+
+            case 18:
             case 'end':
-              return _context2.stop();
+              return _context4.stop();
           }
         }
-      }, _callee2, _this3);
+      }, _callee4, _this3);
     }));
 
+    _this2.onPressEnterCzk = function (field) {
+      var _ref6 = _this2.state || {},
+          _ref6$newPass = _ref6.newPass,
+          newPass = _ref6$newPass === undefined ? '' : _ref6$newPass,
+          _ref6$newPassConfirm = _ref6.newPassConfirm,
+          newPassConfirm = _ref6$newPassConfirm === undefined ? '' : _ref6$newPassConfirm;
+
+      if (field === 'newPass' && newPass.length === 6) {
+        _this2.inputConfirmAmount.input.focus();
+      }
+      if (field === 'newPassConfirm' && newPassConfirm.length === 6 && newPass.length === 6 && newPass === newPassConfirm) {
+        _this2.handleSetModal();
+      }
+    };
+
     _this2.setPwdValue = function (field, value) {
+      if (!/^[0-9]*$/.test(value)) {
+        return;
+      }
       _this2.setState((0, _defineProperty3.default)({}, field, value), function () {
-        var _ref4 = _this2.state || {},
-            _ref4$newPass = _ref4.newPass,
-            newPass = _ref4$newPass === undefined ? '' : _ref4$newPass,
-            _ref4$newPassConfirm = _ref4.newPassConfirm,
-            newPassConfirm = _ref4$newPassConfirm === undefined ? '' : _ref4$newPassConfirm;
+        var _ref7 = _this2.state || {},
+            _ref7$newPass = _ref7.newPass,
+            newPass = _ref7$newPass === undefined ? '' : _ref7$newPass,
+            _ref7$newPassConfirm = _ref7.newPassConfirm,
+            newPassConfirm = _ref7$newPassConfirm === undefined ? '' : _ref7$newPassConfirm;
 
         if (newPassConfirm.length === 6 && newPass.length === 6 && newPass === newPassConfirm) {
           _this2.setState({
@@ -808,15 +919,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleBlur = function (field) {
-      var _ref5 = _this2.state || {},
-          _ref5$newPass = _ref5.newPass,
-          newPass = _ref5$newPass === undefined ? '' : _ref5$newPass,
-          _ref5$newPassConfirm = _ref5.newPassConfirm,
-          newPassConfirm = _ref5$newPassConfirm === undefined ? '' : _ref5$newPassConfirm;
+      var _ref8 = _this2.state || {},
+          _ref8$newPass = _ref8.newPass,
+          newPass = _ref8$newPass === undefined ? '' : _ref8$newPass,
+          _ref8$newPassConfirm = _ref8.newPassConfirm,
+          newPassConfirm = _ref8$newPassConfirm === undefined ? '' : _ref8$newPassConfirm;
 
       setTimeout(function () {
-        var _ref6 = _this2.state || {},
-            showSetPwdModal = _ref6.showSetPwdModal;
+        var _ref9 = _this2.state || {},
+            showSetPwdModal = _ref9.showSetPwdModal;
 
         if (!showSetPwdModal) return;
         if (field === 'newPass' && newPass.length < 6) {
@@ -873,8 +984,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       // TODO: 测试优惠券支付
 
-      var _ref7 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref7.isNewRetailBCPos;
+      var _ref10 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref10.isNewRetailBCPos;
 
       if (isNewRetailBCPos && !_this2.store.paymode.currentMode.boriginReturn) {
         _this2.store.getCouponList();
@@ -940,7 +1051,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       setTimeout(function () {
         _this2.inputJfdxAmount.input.focus();
         _this2.inputJfdxAmount.input.setSelectionRange(0, _this2.inputJfdxAmount.input.value.length);
-      }, 200);
+      }, 300);
     };
 
     _this2.handleJfdxOk = function (e) {
@@ -958,8 +1069,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkOfflineEnable = function (paymode, key) {
-      var _ref8 = paymode || {},
-          paymodes = _ref8.paymodes;
+      var _ref11 = paymode || {},
+          paymodes = _ref11.paymodes;
 
       var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
 
@@ -990,7 +1101,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       paymode.currentMode = null;
       switch (key) {
         case PayStyle.hyczk:
-          _this2.showCzkModal(-1);
+          _this2.setState({
+            isInputMember: true
+          }, function () {
+            _this2.showCzkModal(-1);
+          });
           break;
         case PayStyle.jfdx:
           _this2.showJfdxModal(-1);
@@ -1099,7 +1214,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           boriginReturn = _this2$store3.boriginReturn;
       var noAlreadyWarn = _this2.state.noAlreadyWarn;
 
-
       if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;
 
       if (_this2.checkModeDisabled(key, brefund, boriginReturn)) {
@@ -1169,12 +1283,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.setCurrentFocusAndAddPay = function (key) {
+    _this2.setCurrentFocusAndAddPay = function (key, payId) {
       _this2.store.changeFocusAndAddPay(key);
       if (_this2.store.bquick) {
         _this2.handleSettle("quickPay");
       } else {
-        _this2.setFocusAndSelection(key);
+        _this2.setFocusAndSelection(key, payId);
       }
     };
 
@@ -1205,7 +1319,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           PayStyle = _enumController$getEn13.PayStyle;
 
       var reg = /^[\d.]+$/g;
-      if (_this2.store.paymode.currentMode.paymentType === PayStyle.hyczk) {
+      if (_this2.store.paymode.currentMode.paymentType === PayStyle.hyczk || _this2.store.paymode.currentMode.paymentType === PayStyle.jfdx) {
         if (!val) {
           _this2.setState({
             storageValue: val
@@ -1235,20 +1349,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }
         }
       }
-      // let bjfdx=this.store.paymode.currentMode.paymentType==PayStyle.jfdx;
-      var value = val;
-      var amountMaxLength = parseInt(_this2.props.initData["AmountMaxLength"] || 10);
-      if (isNaN(val) && val !== '-') {
-        value = _this2._val;
-      } else if (!_this2.store.brefund && !isNaN(val) && parseFloat(val) <= 0) {
-        value = _this2._val;
-      } else if (value.length > amountMaxLength) {
-        value = _this2._val;
-      } else {
-        _this2._val = val;
-      }
-      _this2[_this2.inputkey].input.value = value;
-      _this2.store.paymode.setCurrentModeValue(value, max);
+      _this2.store.paymode.setCurrentModeValue(val, max);
     };
 
     _this2.onBlur = function (index, e) {
@@ -1307,8 +1408,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         return;
       }
 
-      var _ref9 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref9.isNewRetailBCPos;
+      var _ref12 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref12.isNewRetailBCPos;
 
       if (isNewRetailBCPos) {
         _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
@@ -1343,27 +1444,38 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.czkdebounced) {
         return;
       }
-      _this2.czkdebounced = (0, _debounce3.default)((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
-        return _regenerator2.default.wrap(function _callee3$(_context3) {
+      _this2.czkdebounced = (0, _debounce3.default)((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+        var memberdata1;
+        return _regenerator2.default.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
-                _context3.next = 2;
+                _context5.next = 2;
                 return _this2.store.loadCzk(v);
 
               case 2:
-                if (_this2.store.paymode.currentMode.StorageCardNo) {
+                memberdata1 = _context5.sent;
+
+                if (memberdata1 && memberdata1.length === 1) {
+                  if (_this2.store.paymode.currentMode.storageCardNo) {
+                    _this2.setState({
+                      czkValue: _this2.store.paymode.currentMode.storageCardNo
+                    });
+                  }
+                } else if (memberdata1 && memberdata1.length >= 1) {
                   _this2.setState({
-                    czkValue: _this2.store.paymode.currentMode.StorageCardNo
+                    czkVisible: true,
+                    moreCzkVisible: true,
+                    memberdata1: memberdata1
                   });
                 }
 
-              case 3:
+              case 4:
               case 'end':
-                return _context3.stop();
+                return _context5.stop();
             }
           }
-        }, _callee3, _this3);
+        }, _callee5, _this3);
       })), 1000, {
         'leading': true,
         'trailing': false
@@ -1531,13 +1643,21 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       return null;
     };
 
-    _this2.setFocusAndSelection = function (key) {
+    _this2.setFocusAndSelection = function (key, payId) {
       var that = _this2;
       var paymode = _this2.store.paymode;
 
+      var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn19.PayStyle;
+
       var themode = (0, _find3.default)(paymode.thePaymodes, function (mode) {
         return mode.paymentType === key;
       });
+      if (key === PayStyle.hyczk) {
+        themode = (0, _find3.default)(paymode.thePaymodes, function (mode) {
+          return mode.paymethodId === payId;
+        });
+      }
       var index = themode && themode.paymethodId || -1;
       if (index !== -1) {
         setTimeout(function () {
@@ -1552,11 +1672,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.settleUnReturn = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+    _this2.settleUnReturn = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
       var that;
-      return _regenerator2.default.wrap(function _callee5$(_context5) {
+      return _regenerator2.default.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               that = _this2;
 
@@ -1579,18 +1699,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 onOk: function onOk() {
                   var _this4 = this;
 
-                  return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+                  return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
                     var result;
-                    return _regenerator2.default.wrap(function _callee4$(_context4) {
+                    return _regenerator2.default.wrap(function _callee6$(_context6) {
                       while (1) {
-                        switch (_context4.prev = _context4.next) {
+                        switch (_context6.prev = _context6.next) {
                           case 0:
                             window.__queryingModal = (0, _utils.openQueryingModal)();
-                            _context4.next = 3;
+                            _context6.next = 3;
                             return that.store.querySettleResult();
 
                           case 3:
-                            result = _context4.sent;
+                            result = _context6.sent;
 
                             setTimeout(function () {
                               if (window.__queryingModal) {
@@ -1598,34 +1718,34 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                                 window.__queryingModal = null;
                               }
                             }, 0);
-                            _context4.t0 = result.Flag;
-                            _context4.next = _context4.t0 === "0" ? 8 : _context4.t0 === "1" ? 11 : _context4.t0 === "2" ? 13 : 15;
+                            _context6.t0 = result.Flag;
+                            _context6.next = _context6.t0 === "0" ? 8 : _context6.t0 === "1" ? 11 : _context6.t0 === "2" ? 13 : 15;
                             break;
 
                           case 8:
                             //成功
                             that.store.setDtoID(result.ID);
                             that.settleSuccess();
-                            return _context4.abrupt('break', 15);
+                            return _context6.abrupt('break', 15);
 
                           case 11:
                             //处理中
                             that.settleUnReturn();
                             // Message.info("结算正在处理中，请稍后再次查询。");
-                            return _context4.abrupt('break', 15);
+                            return _context6.abrupt('break', 15);
 
                           case 13:
                             //失败
                             _message2.default.info('\u7ED3\u7B97\u5931\u8D25\uFF0C\u539F\u56E0:' + result.Message + '\u3002');
                             // that.settleCanceled();
-                            return _context4.abrupt('break', 15);
+                            return _context6.abrupt('break', 15);
 
                           case 15:
                           case 'end':
-                            return _context4.stop();
+                            return _context6.stop();
                         }
                       }
-                    }, _callee4, _this4);
+                    }, _callee6, _this4);
                   }))();
                 },
                 onCancel: function onCancel() {
@@ -1635,10 +1755,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 2:
             case 'end':
-              return _context5.stop();
+              return _context7.stop();
           }
         }
-      }, _callee5, _this3);
+      }, _callee7, _this3);
     }));
 
     _this2.settleCanceled = function () {
@@ -1647,15 +1767,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.cancelState();
     };
 
-    _this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
-      var _enumController$getEn19, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, getSettleGift, type, resp1;
+    _this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+      var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, getSettleGift, type, resp1;
 
-      return _regenerator2.default.wrap(function _callee6$(_context6) {
+      return _regenerator2.default.wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
               //提示成功
-              _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn19.PayStyle;
+              _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn20.PayStyle;
               _this2$store$paymode = _this2.store.paymode, amount = _this2$store$paymode.amount, received = _this2$store$paymode.received, thePaymodes = _this2$store$paymode.thePaymodes;
               IdbusiType = _this2.store.dto.IdbusiType;
               charge = _this2.store.paymode.charge;
@@ -1713,22 +1833,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               resp1 = false;
 
               if (!(type !== 1)) {
-                _context6.next = 20;
+                _context8.next = 20;
                 break;
               }
 
-              _context6.prev = 11;
-              _context6.next = 14;
+              _context8.prev = 11;
+              _context8.next = 14;
               return getSettleGift();
 
             case 14:
-              resp1 = _context6.sent;
-              _context6.next = 20;
+              resp1 = _context8.sent;
+              _context8.next = 20;
               break;
 
             case 17:
-              _context6.prev = 17;
-              _context6.t0 = _context6['catch'](11);
+              _context8.prev = 17;
+              _context8.t0 = _context8['catch'](11);
 
               console.log("获取支付礼包getSettleGift失败");
 
@@ -1766,23 +1886,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 21:
             case 'end':
-              return _context6.stop();
+              return _context8.stop();
           }
         }
-      }, _callee6, _this3, [[11, 17]]);
+      }, _callee8, _this3, [[11, 17]]);
     }));
 
     _this2.handleGuestShow = function (dtype, value) {
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      var _ref13 = dt || {},
-          guestshow_enable = _ref13.guestshow_enable,
-          guestshow_clear = _ref13.guestshow_clear,
-          guestshow_welcome = _ref13.guestshow_welcome,
-          guestshow_collect = _ref13.guestshow_collect,
-          guestshow_refund = _ref13.guestshow_refund,
-          guestshow_change = _ref13.guestshow_change;
+      var _ref16 = dt || {},
+          guestshow_enable = _ref16.guestshow_enable,
+          guestshow_clear = _ref16.guestshow_clear,
+          guestshow_welcome = _ref16.guestshow_welcome,
+          guestshow_collect = _ref16.guestshow_collect,
+          guestshow_refund = _ref16.guestshow_refund,
+          guestshow_change = _ref16.guestshow_change;
 
       var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1817,124 +1937,114 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(args) {
+      var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
         var handleUserInputs = function () {
-          var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(promises) {
+          var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
-            return _regenerator2.default.wrap(function _callee8$(_context8) {
+            return _regenerator2.default.wrap(function _callee10$(_context10) {
               while (1) {
-                switch (_context8.prev = _context8.next) {
+                switch (_context10.prev = _context10.next) {
                   case 0:
                     results = [];
-                    _context8.prev = 1;
+                    _context10.prev = 1;
                     _iteratorNormalCompletion = true;
                     _didIteratorError = false;
                     _iteratorError = undefined;
-                    _context8.prev = 5;
+                    _context10.prev = 5;
                     _iterator = (0, _getIterator3.default)(promises);
 
                   case 7:
                     if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-                      _context8.next = 16;
+                      _context10.next = 16;
                       break;
                     }
 
                     p = _step.value;
-                    _context8.next = 11;
+                    _context10.next = 11;
                     return p;
 
                   case 11:
-                    _result = _context8.sent;
+                    _result = _context10.sent;
 
                     results.push(_result);
 
                   case 13:
                     _iteratorNormalCompletion = true;
-                    _context8.next = 7;
+                    _context10.next = 7;
                     break;
 
                   case 16:
-                    _context8.next = 22;
+                    _context10.next = 22;
                     break;
 
                   case 18:
-                    _context8.prev = 18;
-                    _context8.t0 = _context8['catch'](5);
+                    _context10.prev = 18;
+                    _context10.t0 = _context10['catch'](5);
                     _didIteratorError = true;
-                    _iteratorError = _context8.t0;
+                    _iteratorError = _context10.t0;
 
                   case 22:
-                    _context8.prev = 22;
-                    _context8.prev = 23;
+                    _context10.prev = 22;
+                    _context10.prev = 23;
 
                     if (!_iteratorNormalCompletion && _iterator.return) {
                       _iterator.return();
                     }
 
                   case 25:
-                    _context8.prev = 25;
+                    _context10.prev = 25;
 
                     if (!_didIteratorError) {
-                      _context8.next = 28;
+                      _context10.next = 28;
                       break;
                     }
 
                     throw _iteratorError;
 
                   case 28:
-                    return _context8.finish(25);
+                    return _context10.finish(25);
 
                   case 29:
-                    return _context8.finish(22);
+                    return _context10.finish(22);
 
                   case 30:
                     window.__loadingModal = (0, _utils.openLoadingModal)();
-                    _context8.next = 33;
+                    _context10.next = 33;
                     return commit(results);
 
                   case 33:
-                    _context8.next = 37;
+                    _context10.next = 37;
                     break;
 
                   case 35:
-                    _context8.prev = 35;
-                    _context8.t1 = _context8['catch'](1);
+                    _context10.prev = 35;
+                    _context10.t1 = _context10['catch'](1);
 
                   case 37:
                   case 'end':
-                    return _context8.stop();
+                    return _context10.stop();
                 }
               }
-            }, _callee8, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
+            }, _callee10, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
           }));
 
-          return function handleUserInputs(_x4) {
-            return _ref16.apply(this, arguments);
+          return function handleUserInputs(_x6) {
+            return _ref19.apply(this, arguments);
           };
         }();
 
-        var _enumController$getEn20, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
+        var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
 
-        return _regenerator2.default.wrap(function _callee9$(_context9) {
+        return _regenerator2.default.wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context9.prev = _context9.next) {
+            switch (_context11.prev = _context11.next) {
               case 0:
                 _this2.setState({
                   settleDisabled: true
                 });
                 console.log("settlement.handleSettle开始执行，参数：", +args);
-                //   let p=new Promise((res,rej)=>{
-                //     res(args);
-                //   });
-                //
-                // const testAsync = async (p) => {
-                //   let result = await p;
-                //   console.log(result);
-                // }
-                //
-                // testAsync(p);
-                _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn20.PayStyle;
+                _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
                 _this2$store6 = _this2.store, paymode = _this2$store6.paymode, brefund = _this2$store6.brefund, boriginReturn = _this2$store6.boriginReturn, newStyle = _this2$store6.newStyle;
                 isQuickPay = args === 'quickPay';
                 that = _this2;
@@ -1950,7 +2060,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!(that.checkCharge() && Math.abs(paymode.receivable) > that.props.initData("posChangeUpperAmount"))) {
-                  _context9.next = 13;
+                  _context11.next = 13;
                   break;
                 }
 
@@ -1958,11 +2068,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.setState({
                   settleDisabled: false
                 });
-                return _context9.abrupt('return');
+                return _context11.abrupt('return');
 
               case 13:
                 if (!(args !== "zero" && !newStyle)) {
-                  _context9.next = 19;
+                  _context11.next = 19;
                   break;
                 }
 
@@ -1971,7 +2081,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!zeromode) {
-                  _context9.next = 19;
+                  _context11.next = 19;
                   break;
                 }
 
@@ -1979,7 +2089,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error(zeromode.name + ' 的结算金额为零，不可以结算。');
-                return _context9.abrupt('return');
+                return _context11.abrupt('return');
 
               case 19:
                 promises = [];
@@ -1988,14 +2098,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }) : paymode.thePaymodes, 'orderBy');
 
                 if (!isQuickPay) {
-                  _context9.next = 27;
+                  _context11.next = 27;
                   break;
                 }
 
                 quickmode = thePaymodes[0];
 
                 if (!_this2.checkModeDisabled(quickmode.paymentType, brefund, boriginReturn)) {
-                  _context9.next = 27;
+                  _context11.next = 27;
                   break;
                 }
 
@@ -2003,7 +2113,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error('退款不能使用' + quickmode.name + '结算，请使用其他结算方式！');
-                return _context9.abrupt('return');
+                return _context11.abrupt('return');
 
               case 27:
                 (0, _forEach3.default)(thePaymodes, function (mode) {
@@ -2013,27 +2123,27 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(values) {
+                  var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
                     var result;
-                    return _regenerator2.default.wrap(function _callee7$(_context7) {
+                    return _regenerator2.default.wrap(function _callee9$(_context9) {
                       while (1) {
-                        switch (_context7.prev = _context7.next) {
+                        switch (_context9.prev = _context9.next) {
                           case 0:
-                            _context7.next = 2;
+                            _context9.next = 2;
                             return _this2.store.commit(_this2.props.bTest);
 
                           case 2:
-                            result = _context7.sent;
+                            result = _context9.sent;
 
                             if (!(result === true)) {
-                              _context7.next = 8;
+                              _context9.next = 8;
                               break;
                             }
 
                             //成功
                             that.settleSuccess();
                             _promise2.default.resolve();
-                            _context7.next = 23;
+                            _context9.next = 23;
                             break;
 
                           case 8:
@@ -2050,24 +2160,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             }, 0);
 
                             if (!(result && (result.Code || result.code))) {
-                              _context7.next = 20;
+                              _context9.next = 20;
                               break;
                             }
 
-                            _context7.t0 = result.Code || result.code;
-                            _context7.next = _context7.t0 === 'RE_Settle_UnReturn' ? 14 : _context7.t0 === 'ECONNABORTED' ? 18 : 20;
+                            _context9.t0 = result.Code || result.code;
+                            _context9.next = _context9.t0 === 'RE_Settle_UnReturn' ? 14 : _context9.t0 === 'ECONNABORTED' ? 18 : 20;
                             break;
 
                           case 14:
                             console.log('settlement--RE_Settle_UnReturn--调用清除数据==Focus==');
                             _this2.props.clearVoucherData && _this2.props.clearVoucherData();
                             _this2.cancelState();
-                            return _context7.abrupt('break', 20);
+                            return _context9.abrupt('break', 20);
 
                           case 18:
                             //error.code === 'ECONNABORTED' && error.message.indexOf('timeout')
                             result.message.indexOf('timeout') > -1 && that.settleUnReturn();
-                            return _context7.abrupt('break', 20);
+                            return _context9.abrupt('break', 20);
 
                           case 20:
                             if (isQuickPay) {
@@ -2075,19 +2185,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               that.cancelState();
                             }
 
-                            _context7.next = 23;
+                            _context9.next = 23;
                             return _promise2.default.reject();
 
                           case 23:
                           case 'end':
-                            return _context7.stop();
+                            return _context9.stop();
                         }
                       }
-                    }, _callee7, _this3);
+                    }, _callee9, _this3);
                   }));
 
-                  return function commit(_x3) {
-                    return _ref15.apply(this, arguments);
+                  return function commit(_x5) {
+                    return _ref18.apply(this, arguments);
                   };
                 }();
 
@@ -2095,102 +2205,102 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 30:
               case 'end':
-                return _context9.stop();
+                return _context11.stop();
             }
           }
-        }, _callee9, _this3);
+        }, _callee11, _this3);
       }));
 
-      return function (_x2) {
-        return _ref14.apply(this, arguments);
+      return function (_x4) {
+        return _ref17.apply(this, arguments);
       };
     }();
 
-    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12() {
+    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
       var handleUserInputs = function () {
-        var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(promises) {
+        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
-          return _regenerator2.default.wrap(function _callee11$(_context11) {
+          return _regenerator2.default.wrap(function _callee13$(_context13) {
             while (1) {
-              switch (_context11.prev = _context11.next) {
+              switch (_context13.prev = _context13.next) {
                 case 0:
                   results = [];
-                  _context11.prev = 1;
+                  _context13.prev = 1;
                   _iteratorNormalCompletion2 = true;
                   _didIteratorError2 = false;
                   _iteratorError2 = undefined;
-                  _context11.prev = 5;
+                  _context13.prev = 5;
                   _iterator2 = (0, _getIterator3.default)(promises);
 
                 case 7:
                   if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
-                    _context11.next = 16;
+                    _context13.next = 16;
                     break;
                   }
 
                   p = _step2.value;
-                  _context11.next = 11;
+                  _context13.next = 11;
                   return p;
 
                 case 11:
-                  _result2 = _context11.sent;
+                  _result2 = _context13.sent;
 
                   results.push(_result2);
 
                 case 13:
                   _iteratorNormalCompletion2 = true;
-                  _context11.next = 7;
+                  _context13.next = 7;
                   break;
 
                 case 16:
-                  _context11.next = 22;
+                  _context13.next = 22;
                   break;
 
                 case 18:
-                  _context11.prev = 18;
-                  _context11.t0 = _context11['catch'](5);
+                  _context13.prev = 18;
+                  _context13.t0 = _context13['catch'](5);
                   _didIteratorError2 = true;
-                  _iteratorError2 = _context11.t0;
+                  _iteratorError2 = _context13.t0;
 
                 case 22:
-                  _context11.prev = 22;
-                  _context11.prev = 23;
+                  _context13.prev = 22;
+                  _context13.prev = 23;
 
                   if (!_iteratorNormalCompletion2 && _iterator2.return) {
                     _iterator2.return();
                   }
 
                 case 25:
-                  _context11.prev = 25;
+                  _context13.prev = 25;
 
                   if (!_didIteratorError2) {
-                    _context11.next = 28;
+                    _context13.next = 28;
                     break;
                   }
 
                   throw _iteratorError2;
 
                 case 28:
-                  return _context11.finish(25);
+                  return _context13.finish(25);
 
                 case 29:
-                  return _context11.finish(22);
+                  return _context13.finish(22);
 
                 case 30:
-                  _context11.next = 32;
+                  _context13.next = 32;
                   return commit(results);
 
                 case 32:
-                  _context11.next = 37;
+                  _context13.next = 37;
                   break;
 
                 case 34:
-                  _context11.prev = 34;
-                  _context11.t1 = _context11['catch'](1);
+                  _context13.prev = 34;
+                  _context13.t1 = _context13['catch'](1);
 
-                  if (_context11.t1 != "cancelpwd") {
-                    _message2.default.error(_context11.t1);
+                  if (_context13.t1 != "cancelpwd") {
+                    _message2.default.error(_context13.t1);
                     setTimeout(function () {
                       that.handleCzk();
                     }, 500);
@@ -2198,37 +2308,37 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 case 37:
                 case 'end':
-                  return _context11.stop();
+                  return _context13.stop();
               }
             }
-          }, _callee11, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
+          }, _callee13, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
         }));
 
-        return function handleUserInputs(_x6) {
-          return _ref20.apply(this, arguments);
+        return function handleUserInputs(_x8) {
+          return _ref23.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref18, isNewRetailBCPos, _enumController$getEn21, PayStyle, isNeedPasswordForStoragePay, commit;
+      var that, curmode, promises, _ref21, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
 
-      return _regenerator2.default.wrap(function _callee12$(_context12) {
+      return _regenerator2.default.wrap(function _callee14$(_context14) {
         while (1) {
-          switch (_context12.prev = _context12.next) {
+          switch (_context14.prev = _context14.next) {
             case 0:
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
-              _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
+              _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
               if (isNewRetailBCPos) {
                 if (curmode.value > 0) {
-                  _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
+                  _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
 
                   if (curmode.paymentType === PayStyle.hyczk) {
-                    isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
-
-                    if (isNeedPasswordForStoragePay) {
-                      promises.push(that.inputPwd(curmode));
+                    if (curmode.cardTypeEnum === 'BALANCE_CARD') {
+                      !curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
+                    } else {
+                      curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
                     }
                   }
                 }
@@ -2239,57 +2349,57 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               }
 
               commit = function () {
-                var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(values) {
+                var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
                   var result;
-                  return _regenerator2.default.wrap(function _callee10$(_context10) {
+                  return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
-                      switch (_context10.prev = _context10.next) {
+                      switch (_context12.prev = _context12.next) {
                         case 0:
                           if (!(values.length > 0)) {
-                            _context10.next = 6;
+                            _context12.next = 6;
                             break;
                           }
 
-                          _context10.next = 3;
+                          _context12.next = 3;
                           return that.store.validePwd(values[0]);
 
                         case 3:
-                          _context10.t0 = _context10.sent;
-                          _context10.next = 7;
+                          _context12.t0 = _context12.sent;
+                          _context12.next = 7;
                           break;
 
                         case 6:
-                          _context10.t0 = "";
+                          _context12.t0 = "";
 
                         case 7:
-                          result = _context10.t0;
+                          result = _context12.t0;
 
                           if (!(result == "")) {
-                            _context10.next = 13;
+                            _context12.next = 13;
                             break;
                           }
 
                           //成功
                           //返回
-                          that.setCurrentFocusAndAddPay(curmode.paymentType);
+                          that.setCurrentFocusAndAddPay(curmode.paymentType, curmode.paymethodId);
                           _promise2.default.resolve();
-                          _context10.next = 15;
+                          _context12.next = 15;
                           break;
 
                         case 13:
-                          _context10.next = 15;
+                          _context12.next = 15;
                           return _promise2.default.reject(result);
 
                         case 15:
                         case 'end':
-                          return _context10.stop();
+                          return _context12.stop();
                       }
                     }
-                  }, _callee10, _this3);
+                  }, _callee12, _this3);
                 }));
 
-                return function commit(_x5) {
-                  return _ref19.apply(this, arguments);
+                return function commit(_x7) {
+                  return _ref22.apply(this, arguments);
                 };
               }();
 
@@ -2297,10 +2407,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 7:
             case 'end':
-              return _context12.stop();
+              return _context14.stop();
           }
         }
-      }, _callee12, _this3);
+      }, _callee14, _this3);
     }));
 
     _this2.fKeyboardOnOk = function (paymethodeId) {
@@ -2340,15 +2450,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(paymode) {
+      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
         var that, confirmPwd;
-        return _regenerator2.default.wrap(function _callee13$(_context13) {
+        return _regenerator2.default.wrap(function _callee15$(_context15) {
           while (1) {
-            switch (_context13.prev = _context13.next) {
+            switch (_context15.prev = _context15.next) {
               case 0:
                 that = _this2;
                 confirmPwd = _this2.state.confirmPwd;
-                return _context13.abrupt('return', new _promise2.default(function (resolve, reject) {
+                return _context15.abrupt('return', new _promise2.default(function (resolve, reject) {
                   var modal = (0, _asyncModal2.default)({
                     onPressEnter: function onPressEnter() {
                       _keyboard2.default.close();
@@ -2356,8 +2466,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref22 = that.state || {},
-                          confirmPwd = _ref22.confirmPwd;
+                      var _ref25 = that.state || {},
+                          confirmPwd = _ref25.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2447,8 +2557,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               type: 'primary', size: 'large', onClick: function onClick() {
                                 var v = (0, _trim3.default)(that['inputAmount']['input']['value']);
 
-                                var _ref23 = that.state || {},
-                                    confirmPwd = _ref23.confirmPwd;
+                                var _ref26 = that.state || {},
+                                    confirmPwd = _ref26.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2482,24 +2592,25 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 3:
               case 'end':
-                return _context13.stop();
+                return _context15.stop();
             }
           }
-        }, _callee13, _this3);
+        }, _callee15, _this3);
       }));
 
-      return function (_x7) {
-        return _ref21.apply(this, arguments);
+      return function (_x9) {
+        return _ref24.apply(this, arguments);
       };
     }();
 
     _this2.btnDebounced = function (type, bquick) {
       _this2.setState({
-        bquick: bquick
+        bquick: bquick,
+        isInputMember: true
       });
 
-      var _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn22.PayStyle;
+      var _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn23.PayStyle;
 
       var _this2$store7 = _this2.store,
           paymode = _this2$store7.paymode,
@@ -2542,13 +2653,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref24 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref24.isNewRetailBCPos;
+      var _ref27 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref27.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
       }
-      if (!/^[0-9]*$/.test(v)) {
+      if (!/^[A-Za-z0-9]*$/.test(v)) {
         return;
       }
       _this2.setState({
@@ -2604,8 +2715,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkCharge = function () {
-      var _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn23.PayStyle;
+      var _enumController$getEn24 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn24.PayStyle;
 
       var paymode = _this2.store.paymode;
 
@@ -2652,8 +2763,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.getXianjinPayment = function (payType, value) {
-      var _enumController$getEn24 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn24.PayStyle;
+      var _enumController$getEn25 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn25.PayStyle;
 
       var isManualIntoAmount = _this2.state.isManualIntoAmount;
 
@@ -2661,8 +2772,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.getXianjinBalance = function (payType, value) {
-      var _enumController$getEn25 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn25.PayStyle;
+      var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn26.PayStyle;
       //找零金额-存在权限控制
 
 
@@ -2682,9 +2793,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var isManualIntoAmount = void 0;
       // 付款弹窗
       return new _promise2.default(function (resolve, reject) {
-        var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
-            PayStyle = _enumController$getEn26.PayStyle,
-            PayIcon2 = _enumController$getEn26.PayIcon2;
+        var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
+            PayStyle = _enumController$getEn27.PayStyle,
+            PayIcon2 = _enumController$getEn27.PayIcon2;
 
         var modal = (0, _asyncModal2.default)({
           onPressEnter: function onPressEnter() {
@@ -2890,7 +3001,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         settleDisabled: false
                       });
                       that.store.bquick && that.props.onCancelSettle && that.props.onCancelSettle();
-                      that.store.delPay(paymode.paymethodId);
+                      that.store.bquick && that.store.delPay(paymode.paymethodId);
                       reject('\u652F\u4ED8\u65B9\u5F0F: ' + paymode.name + '\u5931\u8D25');
                     } },
                   '\u53D6\u6D88'
@@ -2953,8 +3064,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           paymode = _this2$store8.paymode,
           newStyle = _this2$store8.newStyle;
 
-      var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn27.PayStyle;
+      var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn28.PayStyle;
 
       var payTypeList = [PayStyle.SQBPAY, PayStyle.CSYH, PayStyle.smzf];
       var payTypeFilterList = payTypeList.filter(function (filterType) {
@@ -2975,15 +3086,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkModeDisabled = function (type, brefund, boriginReturn) {
-      var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn28.PayStyle;
+      var _enumController$getEn29 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn29.PayStyle;
 
       return (brefund && (type == PayStyle.wx || type == PayStyle.zfb || type == PayStyle.smzf || type == PayStyle.jfdx || type == PayStyle.djq || type == PayStyle.SQBPAY || type == PayStyle.CSYH) || boriginReturn && type == PayStyle.hyczk) && !(boriginReturn && (type == PayStyle.wx || type == PayStyle.zfb)) || _this2.checkCurrentModeHaveMutex(type);
     };
 
     _this2.checkSettleDisabled = function (paymode, thePaymodes) {
-      var _enumController$getEn29 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn29.PayStyle;
+      var _enumController$getEn30 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn30.PayStyle;
 
       console.log("settlement.checkSettleDisabled开始执行，参数：", { paymode: paymode, thePaymodes: thePaymodes });
       if (paymode.amount == 0 && paymode.received == 0) {
@@ -3029,8 +3140,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.editCzkModal = function () {
-      var _enumController$getEn30 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn30.PayStyle;
+      var _enumController$getEn31 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn31.PayStyle;
 
       (0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
         if (mode.paymentType == PayStyle.hyczk) {
@@ -3096,9 +3207,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         isPrototypeClick: false
       });
       var that = _this2;
-      var _this2$state2 = _this2.state,
-          bquick = _this2$state2.bquick,
-          isPrototypeClick = _this2$state2.isPrototypeClick;
+      var _this2$state3 = _this2.state,
+          bquick = _this2$state3.bquick,
+          isPrototypeClick = _this2$state3.isPrototypeClick;
 
       if (!isPrototypeClick) {
         if (bquick) {
@@ -3124,31 +3235,32 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref25 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
-        ICCardServer = _ref25.ICCardServer,
-        ICCardPassword = _ref25.ICCardPassword;
+    var _ref28 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        MemberMeStorageCardInputByKeyBoard = _ref28.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref28.ICCardServer,
+        ICCardPassword = _ref28.ICCardPassword;
 
+    _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref26 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref26.isHorizontalPad,
-        isHorizontalSunMi = _ref26.isHorizontalSunMi;
+    var _ref29 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref29.isHorizontalPad,
+        isHorizontalSunMi = _ref29.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
     _this2.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
     _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
     _this2.setTimer = null;
+    _this2.keypressStime = null;
     return _this2;
   }
 
   (0, _createClass3.default)(Settlement, [{
     key: 'componentDidMount',
     value: function componentDidMount() {
-      //let retailDetails=this.context.viewModel.data.RetailDetails;//明细
-      //let totalRetailAmount=this.context.viewModel.data.TotalRetailAmount;//零售金额合计
       this.store.initPaymodes(this.updateInput, this.props.type, this.props.MemberPoints);
     }
   }, {
@@ -3219,8 +3331,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             _this6.connectRfCard(); //读取失败后，重新连接一下。
             return;
           } else if (ret.status === 1) {
-            //this.searchMember(ret.value);
-            _this6.czkInput.input["value"] = ret.value;
+            // this.searchMember(ret.value);
+            // this.czkInput.input["value"]=ret.value;
+            _this6.setState({
+              czkValue: ret.value
+            });
             _this6.loadCzk(ret.value);
           }
         });
@@ -3268,7 +3383,16 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
   }, {
     key: 'onKeyboardChange',
     value: function onKeyboardChange(key) {
+      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn32.PayStyle;
+
       if (this.currentInput) {
+        if (this.store.paymode.currentMode) {
+          var paymentType1 = this.store.paymode.currentMode.paymentType;
+          if (paymentType1 === PayStyle.djq || paymentType1 === PayStyle.hyczk || paymentType1 === PayStyle.jfdx) {
+            return;
+          }
+        }
         var value = _keyboard2.default.getNewValue(this.currentInput, this.currentInput.value, key, true);
         if (!isNaN(value) || value == '-') {
           this.currentInput.value = value;
@@ -3281,9 +3405,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function renderToolbtn(mode, index) {
       var _this7 = this;
 
-      var _enumController$getEn31 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn31.PayIcon,
-          PayStyle = _enumController$getEn31.PayStyle;
+      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn33.PayIcon,
+          PayStyle = _enumController$getEn33.PayStyle;
 
       var isReturn = this.props.isReturn;
       var _store = this.store,
@@ -3355,11 +3479,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function render() {
       var _this8 = this;
 
-      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn32.PayIcon,
-          PayIcon2 = _enumController$getEn32.PayIcon2,
-          PayStyle = _enumController$getEn32.PayStyle,
-          Differentiate = _enumController$getEn32.Differentiate;
+      var _enumController$getEn34 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn34.PayIcon,
+          PayIcon2 = _enumController$getEn34.PayIcon2,
+          PayStyle = _enumController$getEn34.PayStyle,
+          Differentiate = _enumController$getEn34.Differentiate;
 
       var _state2 = this.state,
           btnDissabled = _state2.btnDissabled,
@@ -3367,10 +3491,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           discountTotalAmount = _state2.discountTotalAmount,
           discountRetailTotalAount = _state2.discountRetailTotalAount,
           discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
-          storageValue = _state2.storageValue;
+          storageValue = _state2.storageValue,
+          czkValue = _state2.czkValue,
+          newPassConfirm = _state2.newPassConfirm,
+          newPass = _state2.newPass;
 
-      var _ref27 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref27.isNewRetailBCPos;
+      var _ref30 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref30.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3433,11 +3560,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref28 = quantityDetail || {},
-          _ref28$buyQuantity = _ref28.buyQuantity,
-          buyQuantity = _ref28$buyQuantity === undefined ? 0 : _ref28$buyQuantity,
-          _ref28$returnQuantity = _ref28.returnQuantity,
-          returnQuantity = _ref28$returnQuantity === undefined ? 0 : _ref28$returnQuantity;
+      var _ref31 = quantityDetail || {},
+          _ref31$buyQuantity = _ref31.buyQuantity,
+          buyQuantity = _ref31$buyQuantity === undefined ? 0 : _ref31$buyQuantity,
+          _ref31$returnQuantity = _ref31.returnQuantity,
+          returnQuantity = _ref31$returnQuantity === undefined ? 0 : _ref31$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -3455,7 +3582,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         sumQuantity = this.changeDecimalBuZero(sumQuantity, quantityPrecision);
       }
 
-      var isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
+      var themodeHyczk = thePaymodes.filter(function (mode) {
+        return mode.paymentType === PayStyle.hyczk && mode.value !== '0.00';
+      });
       return _react2.default.createElement(
         'div',
         { className: 'billingSettlement', ref: function ref(r) {
@@ -3661,13 +3790,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _react2.default.createElement(
                       'div',
                       { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
-                      _react2.default.createElement(
-                        'div',
-                        { className: 'lefticon primary-color', onClick: function onClick() {
-                            _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
-                          } },
-                        _react2.default.createElement(_ticon2.default, { type: 'jianqu', className: 'minus' })
-                      ),
                       _react2.default.createElement(
                         'div',
                         { className: (0, _classnames4.default)({ "name": true }) },
@@ -3697,13 +3819,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           }
                         })
                       ),
-                      !isNeedPasswordForStoragePay && _react2.default.createElement(
-                        'div',
-                        { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
-                          onClick: function onClick() {
-                            _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
+                      _react2.default.createElement(
+                        'span',
+                        { className: 'minus', onClick: function onClick() {
+                            _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
                           } },
-                        _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus primary-color' })
+                        _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
                       )
                     ),
                     mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -3730,7 +3851,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       _react2.default.createElement(
                         'span',
                         { className: 'fl' },
-                        isNewRetailBCPos ? mode.member && mode.member.StorageCardNo : mode.member && mode.member.cardNo
+                        mode && mode.storageCardNo
                       ),
                       _react2.default.createElement('br', null),
                       _react2.default.createElement(
@@ -3742,6 +3863,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         'span',
                         { className: 'fl' },
                         (0, _utils.getFixedNumber)(mode.balance)
+                      ),
+                      _react2.default.createElement('br', null),
+                      themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
+                        _button2.default,
+                        { onClick: function onClick() {
+                            _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
+                          }, className: 'addCard btn-border-primary' },
+                        _react2.default.createElement(_ticon2.default, { type: 'jiahao', className: 'plus b-theme-color' }),
+                        _react2.default.createElement(
+                          'span',
+                          null,
+                          '\u6DFB\u52A0\u5361'
+                        )
                       )
                     )
                   );
@@ -4039,7 +4173,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             //   }
                             // }
                             // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() : 
-                            _this8.onHotKeyClick1(mode, index, boriginReturn);
+                            if (mode.paymentType == PayStyle.hyczk) {
+                              if (themodeHyczk && themodeHyczk.length === 0) {
+                                _this8.onHotKeyClick1(mode, index, boriginReturn);
+                              }
+                            } else {
+                              _this8.onHotKeyClick1(mode, index, boriginReturn);
+                            }
                           },
                           value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
                             return tm.paymentType == PayStyle.hyczk;
@@ -4092,7 +4232,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         _react2.default.createElement(
                           'span',
                           null,
-                          isNewRetailBCPos ? m.member && m.member.StorageCardNo : m.member && m.member.cardNo
+                          m && m.storageCardNo
                         ),
                         _react2.default.createElement(
                           'span',
@@ -4103,6 +4243,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           'span',
                           { className: 'balance fr' },
                           '\u652F\u4ED8\u91D1\u989D\uFF1A'
+                        ),
+                        _react2.default.createElement('br', null),
+                        themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
+                          _button2.default,
+                          { onClick: function onClick() {
+                              return _this8.onHotKeyClick1(mode, index, boriginReturn);
+                            }, className: 'addCard btn-border-primary' },
+                          _react2.default.createElement(_ticon2.default, { type: 'jiahao', className: 'plus b-theme-color' }),
+                          _react2.default.createElement(
+                            'span',
+                            null,
+                            '\u6DFB\u52A0\u5361'
+                          )
                         )
                       );
                     })
@@ -4262,14 +4415,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     { key: index + '', className: 'modeItem' },
                     _react2.default.createElement(
                       'div',
-                      { className: 'main ' + (currentIndex == index && 'settlement-pay-item-border') },
-                      _react2.default.createElement(
-                        'div',
-                        { className: 'lefticon', onClick: function onClick() {
-                            _this8.onDelPay(index);
-                          } },
-                        _react2.default.createElement(_ticon2.default, { type: 'jianqu', className: 'minus' })
-                      ),
+                      { className: 'main b-theme-color ' + (currentIndex == index && 'settlement-pay-item-border') },
                       _react2.default.createElement(
                         'div',
                         { className: (0, _classnames4.default)({ "name": true }) },
@@ -4294,13 +4440,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           }
                         })
                       ),
-                      !isNeedPasswordForStoragePay && _react2.default.createElement(
+                      _react2.default.createElement(
                         'div',
-                        { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
-                          onClick: function onClick() {
-                            _this8.appendCzkmode('', 'noPlaySetPwd');
+                        { className: 'minus', onClick: function onClick() {
+                            _this8.onDelPay(index);
                           } },
-                        _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus primary-color' })
+                        _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
                       )
                     ),
                     mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -4327,7 +4472,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       _react2.default.createElement(
                         'span',
                         { className: 'fl' },
-                        isNewRetailBCPos ? mode.member && mode.member.StorageCardNo : mode.member && mode.member.cardNo
+                        mode && mode.storageCardNo
                       ),
                       _react2.default.createElement('br', null),
                       _react2.default.createElement(
@@ -4516,7 +4661,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _react2.default.createElement(
                       'div',
                       { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
-                      _react2.default.createElement('div', { className: 'lefticon' }),
                       _react2.default.createElement(
                         'div',
                         { className: (0, _classnames4.default)({ "name": true }) },
@@ -4651,7 +4795,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             visible: this.state.czkVisible,
             maskClosable: false,
             destroyOnClose: true,
-            title: "余额结算",
+            title: "储值结算",
             onCancel: this.handleCzkCancel,
             keyboard: false,
             centered: !this.isHorizontalPad ? true : false,
@@ -4682,7 +4826,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value valuetext' },
-                  currentMode && currentMode.member.type || '普通'
+                  currentMode && currentMode.member && currentMode.member.type || '普通'
                 ),
                 _react2.default.createElement(
                   'div',
@@ -4703,7 +4847,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && (0, _utils.getFixedNumber)(currentMode.member.balance)
+                  currentMode && (0, _utils.getFixedNumber)(currentMode.balance)
                 ),
                 _react2.default.createElement(
                   'div',
@@ -4724,7 +4868,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.member.balance)))
+                  currentMode && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.balance)))
                 ),
                 _react2.default.createElement(
                   'div',
@@ -4739,29 +4883,83 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 null,
-                '\u4F59\u989D\u5361\u53F7\uFF1A'
+                '\u50A8\u503C\u5361\u53F7\uFF1A'
               ),
               _react2.default.createElement(
                 'span',
                 null,
                 _react2.default.createElement(_input2.default, {
                   type: 'text',
-                  placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u4F59\u989D\u5361'
-                  // disabled={currentMode && !currentMode.member.StorageCardNo && isReturn ? true: false}
-                  , className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
+                  placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u624B\u673A\u53F7/\u50A8\u503C\u5361\u53F7',
+                  className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
                   onChange: function onChange(e) {
                     return _this8.onCzkChange(e.target.value);
                   },
-                  defaultValue: isNewRetailBCPos ? currentMode && currentMode.member.StorageCardNo : currentMode && currentMode.member.cardNo,
-                  value: this.state.czkValue,
+                  defaultValue: currentMode && currentMode.storageCardNo,
+                  value: czkValue,
                   ref: function ref(input) {
                     return _this8.czkInput = input;
                   },
-                  onKeyDown: function onKeyDown(e) {
-                    if (e.keyCode == 13) {
-                      _this8.loadCzk(e.target.value);
-                    }
-                  },
+                  onKeyDown: function () {
+                    var _ref32 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(e) {
+                      var time, _paymode;
+
+                      return _regenerator2.default.wrap(function _callee16$(_context16) {
+                        while (1) {
+                          switch (_context16.prev = _context16.next) {
+                            case 0:
+                              if (!(e.keyCode == 13)) {
+                                _context16.next = 14;
+                                break;
+                              }
+
+                              time = Date.parse(new Date());
+
+                              if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
+                                _context16.next = 7;
+                                break;
+                              }
+
+                              _message2.default.warn('储值卡不可键盘录入，请刷卡!');
+                              _this8.keypressStime = null;
+                              _this8.setState({
+                                czkValue: null
+                              });
+                              return _context16.abrupt('return');
+
+                            case 7:
+                              _this8.keypressStime = null;
+                              _context16.next = 10;
+                              return _this8.loadCzk(e.target.value);
+
+                            case 10:
+                              _paymode = _this8.store.paymode;
+
+                              if (!_paymode.currentMode.storageCardNo) {
+                                _this8.setState({
+                                  czkvalue: null
+                                });
+                              }
+                              _context16.next = 15;
+                              break;
+
+                            case 14:
+                              if (!_this8.keypressStime && e.keyCode !== 8) {
+                                _this8.keypressStime = Date.parse(new Date());
+                              }
+
+                            case 15:
+                            case 'end':
+                              return _context16.stop();
+                          }
+                        }
+                      }, _callee16, _this8);
+                    }));
+
+                    return function (_x11) {
+                      return _ref32.apply(this, arguments);
+                    };
+                  }(),
                   onFocus: function onFocus(e) {
                     _this8.inputTarget = _this8.czkInput.input;
                     !_this8.state.prototypeVisible && _keyboard2.default.open(function (v) {
@@ -4813,22 +5011,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   className: _index.hotKey.hotKeyNotFilter('input'),
                   value: storageValue,
                   onChange: function onChange(event) {
-                    _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.member.balance));
+                    _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
                   },
-                  defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)),
-                  ref: function ref(_ref29) {
-                    return _this8["inputCzkAmount"] = _ref29;
+                  defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)),
+                  ref: function ref(_ref33) {
+                    return _this8["inputCzkAmount"] = _ref33;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
                     _keyboard2.default.open(function (v) {
                       var value = _keyboard2.default.getNewValue(_this8[_this8.inputkey].input, _this8[_this8.inputkey].input.value, v);
-                      _this8.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.member.balance));
+                      _this8.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.balance));
                     }, _this8.keyboardOnOk, _this8.keyboardOnClose)();
                   },
                   onBlur: function onBlur(e) {
                     _keyboard2.default.close();
-                    _this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.member.balance));
+                    _this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.balance));
                   }
                 })
               )
@@ -4866,6 +5064,47 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             )
           )
         ),
+        _react2.default.createElement(
+          _modal2.default,
+          {
+            wrapClassName: _index.hotKey.hotKeyBindClass('5', 'moreCzkModal') + ' ' + (this.isHorizontalPad ? 'extraHeight' : ''),
+            width: '400px',
+            visible: this.state.moreCzkVisible,
+            maskClosable: false,
+            destroyOnClose: true,
+            title: "储值结算",
+            onCancel: this.handleMoreCzkCancel,
+            keyboard: false,
+            centered: !this.isHorizontalPad ? true : false,
+            footer: _react2.default.createElement(
+              'div',
+              { className: 'action' },
+              _react2.default.createElement(
+                'span',
+                { className: 'showUseCard' },
+                '\u4EC5\u5217\u793A\u53EF\u7528\u7684\u50A8\u503C\u5361'
+              ),
+              _react2.default.createElement(
+                _button2.default,
+                { onClick: this.handleMoreCzkCancel },
+                '\u53D6\u6D88'
+              ),
+              _react2.default.createElement(
+                _button2.default,
+                { type: 'primary', onClick: this.handleMoreCzkOk },
+                '\u786E\u5B9A'
+              )
+            )
+          },
+          _react2.default.createElement(
+            'div',
+            null,
+            _react2.default.createElement(_moreCzkTable2.default, {
+              setMoreCzkIndex: this.setMoreCzkIndex,
+              selectedRowIndex: this.state.selectedRowIndex,
+              dataSource: this.state.memberdata1 })
+          )
+        ),
         _react2.default.createElement(
           _modal2.default,
           (0, _defineProperty3.default)({
@@ -4889,7 +5128,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             ),
             _react2.default.createElement(
               _button2.default,
-              { type: 'primary', disabled: currentMode && currentMode.errinfo != '' || btnDissabled, onClick: this.handleSetModal },
+              { type: 'primary', disabled: btnDissabled, onClick: this.handleSetModal },
               '\u786E\u5B9A'
             )
           )),
@@ -4907,21 +5146,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'div',
                 { className: 'two' },
-                _react2.default.createElement(_numkeyboardPassword2.default, {
+                _react2.default.createElement(_input2.default.Password, {
                   className: 'content',
-                  newType: 'positive',
-                  bordered: true,
                   placeholder: '\u8BF7\u8F93\u51656\u4F4D\u6570\u5B57\u5BC6\u7801',
                   style: { width: 266, height: 32 },
                   maxLength: 6,
+                  value: newPass,
                   ref: function ref(input) {
                     return _this8.inputNewAmount = input;
                   },
                   onChange: function onChange(value) {
-                    return _this8.setPwdValue('newPass', value);
+                    return _this8.setPwdValue('newPass', value.target.value);
                   },
                   onBlur: function onBlur(value) {
                     return _this8.handleBlur('newPass');
+                  },
+                  onPressEnter: function onPressEnter() {
+                    return _this8.onPressEnterCzk('newPass');
                   }
                 })
               )
@@ -4937,21 +5178,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'div',
                 { className: 'two' },
-                _react2.default.createElement(_numkeyboardPassword2.default, {
+                _react2.default.createElement(_input2.default.Password, {
                   className: 'content',
-                  newType: 'positive',
-                  bordered: true,
                   placeholder: '\u8BF7\u786E\u8BA46\u4F4D\u6570\u5B57\u5BC6\u7801',
                   style: { width: 266, height: 32 },
                   maxLength: 6,
+                  value: newPassConfirm,
                   ref: function ref(input) {
                     return _this8.inputConfirmAmount = input;
                   },
                   onChange: function onChange(value) {
-                    return _this8.setPwdValue('newPassConfirm', value);
+                    return _this8.setPwdValue('newPassConfirm', value.target.value);
                   },
                   onBlur: function onBlur(value) {
                     return _this8.handleBlur('newPassConfirm');
+                  },
+                  onPressEnter: function onPressEnter() {
+                    return _this8.onPressEnterCzk('newPassConfirm');
                   }
                 })
               )
@@ -5070,7 +5313,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'div',
                 { className: 'djq2' },
-                (0, _map3.default)(currentMode && currentMode.djqs || [], function (q, index) {
+                currentMode && currentMode.djqs && currentMode.djqs.length > 0 ? (0, _map3.default)(currentMode.djqs || [], function (q, index) {
                   if (!_this8.state.couponLight && !q.count) {
                     return;
                   }
@@ -5089,7 +5332,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         _react2.default.createElement(
                           'span',
                           null,
-                          q.amount
+                          q.nominalAmount
                         ),
                         _react2.default.createElement(
                           'span',
@@ -5180,7 +5423,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _react2.default.createElement('div', { className: 'point_top' }),
                     _react2.default.createElement('div', { className: 'point_bottom' })
                   );
-                })
+                }) : _react2.default.createElement(_tplusComponentsTouch.ProgressState, {
+                  state: "empty",
+                  stateCommonStyle: { 'paddingTop': "30px", backgroundColor: 'transparent' },
+                  empty: { buttonVisible: false, imgStyle: { width: '120px', height: '120px' } } })
               )
             ),
             currentMode && !currentMode.boriginReturn && _react2.default.createElement(
@@ -5316,7 +5562,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value valuetext' },
-                  currentMode && currentMode.member.type || '普通'
+                  currentMode && currentMode.member && currentMode.member.type || '普通'
                 ),
                 _react2.default.createElement(
                   'div',
@@ -5337,7 +5583,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && currentMode.member.bonusPoints
+                  currentMode && currentMode.member && currentMode.member.bonusPoints
                 ),
                 _react2.default.createElement(
                   'div',
@@ -5358,12 +5604,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && (0, _utils.getFixedNumber)(currentMode.member.exchangable)
+                  currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.steadCashIntegral)
                 ),
                 _react2.default.createElement(
                   'div',
                   { className: 'name' },
-                  '\u53EF\u62B5\u73B0\u91D1\u989D'
+                  '\u672C\u5355\u4F7F\u7528\u79EF\u5206'
                 )
               ),
               _react2.default.createElement(
@@ -5379,12 +5625,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.member.exchangable)))
+                  currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.member.exchangable)))
                 ),
                 _react2.default.createElement(
                   'div',
                   { className: 'name' },
-                  '\u672C\u5355\u53EF\u7528'
+                  '\u672C\u5355\u53EF\u62B5\u73B0\u91D1\u989D'
                 )
               )
             ),
@@ -5399,7 +5645,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 { className: 'notext' },
-                currentMode && currentMode.member.cardNo
+                currentMode && currentMode.member && currentMode.member.cardNo
               )
             ),
             _react2.default.createElement(
@@ -5430,12 +5676,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(_input2.default, {
                   className: _index.hotKey.hotKeyNotFilter('input'),
                   type: 'text',
+                  value: storageValue,
                   onChange: function onChange(e) {
                     _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
                   },
-                  defaultValue: currentMode && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
-                  ref: function ref(_ref30) {
-                    return _this8["inputJfdxAmount"] = _ref30;
+                  defaultValue: currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
+                  ref: function ref(_ref34) {
+                    return _this8["inputJfdxAmount"] = _ref34;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";