tplus-member 3.26.6 → 3.27.1
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/api.js +5 -5
- package/dist/api.js.map +1 -1
- package/dist/controllers/FeedbackController.js.map +1 -1
- package/dist/controllers/MemberOrderController.js +12 -12
- package/dist/controllers/MemberOrderController.js.map +1 -1
- package/dist/controllers/OpenCardController.js +7 -7
- package/dist/controllers/OpenCardController.js.map +1 -1
- package/dist/controllers/defaultConfig.js.map +1 -1
- package/dist/dataProvider/member.js +7 -7
- package/dist/dataProvider/member.js.map +1 -1
- package/dist/dataProvider/openCard.js.map +1 -1
- package/dist/domain/member/AuthProcess.js.map +1 -1
- package/dist/domain/member/CardCodeChangedProcessor.js +2 -2
- package/dist/domain/member/CardCodeChangedProcessor.js.map +1 -1
- package/dist/domain/member/CheckCardCodeAndCodeProcessor.js +2 -2
- package/dist/domain/member/CheckCardCodeAndCodeProcessor.js.map +1 -1
- package/dist/domain/member/CheckMobilephoneFormatProcessor.js +2 -2
- package/dist/domain/member/CheckMobilephoneFormatProcessor.js.map +1 -1
- package/dist/domain/member/CheckPresentAmountProcessor.js +2 -2
- package/dist/domain/member/CheckPresentAmountProcessor.js.map +1 -1
- package/dist/domain/member/EffectiveDateChangedProcessor.js +2 -2
- package/dist/domain/member/EffectiveDateChangedProcessor.js.map +1 -1
- package/dist/domain/member/GetThisPresentAmountProcessor.js +2 -2
- package/dist/domain/member/GetThisPresentAmountProcessor.js.map +1 -1
- package/dist/domain/member/InitDataProcessor.js +123 -123
- package/dist/domain/member/InitDataProcessor.js.map +1 -1
- package/dist/domain/member/IsMemberEffectiveProcessor.js +2 -2
- package/dist/domain/member/IsMemberEffectiveProcessor.js.map +1 -1
- package/dist/domain/member/IsMemberEnableProcessor.js +2 -2
- package/dist/domain/member/IsMemberEnableProcessor.js.map +1 -1
- package/dist/domain/member/IsMemberExpirationProcessor.js +2 -2
- package/dist/domain/member/IsMemberExpirationProcessor.js.map +1 -1
- package/dist/domain/member/IsMemberPasswordSameProcessor.js +2 -2
- package/dist/domain/member/IsMemberPasswordSameProcessor.js.map +1 -1
- package/dist/domain/member/IsMemberStorageForStoreProcessor.js +3 -3
- package/dist/domain/member/IsMemberStorageForStoreProcessor.js.map +1 -1
- package/dist/domain/member/MemberTypeChangedProcessor.js +4 -4
- package/dist/domain/member/MemberTypeChangedProcessor.js.map +1 -1
- package/dist/domain/member/MobilephoneChangedProcessor.js +4 -4
- package/dist/domain/member/MobilephoneChangedProcessor.js.map +1 -1
- package/dist/domain/member/PersonProcesser.js.map +1 -1
- package/dist/domain/member/PriuserdefChangedProcessor.js +2 -2
- package/dist/domain/member/PriuserdefChangedProcessor.js.map +1 -1
- package/dist/domain/operationLog/AddLogProcessor.js +6 -6
- package/dist/domain/operationLog/AddLogProcessor.js.map +1 -1
- package/dist/domain/operationLog/OperationConfig.js.map +1 -1
- package/dist/domain/operationLog/OperationLog.js.map +1 -1
- package/dist/index.js +1 -6
- package/dist/index.js.map +1 -1
- package/dist/member/MemberPhoto.js.map +1 -1
- package/dist/member/MemberShow.js +1 -3
- package/dist/member/MemberShow.js.map +1 -1
- package/dist/member/ShopMember.js +271 -162
- package/dist/member/ShopMember.js.map +1 -1
- package/dist/member/ShopMember.less +531 -595
- package/dist/member/api.js +42 -245
- package/dist/member/api.js.map +1 -1
- package/dist/member/color.less +31 -31
- package/dist/member/index.js +4 -6
- package/dist/member/index.js.map +1 -1
- package/dist/member/index.less +570 -570
- package/dist/member/memberMenu/changeMemberCard/index.js.map +1 -1
- package/dist/member/memberMenu/changeMemberCard/style.less +42 -42
- package/dist/member/memberMenu/index.js +352 -502
- 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/modifyPass/store.js.map +1 -1
- package/dist/member/memberMenu/modifyPass/style.less +96 -96
- package/dist/member/memberMenu/style.less +85 -127
- package/dist/member/memberTab.js +560 -0
- package/dist/member/memberTab.js.map +1 -0
- package/dist/socket.js +13 -13
- package/dist/socket.js.map +1 -1
- package/dist/stores/MemberStore.js +18 -13
- package/dist/stores/MemberStore.js.map +1 -1
- package/dist/stores/index.js.map +1 -1
- package/dist/utils.js +1 -15
- package/dist/utils.js.map +1 -1
- package/dist/viewController/MemberOrderViewController.js.map +1 -1
- package/dist/viewDoMain/CheckMemberProcessorBlock.js +2 -2
- package/dist/viewDoMain/CheckMemberProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/CheckMemberStorageProcessorBlock.js +2 -2
- package/dist/viewDoMain/CheckMemberStorageProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/CheckSelectMemberProcessorBlock.js +2 -2
- package/dist/viewDoMain/CheckSelectMemberProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/CheckUpdatePasswordProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/MemberDataChangedProcessorBlock.js +2 -2
- package/dist/viewDoMain/MemberDataChangedProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/MemberDataPreSaveProcessorBlock.js +2 -2
- package/dist/viewDoMain/MemberDataPreSaveProcessorBlock.js.map +1 -1
- package/dist/viewDoMain/StorageAmountChangedProcessorBlock.js +2 -2
- package/dist/viewDoMain/StorageAmountChangedProcessorBlock.js.map +1 -1
- package/dist/viewModels/memberVoucher.js +3 -3
- package/dist/viewModels/memberVoucher.js.map +1 -1
- package/dist/views/MemberOrderView.js +6 -6
- package/dist/views/MemberOrderView.js.map +1 -1
- package/dist/views/MemberStore.less +143 -143
- package/dist/views/MemberStoreNew.less +230 -230
- package/dist/views/MemberStoreNewView.js +25 -13
- package/dist/views/MemberStoreNewView.js.map +1 -1
- package/dist/views/MemberStoreView.js.map +1 -1
- package/dist/views/MemberStoreViewContainer.js.map +1 -1
- package/dist/views/PresentDetail.less +118 -118
- package/dist/views/PresetDetailView.js.map +1 -1
- package/dist/views/memberOrder.less +54 -54
- package/locales/zh/tplus-portsetting.json +1 -1
- package/locales/zh-CN/tplus-portsetting.json +1 -1
- package/package.json +6 -6
- package/dist/member/MemberCardList.js +0 -374
- package/dist/member/MemberCardList.js.map +0 -1
- package/dist/member/ShopMemberStorage.js +0 -400
- package/dist/member/ShopMemberStorage.js.map +0 -1
- package/dist/member/memberMenu/bindCard/index.js +0 -291
- 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 -169
- 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 -1274
- package/dist/member/memberMenuStorage/index.js.map +0 -1
- package/dist/member/memberMenuStorage/modifyPass/index.js +0 -419
- 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 -127
- package/dist/member/memberTab/MemberCardInfo.js +0 -89
- package/dist/member/memberTab/MemberCardInfo.js.map +0 -1
- package/dist/member/memberTab/MemberManager.js +0 -591
- package/dist/member/memberTab/MemberManager.js.map +0 -1
- package/dist/member/memberTab/MemberStorage.js +0 -150
- 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
@@ -9,14 +9,6 @@ var _button = require('antd/es/button');
|
|
9
9
|
|
10
10
|
var _button2 = _interopRequireDefault(_button);
|
11
11
|
|
12
|
-
var _regenerator = require('babel-runtime/regenerator');
|
13
|
-
|
14
|
-
var _regenerator2 = _interopRequireDefault(_regenerator);
|
15
|
-
|
16
|
-
var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
|
17
|
-
|
18
|
-
var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
|
19
|
-
|
20
12
|
var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
|
21
13
|
|
22
14
|
var _defineProperty3 = _interopRequireDefault(_defineProperty2);
|
@@ -79,25 +71,28 @@ var _api = require('./api');
|
|
79
71
|
|
80
72
|
var _api2 = _interopRequireDefault(_api);
|
81
73
|
|
82
|
-
var
|
74
|
+
var _memberTab = require('./memberTab');
|
83
75
|
|
84
|
-
var
|
76
|
+
var _memberTab2 = _interopRequireDefault(_memberTab);
|
85
77
|
|
86
|
-
require('
|
78
|
+
var _swiper = require('swiper/dist/js/swiper.js');
|
87
79
|
|
88
|
-
var
|
80
|
+
var _swiper2 = _interopRequireDefault(_swiper);
|
89
81
|
|
90
|
-
|
82
|
+
require('swiper/dist/css/swiper.min.css');
|
91
83
|
|
92
|
-
|
84
|
+
require('./ShopMember.less');
|
85
|
+
|
86
|
+
var _utils = require('../utils');
|
93
87
|
|
94
|
-
var
|
88
|
+
var _index = require('./memberMenu/index.js');
|
95
89
|
|
96
|
-
var
|
90
|
+
var _index2 = _interopRequireDefault(_index);
|
97
91
|
|
98
92
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
99
93
|
|
100
|
-
|
94
|
+
var memberSwiper = void 0;
|
95
|
+
var swiperSelectObserver = void 0;
|
101
96
|
|
102
97
|
var ShopMember = (_temp = _class = function (_Component) {
|
103
98
|
(0, _inherits3.default)(ShopMember, _Component);
|
@@ -169,7 +164,7 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
169
164
|
};
|
170
165
|
|
171
166
|
_this2.loadUserInfo = function (key, Idmember, item, type, syncUpdateMember) {
|
172
|
-
|
167
|
+
_this2.observerCard();
|
173
168
|
|
174
169
|
var _this2$props = _this2.props,
|
175
170
|
selectChange = _this2$props.selectChange,
|
@@ -261,8 +256,6 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
261
256
|
memberChange && memberChange(ret);
|
262
257
|
}
|
263
258
|
}
|
264
|
-
// 获取会员的卡信息
|
265
|
-
_this2.getCardInfoByMemberId(Idmember);
|
266
259
|
}).catch(function (err) {
|
267
260
|
selectChange && selectChange({});
|
268
261
|
if (_this2.isNotSetState(Idmember)) return;
|
@@ -409,7 +402,6 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
409
402
|
|
410
403
|
_this2.handleSearchClick = function () {
|
411
404
|
var searchValue = _this2.state.searchValue;
|
412
|
-
var storeKey = _this2.props.storeKey;
|
413
405
|
|
414
406
|
_this2.userSearch = true;
|
415
407
|
_this2.currentPage = 1;
|
@@ -421,6 +413,139 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
421
413
|
_this2.setState({ searchValue: val });
|
422
414
|
};
|
423
415
|
|
416
|
+
_this2.getCardRender = function () {
|
417
|
+
var item = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
418
|
+
var key = arguments[1];
|
419
|
+
var IsEnableUMember = arguments[2];
|
420
|
+
var precisionInfo = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
|
421
|
+
var ID = item.ID,
|
422
|
+
Name = item.Name,
|
423
|
+
Mobilephone = item.Mobilephone,
|
424
|
+
CardCode = item.CardCode,
|
425
|
+
BalanceIntegral = item.BalanceIntegral,
|
426
|
+
BalanceStorage = item.BalanceStorage,
|
427
|
+
_item$MemberType = item.MemberType,
|
428
|
+
MemberType = _item$MemberType === undefined ? {} : _item$MemberType,
|
429
|
+
IsFocusUmember = item.IsFocusUmember,
|
430
|
+
_item$UmemberLabel = item.UmemberLabel,
|
431
|
+
UmemberLabel = _item$UmemberLabel === undefined ? '' : _item$UmemberLabel,
|
432
|
+
ImageFile = item.ImageFile,
|
433
|
+
_item$ExpirationDate = item.ExpirationDate,
|
434
|
+
ExpirationDate = _item$ExpirationDate === undefined ? '' : _item$ExpirationDate,
|
435
|
+
isExpiration = item.isExpiration,
|
436
|
+
isUserLogout = item.isUserLogout,
|
437
|
+
UmemberOpenId = item.UmemberOpenId;
|
438
|
+
|
439
|
+
var iconItems = _this2.getMemberStateStamp(item);
|
440
|
+
var labels = UmemberLabel ? UmemberLabel.split(',') : [];
|
441
|
+
var defaultAvatar = 'https://newretail.static.chanjet.com/default_avatar.png';
|
442
|
+
var _this2$state4 = _this2.state,
|
443
|
+
selected = _this2$state4.selected,
|
444
|
+
isCC = _this2$state4.isCC;
|
445
|
+
|
446
|
+
var isSelected = selected === key;
|
447
|
+
return _react2.default.createElement(
|
448
|
+
'div',
|
449
|
+
{ key: key, className: 'swiper-slide member-item-slide ' + (isSelected ? 'slide-selected' : ''), onClick: function onClick() {
|
450
|
+
return _this2.loadUserInfo(key, ID, item);
|
451
|
+
} },
|
452
|
+
iconItems && iconItems.length > 0 && _react2.default.createElement(
|
453
|
+
'div',
|
454
|
+
{ className: 'memberstate-stamp' },
|
455
|
+
iconItems
|
456
|
+
),
|
457
|
+
_react2.default.createElement(
|
458
|
+
'div',
|
459
|
+
{ className: 'card-avatar' },
|
460
|
+
_react2.default.createElement(
|
461
|
+
'div',
|
462
|
+
{ className: 'avatar-box' },
|
463
|
+
_react2.default.createElement('img', { src: ImageFile || defaultAvatar, width: 60, height: 60 }),
|
464
|
+
IsEnableUMember && _react2.default.createElement(
|
465
|
+
'div',
|
466
|
+
{ className: 'avatar-bage ' + (UmemberOpenId ? 'bage-follow' : '') },
|
467
|
+
_react2.default.createElement(
|
468
|
+
'div',
|
469
|
+
{ className: 'avatar-bage-scale' },
|
470
|
+
UmemberOpenId ? '已关注' : '未关注'
|
471
|
+
)
|
472
|
+
)
|
473
|
+
)
|
474
|
+
),
|
475
|
+
_react2.default.createElement(
|
476
|
+
'div',
|
477
|
+
{ className: 'member-level' },
|
478
|
+
_react2.default.createElement(
|
479
|
+
'span',
|
480
|
+
null,
|
481
|
+
MemberType.Name
|
482
|
+
)
|
483
|
+
),
|
484
|
+
_react2.default.createElement(
|
485
|
+
'div',
|
486
|
+
{ className: 'member-info-container' },
|
487
|
+
_react2.default.createElement(
|
488
|
+
'div',
|
489
|
+
{ className: 'member-infos' },
|
490
|
+
_react2.default.createElement(
|
491
|
+
'h1',
|
492
|
+
{ className: 'member-info-name' },
|
493
|
+
Name
|
494
|
+
),
|
495
|
+
_react2.default.createElement(
|
496
|
+
'p',
|
497
|
+
{ className: 'member-phone' },
|
498
|
+
Mobilephone || CardCode
|
499
|
+
)
|
500
|
+
),
|
501
|
+
_react2.default.createElement(
|
502
|
+
'div',
|
503
|
+
{ className: 'member-money' },
|
504
|
+
_react2.default.createElement(
|
505
|
+
'div',
|
506
|
+
{ className: 'score' },
|
507
|
+
_react2.default.createElement(
|
508
|
+
'span',
|
509
|
+
null,
|
510
|
+
(0, _utils.formatPrecision)(BalanceIntegral, precisionInfo.BalanceIntegral),
|
511
|
+
'\u79EF\u5206'
|
512
|
+
)
|
513
|
+
),
|
514
|
+
_react2.default.createElement(
|
515
|
+
'div',
|
516
|
+
{ className: 'balance' },
|
517
|
+
_react2.default.createElement(
|
518
|
+
'span',
|
519
|
+
null,
|
520
|
+
BalanceStorage ? (0, _utils.formatPrecision)(BalanceStorage, precisionInfo.BalanceStorage) : 0,
|
521
|
+
'\u4F59\u989D'
|
522
|
+
)
|
523
|
+
)
|
524
|
+
),
|
525
|
+
IsEnableUMember && _react2.default.createElement(
|
526
|
+
'div',
|
527
|
+
{ className: 'member-tag' },
|
528
|
+
labels.map(function (item, key) {
|
529
|
+
return _react2.default.createElement(
|
530
|
+
'span',
|
531
|
+
{ key: key },
|
532
|
+
item
|
533
|
+
);
|
534
|
+
})
|
535
|
+
)
|
536
|
+
),
|
537
|
+
isSelected && _react2.default.createElement(
|
538
|
+
'div',
|
539
|
+
{ className: 'member-selected-icon' },
|
540
|
+
_react2.default.createElement(
|
541
|
+
'div',
|
542
|
+
{ className: 'member-selected-icon-arrow' },
|
543
|
+
_react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'huiyuanxuanzhong' })
|
544
|
+
)
|
545
|
+
)
|
546
|
+
);
|
547
|
+
};
|
548
|
+
|
424
549
|
_this2.usersLoadSuccess = function () {
|
425
550
|
var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
426
551
|
var type = arguments[1];
|
@@ -443,7 +568,7 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
443
568
|
}
|
444
569
|
_this2.setState({ memberList: data }, function () {
|
445
570
|
if (type === 'search') {
|
446
|
-
_this2.
|
571
|
+
_this2.resetSlideTop();
|
447
572
|
}
|
448
573
|
|
449
574
|
var _data = (0, _slicedToArray3.default)(data, 1),
|
@@ -466,12 +591,18 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
466
591
|
memberInfo: { record: [], like: [], recency: [] }
|
467
592
|
}, function () {
|
468
593
|
if (type === 'search') {
|
469
|
-
_this2.
|
594
|
+
_this2.resetSlideTop();
|
470
595
|
}
|
471
596
|
});
|
472
597
|
}
|
473
598
|
};
|
474
599
|
|
600
|
+
_this2.resetSlideTop = function () {
|
601
|
+
if (memberSwiper) {
|
602
|
+
memberSwiper.slideTo(0, 0, false);
|
603
|
+
}
|
604
|
+
};
|
605
|
+
|
475
606
|
_this2.getMemberStateStamp = function (item) {
|
476
607
|
var arr = [];
|
477
608
|
var isExpiration = item.isExpiration,
|
@@ -490,10 +621,10 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
490
621
|
return arr;
|
491
622
|
};
|
492
623
|
|
493
|
-
_this2.handleOk = function (
|
494
|
-
var _this2$
|
495
|
-
member = _this2$
|
496
|
-
errorMsg = _this2$
|
624
|
+
_this2.handleOk = function (nomemberList) {
|
625
|
+
var _this2$state5 = _this2.state,
|
626
|
+
member = _this2$state5.member,
|
627
|
+
errorMsg = _this2$state5.errorMsg;
|
497
628
|
|
498
629
|
var _ref5 = member || {},
|
499
630
|
isExpiration = _ref5.isExpiration,
|
@@ -503,7 +634,7 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
503
634
|
var Id = _ref5$MemberState.Id,
|
504
635
|
Name = _ref5$MemberState.Name;
|
505
636
|
|
506
|
-
if (
|
637
|
+
if (nomemberList) {
|
507
638
|
return _this2.props.onCancel();
|
508
639
|
}
|
509
640
|
if (errorMsg) return _tplusComponentsTouch.Message.warn(errorMsg);
|
@@ -634,6 +765,7 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
634
765
|
_this2.state = {
|
635
766
|
searchValue: '',
|
636
767
|
memberList: [],
|
768
|
+
memberLength: 0,
|
637
769
|
memberInfo: {
|
638
770
|
record: [],
|
639
771
|
like: [],
|
@@ -643,8 +775,7 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
643
775
|
isCC: !!isNewRetailBCPos,
|
644
776
|
tabIndex: _this2.props.defaultActiveKey,
|
645
777
|
isAllAuthority: false,
|
646
|
-
tabMenuHeight: mode !== 'practice' ? 64 : 0
|
647
|
-
cardInfo: [] // 会员的卡信息
|
778
|
+
tabMenuHeight: mode !== 'practice' ? 64 : 0 // 64为table上部操作菜单高度
|
648
779
|
};
|
649
780
|
_this2.ms = _api2.default;
|
650
781
|
return _this2;
|
@@ -653,27 +784,35 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
653
784
|
(0, _createClass3.default)(ShopMember, [{
|
654
785
|
key: 'componentDidMount',
|
655
786
|
value: function componentDidMount() {
|
656
|
-
|
657
|
-
|
658
|
-
|
659
|
-
|
660
|
-
|
661
|
-
|
662
|
-
|
663
|
-
|
664
|
-
|
665
|
-
|
666
|
-
|
667
|
-
|
668
|
-
|
669
|
-
|
787
|
+
var _this3 = this;
|
788
|
+
|
789
|
+
swiperSelectObserver = new IntersectionObserver(function (entries) {
|
790
|
+
var _entries$ = entries[0],
|
791
|
+
_entries$$boundingCli = _entries$.boundingClientRect;
|
792
|
+
_entries$$boundingCli = _entries$$boundingCli === undefined ? {} : _entries$$boundingCli;
|
793
|
+
var height = _entries$$boundingCli.height,
|
794
|
+
bottom = _entries$$boundingCli.bottom,
|
795
|
+
top = _entries$$boundingCli.top,
|
796
|
+
intersectionRatio = _entries$.intersectionRatio;
|
797
|
+
|
798
|
+
if (intersectionRatio !== 1 && _this3.isHotKeyAction) {
|
799
|
+
_this3.isHotKeyAction = false;
|
800
|
+
|
801
|
+
bottom > height && memberSwiper.slideNext();
|
802
|
+
// 解决向上滑动时top < 10 时距离问题
|
803
|
+
if (top < -10) {
|
804
|
+
top < height && memberSwiper.slidePrev() && memberSwiper.slidePrev();
|
805
|
+
} else {
|
806
|
+
top < height && memberSwiper.slidePrev();
|
807
|
+
}
|
808
|
+
}
|
809
|
+
});
|
670
810
|
|
671
811
|
window.addEventListener('resize', this.windowOnresize);
|
672
812
|
var _props = this.props,
|
673
813
|
viewMemberInfo = _props.viewMemberInfo,
|
674
814
|
status = _props.status,
|
675
|
-
columnInfo = _props.columnInfo
|
676
|
-
storeKey = _props.storeKey;
|
815
|
+
columnInfo = _props.columnInfo;
|
677
816
|
|
678
817
|
if (viewMemberInfo) {
|
679
818
|
if (status) {
|
@@ -695,12 +834,35 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
695
834
|
}, {
|
696
835
|
key: 'componentDidUpdate',
|
697
836
|
value: function componentDidUpdate() {
|
837
|
+
var _this4 = this;
|
838
|
+
|
698
839
|
var _state = this.state,
|
699
840
|
_state$memberList = _state.memberList,
|
700
841
|
memberList = _state$memberList === undefined ? [] : _state$memberList,
|
842
|
+
memberLength = _state.memberLength,
|
701
843
|
memberTabHeight = _state.memberTabHeight,
|
702
844
|
tabMenuHeight = _state.tabMenuHeight;
|
703
845
|
|
846
|
+
if (memberList.length !== memberLength) {
|
847
|
+
this.setState({ memberLength: memberList.length }, function () {
|
848
|
+
if (memberSwiper) {
|
849
|
+
return memberSwiper.updateSlides();
|
850
|
+
}
|
851
|
+
memberSwiper = new _swiper2.default('.swiper-member-container', {
|
852
|
+
direction: 'vertical',
|
853
|
+
slidesPerView: 'auto',
|
854
|
+
mousewheel: true,
|
855
|
+
watchSlidesProgress: true,
|
856
|
+
on: {
|
857
|
+
progress: _this4.progressListen
|
858
|
+
},
|
859
|
+
scrollbar: {
|
860
|
+
el: '.swiper-scrollbar',
|
861
|
+
hide: true
|
862
|
+
}
|
863
|
+
});
|
864
|
+
});
|
865
|
+
}
|
704
866
|
var clientHeight = this.memberTab.clientHeight - tabMenuHeight;
|
705
867
|
if (clientHeight !== memberTabHeight) {
|
706
868
|
this.setState({ memberTabHeight: clientHeight });
|
@@ -710,69 +872,21 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
710
872
|
key: 'componentWillUnmount',
|
711
873
|
value: function componentWillUnmount() {
|
712
874
|
|
713
|
-
|
714
|
-
|
875
|
+
memberSwiper && memberSwiper.destroy(false);
|
876
|
+
memberSwiper = undefined;
|
715
877
|
this.willUnmount = true;
|
716
878
|
|
717
879
|
window.removeEventListener('resize', this.windowOnresize);
|
718
|
-
|
880
|
+
swiperSelectObserver.disconnect();
|
719
881
|
$.off(this.hotKeyListener);
|
720
882
|
}
|
721
|
-
}, {
|
722
|
-
key: 'getCardInfoByMemberId',
|
723
|
-
|
724
|
-
|
725
|
-
// 获取会员的卡信息
|
726
|
-
value: function () {
|
727
|
-
var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(memberId) {
|
728
|
-
var cardInfo, _cardInfo$data, data;
|
729
|
-
|
730
|
-
return _regenerator2.default.wrap(function _callee$(_context) {
|
731
|
-
while (1) {
|
732
|
-
switch (_context.prev = _context.next) {
|
733
|
-
case 0:
|
734
|
-
_context.next = 2;
|
735
|
-
return this.ms.getCardInfoByMemberId(memberId);
|
736
|
-
|
737
|
-
case 2:
|
738
|
-
_context.t0 = _context.sent;
|
739
|
-
|
740
|
-
if (_context.t0) {
|
741
|
-
_context.next = 5;
|
742
|
-
break;
|
743
|
-
}
|
744
|
-
|
745
|
-
_context.t0 = {};
|
746
|
-
|
747
|
-
case 5:
|
748
|
-
cardInfo = _context.t0;
|
749
|
-
_cardInfo$data = cardInfo.data, data = _cardInfo$data === undefined ? [] : _cardInfo$data;
|
750
|
-
|
751
|
-
this.setState({
|
752
|
-
cardInfo: data
|
753
|
-
});
|
754
|
-
|
755
|
-
case 8:
|
756
|
-
case 'end':
|
757
|
-
return _context.stop();
|
758
|
-
}
|
759
|
-
}
|
760
|
-
}, _callee, this);
|
761
|
-
}));
|
762
|
-
|
763
|
-
function getCardInfoByMemberId(_x6) {
|
764
|
-
return _ref8.apply(this, arguments);
|
765
|
-
}
|
766
|
-
|
767
|
-
return getCardInfoByMemberId;
|
768
|
-
}()
|
769
883
|
|
770
884
|
//获取会员状态集合,在页面上以图片戳的形式展示。
|
771
885
|
|
772
886
|
}, {
|
773
887
|
key: 'render',
|
774
888
|
value: function render() {
|
775
|
-
var
|
889
|
+
var _this5 = this;
|
776
890
|
|
777
891
|
var isUserAndroidKey = !!window.android_setKeyBoard;
|
778
892
|
|
@@ -800,10 +914,7 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
800
914
|
loadingUser = _state2.loadingUser,
|
801
915
|
loadingBtn = _state2.loadingBtn,
|
802
916
|
selected = _state2.selected,
|
803
|
-
isAllAuthority = _state2.isAllAuthority
|
804
|
-
isCC = _state2.isCC,
|
805
|
-
cardInfo = _state2.cardInfo,
|
806
|
-
cardList = _state2.cardList;
|
917
|
+
isAllAuthority = _state2.isAllAuthority;
|
807
918
|
var _props2 = this.props,
|
808
919
|
status = _props2.status,
|
809
920
|
showModal = _props2.showModal,
|
@@ -813,14 +924,12 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
813
924
|
onCancel = _props2.onCancel,
|
814
925
|
viewMemberInfo = _props2.viewMemberInfo,
|
815
926
|
authProcess = _props2.authProcess,
|
816
|
-
mode = _props2.mode
|
817
|
-
title = _props2.title,
|
818
|
-
storeKey = _props2.storeKey;
|
927
|
+
mode = _props2.mode;
|
819
928
|
var _ms$precisionInfo = this.ms.precisionInfo,
|
820
929
|
precisionInfo = _ms$precisionInfo === undefined ? {} : _ms$precisionInfo;
|
821
930
|
|
822
931
|
var showSearch = ['会员查询'].includes(type);
|
823
|
-
var
|
932
|
+
var nomemberList = !memberList.length;
|
824
933
|
var showSelectBtn = type === '会员查询' || !!status;
|
825
934
|
//是否正常开单
|
826
935
|
var voucherStateType = mode !== 'practice';
|
@@ -841,27 +950,27 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
841
950
|
className: _tplusComponentsTouch.hotKey.hotKeyNotFilter('search-input') + ' android_focus_keyboard',
|
842
951
|
value: searchValue,
|
843
952
|
type: 'native',
|
844
|
-
onChange: function onChange(
|
845
|
-
var searchValue =
|
846
|
-
return
|
953
|
+
onChange: function onChange(_ref8) {
|
954
|
+
var searchValue = _ref8.target.value;
|
955
|
+
return _this5.setState({ searchValue: searchValue });
|
847
956
|
},
|
848
957
|
inputRef: function inputRef(ref) {
|
849
|
-
return
|
958
|
+
return _this5.searchRef = ref;
|
850
959
|
},
|
851
960
|
onClear: function onClear() {
|
852
|
-
return
|
961
|
+
return _this5.onClear('searchValue', _this5.searchRef);
|
853
962
|
},
|
854
|
-
onFocus: function onFocus(
|
855
|
-
var target =
|
963
|
+
onFocus: function onFocus(_ref9) {
|
964
|
+
var target = _ref9.target;
|
856
965
|
|
857
966
|
if (!isUserAndroidKey) {
|
858
|
-
|
859
|
-
|
967
|
+
_this5.focusInputName = 'searchValue';
|
968
|
+
_this5.inputTarget = target;
|
860
969
|
_tplusComponentsTouch.Keyboard.open(function (v) {
|
861
|
-
var key =
|
862
|
-
var value = _tplusComponentsTouch.Keyboard.getNewValue(
|
863
|
-
|
864
|
-
},
|
970
|
+
var key = _this5.focusInputName;
|
971
|
+
var value = _tplusComponentsTouch.Keyboard.getNewValue(_this5.inputTarget, _this5.inputTarget.value, v);
|
972
|
+
_this5.setState((0, _defineProperty3.default)({}, key, value));
|
973
|
+
}, _this5.keyboardOnOk, _this5.keyboardOnClose)();
|
865
974
|
}
|
866
975
|
},
|
867
976
|
onBlur: _tplusComponentsTouch.Keyboard.close,
|
@@ -875,61 +984,62 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
875
984
|
),
|
876
985
|
_react2.default.createElement(
|
877
986
|
'div',
|
878
|
-
{ ref: function ref(
|
879
|
-
return
|
880
|
-
}, className:
|
881
|
-
this.dataLoaded &&
|
882
|
-
_react2.default.createElement(
|
883
|
-
|
884
|
-
|
885
|
-
|
886
|
-
|
887
|
-
|
888
|
-
|
889
|
-
|
890
|
-
|
891
|
-
|
892
|
-
|
893
|
-
|
894
|
-
|
895
|
-
|
896
|
-
|
897
|
-
|
898
|
-
|
987
|
+
{ ref: function ref(_ref10) {
|
988
|
+
return _this5.memberTab = _ref10;
|
989
|
+
}, className: _tplusComponentsTouch.hotKey.hotKeyBindClass('4', 'member-shop-content') },
|
990
|
+
this.dataLoaded && nomemberList && _react2.default.createElement('div', { className: 'empty-data-img' }),
|
991
|
+
_react2.default.createElement(
|
992
|
+
'div',
|
993
|
+
{ className: 'member-card-list-side', style: { display: nomemberList ? 'none' : 'block' } },
|
994
|
+
_react2.default.createElement(
|
995
|
+
'div',
|
996
|
+
{ className: 'swiper-member-container', style: { height: '100%' } },
|
997
|
+
_react2.default.createElement(
|
998
|
+
'div',
|
999
|
+
{ className: 'swiper-wrapper' },
|
1000
|
+
memberList.map(function (value, key) {
|
1001
|
+
return _this5.getCardRender(value, key, IsEnableUMember, precisionInfo);
|
1002
|
+
}),
|
1003
|
+
!memberList.length && _react2.default.createElement(
|
1004
|
+
'span',
|
1005
|
+
{ className: 'empty-data-tip', style: { marginTop: 30 } },
|
1006
|
+
'\u6CA1\u6709\u76F8\u5173\u6570\u636E~'
|
1007
|
+
),
|
1008
|
+
loadmoreLoading && _react2.default.createElement(
|
1009
|
+
'span',
|
1010
|
+
{ className: 'empty-data-tip empty-data-tip-member-card' },
|
1011
|
+
'\u6570\u636E\u52A0\u8F7D\u4E2D ...'
|
1012
|
+
),
|
1013
|
+
nomoreData && _react2.default.createElement(
|
1014
|
+
'span',
|
1015
|
+
{ className: 'empty-data-tip empty-data-tip-member-card' },
|
1016
|
+
'\u6CA1\u6709\u66F4\u591A\u6570\u636E\u4E86~'
|
1017
|
+
)
|
1018
|
+
),
|
1019
|
+
_react2.default.createElement('div', { className: 'swiper-scrollbar' })
|
1020
|
+
)
|
1021
|
+
),
|
899
1022
|
_react2.default.createElement(
|
900
1023
|
'div',
|
901
|
-
{ className: 'member-content-tab content', style: { display:
|
1024
|
+
{ className: 'member-content-tab content', style: { display: nomemberList ? 'none' : 'flex' } },
|
902
1025
|
voucherStateType && !isAllAuthority && _react2.default.createElement(
|
903
1026
|
'div',
|
904
1027
|
null,
|
905
1028
|
_react2.default.createElement(
|
906
1029
|
'div',
|
907
1030
|
{ className: 'menu' },
|
908
|
-
_react2.default.createElement(
|
909
|
-
|
910
|
-
|
911
|
-
loadUserList: this.loadUserList,
|
912
|
-
member: member,
|
913
|
-
memberEnumState: memberEnumState,
|
914
|
-
loadingBtn: loadingBtn,
|
915
|
-
selected: selected,
|
916
|
-
cardList: cardList,
|
917
|
-
getCardList: this.getCardList,
|
918
|
-
loadUserInfo: function loadUserInfo(key, Idmember, item, type, syncUpdateMember) {
|
919
|
-
return _this3.loadUserInfo(key, Idmember, item, type, syncUpdateMember);
|
920
|
-
},
|
921
|
-
handleChange: this.MemberMenuChange })
|
1031
|
+
_react2.default.createElement(_index2.default, { authProcess: authProcess, changeIsAllAuthority: this.changeIsAllAuthority, loadUserList: this.loadUserList, member: member, memberEnumState: memberEnumState, loadingBtn: loadingBtn, selected: selected, loadUserInfo: function loadUserInfo(key, Idmember, item, type, syncUpdateMember) {
|
1032
|
+
return _this5.loadUserInfo(key, Idmember, item, type, syncUpdateMember);
|
1033
|
+
}, handleChange: this.MemberMenuChange })
|
922
1034
|
),
|
923
1035
|
_react2.default.createElement('div', { className: 'line' })
|
924
1036
|
),
|
925
|
-
_react2.default.createElement(
|
1037
|
+
_react2.default.createElement(_memberTab2.default, {
|
926
1038
|
defaultActiveKey: defaultActiveKey,
|
927
1039
|
member: member,
|
928
1040
|
memberInfo: memberInfo,
|
929
1041
|
showModal: showModal,
|
930
|
-
title: title,
|
931
1042
|
titleModal: titleModal,
|
932
|
-
storeKey: storeKey,
|
933
1043
|
recommend: recommend,
|
934
1044
|
memberTabHeight: memberTabHeight,
|
935
1045
|
initEmpty: initEmpty,
|
@@ -937,8 +1047,7 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
937
1047
|
columnInfo: columnInfo,
|
938
1048
|
precisionInfo: precisionInfo,
|
939
1049
|
onChange: this.memberTabChange,
|
940
|
-
getMemberStateStamp: this.getMemberStateStamp
|
941
|
-
cardInfo: cardInfo
|
1050
|
+
getMemberStateStamp: this.getMemberStateStamp
|
942
1051
|
})
|
943
1052
|
)
|
944
1053
|
),
|
@@ -954,13 +1063,13 @@ var ShopMember = (_temp = _class = function (_Component) {
|
|
954
1063
|
_button2.default,
|
955
1064
|
{
|
956
1065
|
onClick: function onClick() {
|
957
|
-
return
|
1066
|
+
return _this5.handleOk(nomemberList);
|
958
1067
|
},
|
959
1068
|
type: 'primary',
|
960
1069
|
style: { marginRight: 5 },
|
961
1070
|
disabled: loadingUser
|
962
1071
|
},
|
963
|
-
loadingUser ? '加载会员' :
|
1072
|
+
loadingUser ? '加载会员' : nomemberList ? '确定' : '选取会员'
|
964
1073
|
)
|
965
1074
|
)
|
966
1075
|
);
|