tplus-components-touch 3.26.6 → 3.26.10

package/dist/components/settlement/settlement.js

@@ -556,7 +556,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.showCzkModal = function () {
       var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id, append, params) {
-        var _enumController$getEn2, PayStyle, currentMode, maxamount, brefund, value11, isInputMember;
+        var _enumController$getEn2, PayStyle, currentMode, maxamount, brefund, value11;
 
         return _regenerator2.default.wrap(function _callee$(_context) {
           while (1) {
@@ -565,51 +565,38 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
 
                 _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
+                _context.next = 4;
+                return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
+
+              case 4:
                 _this2._val = _this2.store.paymode.currentMode.value;
                 currentMode = _this2.store.paymode.currentMode;
                 maxamount = Math.min(currentMode.maxamount, currentMode.balance);
 
-                if (!(_this2.store.bquick && currentMode.storageCardNo && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount))) {
-                  _context.next = 9;
-                  break;
-                }
-
-                _message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
-                  duration: 4
-                });
-                _context.next = 18;
-                break;
-
-              case 9:
-                _this2.setState({
-                  czkVisible: true
-                });
-                brefund = _this2.store.brefund;
-                value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance));
-
-                _this2.setState({
-                  storageValue: value11
-                });
-                if (currentMode.storageCardNo) {
-                  _this2.setState({
-                    czkValue: currentMode.storageCardNo
+                if (_this2.store.bquick && currentMode.storageCardNo && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
+                  _message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
+                    duration: 4
                   });
                 } else {
                   _this2.setState({
-                    czkValue: null
+                    czkVisible: true
                   });
-                }
-                isInputMember = _this2.state.isInputMember;
+                  brefund = _this2.store.brefund;
+                  value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance));
 
-                if (!isInputMember) {
-                  _context.next = 18;
-                  break;
+                  _this2.setState({
+                    storageValue: value11
+                  });
+                  if (currentMode.storageCardNo) {
+                    _this2.setState({
+                      czkValue: currentMode.storageCardNo
+                    });
+                  } else {
+                    _this2.setState({
+                      czkValue: null
+                    });
+                  }
                 }
-
-                _context.next = 18;
-                return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
-
-              case 18:
                 setTimeout(function () {
                   if (!currentMode.storageCardNo) {
                     _this2.czkInput && _this2.czkInput.input.focus();
@@ -622,7 +609,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }, 500);
                 _this2.connectRfCard();
 
-              case 20:
+              case 10:
               case 'end':
                 return _context.stop();
             }
@@ -714,7 +701,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 // 判断是否有密码
                 _this2$store$paymode$ = _this2.store.paymode.currentMode, walletEnabled = _this2$store$paymode$.walletEnabled, cardTypeEnum = _this2$store$paymode$.cardTypeEnum;
 
-                if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled) {
+                if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled && !_this2.store.dto.FreePaymentPasswordStore) {
                   _this2.setState({
                     showSetPwdModal: true,
                     btnDissabled: true
@@ -827,13 +814,31 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }, _callee4, _this3);
     }));
 
+    _this2.onPressEnterCzk = 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;
+
+      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 _ref5 = _this2.state || {},
-            _ref5$newPass = _ref5.newPass,
-            newPass = _ref5$newPass === undefined ? '' : _ref5$newPass,
-            _ref5$newPassConfirm = _ref5.newPassConfirm,
-            newPassConfirm = _ref5$newPassConfirm === undefined ? '' : _ref5$newPassConfirm;
+        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 (newPassConfirm.length === 6 && newPass.length === 6 && newPass === newPassConfirm) {
           _this2.setState({
@@ -844,15 +849,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleBlur = 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;
+      var _ref7 = _this2.state || {},
+          _ref7$newPass = _ref7.newPass,
+          newPass = _ref7$newPass === undefined ? '' : _ref7$newPass,
+          _ref7$newPassConfirm = _ref7.newPassConfirm,
+          newPassConfirm = _ref7$newPassConfirm === undefined ? '' : _ref7$newPassConfirm;
 
       setTimeout(function () {
-        var _ref7 = _this2.state || {},
-            showSetPwdModal = _ref7.showSetPwdModal;
+        var _ref8 = _this2.state || {},
+            showSetPwdModal = _ref8.showSetPwdModal;
 
         if (!showSetPwdModal) return;
         if (field === 'newPass' && newPass.length < 6) {
@@ -909,8 +914,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       // TODO: 测试优惠券支付
 
-      var _ref8 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref8.isNewRetailBCPos;
+      var _ref9 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref9.isNewRetailBCPos;
 
       if (isNewRetailBCPos && !_this2.store.paymode.currentMode.boriginReturn) {
         _this2.store.getCouponList();
@@ -994,8 +999,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkOfflineEnable = function (paymode, key) {
-      var _ref9 = paymode || {},
-          paymodes = _ref9.paymodes;
+      var _ref10 = paymode || {},
+          paymodes = _ref10.paymodes;
 
       var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
 
@@ -1345,8 +1350,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         return;
       }
 
-      var _ref10 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref10.isNewRetailBCPos;
+      var _ref11 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref11.isNewRetailBCPos;
 
       if (isNewRetailBCPos) {
         _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
@@ -1826,13 +1831,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      var _ref14 = dt || {},
-          guestshow_enable = _ref14.guestshow_enable,
-          guestshow_clear = _ref14.guestshow_clear,
-          guestshow_welcome = _ref14.guestshow_welcome,
-          guestshow_collect = _ref14.guestshow_collect,
-          guestshow_refund = _ref14.guestshow_refund,
-          guestshow_change = _ref14.guestshow_change;
+      var _ref15 = dt || {},
+          guestshow_enable = _ref15.guestshow_enable,
+          guestshow_clear = _ref15.guestshow_clear,
+          guestshow_welcome = _ref15.guestshow_welcome,
+          guestshow_collect = _ref15.guestshow_collect,
+          guestshow_refund = _ref15.guestshow_refund,
+          guestshow_change = _ref15.guestshow_change;
 
       var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1867,9 +1872,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
+      var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
         var handleUserInputs = function () {
-          var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
+          var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
             return _regenerator2.default.wrap(function _callee10$(_context10) {
@@ -1960,7 +1965,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }));
 
           return function handleUserInputs(_x7) {
-            return _ref17.apply(this, arguments);
+            return _ref18.apply(this, arguments);
           };
         }();
 
@@ -2063,7 +2068,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
+                  var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
                     var result;
                     return _regenerator2.default.wrap(function _callee9$(_context9) {
                       while (1) {
@@ -2137,7 +2142,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }));
 
                   return function commit(_x6) {
-                    return _ref16.apply(this, arguments);
+                    return _ref17.apply(this, arguments);
                   };
                 }();
 
@@ -2152,13 +2157,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x5) {
-        return _ref15.apply(this, arguments);
+        return _ref16.apply(this, arguments);
       };
     }();
 
     _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
       var handleUserInputs = function () {
-        var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
+        var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
           return _regenerator2.default.wrap(function _callee13$(_context13) {
@@ -2255,11 +2260,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }));
 
         return function handleUserInputs(_x9) {
-          return _ref21.apply(this, arguments);
+          return _ref22.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref19, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
+      var that, curmode, promises, _ref20, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
 
       return _regenerator2.default.wrap(function _callee14$(_context14) {
         while (1) {
@@ -2268,14 +2273,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
-              _ref19 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref19.isNewRetailBCPos;
+              _ref20 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref20.isNewRetailBCPos;
 
               if (isNewRetailBCPos) {
                 if (curmode.value > 0) {
                   _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
 
                   if (curmode.paymentType === PayStyle.hyczk) {
-                    if (curmode.cardTypeEnum === 'BALANCE_CARD' || curmode.isNeedPassword) {
+                    if (curmode.cardTypeEnum === 'BALANCE_CARD' && !_this2.store.dto.FreePaymentPasswordStore || curmode.isNeedPassword) {
                       promises.push(that.inputPwd(curmode));
                     }
                   }
@@ -2287,7 +2292,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               }
 
               commit = function () {
-                var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
+                var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
                   var result;
                   return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
@@ -2337,7 +2342,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }));
 
                 return function commit(_x8) {
-                  return _ref20.apply(this, arguments);
+                  return _ref21.apply(this, arguments);
                 };
               }();
 
@@ -2388,7 +2393,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
+      var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
         var that, confirmPwd;
         return _regenerator2.default.wrap(function _callee15$(_context15) {
           while (1) {
@@ -2404,8 +2409,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref23 = that.state || {},
-                          confirmPwd = _ref23.confirmPwd;
+                      var _ref24 = that.state || {},
+                          confirmPwd = _ref24.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2495,8 +2500,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 _ref24 = that.state || {},
-                                    confirmPwd = _ref24.confirmPwd;
+                                var _ref25 = that.state || {},
+                                    confirmPwd = _ref25.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2537,7 +2542,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x10) {
-        return _ref22.apply(this, arguments);
+        return _ref23.apply(this, arguments);
       };
     }();
 
@@ -2590,8 +2595,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref25 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref25.isNewRetailBCPos;
+      var _ref26 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref26.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -3172,22 +3177,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref26 = _mutantsMicrofx.localStore.get('user') || {},
-        _ref26$loginInfo = _ref26.loginInfo;
+    var _ref27 = _mutantsMicrofx.localStore.get('user') || {},
+        _ref27$loginInfo = _ref27.loginInfo;
 
-    _ref26$loginInfo = _ref26$loginInfo === undefined ? {} : _ref26$loginInfo;
-    var MemberMeStorageCardInputByKeyBoard = _ref26$loginInfo.MemberMeStorageCardInputByKeyBoard,
-        ICCardServer = _ref26$loginInfo.ICCardServer,
-        ICCardPassword = _ref26$loginInfo.ICCardPassword;
+    _ref27$loginInfo = _ref27$loginInfo === undefined ? {} : _ref27$loginInfo;
+    var MemberMeStorageCardInputByKeyBoard = _ref27$loginInfo.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref27$loginInfo.ICCardServer,
+        ICCardPassword = _ref27$loginInfo.ICCardPassword;
 
     _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref27 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref27.isHorizontalPad,
-        isHorizontalSunMi = _ref27.isHorizontalSunMi;
+    var _ref28 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref28.isHorizontalPad,
+        isHorizontalSunMi = _ref28.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3422,10 +3427,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           discountRetailTotalAount = _state2.discountRetailTotalAount,
           discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
           storageValue = _state2.storageValue,
-          czkValue = _state2.czkValue;
+          czkValue = _state2.czkValue,
+          newPassConfirm = _state2.newPassConfirm,
+          newPass = _state2.newPass;
 
-      var _ref28 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref28.isNewRetailBCPos;
+      var _ref29 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref29.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3488,11 +3495,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref29 = quantityDetail || {},
-          _ref29$buyQuantity = _ref29.buyQuantity,
-          buyQuantity = _ref29$buyQuantity === undefined ? 0 : _ref29$buyQuantity,
-          _ref29$returnQuantity = _ref29.returnQuantity,
-          returnQuantity = _ref29$returnQuantity === undefined ? 0 : _ref29$returnQuantity;
+      var _ref30 = quantityDetail || {},
+          _ref30$buyQuantity = _ref30.buyQuantity,
+          buyQuantity = _ref30$buyQuantity === undefined ? 0 : _ref30$buyQuantity,
+          _ref30$returnQuantity = _ref30.returnQuantity,
+          returnQuantity = _ref30$returnQuantity === undefined ? 0 : _ref30$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4829,7 +4836,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     return _this8.czkInput = input;
                   },
                   onKeyDown: function () {
-                    var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(e) {
+                    var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(e) {
                       var time, _paymode;
 
                       return _regenerator2.default.wrap(function _callee16$(_context16) {
@@ -4885,7 +4892,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     }));
 
                     return function (_x12) {
-                      return _ref30.apply(this, arguments);
+                      return _ref31.apply(this, arguments);
                     };
                   }(),
                   onFocus: function onFocus(e) {
@@ -4942,8 +4949,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _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.balance)),
-                  ref: function ref(_ref31) {
-                    return _this8["inputCzkAmount"] = _ref31;
+                  ref: function ref(_ref32) {
+                    return _this8["inputCzkAmount"] = _ref32;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5033,21 +5040,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');
                   }
                 })
               )
@@ -5063,21 +5072,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');
                   }
                 })
               )
@@ -5560,8 +5571,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
                   },
                   defaultValue: currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
-                  ref: function ref(_ref32) {
-                    return _this8["inputJfdxAmount"] = _ref32;
+                  ref: function ref(_ref33) {
+                    return _this8["inputJfdxAmount"] = _ref33;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";