tplus-components-touch 3.22.7 → 3.22.11
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/cloudPrint/index.js +77 -93
- package/dist/components/cloudPrint/index.js.map +1 -1
- package/dist/components/settlement/settlement.js +90 -56
- package/dist/components/settlement/settlement.js.map +1 -1
- package/dist/components/settlement/settlement.less +8 -4
- package/dist/components/settlement/settlementStore.js +38 -23
- package/dist/components/settlement/settlementStore.js.map +1 -1
- package/dist/components/settlement/utils.js +1 -1
- package/dist/components/settlement/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -224,7 +224,6 @@
|
|
|
224
224
|
}
|
|
225
225
|
span:last-child{
|
|
226
226
|
font-size: 18px;
|
|
227
|
-
color: #333333;
|
|
228
227
|
text-align: right;
|
|
229
228
|
line-height: 14px;
|
|
230
229
|
}
|
|
@@ -241,6 +240,11 @@
|
|
|
241
240
|
line-height: 14px;
|
|
242
241
|
}
|
|
243
242
|
}
|
|
243
|
+
.tipStyle4 {
|
|
244
|
+
span:last-child{
|
|
245
|
+
color: white;
|
|
246
|
+
}
|
|
247
|
+
}
|
|
244
248
|
.tipStyle1{
|
|
245
249
|
padding-bottom: 16px;
|
|
246
250
|
}
|
|
@@ -424,7 +428,7 @@
|
|
|
424
428
|
.amount{
|
|
425
429
|
padding-top:27px;
|
|
426
430
|
span:first-child{
|
|
427
|
-
font-size:
|
|
431
|
+
font-size: 20px;
|
|
428
432
|
color: #FFFFFF;
|
|
429
433
|
line-height: 36px;
|
|
430
434
|
}
|
|
@@ -504,8 +508,8 @@
|
|
|
504
508
|
}
|
|
505
509
|
.noxuanzhong1 {
|
|
506
510
|
position: absolute;
|
|
507
|
-
top:
|
|
508
|
-
right:
|
|
511
|
+
top: 12px;
|
|
512
|
+
right: 12px;
|
|
509
513
|
border: 1px solid #979797;
|
|
510
514
|
border-radius: 0.83px;
|
|
511
515
|
width: 18px;
|
|
@@ -269,11 +269,7 @@ var SettlementStore = (_class = function () {
|
|
|
269
269
|
promoRuleId = tieredAmountResult.promoRuleId,
|
|
270
270
|
couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
|
|
271
271
|
|
|
272
|
-
if ((0, _find3.default)(_this2.paymode.
|
|
273
|
-
return djq.code == couponCode;
|
|
274
|
-
})) {
|
|
275
|
-
_message2.default.info(Differentiate.COUPON + '\u5DF2\u6DFB\u52A0');
|
|
276
|
-
} else if (result.IsRepelWithPoints && (0, _find3.default)(_this2.paymode.thePaymodes, function (themode) {
|
|
272
|
+
if (result.IsRepelWithPoints && (0, _find3.default)(_this2.paymode.thePaymodes, function (themode) {
|
|
277
273
|
return themode.paymentType == PayStyle.jfdx;
|
|
278
274
|
})) {
|
|
279
275
|
_message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
|
|
@@ -1173,21 +1169,19 @@ var SettlementStore = (_class = function () {
|
|
|
1173
1169
|
DataSource: { Id: _this11.dataSource }
|
|
1174
1170
|
});
|
|
1175
1171
|
if (mode.paymentType == PayStyle.djq) {
|
|
1176
|
-
(0, _each3.default)(
|
|
1177
|
-
|
|
1178
|
-
|
|
1179
|
-
|
|
1180
|
-
|
|
1181
|
-
|
|
1182
|
-
|
|
1183
|
-
|
|
1184
|
-
|
|
1185
|
-
|
|
1186
|
-
|
|
1187
|
-
|
|
1188
|
-
|
|
1189
|
-
});
|
|
1190
|
-
}
|
|
1172
|
+
(0, _each3.default)(_this11.paymode.checkList, function (djq) {
|
|
1173
|
+
_this11.dto.RetailCouponDetails.push({
|
|
1174
|
+
CouponCode: djq.promoCouponCode,
|
|
1175
|
+
ReductionAmount: djq.amount,
|
|
1176
|
+
EnableAmount: djq.doorsill,
|
|
1177
|
+
CouponTitle: djq.name,
|
|
1178
|
+
IdMember: djq.UMemberID ? mode.member.id : null,
|
|
1179
|
+
LastTS: djq.LastTS,
|
|
1180
|
+
PromotionId: djq.promoId,
|
|
1181
|
+
PromotionRuleId: djq.promoRuleId,
|
|
1182
|
+
PromoCouponAllocatedId: djq.id,
|
|
1183
|
+
DataSource: { Id: _this11.dataSource }
|
|
1184
|
+
});
|
|
1191
1185
|
});
|
|
1192
1186
|
}
|
|
1193
1187
|
}
|
|
@@ -1646,6 +1640,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1646
1640
|
if (!q1.checked) {
|
|
1647
1641
|
this.checkList.forEach(function (ele, i) {
|
|
1648
1642
|
if (ele.id === q1.id) {
|
|
1643
|
+
// this.checkList.forEach((ele1) => {
|
|
1644
|
+
// if(ele.discountPct > 0) {
|
|
1645
|
+
// this.currentMode.receivable = this.currentMode.receivable + ele.amount / (1 - discountPct);
|
|
1646
|
+
// } else {
|
|
1647
|
+
// this.currentMode.receivable = this.currentMode.receivable + ele.amount;
|
|
1648
|
+
// }
|
|
1649
|
+
// })
|
|
1650
|
+
// if(ele.discountPct > 0) {
|
|
1651
|
+
// this.currentMode.receivable = 100;
|
|
1652
|
+
// } else {
|
|
1653
|
+
// this.currentMode.receivable = this.currentMode.receivable + ele.amount;
|
|
1654
|
+
// }
|
|
1649
1655
|
_this14.checkList.splice(i, 1);
|
|
1650
1656
|
}
|
|
1651
1657
|
});
|
|
@@ -1655,11 +1661,14 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1655
1661
|
}
|
|
1656
1662
|
this.checkList.push(q1);
|
|
1657
1663
|
}
|
|
1664
|
+
|
|
1665
|
+
var copy1 = (0, _cloneDeep2.default)(this.receivable);
|
|
1658
1666
|
this.checkList.forEach(function (ele, i) {
|
|
1659
1667
|
if (ele.discountPct > 0) {
|
|
1660
|
-
|
|
1661
|
-
|
|
1662
|
-
|
|
1668
|
+
ele.amount = (1 - ele.discountPct) * copy1;
|
|
1669
|
+
copy1 -= ele.amount;
|
|
1670
|
+
} else {
|
|
1671
|
+
copy1 -= ele.amount;
|
|
1663
1672
|
}
|
|
1664
1673
|
sum = Math.Add(sum, ele.amount);
|
|
1665
1674
|
});
|
|
@@ -1723,6 +1732,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1723
1732
|
var djq1 = (0, _filter3.default)(_this14.currentMode.djqs, function (djq) {
|
|
1724
1733
|
return djq.id === element.id;
|
|
1725
1734
|
});
|
|
1735
|
+
if (element.id === 1632121650020355) {
|
|
1736
|
+
var djq2 = (0, _filter3.default)(_this14.currentMode.djqs, function (djq, index) {
|
|
1737
|
+
djq.id === element.id;
|
|
1738
|
+
});
|
|
1739
|
+
}
|
|
1726
1740
|
|
|
1727
1741
|
var _ref21 = element || {},
|
|
1728
1742
|
couponCode = _ref21.couponCode,
|
|
@@ -1771,6 +1785,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
|
|
|
1771
1785
|
}
|
|
1772
1786
|
});
|
|
1773
1787
|
}
|
|
1788
|
+
// 优惠券【6052098985043】与【6120822326451】不可叠加使用
|
|
1774
1789
|
});
|
|
1775
1790
|
//this.receivable = getFixedNumber(this.receivable - sum);
|
|
1776
1791
|
}
|