tplus-member 3.26.9 → 3.26.13

package/dist/member/memberMenuStorage/index.js

@@ -5,14 +5,18 @@ 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);
 
+var _modal = require('antd/es/modal');
+
+var _modal2 = _interopRequireDefault(_modal);
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
 var _regenerator = require('babel-runtime/regenerator');
 
 var _regenerator2 = _interopRequireDefault(_regenerator);
@@ -43,6 +47,8 @@ var _inherits3 = _interopRequireDefault(_inherits2);
 
 var _class, _class2, _temp, _initialiseProps;
 
+require('antd/es/modal/style');
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -446,7 +452,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
 
                                 this.changeBindCardBtnDisabled(false);
                                 _tplusComponentsTouch.Message.success('绑定成功');
-                                getCardList(StorageCardNo);
+                                getCardList(cardList && cardList.length > 1 ? cardList[0].MemberMobile : StorageCardNo);
                                 this.setState({
                                     bindCardShow: false
                                 });
@@ -479,6 +485,137 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
 
         // 点击退储值的确定按钮
 
+    }, {
+        key: 'submitRefundStorage',
+
+        // 点击退储值确定或者退现金之后，请求数据 isCash, 是否是现金结算
+        value: function () {
+            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+                var cardInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+                var storageAmount = arguments[1];
+                var isCash = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
+                var store, _store$data, data, MeStorageCardId, StorageCardNo, ID, _cardInfo$LatestStora, latestStorageAmount, paymentTypeId, finAccountId, _props9, getCardList, _props9$cardList, cardList, params, ret;
+
+                return _regenerator2.default.wrap(function _callee4$(_context4) {
+                    while (1) {
+                        switch (_context4.prev = _context4.next) {
+                            case 0:
+                                if (cardInfo) {
+                                    _context4.next = 2;
+                                    break;
+                                }
+
+                                return _context4.abrupt('return');
+
+                            case 2:
+                                store = _mutantsMicrofx.stores.memberStore;
+                                _store$data = store.data, data = _store$data === undefined ? {} : _store$data;
+                                MeStorageCardId = cardInfo.MeStorageCardId, StorageCardNo = cardInfo.StorageCardNo, ID = cardInfo.ID, _cardInfo$LatestStora = cardInfo.LatestStorageInfo;
+                                _cardInfo$LatestStora = _cardInfo$LatestStora === undefined ? {} : _cardInfo$LatestStora;
+                                latestStorageAmount = _cardInfo$LatestStora.latestStorageAmount, paymentTypeId = _cardInfo$LatestStora.paymentTypeId, finAccountId = _cardInfo$LatestStora.finAccountId;
+                                _props9 = this.props, getCardList = _props9.getCardList, _props9$cardList = _props9.cardList, cardList = _props9$cardList === undefined ? [] : _props9$cardList;
+                                params = (0, _extends3.default)({}, data, {
+                                    StorageDetails: [{
+                                        Idmember: ID,
+                                        ThisStorageAmount: storageAmount,
+                                        StorageType: {},
+                                        meStorageCardId: MeStorageCardId,
+                                        isPresentGiftpack: false
+                                    }],
+                                    redBlueFlagEnum: 'RED',
+                                    storageAmount: storageAmount,
+                                    tradeTypeEnum: 'REFUND_CARD',
+                                    StorageMutiSettleDetails: []
+                                    // if (isCash) {
+                                });
+                                params.StorageMutiSettleDetails = [{
+                                    "StorageAmount": storageAmount,
+                                    "PaymentCode": "",
+                                    "DynamicPropertyValues": [],
+                                    "IdbankAccount": finAccountId,
+                                    "Code": 1,
+                                    "IdsettleStyle": paymentTypeId,
+                                    "DynamicPropertyKeys": [],
+                                    "DataSource": {}
+                                }];
+                                // }
+                                _context4.next = 12;
+                                return this.setState({
+                                    refundBtnDisabled: true
+                                });
+
+                            case 12:
+                                _context4.prev = 12;
+                                _context4.next = 15;
+                                return this.api.ReturnedStorage(params);
+
+                            case 15:
+                                ret = _context4.sent;
+
+                                getCardList && getCardList(cardList && cardList.length > 1 ? cardList[0].MemberMobile : StorageCardNo);
+                                _tplusComponentsTouch.Message.success('退储值成功！');
+                                _context4.next = 20;
+                                return this.setState({
+                                    refundBtnDisabled: false,
+                                    refundShow: false
+                                });
+
+                            case 20:
+                                _context4.next = 28;
+                                break;
+
+                            case 22:
+                                _context4.prev = 22;
+                                _context4.t0 = _context4['catch'](12);
+
+                                console.log(_context4.t0);
+                                _context4.next = 27;
+                                return this.setState({
+                                    refundBtnDisabled: false
+                                });
+
+                            case 27:
+                                this.returnedCash('\u9000\u6B3E\u5931\u8D25\uFF0C\u53EA\u80FD\u9000\u73B0\u91D1\uFF0C\u662F\u5426\u7EE7\u7EED', storageAmount);
+
+                            case 28:
+                            case 'end':
+                                return _context4.stop();
+                        }
+                    }
+                }, _callee4, this, [[12, 22]]);
+            }));
+
+            function submitRefundStorage() {
+                return _ref9.apply(this, arguments);
+            }
+
+            return submitRefundStorage;
+        }()
+        // 退现金提示
+
+    }, {
+        key: 'returnedCash',
+        value: function returnedCash(content, storageAmount) {
+            _modal2.default.destroyAll();
+            var that = this;
+            _tplusComponentsTouch.ModalWraper.confirm({
+                title: '提示',
+                content: content,
+                okText: '现金',
+                onOk: function onOk() {
+                    var _that$props = that.props,
+                        _that$props$cardList = _that$props.cardList,
+                        cardList = _that$props$cardList === undefined ? [] : _that$props$cardList,
+                        selected = _that$props.selected;
+
+                    that.setState({
+                        refundShow: false
+                    });
+                    that.submitRefundStorage(cardList[selected], storageAmount, true);
+                }
+            });
+        }
         // 点击退储值
 
         // 点击解绑
@@ -502,8 +639,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                     });
                 }
                 if (ret === true) {
-                    var _ref9 = _mutantsUtil.platform || {},
-                        isHorizontalSunMi = _ref9.isHorizontalSunMi;
+                    var _ref10 = _mutantsUtil.platform || {},
+                        isHorizontalSunMi = _ref10.isHorizontalSunMi;
 
                     switch (key) {
                         case 'storage':
@@ -543,27 +680,27 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                 refundShow = _state.refundShow,
                 refundBtnDisabled = _state.refundBtnDisabled,
                 menuKey = _state.menuKey;
-            var _props9 = this.props,
-                _props9$member = _props9.member,
-                member = _props9$member === undefined ? {} : _props9$member,
-                authProcess = _props9.authProcess,
-                getCardList = _props9.getCardList,
-                _props9$selected = _props9.selected,
-                selected = _props9$selected === undefined ? 0 : _props9$selected,
-                modifyMember = _props9.modifyMember,
-                _props9$cardList = _props9.cardList,
-                cardList = _props9$cardList === undefined ? [] : _props9$cardList;
-
-            var _ref10 = cardList.length && cardList[selected] || {},
-                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;
+            var _props10 = this.props,
+                _props10$member = _props10.member,
+                member = _props10$member === undefined ? {} : _props10$member,
+                authProcess = _props10.authProcess,
+                getCardList = _props10.getCardList,
+                _props10$selected = _props10.selected,
+                selected = _props10$selected === undefined ? 0 : _props10$selected,
+                modifyMember = _props10.modifyMember,
+                _props10$cardList = _props10.cardList,
+                cardList = _props10$cardList === undefined ? [] : _props10$cardList;
+
+            var _ref11 = cardList.length && cardList[selected] || {},
+                Id = _ref11.Id,
+                _ref11$BalanceStorage = _ref11.BalanceStorage,
+                BalanceStorage = _ref11$BalanceStorage === undefined ? 0 : _ref11$BalanceStorage,
+                _ref11$PresentAmount = _ref11.PresentAmount,
+                PresentAmount = _ref11$PresentAmount === undefined ? 0 : _ref11$PresentAmount,
+                WalletEnabled = _ref11.WalletEnabled,
+                CardTypeEnum = _ref11.CardTypeEnum,
+                CardStatusEnum = _ref11.CardStatusEnum,
+                StorageCardNo = _ref11.StorageCardNo;
 
             return _react2.default.createElement(
                 'div',
@@ -604,10 +741,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[selected], 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[selected], changeBtnDisabled: this.changeBtnDisabled, loadUserInfo: getCardList, selected: selected, storageInit: this.storageInit, passwordTitle: CardTypeEnum === 'BALANCE_CARD' && !WalletEnabled ? '设置密码' : passwordTitle, modifyMember: modifyMember, ref: function ref(_ref12) {
+                    passwordTitle === '换卡' ? _react2.default.createElement(_changeMemberCard2.default, { cardList: cardList && cardList.length && cardList[selected], modifyMember: modifyMember, member: member, ref: function ref(_ref12) {
                             return _this4.modifyPass = _ref12;
+                        }, cancelModal: this.changePasswordCancel }) : _react2.default.createElement(_modifyPass2.default, { menuKey: menuKey, cardListCopy: cardList, cardList: cardList && cardList.length && cardList[selected], changeBtnDisabled: this.changeBtnDisabled, loadUserInfo: getCardList, selected: selected, storageInit: this.storageInit, passwordTitle: CardTypeEnum === 'BALANCE_CARD' && !WalletEnabled ? '设置密码' : passwordTitle, modifyMember: modifyMember, ref: function ref(_ref13) {
+                            return _this4.modifyPass = _ref13;
                         }, member: member, cancelModal: this.changePasswordCancel })
                 ),
                 _react2.default.createElement(
@@ -622,8 +759,8 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                         btnDissabled: bindCardBtnDisabled
                     },
                     _react2.default.createElement(_bindCard2.default, {
-                        ref: function ref(_ref13) {
-                            return _this4.bindCardRef = _ref13;
+                        ref: function ref(_ref14) {
+                            return _this4.bindCardRef = _ref14;
                         },
                         bindCardClick: this.bindCardClick,
                         changeBindCardBtnDisabled: this.changeBindCardBtnDisabled
@@ -723,9 +860,9 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     var _this5 = this;
 
     this.filterMenus = function (tags) {
-        var _props10 = _this5.props,
-            title = _props10.title,
-            storeKey = _props10.storeKey;
+        var _props11 = _this5.props,
+            title = _props11.title,
+            storeKey = _props11.storeKey;
 
         menus = menus1;
         return menus.filter(function (menu) {
@@ -738,22 +875,22 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     };
 
     this.storageInit = function () {
-        var _props11 = _this5.props,
-            _props11$cardList = _props11.cardList,
-            cardList = _props11$cardList === undefined ? [] : _props11$cardList,
-            getCardList = _props11.getCardList,
-            _props11$selected = _props11.selected,
-            selected = _props11$selected === undefined ? 0 : _props11$selected;
+        var _props12 = _this5.props,
+            _props12$cardList = _props12.cardList,
+            cardList = _props12$cardList === undefined ? [] : _props12$cardList,
+            getCardList = _props12.getCardList,
+            _props12$selected = _props12.selected,
+            selected = _props12$selected === undefined ? 0 : _props12$selected;
 
-        var _ref14 = cardList[selected] || {},
-            StorageCardNo = _ref14.StorageCardNo;
+        var _ref15 = cardList[selected] || {},
+            StorageCardNo = _ref15.StorageCardNo;
 
         _mutantsMicrofx.stores.memberStore.init({
             cardInfo: cardList[selected],
             settlementControlEvent: {
                 onSettleSuccess: function onSettleSuccess() {
                     _mutantsMicrofx.stores.modalRouter.hide('/memberstore');
-                    getCardList(StorageCardNo);
+                    getCardList(cardList && cardList.length > 1 ? cardList[0].MemberMobile : StorageCardNo);
                 }
             },
             callback: function callback() {
@@ -780,19 +917,19 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     };
 
     this.reportLoss = function () {
-        var _props12 = _this5.props,
-            member = _props12.member,
-            handleChange = _props12.handleChange,
-            memberEnumState = _props12.memberEnumState;
+        var _props13 = _this5.props,
+            member = _props13.member,
+            handleChange = _props13.handleChange,
+            memberEnumState = _props13.memberEnumState;
 
         _tplusComponentsTouch.ModalWraper.confirm({
             title: '提示',
             content: '确定要挂失该会员卡吗？',
             onOk: function () {
-                var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
-                    return _regenerator2.default.wrap(function _callee4$(_context4) {
+                var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+                    return _regenerator2.default.wrap(function _callee5$(_context5) {
                         while (1) {
-                            switch (_context4.prev = _context4.next) {
+                            switch (_context5.prev = _context5.next) {
                                 case 0:
                                     _this5.api.RecordLoss(member).then(function (ret) {
                                         var Success = ret.Success,
@@ -814,14 +951,14 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
 
                                 case 1:
                                 case 'end':
-                                    return _context4.stop();
+                                    return _context5.stop();
                             }
                         }
-                    }, _callee4, _this5);
+                    }, _callee5, _this5);
                 }));
 
                 return function onOk() {
-                    return _ref15.apply(this, arguments);
+                    return _ref16.apply(this, arguments);
                 };
             }(),
             onCancel: function onCancel() {},
@@ -832,19 +969,19 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
 
     this.cancelLoss = function () {
         if (!_this5.api) return;
-        var _props13 = _this5.props,
-            member = _props13.member,
-            handleChange = _props13.handleChange,
-            memberEnumState = _props13.memberEnumState;
+        var _props14 = _this5.props,
+            member = _props14.member,
+            handleChange = _props14.handleChange,
+            memberEnumState = _props14.memberEnumState;
 
         _tplusComponentsTouch.ModalWraper.confirm({
             title: '提示',
             content: '确定要取消挂失该会员卡吗？',
             onOk: function () {
-                var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-                    return _regenerator2.default.wrap(function _callee5$(_context5) {
+                var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+                    return _regenerator2.default.wrap(function _callee6$(_context6) {
                         while (1) {
-                            switch (_context5.prev = _context5.next) {
+                            switch (_context6.prev = _context6.next) {
                                 case 0:
                                     _this5.api.UnRecordLoss(member).then(function (ret) {
                                         var Success = ret.Success,
@@ -866,14 +1003,14 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
 
                                 case 1:
                                 case 'end':
-                                    return _context5.stop();
+                                    return _context6.stop();
                             }
                         }
-                    }, _callee5, _this5);
+                    }, _callee6, _this5);
                 }));
 
                 return function onOk() {
-                    return _ref16.apply(this, arguments);
+                    return _ref17.apply(this, arguments);
                 };
             }(),
             onCancel: function onCancel() {},
@@ -883,19 +1020,19 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     };
 
     this.openCard = function () {
-        var _props14 = _this5.props,
-            member = _props14.member,
-            loadUserInfo = _props14.loadUserInfo,
-            _props14$selected = _props14.selected,
-            selected = _props14$selected === undefined ? 0 : _props14$selected,
-            memberEnumState = _props14.memberEnumState;
+        var _props15 = _this5.props,
+            member = _props15.member,
+            loadUserInfo = _props15.loadUserInfo,
+            _props15$selected = _props15.selected,
+            selected = _props15$selected === undefined ? 0 : _props15$selected,
+            memberEnumState = _props15.memberEnumState;
 
-        var _ref17 = member || {},
-            ID = _ref17.ID,
-            _ref17$MemberType = _ref17.MemberType;
+        var _ref18 = member || {},
+            ID = _ref18.ID,
+            _ref18$MemberType = _ref18.MemberType;
 
-        _ref17$MemberType = _ref17$MemberType === undefined ? {} : _ref17$MemberType;
-        var IsStorage = _ref17$MemberType.IsStorage;
+        _ref18$MemberType = _ref18$MemberType === undefined ? {} : _ref18$MemberType;
+        var IsStorage = _ref18$MemberType.IsStorage;
 
         memberStore.GetMemberDTO(ID, false).then(function (ret) {
             _mutantsMicrofx.stores.selectMemberStore.setCurMemberInfo(ret);
@@ -930,14 +1067,14 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     };
 
     this.bindCard = function () {
-        var _props15 = _this5.props,
-            _props15$cardList = _props15.cardList,
-            cardList = _props15$cardList === undefined ? [] : _props15$cardList,
-            _props15$selected = _props15.selected,
-            selected = _props15$selected === undefined ? 0 : _props15$selected;
+        var _props16 = _this5.props,
+            _props16$cardList = _props16.cardList,
+            cardList = _props16$cardList === undefined ? [] : _props16$cardList,
+            _props16$selected = _props16.selected,
+            selected = _props16$selected === undefined ? 0 : _props16$selected;
 
-        var _ref18 = cardList[selected] || {},
-            ID = _ref18.ID;
+        var _ref19 = cardList[selected] || {},
+            ID = _ref19.ID;
 
         if (!!ID) {
             _tplusComponentsTouch.Message.error('该储值卡已经绑定，不能再次进行绑定');
@@ -973,123 +1110,58 @@ 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, _props16, _props16$cardList, cardList, getCardList, _props16$selected, selected, _ref20, MeStorageCardId, _ref20$BalanceStorage, BalanceStorage, _ref20$PresentAmount, PresentAmount, StorageCardNo, ID, LatestStorageAmount, refundable, storageAmount, params, ret;
+    this.changeRefundOk = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
+        var _props17, _props17$cardList, cardList, _props17$selected, selected, _ref21, MeStorageCardId, _ref21$BalanceStorage, BalanceStorage, _ref21$PresentAmount, PresentAmount, StorageCardNo, ID, _ref21$LatestStorageI, latestStorageAmount, paymentTypeId, finAccountId, refundable, storageAmount;
 
-        return _regenerator2.default.wrap(function _callee6$(_context6) {
+        return _regenerator2.default.wrap(function _callee7$(_context7) {
             while (1) {
-                switch (_context6.prev = _context6.next) {
+                switch (_context7.prev = _context7.next) {
                     case 0:
-                        store = _mutantsMicrofx.stores.memberStore;
-                        _store$data = store.data, data = _store$data === undefined ? {} : _store$data;
-                        _props16 = _this5.props, _props16$cardList = _props16.cardList, cardList = _props16$cardList === undefined ? [] : _props16$cardList, getCardList = _props16.getCardList, _props16$selected = _props16.selected, selected = _props16$selected === undefined ? 0 : _props16$selected;
-                        _ref20 = cardList.length && cardList[selected] || {}, 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, LatestStorageAmount = _ref20.LatestStorageAmount;
+                        _props17 = _this5.props, _props17$cardList = _props17.cardList, cardList = _props17$cardList === undefined ? [] : _props17$cardList, _props17$selected = _props17.selected, selected = _props17$selected === undefined ? 0 : _props17$selected;
+                        _ref21 = cardList.length && cardList[selected] || {}, MeStorageCardId = _ref21.MeStorageCardId, _ref21$BalanceStorage = _ref21.BalanceStorage, BalanceStorage = _ref21$BalanceStorage === undefined ? 0 : _ref21$BalanceStorage, _ref21$PresentAmount = _ref21.PresentAmount, PresentAmount = _ref21$PresentAmount === undefined ? 0 : _ref21$PresentAmount, StorageCardNo = _ref21.StorageCardNo, ID = _ref21.ID, _ref21$LatestStorageI = _ref21.LatestStorageInfo;
+                        _ref21$LatestStorageI = _ref21$LatestStorageI === undefined ? {} : _ref21$LatestStorageI;
+                        latestStorageAmount = _ref21$LatestStorageI.latestStorageAmount, paymentTypeId = _ref21$LatestStorageI.paymentTypeId, finAccountId = _ref21$LatestStorageI.finAccountId;
                         refundable = parseFloat((0, _utils.getFixedNumber)(BalanceStorage - PresentAmount));
                         storageAmount = (0, _utils.getFixedNumber)(0 - (BalanceStorage - PresentAmount));
                         // 退款只支持退最后一次储值的金额，如果最后一次储值的金额小于可退金额，弹出提示。
 
-                        if (!(LatestStorageAmount && LatestStorageAmount < refundable)) {
-                            _context6.next = 9;
+                        if (!(latestStorageAmount && latestStorageAmount < refundable)) {
+                            _context7.next = 9;
                             break;
                         }
 
-                        _tplusComponentsTouch.ModalWraper.confirm({
-                            title: '提示',
-                            content: '\u9000\u6B3E\u5927\u4E8E\u6700\u540E\u4E00\u6B21\u50A8\u503C\u91D1\u989D\uFF0C\u65E0\u6CD5\u539F\u8DEF\u9000\u56DE\uFF0C\u53EA\u53EF\u9000\u73B0\u91D1\uFF01\u662F\u5426\u9000\u6B3E\uFF1F',
-                            okText: '现金',
-                            onOk: function onOk() {
-                                _this5.setState({
-                                    refundShow: false
-                                });
-                            }
-                        });
-                        return _context6.abrupt('return');
+                        _this5.returnedCash('\u9000\u6B3E\u5927\u4E8E\u6700\u540E\u4E00\u6B21\u50A8\u503C\u91D1\u989D\uFF0C\u65E0\u6CD5\u539F\u8DEF\u9000\u56DE\uFF0C\u53EA\u53EF\u9000\u73B0\u91D1\uFF01\u662F\u5426\u9000\u6B3E\uFF1F', storageAmount);
+                        return _context7.abrupt('return');
 
                     case 9:
                         if (!(Number(storageAmount) === 0)) {
-                            _context6.next = 12;
+                            _context7.next = 12;
                             break;
                         }
 
                         _tplusComponentsTouch.Message.error('无可退金额，不支持退款！');
-                        return _context6.abrupt('return');
+                        return _context7.abrupt('return');
 
                     case 12:
-                        params = (0, _extends3.default)({}, data, {
-                            StorageDetails: [{
-                                Idmember: ID,
-                                ThisStorageAmount: storageAmount,
-                                StorageType: {},
-                                meStorageCardId: MeStorageCardId,
-                                isPresentGiftpack: false
-                            }],
-                            redBlueFlagEnum: 'RED',
-                            storageAmount: storageAmount,
-                            tradeTypeEnum: 'REFUND_CARD'
-                        });
-                        _context6.next = 15;
-                        return _this5.setState({
-                            refundBtnDisabled: true
-                        });
-
-                    case 15:
-                        _context6.prev = 15;
-                        _context6.next = 18;
-                        return _this5.api.ReturnedStorage(params);
+                        _this5.submitRefundStorage(cardList[selected], storageAmount);
 
-                    case 18:
-                        ret = _context6.sent;
-
-                        getCardList && getCardList(StorageCardNo);
-                        _tplusComponentsTouch.Message.success('退储值成功！');
-                        _context6.next = 23;
-                        return _this5.setState({
-                            refundBtnDisabled: false,
-                            refundShow: false
-                        });
-
-                    case 23:
-                        _context6.next = 31;
-                        break;
-
-                    case 25:
-                        _context6.prev = 25;
-                        _context6.t0 = _context6['catch'](15);
-                        _context6.next = 29;
-                        return _this5.setState({
-                            refundBtnDisabled: false
-                        });
-
-                    case 29:
-                        _tplusComponentsTouch.ModalWraper.destroy();
-                        _tplusComponentsTouch.ModalWraper.confirm({
-                            title: '提示',
-                            content: '\u9000\u6B3E\u5931\u8D25\uFF0C\u53EA\u80FD\u9000\u73B0\u91D1\uFF0C\u662F\u5426\u7EE7\u7EED',
-                            okText: '现金',
-                            onOk: function onOk() {
-                                _this5.setState({
-                                    refundShow: false
-                                });
-                            }
-                        });
-
-                    case 31:
+                    case 13:
                     case 'end':
-                        return _context6.stop();
+                        return _context7.stop();
                 }
             }
-        }, _callee6, _this5, [[15, 25]]);
+        }, _callee7, _this5);
     }));
 
     this.returnedStorage = function () {
-        var _props17 = _this5.props,
-            _props17$cardList = _props17.cardList,
-            cardList = _props17$cardList === undefined ? [] : _props17$cardList,
-            _props17$selected = _props17.selected,
-            selected = _props17$selected === undefined ? 0 : _props17$selected;
+        var _props18 = _this5.props,
+            _props18$cardList = _props18.cardList,
+            cardList = _props18$cardList === undefined ? [] : _props18$cardList,
+            _props18$selected = _props18.selected,
+            selected = _props18$selected === undefined ? 0 : _props18$selected;
 
-        var _ref21 = cardList[selected] || {},
-            Id = _ref21.Id;
+        var _ref22 = cardList[selected] || {},
+            Id = _ref22.Id;
 
         cardList[selected].meMemberId = Id;
         cardList[selected].isRefundStorage = 1; // 自己添加参数，用来判断是储值还是退储值
@@ -1105,17 +1177,17 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     };
 
     this.memberUnBindCard = function () {
-        var _props18 = _this5.props,
-            _props18$cardList = _props18.cardList,
-            cardList = _props18$cardList === undefined ? [] : _props18$cardList,
-            _props18$selected = _props18.selected,
-            selected = _props18$selected === undefined ? 0 : _props18$selected;
+        var _props19 = _this5.props,
+            _props19$cardList = _props19.cardList,
+            cardList = _props19$cardList === undefined ? [] : _props19$cardList,
+            _props19$selected = _props19.selected,
+            selected = _props19$selected === undefined ? 0 : _props19$selected;
 
-        var _ref22 = cardList[selected] || {},
-            StorageCardNo = _ref22.StorageCardNo,
-            MemberMobile = _ref22.MemberMobile,
-            MemberName = _ref22.MemberName,
-            ID = _ref22.ID;
+        var _ref23 = cardList[selected] || {},
+            StorageCardNo = _ref23.StorageCardNo,
+            MemberMobile = _ref23.MemberMobile,
+            MemberName = _ref23.MemberName,
+            ID = _ref23.ID;
 
         if (!ID) {
             _tplusComponentsTouch.Message.error('该卡未绑定会员');
@@ -1126,10 +1198,10 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
             content: '\u6B64\u5361\u5C5E\u4E8E' + (MemberName || MemberMobile) + '\u4F1A\u5458\uFF0C\u786E\u8BA4\u89E3\u7ED1\u5417\uFF1F',
             confirmLoading: _this5.state.memberUnBindCardLoading,
             onOk: function () {
-                var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
-                    return _regenerator2.default.wrap(function _callee7$(_context7) {
+                var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+                    return _regenerator2.default.wrap(function _callee8$(_context8) {
                         while (1) {
-                            switch (_context7.prev = _context7.next) {
+                            switch (_context8.prev = _context8.next) {
                                 case 0:
                                     _this5.setState({
                                         memberUnBindCardLoading: true
@@ -1138,7 +1210,7 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
                                         var getCardList = _this5.props.getCardList;
 
                                         _tplusComponentsTouch.Message.success('解绑成功');
-                                        getCardList(StorageCardNo);
+                                        getCardList(cardList && cardList.length > 1 ? cardList[0].MemberMobile : StorageCardNo);
                                         _this5.setState({
                                             memberUnBindCardLoading: false
                                         });
@@ -1150,14 +1222,14 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
 
                                 case 2:
                                 case 'end':
-                                    return _context7.stop();
+                                    return _context8.stop();
                             }
                         }
-                    }, _callee7, _this5);
+                    }, _callee8, _this5);
                 }));
 
                 return function onOk() {
-                    return _ref23.apply(this, arguments);
+                    return _ref24.apply(this, arguments);
                 };
             }()
         });
@@ -1170,21 +1242,21 @@ var _default = (0, _mutantsMicrofx.observer)(_class = (_temp = _class2 = functio
     };
 
     this.getMenuItem = function (index, menu) {
-        var _props19 = _this5.props,
-            loadingBtn = _props19.loadingBtn,
-            _props19$cardList = _props19.cardList,
-            cardList = _props19$cardList === undefined ? [] : _props19$cardList,
-            _props19$selected = _props19.selected,
-            selected = _props19$selected === undefined ? 0 : _props19$selected;
+        var _props20 = _this5.props,
+            loadingBtn = _props20.loadingBtn,
+            _props20$cardList = _props20.cardList,
+            cardList = _props20$cardList === undefined ? [] : _props20$cardList,
+            _props20$selected = _props20.selected,
+            selected = _props20$selected === undefined ? 0 : _props20$selected;
 
-        var _ref24 = _this5.state || {},
-            setPwdShortKey = _ref24.setPwdShortKey;
+        var _ref25 = _this5.state || {},
+            setPwdShortKey = _ref25.setPwdShortKey;
 
         var newStyle = _mutantsUtil.localStore && _mutantsUtil.localStore.get('voucherDefaultPosMode') == 'voucher';
 
-        var _ref25 = cardList && cardList.length && cardList[selected] || {},
-            WalletEnabled = _ref25.WalletEnabled,
-            CardTypeEnum = _ref25.CardTypeEnum;
+        var _ref26 = cardList && cardList.length && cardList[selected] || {},
+            WalletEnabled = _ref26.WalletEnabled,
+            CardTypeEnum = _ref26.CardTypeEnum;
         // 控制显示修改密码还是设置密码