tplus-member 3.27.5 → 3.27.9

package/dist/member/index.js

@@ -109,11 +109,11 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
     function MemberTag(props) {
         (0, _classCallCheck3.default)(this, MemberTag);
 
-        var _this2 = (0, _possibleConstructorReturn3.default)(this, (MemberTag.__proto__ || (0, _getPrototypeOf2.default)(MemberTag)).call(this, props));
+        var _this = (0, _possibleConstructorReturn3.default)(this, (MemberTag.__proto__ || (0, _getPrototypeOf2.default)(MemberTag)).call(this, props));
 
-        _initialiseProps.call(_this2);
+        _initialiseProps.call(_this);
 
-        _this2.hasElectron = hasElectron;
+        _this.hasElectron = hasElectron;
 
         var _ref = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
             isMemberInputType = _ref.isMemberInputType,
@@ -122,41 +122,44 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
             ICCardServer = _ref.ICCardServer,
             ICCardPassword = _ref.ICCardPassword;
 
-        _this2.isMemberInputType = parseInt(isMemberInputType); // '0'为不禁用 '1'为禁用
-        _this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
-        _this2.openFaceRecognition = parseInt(OpenFaceRecognition); // 启用人脸识别:0禁用 1为启用
-        _this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
-        _this2.iCCardPassword = ICCardPassword; //IC卡密码
-        _this2.ms = _api2.default;
+        _this.isMemberInputType = parseInt(isMemberInputType); // '0'为不禁用 '1'为禁用
+        _this.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入，'0'为不禁用 '1'为禁用
+        _this.openFaceRecognition = parseInt(OpenFaceRecognition); // 启用人脸识别:0禁用 1为启用
+        _this.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
+        _this.iCCardPassword = ICCardPassword; //IC卡密码
+        _this.ms = _api2.default;
         //移动端环境下，没有读取IC卡的方式。
 
         var _ref2 = _mutantsUtil.platform || {},
             isHorizontalPad = _ref2.isHorizontalPad,
             isHorizontalSunMi = _ref2.isHorizontalSunMi;
 
-        _this2.isHorizontalPad = !!isHorizontalPad;
-        _this2.isHorizontalSunMi = !!isHorizontalSunMi;
-        _this2.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
-        _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
+        _this.isHorizontalPad = !!isHorizontalPad;
+        _this.isHorizontalSunMi = !!isHorizontalSunMi;
+        _this.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
+        _this.handleReadICard = _this.handleReadICard.bind(_this);
 
         //记录键盘录入信息的开始时间
-        _this2.keypressStime = null;
-        _this2.iseyboardKEnter = false; //是否为键盘输入
+        _this.keypressStime = null;
+        _this.iseyboardKEnter = false; //是否为键盘输入
 
         var _ref3 = _mutantsUtil.platform || {},
             isNewRetailBCPos = _ref3.isNewRetailBCPos;
 
-        _this2.state = {
+        _this.state = {
             isCC: !!isNewRetailBCPos,
             isShowBirthdayTip: false
         };
-        return _this2;
+
+        //是否单据模式
+        _this.isVoucherMode = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
+        return _this;
     }
 
     (0, _createClass3.default)(MemberTag, [{
         key: 'componentWillReact',
         value: function componentWillReact() {
-            var _this3 = this;
+            var _this2 = this;
 
             var _ref4 = this.context.viewModel || {},
                 _ref4$data = _ref4.data;
@@ -171,10 +174,15 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
                 isClear = _ms$isClear === undefined ? false : _ms$isClear;
 
             var memberChangeData = (0, _keys2.default)(selectMemberInfo).length ? selectMemberInfo : undefined;
-
+            // 有会员的话清空搜索框文本
+            if (dtMember.ID && this.state.searchValue) {
+                this.setState({
+                    searchValue: ''
+                });
+            }
             var memberChange = function memberChange(data) {
-                _this3.setState({ newAvatar: '' });
-                _this3.props.memberChange(data);
+                _this2.setState({ newAvatar: '' });
+                _this2.props.memberChange(data);
             };
             if ((typeof memberChangeData === 'undefined' ? 'undefined' : (0, _typeof3.default)(memberChangeData)) === 'object') {
                 var deepCloneMember = JSON.parse((0, _stringify2.default)(memberChangeData));
@@ -224,7 +232,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
 
         //IC卡连接
         value: function connectRfCard() {
-            var _this4 = this;
+            var _this3 = this;
 
             //客户端环境下，并开启了启用IC卡。
             if (this.hasElectron === true && this.iCCardServer === 1) {
@@ -235,7 +243,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
                     } else {
                         result = { connectCardStatus: true, connectCardError: '' };
                     }
-                    _this4.setState(result);
+                    _this3.setState(result);
                 });
             }
         }
@@ -245,7 +253,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
     }, {
         key: 'readRfCard',
         value: function readRfCard() {
-            var _this5 = this;
+            var _this4 = this;
 
             //客户端环境下，并开启了启用IC卡。
             if (this.hasElectron === true && this.iCCardServer === 1) {
@@ -262,10 +270,10 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
                 _mutantsMicrofx.nativeMs.setIpcRendererMethod('ReadRfCard', (0, _extends3.default)({}, params), function (ret) {
                     if (ret.status === 0) {
                         _tplusComponentsTouch.Message.error(ret.value);
-                        _this5.connectRfCard(); //读取失败后，重新连接一下。
+                        _this4.connectRfCard(); //读取失败后，重新连接一下。
                         return;
                     } else if (ret.status === 1) {
-                        _this5.searchMember(ret.value);
+                        _this4.searchMember(ret.value);
                     }
                 });
             }
@@ -295,7 +303,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
     }, {
         key: 'render',
         value: function render() {
-            var _this6 = this;
+            var _this5 = this;
 
             var _state2 = this.state,
                 memberPhoto = _state2.memberPhoto,
@@ -333,6 +341,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
             _ref5$data = _ref5$data === undefined ? {} : _ref5$data;
             var _ref5$data$Member = _ref5$data.Member,
                 dtMember = _ref5$data$Member === undefined ? {} : _ref5$data$Member,
+                IdbusiType = _ref5$data.IdbusiType,
                 _ref5$items = _ref5.items,
                 items = _ref5$items === undefined ? [] : _ref5$items;
 
@@ -369,14 +378,15 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
                                 placeholder: '\u626B\u63CF/\u8F93\u5165\u4F1A\u5458\u53F7',
                                 value: searchValue,
                                 ref: function ref(el) {
-                                    return _this6.inputSearch = el && el.input;
+                                    return _this5.inputSearch = el && el.input;
                                 },
                                 onChange: function onChange(e) {
-                                    return _this6.handleSearch(e.target.value);
+                                    return _this5.handleSearch(e.target.value);
                                 },
                                 onFocus: this.handleFocus,
                                 onBlur: this.handleBlur,
-                                onKeyDown: this.onKeyPressed
+                                onKeyDown: this.onKeyPressed,
+                                disabled: IdbusiType == 39
                             }),
                             _react2.default.createElement(_tplusComponentsTouch.Spin, {
                                 className: 'search-spin',
@@ -393,7 +403,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
                                 'div',
                                 { className: 'openFaceRecognition-box' },
                                 _react2.default.createElement(_tplusComponentsTouch.Ticon, { className: 'icon', onClick: function onClick() {
-                                        return _this6.loadFaceRecognition(2);
+                                        return _this5.loadFaceRecognition(2);
                                     }, type: 'renlianshibie' }),
                                 _react2.default.createElement(_tplusComponentsTouch.Spin, {
                                     className: 'face-spin',
@@ -405,7 +415,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
 
                             /* 扫描组件 */
                             this.isHorizontalPad && _react2.default.createElement(_tplusComponentsTouch.Scan, { ref: function ref(scan) {
-                                    return _this6.scanObj = scan;
+                                    return _this5.scanObj = scan;
                                 }, onChange: this.onScanResult })
                         )
                     ),
@@ -434,13 +444,13 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
                                 _react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'cuowuda', className: 'cuowudaIcon' })
                             ),
                             memberCareInfo && memberCareInfo.isTicket && _react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'cuowuda', onClick: function onClick() {
-                                    _this6.setIsShowBirthdayTip();
+                                    _this5.setIsShowBirthdayTip();
                                 }, className: 'cuowudaIcon' })
                         ),
                         _react2.default.createElement(
                             'div',
                             { className: 'second member-hotkey-info', onClick: function onClick() {
-                                    return _this6.openShowModal(0);
+                                    return _this5.openShowModal(0);
                                 } },
                             _react2.default.createElement(
                                 'div',
@@ -502,7 +512,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
                         _react2.default.createElement(
                             'div',
                             { className: 'close' },
-                            !isTakeTheir && _react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'guanbi-yuan', onClick: this.openCloseModal })
+                            !isTakeTheir && IdbusiType != 39 && _react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'guanbi-yuan', onClick: this.openCloseModal })
                         )
                     )
                 ),
@@ -512,7 +522,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
                     _react2.default.createElement(
                         _button2.default,
                         { type: 'primary', onClick: function onClick() {
-                                return _this6.loadFaceRecognition(1);
+                                return _this5.loadFaceRecognition(1);
                             }, className: 'btn', disabled: inShopLoading },
                         !inShopLoading && '到店会员',
                         _react2.default.createElement(_tplusComponentsTouch.Spin, {
@@ -535,6 +545,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
                     columnInfo: columnInfo,
                     status: status,
                     showModal: memberShow,
+                    storeKey: 'memberManager',
                     titleModal: titleModal,
                     selectMemberSuccess: selectMemberSuccess,
                     handleModal: this.handleShowModal
@@ -667,7 +678,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
 }, _class2.defaultProps = {
     memberChange: function memberChange() {}
 }, _initialiseProps = function _initialiseProps() {
-    var _this7 = this;
+    var _this6 = this;
 
     this.state = {
         searchValue: '',
@@ -685,15 +696,15 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
     };
 
     this.controllerEvent = function (methodName, methodArgs) {
-        _this7.context.onEvent({ 'controllerEvent': _mutantsAppfx.Action.fromJS(_this7.context.viewModel, methodName) }, 'controllerEvent', methodArgs);
+        _this6.context.onEvent({ 'controllerEvent': _mutantsAppfx.Action.fromJS(_this6.context.viewModel, methodName) }, 'controllerEvent', methodArgs);
     };
 
     this.resetInShopMemberTimer = function (count) {
-        _this7.timer && clearTimeout(_this7.timer);
+        _this6.timer && clearTimeout(_this6.timer);
         if (!count) return;
         var time = 5 * 60 * 1000;
-        _this7.timer = setTimeout(function () {
-            _this7.getInStoreMemberCount();
+        _this6.timer = setTimeout(function () {
+            _this6.getInStoreMemberCount();
         }, time);
     };
 
@@ -702,11 +713,11 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
             isNewRetailBCPos = _ref7.isNewRetailBCPos;
 
         if (!isNewRetailBCPos) {
-            if (!_this7.openFaceRecognition) {
+            if (!_this6.openFaceRecognition) {
                 _tplusComponentsTouch.Message.warn('未启用人脸识别，需要先开启人脸识别功能');
                 return;
             }
-            _this7.setState({
+            _this6.setState({
                 memberPhoto: true,
                 titleModal: '选择头像'
             });
@@ -716,31 +727,31 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
     this.openShowModal = function (status, res) {
         var title = '';
 
-        var _ref8 = _this7.context.viewModel || {},
+        var _ref8 = _this6.context.viewModel || {},
             _ref8$data = _ref8.data;
 
         _ref8$data = _ref8$data === undefined ? {} : _ref8$data;
         var _ref8$data$Member = _ref8$data.Member,
             Member = _ref8$data$Member === undefined ? {} : _ref8$data$Member;
-        var newAvatar = _this7.state.newAvatar;
+        var newAvatar = _this6.state.newAvatar;
 
         var jsMember = (0, _mobx.toJS)(Member);
         var updateMember = newAvatar ? (0, _extends3.default)({}, jsMember, { ImageFile: newAvatar }) : jsMember;
         switch (status) {
             case 0:
                 title = '会员详情';
-                _this7.setState({ viewMemberInfo: updateMember });
+                _this6.setState({ viewMemberInfo: updateMember });
                 break;
             case 1:
                 title = '到店会员';
-                _this7.setState({ viewMemberInfo: res });
+                _this6.setState({ viewMemberInfo: res });
                 break;
             case 2:
                 title = '人脸识别';
-                _this7.setState({ viewMemberInfo: res });
+                _this6.setState({ viewMemberInfo: res });
                 break;
         }
-        _this7.setState({
+        _this6.setState({
             status: status,
             memberShow: true,
             titleModal: title
@@ -748,9 +759,9 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
     };
 
     this.openCloseModal = function () {
-        var setMemberFocus = _this7.props.setMemberFocus;
+        var setMemberFocus = _this6.props.setMemberFocus;
 
-        var memberStore = _this7.context.viewModel && _this7.context.viewModel.items.find(function (el) {
+        var memberStore = _this6.context.viewModel && _this6.context.viewModel.items.find(function (el) {
             return el.name == 'MemberStore';
         });
         var uiState = memberStore.uiState;
@@ -764,7 +775,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
             title: '关闭会员',
             content: '' + (IsIntegralExchange ? "关闭会员将会清空商品信息！" : "确定要关闭该会员吗？"),
             onOk: function onOk() {
-                _this7.ms.clearSeletMember();
+                _this6.ms.clearSeletMember();
                 _mutantsMicrofx.stores.selectMemberStore.clearMemberCare();
                 typeof setMemberFocus == 'function' && setMemberFocus();
             }
@@ -772,87 +783,98 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
     };
 
     this.handleCloseBirthdayModal = function () {
-        _this7.ms.changeBirthdayShow(false);
+        _this6.ms.changeBirthdayShow(false);
     };
 
     this.handleMemberCareModal = function () {
-        _this7.setState({ isMemberCareModal: true });
+        _this6.setState({ isMemberCareModal: true });
     };
 
     this.handleMemberCareModalCancel = function () {
-        _this7.setState({ isMemberCareModal: false });
+        _this6.setState({ isMemberCareModal: false });
     };
 
     this.handleSearch = function (val) {
-        _this7.setState({ searchValue: val });
+        _this6.setState({ searchValue: val });
     };
 
     this.handleFocus = function (el) {
-        if (_this7.isMemberInputType) return;
-        var _this = _this7;
-        function cb() {
-            _this.searchMember(undefined, 'ok');
+        if (_this6.isMemberInputType) return;
+        if (_this6.isVoucherMode) {
+            _tplusComponentsTouch.Keyboard.open(function (v) {
+                var value = _tplusComponentsTouch.Keyboard.getNewValue(_this6.inputSearch, _this6.inputSearch.value, v);
+                _this6.handleSearch(value);
+            }, function () {
+                _this6.searchMember(undefined, 'ok');
+            }, _this6.keyboardClose, 'ByMember', _mutantsMicrofx.localStore.get('ByMember'))();
+        } else {
+            _tplusComponentsTouch.Keyboard.open2(function (v) {
+                var value = _tplusComponentsTouch.Keyboard.getNewValue(_this6.inputSearch, _this6.inputSearch.value, v);
+                _this6.handleSearch(value);
+            }, function () {
+                _this6.searchMember(undefined, 'ok');
+            }, _this6.keyboardClose, 'ByMember', _mutantsMicrofx.localStore.get('ByMember'));
         }
-        _tplusComponentsTouch.Keyboard.open2(function (v) {
-            var value = _tplusComponentsTouch.Keyboard.getNewValue(_this7.inputSearch, _this7.inputSearch.value, v);
-            _this7.handleSearch(value);
-        }, cb, _this7.keyboardClose, 'ByMember', _mutantsMicrofx.localStore.get('ByMember'));
     };
 
     this.keyboardClose = function () {
-        _this7.inputSearch.blur();
+        _this6.inputSearch.blur();
     };
 
     this.handleBlur = function () {
-        _tplusComponentsTouch.Keyboard.close2();
+        if (_this6.isVoucherMode) {
+            _tplusComponentsTouch.Keyboard.close();
+        } else {
+            _tplusComponentsTouch.Keyboard.close2();
+        }
     };
 
     this.handleReadICard = function () {
-        _this7.readRfCard();
+        _this6.readRfCard();
     };
 
     this.handleShowModal = function (type, params) {
         if (params) {
-            _this7.setState({ dtMember: params, memberShow: type });
+            _this6.setState({ dtMember: params, memberShow: type });
         } else {
-            _this7.setState({ memberShow: type });
+            _this6.setState({ memberShow: type });
         }
     };
 
     this.handlePhotoModal = function (type, newAvatar) {
         if (newAvatar) {
-            _this7.setState({
+            _this6.setState({
                 newAvatar: newAvatar,
                 memberPhoto: type
             });
         } else {
-            _this7.setState({ memberPhoto: type });
+            _this6.setState({ memberPhoto: type });
         }
     };
 
     this.searchMember = function (val, type) {
         if (!_mutantsMicrofx.stores.offlineSys.shouldInOffline()) return;
-        if (!_this7.ms || _this7.searchLoading) return;
-        var searchValue = _this7.state.searchValue;
+        if (!_this6.ms || _this6.searchLoading) return;
+        var searchValue = _this6.state.searchValue;
 
         val = val || (searchValue || '').trim();
         if (!val) return;
-        var _props2 = _this7.props,
+        var _props2 = _this6.props,
             memberSearched = _props2.memberSearched,
             selectMemberSuccess = _props2.selectMemberSuccess,
             setMemberFocus = _props2.setMemberFocus,
             getMemberBirthday = _props2.getMemberBirthday,
             getMeStorageCard = _props2.getMeStorageCard;
 
-        _this7.searchLoading = true;
-        _this7.setState({ searchVisible: true });
-        _this7.ms.getSearchMember({
+        _this6.searchLoading = true;
+        _this6.setState({ searchVisible: true });
+        _this6.ms.getSearchMember({
             currentPage: 1,
             pageSize: 10,
             key: val,
             isSingleMember: false
         }).then(function (ret) {
-            _this7.searchLoading = false;
+            _this6.searchLoading = false;
 
             var _ref9 = ret || {},
                 columnInfo = _ref9.ColumnInfo,
@@ -860,11 +882,11 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
 
             var data = JSON.parse(Data) || [];
             var info = data[0];
-            _this7.setState({ searchVisible: false, columnInfo: columnInfo });
-            if (info && info.MemberType && info.MemberType.IsStorage && _this7.isStorageCardInputType && _this7.iseyboardKEnter) {
+            _this6.setState({ searchVisible: false, columnInfo: columnInfo });
+            if (info && info.MemberType && info.MemberType.IsStorage && _this6.isStorageCardInputType && _this6.iseyboardKEnter) {
                 getMeStorageCard && getMeStorageCard(true);
-                _this7.handleSearch('');
-                _this7.keypressStime = null;
+                _this6.handleSearch('');
+                _this6.keypressStime = null;
             } else {
                 getMeStorageCard && getMeStorageCard(false);
             }
@@ -875,20 +897,21 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
                         title: '会员管理',
                         key: 'member',
                         onHide: function onHide() {},
+                        subKey: 'memberManager',
                         listArr: data
                     });
-                    _this7.setState({
+                    _this6.setState({
                         searchValue: null
                     });
                 } else {
                     memberSearched && memberSearched(info, 'searched');
                     (0, _utils.userInfoFormat)(info);
                     if ((0, _utils.errMessageTip)(info)) return;
-                    _this7.ms.seletMember(info, true);
+                    _this6.ms.seletMember(info, true);
                     setTimeout(function () {
-                        return _this7.setState({ searchValue: '' });
+                        return _this6.setState({ searchValue: '' });
                     }, 0);
-                    _this7.handleBlur();
+                    _this6.handleBlur();
                     selectMemberSuccess && selectMemberSuccess();
                     getMemberBirthday && getMemberBirthday(info.ID, function (result) {
                         _mutantsMicrofx.stores.selectMemberStore.changeMemberCare(result);
@@ -897,58 +920,58 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
             } else {
                 if (type === 'ok') {
                     _tplusComponentsTouch.Message.warn('会员不存在');
-                    if (_this7.isMobileEnvironment) {
+                    if (_this6.isMobileEnvironment) {
                         setTimeout(function () {
-                            return _this7.setState({ searchValue: '' });
+                            return _this6.setState({ searchValue: '' });
                         }, 0);
                     }
                     typeof setMemberFocus == 'function' && setMemberFocus();
                 }
             }
         }).catch(function (err) {
-            _this7.setState({ searchVisible: false });
-            _this7.searchLoading = false;
+            _this6.setState({ searchVisible: false });
+            _this6.searchLoading = false;
             memberSearched && memberSearched(undefined, 'err');
         });
     };
 
     this.getInStoreMemberCount = function () {
-        if (!_this7.ms) return;
-        _this7.ms.getInStoreMemberCount().then(function (res) {
+        if (!_this6.ms) return;
+        _this6.ms.getInStoreMemberCount().then(function (res) {
             var _ref10 = res || {},
                 _ref10$data = _ref10.data;
 
             _ref10$data = _ref10$data === undefined ? {} : _ref10$data;
             var shopPerson = _ref10$data.data;
 
-            _this7.setState({ shopPerson: shopPerson });
-            _this7.resetInShopMemberTimer(shopPerson);
+            _this6.setState({ shopPerson: shopPerson });
+            _this6.resetInShopMemberTimer(shopPerson);
         });
     };
 
     this.onKeyPressed = function (e) {
         var keyCode = e && e.keyCode;
         if (keyCode === 13) {
-            if (_this7.isMemberInputType) {
-                var stime = _this7.keypressStime;
+            if (_this6.isMemberInputType) {
+                var stime = _this6.keypressStime;
                 var etime = Date.parse(new Date());
                 if (etime - stime > 300) {
-                    _this7.handleSearch('');
-                    _this7.keypressStime = null;
+                    _this6.handleSearch('');
+                    _this6.keypressStime = null;
                     return _tplusComponentsTouch.Message.warn('未启用键盘录入功能');
                 }
-                _this7.keypressStime = null;
+                _this6.keypressStime = null;
             }
-            _this7.iseyboardKEnter = Date.parse(new Date()) - _this7.keypressStime > 300;
-            if (_this7.isStorageCardInputType) {
-                _this7.keypressStime = null;
+            _this6.iseyboardKEnter = Date.parse(new Date()) - _this6.keypressStime > 300;
+            if (_this6.isStorageCardInputType) {
+                _this6.keypressStime = null;
             }
-            if (_this7.searchLoading) return;
-            _this7.searchMember(undefined, 'ok');
-        } else if (_this7.isMemberInputType && !_this7.keypressStime && !(keyCode == 8)) {
-            _this7.keypressStime = Date.parse(new Date());
-        } else if (_this7.isStorageCardInputType && !_this7.keypressStime && !(keyCode == 8) && !_this7.isMemberInputType) {
-            _this7.keypressStime = Date.parse(new Date());
+            if (_this6.searchLoading) return;
+            _this6.searchMember(undefined, 'ok');
+        } else if (_this6.isMemberInputType && !_this6.keypressStime && !(keyCode == 8)) {
+            _this6.keypressStime = Date.parse(new Date());
+        } else if (_this6.isStorageCardInputType && !_this6.keypressStime && !(keyCode == 8) && !_this6.isMemberInputType) {
+            _this6.keypressStime = Date.parse(new Date());
         }
     };
 
@@ -976,35 +999,35 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
 
     this.loadFaceRecognition = function (type) {
         // type = 1：到店会员 type = 2：POS机人脸识别
-        _this7.setState({ faceLoading: type === 2, inShopLoading: type === 1 });
-        _this7.ms.loadInStoreMember(String(type)).then(function (res) {
-            _this7.setState({ faceLoading: false, inShopLoading: false });
+        _this6.setState({ faceLoading: type === 2, inShopLoading: type === 1 });
+        _this6.ms.loadInStoreMember(String(type)).then(function (res) {
+            _this6.setState({ faceLoading: false, inShopLoading: false });
 
             var _ref12 = res || {},
                 Data = _ref12.Data;
 
             if (!JSON.parse(Data).length) {
                 var tipMessage = ['当前没有到店会员', '未识别到人脸信息'];
-                type === 1 && _this7.setState({ shopPerson: 0 });
+                type === 1 && _this6.setState({ shopPerson: 0 });
                 return _tplusComponentsTouch.Message.info(tipMessage[type - 1]);
             }
-            type === 1 && _this7.getInStoreMemberCount();
-            _this7.openShowModal(type, res);
+            type === 1 && _this6.getInStoreMemberCount();
+            _this6.openShowModal(type, res);
         }).catch(function (err) {
-            _this7.setState({ faceLoading: false, inShopLoading: false });
+            _this6.setState({ faceLoading: false, inShopLoading: false });
             console.log(err);
         });
     };
 
     this.changeScanProduct = function () {
-        if (_this7.scanObj) _this7.scanObj.startScan();
+        if (_this6.scanObj) _this6.scanObj.startScan();
     };
 
     this.onScanResult = function (res) {
-        _this7.setState({
+        _this6.setState({
             searchValue: res
         }, function () {
-            _this7.onKeyPressed({ keyCode: 13 });
+            _this6.onKeyPressed({ keyCode: 13 });
         });
     };