tplus-components-touch 3.54.6 → 3.55.2

package/dist/components/settlement/settlement.js

@@ -36,10 +36,6 @@ var _button = require('antd/es/button');
 
 var _button2 = _interopRequireDefault(_button);
 
-var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
-
-var _defineProperty3 = _interopRequireDefault(_defineProperty2);
-
 var _getIterator2 = require('babel-runtime/core-js/get-iterator');
 
 var _getIterator3 = _interopRequireDefault(_getIterator2);
@@ -52,6 +48,10 @@ var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
 
 var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
 
+var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
+
+var _defineProperty3 = _interopRequireDefault(_defineProperty2);
+
 var _regenerator = require('babel-runtime/regenerator');
 
 var _regenerator2 = _interopRequireDefault(_regenerator);
@@ -182,6 +182,10 @@ var _numKeyboardScan = require('../keyboard/numKeyboardScan');
 
 var _numKeyboardScan2 = _interopRequireDefault(_numKeyboardScan);
 
+var _numkeyboardPassword = require('../keyboard/numkeyboardPassword');
+
+var _numkeyboardPassword2 = _interopRequireDefault(_numkeyboardPassword);
+
 var _ticon = require('../ticon');
 
 var _ticon2 = _interopRequireDefault(_ticon);
@@ -216,14 +220,6 @@ var _moreCzkTable = require('./moreCzkTable');
 
 var _moreCzkTable2 = _interopRequireDefault(_moreCzkTable);
 
-var _ModifyPass = require('../password/ModifyPass');
-
-var _ModifyPass2 = _interopRequireDefault(_ModifyPass);
-
-var _confirmPwd = require('../password/confirmPwd');
-
-var _confirmPwd2 = _interopRequireDefault(_confirmPwd);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var hasElectron = _mutantsMicrofx.env.platform === _mutantsMicrofx.env.constant.platform.electron;
@@ -273,10 +269,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       storageValue: '0.00',
       czkValue: null,
       selectedRowIndex: 0,
-      isNotAutoFocus: true,
-      returnAmount: 0, // 赊销退款金额
-      confirmStatus: false //确认密码弹框
-    };
+      isNotAutoFocus: true };
     _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
       return key.toLocaleUpperCase();
     });
@@ -359,30 +352,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.payQuick = function () {
-      var _this2$state = _this2.state,
-          currentKey = _this2$state.currentKey,
-          returnAmount = _this2$state.returnAmount;
+      var currentKey = _this2.state.currentKey;
 
       var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn.PayStyle;
 
-      var newAmount = _this2.props.amount;
-      if (_this2.props.type != 1) {
-        var IdbusiType = _this2.context.viewModel.data.IdbusiType;
-
-        if (IdbusiType === 42) newAmount = -returnAmount;
-      }
-      _this2.store.init({
-        context: _this2.props.type == 1 ? null : _this2.context,
-        amounthandler: _this2.props.onHandleAmount,
-        datasource: _this2.props.dataSource.Code_02,
-        storeinfo: _this2.props.storeInfo,
-        bquick: true,
-        amount: newAmount,
-        type: _this2.props.type,
-        data: _this2.props.dto,
-        payModeKey: currentKey
-      });
+      _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();
@@ -419,7 +394,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           _this2.setState({
             settleDisabled: false
           });
-          if (!type) {
+          if (type !== 1) {
             var count = _this2.handleShowPrototype();
             if (!isReturn && isAutoShowCouponWhenCash && count > 0) {
               _this2.setState({
@@ -443,26 +418,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.payFun = function () {
-      var returnAmount = _this2.state.returnAmount;
-
-      var newAmount = _this2.props.amount;
-      if (_this2.props.type != 1) {
-        var IdbusiType = _this2.context.viewModel.data.IdbusiType;
-
-        if (IdbusiType === 42) newAmount = -returnAmount;
-      }
-      _this2.store.init({
-        context: _this2.props.type == 1 ? null : _this2.context,
-        amounthandler: _this2.props.onHandleAmount,
-        datasource: _this2.props.dataSource.Code_02,
-        storeinfo: _this2.props.storeInfo,
-        bquick: false,
-        amount: newAmount,
-        type: _this2.props.type,
-        data: _this2.props.dto,
-        creditSalesVoucher: _this2.props.creditSalesVoucher,
-        custVendorId: _this2.props.custVendorId
-      });
+      _this2.store.init(_this2.props.type == 1 ? null : _this2.context, _this2.props.onHandleAmount, _this2.props.dataSource.Code_02, _this2.props.storeInfo, false, _this2.props.amount, _this2.props.type, _this2.props.dto);
       var amount = _this2.store.paymode.amount;
       if (amount == 0) {
         _this2.settleZero();
@@ -561,7 +517,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           _this2.setState({
             settleDisabled: false
           });
-          if (!type) {
+          if (type !== 1) {
             var count = _this2.handleShowPrototype();
             if (!isReturn && isAutoShowCouponWhenCash && count > 0) {
               _this2.setState({
@@ -763,9 +719,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleMoreCzkOk = function () {
-      var _this2$state2 = _this2.state,
-          memberdata1 = _this2$state2.memberdata1,
-          selectedRowIndex = _this2$state2.selectedRowIndex;
+      var _this2$state = _this2.state,
+          memberdata1 = _this2$state.memberdata1,
+          selectedRowIndex = _this2$state.selectedRowIndex;
 
       _this2.store.paymode.updateCardInfo(memberdata1[selectedRowIndex]);
       _this2.handleCzkMoreData();
@@ -897,99 +853,73 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSetModal = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+      var _this2$state2, newPass, newPassConfirm, updataMemberInfo, result, cardTypeEnum, resp;
+
       return _regenerator2.default.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.t0 = _this2.modifyPass;
+              _this2$state2 = _this2.state, newPass = _this2$state2.newPass, newPassConfirm = _this2$state2.newPassConfirm;
+              updataMemberInfo = _this2.props.updataMemberInfo;
+              _context4.next = 4;
+              return _this2.store.queryPwd(newPass, newPassConfirm);
+
+            case 4:
+              result = _context4.sent;
+              cardTypeEnum = _this2.store.paymode.currentMode.cardTypeEnum;
 
-              if (!_context4.t0) {
-                _context4.next = 4;
+              if (!result) {
+                _context4.next = 17;
                 break;
               }
 
-              _context4.next = 4;
-              return _this2.modifyPass.handleOk(_this2.handleCzkData, _this2.store, _this2.props.updateMemberInfo);
-
-            case 4:
-            case 'end':
-              return _context4.stop();
-          }
-        }
-      }, _callee4, _this3);
-    }));
-    _this2.handleConfirmPwdModal = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-      var curmode, result;
-      return _regenerator2.default.wrap(function _callee5$(_context5) {
-        while (1) {
-          switch (_context5.prev = _context5.next) {
-            case 0:
               _this2.setState({
-                confirmStatus: false
+                showSetPwdModal: false,
+                czkVisible: true,
+                newPass: '',
+                newPassConfirm: ''
               });
-              curmode = _this2.store.paymode.currentMode;
-              //密码校验
-
-              _context5.next = 4;
-              return _this2.store.validePwd({
-                pwd: _this2.state.confirmPwd
-              });
-
-            case 4:
-              result = _context5.sent;
+              _message2.default.warn('设置成功');
+              _this2.handleCzkData();
+              setTimeout(function () {
+                if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
+                  _this2.inputCzkAmount.input.focus();
+                  _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
+                }
+              }, 350);
 
-              if (!(result == "")) {
-                _context5.next = 10;
+              if (!_this2.store.member.ID) {
+                _context4.next = 16;
                 break;
               }
 
-              //成功
-              //返回
-              _this2.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
-              _promise2.default.resolve();
-              _context5.next = 13;
-              break;
+              _context4.next = 14;
+              return _this2.store.updateMemberInfo(_this2.store);
 
-            case 10:
-              _this2.setState({
-                confirmStatus: true
-              });
-              //Message.info("密码不正确");
-              _context5.next = 13;
-              return _promise2.default.reject(result);
+            case 14:
+              resp = _context4.sent;
 
-            case 13:
+              updataMemberInfo(resp);
+
+            case 16:
+              if (cardTypeEnum === 'BALANCE_CARD') {
+                _this2.store.paymode.updateCardInfo();
+              }
+
+            case 17:
             case 'end':
-              return _context5.stop();
+              return _context4.stop();
           }
         }
-      }, _callee5, _this3);
+      }, _callee4, _this3);
     }));
 
-    _this2.handleConfirmPwdCancel = function () {
-      _this2.setState({
-        confirmStatus: false
-      });
-    };
-
-    _this2.getConfirmPwd = function (value) {
-      _this2.setState({
-        confirmPwd: value
-      });
-    };
-
-    _this2.changeBtnDisabled = function (value) {
-      _this2.setState({
-        btnDissabled: value
-      });
-    };
-
     _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;
+      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();
@@ -999,6 +929,60 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
+    _this2.setPwdValue = function (field, value) {
+      if (!/^[0-9]*$/.test(value)) {
+        return;
+      }
+      _this2.setState((0, _defineProperty3.default)({}, field, value), function () {
+        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({
+            btnDissabled: false
+          });
+        }
+      });
+    };
+
+    _this2.handleBlur = function (field) {
+      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 _ref8 = _this2.state || {},
+            showSetPwdModal = _ref8.showSetPwdModal;
+
+        if (!showSetPwdModal) return;
+        if (field === 'newPass' && newPass.length < 6) {
+          _this2.setState({
+            btnDissabled: true
+          });
+          _message2.default.warn('请输入6位新密码！');
+        } else {
+          if (field === 'newPassConfirm') {
+            if (newPass !== newPassConfirm) {
+              _this2.setState({
+                btnDissabled: true
+              });
+              _message2.default.warn('密码输入不一致，请重新输入！');
+            }
+          }
+        }
+        if (newPassConfirm.length === 6 && newPass.length === 6 && newPass === newPassConfirm) {
+          _this2.setState({
+            btnDissabled: false
+          });
+        }
+      }, 80);
+    };
+
     _this2.setInventoryFocus = function () {
       if (!!_this2.isHorizontalPad) return;
       var doms = document.getElementsByClassName('app hot-key-focus-container');
@@ -1111,8 +1095,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkOfflineEnable = function (paymode, key) {
-      var _ref7 = paymode || {},
-          paymodes = _ref7.paymodes;
+      var _ref9 = paymode || {},
+          paymodes = _ref9.paymodes;
 
       var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
 
@@ -1344,7 +1328,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       var storeType = _this2.props.type;
 
-      if (!storeType && boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
+      if (storeType != 1 && boriginReturn && (type == PayStyle.hyczk || type == PayStyle.djq || type == PayStyle.jfdx)) {
         _message2.default.info('原单退货时，该结算方式不可以删除。');
       } else {
         _this2.store.delPay(index, bookType);
@@ -1490,18 +1474,18 @@ 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 _callee6() {
+      _this2.czkdebounced = (0, _debounce3.default)((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
         var returnType, memberdata1;
-        return _regenerator2.default.wrap(function _callee6$(_context6) {
+        return _regenerator2.default.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
                 returnType = _this2.getNotBoriginReturn();
-                _context6.next = 3;
+                _context5.next = 3;
                 return _this2.store.loadCzk(v, returnType);
 
               case 3:
-                memberdata1 = _context6.sent;
+                memberdata1 = _context5.sent;
 
                 if (memberdata1 && memberdata1.length === 1) {
                   if (_this2.store.paymode.currentMode.storageCardNo) {
@@ -1519,10 +1503,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 5:
               case 'end':
-                return _context6.stop();
+                return _context5.stop();
             }
           }
-        }, _callee6, _this3);
+        }, _callee5, _this3);
       })), 1000, {
         'leading': true,
         'trailing': false
@@ -1726,11 +1710,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.settleUnReturn = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+    _this2.settleUnReturn = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
       var that;
-      return _regenerator2.default.wrap(function _callee8$(_context8) {
+      return _regenerator2.default.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               that = _this2;
 
@@ -1754,18 +1738,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 _callee7() {
+                  return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
                     var result;
-                    return _regenerator2.default.wrap(function _callee7$(_context7) {
+                    return _regenerator2.default.wrap(function _callee6$(_context6) {
                       while (1) {
-                        switch (_context7.prev = _context7.next) {
+                        switch (_context6.prev = _context6.next) {
                           case 0:
                             window.__queryingModal = (0, _utils.openQueryingModal)();
-                            _context7.next = 3;
+                            _context6.next = 3;
                             return that.store.querySettleResult();
 
                           case 3:
-                            result = _context7.sent;
+                            result = _context6.sent;
 
                             setTimeout(function () {
                               if (window.__queryingModal) {
@@ -1773,34 +1757,34 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                                 window.__queryingModal = null;
                               }
                             }, 0);
-                            _context7.t0 = result.Flag;
-                            _context7.next = _context7.t0 === "0" ? 8 : _context7.t0 === "1" ? 11 : _context7.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 _context7.abrupt('break', 15);
+                            return _context6.abrupt('break', 15);
 
                           case 11:
                             //处理中
                             that.settleUnReturn();
                             // Message.info("结算正在处理中，请稍后再次查询。");
-                            return _context7.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 _context7.abrupt('break', 15);
+                            return _context6.abrupt('break', 15);
 
                           case 15:
                           case 'end':
-                            return _context7.stop();
+                            return _context6.stop();
                         }
                       }
-                    }, _callee7, _this4);
+                    }, _callee6, _this4);
                   }))();
                 },
                 onCancel: function onCancel() {
@@ -1810,10 +1794,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 2:
             case 'end':
-              return _context8.stop();
+              return _context7.stop();
           }
         }
-      }, _callee8, _this3);
+      }, _callee7, _this3);
     }));
 
     _this2.settleCanceled = function () {
@@ -1822,131 +1806,119 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.cancelState();
     };
 
-    _this2.settleSuccess = function () {
-      var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(params) {
-        var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, isFull, 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, isFull, resp1;
 
-        return _regenerator2.default.wrap(function _callee9$(_context9) {
-          while (1) {
-            switch (_context9.prev = _context9.next) {
-              case 0:
-                //提示成功
-                _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;
-                openCashBox = !!(0, _find3.default)(thePaymodes, function (mode) {
-                  return mode.paymentType == PayStyle.xianjin;
-                });
-                // 判断双屏显示。
+      return _regenerator2.default.wrap(function _callee8$(_context8) {
+        while (1) {
+          switch (_context8.prev = _context8.next) {
+            case 0:
+              //提示成功
+              _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;
+              openCashBox = !!(0, _find3.default)(thePaymodes, function (mode) {
+                return mode.paymentType == PayStyle.xianjin;
+              });
+              // 判断双屏显示。
 
-                _this = _this2;
+              _this = _this2;
 
-                showTwoScreen = function showTwoScreen(amount, received, charge) {
-                  var getScreenType = function getScreenType() {
-                    var flag = false;
-                    if (_this.hasElectron === true || _this.isHorizontalSunMi) {
-                      var data = _mutantsMicrofx.localStore.get('setting_setData') || [];
-                      data = data.filter(function (item) {
-                        return item.Name === 'EnableDoubleScreen';
-                      });
-                      data = data && data.length > 0 ? data.shift() : null;
-                      if (data && data.Value === '1') {
-                        flag = true;
-                      }
-                    }
-                    return flag;
-                  };
-                  var params = {
-                    step: 3,
-                    data: {
-                      amount: amount,
-                      received: received,
-                      charge: charge
-                    }
-                  };
-                  var screenType = getScreenType();
-                  if (screenType === true) {
-                    //副屏-第二屏幕
-                    if (_this.isHorizontalSunMi) {
-                      window.sunMi_PresentationManager.sendMessageToSecondScreen(params);
-                      setTimeout(function () {
-                        window.sunMi_PresentationManager.sendMessageToSecondScreen({ step: 1 });
-                      }, 3000);
-                    } else {
-                      _mutantsMicrofx.nativeMs && _mutantsMicrofx.nativeMs.setIpcRendererMethod('ReplyScreen', params);
+              showTwoScreen = function showTwoScreen(amount, received, charge) {
+                var getScreenType = function getScreenType() {
+                  var flag = false;
+                  if (_this.hasElectron === true || _this.isHorizontalSunMi) {
+                    var data = _mutantsMicrofx.localStore.get('setting_setData') || [];
+                    data = data.filter(function (item) {
+                      return item.Name === 'EnableDoubleScreen';
+                    });
+                    data = data && data.length > 0 ? data.shift() : null;
+                    if (data && data.Value === '1') {
+                      flag = true;
                     }
+                  }
+                  return flag;
+                };
+                var params = {
+                  step: 3,
+                  data: {
+                    amount: amount,
+                    received: received,
+                    charge: charge
+                  }
+                };
+                var screenType = getScreenType();
+                if (screenType === true) {
+                  //副屏-第二屏幕
+                  if (_this.isHorizontalSunMi) {
+                    window.sunMi_PresentationManager.sendMessageToSecondScreen(params);
                     setTimeout(function () {
-                      _this.props.onSettleSuccess && _this.props.onSettleSuccess({ openCashBox: openCashBox });
-                    }, 1500);
+                      window.sunMi_PresentationManager.sendMessageToSecondScreen({ step: 1 });
+                    }, 3000);
                   } else {
-                    _this.props.onSettleSuccess && _this.props.onSettleSuccess({ openCashBox: openCashBox });
+                    _mutantsMicrofx.nativeMs && _mutantsMicrofx.nativeMs.setIpcRendererMethod('ReplyScreen', params);
                   }
-                };
+                  setTimeout(function () {
+                    _this.props.onSettleSuccess && _this.props.onSettleSuccess({ openCashBox: openCashBox });
+                  }, 1500);
+                } else {
+                  _this.props.onSettleSuccess && _this.props.onSettleSuccess({ openCashBox: openCashBox });
+                }
+              };
 
-                isFull = _this2.store.isFull;
-                _context9.next = 10;
-                return _this2.settleGiftOpenedInRunningFast();
+              isFull = _this2.store.isFull;
+              _context8.next = 10;
+              return _this2.settleGiftOpenedInRunningFast();
 
-              case 10:
-                resp1 = _context9.sent;
+            case 10:
+              resp1 = _context8.sent;
 
 
-                setTimeout(function () {
-                  if (window.__loadingModal) {
-                    window.__loadingModal.destroy();
-                    window.__loadingModal = null;
-                  }
-                  var isXianjin = _this.state.isXianjin;
-                  showTwoScreen(amount, received, charge);
-                  if (isXianjin) _this2.handleGuestShow(4, charge);
-                  _this.setState({
-                    noAlreadyWarn: true
-                  });
+              setTimeout(function () {
+                if (window.__loadingModal) {
+                  window.__loadingModal.destroy();
+                  window.__loadingModal = null;
+                }
+                var isXianjin = _this.state.isXianjin;
+                showTwoScreen(amount, received, charge);
+                if (isXianjin) _this2.handleGuestShow(4, charge);
+                _this.setState({
+                  noAlreadyWarn: true
+                });
 
-                  var _this$props = _this.props,
-                      MemberPoints = _this$props.MemberPoints,
-                      isMemberPointsReturn = _this$props.isMemberPointsReturn,
-                      isReturn = _this$props.isReturn;
-
-                  var message = "支付成功";
-                  if ((isReturn || isMemberPointsReturn) && Number(amount) == Number(0)) {
-                    message = "退货成功";
-                  } else if (MemberPoints && Number(amount) == Number(0)) {
-                    message = "兑换成功";
-                  } else if (IdbusiType == 39 && received == 0) {
-                    message = "取货成功";
-                  }
-                  _mutantsMicrofx.stores.drawerStore.hide();
-                  if (params === 'onCreditReturn') {
-                    _message2.default.warn('退货成功，此单无须退款！');
-                  } else {
-                    window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, IdbusiType, isFull, function () {
-                      _this.handleGuestShow(5);
-                    });
-                  }
-                  _this2.setState({ isXianjin: false });
-                  _this2.cancelState();
-                }, 0);
+                var _this$props = _this.props,
+                    MemberPoints = _this$props.MemberPoints,
+                    isMemberPointsReturn = _this$props.isMemberPointsReturn,
+                    isReturn = _this$props.isReturn;
+
+                var message = "支付成功";
+                if ((isReturn || isMemberPointsReturn) && Number(amount) == Number(0)) {
+                  message = "退货成功";
+                } else if (MemberPoints && Number(amount) == Number(0)) {
+                  message = "兑换成功";
+                } else if (IdbusiType == 39 && received == 0) {
+                  message = "取货成功";
+                }
+                window.__successModal = (0, _utils.showSuccessModal)(amount, received, charge, _this.props.onModalClose, isXianjin, message, resp1 && resp1.data, _mutantsMicrofx.stores, IdbusiType, isFull, function () {
+                  _this.handleGuestShow(5);
+                });
+                _this2.setState({ isXianjin: false });
+                _this2.cancelState();
+              }, 0);
 
-              case 12:
-              case 'end':
-                return _context9.stop();
-            }
+            case 12:
+            case 'end':
+              return _context8.stop();
           }
-        }, _callee9, _this3);
-      }));
-
-      return function (_x4) {
-        return _ref10.apply(this, arguments);
-      };
-    }();
-
-    _this2.settleGiftOpenedInRunningFast = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
+        }
+      }, _callee8, _this3);
+    }));
+    _this2.settleGiftOpenedInRunningFast = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
       var resp, isCheckGift, vocherPayGift, getSettleGift, type;
-      return _regenerator2.default.wrap(function _callee10$(_context10) {
+      return _regenerator2.default.wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
               resp = false;
               isCheckGift = true;
@@ -1960,55 +1932,55 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               }
 
               if (!isCheckGift) {
-                _context10.next = 16;
+                _context9.next = 16;
                 break;
               }
 
               getSettleGift = _this2.store.getSettleGift;
               type = _this2.props.type;
 
-              if (type) {
-                _context10.next = 16;
+              if (!(type != 1)) {
+                _context9.next = 16;
                 break;
               }
 
-              _context10.prev = 7;
-              _context10.next = 10;
+              _context9.prev = 7;
+              _context9.next = 10;
               return getSettleGift();
 
             case 10:
-              resp = _context10.sent;
-              _context10.next = 16;
+              resp = _context9.sent;
+              _context9.next = 16;
               break;
 
             case 13:
-              _context10.prev = 13;
-              _context10.t0 = _context10['catch'](7);
+              _context9.prev = 13;
+              _context9.t0 = _context9['catch'](7);
 
               console.log("获取支付礼包getSettleGift失败");
 
             case 16:
-              return _context10.abrupt('return', resp);
+              return _context9.abrupt('return', resp);
 
             case 17:
             case 'end':
-              return _context10.stop();
+              return _context9.stop();
           }
         }
-      }, _callee10, _this3, [[7, 13]]);
+      }, _callee9, _this3, [[7, 13]]);
     }));
 
     _this2.handleGuestShow = function (dtype, value) {
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      var _ref12 = dt || {},
-          guestshow_enable = _ref12.guestshow_enable,
-          guestshow_clear = _ref12.guestshow_clear,
-          guestshow_welcome = _ref12.guestshow_welcome,
-          guestshow_collect = _ref12.guestshow_collect,
-          guestshow_refund = _ref12.guestshow_refund,
-          guestshow_change = _ref12.guestshow_change;
+      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 hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -2043,108 +2015,108 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(args) {
+      var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(args) {
         var handleUserInputs = function () {
-          var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(promises) {
+          var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
-            return _regenerator2.default.wrap(function _callee12$(_context12) {
+            return _regenerator2.default.wrap(function _callee11$(_context11) {
               while (1) {
-                switch (_context12.prev = _context12.next) {
+                switch (_context11.prev = _context11.next) {
                   case 0:
                     results = [];
-                    _context12.prev = 1;
+                    _context11.prev = 1;
                     _iteratorNormalCompletion = true;
                     _didIteratorError = false;
                     _iteratorError = undefined;
-                    _context12.prev = 5;
+                    _context11.prev = 5;
                     _iterator = (0, _getIterator3.default)(promises);
 
                   case 7:
                     if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-                      _context12.next = 16;
+                      _context11.next = 16;
                       break;
                     }
 
                     p = _step.value;
-                    _context12.next = 11;
+                    _context11.next = 11;
                     return p;
 
                   case 11:
-                    _result = _context12.sent;
+                    _result = _context11.sent;
 
                     results.push(_result);
 
                   case 13:
                     _iteratorNormalCompletion = true;
-                    _context12.next = 7;
+                    _context11.next = 7;
                     break;
 
                   case 16:
-                    _context12.next = 22;
+                    _context11.next = 22;
                     break;
 
                   case 18:
-                    _context12.prev = 18;
-                    _context12.t0 = _context12['catch'](5);
+                    _context11.prev = 18;
+                    _context11.t0 = _context11['catch'](5);
                     _didIteratorError = true;
-                    _iteratorError = _context12.t0;
+                    _iteratorError = _context11.t0;
 
                   case 22:
-                    _context12.prev = 22;
-                    _context12.prev = 23;
+                    _context11.prev = 22;
+                    _context11.prev = 23;
 
                     if (!_iteratorNormalCompletion && _iterator.return) {
                       _iterator.return();
                     }
 
                   case 25:
-                    _context12.prev = 25;
+                    _context11.prev = 25;
 
                     if (!_didIteratorError) {
-                      _context12.next = 28;
+                      _context11.next = 28;
                       break;
                     }
 
                     throw _iteratorError;
 
                   case 28:
-                    return _context12.finish(25);
+                    return _context11.finish(25);
 
                   case 29:
-                    return _context12.finish(22);
+                    return _context11.finish(22);
 
                   case 30:
                     window.__loadingModal = (0, _utils.openLoadingModal)();
-                    _context12.next = 33;
+                    _context11.next = 33;
                     return commit(results);
 
                   case 33:
-                    _context12.next = 37;
+                    _context11.next = 37;
                     break;
 
                   case 35:
-                    _context12.prev = 35;
-                    _context12.t1 = _context12['catch'](1);
+                    _context11.prev = 35;
+                    _context11.t1 = _context11['catch'](1);
 
                   case 37:
                   case 'end':
-                    return _context12.stop();
+                    return _context11.stop();
                 }
               }
-            }, _callee12, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
+            }, _callee11, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
           }));
 
-          return function handleUserInputs(_x7) {
-            return _ref15.apply(this, arguments);
+          return function handleUserInputs(_x6) {
+            return _ref17.apply(this, arguments);
           };
         }();
 
         var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
 
-        return _regenerator2.default.wrap(function _callee13$(_context13) {
+        return _regenerator2.default.wrap(function _callee12$(_context12) {
           while (1) {
-            switch (_context13.prev = _context13.next) {
+            switch (_context12.prev = _context12.next) {
               case 0:
                 _this2.setState({
                   settleDisabled: true
@@ -2166,7 +2138,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!(that.checkCharge() && Math.abs(paymode.receivable) > that.props.initData("posChangeUpperAmount"))) {
-                  _context13.next = 13;
+                  _context12.next = 13;
                   break;
                 }
 
@@ -2174,11 +2146,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.setState({
                   settleDisabled: false
                 });
-                return _context13.abrupt('return');
+                return _context12.abrupt('return');
 
               case 13:
                 if (!(args !== "zero" && !newStyle)) {
-                  _context13.next = 19;
+                  _context12.next = 19;
                   break;
                 }
 
@@ -2187,7 +2159,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!zeromode) {
-                  _context13.next = 19;
+                  _context12.next = 19;
                   break;
                 }
 
@@ -2195,7 +2167,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error(zeromode.name + ' 的结算金额为零，不可以结算。');
-                return _context13.abrupt('return');
+                return _context12.abrupt('return');
 
               case 19:
                 promises = [];
@@ -2204,14 +2176,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }) : paymode.thePaymodes, 'orderBy');
 
                 if (!isQuickPay) {
-                  _context13.next = 27;
+                  _context12.next = 27;
                   break;
                 }
 
                 quickmode = thePaymodes[0];
 
                 if (!_this2.checkModeDisabled(quickmode.paymentType, brefund, boriginReturn)) {
-                  _context13.next = 27;
+                  _context12.next = 27;
                   break;
                 }
 
@@ -2219,7 +2191,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error('退款不能使用' + quickmode.name + '结算，请使用其他结算方式！');
-                return _context13.abrupt('return');
+                return _context12.abrupt('return');
 
               case 27:
                 (0, _forEach3.default)(thePaymodes, function (mode) {
@@ -2229,27 +2201,27 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(values) {
+                  var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(values) {
                     var result;
-                    return _regenerator2.default.wrap(function _callee11$(_context11) {
+                    return _regenerator2.default.wrap(function _callee10$(_context10) {
                       while (1) {
-                        switch (_context11.prev = _context11.next) {
+                        switch (_context10.prev = _context10.next) {
                           case 0:
-                            _context11.next = 2;
+                            _context10.next = 2;
                             return _this2.store.commit(_this2.props.bTest);
 
                           case 2:
-                            result = _context11.sent;
+                            result = _context10.sent;
 
                             if (!(result === true)) {
-                              _context11.next = 8;
+                              _context10.next = 8;
                               break;
                             }
 
                             //成功
                             that.settleSuccess();
                             _promise2.default.resolve();
-                            _context11.next = 23;
+                            _context10.next = 23;
                             break;
 
                           case 8:
@@ -2266,24 +2238,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             }, 0);
 
                             if (!(result && (result.Code || result.code))) {
-                              _context11.next = 20;
+                              _context10.next = 20;
                               break;
                             }
 
-                            _context11.t0 = result.Code || result.code;
-                            _context11.next = _context11.t0 === 'RE_Settle_UnReturn' ? 14 : _context11.t0 === 'ECONNABORTED' ? 18 : 20;
+                            _context10.t0 = result.Code || result.code;
+                            _context10.next = _context10.t0 === 'RE_Settle_UnReturn' ? 14 : _context10.t0 === 'ECONNABORTED' ? 18 : 20;
                             break;
 
                           case 14:
                             console.log('settlement--RE_Settle_UnReturn--调用清除数据==Focus==');
                             _this2.props.clearVoucherData && _this2.props.clearVoucherData();
                             _this2.cancelState();
-                            return _context11.abrupt('break', 20);
+                            return _context10.abrupt('break', 20);
 
                           case 18:
                             //error.code === 'ECONNABORTED' && error.message.indexOf('timeout')
                             result.message.indexOf('timeout') > -1 && that.settleUnReturn();
-                            return _context11.abrupt('break', 20);
+                            return _context10.abrupt('break', 20);
 
                           case 20:
                             if (isQuickPay) {
@@ -2291,19 +2263,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               that.cancelState();
                             }
 
-                            _context11.next = 23;
+                            _context10.next = 23;
                             return _promise2.default.reject();
 
                           case 23:
                           case 'end':
-                            return _context11.stop();
+                            return _context10.stop();
                         }
                       }
-                    }, _callee11, _this3);
+                    }, _callee10, _this3);
                   }));
 
-                  return function commit(_x6) {
-                    return _ref14.apply(this, arguments);
+                  return function commit(_x5) {
+                    return _ref16.apply(this, arguments);
                   };
                 }();
 
@@ -2311,102 +2283,102 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 30:
               case 'end':
-                return _context13.stop();
+                return _context12.stop();
             }
           }
-        }, _callee13, _this3);
+        }, _callee12, _this3);
       }));
 
-      return function (_x5) {
-        return _ref13.apply(this, arguments);
+      return function (_x4) {
+        return _ref15.apply(this, arguments);
       };
     }();
 
-    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16() {
+    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15() {
       var handleUserInputs = function () {
-        var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(promises) {
+        var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
-          return _regenerator2.default.wrap(function _callee15$(_context15) {
+          return _regenerator2.default.wrap(function _callee14$(_context14) {
             while (1) {
-              switch (_context15.prev = _context15.next) {
+              switch (_context14.prev = _context14.next) {
                 case 0:
                   results = [];
-                  _context15.prev = 1;
+                  _context14.prev = 1;
                   _iteratorNormalCompletion2 = true;
                   _didIteratorError2 = false;
                   _iteratorError2 = undefined;
-                  _context15.prev = 5;
+                  _context14.prev = 5;
                   _iterator2 = (0, _getIterator3.default)(promises);
 
                 case 7:
                   if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
-                    _context15.next = 16;
+                    _context14.next = 16;
                     break;
                   }
 
                   p = _step2.value;
-                  _context15.next = 11;
+                  _context14.next = 11;
                   return p;
 
                 case 11:
-                  _result2 = _context15.sent;
+                  _result2 = _context14.sent;
 
                   results.push(_result2);
 
                 case 13:
                   _iteratorNormalCompletion2 = true;
-                  _context15.next = 7;
+                  _context14.next = 7;
                   break;
 
                 case 16:
-                  _context15.next = 22;
+                  _context14.next = 22;
                   break;
 
                 case 18:
-                  _context15.prev = 18;
-                  _context15.t0 = _context15['catch'](5);
+                  _context14.prev = 18;
+                  _context14.t0 = _context14['catch'](5);
                   _didIteratorError2 = true;
-                  _iteratorError2 = _context15.t0;
+                  _iteratorError2 = _context14.t0;
 
                 case 22:
-                  _context15.prev = 22;
-                  _context15.prev = 23;
+                  _context14.prev = 22;
+                  _context14.prev = 23;
 
                   if (!_iteratorNormalCompletion2 && _iterator2.return) {
                     _iterator2.return();
                   }
 
                 case 25:
-                  _context15.prev = 25;
+                  _context14.prev = 25;
 
                   if (!_didIteratorError2) {
-                    _context15.next = 28;
+                    _context14.next = 28;
                     break;
                   }
 
                   throw _iteratorError2;
 
                 case 28:
-                  return _context15.finish(25);
+                  return _context14.finish(25);
 
                 case 29:
-                  return _context15.finish(22);
+                  return _context14.finish(22);
 
                 case 30:
-                  _context15.next = 32;
+                  _context14.next = 32;
                   return commit(results);
 
                 case 32:
-                  _context15.next = 37;
+                  _context14.next = 37;
                   break;
 
                 case 34:
-                  _context15.prev = 34;
-                  _context15.t1 = _context15['catch'](1);
+                  _context14.prev = 34;
+                  _context14.t1 = _context14['catch'](1);
 
-                  if (_context15.t1 != "cancelpwd") {
-                    _message2.default.error(_context15.t1);
+                  if (_context14.t1 != "cancelpwd") {
+                    _message2.default.error(_context14.t1);
                     setTimeout(function () {
                       that.handleCzk();
                     }, 500);
@@ -2414,22 +2386,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 case 37:
                 case 'end':
-                  return _context15.stop();
+                  return _context14.stop();
               }
             }
-          }, _callee15, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
+          }, _callee14, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
         }));
 
-        return function handleUserInputs(_x9) {
-          return _ref18.apply(this, arguments);
+        return function handleUserInputs(_x8) {
+          return _ref20.apply(this, arguments);
         };
       }();
 
       var that, curmode, promises, _enumController$getEn22, PayStyle, commit;
 
-      return _regenerator2.default.wrap(function _callee16$(_context16) {
+      return _regenerator2.default.wrap(function _callee15$(_context15) {
         while (1) {
-          switch (_context16.prev = _context16.next) {
+          switch (_context15.prev = _context15.next) {
             case 0:
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
@@ -2440,45 +2412,41 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 if (curmode.paymentType === PayStyle.hyczk) {
                   if (curmode.cardTypeEnum === 'BALANCE_CARD') {
-                    !curmode.freePaymentPasswordStore && _this2.setState({
-                      confirmStatus: true
-                    });
+                    !curmode.freePaymentPasswordStore && promises.push(that.inputPwd(curmode));
                   } else {
-                    curmode.isNeedPassword && _this2.setState({
-                      confirmStatus: true
-                    });
+                    curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
                   }
                 }
               }
 
               commit = function () {
-                var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(values) {
+                var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(values) {
                   var result;
-                  return _regenerator2.default.wrap(function _callee14$(_context14) {
+                  return _regenerator2.default.wrap(function _callee13$(_context13) {
                     while (1) {
-                      switch (_context14.prev = _context14.next) {
+                      switch (_context13.prev = _context13.next) {
                         case 0:
                           if (!(values.length > 0)) {
-                            _context14.next = 6;
+                            _context13.next = 6;
                             break;
                           }
 
-                          _context14.next = 3;
+                          _context13.next = 3;
                           return that.store.validePwd(values[0]);
 
                         case 3:
-                          _context14.t0 = _context14.sent;
-                          _context14.next = 7;
+                          _context13.t0 = _context13.sent;
+                          _context13.next = 7;
                           break;
 
                         case 6:
-                          _context14.t0 = "";
+                          _context13.t0 = "";
 
                         case 7:
-                          result = _context14.t0;
+                          result = _context13.t0;
 
                           if (!(result == "")) {
-                            _context14.next = 13;
+                            _context13.next = 13;
                             break;
                           }
 
@@ -2486,23 +2454,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           //返回
                           that.setCurrentFocusAndAddPay(curmode.paymentType, null, curmode.paymethodId);
                           _promise2.default.resolve();
-                          _context14.next = 15;
+                          _context13.next = 15;
                           break;
 
                         case 13:
-                          _context14.next = 15;
+                          _context13.next = 15;
                           return _promise2.default.reject(result);
 
                         case 15:
                         case 'end':
-                          return _context14.stop();
+                          return _context13.stop();
                       }
                     }
-                  }, _callee14, _this3);
+                  }, _callee13, _this3);
                 }));
 
-                return function commit(_x8) {
-                  return _ref17.apply(this, arguments);
+                return function commit(_x7) {
+                  return _ref19.apply(this, arguments);
                 };
               }();
 
@@ -2510,10 +2478,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 6:
             case 'end':
-              return _context16.stop();
+              return _context15.stop();
           }
         }
-      }, _callee16, _this3);
+      }, _callee15, _this3);
     }));
 
     _this2.fKeyboardOnOk = function (paymethodeId) {
@@ -2552,8 +2520,163 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       });
     };
 
-    _this2.handleBtnDebounced = function () {
-      var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(type, bquick) {
+    _this2.inputPwd = function () {
+      var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(paymode) {
+        var that, confirmPwd;
+        return _regenerator2.default.wrap(function _callee16$(_context16) {
+          while (1) {
+            switch (_context16.prev = _context16.next) {
+              case 0:
+                that = _this2;
+                confirmPwd = _this2.state.confirmPwd;
+                return _context16.abrupt('return', new _promise2.default(function (resolve, reject) {
+                  var modal = (0, _asyncModal2.default)({
+                    onPressEnter: function onPressEnter() {
+                      _keyboard2.default.close();
+                      var v = (0, _trim3.default)(that['inputAmount']['input']['value']);
+                      // if (v !== '') {
+                      modal.destroy();
+
+                      var _ref22 = that.state || {},
+                          confirmPwd = _ref22.confirmPwd;
+
+                      setTimeout(function () {
+                        paymode.authCode = v;
+                        resolve({
+                          id: paymode.member.id,
+                          pwd: confirmPwd
+                        });
+                      }, 100);
+                      // } else {
+                      //   Message.info('请输入密码');
+                      //   throw "error";
+                      // }
+                    },
+                    onPressEsc: function onPressEsc() {
+                      _keyboard2.default.close();
+                      reject('cancelpwd');
+                    },
+                    maskClosable: false,
+                    keyboard: false,
+                    closable: true,
+                    title: paymode.name,
+                    width: 450,
+                    className: that.isHorizontalSunMi || !that.isMobileEnvironment ? 'pwdModal' : 'pwdModal extraHeight',
+                    // 储值卡结账时显示为密码框
+                    content: _react2.default.createElement(
+                      'div',
+                      { className: 'scanInput' },
+                      _react2.default.createElement(
+                        'div',
+                        null,
+                        _react2.default.createElement(
+                          'span',
+                          { className: 'label' },
+                          '\u5E94\u6536\u91D1\u989D\uFF1A'
+                        ),
+                        _react2.default.createElement(
+                          'span',
+                          { className: 'yfje' },
+                          (0, _utils.getFixedNumber)(paymode.value)
+                        )
+                      ),
+                      _react2.default.createElement(
+                        'div',
+                        { className: 'pwd' },
+                        _react2.default.createElement(
+                          'span',
+                          { className: 'label' },
+                          '\u50A8\u503C\u4F59\u989D\u5BC6\u7801\uFF1A'
+                        ),
+                        _react2.default.createElement(
+                          'span',
+                          null,
+                          _react2.default.createElement(_numkeyboardPassword2.default, {
+                            className: 'content',
+                            placement: 'rightBottom',
+                            newType: 'positive',
+                            bordered: true,
+                            placeholder: '\u8BF7\u8F93\u51656\u4F4D\u6570\u5B57\u5BC6\u7801',
+                            style: { width: 266, height: 32 },
+                            maxLength: 6,
+                            ref: function ref(input) {
+                              return that.inputAmount = input;
+                            },
+                            onChange: function onChange(value) {
+                              return that.setConfirmPwdValue(value);
+                            }
+                            // onBlur={value => that.handleConfirmBlur}
+                          })
+                        )
+                      ),
+                      _react2.default.createElement(
+                        'div',
+                        { className: 'buttonRegion' },
+                        _react2.default.createElement(
+                          'div',
+                          { className: 'fr' },
+                          _react2.default.createElement(
+                            _button2.default,
+                            { size: 'large', onClick: function onClick() {
+                                modal.destroy();
+                                reject('cancelpwd'); //
+                              } },
+                            '\u53D6\u6D88'
+                          ),
+                          _react2.default.createElement(
+                            _button2.default,
+                            {
+                              type: 'primary', size: 'large', onClick: function onClick() {
+                                var v = (0, _trim3.default)(that['inputAmount']['input']['value']);
+
+                                var _ref23 = that.state || {},
+                                    confirmPwd = _ref23.confirmPwd;
+                                // if (v !== '') {
+
+
+                                modal.destroy();
+                                // if (isQuickPay) {
+                                //   window.__loadingModal = openLoadingModal()
+                                // }
+                                setTimeout(function () {
+                                  paymode.authCode = v;
+                                  resolve({
+                                    id: paymode.member.id,
+                                    pwd: confirmPwd
+                                  });
+                                }, 100);
+                                // } else {
+                                //   Message.info('请输入密码');
+                                // }
+                              } },
+                            '\u786E\u5B9A'
+                          )
+                        )
+                      )
+                    )
+                  });
+                  // 扫码框自动聚焦
+                  setTimeout(function () {
+                    that['inputS' + paymode.paymethodId] && that['inputS' + paymode.paymethodId].input.focus();
+                    that.inputAmount && that.inputAmount.input.focus();
+                  }, 300);
+                }));
+
+              case 3:
+              case 'end':
+                return _context16.stop();
+            }
+          }
+        }, _callee16, _this3);
+      }));
+
+      return function (_x9) {
+        return _ref21.apply(this, arguments);
+      };
+    }();
+
+    _this2.btnDebounced = function () {
+      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(type, bquick) {
         var IdbusiType, CustomerPhone, DistributionMode, Address, isEnableSerialNumber, resultObj, title, productStore, checkResult, _enumController$getEn23, PayStyle, _this2$store7, paymode, brefund, boriginReturn, newStyle, status;
 
         return _regenerator2.default.wrap(function _callee17$(_context17) {
@@ -2677,165 +2800,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x10, _x11) {
-        return _ref19.apply(this, arguments);
-      };
-    }();
-
-    _this2.btnDebounced = function () {
-      var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee18(type, bquick) {
-        var _this2$props3, settlementType, _this2$props3$creditS, creditSalesVoucher, amount, notSelectableVoucherList, _this2$context$viewMo2, IdbusiType, _this2$context$viewMo3, TotalTaxAmount, _this2$context$viewMo4, ArrearsAmount, returnAmount1, _result3;
-
-        return _regenerator2.default.wrap(function _callee18$(_context18) {
-          while (1) {
-            switch (_context18.prev = _context18.next) {
-              case 0:
-                _this2$props3 = _this2.props, settlementType = _this2$props3.type, _this2$props3$creditS = _this2$props3.creditSalesVoucher, creditSalesVoucher = _this2$props3$creditS === undefined ? [] : _this2$props3$creditS, amount = _this2$props3.amount;
-                notSelectableVoucherList = [];
-                //赊销-未生成零售结算单的单据不能进行收款
-
-                if (!(settlementType == 2)) {
-                  _context18.next = 9;
-                  break;
-                }
-
-                if (!(Number(amount) < 0)) {
-                  _context18.next = 5;
-                  break;
-                }
-
-                return _context18.abrupt('return', _message2.default.warn('所勾选零售单的欠款合计须大于等于0！'));
-
-              case 5:
-                notSelectableVoucherList = creditSalesVoucher.filter(function (o) {
-                  return o.SettleStatusEnum != 'SETTLED';
-                });
-
-                if (!(notSelectableVoucherList.length > 0)) {
-                  _context18.next = 9;
-                  break;
-                }
-
-                _modalWraper2.default.confirm({
-                  className: 'not-selectable-voucher',
-                  title: '提示',
-                  icon: false,
-                  content: _react2.default.createElement(
-                    'div',
-                    null,
-                    _react2.default.createElement(
-                      'div',
-                      { className: 'content-title' },
-                      '\u4EE5\u4E0B\u96F6\u552E\u5355\u5C1A\u672A\u751F\u6210\u96F6\u552E\u7ED3\u7B97\u5355\uFF0C\u4E0D\u80FD\u8FDB\u884C\u6536\u6B3E'
-                    ),
-                    _react2.default.createElement(
-                      'ul',
-                      null,
-                      notSelectableVoucherList.map(function (o) {
-                        return _react2.default.createElement(
-                          'li',
-                          null,
-                          o.Code
-                        );
-                      })
-                    )
-                  )
-                });
-                return _context18.abrupt('return');
-
-              case 9:
-                if (!(_this2.props.type != 1)) {
-                  _context18.next = 28;
-                  break;
-                }
-
-                _this2$context$viewMo2 = _this2.context.viewModel.data, IdbusiType = _this2$context$viewMo2.IdbusiType, _this2$context$viewMo3 = _this2$context$viewMo2.TotalTaxAmount, TotalTaxAmount = _this2$context$viewMo3 === undefined ? 0 : _this2$context$viewMo3, _this2$context$viewMo4 = _this2$context$viewMo2.ArrearsAmount, ArrearsAmount = _this2$context$viewMo4 === undefined ? 0 : _this2$context$viewMo4;
-                //赊销原单退货
-
-                if (!(IdbusiType === 42)) {
-                  _context18.next = 25;
-                  break;
-                }
-
-                //实际退款金额
-                returnAmount1 = Math.abs(TotalTaxAmount) - ArrearsAmount;
-
-                _this2.setState({
-                  returnAmount: returnAmount1
-                });
-                //判断欠款金额
-
-                if (!(returnAmount1 > 0)) {
-                  _context18.next = 18;
-                  break;
-                }
-
-                _modalWraper2.default.confirm({
-                  className: 'tplus-confirm-modal',
-                  title: '退款',
-                  content: '\u672C\u5355\u987B\u9000\u6B3E\uFF1A' + returnAmount1 + '\u5143\uFF0C\u672C\u6B21\u9000\u6B3E\u91D1\u989D=\u672C\u6B21\u9000\u8D27\u91D1\u989D-\u8BE5\u5BA2\u6237\u672A\u6536\u6B3E\u91D1\u989D',
-                  onOk: function onOk() {
-                    _this2.handleBtnDebounced(type, bquick);
-                  },
-                  onCancel: function onCancel() {}
-                });
-                _context18.next = 23;
-                break;
-
-              case 18:
-                returnAmount1 = 0;
-                _context18.next = 21;
-                return _this2.store.commit(_this2.props.bTest, _this2.context.viewModel.data);
-
-              case 21:
-                _result3 = _context18.sent;
-
-                if (_result3 === true) {
-                  //成功
-                  _this2.settleSuccess('onCreditReturn');
-                  _promise2.default.resolve();
-                } else {
-                  _this2.setState({
-                    settleDisabled: false
-                  });
-                  //提示失败
-                  setTimeout(function () {
-                    if (window.__loadingModal) {
-                      window.__loadingModal.destroy();
-                      window.__loadingModal = null;
-                    }
-                  }, 0);
-                }
-
-              case 23:
-                _context18.next = 26;
-                break;
-
-              case 25:
-                _this2.handleBtnDebounced(type, bquick);
-
-              case 26:
-                _context18.next = 29;
-                break;
-
-              case 28:
-                _this2.handleBtnDebounced(type, bquick);
-
-              case 29:
-              case 'end':
-                return _context18.stop();
-            }
-          }
-        }, _callee18, _this3);
-      }));
-
-      return function (_x12, _x13) {
-        return _ref20.apply(this, arguments);
+        return _ref24.apply(this, arguments);
       };
     }();
 
     _this2.onCzkChange = function (v) {
-      var _ref21 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref21.isNewRetailBCPos;
+      var _ref25 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref25.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2972,9 +2943,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var that = _this2;
       var isStoredValueCard = false;
       var discountPrototypeTotalAmount = _this2.state.discountPrototypeTotalAmount;
-      var _this2$props4 = _this2.props,
-          isReturn = _this2$props4.isReturn,
-          type = _this2$props4.type;
+      var _this2$props3 = _this2.props,
+          isReturn = _this2$props3.isReturn,
+          type = _this2$props3.type;
 
       var isManualIntoAmount = void 0;
       var BuyerPayFreight = _this2.context && _this2.context.viewModel && _this2.context.viewModel.data && _this2.context.viewModel.data.BuyerPayFreight;
@@ -3131,7 +3102,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 that.getXianjinBalance(paymode.paymentType, paymode.value)
               )
             ),
-            !isReturn && !type && _react2.default.createElement(
+            !isReturn && type !== 1 && _react2.default.createElement(
               'div',
               { className: 'zlje prototype' },
               _react2.default.createElement(
@@ -3294,27 +3265,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       var _enumController$getEn30 = _mutantsUtil.enumController.getEnumOj(),
           PayStyle = _enumController$getEn30.PayStyle;
 
-      var type = _this2.props.type;
-
       console.log("settlement.checkSettleDisabled开始执行，参数：", { paymode: paymode, thePaymodes: thePaymodes });
       if (paymode.amount == 0 && paymode.received == 0) {
         console.log("settlement.checkSettleDisabled返回结果：", false);
         return false;
       }
       if (_this2.store.brefund) {
-        var _result4 = !(paymode.receivable == 0 && thePaymodes.length > 0);
-        console.log("settlement.checkSettleDisabled返回结果：", _result4);
-        return _result4;
+        var _result3 = !(paymode.receivable == 0 && thePaymodes.length > 0);
+        console.log("settlement.checkSettleDisabled返回结果：", _result3);
+        return _result3;
       }
       var xj = (0, _find3.default)(thePaymodes, function (mode) {
         return mode.paymentType == PayStyle.xianjin;
       });
-      //type == 2 是赊销类型，赊销支付可低于应收
-      var receivable = Number(paymode.receivable);
-      var amount = Number(paymode.amount);
-      var enabled = (receivable == 0 || type == 2 && 0 < receivable && receivable < amount) && thePaymodes.length > 0;
+      var enabled = paymode.receivable == 0 && thePaymodes.length > 0;
       if (xj && xj.value != 0) {
-        enabled = receivable <= 0 && thePaymodes.length > 0 && Math.abs(receivable) < xj.value || type == 2 && 0 < receivable && receivable < amount;
+        enabled = paymode.receivable <= 0 && thePaymodes.length > 0 && Math.abs(paymode.receivable) < xj.value;
       }
       console.log("settlement.checkSettleDisabled返回结果：", !enabled);
       var settleDisabled = _this2.state.settleDisabled;
@@ -3390,7 +3356,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             'div',
             null,
             (0, _map3.default)(modeList, function (mode, modeIndex) {
-              return _this2.renderToolbtn(mode, index * carouselStart + modeIndex, !type ? 'bookPay' : '');
+              return _this2.renderToolbtn(mode, index * carouselStart + modeIndex, type !== 1 ? 'bookPay' : '');
             })
           );
         })
@@ -3441,12 +3407,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref22 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
-        MemberMeStorageCardInputByKeyBoard = _ref22.MemberMeStorageCardInputByKeyBoard,
-        ICCardServer = _ref22.ICCardServer,
-        ICCardPassword = _ref22.ICCardPassword,
-        PreSellOrBook = _ref22.PreSellOrBook,
-        PercentageWhenBook = _ref22.PercentageWhenBook;
+    var _ref26 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        MemberMeStorageCardInputByKeyBoard = _ref26.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref26.ICCardServer,
+        ICCardPassword = _ref26.ICCardPassword,
+        PreSellOrBook = _ref26.PreSellOrBook,
+        PercentageWhenBook = _ref26.PercentageWhenBook;
 
     _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
@@ -3455,9 +3421,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.percentageWhenBook = PercentageWhenBook;
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref23 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref23.isHorizontalPad,
-        isHorizontalSunMi = _ref23.isHorizontalSunMi;
+    var _ref27 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref27.isHorizontalPad,
+        isHorizontalSunMi = _ref27.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3465,7 +3431,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
     _this2.setTimer = null;
     _this2.keypressStime = null;
-    _this2.store = !props.type ? _mutantsMicrofx.stores.settlementVoucherStore : _mutantsMicrofx.stores.settlementMemberStore;
+    _this2.store = !(props.type == 1) ? _mutantsMicrofx.stores.settlementVoucherStore : _mutantsMicrofx.stores.settlementMemberStore;
     _this2.voucherRunningFast = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('vocherRunningFast') == '1';
     return _this2;
   }
@@ -3606,8 +3572,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
   }, {
     key: 'isNoProductTip',
     value: function isNoProductTip(nonProductMap) {
-      var _ref24 = this.context.viewModel.data || {},
-          RetailDetails = _ref24.RetailDetails;
+      var _ref28 = this.context.viewModel.data || {},
+          RetailDetails = _ref28.RetailDetails;
 
       var temphtml = [];
       if ((0, _keys2.default)(nonProductMap).length > 0) {
@@ -3806,9 +3772,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           isReturn = _props.isReturn,
           quantityDetail = _props.quantityDetail,
           memberDisabled = _props.memberDisabled,
-          noIsMinAmount = _props.noIsMinAmount,
-          _props$creditSalesVou = _props.creditSalesVoucher,
-          creditSalesVoucher = _props$creditSalesVou === undefined ? [] : _props$creditSalesVou;
+          noIsMinAmount = _props.noIsMinAmount;
       // 原单退货
 
       var boriginReturn = this.getBoriginReturn();
@@ -3862,7 +3826,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           return paymode.isQuick;
         }
       });
-      var productsIsEmpty = !type && this.context.viewModel.data.RetailDetails.length == 0 || type == 1 && parseFloat(amount || 0) <= 0 || memberDisabled || noIsMinAmount || type == 2 && creditSalesVoucher.length === 0;
+      var productsIsEmpty = type != 1 && this.context.viewModel.data.RetailDetails.length == 0 || type == 1 && parseFloat(amount || 0) <= 0 || memberDisabled || noIsMinAmount;
       var moreToolbtns = [];
       var params = {
         pagination: {
@@ -3880,11 +3844,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref25 = quantityDetail || {},
-          _ref25$buyQuantity = _ref25.buyQuantity,
-          buyQuantity = _ref25$buyQuantity === undefined ? 0 : _ref25$buyQuantity,
-          _ref25$returnQuantity = _ref25.returnQuantity,
-          returnQuantity = _ref25$returnQuantity === undefined ? 0 : _ref25$returnQuantity;
+      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 quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4031,7 +3995,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _react2.default.createElement(
           'div',
           { className: 'btns' },
-          !this.isHorizontalPad && !this.props.MemberPoints && type != 2 && (0, _map3.default)(quickPay, function (p, i) {
+          !this.isHorizontalPad && !this.props.MemberPoints && (0, _map3.default)(quickPay, function (p, i) {
             var _classnames2;
 
             var iconclass = PayIcon2[p.paymentType] ? 'color' + p.paymentType : "primary-color";
@@ -4043,7 +4007,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 onClick: function onClick() {
                   _this8.btnDebounced(p.paymentType, true);
                 },
-                disabled: productsIsEmpty || !type && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn)
+                disabled: productsIsEmpty || type != 1 && _this8.checkModeDisabled(p.paymentType, (_this8.context.viewModel.data.TotalTaxAmount || 0 - _this8.context.viewModel.data.OnlinePaymentAmount || 0) < 0, boriginReturn)
               },
               _react2.default.createElement(
                 'div',
@@ -4059,13 +4023,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }),
           _react2.default.createElement(
             _button2.default,
-            { key: 'settle',
-              className: (0, _classnames4.default)({ "settle": true, "settle2": type == 1, "settleStorage": true, 'primary-btn': true }),
-              onClick: function onClick() {
+            { key: 'settle', className: (0, _classnames4.default)({ "settle": true, "settle2": type == 1, "settleStorage": true, 'primary-btn': true }), onClick: function onClick() {
                 _this8.btnDebounced();
-              },
-              disabled: productsIsEmpty },
-            this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : IdbusiType == 39 && _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount == 0 ? '取货' : type == 2 ? '收款' : settle.name
+              }, disabled: productsIsEmpty },
+            this.props.isMemberPoints ? '立即兑换' : this.props.isMemberPointsReturn ? '退货' : IdbusiType == 39 && _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount == 0 ? '取货' : settle.name
           )
         ),
         !newStyle && _react2.default.createElement(
@@ -4129,7 +4090,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         mode.paymentType == PayStyle.hyczk || mode.paymentType == PayStyle.jfdx || mode.paymentType == PayStyle.djq ? _react2.default.createElement('input', { id: 'inputS' + index,
                           className: _index.hotKey.hotKeyNotFilter(),
                           onClick: function onClick() {
-                            _this8.editModal(index, mode.paymentType, !type ? boriginReturn : null);
+                            _this8.editModal(index, mode.paymentType, type != 1 ? boriginReturn : null);
                           }, value: (0, _utils.getFixedNumber)(mode.value) }) : _react2.default.createElement('input', { id: 'inputS' + index,
                           className: _index.hotKey.hotKeyNotFilter(),
                           value: mode.exchangeRate != 1 ? mode.value2 : mode.value,
@@ -4193,7 +4154,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         (0, _utils.getFixedNumber)(mode.balance)
                       ),
                       _react2.default.createElement('br', null),
-                      !type && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
+                      type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && !isReturn && _react2.default.createElement(
                         _button2.default,
                         { onClick: function onClick() {
                             _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
@@ -4300,7 +4261,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     )
                   )
                 ),
-                !type && !isReturn && _react2.default.createElement(
+                type != 1 && !isReturn && _react2.default.createElement(
                   'div',
                   { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
                   '\u4F18\u60E0\u660E\u7EC6',
@@ -4450,7 +4411,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     )
                   )
                 ),
-                !type && !isReturn && _react2.default.createElement(
+                type != 1 && !isReturn && _react2.default.createElement(
                   'div',
                   { onClick: this.prototypeDetailedClick, className: 'prototypeDetailed primary-color' },
                   '\u4F18\u60E0\u660E\u7EC6',
@@ -4537,7 +4498,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           className: _index.hotKey.hotKeyNotFilter("paymode hotkey_" + _this8.compoundHotkeysList[hotkeyIndex]),
                           disabled: _this8.checkModeDisabled(mode.paymentType, brefund, boriginReturn),
                           onClick: function onClick() {
-                            if (!type && mode.paymentType == PayStyle.hyczk) {
+                            if (type != 1 && mode.paymentType == PayStyle.hyczk) {
                               if (themodeHyczk && themodeHyczk.length === 0) {
                                 _this8.onHotKeyClick1(mode, index, boriginReturn);
                               }
@@ -4593,7 +4554,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           null,
                           '\u5361\u53F7\uFF1A'
                         ),
-                        !type ? _react2.default.createElement(
+                        type != 1 ? _react2.default.createElement(
                           'span',
                           null,
                           m && m.storageCardNo
@@ -4613,7 +4574,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           '\u652F\u4ED8\u91D1\u989D\uFF1A'
                         ),
                         _react2.default.createElement('br', null),
-                        !type && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
+                        type != 1 && themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
                           _button2.default,
                           { onClick: function onClick() {
                               return _this8.onHotKeyClick1(mode, index, boriginReturn);
@@ -4772,22 +4733,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     return _this8.czkInput = input;
                   },
                   onKeyDown: function () {
-                    var _ref26 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee19(e) {
+                    var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee18(e) {
                       var time, _paymode;
 
-                      return _regenerator2.default.wrap(function _callee19$(_context19) {
+                      return _regenerator2.default.wrap(function _callee18$(_context18) {
                         while (1) {
-                          switch (_context19.prev = _context19.next) {
+                          switch (_context18.prev = _context18.next) {
                             case 0:
                               if (!(e.keyCode == 13)) {
-                                _context19.next = 14;
+                                _context18.next = 14;
                                 break;
                               }
 
                               time = Date.parse(new Date());
 
                               if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
-                                _context19.next = 7;
+                                _context18.next = 7;
                                 break;
                               }
 
@@ -4796,11 +4757,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               _this8.setState({
                                 czkValue: null
                               });
-                              return _context19.abrupt('return');
+                              return _context18.abrupt('return');
 
                             case 7:
                               _this8.keypressStime = null;
-                              _context19.next = 10;
+                              _context18.next = 10;
                               return _this8.loadCzk(e.target.value);
 
                             case 10:
@@ -4811,7 +4772,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                                   czkvalue: null
                                 });
                               }
-                              _context19.next = 15;
+                              _context18.next = 15;
                               break;
 
                             case 14:
@@ -4821,14 +4782,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                             case 15:
                             case 'end':
-                              return _context19.stop();
+                              return _context18.stop();
                           }
                         }
-                      }, _callee19, _this8);
+                      }, _callee18, _this8);
                     }));
 
-                    return function (_x15) {
-                      return _ref26.apply(this, arguments);
+                    return function (_x13) {
+                      return _ref30.apply(this, arguments);
                     };
                   }(),
                   onFocus: function onFocus(e) {
@@ -4885,8 +4846,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(_ref27) {
-                    return _this8["inputCzkAmount"] = _ref27;
+                  ref: function ref(_ref31) {
+                    return _this8["inputCzkAmount"] = _ref31;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -4980,7 +4941,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _react2.default.createElement(
           _modal2.default,
           (0, _defineProperty3.default)({
-            wrapClassName: 'djq ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' modify-password',
+            wrapClassName: 'djq ' + (this.voucherRunningFast ? 'no-zoom' : '') + ' ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' passwordContainer',
             width: '400px',
             visible: this.state.showSetPwdModal,
             backdropClosable: false,
@@ -5005,47 +4966,74 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               '\u786E\u5B9A'
             )
           )),
-          _react2.default.createElement(_ModifyPass2.default, { changeBtnDisabled: this.changeBtnDisabled, passwordTitle: '\u8BBE\u7F6E\u5BC6\u7801', ref: function ref(_ref28) {
-              return _this8.modifyPass = _ref28;
-            }, cardList: this.store.paymode.currentMode, cancelModal: this.handleSetPwdCancel })
-        ),
-        _react2.default.createElement(
-          _modal2.default,
-          (0, _defineProperty3.default)({
-            wrapClassName: 'djq ' + (this.isHorizontalPad ? 'extraHeight' : '') + ' confirmPwdWraper',
-            width: '400px',
-            visible: this.state.confirmStatus,
-            backdropClosable: false,
-            destroyOnClose: true,
-            footer: null,
-            onCancel: this.handleConfirmPwdCancel,
-            keyboard: false,
-            centered: !this.isHorizontalPad ? true : false,
-            title: '\u50A8\u503C\u5361',
-            zIndex: 1007
-          }, 'footer', _react2.default.createElement(
+          _react2.default.createElement(
             'div',
-            { className: 'action' },
+            { className: 'setPwdContainer' },
             _react2.default.createElement(
-              _button2.default,
-              { onClick: this.handleConfirmPwdCancel },
-              '\u53D6\u6D88'
+              'div',
+              { className: 'setPwdDiv' },
+              _react2.default.createElement(
+                'div',
+                { className: 'one' },
+                '\u65B0\u5BC6\u7801'
+              ),
+              _react2.default.createElement(
+                'div',
+                { className: 'two' },
+                _react2.default.createElement(_input2.default.Password, {
+                  className: 'content',
+                  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.target.value);
+                  },
+                  onBlur: function onBlur(value) {
+                    return _this8.handleBlur('newPass');
+                  },
+                  onPressEnter: function onPressEnter() {
+                    return _this8.onPressEnterCzk('newPass');
+                  }
+                })
+              )
             ),
             _react2.default.createElement(
-              _button2.default,
-              { type: 'primary', onClick: this.handleConfirmPwdModal },
-              '\u786E\u5B9A'
+              'div',
+              { className: 'setPwdDiv' },
+              _react2.default.createElement(
+                'div',
+                { className: 'one' },
+                '\u786E\u8BA4\u65B0\u5BC6\u7801'
+              ),
+              _react2.default.createElement(
+                'div',
+                { className: 'two' },
+                _react2.default.createElement(_input2.default.Password, {
+                  className: 'content',
+                  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.target.value);
+                  },
+                  onBlur: function onBlur(value) {
+                    return _this8.handleBlur('newPassConfirm');
+                  },
+                  onPressEnter: function onPressEnter() {
+                    return _this8.onPressEnterCzk('newPassConfirm');
+                  }
+                })
+              )
             )
-          )),
-          _react2.default.createElement(_confirmPwd2.default, {
-            isLimit: 'yes',
-            placeholder: '',
-            maxLength: 6,
-            labelName: '\u50A8\u503C\u4F59\u989D\u5BC6\u7801',
-            getConfirmPwd: this.getConfirmPwd,
-            params: 'pay',
-            amount: this.store.paymode.currentMode && (0, _utils.getFixedNumber)(this.store.paymode.currentMode.value)
-          })
+          )
         ),
         _react2.default.createElement(
           _modal2.default,
@@ -5529,8 +5517,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(_ref29) {
-                    return _this8["inputJfdxAmount"] = _ref29;
+                  ref: function ref(_ref32) {
+                    return _this8["inputJfdxAmount"] = _ref32;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";