tplus-components-touch 3.33.15 → 3.33.18

package/dist/components/settlement/settlementStore.js

@@ -1167,7 +1167,7 @@ var SettlementStore = (_class = function () {
                                 status = this.type;
                                 _context4.prev = 4;
                                 paylist = this.paymode.thePaymodes.filter(function (v) {
-                                    return !!v.thridPayment && v.value > 0;
+                                    return !!v.thridPayment && Math.abs(v.value) > 0;
                                 }) || [];
 
                                 if (!(paylist && paylist.length > 1)) {
@@ -1648,13 +1648,13 @@ var SettlementStore = (_class = function () {
 
                                 if (vType == 1) {
                                     dto.RetailPaymentDetails.forEach(function (v) {
-                                        if (v.ThirdPaymentInfo != null) {
+                                        if (v.ThirdPaymentInfo != null && Math.abs(v.Amount) > 0) {
                                             v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
                                         }
                                     });
                                 } else if (vType == 2) {
                                     dto.StorageMutiSettleDetails.forEach(function (v) {
-                                        if (v.ThirdPaymentInfo != null) {
+                                        if (v.ThirdPaymentInfo != null && Math.abs(v.StorageAmount) > 0) {
                                             v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
                                         }
                                     });
@@ -1676,7 +1676,7 @@ var SettlementStore = (_class = function () {
                             case 24:
                                 _context7.prev = 24;
                                 _context7.t0 = _context7['catch'](0);
-                                return _context7.abrupt('return', { type: false, data: null, msg: _context7.t0 });
+                                return _context7.abrupt('return', { type: false, data: null, msg: _context7.t0, code: '9999' });
 
                             case 27:
                             case 'end':
@@ -2479,29 +2479,32 @@ var PayMode = exports.PayMode = (_class3 = function () {
             var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
                 var _this19 = this;
 
-                var _ref32, isHorizontalPad, isHorizontalSunMi, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _ref32, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
                 return _regenerator2.default.wrap(function _callee15$(_context15) {
                     while (1) {
                         switch (_context15.prev = _context15.next) {
                             case 0:
+                                // 是否移动端判断
                                 _ref32 = _mutantsUtil.platform || {}, isHorizontalPad = _ref32.isHorizontalPad, isHorizontalSunMi = _ref32.isHorizontalSunMi;
+                                isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
                                 _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn21.settleStyleType, PayStyle = _enumController$getEn21.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
-                                _context15.next = 6;
+                                _context15.next = 7;
                                 return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
 
-                            case 6:
+                            case 7:
                                 modes = _context15.sent;
 
-                                modes = !(!!isHorizontalPad || !!isHorizontalSunMi) ? modes : modes.filter(function (v) {
-                                    return !!v.ThirdPaymentInfo;
-                                });
                                 if (modes) {
                                     (0, _mobx.runInAction)(function () {
                                         var paymodes = [];
-                                        (0, _each3.default)(modes.SettleStyles, function (mode, index) {
+                                        var settleLists = modes.SettleStyles;
+                                        settleLists = isMobileEnvironment ? settleLists.filter(function (v) {
+                                            return !v.ThirdPaymentInfo;
+                                        }) : settleLists;
+                                        (0, _each3.default)(settleLists, function (mode, index) {
                                             //产品需求确认会员储值卡结算方式前端展示统一调整为“储值卡"  tuzha by 2020-07-08
                                             if (mode.Code == PayStyle.hyczk) {
                                                 mode.Name = '储值卡';