tplus-components-touch 3.25.2 → 3.26.1

package/dist/components/settlement/settlement.less

@@ -661,12 +661,25 @@
         padding-top:25px;
         padding-left:30px;
         padding-right: 20px;
-        .settlement-pay-item-border {
-          border-bottom: 1px solid #FF8C25 !important;
+        width: 300px;
+        position: relative;
+        .minus {
+          text-align: center;
+          display: inline-block;
+          height: 40px;
+          line-height: 40px;
+          width: 40px;
+          position: absolute;
+          left: 284px;
+          top: 34px;
+          .minusIcon {
+            font-size: 24px;
+          }
         }
         .main{
           display: flex;
-          border-bottom: 1px solid #C8C8CD;
+          border-bottom-width: 1px;
+          border-bottom-style: solid;
           .content{
             display: inline-block;
             vertical-align: top;
@@ -700,8 +713,8 @@
           }
           .lefticon{
             display: inline-block;
-            width: 20px;
             margin-right: 16px;
+            position: absolute;
             i{
               font-size: 20px;
             }
@@ -715,6 +728,7 @@
             }
           }
           .name{
+            margin-left: 6px;
             width: 100px;
             display: inline-block;
             font-size: 16px;
@@ -733,6 +747,22 @@
           padding-left: 36px;
           padding-top: 6px;
           padding-right: 60px;
+          .addCard {
+            width: 112px;
+            height: 32px;
+            border-radius: 4px;
+            text-align: center;
+            border: none;
+            font-size: 16px;
+            display: flex;
+            align-items: center;
+            border: none;
+            padding-top: 16px !important;
+            .plus {
+              font-size: 18px;
+              margin-right: 6px;
+            }
+          }
         }
       }
 
@@ -936,6 +966,22 @@
           padding-left: 74px;
           padding-top: 6px;
           padding-right: 60px;
+          .addCard {
+            width: 112px;
+            height: 32px;
+            border-radius: 4px;
+            text-align: center;
+            border: none;
+            font-size: 16px;
+            display: flex;
+            align-items: center;
+            border: none;
+            padding-top: 16px !important;
+            .plus {
+              font-size: 18px;
+              margin-right: 6px;
+            }
+          }
         }
 
       }

package/dist/components/settlement/settlementStore.js

@@ -611,7 +611,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'getLoginInfo',
         value: function getLoginInfo() {
-            var _ref7 = _mutantsMicrofx.stores.user || {},
+            var _ref7 = _mutantsMicrofx.localStore.get('user') || {},
                 _ref7$loginInfo = _ref7.loginInfo,
                 loginInfo = _ref7$loginInfo === undefined ? {} : _ref7$loginInfo;
 
@@ -642,16 +642,10 @@ var SettlementStore = (_class = function () {
                 return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function (result) {
                     var data = result.data;
                     var m = data;
-
-                    var _ref9 = _mutantsUtil.platform || {},
-                        isNewRetailBCPos = _ref9.isNewRetailBCPos;
-
-                    if (isNewRetailBCPos) {
-                        _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
-                        _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
-                        _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
-                        _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
-                    }
+                    _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
+                    _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
+                    _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
+                    _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
                     if (!m || !m.ID) {
                         (0, _mobx.runInAction)(function () {
                             _this7.paymode.currentMode.errinfo = "无效的会员卡号";
@@ -689,8 +683,8 @@ var SettlementStore = (_class = function () {
                     var data = JSON.parse(result.Data);
                     var m = data && data.length > 0 && data[0];
 
-                    var _ref10 = _mutantsUtil.platform || {},
-                        isNewRetailBCPos = _ref10.isNewRetailBCPos;
+                    var _ref9 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref9.isNewRetailBCPos;
 
                     if (isNewRetailBCPos) {
                         _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
@@ -984,8 +978,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
-                var _ref12, isNewRetailBCPos;
+            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+                var _ref11, isNewRetailBCPos;
 
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
@@ -1001,7 +995,7 @@ var SettlementStore = (_class = function () {
                                 return _context2.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _ref12 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref12.isNewRetailBCPos;
+                                _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
                                 _context2.prev = 4;
 
                                 if (!(this.type == 1)) {
@@ -1057,7 +1051,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function commit(_x2) {
-                return _ref11.apply(this, arguments);
+                return _ref10.apply(this, arguments);
             }
 
             return commit;
@@ -1115,10 +1109,10 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
                 var _this11 = this;
 
-                var _enumController$getEn14, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn14, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
@@ -1198,8 +1192,8 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
 
-                                    var _ref14 = _mutantsUtil.platform || {},
-                                        isNewRetailBCPos = _ref14.isNewRetailBCPos;
+                                    var _ref13 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref13.isNewRetailBCPos;
 
                                     if (_this11.dto.RetailStorageDetails.length > 0) {
                                         var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
@@ -1233,7 +1227,7 @@ var SettlementStore = (_class = function () {
                                         _this11.dto.Idmember = Idmember;
                                     }
                                 });
-                                _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
+                                _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
 
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
@@ -1303,7 +1297,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref13.apply(this, arguments);
+                return _ref12.apply(this, arguments);
             }
 
             return save;
@@ -1316,7 +1310,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref16 = (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) {
@@ -1344,7 +1338,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref16.apply(this, arguments);
+                return _ref15.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1370,14 +1364,14 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
-                var _ref18, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref17, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
                         switch (_context5.prev = _context5.next) {
                             case 0:
-                                _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
+                                _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
                                 _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
@@ -1462,7 +1456,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function validePwd(_x3) {
-                return _ref17.apply(this, arguments);
+                return _ref16.apply(this, arguments);
             }
 
             return validePwd;
@@ -1501,7 +1495,7 @@ var SettlementStore = (_class = function () {
         var _this13 = this;
 
         return function () {
-            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
@@ -1528,7 +1522,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x4) {
-                return _ref19.apply(this, arguments);
+                return _ref18.apply(this, arguments);
             };
         }();
     }
@@ -1620,8 +1614,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref20 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref20.isNewRetailBCPos;
+            var _ref19 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref19.isNewRetailBCPos;
 
             var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn15.PayStyle,
@@ -1731,18 +1725,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             }
                         });
 
-                        var _ref21 = element || {},
-                            couponCode = _ref21.couponCode,
-                            name = _ref21.name,
-                            tieredAmountResult = _ref21.tieredAmountResult,
-                            fromDate = _ref21.fromDate,
-                            dateMount = _ref21.dateMount,
-                            promoMethodEnum = _ref21.promoMethodEnum,
-                            discountPct = _ref21.discountPct,
-                            nominalAmount = _ref21.nominalAmount,
-                            promoId = _ref21.promoId,
-                            id = _ref21.id,
-                            doorsill = _ref21.doorsill;
+                        var _ref20 = element || {},
+                            couponCode = _ref20.couponCode,
+                            name = _ref20.name,
+                            tieredAmountResult = _ref20.tieredAmountResult,
+                            fromDate = _ref20.fromDate,
+                            dateMount = _ref20.dateMount,
+                            promoMethodEnum = _ref20.promoMethodEnum,
+                            discountPct = _ref20.discountPct,
+                            nominalAmount = _ref20.nominalAmount,
+                            promoId = _ref20.promoId,
+                            id = _ref20.id,
+                            doorsill = _ref20.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -1786,8 +1780,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref22 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref22.isNewRetailBCPos;
+            var _ref21 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
             var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
                 Differentiate = _enumController$getEn16.Differentiate;
@@ -1863,7 +1857,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
 
             if (this.amount > 0 && (v === '' || v === '0.00') && sum !== 0) {
                 this.currentMode.errinfo = "实收金额必须录入";
-            } else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
+            } else if (Math.abs(parseFloat(v)) > Math.abs((0, _utils.getFixedNumber)(sum))) {
                 this.currentMode.errinfo = "实收不应大于应收";
             } else if (parseFloat(v) > 0 && parseFloat(v) > (max || 0)) {
                 this.currentMode.errinfo = "余额不足";
@@ -1877,7 +1871,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
+            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
                 var _this15 = this;
 
                 var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
@@ -1902,7 +1896,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                             //产品需求确认会员储值卡结算方式前端展示统一调整为“储值卡"  tuzha by 2020-07-08
 
                                             if (mode.Code == PayStyle.hyczk) {
-                                                mode.Name = '储值余额';
+                                                mode.Name = '储值卡';
                                             }
                                             paymodes.push({
                                                 name: mode.Name,
@@ -1932,7 +1926,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref23.apply(this, arguments);
+                return _ref22.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -2053,8 +2047,8 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref24 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref24.isNewRetailBCPos;
+            var _ref23 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref23.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
             m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);