|
@@ -112,9 +112,16 @@ export default {
|
|
|
__init() {
|
|
|
// 获取课程形态 设置vip课酬
|
|
|
vipGroupCategory({ organId: this.$store.getters.organ }).then(res => {
|
|
|
- if (res.code == 200) {
|
|
|
+ if (res.code == 200 && res.data.length > 0) {
|
|
|
// this.vipList = res.data
|
|
|
let vipData = res.data
|
|
|
+ let tempArray = []
|
|
|
+ res.data.forEach(item => {
|
|
|
+ console.log(item)
|
|
|
+ tempArray.push({
|
|
|
+ // offlineClassesSalary:
|
|
|
+ })
|
|
|
+ })
|
|
|
// VIP课列表
|
|
|
vipGroupSalaryList({
|
|
|
rows: 9999,
|
|
@@ -189,10 +196,10 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
vipListCompare(vipData, rows) { // vip 做对比
|
|
|
- // console.log('start------------------')
|
|
|
- // console.log(vipData)
|
|
|
- // console.log(rows)
|
|
|
- // console.log('end------------------')
|
|
|
+ console.log('start------------------')
|
|
|
+ console.log(vipData)
|
|
|
+ console.log(rows)
|
|
|
+ console.log('end------------------')
|
|
|
if(!vipData) { // 判断是否有数据
|
|
|
this.vipTable = rows
|
|
|
return
|
|
@@ -208,12 +215,6 @@ export default {
|
|
|
offlineClassesSalary: c.offlineClassesSalary,
|
|
|
onlineClassesSalary: c.onlineClassesSalary
|
|
|
})
|
|
|
- } else {
|
|
|
- result.push({
|
|
|
- vipGroupCategoryName: item.name,
|
|
|
- offlineClassesSalary: item.offlineClassesUnitPrice,
|
|
|
- onlineClassesSalary: item.onlineClassesUnitPrice
|
|
|
- })
|
|
|
}
|
|
|
})
|
|
|
} else {
|
|
@@ -251,28 +252,12 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
- // console.log(result)
|
|
|
- // console.log(domain)
|
|
|
if(result.length > 0) {
|
|
|
domain.forEach(item => {
|
|
|
-
|
|
|
+ if(!item.checked) {
|
|
|
+ result.push(item)
|
|
|
+ }
|
|
|
})
|
|
|
- // result.forEach(item => {
|
|
|
- // domain.forEach(c => {
|
|
|
- // if(item.courseScheduleType == c.courseScheduleType && item.durationMax == c.durationMax && item.durationMin == c.durationMin) {
|
|
|
- // } else {
|
|
|
- // result.push({
|
|
|
- // durationMax: c.durationMax,
|
|
|
- // durationMin: c.durationMin,
|
|
|
- // mainTeacherSalary: c.mainTeacherSalary,
|
|
|
- // assistantTeacherSalary: c.assistantTeacherSalary,
|
|
|
- // courseScheduleType: c.courseScheduleType,
|
|
|
- // userId: this.teacherId,
|
|
|
- // settlementType: 'GRADIENT_SALARY'
|
|
|
- // })
|
|
|
- // }
|
|
|
- // })
|
|
|
- // })
|
|
|
} else {
|
|
|
result = domain
|
|
|
}
|