tplus-member 3.26.1 → 3.26.5

package/dist/member/memberMenuStorage/index.js

@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = undefined;
 
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
 var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
 
 var _defineProperty3 = _interopRequireDefault(_defineProperty2);
@@ -165,10 +169,11 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             setPwdShortKey: '',
             bindCardShow: false, // 是否显示会员绑卡，默认否
             bindCardBtnDisabled: true, // 会员绑卡确定按钮disabled
-
+            menuKey: null, // 用来判断是否是储值，设置密码的时候使用
             refundShow: false, // 是否显示退储值，默认否
             refundTitle: '退储值', // 退储值名称
-            memberUnBindCardLoading: false // 解绑按钮loadong
+            memberUnBindCardLoading: false, // 解绑按钮loadong
+            refundBtnDisabled: false // 退储值disabled
         };
         _this.api = _api2.default;
         return _this;
@@ -304,7 +309,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
         key: 'storage',
         value: function () {
             var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-                var cardList, cardInfo, _ref4, cardTypeEnum, walletEnabled, isNeedPassword, _ref5, isNewRetailBCPos;
+                var cardList, cardInfo, _ref4, CardTypeEnum, WalletEnabled;
 
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
@@ -314,29 +319,20 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
 
                                 if (cardList && cardList.length) {
                                     cardInfo = cardList[0];
-                                    _ref4 = cardInfo || {}, cardTypeEnum = _ref4.cardTypeEnum, walletEnabled = _ref4.walletEnabled, isNeedPassword = _ref4.isNeedPassword;
+                                    _ref4 = cardInfo || {}, CardTypeEnum = _ref4.CardTypeEnum, WalletEnabled = _ref4.WalletEnabled;
 
-                                    if (cardTypeEnum === 'BALANCE_CARD') {
-                                        if (walletEnabled) {
+                                    if (CardTypeEnum === 'BALANCE_CARD') {
+                                        if (WalletEnabled) {
                                             this.storageInit();
                                         } else {
                                             this.setState({ modifyPass: true, passwordTitle: '设置密码', warnContent: '' });
                                         }
                                     } else {
-                                        if (isNewRetailBCPos) {
-                                            if (!isNeedPassword) {
-                                                this.storageInit();
-                                            } else {
-                                                this.setState({ modifyPass: true, passwordTitle: '设置密码', warnContent: '' });
-                                            }
-                                        } else {
-                                            this.storageInit();
-                                        }
+                                        this.storageInit();
                                     }
                                 }
-                                _ref5 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref5.isNewRetailBCPos;
 
-                            case 3:
+                            case 2:
                             case 'end':
                                 return _context2.stop();
                         }
@@ -358,6 +354,17 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
 
         // 修改密码
         value: function changePassword() {
+            var _props$cardList = this.props.cardList,
+                cardList = _props$cardList === undefined ? [] : _props$cardList;
+
+            var _ref5 = cardList[0] || {},
+                IsNeedPassword = _ref5.IsNeedPassword,
+                CardTypeEnum = _ref5.CardTypeEnum;
+
+            if (CardTypeEnum !== 'BALANCE_CARD' && !IsNeedPassword) {
+                _tplusComponentsTouch.Message.warn("该储值卡无需修改密码！");
+                return;
+            }
             this.setState({ modifyPass: true, passwordTitle: '修改密码' });
         }
 
@@ -366,6 +373,17 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     }, {
         key: 'resetPassword',
         value: function resetPassword() {
+            var _props$cardList2 = this.props.cardList,
+                cardList = _props$cardList2 === undefined ? [] : _props$cardList2;
+
+            var _ref6 = cardList[0] || {},
+                IsNeedPassword = _ref6.IsNeedPassword,
+                CardTypeEnum = _ref6.CardTypeEnum;
+
+            if (CardTypeEnum !== 'BALANCE_CARD' && !IsNeedPassword) {
+                _tplusComponentsTouch.Message.warn("该储值卡无需重置密码！");
+                return;
+            }
             this.setState({ modifyPass: true, passwordTitle: '重置密码' });
         }
 
@@ -395,8 +413,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
         // MeStorageCard > gridTemplateUser > MeStorageCard.cardbatchExport
         // 绑卡/会员绑卡确定按钮后，如果是会员绑卡
         value: function () {
-            var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(state) {
-                var value, _props4, getCardList, _props4$cardList, cardList, _ref7, cardNo, params, ret;
+            var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(state) {
+                var value, _props4, getCardList, _props4$cardList, cardList, _ref8, StorageCardNo, params, ret;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
@@ -404,9 +422,9 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                             case 0:
                                 value = state.value;
                                 _props4 = this.props, getCardList = _props4.getCardList, _props4$cardList = _props4.cardList, cardList = _props4$cardList === undefined ? [] : _props4$cardList;
-                                _ref7 = cardList[0] || {}, cardNo = _ref7.cardNo;
+                                _ref8 = cardList[0] || {}, StorageCardNo = _ref8.StorageCardNo;
                                 params = {
-                                    cardNo: cardNo,
+                                    cardNo: StorageCardNo,
                                     mobile: value,
                                     isStorageCardBindMember: true
                                 };
@@ -421,7 +439,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
 
                                 this.changeBindCardBtnDisabled(false);
                                 _tplusComponentsTouch.Message.success('绑定成功');
-                                getCardList(cardNo);
+                                getCardList(StorageCardNo);
                                 this.setState({
                                     bindCardShow: false
                                 });
@@ -443,7 +461,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             }));
 
             function bindCardFn(_x3) {
-                return _ref6.apply(this, arguments);
+                return _ref7.apply(this, arguments);
             }
 
             return bindCardFn;
@@ -452,6 +470,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
         // 点击退储值的取消按钮
 
 
+        // 点击退储值的确定按钮
+
         // 点击退储值
 
         // 点击解绑
@@ -465,9 +485,18 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 warnContent: ''
             });
             this.handleEvent(auth).then(function (ret) {
+                if (key === 'storage') {
+                    _this3.setState({
+                        menuKey: 'storage'
+                    });
+                } else {
+                    _this3.setState({
+                        menuKey: null
+                    });
+                }
                 if (ret === true) {
-                    var _ref8 = _mutantsUtil.platform || {},
-                        isHorizontalSunMi = _ref8.isHorizontalSunMi;
+                    var _ref9 = _mutantsUtil.platform || {},
+                        isHorizontalSunMi = _ref9.isHorizontalSunMi;
 
                     switch (key) {
                         case 'storage':
@@ -504,7 +533,9 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 btnDissabled = _state.btnDissabled,
                 bindCardShow = _state.bindCardShow,
                 bindCardBtnDisabled = _state.bindCardBtnDisabled,
-                refundShow = _state.refundShow;
+                refundShow = _state.refundShow,
+                refundBtnDisabled = _state.refundBtnDisabled,
+                menuKey = _state.menuKey;
             var _props5 = this.props,
                 _props5$member = _props5.member,
                 member = _props5$member === undefined ? {} : _props5$member,
@@ -515,16 +546,16 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 _props5$cardList = _props5.cardList,
                 cardList = _props5$cardList === undefined ? [] : _props5$cardList;
 
-            var _ref9 = cardList.length && cardList[0] || {},
-                id = _ref9.id,
-                _ref9$balanceAmount = _ref9.balanceAmount,
-                balanceAmount = _ref9$balanceAmount === undefined ? 0 : _ref9$balanceAmount,
-                _ref9$presentAmount = _ref9.presentAmount,
-                presentAmount = _ref9$presentAmount === undefined ? 0 : _ref9$presentAmount,
-                walletEnabled = _ref9.walletEnabled,
-                cardTypeEnum = _ref9.cardTypeEnum,
-                cardStatusEnum = _ref9.cardStatusEnum,
-                cardNo = _ref9.cardNo;
+            var _ref10 = cardList.length && cardList[0] || {},
+                Id = _ref10.Id,
+                _ref10$BalanceStorage = _ref10.BalanceStorage,
+                BalanceStorage = _ref10$BalanceStorage === undefined ? 0 : _ref10$BalanceStorage,
+                _ref10$PresentAmount = _ref10.PresentAmount,
+                PresentAmount = _ref10$PresentAmount === undefined ? 0 : _ref10$PresentAmount,
+                WalletEnabled = _ref10.WalletEnabled,
+                CardTypeEnum = _ref10.CardTypeEnum,
+                CardStatusEnum = _ref10.CardStatusEnum,
+                StorageCardNo = _ref10.StorageCardNo;
 
             return _react2.default.createElement(
                 'div',
@@ -533,10 +564,10 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                     var status = authProcess.execute(menu.auth);
                     if (status) {
                         if (menu.auth === 'BindStorageCard') {
-                            if (menu.key === 'memberBindCard' && cardTypeEnum !== 'BALANCE_CARD' && cardStatusEnum && cardStatusEnum !== 'BINDING') {
+                            if (menu.key === 'memberBindCard' && CardTypeEnum !== 'BALANCE_CARD' && CardStatusEnum && CardStatusEnum !== 'BINDING') {
                                 return _this4.getMenuItem(index, menu);
                             }
-                            if (menu.key === 'memberUnBindCard' && cardTypeEnum !== 'BALANCE_CARD' && cardStatusEnum && cardStatusEnum === 'BINDING') {
+                            if (menu.key === 'memberUnBindCard' && CardTypeEnum !== 'BALANCE_CARD' && CardStatusEnum && CardStatusEnum === 'BINDING') {
                                 return _this4.getMenuItem(index, menu);
                             }
                         } else {
@@ -555,7 +586,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 _react2.default.createElement(
                     _tplusComponentsTouch.ModalWraper,
                     {
-                        title: cardTypeEnum === 'BALANCE_CARD' && !walletEnabled ? '设置密码' : passwordTitle,
+                        title: CardTypeEnum === 'BALANCE_CARD' && !WalletEnabled ? '设置密码' : passwordTitle,
                         show: modifyPass,
                         ok: this.changePasswordClick,
                         className: 'modify-password',
@@ -565,10 +596,10 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                         cancel: this.changePasswordCancel,
                         btnDissabled: btnDissabled
                     },
-                    passwordTitle === '换卡' ? _react2.default.createElement(_changeMemberCard2.default, { cardList: cardList && cardList.length && cardList[0], modifyMember: modifyMember, member: member, ref: function ref(_ref10) {
-                            return _this4.modifyPass = _ref10;
-                        }, cancelModal: this.changePasswordCancel }) : _react2.default.createElement(_modifyPass2.default, { cardList: cardList && cardList.length && cardList[0], changeBtnDisabled: this.changeBtnDisabled, loadUserInfo: getCardList, selected: selected, storageInit: this.storageInit, passwordTitle: cardTypeEnum === 'BALANCE_CARD' && !walletEnabled ? '设置密码' : passwordTitle, modifyMember: modifyMember, ref: function ref(_ref11) {
+                    passwordTitle === '换卡' ? _react2.default.createElement(_changeMemberCard2.default, { cardList: cardList && cardList.length && cardList[0], modifyMember: modifyMember, member: member, ref: function ref(_ref11) {
                             return _this4.modifyPass = _ref11;
+                        }, cancelModal: this.changePasswordCancel }) : _react2.default.createElement(_modifyPass2.default, { menuKey: menuKey, cardList: cardList && cardList.length && cardList[0], changeBtnDisabled: this.changeBtnDisabled, loadUserInfo: getCardList, selected: selected, storageInit: this.storageInit, passwordTitle: CardTypeEnum === 'BALANCE_CARD' && !WalletEnabled ? '设置密码' : passwordTitle, modifyMember: modifyMember, ref: function ref(_ref12) {
+                            return _this4.modifyPass = _ref12;
                         }, member: member, cancelModal: this.changePasswordCancel })
                 ),
                 _react2.default.createElement(
@@ -583,8 +614,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                         btnDissabled: bindCardBtnDisabled
                     },
                     _react2.default.createElement(_bindCard2.default, {
-                        ref: function ref(_ref12) {
-                            return _this4.bindCardRef = _ref12;
+                        ref: function ref(_ref13) {
+                            return _this4.bindCardRef = _ref13;
                         },
                         changeBindCardBtnDisabled: this.changeBindCardBtnDisabled
                     })
@@ -597,8 +628,9 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                         className: 'refund',
                         modalType: 'mid',
                         closeButton: false,
-                        ok: this.bindCardClick,
-                        cancel: this.changeRefundCancel
+                        ok: this.changeRefundOk,
+                        cancel: this.changeRefundCancel,
+                        btnDissabled: refundBtnDisabled
                     },
                     _react2.default.createElement(
                         'div',
@@ -617,7 +649,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                                 _react2.default.createElement(
                                     'span',
                                     { className: 'value' },
-                                    cardNo
+                                    StorageCardNo
                                 )
                             ),
                             _react2.default.createElement(
@@ -631,7 +663,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                                 _react2.default.createElement(
                                     'span',
                                     { className: 'value' },
-                                    (0, _utils.formatPrecision)(balanceAmount, 2)
+                                    (0, _utils.formatPrecision)(BalanceStorage, 2)
                                 )
                             ),
                             _react2.default.createElement(
@@ -645,7 +677,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                                 _react2.default.createElement(
                                     'span',
                                     { className: 'value' },
-                                    (0, _utils.formatPrecision)(presentAmount, 2)
+                                    (0, _utils.formatPrecision)(PresentAmount, 2)
                                 )
                             ),
                             _react2.default.createElement(
@@ -659,7 +691,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                                 _react2.default.createElement(
                                     'span',
                                     { className: 'value special' },
-                                    (0, _utils.getFixedNumber)(balanceAmount - presentAmount)
+                                    (0, _utils.getFixedNumber)(BalanceStorage - PresentAmount)
                                 )
                             )
                         ),
@@ -702,16 +734,15 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             getCardList = _props7.getCardList,
             selected = _props7.selected;
 
-        var _ref13 = cardList[0] || {},
-            id = _ref13.id,
-            cardNo = _ref13.cardNo;
+        var _ref14 = cardList[0] || {},
+            StorageCardNo = _ref14.StorageCardNo;
 
         _mutantsMicrofx.stores.memberStore.init({
             member: cardList[0],
             settlementControlEvent: {
                 onSettleSuccess: function onSettleSuccess() {
                     _mutantsMicrofx.stores.modalRouter.hide('/memberstore');
-                    getCardList(cardNo);
+                    getCardList(StorageCardNo);
                 }
             },
             callback: function callback() {
@@ -747,7 +778,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             title: '提示',
             content: '确定要挂失该会员卡吗？',
             onOk: function () {
-                var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+                var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                     return _regenerator2.default.wrap(function _callee4$(_context4) {
                         while (1) {
                             switch (_context4.prev = _context4.next) {
@@ -779,7 +810,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 }));
 
                 return function onOk() {
-                    return _ref14.apply(this, arguments);
+                    return _ref15.apply(this, arguments);
                 };
             }(),
             onCancel: function onCancel() {},
@@ -799,7 +830,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             title: '提示',
             content: '确定要取消挂失该会员卡吗？',
             onOk: function () {
-                var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+                var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
                     return _regenerator2.default.wrap(function _callee5$(_context5) {
                         while (1) {
                             switch (_context5.prev = _context5.next) {
@@ -831,7 +862,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 }));
 
                 return function onOk() {
-                    return _ref15.apply(this, arguments);
+                    return _ref16.apply(this, arguments);
                 };
             }(),
             onCancel: function onCancel() {},
@@ -847,12 +878,12 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             selected = _props10.selected,
             memberEnumState = _props10.memberEnumState;
 
-        var _ref16 = member || {},
-            ID = _ref16.ID,
-            _ref16$MemberType = _ref16.MemberType;
+        var _ref17 = member || {},
+            ID = _ref17.ID,
+            _ref17$MemberType = _ref17.MemberType;
 
-        _ref16$MemberType = _ref16$MemberType === undefined ? {} : _ref16$MemberType;
-        var IsStorage = _ref16$MemberType.IsStorage;
+        _ref17$MemberType = _ref17$MemberType === undefined ? {} : _ref17$MemberType;
+        var IsStorage = _ref17$MemberType.IsStorage;
 
         memberStore.GetMemberDTO(ID, false).then(function (ret) {
             _mutantsMicrofx.stores.selectMemberStore.setCurMemberInfo(ret);
@@ -887,13 +918,13 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     };
 
     this.bindCard = function () {
-        var _props$cardList = _this5.props.cardList,
-            cardList = _props$cardList === undefined ? [] : _props$cardList;
+        var _props$cardList3 = _this5.props.cardList,
+            cardList = _props$cardList3 === undefined ? [] : _props$cardList3;
 
-        var _ref17 = cardList[0] || {},
-            memberName = _ref17.memberName;
+        var _ref18 = cardList[0] || {},
+            ID = _ref18.ID;
 
-        if (!!memberName) {
+        if (!!ID) {
             _tplusComponentsTouch.Message.error('该储值卡已经绑定，不能再次进行绑定');
             return;
         }
@@ -927,42 +958,142 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
         });
     };
 
+    this.changeRefundOk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+        var store, _store$data, data, _props11, _props11$cardList, cardList, getCardList, _ref20, MeStorageCardId, _ref20$BalanceStorage, BalanceStorage, _ref20$PresentAmount, PresentAmount, StorageCardNo, ID, storageAmount, params, ret;
+
+        return _regenerator2.default.wrap(function _callee6$(_context6) {
+            while (1) {
+                switch (_context6.prev = _context6.next) {
+                    case 0:
+                        store = _mutantsMicrofx.stores.memberStore;
+                        _store$data = store.data, data = _store$data === undefined ? {} : _store$data;
+                        _props11 = _this5.props, _props11$cardList = _props11.cardList, cardList = _props11$cardList === undefined ? [] : _props11$cardList, getCardList = _props11.getCardList;
+                        _ref20 = cardList.length && cardList[0] || {}, MeStorageCardId = _ref20.MeStorageCardId, _ref20$BalanceStorage = _ref20.BalanceStorage, BalanceStorage = _ref20$BalanceStorage === undefined ? 0 : _ref20$BalanceStorage, _ref20$PresentAmount = _ref20.PresentAmount, PresentAmount = _ref20$PresentAmount === undefined ? 0 : _ref20$PresentAmount, StorageCardNo = _ref20.StorageCardNo, ID = _ref20.ID;
+                        storageAmount = (0, _utils.getFixedNumber)(0 - (BalanceStorage - PresentAmount));
+                        // 退款金额是0的话，不允许退款
+
+                        if (!(Number(storageAmount) === 0)) {
+                            _context6.next = 8;
+                            break;
+                        }
+
+                        _tplusComponentsTouch.Message.error('无可退金额，不支持退款！');
+                        return _context6.abrupt('return');
+
+                    case 8:
+                        params = (0, _extends3.default)({}, data, {
+                            StorageDetails: [{
+                                Idmember: ID,
+                                ThisStorageAmount: storageAmount,
+                                StorageType: {},
+                                meStorageCardId: MeStorageCardId,
+                                isPresentGiftpack: false
+                            }],
+                            redBlueFlagEnum: 'RED',
+                            storageAmount: storageAmount,
+                            tradeTypeEnum: 'REFUND_CARD'
+                        });
+                        _context6.next = 11;
+                        return _this5.setState({
+                            refundBtnDisabled: true
+                        });
+
+                    case 11:
+                        _context6.prev = 11;
+                        _context6.next = 14;
+                        return _this5.api.ReturnedStorage(params);
+
+                    case 14:
+                        ret = _context6.sent;
+
+                        getCardList && getCardList(StorageCardNo);
+                        _tplusComponentsTouch.Message.success('退储值成功！');
+                        _context6.next = 19;
+                        return _this5.setState({
+                            refundBtnDisabled: false,
+                            refundShow: false
+                        });
+
+                    case 19:
+                        _context6.next = 27;
+                        break;
+
+                    case 21:
+                        _context6.prev = 21;
+                        _context6.t0 = _context6['catch'](11);
+                        _context6.next = 25;
+                        return _this5.setState({
+                            refundBtnDisabled: false
+                        });
+
+                    case 25:
+                        _tplusComponentsTouch.ModalWraper.destroy();
+                        _tplusComponentsTouch.ModalWraper.confirm({
+                            title: '提示',
+                            content: '\u9000\u6B3E\u5931\u8D25\uFF0C\u53EA\u80FD\u9000\u73B0\u91D1\uFF0C\u662F\u5426\u7EE7\u7EED',
+                            okText: '现金'
+                        });
+
+                    case 27:
+                    case 'end':
+                        return _context6.stop();
+                }
+            }
+        }, _callee6, _this5, [[11, 21]]);
+    }));
+
     this.returnedStorage = function () {
-        _this5.setState({
-            refundShow: true
+        var _props$cardList4 = _this5.props.cardList,
+            cardList = _props$cardList4 === undefined ? [] : _props$cardList4;
+
+        var _ref21 = cardList[0] || {},
+            Id = _ref21.Id;
+
+        cardList[0].meMemberId = Id;
+        cardList[0].isRefundStorage = 1; // 自己添加参数，用来判断是储值还是退储值
+        _mutantsMicrofx.stores.memberStore.init({
+            member: cardList[0],
+            settlementControlEvent: {},
+            callback: function callback() {
+                _this5.setState({
+                    refundShow: true
+                });
+            }
         });
     };
 
     this.memberUnBindCard = function () {
-        var _props$cardList2 = _this5.props.cardList,
-            cardList = _props$cardList2 === undefined ? [] : _props$cardList2;
+        var _props$cardList5 = _this5.props.cardList,
+            cardList = _props$cardList5 === undefined ? [] : _props$cardList5;
 
-        var _ref18 = cardList[0] || {},
-            cardNo = _ref18.cardNo,
-            memberName = _ref18.memberName;
+        var _ref22 = cardList[0] || {},
+            StorageCardNo = _ref22.StorageCardNo,
+            MemberMobile = _ref22.MemberMobile,
+            MemberName = _ref22.MemberName,
+            ID = _ref22.ID;
 
-        if (!memberName) {
+        if (!ID) {
             _tplusComponentsTouch.Message.error('该卡未绑定会员');
             return;
         }
         _tplusComponentsTouch.ModalWraper.confirm({
             title: '提示',
-            content: '\u6B64\u5361\u5C5E\u4E8E' + memberName + '\u4F1A\u5458\uFF0C\u786E\u8BA4\u89E3\u7ED1\u5417\uFF1F',
+            content: '\u6B64\u5361\u5C5E\u4E8E' + (MemberName || MemberMobile) + '\u4F1A\u5458\uFF0C\u786E\u8BA4\u89E3\u7ED1\u5417\uFF1F',
             confirmLoading: _this5.state.memberUnBindCardLoading,
             onOk: function () {
-                var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
-                    return _regenerator2.default.wrap(function _callee6$(_context6) {
+                var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
+                    return _regenerator2.default.wrap(function _callee7$(_context7) {
                         while (1) {
-                            switch (_context6.prev = _context6.next) {
+                            switch (_context7.prev = _context7.next) {
                                 case 0:
                                     _this5.setState({
                                         memberUnBindCardLoading: true
                                     });
-                                    _this5.api.MeStorageCardUnbind({ cardNo: cardNo }).then(function (res) {
+                                    _this5.api.MeStorageCardUnbind({ StorageCardNo: StorageCardNo }).then(function (res) {
                                         var getCardList = _this5.props.getCardList;
 
                                         _tplusComponentsTouch.Message.success('解绑成功');
-                                        getCardList(cardNo);
+                                        getCardList(StorageCardNo);
                                         _this5.setState({
                                             memberUnBindCardLoading: false
                                         });
@@ -974,14 +1105,14 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
 
                                 case 2:
                                 case 'end':
-                                    return _context6.stop();
+                                    return _context7.stop();
                             }
                         }
-                    }, _callee6, _this5);
+                    }, _callee7, _this5);
                 }));
 
                 return function onOk() {
-                    return _ref19.apply(this, arguments);
+                    return _ref23.apply(this, arguments);
                 };
             }()
         });
@@ -994,23 +1125,23 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     };
 
     this.getMenuItem = function (index, menu) {
-        var _props11 = _this5.props,
-            loadingBtn = _props11.loadingBtn,
-            cardList = _props11.cardList;
+        var _props12 = _this5.props,
+            loadingBtn = _props12.loadingBtn,
+            cardList = _props12.cardList;
 
-        var _ref20 = _this5.state || {},
-            setPwdShortKey = _ref20.setPwdShortKey;
+        var _ref24 = _this5.state || {},
+            setPwdShortKey = _ref24.setPwdShortKey;
 
         var newStyle = _mutantsUtil.localStore && _mutantsUtil.localStore.get('voucherDefaultPosMode') == 'voucher';
 
-        var _ref21 = cardList && cardList.length && cardList[0] || {},
-            walletEnabled = _ref21.walletEnabled,
-            cardTypeEnum = _ref21.cardTypeEnum;
+        var _ref25 = cardList && cardList.length && cardList[0] || {},
+            WalletEnabled = _ref25.WalletEnabled,
+            CardTypeEnum = _ref25.CardTypeEnum;
         // 控制显示修改密码还是设置密码
 
 
         if (menu.auth === 'ModifyPassword') {
-            if (cardTypeEnum === 'BALANCE_CARD') {
+            if (CardTypeEnum === 'BALANCE_CARD') {
                 return _react2.default.createElement(
                     'div',
                     { key: index, className: 'primary-color b-theme ' + ('hot-' + menu.auth) + '  ' + (loadingBtn === false ? 'member-menu-el' : 'member-menu-el disabled-member-select-btn ') + ' ' + (newStyle && 'memberHeight'),
@@ -1018,7 +1149,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                             if (loadingBtn === false) _this5.click(menu.key, menu.auth);
                         }
                     },
-                    walletEnabled ? _react2.default.createElement(
+                    WalletEnabled ? _react2.default.createElement(
                         'div',
                         null,
                         _react2.default.createElement(_tplusComponentsTouch.Ticon, { icon: menu.icon }),
@@ -1073,7 +1204,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                     )
                 );
             }
-        } else if (cardTypeEnum === 'BALANCE_CARD' && !walletEnabled && menu.auth === 'PosResetPwd') {
+        } else if (CardTypeEnum === 'BALANCE_CARD' && !WalletEnabled && menu.auth === 'PosResetPwd') {
             return;
         } else {
             return _react2.default.createElement(