|
@@ -127,7 +127,6 @@ export default {
|
|
|
tempClassForm[memoItem[0]] = memoItem[1]
|
|
|
})
|
|
|
}
|
|
|
- console.log(tempClassForm)
|
|
|
/**
|
|
|
* 过滤数据
|
|
|
* 乐团课同一个乐团只需要显示一个乐团(价格高的)
|
|
@@ -151,9 +150,13 @@ export default {
|
|
|
} else {
|
|
|
el.memo = ''
|
|
|
}
|
|
|
- // el.memo = this.memo ? tempClassForm[this.classFormToCN(el.classForm)] : ''
|
|
|
+
|
|
|
// 开课周期
|
|
|
- el.startCycel = this.weekSelect(5) + ' ' + el.planBegin.split(' ')[1]
|
|
|
+ if(el.planCycle) {
|
|
|
+ el.startCycel = this.weekSelect(el.planCycle) + ' ' + el.planBegin.split(' ')[1]
|
|
|
+ } else {
|
|
|
+ el.startCycel = '不上课'
|
|
|
+ }
|
|
|
|
|
|
// 课程
|
|
|
let searchClassId = subjectStatus[el.classId], // 查询Id是否存在
|
|
@@ -164,6 +167,11 @@ export default {
|
|
|
price: countAmount
|
|
|
}
|
|
|
} else if(searchClassId && el.classType == 2 && searchClassId.price < countAmount) {
|
|
|
+ for(let i = 0; i < this.classInfo.length; i++) {
|
|
|
+ if(this.classInfo[i].classId == el.classId) {
|
|
|
+ this.classInfo[i] = el
|
|
|
+ }
|
|
|
+ }
|
|
|
subjectStatus[el.classId] = {
|
|
|
price: countAmount
|
|
|
}
|
|
@@ -178,7 +186,6 @@ export default {
|
|
|
if(paymentConfig && paymentConfig.config == el.courseId) {
|
|
|
el.status = true
|
|
|
}
|
|
|
-
|
|
|
})
|
|
|
this.calcAmount() // 计算金额
|
|
|
})
|
|
@@ -362,7 +369,6 @@ export default {
|
|
|
subNames: item.subNames,
|
|
|
classType: item.classType
|
|
|
}
|
|
|
- // console.log(this.protocolData)
|
|
|
this.popupStatus = true
|
|
|
},
|
|
|
onPopupClose(status) {
|