Merge branch '202599-da' into 20250909-hz

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

src/api/httpAjax.js

@@ -0,0 +1,208 @@
+import axios from 'axios'
+import qs from 'qs'
+import {Notification, MessageBox, Message} from 'element-ui'
+import store from '@/store'
+import {getToken} from '@/utils/token'
+import errorCode from '@/utils/errorCode'
+
+/**
+ *request请求 axios.request(config)
+ *requestJson请求 axios.request(config)
+ *get请求 axios.get(url[, config])
+ *post请求 axios.post(url[, data[, config]])
+ *postJson请求 axios.post(url[, data[, config]])
+ *put请求 axios.put(url[, data[, config]])
+ *putJson请求 axios.put(url[, data[, config]])
+ *patch请求 axios.patch(url[, data[, config]])
+ *patchJson请求 axios.patch(url[, data[, config]])
+ *delete请求 axios.delete(url[, config])
+ */
+
+
+// const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
+const TokenName = 'token';
+/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
+//只是用于发送json对象数据时使用post,put,patch
+/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
+//只是用于发送json对象数据时使用post,put,patch
+//用于普通的发送请求
+const formRequest = axios.create({
+  //headers:{'Content-Type':'application/x-www-form-urlencoded'},
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
+  //超时
+  timeout: 10000,
+})
+//发送json对象的拦截器
+formRequest.interceptors.request.use(config => {
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  let curToken = getToken();
+  //curToken='eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIzMTE2MTIsImV4cCI6MTY3MjMxODgxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.a4f41376e994c5fcd3ab537ce17572ef4c633863f87785cf7b6ffa353e2ed51c';
+  if (curToken && !isToken) {
+    config.headers[TokenName] = curToken // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
+}, error => {
+  console.log(error)
+  Promise.reject(error)
+});
+formRequest.interceptors.response.use(res => {
+    //console.log(res);
+    const code = res.data.status || 200;
+    if (code === 200) {
+      return res.data
+    } else {
+      if (code === 401) {
+        // store.dispatch('LogOut').then(() => {
+        //    location.href = this.webBaseUrl + ReLoginUrl;
+        // })
+        console.error('', res.data);
+        return Promise.reject(new Error('接口返回未登录'))
+      } else if (code === 403) {
+        var msg = '当前操作没有权限';
+        Message({message: msg, type: 'error'});
+        return Promise.reject(new Error(msg))
+      } else {
+        //Message({message: res.data.message, type: 'error'});
+        //console.log('err' + res.data.error);
+        return res.data
+      }
+    }
+  },
+  error => {
+    console.log('err', error)
+    let {message} = error;
+    if (message == "Network Error") {
+      message = "网络异常，请稍后重试";
+    } else if (message.includes("timeout")) {
+      message = "网络异常或接口错误，请求超时";
+    } else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({
+      message: message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+
+/**
+ * request请求,可以自定义参数
+ */
+const request = formRequest.request;
+
+/**
+ * get请求 ,只有url
+ */
+const get = function (baseURL, url) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'get',
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+/**
+ * post请求
+ * @param {Object} url
+ * @param {Object} postData
+ */
+const post = function (baseURL, url, postData) {
+  // if (postData) {
+  //   postData = qs.stringify(postData);
+  // }
+  return request({
+    baseURL,
+    url: url,
+    method: 'post',
+    data: postData,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+//post请求
+const postForm = function (baseURL, url, data) {
+  return request({
+    baseURL,
+    url,
+    data,
+    method: 'post',
+    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
+  });
+}
+//  const postJson=jsonRequest.post;
+
+const postJson = function (baseURL, url, postData) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'post',
+    data: postData,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+  })
+}
+
+// 导出文件请求定义
+const postJsonToFile = function (baseURL, url, postData) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'post',
+    data: postData,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+const getJsonToFile = function (baseURL, url, postData) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'get',
+    data: postData,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+/**
+ * put请求
+ */
+const put = function (baseURL, url, data) {
+  if (data) {
+    data = qs.stringify(data);
+  }
+  return request({
+    baseURL,
+    url: url,
+    method: 'put',
+    data: data,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
+  })
+}
+
+const putJson = function (baseURL, url, data) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'put',
+    data: data,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+  })
+}
+
+
+export default {
+  tokenName: TokenName,
+  request,
+  get,
+  post,
+  postJson,
+  postJsonToFile,
+  put,
+  putJson,
+  getJsonToFile
+}

src/api/phase2/index.js

@@ -1,5 +1,7 @@
 import ajax from '@/utils/xajax.js'
 import http from '../unionAjax'
+import httpAjax from '../httpAjax'
+
 const baseURL = process.env.VUE_APP_MANAGER_API_PATH;
 
 
@@ -47,6 +49,18 @@ const articlelist=function (type){
 const courselist=function (data){
   return ajax.post('/xboe/portal/index/courselist',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',{});
+}
 /**
  * 首页新课程推荐列表
  */
@@ -61,5 +75,7 @@ export default {
   articlelist,
   courselist,
   newCases,
-  getRecommendList
+  getRecommendList,
+  qualitylist,
+  qualityPageList
 }

src/components/Portal/interactBar.vue

@@ -44,7 +44,7 @@
           <!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
            <div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
         </el-tooltip>
-        <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
+        <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:data.hasCollect?number(data.hasCollect):1}}</span>
       </div>
       <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
@@ -114,6 +114,8 @@ export default {
             shares:0,
             praises:0,
             views:0,
+             courseId:'',
+            courseName:''
           }
       }
     },
@@ -234,7 +236,7 @@ export default {
   created(){
   },
   mounted() {
-    if(this.data && this.data.id && !this.readonly){
+    if(this.data && (this.data.id||this.data.courseId) && !this.readonly){
        this.checkHas();
     }
 
@@ -308,7 +310,7 @@ export default {
         }
       let msgPageParams=this.pageParams;
       if(!msgPageParams){
-        msgPageParams=this.data.id;
+        msgPageParams=this.data.id ?this.data.id: this.data.courseId;
       }
       let message={
         content,
@@ -331,9 +333,9 @@ export default {
       })
     },
     checkHas(){
-      if(this.type>0 && !this.readonly && this.data.id){
+      if(this.type>0 && !this.readonly && (this.data.id||this.data.courseId)){
         if(this.favorites){
-          apiFavorites.has(this.type,this.data.id).then(rs=>{
+          apiFavorites.has(this.type,(this.data.id || this.data.courseId)).then(rs=>{
             if(rs.status==200 && rs.result){
               this.isFavorite=true;
             }else{
@@ -506,9 +508,11 @@ export default {
         return;
        }
       //需要判断是否已点赞，已点赞的不再加
+      console.log(this.data,'---------------');
+      
       let postData={
         objType:this.type,
-        objId:this.data.id,
+        objId:this.data.id ?this.data.id: this.data.courseId,
         title:'',
       }
       if(this.loading) {
@@ -516,7 +520,7 @@ export default {
         }
         this.loading=true;
       if(this.type==1){
-        postData.title=this.data.name;
+        postData.title=this.data.name?this.data.name:this.data.courseName;
       }else if(this.type==60){
         postData.title=this.data.content;
       } else if(this.type==5){
@@ -525,7 +529,7 @@ export default {
         postData.title=this.data.title;
       }
       if(this.isFavorite) {// 已经收藏，再次点击取消收藏
-        apiFavorites.remove(this.type,this.data.id).then(res=>{
+        apiFavorites.remove(this.type,this.data.id ?this.data.id: this.data.courseId).then(res=>{
           this.loading=false;
         if(res.status==200){
           this.isFavorite=false;
@@ -554,7 +558,7 @@ export default {
             this.$store.dispatch("unicomFavorites",true)
           }
           //if(this.type===2||this.type===4){
-            this.messageSave(this.data.id,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
+            this.messageSave(this.data.id ?this.data.id: this.data.courseId,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
           //}
           this.$message({message:'已加入收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在

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)
@@ -362,7 +361,15 @@ export const constantRoutes = [{
     path: '/500',
     component: (resolve) => require(['@/views/error/500'], resolve),
     hidden: true
+  },
+  {
+    path: '/qualityCourse',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/qualityCourse'], resolve),
+    name: 'qualityCourse',
+    meta: {title: '精品课课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false},
   }
+
 ]
 
 const router = new VueRouter({

src/views/Index.vue

@@ -153,11 +153,87 @@
       </div>
     </div>
     <div class="xindex-content">
+
       <!-- 推荐课程 -->
       <div class="modules xcontent2">
-        <div class="xcontent2-main">
+        <!-- <div class="xcontent2-main"> -->
           <!--内容块-->
-          <div class="modules-title xindex-main">
+
+          <!-- </div> -->
+           <!-- 精品课模块 -->
+        <div class="xcontent2-main">
+          <div class="modules-title xindex-main" v-if="this.qusisityList.list.length>0">
+            <!-- <span class="modules-text" style="color: #3D86F4;">精品课</span> -->
+            <span class="quyer-tag" style="margin-left: 0px;">
+              <!-- <img src="../assets/images/tutoring1.pn" alt=""> -->
+              <img class="modules-text" style="height: 24px;" src="../assets/images/course/courseTitle.png" alt="">
+            </span>
+            <span class="more">
+              <router-link to="/quailtyCourse">查看更多>></router-link>
+            </span>
+          </div>
+
+
+
+          <div
+              v-for="(course, eIndex) in exquisiteList"
+              :key="'cc' + eIndex"
+              class="xindex-course courseBg"
+              style="position: relative;margin-top: 20px;"
+            >
+              <div style="position: absolute; right: 25px; bottom: 72px">
+                <interactBar
+                  nodeWidth="20px"
+                  :courseExclusive="true"
+                  :type="1"
+                  :data="course"
+                  :comments="false"
+                  :praises="false"
+                  :shares="false"
+                  :views="false"
+                >
+                </interactBar>
+                <!-- <svg-icon style="font-size: 32px;margin-top: -5px;" icon-class="collectedCourse"></svg-icon> -->
+              </div>
+              <a @click="toCourseDetail(course)">
+                <div class="xindex-course-image">
+                  <course-image :course="course"></course-image>
+                  <!-- <span v-if="course.type == 20 || 10" class="course-type"
+                    >录播课</span
+                  > -->
+                  <img v-if="course.type == 20 || 10" src="../assets/images/course/courseTag.png" class="course-type" style="background: none;" alt="">
+                </div>
+                <div
+                  style="width: 80%"
+                  :title="course.courseName"
+                  class="course-title portal-title-tow two-line-ellipsis"
+                >
+                  {{ course.courseName }}
+                </div>
+                <div class="course-author">
+                  <div class="course-author-left">
+                    {{ course.authorInfo.teacherName }}
+
+                    <span class="study-num"
+                      >{{ formatNum(course.studyNum) }}人学习</span
+                    >
+                  </div>
+                  <div style="display: flex">
+                    <div v-if="course.courseScore">
+                      <span class="course-score-value" style="margin-left: 10px"
+                        >{{ toScore(course.courseScore) }}分</span
+                      >
+                    </div>
+                    <div v-else class="course-score-no">未评分</div>
+                  </div>
+                </div>
+              </a>
+            </div>
+
+
+
+          <!--内容块-->
+          <div class="modules-title xindex-main" v-if="courseComputedOneList.length > 0">
             <span class="modules-text">推荐课程</span>
             <span class="quyer-tag">
               <a
@@ -1137,6 +1213,9 @@ export default {
         orderType: 2,
         list: [],
       },
+      qusisityList: {
+        list: [],
+      },
       // 推荐课程
       recommendedList:{
         list: [],
@@ -1164,6 +1243,7 @@ export default {
   },
   mounted() {
     this.getCourseData(1);
+    this.getEsqusiteList();
     this.getRecommendList();
     this.getPositive()
     this.getCaseData();
@@ -1227,6 +1307,10 @@ export default {
     courseComputedTwoList(){
       return this.courseList.list.slice(3)
     },
+    // 精品课展示
+    exquisiteList() {
+      return this.qusisityList.list.slice(0,3)
+    },
   },
   methods: {
     getPositive() {
@@ -1424,15 +1508,15 @@ export default {
       if (item.type == 10) {
         //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
         //console.log("直接进入学习页面");
-        this.$router.push("/course/studyindex?id=" + item.id);
+        this.$router.push("/course/studyindex?id=" + item.id?item.id:item.courseId);
       } else if (item.type == 20) {
-        apiCourseStudy.hasSignup(item.id).then((rs) => {
+        apiCourseStudy.hasSignup(item.id?item.id:item.courseId).then((rs) => {
           if (rs.status == 200) {
             //return $this.webBaseUrl + "/course/studyindex?id=" + item.id;
-            this.$router.push("/course/studyindex?id=" + item.id);
+            this.$router.push("/course/studyindex?id=" + item.id?item.id:item.courseId);
           } else {
             //return $this.webBaseUrl + "/course/detail?id=" + item.id;
-            this.$router.push("/course/detail?id=" + item.id);
+            this.$router.push("/course/detail?id=" + item.id?item.id:item.courseId);
           }
         });
         //return $this.webBaseUrl + "/course/detail?id=" + item.id;
@@ -1472,6 +1556,16 @@ export default {
         }
       })
     },
+    //精品课展示
+    getEsqusiteList(){
+      let course = {
+        aid: this.userInfo.aid,
+      }
+      apiIndex.qualitylist(course).then((res) => {
+        console.log(res,'jinpinsjfhhfjash--------------------------');
+        this.qusisityList.list = res.data.result;
+      })
+    },
     getCourseData(pageIndex) {
       this.isNext = false;
       let { orderType, num } = this.courseList;
@@ -2661,6 +2755,7 @@ export default {
     // padding-bottom: 10px;
     display: flex;
     justify-content: space-between;
+    margin-bottom: 20px;
 
     .course-author-left {
       font-size: 14px;
@@ -3009,4 +3104,17 @@ export default {
     }
   }
 }
+.courseBg{
+  // width: 332px;
+  // height: 323px;
+  // background: url("../assets/images/course/courseBackground.png") no-repeat;
+  // background-size: 100% 100%; /* 或 use 'contain' */
+  // background-position: center;
+  // border: none;
+  border-radius: 12px;
+  background: linear-gradient(135deg, #e6f7ff, #f0f8ff, #ffffff);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
+  border: 1px solid #d9edf7;
+  overflow: hidden;
+}
 </style>

src/views/grateful/GratefulHomePage.vue

@@ -5,8 +5,8 @@
         <!-- 当轮播图等于一张时 -->
         <swiper :options="swiperOptiontwo">
           <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'a' + idx"
-            class="swiper-slide games pointer">
-            <div class="bannbox" :style="{
+            class="swiper-slide games pointer"  >
+            <div class="bannbox" @click="handleCarouselClick(item)" :style="{
               background: `url(${fileBaseUrl + item.image
                 }) center center no-repeat`,
             }"></div>
@@ -17,8 +17,8 @@
       <div id="container" style="z-index: 99" v-else>
         <swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length > 1">
           <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'b' + idx"
-            class="swiper-slide games pointer">
-            <div class="bannbox" :style="{
+            class="swiper-slide games pointer"  >
+            <div class="bannbox" @click="handleCarouselClick(item)"  :style="{
               background: `url(${fileBaseUrl + item.image
                 })  center center no-repeat`,
             }"></div>
@@ -220,7 +220,7 @@ export default {
         autoplay: false,
         // noSwiping: true,
       },
-      resonimg: [],
+      // resonimg: [],
       swiperOption: {
         autoplay: {
           delay: 2000,
@@ -249,6 +249,13 @@ export default {
     this.getToolData()
   },
   methods: {
+    // 添加点击轮播图跳转的方法
+    handleCarouselClick(item) {
+      if (item.url) {
+        window.open(item.url, '_blank');
+      }
+    },
+
     downTool(toolInfo) {
       console.log(toolInfo);
       window.open(`/activityApi/xboe/m/boe/tools/url/download?urlStr=${process.env.VUE_APP_BOE_WEB_URL}/upload${toolInfo.filePath}&fileName=${toolInfo.name}`)

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 {