tplus-member 3.27.5 → 3.27.9

package/dist/member/ShopMember.js

@@ -9,6 +9,14 @@ var _button = require('antd/es/button');
 
 var _button2 = _interopRequireDefault(_button);
 
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
 var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
 
 var _defineProperty3 = _interopRequireDefault(_defineProperty2);
@@ -71,33 +79,32 @@ var _api = require('./api');
 
 var _api2 = _interopRequireDefault(_api);
 
-var _memberTab = require('./memberTab');
+var _index = require('./memberTab/index.js');
 
-var _memberTab2 = _interopRequireDefault(_memberTab);
-
-var _swiper = require('swiper/dist/js/swiper.js');
-
-var _swiper2 = _interopRequireDefault(_swiper);
-
-require('swiper/dist/css/swiper.min.css');
+var _index2 = _interopRequireDefault(_index);
 
 require('./ShopMember.less');
 
 var _utils = require('../utils');
 
-var _index = require('./memberMenu/index.js');
+var _index3 = require('./memberMenu/index.js');
 
-var _index2 = _interopRequireDefault(_index);
+var _index4 = _interopRequireDefault(_index3);
+
+var _MemberCardList = require('./MemberCardList');
+
+var _MemberCardList2 = _interopRequireDefault(_MemberCardList);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var memberSwiper = void 0;
-var swiperSelectObserver = void 0;
+// let swiperSelectObserver;
 
 var ShopMember = (_temp = _class = function (_Component) {
   (0, _inherits3.default)(ShopMember, _Component);
 
   function ShopMember(props) {
+    var _this3 = this;
+
     (0, _classCallCheck3.default)(this, ShopMember);
 
     var _this2 = (0, _possibleConstructorReturn3.default)(this, (ShopMember.__proto__ || (0, _getPrototypeOf2.default)(ShopMember)).call(this, props));
@@ -164,7 +171,7 @@ var ShopMember = (_temp = _class = function (_Component) {
     };
 
     _this2.loadUserInfo = function (key, Idmember, item, type, syncUpdateMember) {
-      _this2.observerCard();
+      // this.observerCard();
 
       var _this2$props = _this2.props,
           selectChange = _this2$props.selectChange,
@@ -241,6 +248,9 @@ var ShopMember = (_temp = _class = function (_Component) {
         });
         _mutantsMicrofx.stores.selectMemberStore.setCurMemberInfo(ret);
         selectChange && selectChange(item);
+        // 获取购买记录
+        _this2.resetLastRetail(0);
+        _this2.findMemberLastRetailDetailList(3);
         // 更新当前选定的会员信息
         if (syncUpdateMember) {
           var _ref2 = _this2.context.viewModel || {},
@@ -256,6 +266,8 @@ var ShopMember = (_temp = _class = function (_Component) {
             memberChange && memberChange(ret);
           }
         }
+        // 获取会员的卡信息
+        _this2.getCardInfoByMemberId(Idmember);
       }).catch(function (err) {
         selectChange && selectChange({});
         if (_this2.isNotSetState(Idmember)) return;
@@ -398,6 +410,7 @@ var ShopMember = (_temp = _class = function (_Component) {
 
     _this2.handleSearchClick = function () {
       var searchValue = _this2.state.searchValue;
+      var storeKey = _this2.props.storeKey;
 
       _this2.userSearch = true;
       _this2.currentPage = 1;
@@ -409,139 +422,6 @@ var ShopMember = (_temp = _class = function (_Component) {
       _this2.setState({ searchValue: val });
     };
 
-    _this2.getCardRender = function () {
-      var item = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var key = arguments[1];
-      var IsEnableUMember = arguments[2];
-      var precisionInfo = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-      var ID = item.ID,
-          Name = item.Name,
-          Mobilephone = item.Mobilephone,
-          CardCode = item.CardCode,
-          BalanceIntegral = item.BalanceIntegral,
-          BalanceStorage = item.BalanceStorage,
-          _item$MemberType = item.MemberType,
-          MemberType = _item$MemberType === undefined ? {} : _item$MemberType,
-          IsFocusUmember = item.IsFocusUmember,
-          _item$UmemberLabel = item.UmemberLabel,
-          UmemberLabel = _item$UmemberLabel === undefined ? '' : _item$UmemberLabel,
-          ImageFile = item.ImageFile,
-          _item$ExpirationDate = item.ExpirationDate,
-          ExpirationDate = _item$ExpirationDate === undefined ? '' : _item$ExpirationDate,
-          isExpiration = item.isExpiration,
-          isUserLogout = item.isUserLogout,
-          UmemberOpenId = item.UmemberOpenId;
-
-      var iconItems = _this2.getMemberStateStamp(item);
-      var labels = UmemberLabel ? UmemberLabel.split(',') : [];
-      var defaultAvatar = 'https://newretail.static.chanjet.com/default_avatar.png';
-      var _this2$state4 = _this2.state,
-          selected = _this2$state4.selected,
-          isCC = _this2$state4.isCC;
-
-      var isSelected = selected === key;
-      return _react2.default.createElement(
-        'div',
-        { key: key, className: 'swiper-slide member-item-slide ' + (isSelected ? 'slide-selected' : ''), onClick: function onClick() {
-            return _this2.loadUserInfo(key, ID, item);
-          } },
-        iconItems && iconItems.length > 0 && _react2.default.createElement(
-          'div',
-          { className: 'memberstate-stamp' },
-          iconItems
-        ),
-        _react2.default.createElement(
-          'div',
-          { className: 'card-avatar' },
-          _react2.default.createElement(
-            'div',
-            { className: 'avatar-box' },
-            _react2.default.createElement('img', { src: ImageFile || defaultAvatar, width: 60, height: 60 }),
-            IsEnableUMember && _react2.default.createElement(
-              'div',
-              { className: 'avatar-bage ' + (UmemberOpenId ? 'bage-follow' : '') },
-              _react2.default.createElement(
-                'div',
-                { className: 'avatar-bage-scale' },
-                UmemberOpenId ? '已关注' : '未关注'
-              )
-            )
-          )
-        ),
-        _react2.default.createElement(
-          'div',
-          { className: 'member-level' },
-          _react2.default.createElement(
-            'span',
-            null,
-            MemberType.Name
-          )
-        ),
-        _react2.default.createElement(
-          'div',
-          { className: 'member-info-container' },
-          _react2.default.createElement(
-            'div',
-            { className: 'member-infos' },
-            _react2.default.createElement(
-              'h1',
-              { className: 'member-info-name' },
-              Name
-            ),
-            _react2.default.createElement(
-              'p',
-              { className: 'member-phone' },
-              Mobilephone || CardCode
-            )
-          ),
-          _react2.default.createElement(
-            'div',
-            { className: 'member-money' },
-            _react2.default.createElement(
-              'div',
-              { className: 'score' },
-              _react2.default.createElement(
-                'span',
-                null,
-                (0, _utils.formatPrecision)(BalanceIntegral, precisionInfo.BalanceIntegral),
-                '\u79EF\u5206'
-              )
-            ),
-            _react2.default.createElement(
-              'div',
-              { className: 'balance' },
-              _react2.default.createElement(
-                'span',
-                null,
-                BalanceStorage ? (0, _utils.formatPrecision)(BalanceStorage, precisionInfo.BalanceStorage) : 0,
-                '\u4F59\u989D'
-              )
-            )
-          ),
-          IsEnableUMember && _react2.default.createElement(
-            'div',
-            { className: 'member-tag' },
-            labels.map(function (item, key) {
-              return _react2.default.createElement(
-                'span',
-                { key: key },
-                item
-              );
-            })
-          )
-        ),
-        isSelected && _react2.default.createElement(
-          'div',
-          { className: 'member-selected-icon' },
-          _react2.default.createElement(
-            'div',
-            { className: 'member-selected-icon-arrow' },
-            _react2.default.createElement(_tplusComponentsTouch.Ticon, { type: 'huiyuanxuanzhong' })
-          )
-        )
-      );
-    };
-
     _this2.usersLoadSuccess = function () {
       var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       var type = arguments[1];
@@ -564,7 +444,7 @@ var ShopMember = (_temp = _class = function (_Component) {
         }
         _this2.setState({ memberList: data }, function () {
           if (type === 'search') {
-            _this2.resetSlideTop();
+            _this2.memberCardList.resetSlideTop();
           }
 
           var _data = (0, _slicedToArray3.default)(data, 1),
@@ -587,18 +467,12 @@ var ShopMember = (_temp = _class = function (_Component) {
           memberInfo: { record: [], like: [], recency: [] }
         }, function () {
           if (type === 'search') {
-            _this2.resetSlideTop();
+            _this2.memberCardList.resetSlideTop();
           }
         });
       }
     };
 
-    _this2.resetSlideTop = function () {
-      if (memberSwiper) {
-        memberSwiper.slideTo(0, 0, false);
-      }
-    };
-
     _this2.getMemberStateStamp = function (item) {
       var arr = [];
       var isExpiration = item.isExpiration,
@@ -617,10 +491,10 @@ var ShopMember = (_temp = _class = function (_Component) {
       return arr;
     };
 
-    _this2.handleOk = function (nomemberList) {
-      var _this2$state5 = _this2.state,
-          member = _this2$state5.member,
-          errorMsg = _this2$state5.errorMsg;
+    _this2.handleOk = function (noList) {
+      var _this2$state4 = _this2.state,
+          member = _this2$state4.member,
+          errorMsg = _this2$state4.errorMsg;
 
       var _ref5 = member || {},
           isExpiration = _ref5.isExpiration,
@@ -630,7 +504,7 @@ var ShopMember = (_temp = _class = function (_Component) {
       var Id = _ref5$MemberState.Id,
           Name = _ref5$MemberState.Name;
 
-      if (nomemberList) {
+      if (noList) {
         return _this2.props.onCancel();
       }
       if (errorMsg) return _tplusComponentsTouch.Message.warn(errorMsg);
@@ -643,10 +517,14 @@ var ShopMember = (_temp = _class = function (_Component) {
       var _ref6$data$Member = _ref6$data.Member;
       _ref6$data$Member = _ref6$data$Member === undefined ? {} : _ref6$data$Member;
       var ID = _ref6$data$Member.ID,
+          IdbusiType = _ref6$data.IdbusiType,
           _ref6$items = _ref6.items,
           items = _ref6$items === undefined ? [] : _ref6$items;
 
-
+      if (IdbusiType == 39) {
+        _tplusComponentsTouch.Message.warn('取货时不可以切换选择会员');
+        return;
+      }
       var viewVoucher = items.find(function (v) {
         return v.type === 'Voucher';
       }) || {};
@@ -753,15 +631,100 @@ var ShopMember = (_temp = _class = function (_Component) {
       });
     };
 
+    _this2.resetLastRetail = function () {
+      var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(pageNo) {
+        return _regenerator2.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this2.setState({
+                  lastRetailPageNo: pageNo
+                });
+
+              case 1:
+              case 'end':
+                return _context.stop();
+            }
+          }
+        }, _callee, _this3);
+      }));
+
+      return function (_x6) {
+        return _ref7.apply(this, arguments);
+      };
+    }();
+
+    _this2.findMemberLastRetailDetailList = function () {
+      var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(pageSize) {
+        var _this2$state5, lastRetailPageNo, _this2$state5$member, ID, _this2$state5$lastRet, lastRetailList, params, ret, _ret$data, _ret$data$recencyBean, recencyBeanList, _ret$data$totalCount, totalCount;
+
+        return _regenerator2.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _this2$state5 = _this2.state, lastRetailPageNo = _this2$state5.lastRetailPageNo, _this2$state5$member = _this2$state5.member;
+                _this2$state5$member = _this2$state5$member === undefined ? {} : _this2$state5$member;
+                ID = _this2$state5$member.ID, _this2$state5$lastRet = _this2$state5.lastRetailList, lastRetailList = _this2$state5$lastRet === undefined ? [] : _this2$state5$lastRet;
+                params = {
+                  memberId: ID,
+                  pageNo: lastRetailPageNo,
+                  pageSize: pageSize
+                };
+
+                _this2.setState({
+                  lastRetailLoading: true
+                });
+                _context2.prev = 5;
+                _context2.next = 8;
+                return _this2.ms.findMemberLastRetailDetail(params);
+
+              case 8:
+                ret = _context2.sent;
+                _ret$data = ret.data;
+                _ret$data = _ret$data === undefined ? {} : _ret$data;
+                _ret$data$recencyBean = _ret$data.recencyBeanList, recencyBeanList = _ret$data$recencyBean === undefined ? [] : _ret$data$recencyBean, _ret$data$totalCount = _ret$data.totalCount, totalCount = _ret$data$totalCount === undefined ? 0 : _ret$data$totalCount;
+
+                lastRetailList.push.apply(lastRetailList, (0, _toConsumableArray3.default)(recencyBeanList));
+
+                _this2.setState({
+                  lastRetailTotal: totalCount,
+                  lastRetailLoading: false,
+                  lastRetailPageNo: pageSize === 3 ? 0 : _this2.state.lastRetailPageNo + 1,
+                  lastRetailList: _this2.state.lastRetailPageNo === 0 ? recencyBeanList : lastRetailList
+                });
+
+                _context2.next = 19;
+                break;
+
+              case 16:
+                _context2.prev = 16;
+                _context2.t0 = _context2['catch'](5);
+
+                _this2.setState({
+                  lastRetailLoading: false
+                });
+
+              case 19:
+              case 'end':
+                return _context2.stop();
+            }
+          }
+        }, _callee2, _this3, [[5, 16]]);
+      }));
+
+      return function (_x7) {
+        return _ref8.apply(this, arguments);
+      };
+    }();
+
     var mode = _this2.props.mode;
 
-    var _ref7 = _mutantsUtil.platform || {},
-        isNewRetailBCPos = _ref7.isNewRetailBCPos;
+    var _ref9 = _mutantsUtil.platform || {},
+        isNewRetailBCPos = _ref9.isNewRetailBCPos;
 
     _this2.state = {
       searchValue: '',
       memberList: [],
-      memberLength: 0,
       memberInfo: {
         record: [],
         like: [],
@@ -771,7 +734,12 @@ var ShopMember = (_temp = _class = function (_Component) {
       isCC: !!isNewRetailBCPos,
       tabIndex: _this2.props.defaultActiveKey,
       isAllAuthority: false,
-      tabMenuHeight: mode !== 'practice' ? 64 : 0 // 64为table上部操作菜单高度
+      tabMenuHeight: mode !== 'practice' ? 64 : 0, // 64为table上部操作菜单高度
+      cardInfo: [], // 会员的卡信息
+      lastRetailList: [], // 最近购买列表
+      lastRetailTotal: 0, // 最近购买的总数量
+      lastRetailPageNo: 0, // 最近购买的当前页，默认0开始
+      lastRetailLoading: false // 是否正在加载购买记录
     };
     _this2.ms = _api2.default;
     return _this2;
@@ -780,35 +748,27 @@ var ShopMember = (_temp = _class = function (_Component) {
   (0, _createClass3.default)(ShopMember, [{
     key: 'componentDidMount',
     value: function componentDidMount() {
-      var _this3 = this;
-
-      swiperSelectObserver = new IntersectionObserver(function (entries) {
-        var _entries$ = entries[0],
-            _entries$$boundingCli = _entries$.boundingClientRect;
-        _entries$$boundingCli = _entries$$boundingCli === undefined ? {} : _entries$$boundingCli;
-        var height = _entries$$boundingCli.height,
-            bottom = _entries$$boundingCli.bottom,
-            top = _entries$$boundingCli.top,
-            intersectionRatio = _entries$.intersectionRatio;
-
-        if (intersectionRatio !== 1 && _this3.isHotKeyAction) {
-          _this3.isHotKeyAction = false;
-
-          bottom > height && memberSwiper.slideNext();
-          // 解决向上滑动时top < 10 时距离问题
-          if (top < -10) {
-            top < height && memberSwiper.slidePrev() && memberSwiper.slidePrev();
-          } else {
-            top < height && memberSwiper.slidePrev();
-          }
-        }
-      });
+      // swiperSelectObserver = new IntersectionObserver(entries => {
+      //   const { boundingClientRect: { height, bottom, top } = {}, intersectionRatio } = entries[0];
+      //   if (intersectionRatio !== 1 && this.isHotKeyAction) {
+      //     this.isHotKeyAction = false;
+
+      //     bottom > height && memberSwiper.slideNext();
+      //     // 解决向上滑动时top < 10 时距离问题
+      //     if (top < -10) {
+      //       top < height && memberSwiper.slidePrev() && memberSwiper.slidePrev()
+      //     } else {
+      //       top < height && memberSwiper.slidePrev()
+      //     }
+      //   }
+      // });
 
       window.addEventListener('resize', this.windowOnresize);
       var _props = this.props,
           viewMemberInfo = _props.viewMemberInfo,
           status = _props.status,
-          columnInfo = _props.columnInfo;
+          columnInfo = _props.columnInfo,
+          storeKey = _props.storeKey;
 
       if (viewMemberInfo) {
         if (status) {
@@ -830,35 +790,12 @@ var ShopMember = (_temp = _class = function (_Component) {
   }, {
     key: 'componentDidUpdate',
     value: function componentDidUpdate() {
-      var _this4 = this;
-
       var _state = this.state,
           _state$memberList = _state.memberList,
           memberList = _state$memberList === undefined ? [] : _state$memberList,
-          memberLength = _state.memberLength,
           memberTabHeight = _state.memberTabHeight,
           tabMenuHeight = _state.tabMenuHeight;
 
-      if (memberList.length !== memberLength) {
-        this.setState({ memberLength: memberList.length }, function () {
-          if (memberSwiper) {
-            return memberSwiper.updateSlides();
-          }
-          memberSwiper = new _swiper2.default('.swiper-member-container', {
-            direction: 'vertical',
-            slidesPerView: 'auto',
-            mousewheel: true,
-            watchSlidesProgress: true,
-            on: {
-              progress: _this4.progressListen
-            },
-            scrollbar: {
-              el: '.swiper-scrollbar',
-              hide: true
-            }
-          });
-        });
-      }
       var clientHeight = this.memberTab.clientHeight - tabMenuHeight;
       if (clientHeight !== memberTabHeight) {
         this.setState({ memberTabHeight: clientHeight });
@@ -868,21 +805,74 @@ var ShopMember = (_temp = _class = function (_Component) {
     key: 'componentWillUnmount',
     value: function componentWillUnmount() {
 
-      memberSwiper && memberSwiper.destroy(false);
-      memberSwiper = undefined;
+      // memberSwiper && memberSwiper.destroy(false);
+      // memberSwiper = undefined;
       this.willUnmount = true;
 
       window.removeEventListener('resize', this.windowOnresize);
-      swiperSelectObserver.disconnect();
+      // swiperSelectObserver.disconnect();
       $.off(this.hotKeyListener);
     }
+  }, {
+    key: 'getCardInfoByMemberId',
+
+
+    // 获取会员的卡信息
+    value: function () {
+      var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(memberId) {
+        var cardInfo, _cardInfo$data, data;
+
+        return _regenerator2.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return this.ms.getCardInfoByMemberId(memberId);
+
+              case 2:
+                _context3.t0 = _context3.sent;
+
+                if (_context3.t0) {
+                  _context3.next = 5;
+                  break;
+                }
+
+                _context3.t0 = {};
+
+              case 5:
+                cardInfo = _context3.t0;
+                _cardInfo$data = cardInfo.data, data = _cardInfo$data === undefined ? [] : _cardInfo$data;
+
+                this.setState({
+                  cardInfo: data
+                });
+
+              case 8:
+              case 'end':
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function getCardInfoByMemberId(_x8) {
+        return _ref10.apply(this, arguments);
+      }
+
+      return getCardInfoByMemberId;
+    }()
 
     //获取会员状态集合，在页面上以图片戳的形式展示。
 
+
+    // 重置购买记录相关数据
+
+    // 获取会员的购买记录
+
   }, {
     key: 'render',
     value: function render() {
-      var _this5 = this;
+      var _this4 = this;
 
       var isUserAndroidKey = !!window.android_setKeyBoard;
 
@@ -910,7 +900,13 @@ var ShopMember = (_temp = _class = function (_Component) {
           loadingUser = _state2.loadingUser,
           loadingBtn = _state2.loadingBtn,
           selected = _state2.selected,
-          isAllAuthority = _state2.isAllAuthority;
+          isAllAuthority = _state2.isAllAuthority,
+          lastRetailTotal = _state2.lastRetailTotal,
+          lastRetailList = _state2.lastRetailList,
+          lastRetailLoading = _state2.lastRetailLoading,
+          isCC = _state2.isCC,
+          cardInfo = _state2.cardInfo,
+          cardList = _state2.cardList;
       var _props2 = this.props,
           status = _props2.status,
           showModal = _props2.showModal,
@@ -920,12 +916,14 @@ var ShopMember = (_temp = _class = function (_Component) {
           onCancel = _props2.onCancel,
           viewMemberInfo = _props2.viewMemberInfo,
           authProcess = _props2.authProcess,
-          mode = _props2.mode;
+          mode = _props2.mode,
+          title = _props2.title,
+          storeKey = _props2.storeKey;
       var _ms$precisionInfo = this.ms.precisionInfo,
           precisionInfo = _ms$precisionInfo === undefined ? {} : _ms$precisionInfo;
 
       var showSearch = ['会员查询'].includes(type);
-      var nomemberList = !memberList.length;
+      var noList = !memberList.length;
       var showSelectBtn = type === '会员查询' || !!status;
       //是否正常开单
       var voucherStateType = mode !== 'practice';
@@ -946,27 +944,27 @@ var ShopMember = (_temp = _class = function (_Component) {
             className: _tplusComponentsTouch.hotKey.hotKeyNotFilter('search-input') + ' android_focus_keyboard',
             value: searchValue,
             type: 'native',
-            onChange: function onChange(_ref8) {
-              var searchValue = _ref8.target.value;
-              return _this5.setState({ searchValue: searchValue });
+            onChange: function onChange(_ref11) {
+              var searchValue = _ref11.target.value;
+              return _this4.setState({ searchValue: searchValue });
             },
             inputRef: function inputRef(ref) {
-              return _this5.searchRef = ref;
+              return _this4.searchRef = ref;
             },
             onClear: function onClear() {
-              return _this5.onClear('searchValue', _this5.searchRef);
+              return _this4.onClear('searchValue', _this4.searchRef);
             },
-            onFocus: function onFocus(_ref9) {
-              var target = _ref9.target;
+            onFocus: function onFocus(_ref12) {
+              var target = _ref12.target;
 
               if (!isUserAndroidKey) {
-                _this5.focusInputName = 'searchValue';
-                _this5.inputTarget = target;
+                _this4.focusInputName = 'searchValue';
+                _this4.inputTarget = target;
                 _tplusComponentsTouch.Keyboard.open(function (v) {
-                  var key = _this5.focusInputName;
-                  var value = _tplusComponentsTouch.Keyboard.getNewValue(_this5.inputTarget, _this5.inputTarget.value, v);
-                  _this5.setState((0, _defineProperty3.default)({}, key, value));
-                }, _this5.keyboardOnOk, _this5.keyboardOnClose)();
+                  var key = _this4.focusInputName;
+                  var value = _tplusComponentsTouch.Keyboard.getNewValue(_this4.inputTarget, _this4.inputTarget.value, v);
+                  _this4.setState((0, _defineProperty3.default)({}, key, value));
+                }, _this4.keyboardOnOk, _this4.keyboardOnClose)();
               }
             },
             onBlur: _tplusComponentsTouch.Keyboard.close,
@@ -980,62 +978,69 @@ var ShopMember = (_temp = _class = function (_Component) {
         ),
         _react2.default.createElement(
           'div',
-          { ref: function ref(_ref10) {
-              return _this5.memberTab = _ref10;
-            }, className: _tplusComponentsTouch.hotKey.hotKeyBindClass('4', 'member-shop-content') },
-          this.dataLoaded && nomemberList && _react2.default.createElement('div', { className: 'empty-data-img' }),
-          _react2.default.createElement(
+          { ref: function ref(_ref13) {
+              return _this4.memberTab = _ref13;
+            }, className: '' + _tplusComponentsTouch.hotKey.hotKeyBindClass('4', 'member-shop-content') },
+          this.dataLoaded && noList && _react2.default.createElement(
             'div',
-            { className: 'member-card-list-side', style: { display: nomemberList ? 'none' : 'block' } },
+            { className: 'empty-data-img' },
             _react2.default.createElement(
               'div',
-              { className: 'swiper-member-container', style: { height: '100%' } },
-              _react2.default.createElement(
-                'div',
-                { className: 'swiper-wrapper' },
-                memberList.map(function (value, key) {
-                  return _this5.getCardRender(value, key, IsEnableUMember, precisionInfo);
-                }),
-                !memberList.length && _react2.default.createElement(
-                  'span',
-                  { className: 'empty-data-tip', style: { marginTop: 30 } },
-                  '\u6CA1\u6709\u76F8\u5173\u6570\u636E~'
-                ),
-                loadmoreLoading && _react2.default.createElement(
-                  'span',
-                  { className: 'empty-data-tip empty-data-tip-member-card' },
-                  '\u6570\u636E\u52A0\u8F7D\u4E2D ...'
-                ),
-                nomoreData && _react2.default.createElement(
-                  'span',
-                  { className: 'empty-data-tip empty-data-tip-member-card' },
-                  '\u6CA1\u6709\u66F4\u591A\u6570\u636E\u4E86~'
-                )
-              ),
-              _react2.default.createElement('div', { className: 'swiper-scrollbar' })
+              { className: 'tip-text' },
+              '\u6682\u65E0\u6570\u636E ~'
             )
           ),
+          _react2.default.createElement(_MemberCardList2.default, {
+            ref: function ref(list) {
+              return _this4.memberCardList = list;
+            },
+            title: title,
+            storeKey: storeKey,
+            memberList: memberList,
+            precisionInfo: precisionInfo,
+            loadmoreLoading: loadmoreLoading,
+            nomoreData: nomoreData,
+            loadUserInfo: this.loadUserInfo,
+            progressListen: this.progressListen,
+            getMemberStateStamp: this.getMemberStateStamp,
+            selected: selected,
+            isCC: isCC,
+            cardList: cardList
+          }),
           _react2.default.createElement(
             'div',
-            { className: 'member-content-tab content', style: { display: nomemberList ? 'none' : 'flex' } },
+            { className: 'member-content-tab content', style: { display: noList ? 'none' : 'flex' } },
             voucherStateType && !isAllAuthority && _react2.default.createElement(
               'div',
               null,
               _react2.default.createElement(
                 'div',
                 { className: 'menu' },
-                _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) {
-                    return _this5.loadUserInfo(key, Idmember, item, type, syncUpdateMember);
-                  }, handleChange: this.MemberMenuChange })
+                _react2.default.createElement(_index4.default, {
+                  authProcess: authProcess,
+                  changeIsAllAuthority: this.changeIsAllAuthority,
+                  loadUserList: this.loadUserList,
+                  member: member,
+                  memberEnumState: memberEnumState,
+                  loadingBtn: loadingBtn,
+                  selected: selected,
+                  cardList: cardList,
+                  getCardList: this.getCardList,
+                  loadUserInfo: function loadUserInfo(key, Idmember, item, type, syncUpdateMember) {
+                    return _this4.loadUserInfo(key, Idmember, item, type, syncUpdateMember);
+                  },
+                  handleChange: this.MemberMenuChange })
               ),
               _react2.default.createElement('div', { className: 'line' })
             ),
-            _react2.default.createElement(_memberTab2.default, {
+            _react2.default.createElement(_index2.default, {
               defaultActiveKey: defaultActiveKey,
               member: member,
               memberInfo: memberInfo,
               showModal: showModal,
+              title: title,
               titleModal: titleModal,
+              storeKey: storeKey,
               recommend: recommend,
               memberTabHeight: memberTabHeight,
               initEmpty: initEmpty,
@@ -1043,7 +1048,12 @@ var ShopMember = (_temp = _class = function (_Component) {
               columnInfo: columnInfo,
               precisionInfo: precisionInfo,
               onChange: this.memberTabChange,
-              getMemberStateStamp: this.getMemberStateStamp
+              getMemberStateStamp: this.getMemberStateStamp,
+              cardInfo: cardInfo,
+              lastRetailTotal: lastRetailTotal,
+              lastRetailList: lastRetailList,
+              lastRetailLoading: lastRetailLoading,
+              findMemberLastRetailDetailList: this.findMemberLastRetailDetailList
             })
           )
         ),
@@ -1059,13 +1069,13 @@ var ShopMember = (_temp = _class = function (_Component) {
             _button2.default,
             {
               onClick: function onClick() {
-                return _this5.handleOk(nomemberList);
+                return _this4.handleOk(noList);
               },
               type: 'primary',
               style: { marginRight: 5 },
               disabled: loadingUser
             },
-            loadingUser ? '加载会员' : nomemberList ? '确定' : '选取会员'
+            loadingUser ? '加载会员' : noList ? '确定' : '选取会员'
           )
         )
       );