tplus-components-touch 3.36.4 → 3.36.5

package/dist/components/settlement/settlement.less

@@ -605,6 +605,7 @@
   z-index: 1006 !important;
 }
 .settlement-wraper2{
+  z-index: 1006;
   .ant-modal-body{
     padding:0px !important;
   }
@@ -1308,7 +1309,8 @@
 
   .btns{
     float: right;
-    height: 60px;
+    // height: 60px;
+    min-height: 60px;
     line-height: 49px;
     .quick{
       float: left;
@@ -1376,6 +1378,7 @@
       border:none;
       border-radius: 0px !important;
       margin-left:8px;
+      float: right;
     }
 
     .settle2{
@@ -1383,6 +1386,7 @@
       height:40px;
       // line-height: 16px;
       border-radius: 4px !important;
+      float: none;
     }
 
     .settleStorage{

package/dist/components/settlement/settlementStore.js

@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _desc2, _value2, _class3, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _desc3, _value3, _class5, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19;
+var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _desc2, _value2, _class3, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _desc3, _value3, _class5, _descriptor17, _descriptor18, _descriptor19, _descriptor20, _descriptor21;
 
 var _mobx = require('mobx');
 
@@ -173,15 +173,18 @@ var SettlementStore = (_class = function () {
         this.brefund = false;
         this.bquick = false;
         this.boriginReturn = false;
-        this.newStyle = true;
 
-        _initDefineProp(this, 'queryPwd', _descriptor, this);
+        _initDefineProp(this, 'newStyle', _descriptor, this);
 
-        _initDefineProp(this, 'updateMemberInfo', _descriptor2, this);
+        _initDefineProp(this, 'setNewStyle', _descriptor2, this);
 
-        _initDefineProp(this, 'updateCurrentMode', _descriptor3, this);
+        _initDefineProp(this, 'queryPwd', _descriptor3, this);
 
-        _initDefineProp(this, 'updateCardInfo', _descriptor4, this);
+        _initDefineProp(this, 'updateMemberInfo', _descriptor4, this);
+
+        _initDefineProp(this, 'updateCurrentMode', _descriptor5, this);
+
+        _initDefineProp(this, 'updateCardInfo', _descriptor6, this);
 
         this.handleCzkData = function (m) {
             if (!m || !m.StorageCardNo) {
@@ -494,7 +497,7 @@ var SettlementStore = (_class = function () {
         this.paymode = new PayMode();
         var params = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('cloudPrintArguments');
         if (params) this.cloudPrintArguments = params;
-        this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
+        this.setNewStyle();
     }
 
     (0, _createClass3.default)(SettlementStore, [{
@@ -509,7 +512,7 @@ var SettlementStore = (_class = function () {
         value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data, payModeKey) {
             var _this3 = this;
 
-            this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
+            this.setNewStyle();
             this.type = type;
             if (context) {
                 this.context = context;
@@ -1951,11 +1954,25 @@ var SettlementStore = (_class = function () {
         }()
     }]);
     return SettlementStore;
-}(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
+}(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'newStyle', [_mobx.observable], {
+    enumerable: true,
+    initializer: function initializer() {
+        return true;
+    }
+}), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, 'setNewStyle', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
         var _this14 = this;
 
+        return function () {
+            _this14.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
+        };
+    }
+}), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
+    enumerable: true,
+    initializer: function initializer() {
+        var _this15 = this;
+
         return function (newPass, newPassConfirm) {
             if (!newPass || !newPassConfirm) {
                 return _message2.default.warn('您还有未填写项');
@@ -1966,7 +1983,7 @@ var SettlementStore = (_class = function () {
             var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
             return (0, _tplusApi.ccApi)({
                 Idstore: idstore,
-                meMemberId: _this14.paymode.currentMode.memberId,
+                meMemberId: _this15.paymode.currentMode.memberId,
                 oldPassword: null,
                 newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
                 dataSource: "POS"
@@ -1977,10 +1994,10 @@ var SettlementStore = (_class = function () {
             });
         };
     }
-}), _applyDecoratedDescriptor(_class.prototype, 'initByOriginReturn', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'initByOriginReturn'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'quickSettle', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'quickSettle'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusAndAddPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusAndAddPay'), _class.prototype), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, 'updateMemberInfo', [_mobx.action], {
+}), _applyDecoratedDescriptor(_class.prototype, 'initByOriginReturn', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'initByOriginReturn'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'quickSettle', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'quickSettle'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusAndAddPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusAndAddPay'), _class.prototype), _descriptor4 = _applyDecoratedDescriptor(_class.prototype, 'updateMemberInfo', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this15 = this;
+        var _this16 = this;
 
         return function () {
             var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(_this) {
@@ -1990,9 +2007,9 @@ var SettlementStore = (_class = function () {
                     while (1) {
                         switch (_context12.prev = _context12.next) {
                             case 0:
-                                _getLoginInfo = _this15.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
+                                _getLoginInfo = _this16.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
                                 _context12.next = 3;
-                                return (0, _tplusApi.tApi)({ Idmember: _this15.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
+                                return (0, _tplusApi.tApi)({ Idmember: _this16.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
                             case 3:
                                 resp = _context12.sent;
@@ -2006,7 +2023,7 @@ var SettlementStore = (_class = function () {
                                 return _context12.stop();
                         }
                     }
-                }, _callee12, _this15);
+                }, _callee12, _this16);
             }));
 
             return function (_x10) {
@@ -2014,10 +2031,10 @@ var SettlementStore = (_class = function () {
             };
         }();
     }
-}), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'updateCurrentMode', [_mobx.action], {
+}), _descriptor5 = _applyDecoratedDescriptor(_class.prototype, 'updateCurrentMode', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this16 = this;
+        var _this17 = this;
 
         return function () {
             var _ref26 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(memberId) {
@@ -2042,7 +2059,7 @@ var SettlementStore = (_class = function () {
                                     break;
                                 }
 
-                                _this16.paymode.updateCardInfo(result.data[0]);
+                                _this17.paymode.updateCardInfo(result.data[0]);
                                 return _context13.abrupt('return', result.data);
 
                             case 9:
@@ -2051,7 +2068,7 @@ var SettlementStore = (_class = function () {
                                     break;
                                 }
 
-                                _this16.paymode.updateCardInfo(result.data[0]);
+                                _this17.paymode.updateCardInfo(result.data[0]);
                                 return _context13.abrupt('return', result.data);
 
                             case 14:
@@ -2071,7 +2088,7 @@ var SettlementStore = (_class = function () {
                                 return _context13.stop();
                         }
                     }
-                }, _callee13, _this16);
+                }, _callee13, _this17);
             }));
 
             return function (_x11) {
@@ -2079,10 +2096,10 @@ var SettlementStore = (_class = function () {
             };
         }();
     }
-}), _descriptor4 = _applyDecoratedDescriptor(_class.prototype, 'updateCardInfo', [_mobx.action], {
+}), _descriptor6 = _applyDecoratedDescriptor(_class.prototype, 'updateCardInfo', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this17 = this;
+        var _this18 = this;
 
         return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
             var address, result;
@@ -2090,21 +2107,21 @@ var SettlementStore = (_class = function () {
                 while (1) {
                     switch (_context14.prev = _context14.next) {
                         case 0:
-                            address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this17.paymode.currentMode.storageCardNo;
+                            address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this18.paymode.currentMode.storageCardNo;
                             _context14.next = 3;
                             return (0, _tplusApi.ccApi)({}, address, false, false, { method: 'get', timeout_skip: true });
 
                         case 3:
                             result = _context14.sent;
 
-                            _this17.paymode.updateCardInfo(result.data);
+                            _this18.paymode.updateCardInfo(result.data);
 
                         case 5:
                         case 'end':
                             return _context14.stop();
                     }
                 }
-            }, _callee14, _this17);
+            }, _callee14, _this18);
         }));
     }
 }), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
@@ -2121,19 +2138,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
         this.onlineamount = 0;
         this.maxamount = 0;
 
-        _initDefineProp(this, 'currentFocus', _descriptor5, this);
+        _initDefineProp(this, 'currentFocus', _descriptor7, this);
 
-        _initDefineProp(this, 'received', _descriptor6, this);
+        _initDefineProp(this, 'received', _descriptor8, this);
 
-        _initDefineProp(this, 'receivable', _descriptor7, this);
+        _initDefineProp(this, 'receivable', _descriptor9, this);
 
-        _initDefineProp(this, 'paymodes', _descriptor8, this);
+        _initDefineProp(this, 'paymodes', _descriptor10, this);
 
-        _initDefineProp(this, 'thePaymodes', _descriptor9, this);
+        _initDefineProp(this, 'thePaymodes', _descriptor11, this);
 
-        _initDefineProp(this, 'storageCardNo', _descriptor10, this);
+        _initDefineProp(this, 'storageCardNo', _descriptor12, this);
 
-        _initDefineProp(this, 'balance', _descriptor11, this);
+        _initDefineProp(this, 'balance', _descriptor13, this);
 
         this.currentMode = null;
         this.checkList = [];
@@ -2142,11 +2159,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
             hotKey: "Ctrl+M"
         };
 
-        _initDefineProp(this, 'calcCheckList', _descriptor12, this);
+        _initDefineProp(this, 'calcCheckList', _descriptor14, this);
 
-        _initDefineProp(this, 'setCouponNum', _descriptor13, this);
+        _initDefineProp(this, 'setCouponNum', _descriptor15, this);
 
-        _initDefineProp(this, 'addDjqs', _descriptor14, this);
+        _initDefineProp(this, 'addDjqs', _descriptor16, this);
     }
     // @observable store = null;
 
@@ -2205,7 +2222,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqCheckValue',
         value: function calcDjqCheckValue(q1, dto, params) {
-            var _this18 = this;
+            var _this19 = this;
 
             var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
             var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -2252,7 +2269,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
-                        _this18.checkList.splice(i, 1);
+                        _this19.checkList.splice(i, 1);
                     }
                 });
             } else {
@@ -2324,7 +2341,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 if (result && result.length != 0) {
                     result.forEach(function (element, index) {
                         var djq1 = false;
-                        _this18.currentMode.djqs.forEach(function (djq) {
+                        _this19.currentMode.djqs.forEach(function (djq) {
                             if (element.id === djq.id) {
                                 djq1 = true;
                             }
@@ -2369,10 +2386,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
                             //     id
                             // })
-                            _this18.addDjqs(couponCode, name, true, nominalAmount, promoDiscount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
+                            _this19.addDjqs(couponCode, name, true, nominalAmount, promoDiscount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
                             djq1 = false;
                         } else {
-                            _this18.setCouponNum(element.id, couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
+                            _this19.setCouponNum(element.id, couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -2477,7 +2494,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
         key: 'setPaymodes',
         value: function () {
             var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
-                var _this19 = this;
+                var _this20 = this;
 
                 var _ref32, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
@@ -2524,7 +2541,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 thridPayment: mode.ThirdPaymentInfo
                                             });
                                         });
-                                        _this19.paymodes = paymodes;
+                                        _this20.paymodes = paymodes;
                                     });
                                 }
 
@@ -2554,57 +2571,57 @@ var PayMode = exports.PayMode = (_class3 = function () {
         }
     }]);
     return PayMode;
-}(), (_descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
+}(), (_descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return "";
     }
-}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return null;
     }
-}), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
+}), _descriptor13 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return null;
     }
-}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this20 = this;
+        var _this21 = this;
 
         return function () {
-            _this20.checkList = [];
+            _this21.checkList = [];
         };
     }
-}), _applyDecoratedDescriptor(_class3.prototype, 'updateMemberStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateMemberStorageCardNo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'updateCardInfo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateCardInfo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor13 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'updateMemberStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateMemberStorageCardNo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'updateCardInfo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateCardInfo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor15 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this21 = this;
+        var _this22 = this;
 
         return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
-            _this21.currentMode.djqs.forEach(function (ele) {
+            _this22.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
                     ele.amount = promoDiscount;
                     promoMethodEnum == "CASH_COUPON" && (ele.nominalAmount = nominalAmount);
@@ -2615,10 +2632,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
             });
         };
     }
-}), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
+}), _descriptor16 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this22 = this;
+        var _this23 = this;
 
         return function (promoCouponCode, name, IsEnable, nominalAmount, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
             var djq = {
@@ -2641,25 +2658,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 couponCategoryEnum: couponCategoryEnum,
                 id: id
             };
-            _this22.currentMode.djqs.push(djq);
+            _this23.currentMode.djqs.push(djq);
         };
     }
 }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
 var Member = exports.Member = (_class5 = function () {
     function Member(m) {
-        var _this23 = this;
+        var _this24 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
-        _initDefineProp(this, 'cardNo', _descriptor15, this);
+        _initDefineProp(this, 'cardNo', _descriptor17, this);
 
-        _initDefineProp(this, 'balance', _descriptor16, this);
+        _initDefineProp(this, 'balance', _descriptor18, this);
 
-        _initDefineProp(this, 'exchangable', _descriptor17, this);
+        _initDefineProp(this, 'exchangable', _descriptor19, this);
 
-        _initDefineProp(this, 'meStorageCardId', _descriptor18, this);
+        _initDefineProp(this, 'meStorageCardId', _descriptor20, this);
 
-        _initDefineProp(this, 'storageCardNo', _descriptor19, this);
+        _initDefineProp(this, 'storageCardNo', _descriptor21, this);
 
         if (m) {
             this.id = m.ID;
@@ -2674,11 +2691,11 @@ var Member = exports.Member = (_class5 = function () {
                 isNewRetailBCPos = _ref33.isNewRetailBCPos;
 
             (0, _mobx.runInAction)(function () {
-                _this23.cardNo = m.CardCode;
+                _this24.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this23.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this24.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this23.balance = _this23.rawbalance;
+                    _this24.balance = _this24.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2700,19 +2717,19 @@ var Member = exports.Member = (_class5 = function () {
         }
     }]);
     return Member;
-}(), (_descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
+}(), (_descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
+}), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
+}), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
+}), _descriptor20 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'storageCardNo', [_mobx.observable], {
+}), _descriptor21 = _applyDecoratedDescriptor(_class5.prototype, 'storageCardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
 }), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype)), _class5);