tplus-member 3.26.3 → 3.27.1

package/dist/member/ShopMember.js

@@ -9,14 +9,6 @@ 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);
@@ -79,25 +71,28 @@ var _api = require('./api');
 
 var _api2 = _interopRequireDefault(_api);
 
-var _index = require('./memberTab/index.js');
+var _memberTab = require('./memberTab');
 
-var _index2 = _interopRequireDefault(_index);
+var _memberTab2 = _interopRequireDefault(_memberTab);
 
-require('./ShopMember.less');
+var _swiper = require('swiper/dist/js/swiper.js');
 
-var _utils = require('../utils');
+var _swiper2 = _interopRequireDefault(_swiper);
 
-var _index3 = require('./memberMenu/index.js');
+require('swiper/dist/css/swiper.min.css');
 
-var _index4 = _interopRequireDefault(_index3);
+require('./ShopMember.less');
+
+var _utils = require('../utils');
 
-var _MemberCardList = require('./MemberCardList');
+var _index = require('./memberMenu/index.js');
 
-var _MemberCardList2 = _interopRequireDefault(_MemberCardList);
+var _index2 = _interopRequireDefault(_index);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// let swiperSelectObserver;
+var memberSwiper = void 0;
+var swiperSelectObserver = void 0;
 
 var ShopMember = (_temp = _class = function (_Component) {
   (0, _inherits3.default)(ShopMember, _Component);
@@ -169,7 +164,7 @@ var ShopMember = (_temp = _class = function (_Component) {
     };
 
     _this2.loadUserInfo = function (key, Idmember, item, type, syncUpdateMember) {
-      // this.observerCard();
+      _this2.observerCard();
 
       var _this2$props = _this2.props,
           selectChange = _this2$props.selectChange,
@@ -261,8 +256,6 @@ var ShopMember = (_temp = _class = function (_Component) {
             memberChange && memberChange(ret);
           }
         }
-        // 获取会员的卡信息
-        _this2.getCardInfoByMemberId(Idmember);
       }).catch(function (err) {
         selectChange && selectChange({});
         if (_this2.isNotSetState(Idmember)) return;
@@ -409,7 +402,6 @@ 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;
@@ -421,6 +413,139 @@ 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];
@@ -443,7 +568,7 @@ var ShopMember = (_temp = _class = function (_Component) {
         }
         _this2.setState({ memberList: data }, function () {
           if (type === 'search') {
-            _this2.memberCardList.resetSlideTop();
+            _this2.resetSlideTop();
           }
 
           var _data = (0, _slicedToArray3.default)(data, 1),
@@ -466,12 +591,18 @@ var ShopMember = (_temp = _class = function (_Component) {
           memberInfo: { record: [], like: [], recency: [] }
         }, function () {
           if (type === 'search') {
-            _this2.memberCardList.resetSlideTop();
+            _this2.resetSlideTop();
           }
         });
       }
     };
 
+    _this2.resetSlideTop = function () {
+      if (memberSwiper) {
+        memberSwiper.slideTo(0, 0, false);
+      }
+    };
+
     _this2.getMemberStateStamp = function (item) {
       var arr = [];
       var isExpiration = item.isExpiration,
@@ -490,10 +621,10 @@ var ShopMember = (_temp = _class = function (_Component) {
       return arr;
     };
 
-    _this2.handleOk = function (noList) {
-      var _this2$state4 = _this2.state,
-          member = _this2$state4.member,
-          errorMsg = _this2$state4.errorMsg;
+    _this2.handleOk = function (nomemberList) {
+      var _this2$state5 = _this2.state,
+          member = _this2$state5.member,
+          errorMsg = _this2$state5.errorMsg;
 
       var _ref5 = member || {},
           isExpiration = _ref5.isExpiration,
@@ -503,7 +634,7 @@ var ShopMember = (_temp = _class = function (_Component) {
       var Id = _ref5$MemberState.Id,
           Name = _ref5$MemberState.Name;
 
-      if (noList) {
+      if (nomemberList) {
         return _this2.props.onCancel();
       }
       if (errorMsg) return _tplusComponentsTouch.Message.warn(errorMsg);
@@ -634,6 +765,7 @@ var ShopMember = (_temp = _class = function (_Component) {
     _this2.state = {
       searchValue: '',
       memberList: [],
+      memberLength: 0,
       memberInfo: {
         record: [],
         like: [],
@@ -643,8 +775,7 @@ var ShopMember = (_temp = _class = function (_Component) {
       isCC: !!isNewRetailBCPos,
       tabIndex: _this2.props.defaultActiveKey,
       isAllAuthority: false,
-      tabMenuHeight: mode !== 'practice' ? 64 : 0, // 64为table上部操作菜单高度
-      cardInfo: [] // 会员的卡信息
+      tabMenuHeight: mode !== 'practice' ? 64 : 0 // 64为table上部操作菜单高度
     };
     _this2.ms = _api2.default;
     return _this2;
@@ -653,27 +784,35 @@ var ShopMember = (_temp = _class = function (_Component) {
   (0, _createClass3.default)(ShopMember, [{
     key: 'componentDidMount',
     value: function componentDidMount() {
-      // 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()
-      //     }
-      //   }
-      // });
+      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();
+          }
+        }
+      });
 
       window.addEventListener('resize', this.windowOnresize);
       var _props = this.props,
           viewMemberInfo = _props.viewMemberInfo,
           status = _props.status,
-          columnInfo = _props.columnInfo,
-          storeKey = _props.storeKey;
+          columnInfo = _props.columnInfo;
 
       if (viewMemberInfo) {
         if (status) {
@@ -695,12 +834,35 @@ 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 });
@@ -710,69 +872,21 @@ 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 _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(memberId) {
-        var cardInfo, _cardInfo$data, data;
-
-        return _regenerator2.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return this.ms.getCardInfoByMemberId(memberId);
-
-              case 2:
-                _context.t0 = _context.sent;
-
-                if (_context.t0) {
-                  _context.next = 5;
-                  break;
-                }
-
-                _context.t0 = {};
-
-              case 5:
-                cardInfo = _context.t0;
-                _cardInfo$data = cardInfo.data, data = _cardInfo$data === undefined ? [] : _cardInfo$data;
-
-                this.setState({
-                  cardInfo: data
-                });
-
-              case 8:
-              case 'end':
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function getCardInfoByMemberId(_x6) {
-        return _ref8.apply(this, arguments);
-      }
-
-      return getCardInfoByMemberId;
-    }()
 
     //获取会员状态集合，在页面上以图片戳的形式展示。
 
   }, {
     key: 'render',
     value: function render() {
-      var _this3 = this;
+      var _this5 = this;
 
       var isUserAndroidKey = !!window.android_setKeyBoard;
 
@@ -800,10 +914,7 @@ var ShopMember = (_temp = _class = function (_Component) {
           loadingUser = _state2.loadingUser,
           loadingBtn = _state2.loadingBtn,
           selected = _state2.selected,
-          isAllAuthority = _state2.isAllAuthority,
-          isCC = _state2.isCC,
-          cardInfo = _state2.cardInfo,
-          cardList = _state2.cardList;
+          isAllAuthority = _state2.isAllAuthority;
       var _props2 = this.props,
           status = _props2.status,
           showModal = _props2.showModal,
@@ -813,14 +924,12 @@ var ShopMember = (_temp = _class = function (_Component) {
           onCancel = _props2.onCancel,
           viewMemberInfo = _props2.viewMemberInfo,
           authProcess = _props2.authProcess,
-          mode = _props2.mode,
-          title = _props2.title,
-          storeKey = _props2.storeKey;
+          mode = _props2.mode;
       var _ms$precisionInfo = this.ms.precisionInfo,
           precisionInfo = _ms$precisionInfo === undefined ? {} : _ms$precisionInfo;
 
       var showSearch = ['会员查询'].includes(type);
-      var noList = !memberList.length;
+      var nomemberList = !memberList.length;
       var showSelectBtn = type === '会员查询' || !!status;
       //是否正常开单
       var voucherStateType = mode !== 'practice';
@@ -841,27 +950,27 @@ var ShopMember = (_temp = _class = function (_Component) {
             className: _tplusComponentsTouch.hotKey.hotKeyNotFilter('search-input') + ' android_focus_keyboard',
             value: searchValue,
             type: 'native',
-            onChange: function onChange(_ref9) {
-              var searchValue = _ref9.target.value;
-              return _this3.setState({ searchValue: searchValue });
+            onChange: function onChange(_ref8) {
+              var searchValue = _ref8.target.value;
+              return _this5.setState({ searchValue: searchValue });
             },
             inputRef: function inputRef(ref) {
-              return _this3.searchRef = ref;
+              return _this5.searchRef = ref;
             },
             onClear: function onClear() {
-              return _this3.onClear('searchValue', _this3.searchRef);
+              return _this5.onClear('searchValue', _this5.searchRef);
             },
-            onFocus: function onFocus(_ref10) {
-              var target = _ref10.target;
+            onFocus: function onFocus(_ref9) {
+              var target = _ref9.target;
 
               if (!isUserAndroidKey) {
-                _this3.focusInputName = 'searchValue';
-                _this3.inputTarget = target;
+                _this5.focusInputName = 'searchValue';
+                _this5.inputTarget = target;
                 _tplusComponentsTouch.Keyboard.open(function (v) {
-                  var key = _this3.focusInputName;
-                  var value = _tplusComponentsTouch.Keyboard.getNewValue(_this3.inputTarget, _this3.inputTarget.value, v);
-                  _this3.setState((0, _defineProperty3.default)({}, key, value));
-                }, _this3.keyboardOnOk, _this3.keyboardOnClose)();
+                  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)();
               }
             },
             onBlur: _tplusComponentsTouch.Keyboard.close,
@@ -875,61 +984,62 @@ var ShopMember = (_temp = _class = function (_Component) {
         ),
         _react2.default.createElement(
           'div',
-          { ref: function ref(_ref11) {
-              return _this3.memberTab = _ref11;
-            }, className: '' + _tplusComponentsTouch.hotKey.hotKeyBindClass('4', 'member-shop-content') },
-          this.dataLoaded && noList && _react2.default.createElement('div', { className: 'empty-data-img' }),
-          _react2.default.createElement(_MemberCardList2.default, {
-            ref: function ref(list) {
-              return _this3.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
-          }),
+          { 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(
+            'div',
+            { className: 'member-card-list-side', style: { display: nomemberList ? 'none' : 'block' } },
+            _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' })
+            )
+          ),
           _react2.default.createElement(
             'div',
-            { className: 'member-content-tab content', style: { display: noList ? 'none' : 'flex' } },
+            { className: 'member-content-tab content', style: { display: nomemberList ? 'none' : 'flex' } },
             voucherStateType && !isAllAuthority && _react2.default.createElement(
               'div',
               null,
               _react2.default.createElement(
                 'div',
                 { className: 'menu' },
-                _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 _this3.loadUserInfo(key, Idmember, item, type, syncUpdateMember);
-                  },
-                  handleChange: this.MemberMenuChange })
+                _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('div', { className: 'line' })
             ),
-            _react2.default.createElement(_index2.default, {
+            _react2.default.createElement(_memberTab2.default, {
               defaultActiveKey: defaultActiveKey,
               member: member,
               memberInfo: memberInfo,
               showModal: showModal,
-              title: title,
               titleModal: titleModal,
-              storeKey: storeKey,
               recommend: recommend,
               memberTabHeight: memberTabHeight,
               initEmpty: initEmpty,
@@ -937,8 +1047,7 @@ var ShopMember = (_temp = _class = function (_Component) {
               columnInfo: columnInfo,
               precisionInfo: precisionInfo,
               onChange: this.memberTabChange,
-              getMemberStateStamp: this.getMemberStateStamp,
-              cardInfo: cardInfo
+              getMemberStateStamp: this.getMemberStateStamp
             })
           )
         ),
@@ -954,13 +1063,13 @@ var ShopMember = (_temp = _class = function (_Component) {
             _button2.default,
             {
               onClick: function onClick() {
-                return _this3.handleOk(noList);
+                return _this5.handleOk(nomemberList);
               },
               type: 'primary',
               style: { marginRight: 5 },
               disabled: loadingUser
             },
-            loadingUser ? '加载会员' : noList ? '确定' : '选取会员'
+            loadingUser ? '加载会员' : nomemberList ? '确定' : '选取会员'
           )
         )
       );