|
|
@@ -393,12 +393,19 @@ export default {
|
|
|
type: '租赁',
|
|
|
price: item.depositFee
|
|
|
})
|
|
|
- } else if (item.kitType == 'GROUP' && parseFloat(item.price - couponPrice) > 0) {
|
|
|
+ } else if (item.kitType == 'GROUP') {
|
|
|
+ // && parseFloat(item.price - couponPrice) > 0
|
|
|
buyList.push({
|
|
|
name: item.name,
|
|
|
type: '团购',
|
|
|
price: parseFloat(item.price - couponPrice)
|
|
|
})
|
|
|
+ } else if(item.kitType == 'FREE') {
|
|
|
+ buyList.push({
|
|
|
+ name: item.name,
|
|
|
+ type: '免费',
|
|
|
+ price: 0
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
// 是否减免课程费用，必须团购，并且开启了减免课程费用
|
|
|
@@ -409,13 +416,13 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
amount += parseFloat(tempCourseFee + musicClassFee)
|
|
|
- if (parseFloat(tempCourseFee + musicClassFee) > 0) {
|
|
|
+ // if (parseFloat(tempCourseFee + musicClassFee) > 0) {
|
|
|
buyList.unshift({
|
|
|
name: '乐团课',
|
|
|
type: paymentPatternType[this.paymentPattern],
|
|
|
price: Number((tempCourseFee + musicClassFee).toFixed(2))
|
|
|
})
|
|
|
- }
|
|
|
+ // }
|
|
|
// 辅件
|
|
|
if (this.accessOries.length > 0) {
|
|
|
let tempAccessPrice = 0
|
|
|
@@ -431,13 +438,13 @@ export default {
|
|
|
goodsGroupIds[item.id] = 'ACCESSORIES'
|
|
|
}
|
|
|
})
|
|
|
- if (tempAccessPrice > 0) {
|
|
|
+ // if (tempAccessPrice > 0) {
|
|
|
buyList.push({
|
|
|
name: '辅件',
|
|
|
type: '团购',
|
|
|
price: tempAccessPrice
|
|
|
})
|
|
|
- }
|
|
|
+ // }
|
|
|
}
|
|
|
// console.log(amount)
|
|
|
let tempGroupPurchasePrice = amount
|
