Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/router/index.js

@@ -624,7 +624,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/career/subject/majorChoice'], resolve),
         name: 'MajorChoice',
         meta: {
-          title: '由专业选科目'
+          title: '由专业选科目',
+          parentPath: '/new-gaokao/careerSubjectIndex'
         }
       },
       {
@@ -640,7 +641,8 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/career/subject/choose-subject.vue'], resolve),
         name: 'SubjectChoice',
         meta: {
-          title: '由科目选专业'
+          title: '由科目选专业',
+          parentPath: "/new-gaokao/careerSubjectIndex"
         }
       },
       {
@@ -648,7 +650,7 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/career/plan/UniversitiesDetail'], resolve),
         name: 'UniversityDetail',
         meta: {
-          title: '生涯评测-院校详情'
+          title: '生涯评测-院校详情',
         }
       },
       {