Merge remote-tracking branch 'origin/master'

src/api/index.js

@@ -42,6 +42,7 @@ export default {
     exportPracticeByStudentDetail: `${host}occupationlab/achievement/exportPracticeByStudentDetail`, // 导出学生端练习实验情况
     reportDetail: `${host}occupationlab/achievement/reportDetail`, // 成绩报告详情
     updateReport: `${host}occupationlab/achievement/updateReport`, // 更新成绩报告
+    schoolCourseByAchievement: `${host}nakadai/nakadai/curriculum/schoolCourseByAchievement`, // 获取学校购买订单后的课程
 
     // 考核列表
     pageStuAssessment: `${host}occupationlab/assessment/pageStuAssessment`, // 学生端——学生考核列表

src/pages/record/list/index.vue

@@ -100,7 +100,7 @@ export default {
             setRecord: "project/setRecord"
         }),
         getschoolCourse() { // 获取课程下拉框数据
-            this.$get(this.api.schoolCourse).then(res => {
+            this.$get(this.api.schoolCourseByAchievement).then(res => {
                 if (res.data && res.data.length) {
                     this.curriculumList = res.data;
                     this.curriculumId = this.curriculumList[0].cid;