tplus-member 3.33.1 → 3.36.1
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/index.js +1 -6
- package/dist/index.js.map +1 -1
- package/dist/member/MemberShow.js +1 -3
- package/dist/member/MemberShow.js.map +1 -1
- package/dist/member/ShopMember.js +268 -274
- package/dist/member/ShopMember.js.map +1 -1
- package/dist/member/ShopMember.less +10 -115
- package/dist/member/api.js +42 -277
- package/dist/member/api.js.map +1 -1
- package/dist/member/index.js +115 -131
- package/dist/member/index.js.map +1 -1
- package/dist/member/memberMenu/index.js +352 -503
- package/dist/member/memberMenu/index.js.map +1 -1
- package/dist/member/memberMenu/modifyPass/index.js +2 -0
- package/dist/member/memberMenu/modifyPass/index.js.map +1 -1
- package/dist/member/memberMenu/style.less +1 -44
- package/dist/member/memberTab.js +11 -58
- package/dist/member/memberTab.js.map +1 -1
- package/dist/stores/MemberStore.js +21 -26
- package/dist/stores/MemberStore.js.map +1 -1
- package/dist/utils.js +1 -15
- package/dist/utils.js.map +1 -1
- package/dist/viewDoMain/StorageAmountChangedProcessorBlock.js +0 -1
- package/dist/viewDoMain/StorageAmountChangedProcessorBlock.js.map +1 -1
- package/dist/views/MemberOrderView.js +1 -1
- package/dist/views/MemberOrderView.js.map +1 -1
- package/dist/views/MemberStoreNew.less +3 -1
- package/dist/views/MemberStoreNewView.js +26 -14
- package/dist/views/MemberStoreNewView.js.map +1 -1
- package/package.json +6 -5
- package/dist/member/MemberCardList.js +0 -393
- package/dist/member/MemberCardList.js.map +0 -1
- package/dist/member/ShopMemberStorage.js +0 -451
- package/dist/member/ShopMemberStorage.js.map +0 -1
- package/dist/member/memberMenu/bindCard/index.js +0 -295
- package/dist/member/memberMenu/bindCard/index.js.map +0 -1
- package/dist/member/memberMenu/bindCard/style.less +0 -8
- package/dist/member/memberMenuStorage/bindCard/index.js +0 -172
- package/dist/member/memberMenuStorage/bindCard/index.js.map +0 -1
- package/dist/member/memberMenuStorage/bindCard/style.less +0 -8
- package/dist/member/memberMenuStorage/changeMemberCard/index.js +0 -260
- package/dist/member/memberMenuStorage/changeMemberCard/index.js.map +0 -1
- package/dist/member/memberMenuStorage/changeMemberCard/style.less +0 -43
- package/dist/member/memberMenuStorage/index.js +0 -1680
- package/dist/member/memberMenuStorage/index.js.map +0 -1
- package/dist/member/memberMenuStorage/modifyPass/index.js +0 -420
- package/dist/member/memberMenuStorage/modifyPass/index.js.map +0 -1
- package/dist/member/memberMenuStorage/modifyPass/store.js +0 -426
- package/dist/member/memberMenuStorage/modifyPass/store.js.map +0 -1
- package/dist/member/memberMenuStorage/modifyPass/style.less +0 -96
- package/dist/member/memberMenuStorage/style.less +0 -130
- package/dist/member/memberTab/MemberCardInfo.js +0 -89
- package/dist/member/memberTab/MemberCardInfo.js.map +0 -1
- package/dist/member/memberTab/MemberManager.js +0 -640
- package/dist/member/memberTab/MemberManager.js.map +0 -1
- package/dist/member/memberTab/MemberStorage.js +0 -176
- package/dist/member/memberTab/MemberStorage.js.map +0 -1
- package/dist/member/memberTab/index.js +0 -133
- package/dist/member/memberTab/index.js.map +0 -1
package/dist/member/index.js
CHANGED
@@ -109,11 +109,11 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
109
109
|
function MemberTag(props) {
|
110
110
|
(0, _classCallCheck3.default)(this, MemberTag);
|
111
111
|
|
112
|
-
var
|
112
|
+
var _this2 = (0, _possibleConstructorReturn3.default)(this, (MemberTag.__proto__ || (0, _getPrototypeOf2.default)(MemberTag)).call(this, props));
|
113
113
|
|
114
|
-
_initialiseProps.call(
|
114
|
+
_initialiseProps.call(_this2);
|
115
115
|
|
116
|
-
|
116
|
+
_this2.hasElectron = hasElectron;
|
117
117
|
|
118
118
|
var _ref = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
|
119
119
|
isMemberInputType = _ref.isMemberInputType,
|
@@ -122,44 +122,41 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
122
122
|
ICCardServer = _ref.ICCardServer,
|
123
123
|
ICCardPassword = _ref.ICCardPassword;
|
124
124
|
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
125
|
+
_this2.isMemberInputType = parseInt(isMemberInputType); // '0'为不禁用 '1'为禁用
|
126
|
+
_this2.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入,'0'为不禁用 '1'为禁用
|
127
|
+
_this2.openFaceRecognition = parseInt(OpenFaceRecognition); // 启用人脸识别:0禁用 1为启用
|
128
|
+
_this2.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
|
129
|
+
_this2.iCCardPassword = ICCardPassword; //IC卡密码
|
130
|
+
_this2.ms = _api2.default;
|
131
131
|
//移动端环境下,没有读取IC卡的方式。
|
132
132
|
|
133
133
|
var _ref2 = _mutantsUtil.platform || {},
|
134
134
|
isHorizontalPad = _ref2.isHorizontalPad,
|
135
135
|
isHorizontalSunMi = _ref2.isHorizontalSunMi;
|
136
136
|
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
137
|
+
_this2.isHorizontalPad = !!isHorizontalPad;
|
138
|
+
_this2.isHorizontalSunMi = !!isHorizontalSunMi;
|
139
|
+
_this2.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
|
140
|
+
_this2.handleReadICard = _this2.handleReadICard.bind(_this2);
|
141
141
|
|
142
142
|
//记录键盘录入信息的开始时间
|
143
|
-
|
144
|
-
|
143
|
+
_this2.keypressStime = null;
|
144
|
+
_this2.iseyboardKEnter = false; //是否为键盘输入
|
145
145
|
|
146
146
|
var _ref3 = _mutantsUtil.platform || {},
|
147
147
|
isNewRetailBCPos = _ref3.isNewRetailBCPos;
|
148
148
|
|
149
|
-
|
149
|
+
_this2.state = {
|
150
150
|
isCC: !!isNewRetailBCPos,
|
151
151
|
isShowBirthdayTip: false
|
152
152
|
};
|
153
|
-
|
154
|
-
//是否单据模式
|
155
|
-
_this.isVoucherMode = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
|
156
|
-
return _this;
|
153
|
+
return _this2;
|
157
154
|
}
|
158
155
|
|
159
156
|
(0, _createClass3.default)(MemberTag, [{
|
160
157
|
key: 'componentWillReact',
|
161
158
|
value: function componentWillReact() {
|
162
|
-
var
|
159
|
+
var _this3 = this;
|
163
160
|
|
164
161
|
var _ref4 = this.context.viewModel || {},
|
165
162
|
_ref4$data = _ref4.data;
|
@@ -176,8 +173,8 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
176
173
|
var memberChangeData = (0, _keys2.default)(selectMemberInfo).length ? selectMemberInfo : undefined;
|
177
174
|
|
178
175
|
var memberChange = function memberChange(data) {
|
179
|
-
|
180
|
-
|
176
|
+
_this3.setState({ newAvatar: '' });
|
177
|
+
_this3.props.memberChange(data);
|
181
178
|
};
|
182
179
|
if ((typeof memberChangeData === 'undefined' ? 'undefined' : (0, _typeof3.default)(memberChangeData)) === 'object') {
|
183
180
|
var deepCloneMember = JSON.parse((0, _stringify2.default)(memberChangeData));
|
@@ -227,7 +224,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
227
224
|
|
228
225
|
//IC卡连接
|
229
226
|
value: function connectRfCard() {
|
230
|
-
var
|
227
|
+
var _this4 = this;
|
231
228
|
|
232
229
|
//客户端环境下,并开启了启用IC卡。
|
233
230
|
if (this.hasElectron === true && this.iCCardServer === 1) {
|
@@ -238,7 +235,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
238
235
|
} else {
|
239
236
|
result = { connectCardStatus: true, connectCardError: '' };
|
240
237
|
}
|
241
|
-
|
238
|
+
_this4.setState(result);
|
242
239
|
});
|
243
240
|
}
|
244
241
|
}
|
@@ -248,7 +245,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
248
245
|
}, {
|
249
246
|
key: 'readRfCard',
|
250
247
|
value: function readRfCard() {
|
251
|
-
var
|
248
|
+
var _this5 = this;
|
252
249
|
|
253
250
|
//客户端环境下,并开启了启用IC卡。
|
254
251
|
if (this.hasElectron === true && this.iCCardServer === 1) {
|
@@ -265,10 +262,10 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
265
262
|
_mutantsMicrofx.nativeMs.setIpcRendererMethod('ReadRfCard', (0, _extends3.default)({}, params), function (ret) {
|
266
263
|
if (ret.status === 0) {
|
267
264
|
_tplusComponentsTouch.Message.error(ret.value);
|
268
|
-
|
265
|
+
_this5.connectRfCard(); //读取失败后,重新连接一下。
|
269
266
|
return;
|
270
267
|
} else if (ret.status === 1) {
|
271
|
-
|
268
|
+
_this5.searchMember(ret.value);
|
272
269
|
}
|
273
270
|
});
|
274
271
|
}
|
@@ -298,7 +295,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
298
295
|
}, {
|
299
296
|
key: 'render',
|
300
297
|
value: function render() {
|
301
|
-
var
|
298
|
+
var _this6 = this;
|
302
299
|
|
303
300
|
var _state2 = this.state,
|
304
301
|
memberPhoto = _state2.memberPhoto,
|
@@ -372,10 +369,10 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
372
369
|
placeholder: '\u626B\u63CF/\u8F93\u5165\u4F1A\u5458\u53F7',
|
373
370
|
value: searchValue,
|
374
371
|
ref: function ref(el) {
|
375
|
-
return
|
372
|
+
return _this6.inputSearch = el && el.input;
|
376
373
|
},
|
377
374
|
onChange: function onChange(e) {
|
378
|
-
return
|
375
|
+
return _this6.handleSearch(e.target.value);
|
379
376
|
},
|
380
377
|
onFocus: this.handleFocus,
|
381
378
|
onBlur: this.handleBlur,
|
@@ -396,7 +393,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
396
393
|
'div',
|
397
394
|
{ className: 'openFaceRecognition-box' },
|
398
395
|
_react2.default.createElement(_tplusComponentsTouch.Ticon, { className: 'icon', onClick: function onClick() {
|
399
|
-
return
|
396
|
+
return _this6.loadFaceRecognition(2);
|
400
397
|
}, type: 'renlianshibie' }),
|
401
398
|
_react2.default.createElement(_tplusComponentsTouch.Spin, {
|
402
399
|
className: 'face-spin',
|
@@ -408,7 +405,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
408
405
|
|
409
406
|
/* 扫描组件 */
|
410
407
|
this.isHorizontalPad && _react2.default.createElement(_tplusComponentsTouch.Scan, { ref: function ref(scan) {
|
411
|
-
return
|
408
|
+
return _this6.scanObj = scan;
|
412
409
|
}, onChange: this.onScanResult })
|
413
410
|
)
|
414
411
|
),
|
@@ -437,13 +434,13 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
437
434
|
_react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'cuowuda', className: 'cuowudaIcon' })
|
438
435
|
),
|
439
436
|
memberCareInfo && memberCareInfo.isTicket && _react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'cuowuda', onClick: function onClick() {
|
440
|
-
|
437
|
+
_this6.setIsShowBirthdayTip();
|
441
438
|
}, className: 'cuowudaIcon' })
|
442
439
|
),
|
443
440
|
_react2.default.createElement(
|
444
441
|
'div',
|
445
442
|
{ className: 'second member-hotkey-info', onClick: function onClick() {
|
446
|
-
return
|
443
|
+
return _this6.openShowModal(0);
|
447
444
|
} },
|
448
445
|
_react2.default.createElement(
|
449
446
|
'div',
|
@@ -515,7 +512,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
515
512
|
_react2.default.createElement(
|
516
513
|
_button2.default,
|
517
514
|
{ type: 'primary', onClick: function onClick() {
|
518
|
-
return
|
515
|
+
return _this6.loadFaceRecognition(1);
|
519
516
|
}, className: 'btn', disabled: inShopLoading },
|
520
517
|
!inShopLoading && '到店会员',
|
521
518
|
_react2.default.createElement(_tplusComponentsTouch.Spin, {
|
@@ -538,7 +535,6 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
538
535
|
columnInfo: columnInfo,
|
539
536
|
status: status,
|
540
537
|
showModal: memberShow,
|
541
|
-
storeKey: 'memberManager',
|
542
538
|
titleModal: titleModal,
|
543
539
|
selectMemberSuccess: selectMemberSuccess,
|
544
540
|
handleModal: this.handleShowModal
|
@@ -671,7 +667,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
671
667
|
}, _class2.defaultProps = {
|
672
668
|
memberChange: function memberChange() {}
|
673
669
|
}, _initialiseProps = function _initialiseProps() {
|
674
|
-
var
|
670
|
+
var _this7 = this;
|
675
671
|
|
676
672
|
this.state = {
|
677
673
|
searchValue: '',
|
@@ -689,15 +685,15 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
689
685
|
};
|
690
686
|
|
691
687
|
this.controllerEvent = function (methodName, methodArgs) {
|
692
|
-
|
688
|
+
_this7.context.onEvent({ 'controllerEvent': _mutantsAppfx.Action.fromJS(_this7.context.viewModel, methodName) }, 'controllerEvent', methodArgs);
|
693
689
|
};
|
694
690
|
|
695
691
|
this.resetInShopMemberTimer = function (count) {
|
696
|
-
|
692
|
+
_this7.timer && clearTimeout(_this7.timer);
|
697
693
|
if (!count) return;
|
698
694
|
var time = 5 * 60 * 1000;
|
699
|
-
|
700
|
-
|
695
|
+
_this7.timer = setTimeout(function () {
|
696
|
+
_this7.getInStoreMemberCount();
|
701
697
|
}, time);
|
702
698
|
};
|
703
699
|
|
@@ -706,11 +702,11 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
706
702
|
isNewRetailBCPos = _ref7.isNewRetailBCPos;
|
707
703
|
|
708
704
|
if (!isNewRetailBCPos) {
|
709
|
-
if (!
|
705
|
+
if (!_this7.openFaceRecognition) {
|
710
706
|
_tplusComponentsTouch.Message.warn('未启用人脸识别,需要先开启人脸识别功能');
|
711
707
|
return;
|
712
708
|
}
|
713
|
-
|
709
|
+
_this7.setState({
|
714
710
|
memberPhoto: true,
|
715
711
|
titleModal: '选择头像'
|
716
712
|
});
|
@@ -720,31 +716,31 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
720
716
|
this.openShowModal = function (status, res) {
|
721
717
|
var title = '';
|
722
718
|
|
723
|
-
var _ref8 =
|
719
|
+
var _ref8 = _this7.context.viewModel || {},
|
724
720
|
_ref8$data = _ref8.data;
|
725
721
|
|
726
722
|
_ref8$data = _ref8$data === undefined ? {} : _ref8$data;
|
727
723
|
var _ref8$data$Member = _ref8$data.Member,
|
728
724
|
Member = _ref8$data$Member === undefined ? {} : _ref8$data$Member;
|
729
|
-
var newAvatar =
|
725
|
+
var newAvatar = _this7.state.newAvatar;
|
730
726
|
|
731
727
|
var jsMember = (0, _mobx.toJS)(Member);
|
732
728
|
var updateMember = newAvatar ? (0, _extends3.default)({}, jsMember, { ImageFile: newAvatar }) : jsMember;
|
733
729
|
switch (status) {
|
734
730
|
case 0:
|
735
731
|
title = '会员详情';
|
736
|
-
|
732
|
+
_this7.setState({ viewMemberInfo: updateMember });
|
737
733
|
break;
|
738
734
|
case 1:
|
739
735
|
title = '到店会员';
|
740
|
-
|
736
|
+
_this7.setState({ viewMemberInfo: res });
|
741
737
|
break;
|
742
738
|
case 2:
|
743
739
|
title = '人脸识别';
|
744
|
-
|
740
|
+
_this7.setState({ viewMemberInfo: res });
|
745
741
|
break;
|
746
742
|
}
|
747
|
-
|
743
|
+
_this7.setState({
|
748
744
|
status: status,
|
749
745
|
memberShow: true,
|
750
746
|
titleModal: title
|
@@ -752,9 +748,9 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
752
748
|
};
|
753
749
|
|
754
750
|
this.openCloseModal = function () {
|
755
|
-
var setMemberFocus =
|
751
|
+
var setMemberFocus = _this7.props.setMemberFocus;
|
756
752
|
|
757
|
-
var memberStore =
|
753
|
+
var memberStore = _this7.context.viewModel && _this7.context.viewModel.items.find(function (el) {
|
758
754
|
return el.name == 'MemberStore';
|
759
755
|
});
|
760
756
|
var uiState = memberStore.uiState;
|
@@ -768,7 +764,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
768
764
|
title: '关闭会员',
|
769
765
|
content: '' + (IsIntegralExchange ? "关闭会员将会清空商品信息!" : "确定要关闭该会员吗?"),
|
770
766
|
onOk: function onOk() {
|
771
|
-
|
767
|
+
_this7.ms.clearSeletMember();
|
772
768
|
_mutantsMicrofx.stores.selectMemberStore.clearMemberCare();
|
773
769
|
typeof setMemberFocus == 'function' && setMemberFocus();
|
774
770
|
}
|
@@ -776,98 +772,87 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
776
772
|
};
|
777
773
|
|
778
774
|
this.handleCloseBirthdayModal = function () {
|
779
|
-
|
775
|
+
_this7.ms.changeBirthdayShow(false);
|
780
776
|
};
|
781
777
|
|
782
778
|
this.handleMemberCareModal = function () {
|
783
|
-
|
779
|
+
_this7.setState({ isMemberCareModal: true });
|
784
780
|
};
|
785
781
|
|
786
782
|
this.handleMemberCareModalCancel = function () {
|
787
|
-
|
783
|
+
_this7.setState({ isMemberCareModal: false });
|
788
784
|
};
|
789
785
|
|
790
786
|
this.handleSearch = function (val) {
|
791
|
-
|
787
|
+
_this7.setState({ searchValue: val });
|
792
788
|
};
|
793
789
|
|
794
790
|
this.handleFocus = function (el) {
|
795
|
-
if (
|
796
|
-
|
797
|
-
|
798
|
-
|
799
|
-
_this6.handleSearch(value);
|
800
|
-
}, function () {
|
801
|
-
_this6.searchMember(undefined, 'ok');
|
802
|
-
}, _this6.keyboardClose, 'ByMember', _mutantsMicrofx.localStore.get('ByMember'))();
|
803
|
-
} else {
|
804
|
-
_tplusComponentsTouch.Keyboard.open2(function (v) {
|
805
|
-
var value = _tplusComponentsTouch.Keyboard.getNewValue(_this6.inputSearch, _this6.inputSearch.value, v);
|
806
|
-
_this6.handleSearch(value);
|
807
|
-
}, function () {
|
808
|
-
_this6.searchMember(undefined, 'ok');
|
809
|
-
}, _this6.keyboardClose, 'ByMember', _mutantsMicrofx.localStore.get('ByMember'));
|
791
|
+
if (_this7.isMemberInputType) return;
|
792
|
+
var _this = _this7;
|
793
|
+
function cb() {
|
794
|
+
_this.searchMember(undefined, 'ok');
|
810
795
|
}
|
796
|
+
_tplusComponentsTouch.Keyboard.open2(function (v) {
|
797
|
+
var value = _tplusComponentsTouch.Keyboard.getNewValue(_this7.inputSearch, _this7.inputSearch.value, v);
|
798
|
+
_this7.handleSearch(value);
|
799
|
+
}, cb, _this7.keyboardClose, 'ByMember', _mutantsMicrofx.localStore.get('ByMember'));
|
811
800
|
};
|
812
801
|
|
813
802
|
this.keyboardClose = function () {
|
814
|
-
|
803
|
+
_this7.inputSearch.blur();
|
815
804
|
};
|
816
805
|
|
817
806
|
this.handleBlur = function () {
|
818
|
-
|
819
|
-
_tplusComponentsTouch.Keyboard.close();
|
820
|
-
} else {
|
821
|
-
_tplusComponentsTouch.Keyboard.close2();
|
822
|
-
}
|
807
|
+
_tplusComponentsTouch.Keyboard.close2();
|
823
808
|
};
|
824
809
|
|
825
810
|
this.handleReadICard = function () {
|
826
|
-
|
811
|
+
_this7.readRfCard();
|
827
812
|
};
|
828
813
|
|
829
814
|
this.handleShowModal = function (type, params) {
|
830
815
|
if (params) {
|
831
|
-
|
816
|
+
_this7.setState({ dtMember: params, memberShow: type });
|
832
817
|
} else {
|
833
|
-
|
818
|
+
_this7.setState({ memberShow: type });
|
834
819
|
}
|
835
820
|
};
|
836
821
|
|
837
822
|
this.handlePhotoModal = function (type, newAvatar) {
|
838
823
|
if (newAvatar) {
|
839
|
-
|
824
|
+
_this7.setState({
|
840
825
|
newAvatar: newAvatar,
|
841
826
|
memberPhoto: type
|
842
827
|
});
|
843
828
|
} else {
|
844
|
-
|
829
|
+
_this7.setState({ memberPhoto: type });
|
845
830
|
}
|
846
831
|
};
|
847
832
|
|
848
833
|
this.searchMember = function (val, type) {
|
849
834
|
if (!_mutantsMicrofx.stores.offlineSys.shouldInOffline()) return;
|
850
|
-
if (!
|
851
|
-
var searchValue =
|
835
|
+
if (!_this7.ms || _this7.searchLoading) return;
|
836
|
+
var searchValue = _this7.state.searchValue;
|
852
837
|
|
853
838
|
val = val || (searchValue || '').trim();
|
854
839
|
if (!val) return;
|
855
|
-
var _props2 =
|
840
|
+
var _props2 = _this7.props,
|
856
841
|
memberSearched = _props2.memberSearched,
|
857
842
|
selectMemberSuccess = _props2.selectMemberSuccess,
|
858
843
|
setMemberFocus = _props2.setMemberFocus,
|
859
844
|
getMemberBirthday = _props2.getMemberBirthday,
|
860
845
|
getMeStorageCard = _props2.getMeStorageCard;
|
861
846
|
|
862
|
-
|
863
|
-
|
864
|
-
|
847
|
+
_this7.searchLoading = true;
|
848
|
+
_this7.setState({ searchVisible: true });
|
849
|
+
_this7.ms.getSearchMember({
|
865
850
|
currentPage: 1,
|
866
851
|
pageSize: 10,
|
867
852
|
key: val,
|
868
853
|
isSingleMember: false
|
869
854
|
}).then(function (ret) {
|
870
|
-
|
855
|
+
_this7.searchLoading = false;
|
871
856
|
|
872
857
|
var _ref9 = ret || {},
|
873
858
|
columnInfo = _ref9.ColumnInfo,
|
@@ -875,11 +860,11 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
875
860
|
|
876
861
|
var data = JSON.parse(Data) || [];
|
877
862
|
var info = data[0];
|
878
|
-
|
879
|
-
if (info && info.MemberType && info.MemberType.IsStorage &&
|
863
|
+
_this7.setState({ searchVisible: false, columnInfo: columnInfo });
|
864
|
+
if (info && info.MemberType && info.MemberType.IsStorage && _this7.isStorageCardInputType && _this7.iseyboardKEnter) {
|
880
865
|
getMeStorageCard && getMeStorageCard(true);
|
881
|
-
|
882
|
-
|
866
|
+
_this7.handleSearch('');
|
867
|
+
_this7.keypressStime = null;
|
883
868
|
} else {
|
884
869
|
getMeStorageCard && getMeStorageCard(false);
|
885
870
|
}
|
@@ -890,21 +875,20 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
890
875
|
title: '会员管理',
|
891
876
|
key: 'member',
|
892
877
|
onHide: function onHide() {},
|
893
|
-
subKey: 'memberManager',
|
894
878
|
listArr: data
|
895
879
|
});
|
896
|
-
|
880
|
+
_this7.setState({
|
897
881
|
searchValue: null
|
898
882
|
});
|
899
883
|
} else {
|
900
884
|
memberSearched && memberSearched(info, 'searched');
|
901
885
|
(0, _utils.userInfoFormat)(info);
|
902
886
|
if ((0, _utils.errMessageTip)(info)) return;
|
903
|
-
|
887
|
+
_this7.ms.seletMember(info, true);
|
904
888
|
setTimeout(function () {
|
905
|
-
return
|
889
|
+
return _this7.setState({ searchValue: '' });
|
906
890
|
}, 0);
|
907
|
-
|
891
|
+
_this7.handleBlur();
|
908
892
|
selectMemberSuccess && selectMemberSuccess();
|
909
893
|
getMemberBirthday && getMemberBirthday(info.ID, function (result) {
|
910
894
|
_mutantsMicrofx.stores.selectMemberStore.changeMemberCare(result);
|
@@ -913,58 +897,58 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
913
897
|
} else {
|
914
898
|
if (type === 'ok') {
|
915
899
|
_tplusComponentsTouch.Message.warn('会员不存在');
|
916
|
-
if (
|
900
|
+
if (_this7.isMobileEnvironment) {
|
917
901
|
setTimeout(function () {
|
918
|
-
return
|
902
|
+
return _this7.setState({ searchValue: '' });
|
919
903
|
}, 0);
|
920
904
|
}
|
921
905
|
typeof setMemberFocus == 'function' && setMemberFocus();
|
922
906
|
}
|
923
907
|
}
|
924
908
|
}).catch(function (err) {
|
925
|
-
|
926
|
-
|
909
|
+
_this7.setState({ searchVisible: false });
|
910
|
+
_this7.searchLoading = false;
|
927
911
|
memberSearched && memberSearched(undefined, 'err');
|
928
912
|
});
|
929
913
|
};
|
930
914
|
|
931
915
|
this.getInStoreMemberCount = function () {
|
932
|
-
if (!
|
933
|
-
|
916
|
+
if (!_this7.ms) return;
|
917
|
+
_this7.ms.getInStoreMemberCount().then(function (res) {
|
934
918
|
var _ref10 = res || {},
|
935
919
|
_ref10$data = _ref10.data;
|
936
920
|
|
937
921
|
_ref10$data = _ref10$data === undefined ? {} : _ref10$data;
|
938
922
|
var shopPerson = _ref10$data.data;
|
939
923
|
|
940
|
-
|
941
|
-
|
924
|
+
_this7.setState({ shopPerson: shopPerson });
|
925
|
+
_this7.resetInShopMemberTimer(shopPerson);
|
942
926
|
});
|
943
927
|
};
|
944
928
|
|
945
929
|
this.onKeyPressed = function (e) {
|
946
930
|
var keyCode = e && e.keyCode;
|
947
931
|
if (keyCode === 13) {
|
948
|
-
if (
|
949
|
-
var stime =
|
932
|
+
if (_this7.isMemberInputType) {
|
933
|
+
var stime = _this7.keypressStime;
|
950
934
|
var etime = Date.parse(new Date());
|
951
935
|
if (etime - stime > 300) {
|
952
|
-
|
953
|
-
|
936
|
+
_this7.handleSearch('');
|
937
|
+
_this7.keypressStime = null;
|
954
938
|
return _tplusComponentsTouch.Message.warn('未启用键盘录入功能');
|
955
939
|
}
|
956
|
-
|
940
|
+
_this7.keypressStime = null;
|
957
941
|
}
|
958
|
-
|
959
|
-
if (
|
960
|
-
|
942
|
+
_this7.iseyboardKEnter = Date.parse(new Date()) - _this7.keypressStime > 300;
|
943
|
+
if (_this7.isStorageCardInputType) {
|
944
|
+
_this7.keypressStime = null;
|
961
945
|
}
|
962
|
-
if (
|
963
|
-
|
964
|
-
} else if (
|
965
|
-
|
966
|
-
} else if (
|
967
|
-
|
946
|
+
if (_this7.searchLoading) return;
|
947
|
+
_this7.searchMember(undefined, 'ok');
|
948
|
+
} else if (_this7.isMemberInputType && !_this7.keypressStime && !(keyCode == 8)) {
|
949
|
+
_this7.keypressStime = Date.parse(new Date());
|
950
|
+
} else if (_this7.isStorageCardInputType && !_this7.keypressStime && !(keyCode == 8) && !_this7.isMemberInputType) {
|
951
|
+
_this7.keypressStime = Date.parse(new Date());
|
968
952
|
}
|
969
953
|
};
|
970
954
|
|
@@ -992,35 +976,35 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
|
|
992
976
|
|
993
977
|
this.loadFaceRecognition = function (type) {
|
994
978
|
// type = 1:到店会员 type = 2:POS机人脸识别
|
995
|
-
|
996
|
-
|
997
|
-
|
979
|
+
_this7.setState({ faceLoading: type === 2, inShopLoading: type === 1 });
|
980
|
+
_this7.ms.loadInStoreMember(String(type)).then(function (res) {
|
981
|
+
_this7.setState({ faceLoading: false, inShopLoading: false });
|
998
982
|
|
999
983
|
var _ref12 = res || {},
|
1000
984
|
Data = _ref12.Data;
|
1001
985
|
|
1002
986
|
if (!JSON.parse(Data).length) {
|
1003
987
|
var tipMessage = ['当前没有到店会员', '未识别到人脸信息'];
|
1004
|
-
type === 1 &&
|
988
|
+
type === 1 && _this7.setState({ shopPerson: 0 });
|
1005
989
|
return _tplusComponentsTouch.Message.info(tipMessage[type - 1]);
|
1006
990
|
}
|
1007
|
-
type === 1 &&
|
1008
|
-
|
991
|
+
type === 1 && _this7.getInStoreMemberCount();
|
992
|
+
_this7.openShowModal(type, res);
|
1009
993
|
}).catch(function (err) {
|
1010
|
-
|
994
|
+
_this7.setState({ faceLoading: false, inShopLoading: false });
|
1011
995
|
console.log(err);
|
1012
996
|
});
|
1013
997
|
};
|
1014
998
|
|
1015
999
|
this.changeScanProduct = function () {
|
1016
|
-
if (
|
1000
|
+
if (_this7.scanObj) _this7.scanObj.startScan();
|
1017
1001
|
};
|
1018
1002
|
|
1019
1003
|
this.onScanResult = function (res) {
|
1020
|
-
|
1004
|
+
_this7.setState({
|
1021
1005
|
searchValue: res
|
1022
1006
|
}, function () {
|
1023
|
-
|
1007
|
+
_this7.onKeyPressed({ keyCode: 13 });
|
1024
1008
|
});
|
1025
1009
|
};
|
1026
1010
|
|