tplus-components-touch 3.23.4 → 3.23.8

package/dist/components/settlement/settlementStore.js

@@ -1371,7 +1371,7 @@ 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, result, count, _result;
+                var _ref18, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
@@ -1381,83 +1381,84 @@ var SettlementStore = (_class = function () {
                                 _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context5.next = 18;
+                                    _context5.next = 19;
                                     break;
                                 }
 
                                 cook1 = this.getAllCookies()['errorPwd'];
                                 cook2 = cook1 && JSON.parse(cook1);
                                 message = '密码输入错误';
+                                memberId = this.paymode.currentMode.member.MeStorageCardId;
 
                                 if (!cook2) {
-                                    _context5.next = 11;
+                                    _context5.next = 12;
                                     break;
                                 }
 
-                                if (!cook2.hasOwnProperty(this.member.MeStorageCardId + "")) {
-                                    _context5.next = 11;
+                                if (!cook2.hasOwnProperty(memberId + "")) {
+                                    _context5.next = 12;
                                     break;
                                 }
 
-                                if (!(cook2[this.member.MeStorageCardId] > 3)) {
-                                    _context5.next = 11;
+                                if (!(cook2[memberId] > 3)) {
+                                    _context5.next = 12;
                                     break;
                                 }
 
                                 message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
                                 return _context5.abrupt('return', _promise2.default.resolve(message));
 
-                            case 11:
-                                _context5.next = 13;
+                            case 12:
+                                _context5.next = 14;
                                 return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd) }, '/member/MeMemberWallet/checkPaymentPassword/' + value.id, false, false);
 
-                            case 13:
+                            case 14:
                                 result = _context5.sent;
 
                                 if (!result.data) {
                                     if (cook2) {
-                                        if (cook2.hasOwnProperty(this.member.MeStorageCardId + "")) {
-                                            count = cook2[this.member.MeStorageCardId];
+                                        if (cook2.hasOwnProperty(memberId + "")) {
+                                            count = cook2[memberId];
 
-                                            cook2[this.member.MeStorageCardId] = count + 1;
+                                            cook2[memberId] = count + 1;
                                         } else {
-                                            cook2[this.member.MeStorageCardId] = 1;
+                                            cook2[memberId] = 1;
                                         }
                                     } else {
                                         cook2 = {};
-                                        cook2[this.member.MeStorageCardId] = 1;
+                                        cook2[memberId] = 1;
                                     }
                                     this.setCookie('errorPwd', '', -1);
                                     this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
                                 }
                                 return _context5.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
-                            case 18:
-                                _context5.next = 20;
+                            case 19:
+                                _context5.next = 21;
                                 return (0, _tplusApi.tApi)({ "CheckoutParams": {
                                         "Idmember": value.id,
                                         "Password": value.pwd
                                     } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
 
-                            case 20:
+                            case 21:
                                 _result = _context5.sent;
                                 return _context5.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
-                            case 22:
-                                _context5.next = 27;
+                            case 23:
+                                _context5.next = 28;
                                 break;
 
-                            case 24:
-                                _context5.prev = 24;
+                            case 25:
+                                _context5.prev = 25;
                                 _context5.t0 = _context5['catch'](1);
                                 return _context5.abrupt('return', "failed");
 
-                            case 27:
+                            case 28:
                             case 'end':
                                 return _context5.stop();
                         }
                     }
-                }, _callee5, this, [[1, 24]]);
+                }, _callee5, this, [[1, 25]]);
             }));
 
             function validePwd(_x3) {
@@ -1686,18 +1687,21 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 detailDTO.isManualFreeGift = item.IsPresent;
                 detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
                 detailDTO.IsManualChangePrice = item.IsManualChangePrice;
-                if (detailDTO.IsManualChangePrice) //如果是手工改价
-                    {
-                        detailDTO.listPrice = item.TaxPrice;
-                        detailDTO.netAmountWithTax = item.TaxAmount;
-                    } else {
-                    var bookingQuantity = 0;
-                    if (item.BookingQuantity) {
-                        bookingQuantity = item.BookingQuantity;
-                    }
-                    detailDTO.listPrice = item.MemberPrice;
-                    detailDTO.netAmountWithTax = Math.Multiply(item.MemberPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
+
+                // if(detailDTO.IsManualChangePrice)//如果是手工改价
+                // {
+                //     detailDTO.listPrice = item.TaxPrice;
+                //     detailDTO.netAmountWithTax = item.TaxAmount;
+                // }
+                // else
+                // {
+                var bookingQuantity = 0;
+                if (item.BookingQuantity) {
+                    bookingQuantity = item.BookingQuantity;
                 }
+                detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
+                detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
+                //} 
                 detailDTO.taxRate = item.TaxRate;
                 detailDTO.quantity = item.Quantity;