Merge branch '202599-da' into 20250909-hz

# Conflicts:
#	src/api/phase2/index.js
#	src/router/index.js
#	src/views/Index.vue

src/api/phase2/index.js

@@ -53,6 +53,14 @@ const courselist=function (data){
 const qualitylist=function (data){
   return httpAjax.post(baseURL,'/quality/home/qualityItem',data);
 }
+// 精品课分页查询
+export const qualityPageList=function (data){
+  return httpAjax.post(baseURL,'/quality/home/qualityPages',data);
+}
+// 课程精品课标记时间年份列表
+export const qualityCourseTimeMark=function (){
+  return httpAjax.post(baseURL,'/quality/manage/createYearList',{});
+}
 /**
  * 首页新课程推荐列表
  */
@@ -68,5 +76,6 @@ export default {
   courselist,
   newCases,
   getRecommendList,
-  qualitylist
+  qualitylist,
+  qualityPageList
 }

src/components/PortalHeader.vue

@@ -13,9 +13,9 @@
               </router-link>
             </div>
             <div class="top-nav" :style="{color:textColor}" :class="current == 'course' ? activeNav : ''">
-              <router-link to="/course">课程
+              <a @click="handleChangeCourse">课程
                 <div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
-              </router-link>
+              </a>
             </div>
             <div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? activeNav : ''">
               <router-link to="/case">案例
@@ -214,6 +214,12 @@ export default {
     //this.loadPopupConfig();
   },
   methods: {
+    handleChangeCourse() {
+      const paths = ["/course","/qualityCourse"]
+      // 如果是 课程 和 精品课程， 那么就不再重定向
+      const needReload = paths.findIndex(e=> e === this.$route.path) === -1
+      if (needReload) this.$router.push({path: paths[0]})
+    },
 
     setCurIdentity(iden){
         this.$store.dispatch('SetCurIdentity',iden);

src/router/index.js

@@ -2,7 +2,6 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 /* Layout */
 import Layout from '@/layout/index'
-import LayoutPortal from '@/layout/portal'
 import Grateful from '@/views/grateful'
 
 Vue.use(VueRouter)
@@ -363,13 +362,13 @@ export const constantRoutes = [{
     component: (resolve) => require(['@/views/error/500'], resolve),
     hidden: true
   },
-   {
+  {
-    path: '/quailtyCourse',
+    path: '/qualityCourse',
     hidden: true,
-    component: (resolve) => require(['@/views/portal/course/quailtyCourse'], resolve),
+    component: (resolve) => require(['@/views/portal/course/qualityCourse'], resolve),
-    name: 'course',
+    name: 'qualityCourse',
     meta: {title: '精品课课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false},
-  },
+  }
 
 ]
 

src/views/Index.vue

@@ -153,12 +153,12 @@
       </div>
     </div>
     <div class="xindex-content">
-      
+
       <!-- 推荐课程 -->
       <div class="modules xcontent2">
         <!-- <div class="xcontent2-main"> -->
           <!--内容块-->
-        
+
           <!-- </div> -->
            <!-- 精品课模块 -->
         <div class="xcontent2-main">
@@ -174,7 +174,7 @@
           </div>
 
 
-          
+
           <div
               v-for="(course, eIndex) in exquisiteList"
               :key="'cc' + eIndex"
@@ -231,7 +231,7 @@
             </div>
 
 
-        
+
           <!--内容块-->
           <div class="modules-title xindex-main" v-if="courseComputedOneList.length > 0">
             <span class="modules-text">推荐课程</span>
@@ -1308,7 +1308,7 @@ export default {
       return this.courseList.list.slice(3)
     },
     // 精品课展示
-    exquisiteList() { 
+    exquisiteList() {
       return this.qusisityList.list.slice(0,3)
     },
   },
@@ -1561,7 +1561,7 @@ export default {
       let course = {
         aid: this.userInfo.aid,
       }
-      apiIndex.qualitylist(course).then((res) => { 
+      apiIndex.qualitylist(course).then((res) => {
         console.log(res,'jinpinsjfhhfjash--------------------------');
         this.qusisityList.list = res.data.result;
       })

src/views/grateful/TeacherOpinion.vue

@@ -8,7 +8,7 @@
           <div class="navTop">
             <div>
               <router-link to="/grateful" class="nav">首页</router-link>&nbsp;>&nbsp;
-              <span style="cursor: pointer;" class="nav">认证讲师库（2023）</span>
+              <span style="cursor: pointer;" class="nav">认证讲师库</span>
             </div>
             <div style="position: relative;">
               <el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "

src/views/study/coursenew.vue

@@ -177,7 +177,7 @@
             </div>
             <!-- 课程单元  -->
             <div class="course-units" v-if="tab == 1">
-              <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
+              <div style="min-height: 350px;max-height: 650px ;overflow-y: auto;">
                 <div class="catalog" v-if="courseInfo.type == 20">
                   <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
                     <el-menu
@@ -816,7 +816,8 @@
           }else if(h>500){
             h=h+60;
           }
-          $this.controlHeight=h-95;
+          // 移除高度控制 防止内容塌陷
+            // $this.controlHeight=h-95;
         })
 
 
@@ -1800,7 +1801,7 @@
     margin: 20px auto;
     .course-playbox {
       background-color: #fff;
-      min-height: 400px;
+      //min-height: 400px;
       display: flex;
       justify-content: space-between;
       .course-player-container {