tplus-member 3.36.1 → 3.38.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (138) hide show
  1. package/dist/api.js +5 -5
  2. package/dist/api.js.map +1 -1
  3. package/dist/controllers/FeedbackController.js.map +1 -1
  4. package/dist/controllers/MemberOrderController.js +12 -12
  5. package/dist/controllers/MemberOrderController.js.map +1 -1
  6. package/dist/controllers/OpenCardController.js +7 -7
  7. package/dist/controllers/OpenCardController.js.map +1 -1
  8. package/dist/controllers/defaultConfig.js.map +1 -1
  9. package/dist/dataProvider/member.js +7 -7
  10. package/dist/dataProvider/member.js.map +1 -1
  11. package/dist/dataProvider/openCard.js.map +1 -1
  12. package/dist/domain/member/AuthProcess.js.map +1 -1
  13. package/dist/domain/member/CardCodeChangedProcessor.js +2 -2
  14. package/dist/domain/member/CardCodeChangedProcessor.js.map +1 -1
  15. package/dist/domain/member/CheckCardCodeAndCodeProcessor.js +2 -2
  16. package/dist/domain/member/CheckCardCodeAndCodeProcessor.js.map +1 -1
  17. package/dist/domain/member/CheckMobilephoneFormatProcessor.js +2 -2
  18. package/dist/domain/member/CheckMobilephoneFormatProcessor.js.map +1 -1
  19. package/dist/domain/member/CheckPresentAmountProcessor.js +2 -2
  20. package/dist/domain/member/CheckPresentAmountProcessor.js.map +1 -1
  21. package/dist/domain/member/EffectiveDateChangedProcessor.js +2 -2
  22. package/dist/domain/member/EffectiveDateChangedProcessor.js.map +1 -1
  23. package/dist/domain/member/GetThisPresentAmountProcessor.js +2 -2
  24. package/dist/domain/member/GetThisPresentAmountProcessor.js.map +1 -1
  25. package/dist/domain/member/InitDataProcessor.js +123 -123
  26. package/dist/domain/member/InitDataProcessor.js.map +1 -1
  27. package/dist/domain/member/IsMemberEffectiveProcessor.js +2 -2
  28. package/dist/domain/member/IsMemberEffectiveProcessor.js.map +1 -1
  29. package/dist/domain/member/IsMemberEnableProcessor.js +2 -2
  30. package/dist/domain/member/IsMemberEnableProcessor.js.map +1 -1
  31. package/dist/domain/member/IsMemberExpirationProcessor.js +2 -2
  32. package/dist/domain/member/IsMemberExpirationProcessor.js.map +1 -1
  33. package/dist/domain/member/IsMemberPasswordSameProcessor.js +2 -2
  34. package/dist/domain/member/IsMemberPasswordSameProcessor.js.map +1 -1
  35. package/dist/domain/member/IsMemberStorageForStoreProcessor.js +3 -3
  36. package/dist/domain/member/IsMemberStorageForStoreProcessor.js.map +1 -1
  37. package/dist/domain/member/MemberTypeChangedProcessor.js +4 -4
  38. package/dist/domain/member/MemberTypeChangedProcessor.js.map +1 -1
  39. package/dist/domain/member/MobilephoneChangedProcessor.js +4 -4
  40. package/dist/domain/member/MobilephoneChangedProcessor.js.map +1 -1
  41. package/dist/domain/member/PersonProcesser.js.map +1 -1
  42. package/dist/domain/member/PriuserdefChangedProcessor.js +2 -2
  43. package/dist/domain/member/PriuserdefChangedProcessor.js.map +1 -1
  44. package/dist/domain/operationLog/AddLogProcessor.js +6 -6
  45. package/dist/domain/operationLog/AddLogProcessor.js.map +1 -1
  46. package/dist/domain/operationLog/OperationConfig.js.map +1 -1
  47. package/dist/domain/operationLog/OperationLog.js.map +1 -1
  48. package/dist/index.js +6 -1
  49. package/dist/index.js.map +1 -1
  50. package/dist/member/MemberCardList.js +393 -0
  51. package/dist/member/MemberCardList.js.map +1 -0
  52. package/dist/member/MemberPhoto.js.map +1 -1
  53. package/dist/member/MemberShow.js +3 -1
  54. package/dist/member/MemberShow.js.map +1 -1
  55. package/dist/member/ShopMember.js +274 -268
  56. package/dist/member/ShopMember.js.map +1 -1
  57. package/dist/member/ShopMember.less +636 -531
  58. package/dist/member/ShopMemberStorage.js +451 -0
  59. package/dist/member/ShopMemberStorage.js.map +1 -0
  60. package/dist/member/api.js +277 -42
  61. package/dist/member/api.js.map +1 -1
  62. package/dist/member/color.less +31 -31
  63. package/dist/member/index.js +142 -121
  64. package/dist/member/index.js.map +1 -1
  65. package/dist/member/index.less +570 -570
  66. package/dist/member/memberMenu/bindCard/index.js +295 -0
  67. package/dist/member/memberMenu/bindCard/index.js.map +1 -0
  68. package/dist/member/memberMenu/bindCard/style.less +8 -0
  69. package/dist/member/memberMenu/changeMemberCard/index.js.map +1 -1
  70. package/dist/member/memberMenu/changeMemberCard/style.less +42 -42
  71. package/dist/member/memberMenu/index.js +504 -345
  72. package/dist/member/memberMenu/index.js.map +1 -1
  73. package/dist/member/memberMenu/modifyPass/index.js +0 -2
  74. package/dist/member/memberMenu/modifyPass/index.js.map +1 -1
  75. package/dist/member/memberMenu/modifyPass/store.js.map +1 -1
  76. package/dist/member/memberMenu/modifyPass/style.less +96 -96
  77. package/dist/member/memberMenu/style.less +128 -85
  78. package/dist/member/memberMenuStorage/bindCard/index.js +172 -0
  79. package/dist/member/memberMenuStorage/bindCard/index.js.map +1 -0
  80. package/dist/member/memberMenuStorage/bindCard/style.less +8 -0
  81. package/dist/member/memberMenuStorage/changeMemberCard/index.js +260 -0
  82. package/dist/member/memberMenuStorage/changeMemberCard/index.js.map +1 -0
  83. package/dist/member/memberMenuStorage/changeMemberCard/style.less +43 -0
  84. package/dist/member/memberMenuStorage/index.js +1807 -0
  85. package/dist/member/memberMenuStorage/index.js.map +1 -0
  86. package/dist/member/memberMenuStorage/modifyPass/index.js +420 -0
  87. package/dist/member/memberMenuStorage/modifyPass/index.js.map +1 -0
  88. package/dist/member/memberMenuStorage/modifyPass/store.js +426 -0
  89. package/dist/member/memberMenuStorage/modifyPass/store.js.map +1 -0
  90. package/dist/member/memberMenuStorage/modifyPass/style.less +96 -0
  91. package/dist/member/memberMenuStorage/style.less +130 -0
  92. package/dist/member/memberTab/MemberCardInfo.js +89 -0
  93. package/dist/member/memberTab/MemberCardInfo.js.map +1 -0
  94. package/dist/member/memberTab/MemberManager.js +640 -0
  95. package/dist/member/memberTab/MemberManager.js.map +1 -0
  96. package/dist/member/memberTab/MemberStorage.js +176 -0
  97. package/dist/member/memberTab/MemberStorage.js.map +1 -0
  98. package/dist/member/memberTab/index.js +133 -0
  99. package/dist/member/memberTab/index.js.map +1 -0
  100. package/dist/member/memberTab.js +58 -11
  101. package/dist/member/memberTab.js.map +1 -1
  102. package/dist/socket.js +13 -13
  103. package/dist/socket.js.map +1 -1
  104. package/dist/stores/MemberStore.js +87 -5
  105. package/dist/stores/MemberStore.js.map +1 -1
  106. package/dist/stores/index.js.map +1 -1
  107. package/dist/utils.js +15 -1
  108. package/dist/utils.js.map +1 -1
  109. package/dist/viewController/MemberOrderViewController.js.map +1 -1
  110. package/dist/viewDoMain/CheckMemberProcessorBlock.js +2 -2
  111. package/dist/viewDoMain/CheckMemberProcessorBlock.js.map +1 -1
  112. package/dist/viewDoMain/CheckMemberStorageProcessorBlock.js +2 -2
  113. package/dist/viewDoMain/CheckMemberStorageProcessorBlock.js.map +1 -1
  114. package/dist/viewDoMain/CheckSelectMemberProcessorBlock.js +2 -2
  115. package/dist/viewDoMain/CheckSelectMemberProcessorBlock.js.map +1 -1
  116. package/dist/viewDoMain/CheckUpdatePasswordProcessorBlock.js.map +1 -1
  117. package/dist/viewDoMain/MemberDataChangedProcessorBlock.js +2 -2
  118. package/dist/viewDoMain/MemberDataChangedProcessorBlock.js.map +1 -1
  119. package/dist/viewDoMain/MemberDataPreSaveProcessorBlock.js +2 -2
  120. package/dist/viewDoMain/MemberDataPreSaveProcessorBlock.js.map +1 -1
  121. package/dist/viewDoMain/StorageAmountChangedProcessorBlock.js +3 -2
  122. package/dist/viewDoMain/StorageAmountChangedProcessorBlock.js.map +1 -1
  123. package/dist/viewModels/memberVoucher.js +3 -3
  124. package/dist/viewModels/memberVoucher.js.map +1 -1
  125. package/dist/views/MemberOrderView.js +6 -6
  126. package/dist/views/MemberOrderView.js.map +1 -1
  127. package/dist/views/MemberStore.less +143 -143
  128. package/dist/views/MemberStoreNew.less +228 -230
  129. package/dist/views/MemberStoreNewView.js +14 -26
  130. package/dist/views/MemberStoreNewView.js.map +1 -1
  131. package/dist/views/MemberStoreView.js.map +1 -1
  132. package/dist/views/MemberStoreViewContainer.js.map +1 -1
  133. package/dist/views/PresentDetail.less +118 -118
  134. package/dist/views/PresetDetailView.js.map +1 -1
  135. package/dist/views/memberOrder.less +54 -54
  136. package/locales/zh/tplus-portsetting.json +1 -1
  137. package/locales/zh-CN/tplus-portsetting.json +1 -1
  138. package/package.json +6 -7
@@ -48,10 +48,10 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
48
48
 
49
49
  var _inherits3 = _interopRequireDefault(_inherits2);
50
50
 
51
- var _class, _class2, _temp, _initialiseProps; /**
52
- * @memberChange member 状态发生变化时的回调
53
- * @memberSearched 录入框会员状态发生变化时的回调 memberSearched(value, type) // type: searched 触发搜索 | err 搜索接口错误 | close 关闭会员
54
- *
51
+ var _class, _class2, _temp, _initialiseProps; /**
52
+ * @memberChange member 状态发生变化时的回调
53
+ * @memberSearched 录入框会员状态发生变化时的回调 memberSearched(value, type) // type: searched 触发搜索 | err 搜索接口错误 | close 关闭会员
54
+ *
55
55
  */
56
56
 
57
57
 
@@ -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 _this2 = (0, _possibleConstructorReturn3.default)(this, (MemberTag.__proto__ || (0, _getPrototypeOf2.default)(MemberTag)).call(this, props));
112
+ var _this = (0, _possibleConstructorReturn3.default)(this, (MemberTag.__proto__ || (0, _getPrototypeOf2.default)(MemberTag)).call(this, props));
113
113
 
114
- _initialiseProps.call(_this2);
114
+ _initialiseProps.call(_this);
115
115
 
116
- _this2.hasElectron = hasElectron;
116
+ _this.hasElectron = hasElectron;
117
117
 
118
118
  var _ref = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
119
119
  isMemberInputType = _ref.isMemberInputType,
@@ -122,41 +122,44 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
122
122
  ICCardServer = _ref.ICCardServer,
123
123
  ICCardPassword = _ref.ICCardPassword;
124
124
 
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;
125
+ _this.isMemberInputType = parseInt(isMemberInputType); // '0'为不禁用 '1'为禁用
126
+ _this.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入,'0'为不禁用 '1'为禁用
127
+ _this.openFaceRecognition = parseInt(OpenFaceRecognition); // 启用人脸识别:0禁用 1为启用
128
+ _this.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
129
+ _this.iCCardPassword = ICCardPassword; //IC卡密码
130
+ _this.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
- _this2.isHorizontalPad = !!isHorizontalPad;
138
- _this2.isHorizontalSunMi = !!isHorizontalSunMi;
139
- _this2.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
140
- _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
137
+ _this.isHorizontalPad = !!isHorizontalPad;
138
+ _this.isHorizontalSunMi = !!isHorizontalSunMi;
139
+ _this.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
140
+ _this.handleReadICard = _this.handleReadICard.bind(_this);
141
141
 
142
142
  //记录键盘录入信息的开始时间
143
- _this2.keypressStime = null;
144
- _this2.iseyboardKEnter = false; //是否为键盘输入
143
+ _this.keypressStime = null;
144
+ _this.iseyboardKEnter = false; //是否为键盘输入
145
145
 
146
146
  var _ref3 = _mutantsUtil.platform || {},
147
147
  isNewRetailBCPos = _ref3.isNewRetailBCPos;
148
148
 
149
- _this2.state = {
149
+ _this.state = {
150
150
  isCC: !!isNewRetailBCPos,
151
151
  isShowBirthdayTip: false
152
152
  };
153
- return _this2;
153
+
154
+ //是否单据模式
155
+ _this.isVoucherMode = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
156
+ return _this;
154
157
  }
155
158
 
156
159
  (0, _createClass3.default)(MemberTag, [{
157
160
  key: 'componentWillReact',
158
161
  value: function componentWillReact() {
159
- var _this3 = this;
162
+ var _this2 = this;
160
163
 
161
164
  var _ref4 = this.context.viewModel || {},
162
165
  _ref4$data = _ref4.data;
@@ -171,10 +174,15 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
171
174
  isClear = _ms$isClear === undefined ? false : _ms$isClear;
172
175
 
173
176
  var memberChangeData = (0, _keys2.default)(selectMemberInfo).length ? selectMemberInfo : undefined;
174
-
177
+ // 有会员的话清空搜索框文本
178
+ if (dtMember.ID && this.state.searchValue) {
179
+ this.setState({
180
+ searchValue: ''
181
+ });
182
+ }
175
183
  var memberChange = function memberChange(data) {
176
- _this3.setState({ newAvatar: '' });
177
- _this3.props.memberChange(data);
184
+ _this2.setState({ newAvatar: '' });
185
+ _this2.props.memberChange(data);
178
186
  };
179
187
  if ((typeof memberChangeData === 'undefined' ? 'undefined' : (0, _typeof3.default)(memberChangeData)) === 'object') {
180
188
  var deepCloneMember = JSON.parse((0, _stringify2.default)(memberChangeData));
@@ -224,7 +232,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
224
232
 
225
233
  //IC卡连接
226
234
  value: function connectRfCard() {
227
- var _this4 = this;
235
+ var _this3 = this;
228
236
 
229
237
  //客户端环境下,并开启了启用IC卡。
230
238
  if (this.hasElectron === true && this.iCCardServer === 1) {
@@ -235,7 +243,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
235
243
  } else {
236
244
  result = { connectCardStatus: true, connectCardError: '' };
237
245
  }
238
- _this4.setState(result);
246
+ _this3.setState(result);
239
247
  });
240
248
  }
241
249
  }
@@ -245,7 +253,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
245
253
  }, {
246
254
  key: 'readRfCard',
247
255
  value: function readRfCard() {
248
- var _this5 = this;
256
+ var _this4 = this;
249
257
 
250
258
  //客户端环境下,并开启了启用IC卡。
251
259
  if (this.hasElectron === true && this.iCCardServer === 1) {
@@ -262,10 +270,10 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
262
270
  _mutantsMicrofx.nativeMs.setIpcRendererMethod('ReadRfCard', (0, _extends3.default)({}, params), function (ret) {
263
271
  if (ret.status === 0) {
264
272
  _tplusComponentsTouch.Message.error(ret.value);
265
- _this5.connectRfCard(); //读取失败后,重新连接一下。
273
+ _this4.connectRfCard(); //读取失败后,重新连接一下。
266
274
  return;
267
275
  } else if (ret.status === 1) {
268
- _this5.searchMember(ret.value);
276
+ _this4.searchMember(ret.value);
269
277
  }
270
278
  });
271
279
  }
@@ -295,7 +303,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
295
303
  }, {
296
304
  key: 'render',
297
305
  value: function render() {
298
- var _this6 = this;
306
+ var _this5 = this;
299
307
 
300
308
  var _state2 = this.state,
301
309
  memberPhoto = _state2.memberPhoto,
@@ -369,10 +377,10 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
369
377
  placeholder: '\u626B\u63CF/\u8F93\u5165\u4F1A\u5458\u53F7',
370
378
  value: searchValue,
371
379
  ref: function ref(el) {
372
- return _this6.inputSearch = el && el.input;
380
+ return _this5.inputSearch = el && el.input;
373
381
  },
374
382
  onChange: function onChange(e) {
375
- return _this6.handleSearch(e.target.value);
383
+ return _this5.handleSearch(e.target.value);
376
384
  },
377
385
  onFocus: this.handleFocus,
378
386
  onBlur: this.handleBlur,
@@ -393,7 +401,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
393
401
  'div',
394
402
  { className: 'openFaceRecognition-box' },
395
403
  _react2.default.createElement(_tplusComponentsTouch.Ticon, { className: 'icon', onClick: function onClick() {
396
- return _this6.loadFaceRecognition(2);
404
+ return _this5.loadFaceRecognition(2);
397
405
  }, type: 'renlianshibie' }),
398
406
  _react2.default.createElement(_tplusComponentsTouch.Spin, {
399
407
  className: 'face-spin',
@@ -405,7 +413,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
405
413
 
406
414
  /* 扫描组件 */
407
415
  this.isHorizontalPad && _react2.default.createElement(_tplusComponentsTouch.Scan, { ref: function ref(scan) {
408
- return _this6.scanObj = scan;
416
+ return _this5.scanObj = scan;
409
417
  }, onChange: this.onScanResult })
410
418
  )
411
419
  ),
@@ -434,13 +442,13 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
434
442
  _react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'cuowuda', className: 'cuowudaIcon' })
435
443
  ),
436
444
  memberCareInfo && memberCareInfo.isTicket && _react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'cuowuda', onClick: function onClick() {
437
- _this6.setIsShowBirthdayTip();
445
+ _this5.setIsShowBirthdayTip();
438
446
  }, className: 'cuowudaIcon' })
439
447
  ),
440
448
  _react2.default.createElement(
441
449
  'div',
442
450
  { className: 'second member-hotkey-info', onClick: function onClick() {
443
- return _this6.openShowModal(0);
451
+ return _this5.openShowModal(0);
444
452
  } },
445
453
  _react2.default.createElement(
446
454
  'div',
@@ -512,7 +520,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
512
520
  _react2.default.createElement(
513
521
  _button2.default,
514
522
  { type: 'primary', onClick: function onClick() {
515
- return _this6.loadFaceRecognition(1);
523
+ return _this5.loadFaceRecognition(1);
516
524
  }, className: 'btn', disabled: inShopLoading },
517
525
  !inShopLoading && '到店会员',
518
526
  _react2.default.createElement(_tplusComponentsTouch.Spin, {
@@ -535,6 +543,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
535
543
  columnInfo: columnInfo,
536
544
  status: status,
537
545
  showModal: memberShow,
546
+ storeKey: 'memberManager',
538
547
  titleModal: titleModal,
539
548
  selectMemberSuccess: selectMemberSuccess,
540
549
  handleModal: this.handleShowModal
@@ -667,7 +676,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
667
676
  }, _class2.defaultProps = {
668
677
  memberChange: function memberChange() {}
669
678
  }, _initialiseProps = function _initialiseProps() {
670
- var _this7 = this;
679
+ var _this6 = this;
671
680
 
672
681
  this.state = {
673
682
  searchValue: '',
@@ -685,15 +694,15 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
685
694
  };
686
695
 
687
696
  this.controllerEvent = function (methodName, methodArgs) {
688
- _this7.context.onEvent({ 'controllerEvent': _mutantsAppfx.Action.fromJS(_this7.context.viewModel, methodName) }, 'controllerEvent', methodArgs);
697
+ _this6.context.onEvent({ 'controllerEvent': _mutantsAppfx.Action.fromJS(_this6.context.viewModel, methodName) }, 'controllerEvent', methodArgs);
689
698
  };
690
699
 
691
700
  this.resetInShopMemberTimer = function (count) {
692
- _this7.timer && clearTimeout(_this7.timer);
701
+ _this6.timer && clearTimeout(_this6.timer);
693
702
  if (!count) return;
694
703
  var time = 5 * 60 * 1000;
695
- _this7.timer = setTimeout(function () {
696
- _this7.getInStoreMemberCount();
704
+ _this6.timer = setTimeout(function () {
705
+ _this6.getInStoreMemberCount();
697
706
  }, time);
698
707
  };
699
708
 
@@ -702,11 +711,11 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
702
711
  isNewRetailBCPos = _ref7.isNewRetailBCPos;
703
712
 
704
713
  if (!isNewRetailBCPos) {
705
- if (!_this7.openFaceRecognition) {
714
+ if (!_this6.openFaceRecognition) {
706
715
  _tplusComponentsTouch.Message.warn('未启用人脸识别,需要先开启人脸识别功能');
707
716
  return;
708
717
  }
709
- _this7.setState({
718
+ _this6.setState({
710
719
  memberPhoto: true,
711
720
  titleModal: '选择头像'
712
721
  });
@@ -716,31 +725,31 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
716
725
  this.openShowModal = function (status, res) {
717
726
  var title = '';
718
727
 
719
- var _ref8 = _this7.context.viewModel || {},
728
+ var _ref8 = _this6.context.viewModel || {},
720
729
  _ref8$data = _ref8.data;
721
730
 
722
731
  _ref8$data = _ref8$data === undefined ? {} : _ref8$data;
723
732
  var _ref8$data$Member = _ref8$data.Member,
724
733
  Member = _ref8$data$Member === undefined ? {} : _ref8$data$Member;
725
- var newAvatar = _this7.state.newAvatar;
734
+ var newAvatar = _this6.state.newAvatar;
726
735
 
727
736
  var jsMember = (0, _mobx.toJS)(Member);
728
737
  var updateMember = newAvatar ? (0, _extends3.default)({}, jsMember, { ImageFile: newAvatar }) : jsMember;
729
738
  switch (status) {
730
739
  case 0:
731
740
  title = '会员详情';
732
- _this7.setState({ viewMemberInfo: updateMember });
741
+ _this6.setState({ viewMemberInfo: updateMember });
733
742
  break;
734
743
  case 1:
735
744
  title = '到店会员';
736
- _this7.setState({ viewMemberInfo: res });
745
+ _this6.setState({ viewMemberInfo: res });
737
746
  break;
738
747
  case 2:
739
748
  title = '人脸识别';
740
- _this7.setState({ viewMemberInfo: res });
749
+ _this6.setState({ viewMemberInfo: res });
741
750
  break;
742
751
  }
743
- _this7.setState({
752
+ _this6.setState({
744
753
  status: status,
745
754
  memberShow: true,
746
755
  titleModal: title
@@ -748,9 +757,9 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
748
757
  };
749
758
 
750
759
  this.openCloseModal = function () {
751
- var setMemberFocus = _this7.props.setMemberFocus;
760
+ var setMemberFocus = _this6.props.setMemberFocus;
752
761
 
753
- var memberStore = _this7.context.viewModel && _this7.context.viewModel.items.find(function (el) {
762
+ var memberStore = _this6.context.viewModel && _this6.context.viewModel.items.find(function (el) {
754
763
  return el.name == 'MemberStore';
755
764
  });
756
765
  var uiState = memberStore.uiState;
@@ -764,7 +773,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
764
773
  title: '关闭会员',
765
774
  content: '' + (IsIntegralExchange ? "关闭会员将会清空商品信息!" : "确定要关闭该会员吗?"),
766
775
  onOk: function onOk() {
767
- _this7.ms.clearSeletMember();
776
+ _this6.ms.clearSeletMember();
768
777
  _mutantsMicrofx.stores.selectMemberStore.clearMemberCare();
769
778
  typeof setMemberFocus == 'function' && setMemberFocus();
770
779
  }
@@ -772,87 +781,98 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
772
781
  };
773
782
 
774
783
  this.handleCloseBirthdayModal = function () {
775
- _this7.ms.changeBirthdayShow(false);
784
+ _this6.ms.changeBirthdayShow(false);
776
785
  };
777
786
 
778
787
  this.handleMemberCareModal = function () {
779
- _this7.setState({ isMemberCareModal: true });
788
+ _this6.setState({ isMemberCareModal: true });
780
789
  };
781
790
 
782
791
  this.handleMemberCareModalCancel = function () {
783
- _this7.setState({ isMemberCareModal: false });
792
+ _this6.setState({ isMemberCareModal: false });
784
793
  };
785
794
 
786
795
  this.handleSearch = function (val) {
787
- _this7.setState({ searchValue: val });
796
+ _this6.setState({ searchValue: val });
788
797
  };
789
798
 
790
799
  this.handleFocus = function (el) {
791
- if (_this7.isMemberInputType) return;
792
- var _this = _this7;
793
- function cb() {
794
- _this.searchMember(undefined, 'ok');
800
+ if (_this6.isMemberInputType) return;
801
+ if (_this6.isVoucherMode) {
802
+ _tplusComponentsTouch.Keyboard.open(function (v) {
803
+ var value = _tplusComponentsTouch.Keyboard.getNewValue(_this6.inputSearch, _this6.inputSearch.value, v);
804
+ _this6.handleSearch(value);
805
+ }, function () {
806
+ _this6.searchMember(undefined, 'ok');
807
+ }, _this6.keyboardClose, 'ByMember', _mutantsMicrofx.localStore.get('ByMember'))();
808
+ } else {
809
+ _tplusComponentsTouch.Keyboard.open2(function (v) {
810
+ var value = _tplusComponentsTouch.Keyboard.getNewValue(_this6.inputSearch, _this6.inputSearch.value, v);
811
+ _this6.handleSearch(value);
812
+ }, function () {
813
+ _this6.searchMember(undefined, 'ok');
814
+ }, _this6.keyboardClose, 'ByMember', _mutantsMicrofx.localStore.get('ByMember'));
795
815
  }
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'));
800
816
  };
801
817
 
802
818
  this.keyboardClose = function () {
803
- _this7.inputSearch.blur();
819
+ _this6.inputSearch.blur();
804
820
  };
805
821
 
806
822
  this.handleBlur = function () {
807
- _tplusComponentsTouch.Keyboard.close2();
823
+ if (_this6.isVoucherMode) {
824
+ _tplusComponentsTouch.Keyboard.close();
825
+ } else {
826
+ _tplusComponentsTouch.Keyboard.close2();
827
+ }
808
828
  };
809
829
 
810
830
  this.handleReadICard = function () {
811
- _this7.readRfCard();
831
+ _this6.readRfCard();
812
832
  };
813
833
 
814
834
  this.handleShowModal = function (type, params) {
815
835
  if (params) {
816
- _this7.setState({ dtMember: params, memberShow: type });
836
+ _this6.setState({ dtMember: params, memberShow: type });
817
837
  } else {
818
- _this7.setState({ memberShow: type });
838
+ _this6.setState({ memberShow: type });
819
839
  }
820
840
  };
821
841
 
822
842
  this.handlePhotoModal = function (type, newAvatar) {
823
843
  if (newAvatar) {
824
- _this7.setState({
844
+ _this6.setState({
825
845
  newAvatar: newAvatar,
826
846
  memberPhoto: type
827
847
  });
828
848
  } else {
829
- _this7.setState({ memberPhoto: type });
849
+ _this6.setState({ memberPhoto: type });
830
850
  }
831
851
  };
832
852
 
833
853
  this.searchMember = function (val, type) {
834
854
  if (!_mutantsMicrofx.stores.offlineSys.shouldInOffline()) return;
835
- if (!_this7.ms || _this7.searchLoading) return;
836
- var searchValue = _this7.state.searchValue;
855
+ if (!_this6.ms || _this6.searchLoading) return;
856
+ var searchValue = _this6.state.searchValue;
837
857
 
838
858
  val = val || (searchValue || '').trim();
839
859
  if (!val) return;
840
- var _props2 = _this7.props,
860
+ var _props2 = _this6.props,
841
861
  memberSearched = _props2.memberSearched,
842
862
  selectMemberSuccess = _props2.selectMemberSuccess,
843
863
  setMemberFocus = _props2.setMemberFocus,
844
864
  getMemberBirthday = _props2.getMemberBirthday,
845
865
  getMeStorageCard = _props2.getMeStorageCard;
846
866
 
847
- _this7.searchLoading = true;
848
- _this7.setState({ searchVisible: true });
849
- _this7.ms.getSearchMember({
867
+ _this6.searchLoading = true;
868
+ _this6.setState({ searchVisible: true });
869
+ _this6.ms.getSearchMember({
850
870
  currentPage: 1,
851
871
  pageSize: 10,
852
872
  key: val,
853
- isSingleMember: false
873
+ isSingleMember: true
854
874
  }).then(function (ret) {
855
- _this7.searchLoading = false;
875
+ _this6.searchLoading = false;
856
876
 
857
877
  var _ref9 = ret || {},
858
878
  columnInfo = _ref9.ColumnInfo,
@@ -860,11 +880,11 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
860
880
 
861
881
  var data = JSON.parse(Data) || [];
862
882
  var info = data[0];
863
- _this7.setState({ searchVisible: false, columnInfo: columnInfo });
864
- if (info && info.MemberType && info.MemberType.IsStorage && _this7.isStorageCardInputType && _this7.iseyboardKEnter) {
883
+ _this6.setState({ searchVisible: false, columnInfo: columnInfo });
884
+ if (info && info.MemberType && info.MemberType.IsStorage && _this6.isStorageCardInputType && _this6.iseyboardKEnter) {
865
885
  getMeStorageCard && getMeStorageCard(true);
866
- _this7.handleSearch('');
867
- _this7.keypressStime = null;
886
+ _this6.handleSearch('');
887
+ _this6.keypressStime = null;
868
888
  } else {
869
889
  getMeStorageCard && getMeStorageCard(false);
870
890
  }
@@ -875,20 +895,21 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
875
895
  title: '会员管理',
876
896
  key: 'member',
877
897
  onHide: function onHide() {},
898
+ subKey: 'memberManager',
878
899
  listArr: data
879
900
  });
880
- _this7.setState({
901
+ _this6.setState({
881
902
  searchValue: null
882
903
  });
883
904
  } else {
884
905
  memberSearched && memberSearched(info, 'searched');
885
906
  (0, _utils.userInfoFormat)(info);
886
907
  if ((0, _utils.errMessageTip)(info)) return;
887
- _this7.ms.seletMember(info, true);
908
+ _this6.ms.seletMember(info, true);
888
909
  setTimeout(function () {
889
- return _this7.setState({ searchValue: '' });
910
+ return _this6.setState({ searchValue: '' });
890
911
  }, 0);
891
- _this7.handleBlur();
912
+ _this6.handleBlur();
892
913
  selectMemberSuccess && selectMemberSuccess();
893
914
  getMemberBirthday && getMemberBirthday(info.ID, function (result) {
894
915
  _mutantsMicrofx.stores.selectMemberStore.changeMemberCare(result);
@@ -897,58 +918,58 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
897
918
  } else {
898
919
  if (type === 'ok') {
899
920
  _tplusComponentsTouch.Message.warn('会员不存在');
900
- if (_this7.isMobileEnvironment) {
921
+ if (_this6.isMobileEnvironment) {
901
922
  setTimeout(function () {
902
- return _this7.setState({ searchValue: '' });
923
+ return _this6.setState({ searchValue: '' });
903
924
  }, 0);
904
925
  }
905
926
  typeof setMemberFocus == 'function' && setMemberFocus();
906
927
  }
907
928
  }
908
929
  }).catch(function (err) {
909
- _this7.setState({ searchVisible: false });
910
- _this7.searchLoading = false;
930
+ _this6.setState({ searchVisible: false });
931
+ _this6.searchLoading = false;
911
932
  memberSearched && memberSearched(undefined, 'err');
912
933
  });
913
934
  };
914
935
 
915
936
  this.getInStoreMemberCount = function () {
916
- if (!_this7.ms) return;
917
- _this7.ms.getInStoreMemberCount().then(function (res) {
937
+ if (!_this6.ms) return;
938
+ _this6.ms.getInStoreMemberCount().then(function (res) {
918
939
  var _ref10 = res || {},
919
940
  _ref10$data = _ref10.data;
920
941
 
921
942
  _ref10$data = _ref10$data === undefined ? {} : _ref10$data;
922
943
  var shopPerson = _ref10$data.data;
923
944
 
924
- _this7.setState({ shopPerson: shopPerson });
925
- _this7.resetInShopMemberTimer(shopPerson);
945
+ _this6.setState({ shopPerson: shopPerson });
946
+ _this6.resetInShopMemberTimer(shopPerson);
926
947
  });
927
948
  };
928
949
 
929
950
  this.onKeyPressed = function (e) {
930
951
  var keyCode = e && e.keyCode;
931
952
  if (keyCode === 13) {
932
- if (_this7.isMemberInputType) {
933
- var stime = _this7.keypressStime;
953
+ if (_this6.isMemberInputType) {
954
+ var stime = _this6.keypressStime;
934
955
  var etime = Date.parse(new Date());
935
956
  if (etime - stime > 300) {
936
- _this7.handleSearch('');
937
- _this7.keypressStime = null;
957
+ _this6.handleSearch('');
958
+ _this6.keypressStime = null;
938
959
  return _tplusComponentsTouch.Message.warn('未启用键盘录入功能');
939
960
  }
940
- _this7.keypressStime = null;
961
+ _this6.keypressStime = null;
941
962
  }
942
- _this7.iseyboardKEnter = Date.parse(new Date()) - _this7.keypressStime > 300;
943
- if (_this7.isStorageCardInputType) {
944
- _this7.keypressStime = null;
963
+ _this6.iseyboardKEnter = Date.parse(new Date()) - _this6.keypressStime > 300;
964
+ if (_this6.isStorageCardInputType) {
965
+ _this6.keypressStime = null;
945
966
  }
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());
967
+ if (_this6.searchLoading) return;
968
+ _this6.searchMember(undefined, 'ok');
969
+ } else if (_this6.isMemberInputType && !_this6.keypressStime && !(keyCode == 8)) {
970
+ _this6.keypressStime = Date.parse(new Date());
971
+ } else if (_this6.isStorageCardInputType && !_this6.keypressStime && !(keyCode == 8) && !_this6.isMemberInputType) {
972
+ _this6.keypressStime = Date.parse(new Date());
952
973
  }
953
974
  };
954
975
 
@@ -976,35 +997,35 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
976
997
 
977
998
  this.loadFaceRecognition = function (type) {
978
999
  // type = 1:到店会员 type = 2:POS机人脸识别
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 });
1000
+ _this6.setState({ faceLoading: type === 2, inShopLoading: type === 1 });
1001
+ _this6.ms.loadInStoreMember(String(type)).then(function (res) {
1002
+ _this6.setState({ faceLoading: false, inShopLoading: false });
982
1003
 
983
1004
  var _ref12 = res || {},
984
1005
  Data = _ref12.Data;
985
1006
 
986
1007
  if (!JSON.parse(Data).length) {
987
1008
  var tipMessage = ['当前没有到店会员', '未识别到人脸信息'];
988
- type === 1 && _this7.setState({ shopPerson: 0 });
1009
+ type === 1 && _this6.setState({ shopPerson: 0 });
989
1010
  return _tplusComponentsTouch.Message.info(tipMessage[type - 1]);
990
1011
  }
991
- type === 1 && _this7.getInStoreMemberCount();
992
- _this7.openShowModal(type, res);
1012
+ type === 1 && _this6.getInStoreMemberCount();
1013
+ _this6.openShowModal(type, res);
993
1014
  }).catch(function (err) {
994
- _this7.setState({ faceLoading: false, inShopLoading: false });
1015
+ _this6.setState({ faceLoading: false, inShopLoading: false });
995
1016
  console.log(err);
996
1017
  });
997
1018
  };
998
1019
 
999
1020
  this.changeScanProduct = function () {
1000
- if (_this7.scanObj) _this7.scanObj.startScan();
1021
+ if (_this6.scanObj) _this6.scanObj.startScan();
1001
1022
  };
1002
1023
 
1003
1024
  this.onScanResult = function (res) {
1004
- _this7.setState({
1025
+ _this6.setState({
1005
1026
  searchValue: res
1006
1027
  }, function () {
1007
- _this7.onKeyPressed({ keyCode: 13 });
1028
+ _this6.onKeyPressed({ keyCode: 13 });
1008
1029
  });
1009
1030
  };
1010
1031