tplus-member 3.36.1 → 3.36.4

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 +418 -322
  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 +271 -172
  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 +3 -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 +137 -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 +423 -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 +139 -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 +15 -27
  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 +1 -1
@@ -4,6 +4,18 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
 
7
+ var _regenerator = require('babel-runtime/regenerator');
8
+
9
+ var _regenerator2 = _interopRequireDefault(_regenerator);
10
+
11
+ var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
12
+
13
+ var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
14
+
15
+ var _promise = require('babel-runtime/core-js/promise');
16
+
17
+ var _promise2 = _interopRequireDefault(_promise);
18
+
7
19
  var _button = require('antd/es/button');
8
20
 
9
21
  var _button2 = _interopRequireDefault(_button);
@@ -48,10 +60,10 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
48
60
 
49
61
  var _inherits3 = _interopRequireDefault(_inherits2);
50
62
 
51
- var _class, _class2, _temp, _initialiseProps; /**
52
- * @memberChange member 状态发生变化时的回调
53
- * @memberSearched 录入框会员状态发生变化时的回调 memberSearched(value, type) // type: searched 触发搜索 | err 搜索接口错误 | close 关闭会员
54
- *
63
+ var _class, _class2, _temp, _initialiseProps; /**
64
+ * @memberChange member 状态发生变化时的回调
65
+ * @memberSearched 录入框会员状态发生变化时的回调 memberSearched(value, type) // type: searched 触发搜索 | err 搜索接口错误 | close 关闭会员
66
+ *
55
67
  */
56
68
 
57
69
 
@@ -109,11 +121,11 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
109
121
  function MemberTag(props) {
110
122
  (0, _classCallCheck3.default)(this, MemberTag);
111
123
 
112
- var _this2 = (0, _possibleConstructorReturn3.default)(this, (MemberTag.__proto__ || (0, _getPrototypeOf2.default)(MemberTag)).call(this, props));
124
+ var _this = (0, _possibleConstructorReturn3.default)(this, (MemberTag.__proto__ || (0, _getPrototypeOf2.default)(MemberTag)).call(this, props));
113
125
 
114
- _initialiseProps.call(_this2);
126
+ _initialiseProps.call(_this);
115
127
 
116
- _this2.hasElectron = hasElectron;
128
+ _this.hasElectron = hasElectron;
117
129
 
118
130
  var _ref = _mutantsMicrofx.stores.user.options.get('loginInfo') || {},
119
131
  isMemberInputType = _ref.isMemberInputType,
@@ -122,41 +134,44 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
122
134
  ICCardServer = _ref.ICCardServer,
123
135
  ICCardPassword = _ref.ICCardPassword;
124
136
 
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;
137
+ _this.isMemberInputType = parseInt(isMemberInputType); // '0'为不禁用 '1'为禁用
138
+ _this.isStorageCardInputType = MemberMeStorageCardInputByKeyBoard; // 仅储值卡是否禁用键盘输入,'0'为不禁用 '1'为禁用
139
+ _this.openFaceRecognition = parseInt(OpenFaceRecognition); // 启用人脸识别:0禁用 1为启用
140
+ _this.iCCardServer = parseInt(ICCardServer); // 启用IC卡:0为禁用 1为启用
141
+ _this.iCCardPassword = ICCardPassword; //IC卡密码
142
+ _this.ms = _api2.default;
131
143
  //移动端环境下,没有读取IC卡的方式。
132
144
 
133
145
  var _ref2 = _mutantsUtil.platform || {},
134
146
  isHorizontalPad = _ref2.isHorizontalPad,
135
147
  isHorizontalSunMi = _ref2.isHorizontalSunMi;
136
148
 
137
- _this2.isHorizontalPad = !!isHorizontalPad;
138
- _this2.isHorizontalSunMi = !!isHorizontalSunMi;
139
- _this2.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
140
- _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
149
+ _this.isHorizontalPad = !!isHorizontalPad;
150
+ _this.isHorizontalSunMi = !!isHorizontalSunMi;
151
+ _this.isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
152
+ _this.handleReadICard = _this.handleReadICard.bind(_this);
141
153
 
142
154
  //记录键盘录入信息的开始时间
143
- _this2.keypressStime = null;
144
- _this2.iseyboardKEnter = false; //是否为键盘输入
155
+ _this.keypressStime = null;
156
+ _this.iseyboardKEnter = false; //是否为键盘输入
145
157
 
146
158
  var _ref3 = _mutantsUtil.platform || {},
147
159
  isNewRetailBCPos = _ref3.isNewRetailBCPos;
148
160
 
149
- _this2.state = {
161
+ _this.state = {
150
162
  isCC: !!isNewRetailBCPos,
151
163
  isShowBirthdayTip: false
152
164
  };
153
- return _this2;
165
+
166
+ //是否单据模式
167
+ _this.isVoucherMode = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
168
+ return _this;
154
169
  }
155
170
 
156
171
  (0, _createClass3.default)(MemberTag, [{
157
172
  key: 'componentWillReact',
158
173
  value: function componentWillReact() {
159
- var _this3 = this;
174
+ var _this2 = this;
160
175
 
161
176
  var _ref4 = this.context.viewModel || {},
162
177
  _ref4$data = _ref4.data;
@@ -171,10 +186,15 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
171
186
  isClear = _ms$isClear === undefined ? false : _ms$isClear;
172
187
 
173
188
  var memberChangeData = (0, _keys2.default)(selectMemberInfo).length ? selectMemberInfo : undefined;
174
-
189
+ // 有会员的话清空搜索框文本
190
+ if (dtMember.ID && this.state.searchValue) {
191
+ this.setState({
192
+ searchValue: ''
193
+ });
194
+ }
175
195
  var memberChange = function memberChange(data) {
176
- _this3.setState({ newAvatar: '' });
177
- _this3.props.memberChange(data);
196
+ _this2.setState({ newAvatar: '' });
197
+ _this2.props.memberChange(data);
178
198
  };
179
199
  if ((typeof memberChangeData === 'undefined' ? 'undefined' : (0, _typeof3.default)(memberChangeData)) === 'object') {
180
200
  var deepCloneMember = JSON.parse((0, _stringify2.default)(memberChangeData));
@@ -224,7 +244,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
224
244
 
225
245
  //IC卡连接
226
246
  value: function connectRfCard() {
227
- var _this4 = this;
247
+ var _this3 = this;
228
248
 
229
249
  //客户端环境下,并开启了启用IC卡。
230
250
  if (this.hasElectron === true && this.iCCardServer === 1) {
@@ -235,7 +255,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
235
255
  } else {
236
256
  result = { connectCardStatus: true, connectCardError: '' };
237
257
  }
238
- _this4.setState(result);
258
+ _this3.setState(result);
239
259
  });
240
260
  }
241
261
  }
@@ -245,7 +265,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
245
265
  }, {
246
266
  key: 'readRfCard',
247
267
  value: function readRfCard() {
248
- var _this5 = this;
268
+ var _this4 = this;
249
269
 
250
270
  //客户端环境下,并开启了启用IC卡。
251
271
  if (this.hasElectron === true && this.iCCardServer === 1) {
@@ -262,10 +282,10 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
262
282
  _mutantsMicrofx.nativeMs.setIpcRendererMethod('ReadRfCard', (0, _extends3.default)({}, params), function (ret) {
263
283
  if (ret.status === 0) {
264
284
  _tplusComponentsTouch.Message.error(ret.value);
265
- _this5.connectRfCard(); //读取失败后,重新连接一下。
285
+ _this4.connectRfCard(); //读取失败后,重新连接一下。
266
286
  return;
267
287
  } else if (ret.status === 1) {
268
- _this5.searchMember(ret.value);
288
+ _this4.searchMember(ret.value);
269
289
  }
270
290
  });
271
291
  }
@@ -295,7 +315,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
295
315
  }, {
296
316
  key: 'render',
297
317
  value: function render() {
298
- var _this6 = this;
318
+ var _this5 = this;
299
319
 
300
320
  var _state2 = this.state,
301
321
  memberPhoto = _state2.memberPhoto,
@@ -369,10 +389,10 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
369
389
  placeholder: '\u626B\u63CF/\u8F93\u5165\u4F1A\u5458\u53F7',
370
390
  value: searchValue,
371
391
  ref: function ref(el) {
372
- return _this6.inputSearch = el && el.input;
392
+ return _this5.inputSearch = el && el.input;
373
393
  },
374
394
  onChange: function onChange(e) {
375
- return _this6.handleSearch(e.target.value);
395
+ return _this5.handleSearch(e.target.value);
376
396
  },
377
397
  onFocus: this.handleFocus,
378
398
  onBlur: this.handleBlur,
@@ -393,7 +413,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
393
413
  'div',
394
414
  { className: 'openFaceRecognition-box' },
395
415
  _react2.default.createElement(_tplusComponentsTouch.Ticon, { className: 'icon', onClick: function onClick() {
396
- return _this6.loadFaceRecognition(2);
416
+ return _this5.loadFaceRecognition(2);
397
417
  }, type: 'renlianshibie' }),
398
418
  _react2.default.createElement(_tplusComponentsTouch.Spin, {
399
419
  className: 'face-spin',
@@ -405,7 +425,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
405
425
 
406
426
  /* 扫描组件 */
407
427
  this.isHorizontalPad && _react2.default.createElement(_tplusComponentsTouch.Scan, { ref: function ref(scan) {
408
- return _this6.scanObj = scan;
428
+ return _this5.scanObj = scan;
409
429
  }, onChange: this.onScanResult })
410
430
  )
411
431
  ),
@@ -434,13 +454,13 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
434
454
  _react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'cuowuda', className: 'cuowudaIcon' })
435
455
  ),
436
456
  memberCareInfo && memberCareInfo.isTicket && _react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'cuowuda', onClick: function onClick() {
437
- _this6.setIsShowBirthdayTip();
457
+ _this5.setIsShowBirthdayTip();
438
458
  }, className: 'cuowudaIcon' })
439
459
  ),
440
460
  _react2.default.createElement(
441
461
  'div',
442
462
  { className: 'second member-hotkey-info', onClick: function onClick() {
443
- return _this6.openShowModal(0);
463
+ return _this5.openShowModal(0);
444
464
  } },
445
465
  _react2.default.createElement(
446
466
  'div',
@@ -512,7 +532,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
512
532
  _react2.default.createElement(
513
533
  _button2.default,
514
534
  { type: 'primary', onClick: function onClick() {
515
- return _this6.loadFaceRecognition(1);
535
+ return _this5.loadFaceRecognition(1);
516
536
  }, className: 'btn', disabled: inShopLoading },
517
537
  !inShopLoading && '到店会员',
518
538
  _react2.default.createElement(_tplusComponentsTouch.Spin, {
@@ -535,6 +555,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
535
555
  columnInfo: columnInfo,
536
556
  status: status,
537
557
  showModal: memberShow,
558
+ storeKey: 'memberManager',
538
559
  titleModal: titleModal,
539
560
  selectMemberSuccess: selectMemberSuccess,
540
561
  handleModal: this.handleShowModal
@@ -667,7 +688,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
667
688
  }, _class2.defaultProps = {
668
689
  memberChange: function memberChange() {}
669
690
  }, _initialiseProps = function _initialiseProps() {
670
- var _this7 = this;
691
+ var _this6 = this;
671
692
 
672
693
  this.state = {
673
694
  searchValue: '',
@@ -685,15 +706,19 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
685
706
  };
686
707
 
687
708
  this.controllerEvent = function (methodName, methodArgs) {
688
- _this7.context.onEvent({ 'controllerEvent': _mutantsAppfx.Action.fromJS(_this7.context.viewModel, methodName) }, 'controllerEvent', methodArgs);
709
+ return new _promise2.default(function (resolve) {
710
+ _this6.context.onEvent({ 'controllerEvent': _mutantsAppfx.Action.fromJS(_this6.context.viewModel, methodName) }, 'controllerEvent', (0, _extends3.default)({}, methodArgs, { fn: function fn(result) {
711
+ resolve(result);
712
+ } }));
713
+ });
689
714
  };
690
715
 
691
716
  this.resetInShopMemberTimer = function (count) {
692
- _this7.timer && clearTimeout(_this7.timer);
717
+ _this6.timer && clearTimeout(_this6.timer);
693
718
  if (!count) return;
694
719
  var time = 5 * 60 * 1000;
695
- _this7.timer = setTimeout(function () {
696
- _this7.getInStoreMemberCount();
720
+ _this6.timer = setTimeout(function () {
721
+ _this6.getInStoreMemberCount();
697
722
  }, time);
698
723
  };
699
724
 
@@ -702,11 +727,11 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
702
727
  isNewRetailBCPos = _ref7.isNewRetailBCPos;
703
728
 
704
729
  if (!isNewRetailBCPos) {
705
- if (!_this7.openFaceRecognition) {
730
+ if (!_this6.openFaceRecognition) {
706
731
  _tplusComponentsTouch.Message.warn('未启用人脸识别,需要先开启人脸识别功能');
707
732
  return;
708
733
  }
709
- _this7.setState({
734
+ _this6.setState({
710
735
  memberPhoto: true,
711
736
  titleModal: '选择头像'
712
737
  });
@@ -716,31 +741,31 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
716
741
  this.openShowModal = function (status, res) {
717
742
  var title = '';
718
743
 
719
- var _ref8 = _this7.context.viewModel || {},
744
+ var _ref8 = _this6.context.viewModel || {},
720
745
  _ref8$data = _ref8.data;
721
746
 
722
747
  _ref8$data = _ref8$data === undefined ? {} : _ref8$data;
723
748
  var _ref8$data$Member = _ref8$data.Member,
724
749
  Member = _ref8$data$Member === undefined ? {} : _ref8$data$Member;
725
- var newAvatar = _this7.state.newAvatar;
750
+ var newAvatar = _this6.state.newAvatar;
726
751
 
727
752
  var jsMember = (0, _mobx.toJS)(Member);
728
753
  var updateMember = newAvatar ? (0, _extends3.default)({}, jsMember, { ImageFile: newAvatar }) : jsMember;
729
754
  switch (status) {
730
755
  case 0:
731
756
  title = '会员详情';
732
- _this7.setState({ viewMemberInfo: updateMember });
757
+ _this6.setState({ viewMemberInfo: updateMember });
733
758
  break;
734
759
  case 1:
735
760
  title = '到店会员';
736
- _this7.setState({ viewMemberInfo: res });
761
+ _this6.setState({ viewMemberInfo: res });
737
762
  break;
738
763
  case 2:
739
764
  title = '人脸识别';
740
- _this7.setState({ viewMemberInfo: res });
765
+ _this6.setState({ viewMemberInfo: res });
741
766
  break;
742
767
  }
743
- _this7.setState({
768
+ _this6.setState({
744
769
  status: status,
745
770
  memberShow: true,
746
771
  titleModal: title
@@ -748,9 +773,9 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
748
773
  };
749
774
 
750
775
  this.openCloseModal = function () {
751
- var setMemberFocus = _this7.props.setMemberFocus;
776
+ var setMemberFocus = _this6.props.setMemberFocus;
752
777
 
753
- var memberStore = _this7.context.viewModel && _this7.context.viewModel.items.find(function (el) {
778
+ var memberStore = _this6.context.viewModel && _this6.context.viewModel.items.find(function (el) {
754
779
  return el.name == 'MemberStore';
755
780
  });
756
781
  var uiState = memberStore.uiState;
@@ -764,7 +789,7 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
764
789
  title: '关闭会员',
765
790
  content: '' + (IsIntegralExchange ? "关闭会员将会清空商品信息!" : "确定要关闭该会员吗?"),
766
791
  onOk: function onOk() {
767
- _this7.ms.clearSeletMember();
792
+ _this6.ms.clearSeletMember();
768
793
  _mutantsMicrofx.stores.selectMemberStore.clearMemberCare();
769
794
  typeof setMemberFocus == 'function' && setMemberFocus();
770
795
  }
@@ -772,191 +797,265 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
772
797
  };
773
798
 
774
799
  this.handleCloseBirthdayModal = function () {
775
- _this7.ms.changeBirthdayShow(false);
800
+ _this6.ms.changeBirthdayShow(false);
776
801
  };
777
802
 
778
803
  this.handleMemberCareModal = function () {
779
- _this7.setState({ isMemberCareModal: true });
804
+ _this6.setState({ isMemberCareModal: true });
780
805
  };
781
806
 
782
807
  this.handleMemberCareModalCancel = function () {
783
- _this7.setState({ isMemberCareModal: false });
808
+ _this6.setState({ isMemberCareModal: false });
784
809
  };
785
810
 
786
811
  this.handleSearch = function (val) {
787
- _this7.setState({ searchValue: val });
812
+ _this6.setState({ searchValue: val });
788
813
  };
789
814
 
790
815
  this.handleFocus = function (el) {
791
- if (_this7.isMemberInputType) return;
792
- var _this = _this7;
793
- function cb() {
794
- _this.searchMember(undefined, 'ok');
816
+ if (_this6.isMemberInputType) return;
817
+ if (_this6.isVoucherMode) {
818
+ _tplusComponentsTouch.Keyboard.open(function (v) {
819
+ var value = _tplusComponentsTouch.Keyboard.getNewValue(_this6.inputSearch, _this6.inputSearch.value, v);
820
+ _this6.handleSearch(value);
821
+ }, function () {
822
+ _this6.searchMember(undefined, 'ok');
823
+ }, _this6.keyboardClose, { bottom: 60 })();
824
+ } else {
825
+ _tplusComponentsTouch.Keyboard.open2(function (v) {
826
+ var value = _tplusComponentsTouch.Keyboard.getNewValue(_this6.inputSearch, _this6.inputSearch.value, v);
827
+ _this6.handleSearch(value);
828
+ }, function () {
829
+ _this6.searchMember(undefined, 'ok');
830
+ }, _this6.keyboardClose, 'ByMember', _mutantsMicrofx.localStore.get('ByMember'));
795
831
  }
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
832
  };
801
833
 
802
834
  this.keyboardClose = function () {
803
- _this7.inputSearch.blur();
835
+ _this6.inputSearch.blur();
804
836
  };
805
837
 
806
838
  this.handleBlur = function () {
807
- _tplusComponentsTouch.Keyboard.close2();
839
+ if (_this6.isVoucherMode) {
840
+ _tplusComponentsTouch.Keyboard.close();
841
+ } else {
842
+ _tplusComponentsTouch.Keyboard.close2();
843
+ }
808
844
  };
809
845
 
810
846
  this.handleReadICard = function () {
811
- _this7.readRfCard();
847
+ _this6.readRfCard();
812
848
  };
813
849
 
814
850
  this.handleShowModal = function (type, params) {
815
851
  if (params) {
816
- _this7.setState({ dtMember: params, memberShow: type });
852
+ _this6.setState({ dtMember: params, memberShow: type });
817
853
  } else {
818
- _this7.setState({ memberShow: type });
854
+ _this6.setState({ memberShow: type });
819
855
  }
820
856
  };
821
857
 
822
858
  this.handlePhotoModal = function (type, newAvatar) {
823
859
  if (newAvatar) {
824
- _this7.setState({
860
+ _this6.setState({
825
861
  newAvatar: newAvatar,
826
862
  memberPhoto: type
827
863
  });
828
864
  } else {
829
- _this7.setState({ memberPhoto: type });
865
+ _this6.setState({ memberPhoto: type });
830
866
  }
831
867
  };
832
868
 
833
869
  this.searchMember = function (val, type) {
834
870
  if (!_mutantsMicrofx.stores.offlineSys.shouldInOffline()) return;
835
- if (!_this7.ms || _this7.searchLoading) return;
836
- var searchValue = _this7.state.searchValue;
871
+ if (!_this6.ms || _this6.searchLoading) return;
872
+ var searchValue = _this6.state.searchValue;
837
873
 
838
874
  val = val || (searchValue || '').trim();
839
875
  if (!val) return;
840
- var _props2 = _this7.props,
876
+ var _props2 = _this6.props,
841
877
  memberSearched = _props2.memberSearched,
842
878
  selectMemberSuccess = _props2.selectMemberSuccess,
843
879
  setMemberFocus = _props2.setMemberFocus,
844
880
  getMemberBirthday = _props2.getMemberBirthday,
845
881
  getMeStorageCard = _props2.getMeStorageCard;
846
882
 
847
- _this7.searchLoading = true;
848
- _this7.setState({ searchVisible: true });
849
- _this7.ms.getSearchMember({
883
+ _this6.searchLoading = true;
884
+ _this6.setState({ searchVisible: true });
885
+ _this6.ms.getSearchMember({
850
886
  currentPage: 1,
851
887
  pageSize: 10,
852
888
  key: val,
853
- isSingleMember: false
854
- }).then(function (ret) {
855
- _this7.searchLoading = false;
856
-
857
- var _ref9 = ret || {},
858
- columnInfo = _ref9.ColumnInfo,
859
- Data = _ref9.Data;
860
-
861
- var data = JSON.parse(Data) || [];
862
- var info = data[0];
863
- _this7.setState({ searchVisible: false, columnInfo: columnInfo });
864
- if (info && info.MemberType && info.MemberType.IsStorage && _this7.isStorageCardInputType && _this7.iseyboardKEnter) {
865
- getMeStorageCard && getMeStorageCard(true);
866
- _this7.handleSearch('');
867
- _this7.keypressStime = null;
868
- } else {
869
- getMeStorageCard && getMeStorageCard(false);
870
- }
871
- memberSearched && memberSearched(info, 'searched');
872
- if (info) {
873
- if (data.length > 1) {
874
- _mutantsMicrofx.stores.drawerStore.init({
875
- title: '会员管理',
876
- key: 'member',
877
- onHide: function onHide() {},
878
- listArr: data
879
- });
880
- _this7.setState({
881
- searchValue: null
882
- });
883
- } else {
884
- memberSearched && memberSearched(info, 'searched');
885
- (0, _utils.userInfoFormat)(info);
886
- if ((0, _utils.errMessageTip)(info)) return;
887
- _this7.ms.seletMember(info, true);
888
- setTimeout(function () {
889
- return _this7.setState({ searchValue: '' });
890
- }, 0);
891
- _this7.handleBlur();
892
- selectMemberSuccess && selectMemberSuccess();
893
- getMemberBirthday && getMemberBirthday(info.ID, function (result) {
894
- _mutantsMicrofx.stores.selectMemberStore.changeMemberCare(result);
895
- });
896
- }
897
- } else {
898
- if (type === 'ok') {
899
- _tplusComponentsTouch.Message.warn('会员不存在');
900
- if (_this7.isMobileEnvironment) {
901
- setTimeout(function () {
902
- return _this7.setState({ searchValue: '' });
903
- }, 0);
889
+ isSingleMember: true
890
+ }).then(function () {
891
+ var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ret) {
892
+ var _ref10, columnInfo, Data, data, info, _ref11, _ref11$data, _ref11$data$RetailDet, RetailDetails, isArrowPriceChange;
893
+
894
+ return _regenerator2.default.wrap(function _callee$(_context) {
895
+ while (1) {
896
+ switch (_context.prev = _context.next) {
897
+ case 0:
898
+ _this6.searchLoading = false;
899
+ _ref10 = ret || {}, columnInfo = _ref10.ColumnInfo, Data = _ref10.Data;
900
+ data = JSON.parse(Data) || [];
901
+ info = data[0];
902
+
903
+ if (!(data.length === 1 && info)) {
904
+ _context.next = 14;
905
+ break;
906
+ }
907
+
908
+ _ref11 = _this6.context.viewModel || {}, _ref11$data = _ref11.data;
909
+ _ref11$data = _ref11$data === undefined ? {} : _ref11$data;
910
+ _ref11$data$RetailDet = _ref11$data.RetailDetails, RetailDetails = _ref11$data$RetailDet === undefined ? [] : _ref11$data$RetailDet;
911
+ _context.next = 10;
912
+ return _this6.controllerEvent('memberPriceChangeValidate', { member: info, retailDetails: (0, _mobx.toJS)(RetailDetails) });
913
+
914
+ case 10:
915
+ isArrowPriceChange = _context.sent;
916
+
917
+ if (isArrowPriceChange) {
918
+ _context.next = 14;
919
+ break;
920
+ }
921
+
922
+ _this6.setState({ searchVisible: false, searchValue: '' });
923
+ return _context.abrupt('return');
924
+
925
+ case 14:
926
+ _this6.setState({ searchVisible: false, columnInfo: columnInfo });
927
+ if (info && info.MemberType && info.MemberType.IsStorage && _this6.isStorageCardInputType && _this6.iseyboardKEnter) {
928
+ getMeStorageCard && getMeStorageCard(true);
929
+ _this6.handleSearch('');
930
+ _this6.keypressStime = null;
931
+ } else {
932
+ getMeStorageCard && getMeStorageCard(false);
933
+ }
934
+ memberSearched && memberSearched(info, 'searched');
935
+
936
+ if (!info) {
937
+ _context.next = 34;
938
+ break;
939
+ }
940
+
941
+ if (!(data.length > 1)) {
942
+ _context.next = 23;
943
+ break;
944
+ }
945
+
946
+ _mutantsMicrofx.stores.drawerStore.init({
947
+ title: '会员管理',
948
+ key: 'member',
949
+ onHide: function onHide() {},
950
+ subKey: 'memberManager',
951
+ listArr: data
952
+ });
953
+ _this6.setState({
954
+ searchValue: null
955
+ });
956
+ _context.next = 32;
957
+ break;
958
+
959
+ case 23:
960
+ memberSearched && memberSearched(info, 'searched');
961
+ (0, _utils.userInfoFormat)(info);
962
+
963
+ if (!(0, _utils.errMessageTip)(info)) {
964
+ _context.next = 27;
965
+ break;
966
+ }
967
+
968
+ return _context.abrupt('return');
969
+
970
+ case 27:
971
+ _this6.ms.seletMember(info, true);
972
+ setTimeout(function () {
973
+ return _this6.setState({ searchValue: '' });
974
+ }, 0);
975
+ _this6.handleBlur();
976
+ selectMemberSuccess && selectMemberSuccess();
977
+ getMemberBirthday && getMemberBirthday(info.ID, function (result) {
978
+ _mutantsMicrofx.stores.selectMemberStore.changeMemberCare(result);
979
+ });
980
+
981
+ case 32:
982
+ _context.next = 35;
983
+ break;
984
+
985
+ case 34:
986
+ if (type === 'ok') {
987
+ _tplusComponentsTouch.Message.warn('会员不存在');
988
+ if (_this6.isMobileEnvironment) {
989
+ setTimeout(function () {
990
+ return _this6.setState({ searchValue: '' });
991
+ }, 0);
992
+ }
993
+ typeof setMemberFocus == 'function' && setMemberFocus();
994
+ }
995
+
996
+ case 35:
997
+ case 'end':
998
+ return _context.stop();
999
+ }
904
1000
  }
905
- typeof setMemberFocus == 'function' && setMemberFocus();
906
- }
907
- }
908
- }).catch(function (err) {
909
- _this7.setState({ searchVisible: false });
910
- _this7.searchLoading = false;
1001
+ }, _callee, _this6);
1002
+ }));
1003
+
1004
+ return function (_x) {
1005
+ return _ref9.apply(this, arguments);
1006
+ };
1007
+ }()).catch(function (err) {
1008
+ _this6.setState({ searchVisible: false });
1009
+ _this6.searchLoading = false;
911
1010
  memberSearched && memberSearched(undefined, 'err');
912
1011
  });
913
1012
  };
914
1013
 
915
1014
  this.getInStoreMemberCount = function () {
916
- if (!_this7.ms) return;
917
- _this7.ms.getInStoreMemberCount().then(function (res) {
918
- var _ref10 = res || {},
919
- _ref10$data = _ref10.data;
1015
+ if (!_this6.ms) return;
1016
+ _this6.ms.getInStoreMemberCount().then(function (res) {
1017
+ var _ref12 = res || {},
1018
+ _ref12$data = _ref12.data;
920
1019
 
921
- _ref10$data = _ref10$data === undefined ? {} : _ref10$data;
922
- var shopPerson = _ref10$data.data;
1020
+ _ref12$data = _ref12$data === undefined ? {} : _ref12$data;
1021
+ var shopPerson = _ref12$data.data;
923
1022
 
924
- _this7.setState({ shopPerson: shopPerson });
925
- _this7.resetInShopMemberTimer(shopPerson);
1023
+ _this6.setState({ shopPerson: shopPerson });
1024
+ _this6.resetInShopMemberTimer(shopPerson);
926
1025
  });
927
1026
  };
928
1027
 
929
1028
  this.onKeyPressed = function (e) {
930
1029
  var keyCode = e && e.keyCode;
931
1030
  if (keyCode === 13) {
932
- if (_this7.isMemberInputType) {
933
- var stime = _this7.keypressStime;
1031
+ if (_this6.isMemberInputType) {
1032
+ var stime = _this6.keypressStime;
934
1033
  var etime = Date.parse(new Date());
935
1034
  if (etime - stime > 300) {
936
- _this7.handleSearch('');
937
- _this7.keypressStime = null;
1035
+ _this6.handleSearch('');
1036
+ _this6.keypressStime = null;
938
1037
  return _tplusComponentsTouch.Message.warn('未启用键盘录入功能');
939
1038
  }
940
- _this7.keypressStime = null;
1039
+ _this6.keypressStime = null;
941
1040
  }
942
- _this7.iseyboardKEnter = Date.parse(new Date()) - _this7.keypressStime > 300;
943
- if (_this7.isStorageCardInputType) {
944
- _this7.keypressStime = null;
1041
+ _this6.iseyboardKEnter = Date.parse(new Date()) - _this6.keypressStime > 300;
1042
+ if (_this6.isStorageCardInputType) {
1043
+ _this6.keypressStime = null;
945
1044
  }
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());
1045
+ if (_this6.searchLoading) return;
1046
+ _this6.searchMember(undefined, 'ok');
1047
+ } else if (_this6.isMemberInputType && !_this6.keypressStime && !(keyCode == 8)) {
1048
+ _this6.keypressStime = Date.parse(new Date());
1049
+ } else if (_this6.isStorageCardInputType && !_this6.keypressStime && !(keyCode == 8) && !_this6.isMemberInputType) {
1050
+ _this6.keypressStime = Date.parse(new Date());
952
1051
  }
953
1052
  };
954
1053
 
955
1054
  this.computedCoupon = function () {
956
1055
  var member = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
957
1056
 
958
- var _ref11 = _mutantsUtil.platform || {},
959
- isNewRetailBCPos = _ref11.isNewRetailBCPos;
1057
+ var _ref13 = _mutantsUtil.platform || {},
1058
+ isNewRetailBCPos = _ref13.isNewRetailBCPos;
960
1059
 
961
1060
  if (!!isNewRetailBCPos) {
962
1061
  return member.MemberCouponCount ? member.MemberCouponCount : '0';
@@ -976,35 +1075,35 @@ var MemberTag = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_
976
1075
 
977
1076
  this.loadFaceRecognition = function (type) {
978
1077
  // 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 });
1078
+ _this6.setState({ faceLoading: type === 2, inShopLoading: type === 1 });
1079
+ _this6.ms.loadInStoreMember(String(type)).then(function (res) {
1080
+ _this6.setState({ faceLoading: false, inShopLoading: false });
982
1081
 
983
- var _ref12 = res || {},
984
- Data = _ref12.Data;
1082
+ var _ref14 = res || {},
1083
+ Data = _ref14.Data;
985
1084
 
986
1085
  if (!JSON.parse(Data).length) {
987
1086
  var tipMessage = ['当前没有到店会员', '未识别到人脸信息'];
988
- type === 1 && _this7.setState({ shopPerson: 0 });
1087
+ type === 1 && _this6.setState({ shopPerson: 0 });
989
1088
  return _tplusComponentsTouch.Message.info(tipMessage[type - 1]);
990
1089
  }
991
- type === 1 && _this7.getInStoreMemberCount();
992
- _this7.openShowModal(type, res);
1090
+ type === 1 && _this6.getInStoreMemberCount();
1091
+ _this6.openShowModal(type, res);
993
1092
  }).catch(function (err) {
994
- _this7.setState({ faceLoading: false, inShopLoading: false });
1093
+ _this6.setState({ faceLoading: false, inShopLoading: false });
995
1094
  console.log(err);
996
1095
  });
997
1096
  };
998
1097
 
999
1098
  this.changeScanProduct = function () {
1000
- if (_this7.scanObj) _this7.scanObj.startScan();
1099
+ if (_this6.scanObj) _this6.scanObj.startScan();
1001
1100
  };
1002
1101
 
1003
1102
  this.onScanResult = function (res) {
1004
- _this7.setState({
1103
+ _this6.setState({
1005
1104
  searchValue: res
1006
1105
  }, function () {
1007
- _this7.onKeyPressed({ keyCode: 13 });
1106
+ _this6.onKeyPressed({ keyCode: 13 });
1008
1107
  });
1009
1108
  };
1010
1109