|
@@ -201,7 +201,7 @@ export const myMixin = {
|
|
|
if(courseGrade && !courseGrade2){
|
|
if(courseGrade && !courseGrade2){
|
|
|
let array = this.packageArray.sort((a, b) => a.sort - b.sort)
|
|
let array = this.packageArray.sort((a, b) => a.sort - b.sort)
|
|
|
for(let item2 of array){
|
|
for(let item2 of array){
|
|
|
- if(courseGrade.includes(item2.grade)){
|
|
|
|
|
|
|
+ if(courseGrade.data && courseGrade.data[0] && courseGrade.data[0][0] && courseGrade.data[0][0].grade.includes(item2.grade)){
|
|
|
coursePackageName2 = item2.coursePackage;
|
|
coursePackageName2 = item2.coursePackage;
|
|
|
courseName = item2.courseName;
|
|
courseName = item2.courseName;
|
|
|
courseGrade2 = item2.grade;
|
|
courseGrade2 = item2.grade;
|
|
@@ -224,7 +224,7 @@ export const myMixin = {
|
|
|
"coursePackageName": coursePackageName2 ? coursePackageName2 : coursePackageName.data[0][0].title,
|
|
"coursePackageName": coursePackageName2 ? coursePackageName2 : coursePackageName.data[0][0].title,
|
|
|
"courseId": classData.courseId,
|
|
"courseId": classData.courseId,
|
|
|
"courseName": courseName || classData.title,
|
|
"courseName": courseName || classData.title,
|
|
|
- "courseGrade": courseGrade2 ? courseGrade2 : courseGrade.data[0][0].name || '无年级',
|
|
|
|
|
|
|
+ "courseGrade": courseGrade2 ? courseGrade2 : courseGrade.data && courseGrade.data[0] && courseGrade.data[0][0] ? courseGrade.data[0][0].name : '无年级',
|
|
|
"courseTime": classData.courseTime,
|
|
"courseTime": classData.courseTime,
|
|
|
"startTime": classData.startTime,
|
|
"startTime": classData.startTime,
|
|
|
"endTime": classData.endTime
|
|
"endTime": classData.endTime
|
|
@@ -315,7 +315,7 @@ export const myMixin = {
|
|
|
"coursePackageName": coursePackageName2 ? coursePackageName2 : coursePackageName.data[0][0].title,
|
|
"coursePackageName": coursePackageName2 ? coursePackageName2 : coursePackageName.data[0][0].title,
|
|
|
"courseId": classData.courseId,
|
|
"courseId": classData.courseId,
|
|
|
"courseName": courseName || classData.title,
|
|
"courseName": courseName || classData.title,
|
|
|
- "courseGrade": courseGrade2 ? courseGrade2 : courseGrade.data[0][0].name || '无年级',
|
|
|
|
|
|
|
+ "courseGrade": courseGrade2 ? courseGrade2 : courseGrade.data && courseGrade.data[0] && courseGrade.data[0][0] ? courseGrade.data[0][0].name : '无年级',
|
|
|
"courseTime": classData.courseTime,
|
|
"courseTime": classData.courseTime,
|
|
|
"startTime": classData.startTime,
|
|
"startTime": classData.startTime,
|
|
|
"endTime": classData.endTime
|
|
"endTime": classData.endTime
|
11wqe1