tplus-components-touch 3.26.3 → 3.27.2

package/dist/components/settlement/settlement.js

@@ -24,6 +24,10 @@ var _carousel = require('antd/es/carousel');
 
 var _carousel2 = _interopRequireDefault(_carousel);
 
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _button = require('antd/es/button');
 
 var _button2 = _interopRequireDefault(_button);
@@ -253,8 +257,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       currentKey: null,
       couponLight: true,
       storageValue: '0.00',
-      czkValue: null,
-      isInputMember: false };
+      czkValue: null };
     _this2.compoundHotkeysList = (window.$.operationControl[5] ? window.$.operationControl[5].control || [] : []).map(function (key) {
       return key.toLocaleUpperCase();
     });
@@ -301,12 +304,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         _this2.inputkey = "inputJfdxAmount";
         _this2["inputJfdxAmount"].input.value = currentMode && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable));
         _this2.setCurrentModeValue(_this2.inputJfdxAmount.input.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
-      } else if (_this2.state.czkVisible && currentMode && currentMode.value >= 0 && currentMode.balance !== undefined) {
+      } else if (_this2.state.czkVisible && currentMode && currentMode.value >= 0 && currentMode.member.balance !== undefined) {
         _this2.inputkey = "inputCzkAmount";
-        _this2["inputCzkAmount"] && _this2["inputCzkAmount"].input && (_this2["inputCzkAmount"].input.value = (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)));
-        var maxamount = Math.min(currentMode.maxamount, currentMode.balance);
+        _this2["inputCzkAmount"] && _this2["inputCzkAmount"].input && (_this2["inputCzkAmount"].input.value = (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)));
+        var maxamount = Math.min(currentMode.maxamount, currentMode.member.balance);
         _this2.inputCzkAmount && _this2.inputCzkAmount.input && _this2.setCurrentModeValue(_this2.inputCzkAmount.input.value, maxamount);
-        if (_this2.store.bquick && currentMode.storageCardNo && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
+        if (_this2.store.bquick && currentMode.member.id && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
           _message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
             duration: 4
           });
@@ -554,167 +557,163 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       });
     };
 
-    _this2.showCzkModal = function () {
-      var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id, append, params) {
-        var _enumController$getEn2, PayStyle, currentMode, maxamount, brefund, value11, isInputMember, walletEnabled, cardTypeEnum;
-
-        return _regenerator2.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
-
-                _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
-                _this2._val = _this2.store.paymode.currentMode.value;
-                currentMode = _this2.store.paymode.currentMode;
-                maxamount = Math.min(currentMode.maxamount, currentMode.balance);
-
-                if (!(_this2.store.bquick && currentMode.storageCardNo && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount))) {
-                  _context.next = 9;
-                  break;
-                }
-
-                _message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
-                  duration: 4
-                });
-                _context.next = 20;
-                break;
-
-              case 9:
-                _this2.setState({
-                  czkVisible: true
-                });
-                brefund = _this2.store.brefund;
-                value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance));
-
-                _this2.setState({
-                  storageValue: value11
-                });
-                if (currentMode.storageCardNo) {
-                  _this2.setState({
-                    czkValue: currentMode.storageCardNo
-                  });
-                } else {
-                  _this2.setState({
-                    czkValue: null
-                  });
-                }
-                isInputMember = _this2.state.isInputMember;
-
-                if (!isInputMember) {
-                  _context.next = 20;
-                  break;
-                }
-
-                _context.next = 18;
-                return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
+    _this2.showCzkModal = function (id, append, params) {
+      var _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn2.PayStyle;
 
-              case 18:
-                walletEnabled = currentMode.walletEnabled, cardTypeEnum = currentMode.cardTypeEnum;
+      var _ref = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref.isNewRetailBCPos;
 
-                if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled) {
-                  _this2.setState({
-                    showSetPwdModal: true,
-                    btnDissabled: true
-                  });
-                }
+      _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
+      _this2._val = _this2.store.paymode.currentMode.value;
+      var currentMode = _this2.store.paymode.currentMode;
 
-              case 20:
-                setTimeout(function () {
-                  if (!currentMode.storageCardNo) {
-                    _this2.czkInput && _this2.czkInput.input.focus();
-                  } else {
-                    if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
-                      _this2.inputCzkAmount.input.focus();
-                      _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
-                    }
-                  }
-                }, 500);
-                _this2.connectRfCard();
+      var maxamount = Math.min(currentMode.maxamount, currentMode.member.balance);
+      if (_this2.store.bquick && currentMode.member.id && parseFloat(_this2.store.paymode.amount) > parseFloat(maxamount)) {
+        _message2.default.error("本单最大可用储值卡结算金额为：" + (0, _utils.getFixedNumber)(maxamount) + "，请使用复合结算！", {
+          duration: 4
+        });
+      } else {
+        // if (isNewRetailBCPos) {
+        //   let { isReturn } = this.props;
+        //   let sMember = this.store.member;
+        //   if (!sMember.StorageCardEnable) {
+        //     Message.warn("该储值卡已停用");
+        //     return;
+        //   }
+        //   if (sMember && sMember.ID) {
+        //     // noPlaySetPwd 点击结算方式设置密码，点加号不设置
+        //     if (!sMember.WalletEnabled && params !== 'noPlaySetPwd' && !isReturn) {
+        //       this.setState({
+        //         newPass: '',
+        //         newPassConfirm: '',
+        //         showSetPwdModal: true
+        //       })
+        //     } else {
+        //       this.setState({
+        //         showSetPwdModal: false,
+        //         czkVisible: true
+        //       })
+        //     }
+        //   }
+        //   // else {
+        //   //   Message.warn('请先录入会员');
+        //   // }
+        //   // this.setState({
+        // //   czkVisible: true,
+        // // });
+        // } else {
+        //   this.setState({
+        //     czkVisible: true,
+        //   });
+        // }
+        _this2.setState({
+          czkVisible: true
+        });
+        var brefund = _this2.store.brefund;
 
-              case 22:
-              case 'end':
-                return _context.stop();
-            }
+        var value11 = currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance));
+        _this2.setState({
+          storageValue: value11
+        });
+        if (currentMode.member.id) {
+          _this2.setState({
+            czkValue: currentMode.member.StorageCardNo
+          });
+        } else {
+          _this2.setState({
+            czkValue: null
+          });
+        }
+      }
+      setTimeout(function () {
+        if (!currentMode.member || !currentMode.member.id) {
+          _this2.czkInput && _this2.czkInput.input.focus();
+        } else {
+          if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
+            _this2.inputCzkAmount.input.focus();
+            _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
           }
-        }, _callee, _this3);
-      }));
-
-      return function (_x, _x2, _x3) {
-        return _ref.apply(this, arguments);
-      };
-    }();
+        }
+      }, 500);
+      _this2.connectRfCard();
+    };
 
     _this2.handleCzkOk = function () {
-      var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(e) {
+      var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(e) {
         var _enumController$getEn3, PayStyle;
 
-        return _regenerator2.default.wrap(function _callee2$(_context2) {
+        return _regenerator2.default.wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.next) {
               case 0:
-                _this2.setState({
-                  isInputMember: false
-                });
+                // const maxamount=Math.min(this.store.paymode.currentMode.maxamount,this.store.paymode.currentMode.member.balance);
+                // if(this.store.bquick && this.store.paymode.amount>maxamount){
+                //   Message.error("本单最大可用储值卡结算金额为："+getFixedNumber(maxamount)+"，请使用复合结算！");
+                //   this.setState({
+                //     czkVisible: false,
+                //   });
+                //   return;
+                // }
                 _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle;
 
-                if (_this2.store.paymode.currentMode.storageCardNo) {
-                  _context2.next = 5;
+                if (_this2.store.paymode.currentMode.member.id) {
+                  _context.next = 4;
                   break;
                 }
 
-                _context2.next = 5;
+                _context.next = 4;
                 return _this2.store.loadCzk(_this2.czkInput.input.value);
 
-              case 5:
-                if (_this2.store.paymode.currentMode.storageCardNo) {
-                  _context2.next = 8;
+              case 4:
+                if (_this2.store.paymode.currentMode.member.id) {
+                  _context.next = 7;
                   break;
                 }
 
                 _message2.default.error("请录入储值卡！");
-                return _context2.abrupt('return');
+                return _context.abrupt('return');
 
-              case 8:
+              case 7:
                 if (!(0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
-                  return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.storageCardNo == _this2.store.paymode.currentMode.storageCardNo;
+                  return mode.paymethodId != _this2.store.paymode.currentMode.paymethodId && mode.paymentType == PayStyle.hyczk && mode.member.id == _this2.store.paymode.currentMode.member.id;
                 })) {
-                  _context2.next = 11;
+                  _context.next = 10;
                   break;
                 }
 
                 _message2.default.error("该储值卡已使用。");
-                return _context2.abrupt('return');
+                return _context.abrupt('return');
 
-              case 11:
+              case 10:
                 if (!(_this2.store.bquick && _this2.store.paymode.amount != _this2.store.paymode.currentMode.value)) {
-                  _context2.next = 14;
+                  _context.next = 13;
                   break;
                 }
 
                 _message2.default.error("实收金额应等于应收金额。");
-                return _context2.abrupt('return');
+                return _context.abrupt('return');
 
-              case 14:
+              case 13:
 
                 _this2.setState({
                   czkVisible: false,
                   storageValue: '0.00',
-                  czkValue: null
+                  czkvalue: null
                 });
                 _this2.closeRfCard();
                 _this2.store.paymode.calcMemberBalance();
                 _this2.handleCzk();
 
-              case 18:
+              case 17:
               case 'end':
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2, _this3);
+        }, _callee, _this3);
       }));
 
-      return function (_x4) {
+      return function (_x) {
         return _ref2.apply(this, arguments);
       };
     }();
@@ -727,7 +726,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.setState({
         czkVisible: false,
         storageValue: '0.00',
-        czkValue: null
+        czkvalue: null
       });
       _this2.closeRfCard();
       _keyboard2.default.close();
@@ -740,24 +739,23 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       });
     };
 
-    _this2.handleSetModal = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
-      var _this2$state, newPass, newPassConfirm, isInputMember, updataMemberInfo, result, cardTypeEnum, resp;
+    _this2.handleSetModal = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+      var _this2$state, newPass, newPassConfirm, updataMemberInfo, result, currentMode, resp;
 
-      return _regenerator2.default.wrap(function _callee3$(_context3) {
+      return _regenerator2.default.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              _this2$state = _this2.state, newPass = _this2$state.newPass, newPassConfirm = _this2$state.newPassConfirm, isInputMember = _this2$state.isInputMember;
+              _this2$state = _this2.state, newPass = _this2$state.newPass, newPassConfirm = _this2$state.newPassConfirm;
               updataMemberInfo = _this2.props.updataMemberInfo;
-              _context3.next = 4;
+              _context2.next = 4;
               return _this2.store.queryPwd(newPass, newPassConfirm);
 
             case 4:
-              result = _context3.sent;
-              cardTypeEnum = _this2.store.paymode.currentMode.cardTypeEnum;
+              result = _context2.sent;
 
               if (!result) {
-                _context3.next = 20;
+                _context2.next = 15;
                 break;
               }
 
@@ -768,45 +766,33 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 newPassConfirm: ''
               });
               _message2.default.warn('设置成功');
+              currentMode = _this2.store.paymode.currentMode;
+
               setTimeout(function () {
-                if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
-                  _this2.inputCzkAmount.input.focus();
-                  _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
+                if (!currentMode.member || !currentMode.member.id) {
+                  _this2.czkInput && _this2.czkInput.input.focus();
+                } else {
+                  if (_this2.inputCzkAmount && _this2.inputCzkAmount.input) {
+                    _this2.inputCzkAmount.input.focus();
+                    _this2.inputCzkAmount.input.setSelectionRange(0, _this2.inputCzkAmount.input.value.length);
+                  }
                 }
               }, 350);
               _this2.connectRfCard();
-
-              if (!isInputMember) {
-                _context3.next = 18;
-                break;
-              }
-
-              _context3.next = 14;
+              _context2.next = 13;
               return _this2.store.updateMemberInfo(_this2.store);
 
-            case 14:
-              resp = _context3.sent;
+            case 13:
+              resp = _context2.sent;
 
               updataMemberInfo(resp);
-              _context3.next = 19;
-              break;
-
-            case 18:
-              if (cardTypeEnum === 'BALANCE_CARD') {
-                _this2.store.updateCardInfo();
-              }
 
-            case 19:
-              _this2.setState({
-                isInputMember: false
-              });
-
-            case 20:
+            case 15:
             case 'end':
-              return _context3.stop();
+              return _context2.stop();
           }
         }
-      }, _callee3, _this3);
+      }, _callee2, _this3);
     }));
 
     _this2.setPwdValue = function (field, value) {
@@ -1009,9 +995,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       switch (key) {
         case PayStyle.hyczk:
           _this2.showCzkModal(-1);
-          _this2.store.dto.Idmember && _this2.setState({
-            isInputMember: true
-          });
           break;
         case PayStyle.jfdx:
           _this2.showJfdxModal(-1);
@@ -1120,6 +1103,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           boriginReturn = _this2$store3.boriginReturn;
       var noAlreadyWarn = _this2.state.noAlreadyWarn;
 
+
       if (!_mutantsMicrofx.stores.offlineSys.shouldSettlement(key)) return false;
 
       if (_this2.checkModeDisabled(key, brefund, boriginReturn)) {
@@ -1189,12 +1173,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.setCurrentFocusAndAddPay = function (key, payId) {
+    _this2.setCurrentFocusAndAddPay = function (key) {
       _this2.store.changeFocusAndAddPay(key);
       if (_this2.store.bquick) {
         _this2.handleSettle("quickPay");
       } else {
-        _this2.setFocusAndSelection(key, payId);
+        _this2.setFocusAndSelection(key);
       }
     };
 
@@ -1363,37 +1347,27 @@ 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 _callee4() {
-        var _this2$store$paymode$, cardTypeEnum, walletEnabled;
-
-        return _regenerator2.default.wrap(function _callee4$(_context4) {
+      _this2.czkdebounced = (0, _debounce3.default)((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+        return _regenerator2.default.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
-                _context4.next = 2;
+                _context3.next = 2;
                 return _this2.store.loadCzk(v);
 
               case 2:
-                _this2$store$paymode$ = _this2.store.paymode.currentMode, cardTypeEnum = _this2$store$paymode$.cardTypeEnum, walletEnabled = _this2$store$paymode$.walletEnabled;
-
-                if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled) {
+                if (_this2.store.paymode.currentMode.StorageCardNo) {
                   _this2.setState({
-                    showSetPwdModal: true,
-                    btnDissabled: true
-                  });
-                }
-                if (_this2.store.paymode.currentMode.storageCardNo) {
-                  _this2.setState({
-                    czkValue: _this2.store.paymode.currentMode.storageCardNo
+                    czkValue: _this2.store.paymode.currentMode.StorageCardNo
                   });
                 }
 
-              case 5:
+              case 3:
               case 'end':
-                return _context4.stop();
+                return _context3.stop();
             }
           }
-        }, _callee4, _this3);
+        }, _callee3, _this3);
       })), 1000, {
         'leading': true,
         'trailing': false
@@ -1561,21 +1535,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       return null;
     };
 
-    _this2.setFocusAndSelection = function (key, payId) {
+    _this2.setFocusAndSelection = function (key) {
       var that = _this2;
       var paymode = _this2.store.paymode;
 
-      var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn19.PayStyle;
-
       var themode = (0, _find3.default)(paymode.thePaymodes, function (mode) {
         return mode.paymentType === key;
       });
-      if (key === PayStyle.hyczk) {
-        themode = (0, _find3.default)(paymode.thePaymodes, function (mode) {
-          return mode.paymethodId === payId;
-        });
-      }
       var index = themode && themode.paymethodId || -1;
       if (index !== -1) {
         setTimeout(function () {
@@ -1590,11 +1556,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }
     };
 
-    _this2.settleUnReturn = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+    _this2.settleUnReturn = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
       var that;
-      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:
               that = _this2;
 
@@ -1617,18 +1583,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 _callee5() {
+                  return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                     var result;
-                    return _regenerator2.default.wrap(function _callee5$(_context5) {
+                    return _regenerator2.default.wrap(function _callee4$(_context4) {
                       while (1) {
-                        switch (_context5.prev = _context5.next) {
+                        switch (_context4.prev = _context4.next) {
                           case 0:
                             window.__queryingModal = (0, _utils.openQueryingModal)();
-                            _context5.next = 3;
+                            _context4.next = 3;
                             return that.store.querySettleResult();
 
                           case 3:
-                            result = _context5.sent;
+                            result = _context4.sent;
 
                             setTimeout(function () {
                               if (window.__queryingModal) {
@@ -1636,34 +1602,34 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                                 window.__queryingModal = null;
                               }
                             }, 0);
-                            _context5.t0 = result.Flag;
-                            _context5.next = _context5.t0 === "0" ? 8 : _context5.t0 === "1" ? 11 : _context5.t0 === "2" ? 13 : 15;
+                            _context4.t0 = result.Flag;
+                            _context4.next = _context4.t0 === "0" ? 8 : _context4.t0 === "1" ? 11 : _context4.t0 === "2" ? 13 : 15;
                             break;
 
                           case 8:
                             //成功
                             that.store.setDtoID(result.ID);
                             that.settleSuccess();
-                            return _context5.abrupt('break', 15);
+                            return _context4.abrupt('break', 15);
 
                           case 11:
                             //处理中
                             that.settleUnReturn();
                             // Message.info("结算正在处理中，请稍后再次查询。");
-                            return _context5.abrupt('break', 15);
+                            return _context4.abrupt('break', 15);
 
                           case 13:
                             //失败
                             _message2.default.info('\u7ED3\u7B97\u5931\u8D25\uFF0C\u539F\u56E0:' + result.Message + '\u3002');
                             // that.settleCanceled();
-                            return _context5.abrupt('break', 15);
+                            return _context4.abrupt('break', 15);
 
                           case 15:
                           case 'end':
-                            return _context5.stop();
+                            return _context4.stop();
                         }
                       }
-                    }, _callee5, _this4);
+                    }, _callee4, _this4);
                   }))();
                 },
                 onCancel: function onCancel() {
@@ -1673,10 +1639,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 2:
             case 'end':
-              return _context6.stop();
+              return _context5.stop();
           }
         }
-      }, _callee6, _this3);
+      }, _callee5, _this3);
     }));
 
     _this2.settleCanceled = function () {
@@ -1685,15 +1651,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       _this2.cancelState();
     };
 
-    _this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
-      var _enumController$getEn20, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, getSettleGift, type, resp1;
+    _this2.settleSuccess = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+      var _enumController$getEn19, PayStyle, _this2$store$paymode, amount, received, thePaymodes, IdbusiType, charge, openCashBox, _this, showTwoScreen, getSettleGift, type, resp1;
 
-      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:
               //提示成功
-              _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn20.PayStyle;
+              _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn19.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;
@@ -1751,22 +1717,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               resp1 = false;
 
               if (!(type !== 1)) {
-                _context7.next = 20;
+                _context6.next = 20;
                 break;
               }
 
-              _context7.prev = 11;
-              _context7.next = 14;
+              _context6.prev = 11;
+              _context6.next = 14;
               return getSettleGift();
 
             case 14:
-              resp1 = _context7.sent;
-              _context7.next = 20;
+              resp1 = _context6.sent;
+              _context6.next = 20;
               break;
 
             case 17:
-              _context7.prev = 17;
-              _context7.t0 = _context7['catch'](11);
+              _context6.prev = 17;
+              _context6.t0 = _context6['catch'](11);
 
               console.log("获取支付礼包getSettleGift失败");
 
@@ -1804,10 +1770,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 21:
             case 'end':
-              return _context7.stop();
+              return _context6.stop();
           }
         }
-      }, _callee7, _this3, [[11, 17]]);
+      }, _callee6, _this3, [[11, 17]]);
     }));
 
     _this2.handleGuestShow = function (dtype, value) {
@@ -1855,108 +1821,108 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(args) {
+      var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(args) {
         var handleUserInputs = function () {
-          var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(promises) {
+          var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
-            return _regenerator2.default.wrap(function _callee9$(_context9) {
+            return _regenerator2.default.wrap(function _callee8$(_context8) {
               while (1) {
-                switch (_context9.prev = _context9.next) {
+                switch (_context8.prev = _context8.next) {
                   case 0:
                     results = [];
-                    _context9.prev = 1;
+                    _context8.prev = 1;
                     _iteratorNormalCompletion = true;
                     _didIteratorError = false;
                     _iteratorError = undefined;
-                    _context9.prev = 5;
+                    _context8.prev = 5;
                     _iterator = (0, _getIterator3.default)(promises);
 
                   case 7:
                     if (_iteratorNormalCompletion = (_step = _iterator.next()).done) {
-                      _context9.next = 16;
+                      _context8.next = 16;
                       break;
                     }
 
                     p = _step.value;
-                    _context9.next = 11;
+                    _context8.next = 11;
                     return p;
 
                   case 11:
-                    _result = _context9.sent;
+                    _result = _context8.sent;
 
                     results.push(_result);
 
                   case 13:
                     _iteratorNormalCompletion = true;
-                    _context9.next = 7;
+                    _context8.next = 7;
                     break;
 
                   case 16:
-                    _context9.next = 22;
+                    _context8.next = 22;
                     break;
 
                   case 18:
-                    _context9.prev = 18;
-                    _context9.t0 = _context9['catch'](5);
+                    _context8.prev = 18;
+                    _context8.t0 = _context8['catch'](5);
                     _didIteratorError = true;
-                    _iteratorError = _context9.t0;
+                    _iteratorError = _context8.t0;
 
                   case 22:
-                    _context9.prev = 22;
-                    _context9.prev = 23;
+                    _context8.prev = 22;
+                    _context8.prev = 23;
 
                     if (!_iteratorNormalCompletion && _iterator.return) {
                       _iterator.return();
                     }
 
                   case 25:
-                    _context9.prev = 25;
+                    _context8.prev = 25;
 
                     if (!_didIteratorError) {
-                      _context9.next = 28;
+                      _context8.next = 28;
                       break;
                     }
 
                     throw _iteratorError;
 
                   case 28:
-                    return _context9.finish(25);
+                    return _context8.finish(25);
 
                   case 29:
-                    return _context9.finish(22);
+                    return _context8.finish(22);
 
                   case 30:
                     window.__loadingModal = (0, _utils.openLoadingModal)();
-                    _context9.next = 33;
+                    _context8.next = 33;
                     return commit(results);
 
                   case 33:
-                    _context9.next = 37;
+                    _context8.next = 37;
                     break;
 
                   case 35:
-                    _context9.prev = 35;
-                    _context9.t1 = _context9['catch'](1);
+                    _context8.prev = 35;
+                    _context8.t1 = _context8['catch'](1);
 
                   case 37:
                   case 'end':
-                    return _context9.stop();
+                    return _context8.stop();
                 }
               }
-            }, _callee9, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
+            }, _callee8, this, [[1, 35], [5, 18, 22, 30], [23,, 25, 29]]);
           }));
 
-          return function handleUserInputs(_x7) {
+          return function handleUserInputs(_x4) {
             return _ref16.apply(this, arguments);
           };
         }();
 
-        var _enumController$getEn21, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
+        var _enumController$getEn20, PayStyle, _this2$store6, paymode, brefund, boriginReturn, newStyle, isQuickPay, that, status, zeromode, promises, thePaymodes, quickmode, commit;
 
-        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:
                 _this2.setState({
                   settleDisabled: true
@@ -1972,7 +1938,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 // }
                 //
                 // testAsync(p);
-                _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
+                _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn20.PayStyle;
                 _this2$store6 = _this2.store, paymode = _this2$store6.paymode, brefund = _this2$store6.brefund, boriginReturn = _this2$store6.boriginReturn, newStyle = _this2$store6.newStyle;
                 isQuickPay = args === 'quickPay';
                 that = _this2;
@@ -1988,7 +1954,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!(that.checkCharge() && Math.abs(paymode.receivable) > that.props.initData("posChangeUpperAmount"))) {
-                  _context10.next = 13;
+                  _context9.next = 13;
                   break;
                 }
 
@@ -1996,11 +1962,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _this2.setState({
                   settleDisabled: false
                 });
-                return _context10.abrupt('return');
+                return _context9.abrupt('return');
 
               case 13:
                 if (!(args !== "zero" && !newStyle)) {
-                  _context10.next = 19;
+                  _context9.next = 19;
                   break;
                 }
 
@@ -2009,7 +1975,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 if (!zeromode) {
-                  _context10.next = 19;
+                  _context9.next = 19;
                   break;
                 }
 
@@ -2017,7 +1983,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error(zeromode.name + ' 的结算金额为零，不可以结算。');
-                return _context10.abrupt('return');
+                return _context9.abrupt('return');
 
               case 19:
                 promises = [];
@@ -2026,14 +1992,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }) : paymode.thePaymodes, 'orderBy');
 
                 if (!isQuickPay) {
-                  _context10.next = 27;
+                  _context9.next = 27;
                   break;
                 }
 
                 quickmode = thePaymodes[0];
 
                 if (!_this2.checkModeDisabled(quickmode.paymentType, brefund, boriginReturn)) {
-                  _context10.next = 27;
+                  _context9.next = 27;
                   break;
                 }
 
@@ -2041,7 +2007,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   settleDisabled: false
                 });
                 _message2.default.error('退款不能使用' + quickmode.name + '结算，请使用其他结算方式！');
-                return _context10.abrupt('return');
+                return _context9.abrupt('return');
 
               case 27:
                 (0, _forEach3.default)(thePaymodes, function (mode) {
@@ -2051,27 +2017,27 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(values) {
+                  var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(values) {
                     var result;
-                    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:
-                            _context8.next = 2;
+                            _context7.next = 2;
                             return _this2.store.commit(_this2.props.bTest);
 
                           case 2:
-                            result = _context8.sent;
+                            result = _context7.sent;
 
                             if (!(result === true)) {
-                              _context8.next = 8;
+                              _context7.next = 8;
                               break;
                             }
 
                             //成功
                             that.settleSuccess();
                             _promise2.default.resolve();
-                            _context8.next = 23;
+                            _context7.next = 23;
                             break;
 
                           case 8:
@@ -2088,24 +2054,24 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             }, 0);
 
                             if (!(result && (result.Code || result.code))) {
-                              _context8.next = 20;
+                              _context7.next = 20;
                               break;
                             }
 
-                            _context8.t0 = result.Code || result.code;
-                            _context8.next = _context8.t0 === 'RE_Settle_UnReturn' ? 14 : _context8.t0 === 'ECONNABORTED' ? 18 : 20;
+                            _context7.t0 = result.Code || result.code;
+                            _context7.next = _context7.t0 === 'RE_Settle_UnReturn' ? 14 : _context7.t0 === 'ECONNABORTED' ? 18 : 20;
                             break;
 
                           case 14:
                             console.log('settlement--RE_Settle_UnReturn--调用清除数据==Focus==');
                             _this2.props.clearVoucherData && _this2.props.clearVoucherData();
                             _this2.cancelState();
-                            return _context8.abrupt('break', 20);
+                            return _context7.abrupt('break', 20);
 
                           case 18:
                             //error.code === 'ECONNABORTED' && error.message.indexOf('timeout')
                             result.message.indexOf('timeout') > -1 && that.settleUnReturn();
-                            return _context8.abrupt('break', 20);
+                            return _context7.abrupt('break', 20);
 
                           case 20:
                             if (isQuickPay) {
@@ -2113,18 +2079,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               that.cancelState();
                             }
 
-                            _context8.next = 23;
+                            _context7.next = 23;
                             return _promise2.default.reject();
 
                           case 23:
                           case 'end':
-                            return _context8.stop();
+                            return _context7.stop();
                         }
                       }
-                    }, _callee8, _this3);
+                    }, _callee7, _this3);
                   }));
 
-                  return function commit(_x6) {
+                  return function commit(_x3) {
                     return _ref15.apply(this, arguments);
                   };
                 }();
@@ -2133,102 +2099,102 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 30:
               case 'end':
-                return _context10.stop();
+                return _context9.stop();
             }
           }
-        }, _callee10, _this3);
+        }, _callee9, _this3);
       }));
 
-      return function (_x5) {
+      return function (_x2) {
         return _ref14.apply(this, arguments);
       };
     }();
 
-    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13() {
+    _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12() {
       var handleUserInputs = function () {
-        var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(promises) {
+        var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
-          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;
                   _iteratorNormalCompletion2 = true;
                   _didIteratorError2 = false;
                   _iteratorError2 = undefined;
-                  _context12.prev = 5;
+                  _context11.prev = 5;
                   _iterator2 = (0, _getIterator3.default)(promises);
 
                 case 7:
                   if (_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done) {
-                    _context12.next = 16;
+                    _context11.next = 16;
                     break;
                   }
 
                   p = _step2.value;
-                  _context12.next = 11;
+                  _context11.next = 11;
                   return p;
 
                 case 11:
-                  _result2 = _context12.sent;
+                  _result2 = _context11.sent;
 
                   results.push(_result2);
 
                 case 13:
                   _iteratorNormalCompletion2 = 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);
                   _didIteratorError2 = true;
-                  _iteratorError2 = _context12.t0;
+                  _iteratorError2 = _context11.t0;
 
                 case 22:
-                  _context12.prev = 22;
-                  _context12.prev = 23;
+                  _context11.prev = 22;
+                  _context11.prev = 23;
 
                   if (!_iteratorNormalCompletion2 && _iterator2.return) {
                     _iterator2.return();
                   }
 
                 case 25:
-                  _context12.prev = 25;
+                  _context11.prev = 25;
 
                   if (!_didIteratorError2) {
-                    _context12.next = 28;
+                    _context11.next = 28;
                     break;
                   }
 
                   throw _iteratorError2;
 
                 case 28:
-                  return _context12.finish(25);
+                  return _context11.finish(25);
 
                 case 29:
-                  return _context12.finish(22);
+                  return _context11.finish(22);
 
                 case 30:
-                  _context12.next = 32;
+                  _context11.next = 32;
                   return commit(results);
 
                 case 32:
-                  _context12.next = 37;
+                  _context11.next = 37;
                   break;
 
                 case 34:
-                  _context12.prev = 34;
-                  _context12.t1 = _context12['catch'](1);
+                  _context11.prev = 34;
+                  _context11.t1 = _context11['catch'](1);
 
-                  if (_context12.t1 != "cancelpwd") {
-                    _message2.default.error(_context12.t1);
+                  if (_context11.t1 != "cancelpwd") {
+                    _message2.default.error(_context11.t1);
                     setTimeout(function () {
                       that.handleCzk();
                     }, 500);
@@ -2236,22 +2202,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
                 case 37:
                 case 'end':
-                  return _context12.stop();
+                  return _context11.stop();
               }
             }
-          }, _callee12, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
+          }, _callee11, this, [[1, 34], [5, 18, 22, 30], [23,, 25, 29]]);
         }));
 
-        return function handleUserInputs(_x9) {
+        return function handleUserInputs(_x6) {
           return _ref20.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref18, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
+      var that, curmode, promises, _ref18, isNewRetailBCPos, _enumController$getEn21, PayStyle, isNeedPasswordForStoragePay, 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:
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
@@ -2260,10 +2226,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               if (isNewRetailBCPos) {
                 if (curmode.value > 0) {
-                  _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
+                  _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn21.PayStyle;
 
                   if (curmode.paymentType === PayStyle.hyczk) {
-                    if (curmode.cardTypeEnum === 'BALANCE_CARD' || curmode.isNeedPassword) {
+                    isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
+
+                    if (isNeedPasswordForStoragePay) {
                       promises.push(that.inputPwd(curmode));
                     }
                   }
@@ -2275,59 +2243,56 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               }
 
               commit = function () {
-                var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(values) {
+                var _ref19 = (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:
                           if (!(values.length > 0)) {
-                            _context11.next = 6;
+                            _context10.next = 6;
                             break;
                           }
 
-                          _context11.next = 3;
+                          _context10.next = 3;
                           return that.store.validePwd(values[0]);
 
                         case 3:
-                          _context11.t0 = _context11.sent;
-                          _context11.next = 7;
+                          _context10.t0 = _context10.sent;
+                          _context10.next = 7;
                           break;
 
                         case 6:
-                          _context11.t0 = "";
+                          _context10.t0 = "";
 
                         case 7:
-                          result = _context11.t0;
+                          result = _context10.t0;
 
                           if (!(result == "")) {
-                            _context11.next = 14;
+                            _context10.next = 13;
                             break;
                           }
 
                           //成功
                           //返回
-                          if (values.length > 0) {
-                            _message2.default.success('密码确认成功！');
-                          }
-                          that.setCurrentFocusAndAddPay(curmode.paymentType, curmode.paymethodId);
+                          that.setCurrentFocusAndAddPay(curmode.paymentType);
                           _promise2.default.resolve();
-                          _context11.next = 16;
+                          _context10.next = 15;
                           break;
 
-                        case 14:
-                          _context11.next = 16;
+                        case 13:
+                          _context10.next = 15;
                           return _promise2.default.reject(result);
 
-                        case 16:
+                        case 15:
                         case 'end':
-                          return _context11.stop();
+                          return _context10.stop();
                       }
                     }
-                  }, _callee11, _this3);
+                  }, _callee10, _this3);
                 }));
 
-                return function commit(_x8) {
+                return function commit(_x5) {
                   return _ref19.apply(this, arguments);
                 };
               }();
@@ -2336,10 +2301,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
             case 7:
             case 'end':
-              return _context13.stop();
+              return _context12.stop();
           }
         }
-      }, _callee13, _this3);
+      }, _callee12, _this3);
     }));
 
     _this2.fKeyboardOnOk = function (paymethodeId) {
@@ -2379,15 +2344,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(paymode) {
+      var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(paymode) {
         var that, confirmPwd;
-        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:
                 that = _this2;
                 confirmPwd = _this2.state.confirmPwd;
-                return _context14.abrupt('return', new _promise2.default(function (resolve, reject) {
+                return _context13.abrupt('return', new _promise2.default(function (resolve, reject) {
                   var modal = (0, _asyncModal2.default)({
                     onPressEnter: function onPressEnter() {
                       _keyboard2.default.close();
@@ -2521,68 +2486,181 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
               case 3:
               case 'end':
-                return _context14.stop();
+                return _context13.stop();
             }
           }
-        }, _callee14, _this3);
+        }, _callee13, _this3);
       }));
 
-      return function (_x10) {
+      return function (_x7) {
         return _ref21.apply(this, arguments);
       };
     }();
 
-    _this2.btnDebounced = function (type, bquick) {
-      _this2.setState({
-        bquick: bquick
-      });
+    _this2.isNoProductTip = function (nonProductMap) {
+      var names = [];
+      var temphtml = [];
+      var count = 0;
+      if ((0, _keys2.default)(nonProductMap).length > 0) {
+        for (var key in nonProductMap) {
+          count++;
+          names.push('【' + key + '】');
+          temphtml.push(count + '、' + nonProductMap[key]);
+        }
+        _modalWraper2.default.warning({
+          title: '不可配送商品',
+          content: '\u5546\u54C1' + names.join(',') + '\u4E0D\u53EF\u914D\u9001\uFF0C\u53EF\u80FD\u539F\u56E0\u5982\u4E0B\uFF1A' + temphtml.join('；')
+        });
+        return true;
+      }
+      return false;
+    };
 
-      var _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn23.PayStyle;
+    _this2.btnDebounced = function () {
+      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, bquick) {
+        var _ref25, IdbusiType, CustomerPhone, DistributionMode, _this2$store7, getPerformanceDistributionValue, getPosFreight, updataFreight, IPMSG, _ref26, nonProductMap, _ref26$freightProduct, freightProductDTOList, data, _enumController$getEn22, PayStyle, _this2$store8, paymode, brefund, boriginReturn, newStyle, status;
 
-      var _this2$store7 = _this2.store,
-          paymode = _this2$store7.paymode,
-          brefund = _this2$store7.brefund,
-          boriginReturn = _this2$store7.boriginReturn,
-          newStyle = _this2$store7.newStyle;
+        return _regenerator2.default.wrap(function _callee14$(_context14) {
+          while (1) {
+            switch (_context14.prev = _context14.next) {
+              case 0:
+                _ref25 = _this2.context.viewModel.data || {}, IdbusiType = _ref25.IdbusiType, CustomerPhone = _ref25.CustomerPhone, DistributionMode = _ref25.DistributionMode;
+                //预订时，若没录入买家手机号，或配送方式为快递时，弹框买家信息确认框
 
+                if (!(IdbusiType == 38)) {
+                  _context14.next = 28;
+                  break;
+                }
 
-      if (bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type)) return false;
+                if (!(!CustomerPhone || DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
+                  _context14.next = 5;
+                  break;
+                }
 
-      var status = false;
-      paymode.thePaymodes.forEach(function (v) {
-        if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
-          status = true;
-        }
-      });
-      _this2.setState({
-        isXianjin: status ? true : false
-      });
+                _context14.next = 5;
+                return _this2.props.openBuyerModal();
 
-      if (_this2.btndebounced) {
-        return;
-      }
-      _this2.btndebounced = (0, _debounce3.default)(function () {
-        if (bquick) {
-          _this2.quickSettle(type);
-        } else {
-          _this2.showModal();
-        }
-      }, 1000, {
-        'leading': true,
-        'trailing': false
-      });
-      _this2.btndebounced();
-      setTimeout(function () {
-        _this2.btndebounced.cancel();
-        _this2.btndebounced = null;
-      }, 2000);
-    };
+              case 5:
+                if (!(DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
+                  _context14.next = 28;
+                  break;
+                }
+
+                _this2$store7 = _this2.store, getPerformanceDistributionValue = _this2$store7.getPerformanceDistributionValue, getPosFreight = _this2$store7.getPosFreight, updataFreight = _this2$store7.updataFreight;
+                IPMSG = {};
+
+                if (!!window.localStorage.IPMSG) {
+                  IPMSG = JSON.parse(window.localStorage.IPMSG);
+                }
+                _context14.next = 11;
+                return getPerformanceDistributionValue({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
+
+              case 11:
+                _ref26 = _context14.sent;
+                nonProductMap = _ref26.nonProductMap;
+                _ref26$freightProduct = _ref26.freightProductDTOList;
+                freightProductDTOList = _ref26$freightProduct === undefined ? [] : _ref26$freightProduct;
+
+                console.log('zlfnonProductMap', nonProductMap);
+                console.log('zlffreightProductDTOList', freightProductDTOList);
+
+                if (!_this2.isNoProductTip(nonProductMap)) {
+                  _context14.next = 19;
+                  break;
+                }
+
+                return _context14.abrupt('return');
+
+              case 19:
+                _context14.next = 21;
+                return _this2.props.openWareHouseModal(freightProductDTOList);
+
+              case 21:
+                _context14.next = 23;
+                return getPosFreight({ cip: IPMSG.query || "", dto: _this2.context.viewModel.data });
+
+              case 23:
+                data = _context14.sent;
+
+                if (!_this2.isNoProductTip(data.nonProductMap)) {
+                  _context14.next = 26;
+                  break;
+                }
+
+                return _context14.abrupt('return');
+
+              case 26:
+                _context14.next = 28;
+                return _this2.props.updataFreight(data.freight);
+
+              case 28:
+
+                _this2.setState({
+                  bquick: bquick
+                });
+                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
+                _this2$store8 = _this2.store, paymode = _this2$store8.paymode, brefund = _this2$store8.brefund, boriginReturn = _this2$store8.boriginReturn, newStyle = _this2$store8.newStyle;
+
+                if (!(bquick && !_mutantsMicrofx.stores.offlineSys.shouldSettlement(type))) {
+                  _context14.next = 33;
+                  break;
+                }
+
+                return _context14.abrupt('return', false);
+
+              case 33:
+                status = false;
+
+                paymode.thePaymodes.forEach(function (v) {
+                  if (v.paymentType === PayStyle.xianjin && v.value !== '0.00') {
+                    status = true;
+                  }
+                });
+                _this2.setState({
+                  isXianjin: status ? true : false
+                });
+
+                if (!_this2.btndebounced) {
+                  _context14.next = 38;
+                  break;
+                }
+
+                return _context14.abrupt('return');
+
+              case 38:
+                _this2.btndebounced = (0, _debounce3.default)(function () {
+                  if (bquick) {
+                    _this2.quickSettle(type);
+                  } else {
+                    _this2.showModal();
+                  }
+                }, 1000, {
+                  'leading': true,
+                  'trailing': false
+                });
+                _this2.btndebounced();
+                setTimeout(function () {
+                  _this2.btndebounced.cancel();
+                  _this2.btndebounced = null;
+                }, 2000);
+
+              case 41:
+              case 'end':
+                return _context14.stop();
+            }
+          }
+        }, _callee14, _this3);
+      }));
+
+      return function (_x8, _x9) {
+        return _ref24.apply(this, arguments);
+      };
+    }();
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref24 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref24.isNewRetailBCPos;
+      var _ref27 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref27.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -2643,8 +2721,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkCharge = function () {
-      var _enumController$getEn24 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn24.PayStyle;
+      var _enumController$getEn23 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn23.PayStyle;
 
       var paymode = _this2.store.paymode;
 
@@ -2691,8 +2769,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.getXianjinPayment = function (payType, value) {
-      var _enumController$getEn25 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn25.PayStyle;
+      var _enumController$getEn24 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn24.PayStyle;
 
       var isManualIntoAmount = _this2.state.isManualIntoAmount;
 
@@ -2700,8 +2778,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.getXianjinBalance = function (payType, value) {
-      var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn26.PayStyle;
+      var _enumController$getEn25 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn25.PayStyle;
       //找零金额-存在权限控制
 
 
@@ -2719,11 +2797,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           type = _this2$props3.type;
 
       var isManualIntoAmount = void 0;
+      var _this2$context$viewMo2 = _this2.context.viewModel.data,
+          BuyerPayFreight = _this2$context$viewMo2.BuyerPayFreight,
+          DistributionMode = _this2$context$viewMo2.DistributionMode;
       // 付款弹窗
+
       return new _promise2.default(function (resolve, reject) {
-        var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
-            PayStyle = _enumController$getEn27.PayStyle,
-            PayIcon2 = _enumController$getEn27.PayIcon2;
+        var _enumController$getEn26 = _mutantsUtil.enumController.getEnumOj(),
+            PayStyle = _enumController$getEn26.PayStyle,
+            PayIcon2 = _enumController$getEn26.PayIcon2;
 
         var modal = (0, _asyncModal2.default)({
           onPressEnter: function onPressEnter() {
@@ -2808,7 +2890,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 { className: 'yfje' },
-                paymode.value
+                paymode.value,
+                (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? _react2.default.createElement(
+                  'span',
+                  { className: 'freight' },
+                  '(\u5305\u542B',
+                  BuyerPayFreight,
+                  '\u5143\u8FD0\u8D39)'
+                ) : null
               )
             ),
             paymode.paymentType == PayStyle.xianjin && _react2.default.createElement(
@@ -2988,12 +3077,12 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkCurrentModeHaveMutex = function (type) {
-      var _this2$store8 = _this2.store,
-          paymode = _this2$store8.paymode,
-          newStyle = _this2$store8.newStyle;
+      var _this2$store9 = _this2.store,
+          paymode = _this2$store9.paymode,
+          newStyle = _this2$store9.newStyle;
 
-      var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn28.PayStyle;
+      var _enumController$getEn27 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn27.PayStyle;
 
       var payTypeList = [PayStyle.SQBPAY, PayStyle.CSYH, PayStyle.smzf];
       var payTypeFilterList = payTypeList.filter(function (filterType) {
@@ -3014,15 +3103,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkModeDisabled = function (type, brefund, boriginReturn) {
-      var _enumController$getEn29 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn29.PayStyle;
+      var _enumController$getEn28 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn28.PayStyle;
 
       return (brefund && (type == PayStyle.wx || type == PayStyle.zfb || type == PayStyle.smzf || type == PayStyle.jfdx || type == PayStyle.djq || type == PayStyle.SQBPAY || type == PayStyle.CSYH) || boriginReturn && type == PayStyle.hyczk) && !(boriginReturn && (type == PayStyle.wx || type == PayStyle.zfb)) || _this2.checkCurrentModeHaveMutex(type);
     };
 
     _this2.checkSettleDisabled = function (paymode, thePaymodes) {
-      var _enumController$getEn30 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn30.PayStyle;
+      var _enumController$getEn29 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn29.PayStyle;
 
       console.log("settlement.checkSettleDisabled开始执行，参数：", { paymode: paymode, thePaymodes: thePaymodes });
       if (paymode.amount == 0 && paymode.received == 0) {
@@ -3068,8 +3157,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.editCzkModal = function () {
-      var _enumController$getEn31 = _mutantsUtil.enumController.getEnumOj(),
-          PayStyle = _enumController$getEn31.PayStyle;
+      var _enumController$getEn30 = _mutantsUtil.enumController.getEnumOj(),
+          PayStyle = _enumController$getEn30.PayStyle;
 
       (0, _find3.default)(_this2.store.paymode.thePaymodes, function (mode) {
         if (mode.paymentType == PayStyle.hyczk) {
@@ -3163,29 +3252,30 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref25 = _mutantsMicrofx.localStore.get('user') || {},
-        _ref25$loginInfo = _ref25.loginInfo;
+    var _ref28 = _mutantsMicrofx.localStore.get('user') || {},
+        _ref28$loginInfo = _ref28.loginInfo;
 
-    _ref25$loginInfo = _ref25$loginInfo === undefined ? {} : _ref25$loginInfo;
-    var MemberMeStorageCardInputByKeyBoard = _ref25$loginInfo.MemberMeStorageCardInputByKeyBoard,
-        ICCardServer = _ref25$loginInfo.ICCardServer,
-        ICCardPassword = _ref25$loginInfo.ICCardPassword;
+    _ref28$loginInfo = _ref28$loginInfo === undefined ? {} : _ref28$loginInfo;
+    var ICCardServer = _ref28$loginInfo.ICCardServer,
+        ICCardPassword = _ref28$loginInfo.ICCardPassword,
+        Book = _ref28$loginInfo.Book,
+        PercentageWhenBook = _ref28$loginInfo.PercentageWhenBook;
 
-    _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
+    _this2.isBook = Book;
+    _this2.percentageWhenBook = PercentageWhenBook;
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref26 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref26.isHorizontalPad,
-        isHorizontalSunMi = _ref26.isHorizontalSunMi;
+    var _ref29 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref29.isHorizontalPad,
+        isHorizontalSunMi = _ref29.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
     _this2.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
     _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
     _this2.setTimer = null;
-    _this2.keypressStime = null;
     return _this2;
   }
 
@@ -3294,11 +3384,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     //jfdx
 
 
-    /**
-     *
-     * @param {*} thePaymodes 支付方式列表
-     * @param {*} currenIndex  当前支付方式下标
-     * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
+    /**
+     *
+     * @param {*} thePaymodes 支付方式列表
+     * @param {*} currenIndex  当前支付方式下标
+     * @param {*} symbol  从当前currenIndex开始 还是从当前currenIndex截止
      */
 
     // 处理客显显示功能
@@ -3326,9 +3416,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function renderToolbtn(mode, index) {
       var _this7 = this;
 
-      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn32.PayIcon,
-          PayStyle = _enumController$getEn32.PayStyle;
+      var _enumController$getEn31 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn31.PayIcon,
+          PayStyle = _enumController$getEn31.PayStyle;
 
       var isReturn = this.props.isReturn;
       var _store = this.store,
@@ -3400,11 +3490,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     value: function render() {
       var _this8 = this;
 
-      var _enumController$getEn33 = _mutantsUtil.enumController.getEnumOj(),
-          PayIcon = _enumController$getEn33.PayIcon,
-          PayIcon2 = _enumController$getEn33.PayIcon2,
-          PayStyle = _enumController$getEn33.PayStyle,
-          Differentiate = _enumController$getEn33.Differentiate;
+      var _enumController$getEn32 = _mutantsUtil.enumController.getEnumOj(),
+          PayIcon = _enumController$getEn32.PayIcon,
+          PayIcon2 = _enumController$getEn32.PayIcon2,
+          PayStyle = _enumController$getEn32.PayStyle,
+          Differentiate = _enumController$getEn32.Differentiate;
 
       var _state2 = this.state,
           btnDissabled = _state2.btnDissabled,
@@ -3412,11 +3502,10 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           discountTotalAmount = _state2.discountTotalAmount,
           discountRetailTotalAount = _state2.discountRetailTotalAount,
           discountPrototypeTotalAmount = _state2.discountPrototypeTotalAmount,
-          storageValue = _state2.storageValue,
-          czkValue = _state2.czkValue;
+          storageValue = _state2.storageValue;
 
-      var _ref27 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref27.isNewRetailBCPos;
+      var _ref30 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref30.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3435,6 +3524,21 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       var boriginReturn = this.context && this.context.viewModel && this.context.viewModel.data && JSON.getCellValue(this.context.viewModel.data, "IsOriginalReturn");
       var totalTaxAmount = this.context && this.context.viewModel && this.context.viewModel.data && this.context.viewModel.data.TotalTaxAmount;
+
+      //收订金
+
+      var _ref31 = this.context && this.context.viewModel && this.context.viewModel.data,
+          IdbusiType = _ref31.IdbusiType,
+          DistributionMode = _ref31.DistributionMode,
+          BuyerPayFreight = _ref31.BuyerPayFreight;
+
+      if (IdbusiType == 38 && this.isBook && this.percentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
+        totalTaxAmount = totalTaxAmount * this.percentageWhenBook / 100;
+      }
+      if (IdbusiType == 39) {
+        totalTaxAmount = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
+      }
+
       // 单据模式
       var thePaymodes = newStyle ? (0, _filter3.default)(paymode.thePaymodes, function (m) {
         return !(_this8.checkModeDisabled(m.paymentType, brefund, boriginReturn) && parseFloat(m.value) == 0);
@@ -3479,11 +3583,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref28 = quantityDetail || {},
-          _ref28$buyQuantity = _ref28.buyQuantity,
-          buyQuantity = _ref28$buyQuantity === undefined ? 0 : _ref28$buyQuantity,
-          _ref28$returnQuantity = _ref28.returnQuantity,
-          returnQuantity = _ref28$returnQuantity === undefined ? 0 : _ref28$returnQuantity;
+      var _ref32 = quantityDetail || {},
+          _ref32$buyQuantity = _ref32.buyQuantity,
+          buyQuantity = _ref32$buyQuantity === undefined ? 0 : _ref32$buyQuantity,
+          _ref32$returnQuantity = _ref32.returnQuantity,
+          returnQuantity = _ref32$returnQuantity === undefined ? 0 : _ref32$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -3501,9 +3605,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         sumQuantity = this.changeDecimalBuZero(sumQuantity, quantityPrecision);
       }
 
-      var themodeHyczk = thePaymodes.filter(function (mode) {
-        return mode.paymentType === PayStyle.hyczk && mode.value !== '0.00';
-      });
+      var isNeedPasswordForStoragePay = (0, _tplusPoslogin.PosInitData)('IsNeedPasswordForStoragePay');
       return _react2.default.createElement(
         'div',
         { className: 'billingSettlement', ref: function ref(r) {
@@ -3709,6 +3811,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _react2.default.createElement(
                       'div',
                       { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
+                      _react2.default.createElement(
+                        'div',
+                        { className: 'lefticon primary-color', onClick: function onClick() {
+                            _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
+                          } },
+                        _react2.default.createElement(_ticon2.default, { type: 'jianqu', className: 'minus' })
+                      ),
                       _react2.default.createElement(
                         'div',
                         { className: (0, _classnames4.default)({ "name": true }) },
@@ -3738,12 +3847,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           }
                         })
                       ),
-                      _react2.default.createElement(
-                        'span',
-                        { className: 'minus', onClick: function onClick() {
-                            _this8.onDelPay(index, boriginReturn && mode.boriginReturn, mode.paymentType);
+                      !isNeedPasswordForStoragePay && _react2.default.createElement(
+                        'div',
+                        { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
+                          onClick: function onClick() {
+                            _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
                           } },
-                        _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
+                        _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus primary-color' })
                       )
                     ),
                     mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -3770,7 +3880,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       _react2.default.createElement(
                         'span',
                         { className: 'fl' },
-                        mode && mode.storageCardNo
+                        isNewRetailBCPos ? mode.member && mode.member.StorageCardNo : mode.member && mode.member.cardNo
                       ),
                       _react2.default.createElement('br', null),
                       _react2.default.createElement(
@@ -3782,19 +3892,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         'span',
                         { className: 'fl' },
                         (0, _utils.getFixedNumber)(mode.balance)
-                      ),
-                      _react2.default.createElement('br', null),
-                      themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === mode.paymethodId && _react2.default.createElement(
-                        _button2.default,
-                        { onClick: function onClick() {
-                            _this8.appendCzkmode(boriginReturn, 'noPlaySetPwd');
-                          }, className: 'addCard btn-border-primary' },
-                        _react2.default.createElement(_ticon2.default, { type: 'jiahao', className: 'plus b-theme-color' }),
-                        _react2.default.createElement(
-                          'span',
-                          null,
-                          '\u6DFB\u52A0\u5361'
-                        )
                       )
                     )
                   );
@@ -3875,6 +3972,20 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       { className: 'received' },
                       (0, _utils.getFixedNumber)(Math.abs(paymode.receivable))
                     )
+                  ),
+                  _react2.default.createElement(
+                    'div',
+                    { className: 'receivable', style: { display: (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 ? 'block' : 'none' } },
+                    _react2.default.createElement(
+                      'span',
+                      null,
+                      '\u8FD0\u8D39'
+                    ),
+                    _react2.default.createElement(
+                      'span',
+                      { className: 'received' },
+                      (0, _utils.getFixedNumber)(Math.abs(BuyerPayFreight))
+                    )
                   )
                 ),
                 !isReturn && _react2.default.createElement(
@@ -4091,14 +4202,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                             //     return;
                             //   }
                             // }
-                            // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() : 
-                            if (mode.paymentType == PayStyle.hyczk) {
-                              if (themodeHyczk && themodeHyczk.length === 0) {
-                                _this8.onHotKeyClick1(mode, index, boriginReturn);
-                              }
-                            } else {
-                              _this8.onHotKeyClick1(mode, index, boriginReturn);
-                            }
+                            // mode.paymentType == PayStyle.hyczk && czkinput && czkinput.value !== '0.00' ? this.editCzkModal() :
+                            _this8.onHotKeyClick1(mode, index, boriginReturn);
                           },
                           value: mode.paymentType == PayStyle.hyczk ? (0, _utils.getFixedNumber)((0, _reduce3.default)((0, _filter3.default)(thePaymodes, function (tm) {
                             return tm.paymentType == PayStyle.hyczk;
@@ -4151,7 +4256,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                         _react2.default.createElement(
                           'span',
                           null,
-                          m && m.storageCardNo
+                          isNewRetailBCPos ? m.member && m.member.StorageCardNo : m.member && m.member.cardNo
                         ),
                         _react2.default.createElement(
                           'span',
@@ -4162,19 +4267,6 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           'span',
                           { className: 'balance fr' },
                           '\u652F\u4ED8\u91D1\u989D\uFF1A'
-                        ),
-                        _react2.default.createElement('br', null),
-                        themodeHyczk && themodeHyczk.length && themodeHyczk[themodeHyczk.length - 1].paymethodId === m.paymethodId && _react2.default.createElement(
-                          _button2.default,
-                          { onClick: function onClick() {
-                              return _this8.onHotKeyClick1(mode, index, boriginReturn);
-                            }, className: 'addCard btn-border-primary' },
-                          _react2.default.createElement(_ticon2.default, { type: 'jiahao', className: 'plus b-theme-color' }),
-                          _react2.default.createElement(
-                            'span',
-                            null,
-                            '\u6DFB\u52A0\u5361'
-                          )
                         )
                       );
                     })
@@ -4334,7 +4426,14 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     { key: index + '', className: 'modeItem' },
                     _react2.default.createElement(
                       'div',
-                      { className: 'main b-theme-color ' + (currentIndex == index && 'settlement-pay-item-border') },
+                      { className: 'main ' + (currentIndex == index && 'settlement-pay-item-border') },
+                      _react2.default.createElement(
+                        'div',
+                        { className: 'lefticon', onClick: function onClick() {
+                            _this8.onDelPay(index);
+                          } },
+                        _react2.default.createElement(_ticon2.default, { type: 'jianqu', className: 'minus' })
+                      ),
                       _react2.default.createElement(
                         'div',
                         { className: (0, _classnames4.default)({ "name": true }) },
@@ -4359,12 +4458,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                           }
                         })
                       ),
-                      _react2.default.createElement(
+                      !isNeedPasswordForStoragePay && _react2.default.createElement(
                         'div',
-                        { className: 'minus', onClick: function onClick() {
-                            _this8.onDelPay(index);
+                        { className: 'righticon', style: { display: mode.paymentType == PayStyle.hyczk ? 'inline-block' : 'none' },
+                          onClick: function onClick() {
+                            _this8.appendCzkmode('', 'noPlaySetPwd');
                           } },
-                        _react2.default.createElement(_ticon2.default, { type: 'shanchu', className: 'minusIcon primary-color' })
+                        _react2.default.createElement(_ticon2.default, { type: 'zengjia', className: 'plus primary-color' })
                       )
                     ),
                     mode.paymentType == PayStyle.djq ? _react2.default.createElement(
@@ -4391,7 +4491,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       _react2.default.createElement(
                         'span',
                         { className: 'fl' },
-                        mode && mode.storageCardNo
+                        isNewRetailBCPos ? mode.member && mode.member.StorageCardNo : mode.member && mode.member.cardNo
                       ),
                       _react2.default.createElement('br', null),
                       _react2.default.createElement(
@@ -4580,6 +4680,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _react2.default.createElement(
                       'div',
                       { className: (0, _classnames4.default)({ "main": true, "focusbottom": currentIndex == index }) },
+                      _react2.default.createElement('div', { className: 'lefticon' }),
                       _react2.default.createElement(
                         'div',
                         { className: (0, _classnames4.default)({ "name": true }) },
@@ -4714,7 +4815,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             visible: this.state.czkVisible,
             maskClosable: false,
             destroyOnClose: true,
-            title: "储值结算",
+            title: "余额结算",
             onCancel: this.handleCzkCancel,
             keyboard: false,
             centered: !this.isHorizontalPad ? true : false,
@@ -4745,7 +4846,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value valuetext' },
-                  currentMode && currentMode.member && currentMode.member.type || '普通'
+                  currentMode && currentMode.member.type || '普通'
                 ),
                 _react2.default.createElement(
                   'div',
@@ -4766,7 +4867,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && (0, _utils.getFixedNumber)(currentMode.balance)
+                  currentMode && (0, _utils.getFixedNumber)(currentMode.member.balance)
                 ),
                 _react2.default.createElement(
                   'div',
@@ -4787,7 +4888,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.balance)))
+                  currentMode && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.member.balance)))
                 ),
                 _react2.default.createElement(
                   'div',
@@ -4802,83 +4903,29 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 null,
-                '\u50A8\u503C\u5361\u53F7\uFF1A'
+                '\u4F59\u989D\u5361\u53F7\uFF1A'
               ),
               _react2.default.createElement(
                 'span',
                 null,
                 _react2.default.createElement(_input2.default, {
                   type: 'text',
-                  placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u50A8\u503C\u5361',
-                  className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
+                  placeholder: '\u8BF7\u626B\u63CF\u6216\u8F93\u5165\u4F59\u989D\u5361'
+                  // disabled={currentMode && !currentMode.member.StorageCardNo && isReturn ? true: false}
+                  , className: 'input ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
                   onChange: function onChange(e) {
                     return _this8.onCzkChange(e.target.value);
                   },
-                  defaultValue: currentMode && currentMode.storageCardNo,
-                  value: czkValue,
+                  defaultValue: isNewRetailBCPos ? currentMode && currentMode.member.StorageCardNo : currentMode && currentMode.member.cardNo,
+                  value: this.state.czkValue,
                   ref: function ref(input) {
                     return _this8.czkInput = input;
                   },
-                  onKeyDown: function () {
-                    var _ref29 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(e) {
-                      var time, _paymode;
-
-                      return _regenerator2.default.wrap(function _callee15$(_context15) {
-                        while (1) {
-                          switch (_context15.prev = _context15.next) {
-                            case 0:
-                              if (!(e.keyCode == 13)) {
-                                _context15.next = 14;
-                                break;
-                              }
-
-                              time = Date.parse(new Date());
-
-                              if (!(_this8.isStorageCardInputType && time - _this8.keypressStime > 350)) {
-                                _context15.next = 7;
-                                break;
-                              }
-
-                              _message2.default.warn('储值卡不可键盘录入，请刷卡!');
-                              _this8.keypressStime = null;
-                              _this8.setState({
-                                czkValue: null
-                              });
-                              return _context15.abrupt('return');
-
-                            case 7:
-                              _this8.keypressStime = null;
-                              _context15.next = 10;
-                              return _this8.loadCzk(e.target.value);
-
-                            case 10:
-                              _paymode = _this8.store.paymode;
-
-                              if (!_paymode.currentMode.storageCardNo) {
-                                _this8.setState({
-                                  czkvalue: null
-                                });
-                              }
-                              _context15.next = 15;
-                              break;
-
-                            case 14:
-                              if (!_this8.keypressStime && e.keyCode !== 8) {
-                                _this8.keypressStime = Date.parse(new Date());
-                              }
-
-                            case 15:
-                            case 'end':
-                              return _context15.stop();
-                          }
-                        }
-                      }, _callee15, _this8);
-                    }));
-
-                    return function (_x12) {
-                      return _ref29.apply(this, arguments);
-                    };
-                  }(),
+                  onKeyDown: function onKeyDown(e) {
+                    if (e.keyCode == 13) {
+                      _this8.loadCzk(e.target.value);
+                    }
+                  },
                   onFocus: function onFocus(e) {
                     _this8.inputTarget = _this8.czkInput.input;
                     !_this8.state.prototypeVisible && _keyboard2.default.open(function (v) {
@@ -4930,22 +4977,22 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   className: _index.hotKey.hotKeyNotFilter('input'),
                   value: storageValue,
                   onChange: function onChange(event) {
-                    _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
+                    _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.member.balance));
                   },
-                  defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)),
-                  ref: function ref(_ref30) {
-                    return _this8["inputCzkAmount"] = _ref30;
+                  defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.member.balance)),
+                  ref: function ref(_ref33) {
+                    return _this8["inputCzkAmount"] = _ref33;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
                     _keyboard2.default.open(function (v) {
                       var value = _keyboard2.default.getNewValue(_this8[_this8.inputkey].input, _this8[_this8.inputkey].input.value, v);
-                      _this8.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.balance));
+                      _this8.setCurrentModeValue(value, Math.min(currentMode.maxamount, currentMode.member.balance));
                     }, _this8.keyboardOnOk, _this8.keyboardOnClose)();
                   },
                   onBlur: function onBlur(e) {
                     _keyboard2.default.close();
-                    _this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.balance));
+                    _this8.setCurrentModeValue((0, _utils.getFixedNumber)(_this8.inputCzkAmount.input.value), Math.min(currentMode.maxamount, currentMode.member.balance));
                   }
                 })
               )
@@ -5006,7 +5053,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
             ),
             _react2.default.createElement(
               _button2.default,
-              { type: 'primary', disabled: btnDissabled, onClick: this.handleSetModal },
+              { type: 'primary', disabled: currentMode && currentMode.errinfo != '' || btnDissabled, onClick: this.handleSetModal },
               '\u786E\u5B9A'
             )
           )),
@@ -5433,7 +5480,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value valuetext' },
-                  currentMode && currentMode.member && currentMode.member.type || '普通'
+                  currentMode && currentMode.member.type || '普通'
                 ),
                 _react2.default.createElement(
                   'div',
@@ -5454,7 +5501,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && currentMode.member && currentMode.member.bonusPoints
+                  currentMode && currentMode.member.bonusPoints
                 ),
                 _react2.default.createElement(
                   'div',
@@ -5475,7 +5522,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && currentMode.member && (0, _utils.getFixedNumber)(currentMode.member.exchangable)
+                  currentMode && (0, _utils.getFixedNumber)(currentMode.member.exchangable)
                 ),
                 _react2.default.createElement(
                   'div',
@@ -5496,7 +5543,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _react2.default.createElement(
                   'div',
                   { className: 'value' },
-                  currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.member.exchangable)))
+                  currentMode && (0, _utils.getFixedNumber)(Math.max(0, Math.min(currentMode.maxamount, currentMode.member.exchangable)))
                 ),
                 _react2.default.createElement(
                   'div',
@@ -5516,7 +5563,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               _react2.default.createElement(
                 'span',
                 { className: 'notext' },
-                currentMode && currentMode.member && currentMode.member.cardNo
+                currentMode && currentMode.member.cardNo
               )
             ),
             _react2.default.createElement(
@@ -5550,9 +5597,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   onChange: function onChange(e) {
                     _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(_ref31) {
-                    return _this8["inputJfdxAmount"] = _ref31;
+                  defaultValue: currentMode && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
+                  ref: function ref(_ref34) {
+                    return _this8["inputJfdxAmount"] = _ref34;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";