tplus-components-touch 3.26.10 → 3.26.14

package/dist/components/settlement/settlement.js

@@ -556,7 +556,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.showCzkModal = function () {
       var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(id, append, params) {
-        var _enumController$getEn2, PayStyle, currentMode, maxamount, brefund, value11;
+        var _enumController$getEn2, PayStyle, _ref2, isInputMember, currentMode, maxamount, brefund, value11;
 
         return _regenerator2.default.wrap(function _callee$(_context) {
           while (1) {
@@ -565,10 +565,18 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn2.PayStyle;
 
                 _this2.store.setCurrentMode(id, PayStyle.hyczk, append);
-                _context.next = 4;
+                _ref2 = _this2.state || {}, isInputMember = _ref2.isInputMember;
+                _context.t0 = isInputMember && _this2.store.paymode.currentMode.memberId;
+
+                if (!_context.t0) {
+                  _context.next = 7;
+                  break;
+                }
+
+                _context.next = 7;
                 return _this2.store.updateCurrentMode(_this2.store.paymode.currentMode.memberId);
 
-              case 4:
+              case 7:
                 _this2._val = _this2.store.paymode.currentMode.value;
                 currentMode = _this2.store.paymode.currentMode;
                 maxamount = Math.min(currentMode.maxamount, currentMode.balance);
@@ -609,7 +617,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }, 500);
                 _this2.connectRfCard();
 
-              case 10:
+              case 13:
               case 'end':
                 return _context.stop();
             }
@@ -691,7 +699,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     }));
 
     _this2.handleCzkOk = function () {
-      var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(e) {
+      var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(e) {
         var _this2$store$paymode$, walletEnabled, cardTypeEnum;
 
         return _regenerator2.default.wrap(function _callee3$(_context3) {
@@ -701,7 +709,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 // 判断是否有密码
                 _this2$store$paymode$ = _this2.store.paymode.currentMode, walletEnabled = _this2$store$paymode$.walletEnabled, cardTypeEnum = _this2$store$paymode$.cardTypeEnum;
 
-                if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled && !_this2.store.dto.FreePaymentPasswordStore) {
+                if (cardTypeEnum === 'BALANCE_CARD' && _this2.store.dto.FreePaymentPasswordStore) {
+                  _this2.handleCzkData();
+                } else if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled) {
                   _this2.setState({
                     showSetPwdModal: true,
                     btnDissabled: true
@@ -719,7 +729,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x4) {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
 
@@ -815,11 +825,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     }));
 
     _this2.onPressEnterCzk = function (field) {
-      var _ref5 = _this2.state || {},
-          _ref5$newPass = _ref5.newPass,
-          newPass = _ref5$newPass === undefined ? '' : _ref5$newPass,
-          _ref5$newPassConfirm = _ref5.newPassConfirm,
-          newPassConfirm = _ref5$newPassConfirm === undefined ? '' : _ref5$newPassConfirm;
+      var _ref6 = _this2.state || {},
+          _ref6$newPass = _ref6.newPass,
+          newPass = _ref6$newPass === undefined ? '' : _ref6$newPass,
+          _ref6$newPassConfirm = _ref6.newPassConfirm,
+          newPassConfirm = _ref6$newPassConfirm === undefined ? '' : _ref6$newPassConfirm;
 
       if (field === 'newPass' && newPass.length === 6) {
         _this2.inputConfirmAmount.input.focus();
@@ -834,11 +844,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         return;
       }
       _this2.setState((0, _defineProperty3.default)({}, field, value), function () {
-        var _ref6 = _this2.state || {},
-            _ref6$newPass = _ref6.newPass,
-            newPass = _ref6$newPass === undefined ? '' : _ref6$newPass,
-            _ref6$newPassConfirm = _ref6.newPassConfirm,
-            newPassConfirm = _ref6$newPassConfirm === undefined ? '' : _ref6$newPassConfirm;
+        var _ref7 = _this2.state || {},
+            _ref7$newPass = _ref7.newPass,
+            newPass = _ref7$newPass === undefined ? '' : _ref7$newPass,
+            _ref7$newPassConfirm = _ref7.newPassConfirm,
+            newPassConfirm = _ref7$newPassConfirm === undefined ? '' : _ref7$newPassConfirm;
 
         if (newPassConfirm.length === 6 && newPass.length === 6 && newPass === newPassConfirm) {
           _this2.setState({
@@ -849,15 +859,15 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleBlur = function (field) {
-      var _ref7 = _this2.state || {},
-          _ref7$newPass = _ref7.newPass,
-          newPass = _ref7$newPass === undefined ? '' : _ref7$newPass,
-          _ref7$newPassConfirm = _ref7.newPassConfirm,
-          newPassConfirm = _ref7$newPassConfirm === undefined ? '' : _ref7$newPassConfirm;
+      var _ref8 = _this2.state || {},
+          _ref8$newPass = _ref8.newPass,
+          newPass = _ref8$newPass === undefined ? '' : _ref8$newPass,
+          _ref8$newPassConfirm = _ref8.newPassConfirm,
+          newPassConfirm = _ref8$newPassConfirm === undefined ? '' : _ref8$newPassConfirm;
 
       setTimeout(function () {
-        var _ref8 = _this2.state || {},
-            showSetPwdModal = _ref8.showSetPwdModal;
+        var _ref9 = _this2.state || {},
+            showSetPwdModal = _ref9.showSetPwdModal;
 
         if (!showSetPwdModal) return;
         if (field === 'newPass' && newPass.length < 6) {
@@ -914,8 +924,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
       // TODO: 测试优惠券支付
 
-      var _ref9 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref9.isNewRetailBCPos;
+      var _ref10 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref10.isNewRetailBCPos;
 
       if (isNewRetailBCPos && !_this2.store.paymode.currentMode.boriginReturn) {
         _this2.store.getCouponList();
@@ -999,8 +1009,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.checkOfflineEnable = function (paymode, key) {
-      var _ref10 = paymode || {},
-          paymodes = _ref10.paymodes;
+      var _ref11 = paymode || {},
+          paymodes = _ref11.paymodes;
 
       var isOffline = _mutantsMicrofx.stores.offlineSys.isOffline;
 
@@ -1032,7 +1042,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       switch (key) {
         case PayStyle.hyczk:
           _this2.showCzkModal(-1);
-          _this2.store.dto.Idmember && _this2.setState({
+          _this2.setState({
             isInputMember: true
           });
           break;
@@ -1350,8 +1360,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         return;
       }
 
-      var _ref11 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref11.isNewRetailBCPos;
+      var _ref12 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref12.isNewRetailBCPos;
 
       if (isNewRetailBCPos) {
         _this2.store.paymode.calcDjqCheckValue(q, _this2.store.dto);
@@ -1831,13 +1841,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       if (_this2.hasElectron === false) return;
       var dt = _mutantsMicrofx.localStore.get('portsetting_hardSet') || [];
 
-      var _ref15 = dt || {},
-          guestshow_enable = _ref15.guestshow_enable,
-          guestshow_clear = _ref15.guestshow_clear,
-          guestshow_welcome = _ref15.guestshow_welcome,
-          guestshow_collect = _ref15.guestshow_collect,
-          guestshow_refund = _ref15.guestshow_refund,
-          guestshow_change = _ref15.guestshow_change;
+      var _ref16 = dt || {},
+          guestshow_enable = _ref16.guestshow_enable,
+          guestshow_clear = _ref16.guestshow_clear,
+          guestshow_welcome = _ref16.guestshow_welcome,
+          guestshow_collect = _ref16.guestshow_collect,
+          guestshow_refund = _ref16.guestshow_refund,
+          guestshow_change = _ref16.guestshow_change;
 
       var hasSuccess = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('portsetting_hardSet_isSuccess');
       if (!guestshow_enable || !!guestshow_enable && hasSuccess == '0') return;
@@ -1872,9 +1882,9 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.handleSettle = function () {
-      var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
+      var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(args) {
         var handleUserInputs = function () {
-          var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
+          var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(promises) {
             var results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, p, _result;
 
             return _regenerator2.default.wrap(function _callee10$(_context10) {
@@ -1965,7 +1975,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           }));
 
           return function handleUserInputs(_x7) {
-            return _ref18.apply(this, arguments);
+            return _ref19.apply(this, arguments);
           };
         }();
 
@@ -2068,7 +2078,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 });
 
                 commit = function () {
-                  var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
+                  var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(values) {
                     var result;
                     return _regenerator2.default.wrap(function _callee9$(_context9) {
                       while (1) {
@@ -2142,7 +2152,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                   }));
 
                   return function commit(_x6) {
-                    return _ref17.apply(this, arguments);
+                    return _ref18.apply(this, arguments);
                   };
                 }();
 
@@ -2157,13 +2167,13 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x5) {
-        return _ref16.apply(this, arguments);
+        return _ref17.apply(this, arguments);
       };
     }();
 
     _this2.handleCzk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
       var handleUserInputs = function () {
-        var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
+        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(promises) {
           var results, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, p, _result2;
 
           return _regenerator2.default.wrap(function _callee13$(_context13) {
@@ -2260,11 +2270,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
         }));
 
         return function handleUserInputs(_x9) {
-          return _ref22.apply(this, arguments);
+          return _ref23.apply(this, arguments);
         };
       }();
 
-      var that, curmode, promises, _ref20, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
+      var that, curmode, promises, _ref21, isNewRetailBCPos, _enumController$getEn22, PayStyle, commit;
 
       return _regenerator2.default.wrap(function _callee14$(_context14) {
         while (1) {
@@ -2273,15 +2283,21 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               that = _this2;
               curmode = _this2.store.paymode.currentMode;
               promises = [];
-              _ref20 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref20.isNewRetailBCPos;
+              _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
               if (isNewRetailBCPos) {
                 if (curmode.value > 0) {
                   _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle;
 
                   if (curmode.paymentType === PayStyle.hyczk) {
-                    if (curmode.cardTypeEnum === 'BALANCE_CARD' && !_this2.store.dto.FreePaymentPasswordStore || curmode.isNeedPassword) {
-                      promises.push(that.inputPwd(curmode));
+                    if (curmode.cardTypeEnum === 'BALANCE_CARD') {
+                      !_this2.store.dto.FreePaymentPasswordStore && promises.push(that.inputPwd(curmode));
+                    } else {
+                      if (_this2.store.dto.Idmember === curmode.memberId) {
+                        !_this2.store.dto.FreePaymentPasswordStore && promises.push(that.inputPwd(curmode));
+                      } else {
+                        curmode.isNeedPassword && promises.push(that.inputPwd(curmode));
+                      }
                     }
                   }
                 }
@@ -2292,7 +2308,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
               }
 
               commit = function () {
-                var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
+                var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(values) {
                   var result;
                   return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
@@ -2342,7 +2358,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                 }));
 
                 return function commit(_x8) {
-                  return _ref21.apply(this, arguments);
+                  return _ref22.apply(this, arguments);
                 };
               }();
 
@@ -2393,7 +2409,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
     };
 
     _this2.inputPwd = function () {
-      var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
+      var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(paymode) {
         var that, confirmPwd;
         return _regenerator2.default.wrap(function _callee15$(_context15) {
           while (1) {
@@ -2409,8 +2425,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                       // if (v !== '') {
                       modal.destroy();
 
-                      var _ref24 = that.state || {},
-                          confirmPwd = _ref24.confirmPwd;
+                      var _ref25 = that.state || {},
+                          confirmPwd = _ref25.confirmPwd;
 
                       setTimeout(function () {
                         paymode.authCode = v;
@@ -2500,8 +2516,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                               type: 'primary', size: 'large', onClick: function onClick() {
                                 var v = (0, _trim3.default)(that['inputAmount']['input']['value']);
 
-                                var _ref25 = that.state || {},
-                                    confirmPwd = _ref25.confirmPwd;
+                                var _ref26 = that.state || {},
+                                    confirmPwd = _ref26.confirmPwd;
                                 // if (v !== '') {
 
 
@@ -2542,7 +2558,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
       }));
 
       return function (_x10) {
-        return _ref23.apply(this, arguments);
+        return _ref24.apply(this, arguments);
       };
     }();
 
@@ -2595,8 +2611,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.onCzkChange = function (v) {
       // console.log("czk change:"+new Date().toLocaleTimeString())
-      var _ref26 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref26.isNewRetailBCPos;
+      var _ref27 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref27.isNewRetailBCPos;
 
       if (!isNewRetailBCPos) {
         _this2.store.paymode.currentMode.member.setCardNo(v);
@@ -3177,22 +3193,19 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
 
     _this2.hasElectron = hasElectron;
 
-    var _ref27 = _mutantsMicrofx.localStore.get('user') || {},
-        _ref27$loginInfo = _ref27.loginInfo;
-
-    _ref27$loginInfo = _ref27$loginInfo === undefined ? {} : _ref27$loginInfo;
-    var MemberMeStorageCardInputByKeyBoard = _ref27$loginInfo.MemberMeStorageCardInputByKeyBoard,
-        ICCardServer = _ref27$loginInfo.ICCardServer,
-        ICCardPassword = _ref27$loginInfo.ICCardPassword;
+    var _ref28 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
+        MemberMeStorageCardInputByKeyBoard = _ref28.MemberMeStorageCardInputByKeyBoard,
+        ICCardServer = _ref28.ICCardServer,
+        ICCardPassword = _ref28.ICCardPassword;
 
     _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
     _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
     _this2.iCCardPassword = ICCardPassword; //IC卡密码
     //移动端环境下，没有读取IC卡的方式。
 
-    var _ref28 = _mutantsUtil.platform || {},
-        isHorizontalPad = _ref28.isHorizontalPad,
-        isHorizontalSunMi = _ref28.isHorizontalSunMi;
+    var _ref29 = _mutantsUtil.platform || {},
+        isHorizontalPad = _ref29.isHorizontalPad,
+        isHorizontalSunMi = _ref29.isHorizontalSunMi;
 
     _this2.isHorizontalPad = !!isHorizontalPad;
     _this2.isHorizontalSunMi = !!isHorizontalSunMi;
@@ -3431,8 +3444,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           newPassConfirm = _state2.newPassConfirm,
           newPass = _state2.newPass;
 
-      var _ref29 = _mutantsUtil.platform || {},
-          isNewRetailBCPos = _ref29.isNewRetailBCPos;
+      var _ref30 = _mutantsUtil.platform || {},
+          isNewRetailBCPos = _ref30.isNewRetailBCPos;
 
       var _store2 = this.store,
           paymode = _store2.paymode,
@@ -3495,11 +3508,11 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
           quantity4 = 0;
       var sumQuantity = 0; //数量总和的值，包括称重的。
 
-      var _ref30 = quantityDetail || {},
-          _ref30$buyQuantity = _ref30.buyQuantity,
-          buyQuantity = _ref30$buyQuantity === undefined ? 0 : _ref30$buyQuantity,
-          _ref30$returnQuantity = _ref30.returnQuantity,
-          returnQuantity = _ref30$returnQuantity === undefined ? 0 : _ref30$returnQuantity;
+      var _ref31 = quantityDetail || {},
+          _ref31$buyQuantity = _ref31.buyQuantity,
+          buyQuantity = _ref31$buyQuantity === undefined ? 0 : _ref31$buyQuantity,
+          _ref31$returnQuantity = _ref31.returnQuantity,
+          returnQuantity = _ref31$returnQuantity === undefined ? 0 : _ref31$returnQuantity;
 
       var quantityPrecision = (0, _tplusPoslogin.PosInitData)("QuantityPrecision");
       quantityPrecision = quantityPrecision ? parseInt(quantityPrecision) : '';
@@ -4836,7 +4849,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     return _this8.czkInput = input;
                   },
                   onKeyDown: function () {
-                    var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(e) {
+                    var _ref32 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(e) {
                       var time, _paymode;
 
                       return _regenerator2.default.wrap(function _callee16$(_context16) {
@@ -4892,7 +4905,7 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     }));
 
                     return function (_x12) {
-                      return _ref31.apply(this, arguments);
+                      return _ref32.apply(this, arguments);
                     };
                   }(),
                   onFocus: function onFocus(e) {
@@ -4949,8 +4962,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(event.target.value, Math.min(currentMode.maxamount, currentMode.balance));
                   },
                   defaultValue: currentMode && (0, _utils.getFixedNumber)(brefund ? currentMode.value : Math.min(currentMode.value, currentMode.maxamount, currentMode.balance)),
-                  ref: function ref(_ref32) {
-                    return _this8["inputCzkAmount"] = _ref32;
+                  ref: function ref(_ref33) {
+                    return _this8["inputCzkAmount"] = _ref33;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputCzkAmount";
@@ -5571,8 +5584,8 @@ var Settlement = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (
                     _this8.setCurrentModeValue(e.target.value, Math.min(currentMode.maxamount, currentMode.member.exchangable));
                   },
                   defaultValue: currentMode && currentMode.member && (0, _utils.getFixedNumber)(Math.min(currentMode.value, currentMode.maxamount, currentMode.member.exchangable)),
-                  ref: function ref(_ref33) {
-                    return _this8["inputJfdxAmount"] = _ref33;
+                  ref: function ref(_ref34) {
+                    return _this8["inputJfdxAmount"] = _ref34;
                   },
                   onFocus: function onFocus(e) {
                     _this8.inputkey = "inputJfdxAmount";