tplus-components-touch 3.27.34 → 3.27.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/presale/pickup.js +1 -1
- package/dist/components/presale/pickup.js.map +1 -1
- package/dist/components/settlement/settlement.js +1 -1
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlementStore.js +13 -3
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/settlement/utils.js +2 -2
- package/dist/components/settlement/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -917,10 +917,20 @@ var SettlementStore = (_class = function () {
|
|
|
917
917
|
}
|
|
918
918
|
}
|
|
919
919
|
|
|
920
|
+
//积分抵现不包含运费
|
|
921
|
+
var BuyerPayFreight = this.dto.BuyerPayFreight;
|
|
922
|
+
var DistributionMode = this.dto.DistributionMode;
|
|
923
|
+
var value = 0;
|
|
924
|
+
if ((DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0) {
|
|
925
|
+
value = (0, _utils.getFixedNumber)(Math.Minus(this.paymode.amount, BuyerPayFreight));
|
|
926
|
+
} else {
|
|
927
|
+
value = this.paymode.amount;
|
|
928
|
+
}
|
|
929
|
+
|
|
920
930
|
(0, _tplusApi.tApi)({ IntegralSteadCashParams: {
|
|
921
931
|
Idmember: this.paymode.currentMode.memberId,
|
|
922
|
-
TotalTaxAmount:
|
|
923
|
-
BalanceTaxAmount:
|
|
932
|
+
TotalTaxAmount: value,
|
|
933
|
+
BalanceTaxAmount: value
|
|
924
934
|
} }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
|
|
925
935
|
_this8.paymode.currentMode.member.setExchangable(result.MaxAmount);
|
|
926
936
|
_this8.updateEvent();
|
|
@@ -1013,7 +1023,7 @@ var SettlementStore = (_class = function () {
|
|
|
1013
1023
|
var BuyerPayFreight = _this9.dto.BuyerPayFreight;
|
|
1014
1024
|
var DistributionMode = _this9.dto.DistributionMode;
|
|
1015
1025
|
var value = 0;
|
|
1016
|
-
if ((DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0) {
|
|
1026
|
+
if ((DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 && type != PayStyle.jfdx) {
|
|
1017
1027
|
value = (0, _utils.getFixedNumber)(parseFloat(_this9.context.viewModel.getViewItem('Voucher').availableAmount) + parseFloat(BuyerPayFreight));
|
|
1018
1028
|
} else {
|
|
1019
1029
|
value = _this9.context.viewModel.getViewItem('Voucher').availableAmount;
|