diff --git a/public/images/courseBg.png b/public/images/courseBg.png
new file mode 100644
index 00000000..d793e2d3
Binary files /dev/null and b/public/images/courseBg.png differ
diff --git a/src/api/modules/cases.js b/src/api/modules/cases.js
index ef3e1b26..a8c6adf6 100644
--- a/src/api/modules/cases.js
+++ b/src/api/modules/cases.js
@@ -6,8 +6,8 @@ import ajax from '@/utils/xajax.js'
  * orderField
  * orderAsc
 */
-const indexList = function(query) {
-    return ajax.post('/xboe/m/boe/cases/case-random', query);
+const indexList = function (query) {
+  return ajax.post('/xboe/m/boe/cases/case-random', query);
 }
 /*
  *案例分页搜索查询    是否推荐
@@ -19,9 +19,12 @@ const indexList = function(query) {
  *@param(String) majorType 专业分类
 * @param(String) majorDomain 专业领域
  */
-const queryList = function(query) {
-        return ajax.post('/xboe/m/boe/cases/queryList', query);
-    }
+const queryList = function (query) {
+  return ajax.post('/xboe/m/boe/cases/queryList', query);
+}
+const queryListV2 = function (query) {
+  return ajax.postJson('/xboe/m/boe/cases/queryListV2', query);
+}
 /* 案例分页搜索查询 是否置顶
 *@param(String) keyWord  关键词
 @param(Boolean) isTop  是否置顶 true或false
@@ -29,76 +32,77 @@ const queryList = function(query) {
  *@param(String) majorType 专业分类
 * @param(String) majorDomain 专业领域
 */
-const isTopList = function(query) {
-        return ajax.post('/xboe/m/boe/cases/isTopList', query);
-    }
-    /* 设置置顶  取消置顶
-     @param(String) id
-     @param(Integer) isTop  是否置顶 0：未置顶，1：已置顶
-     */
-const updateTop = function(id, isTop) {
-        return ajax.get(`/xboe/m/boe/cases/updateTop?id=${id}&isTop=${isTop}`);
-    }
-    /* 删除案例
-     *param(String) id 案例的id
-     */
-const del = function(id) {
-        return ajax.get('/xboe/m/boe/cases/delete?id=' + id);
-    }
-    /*案例详情
-     @param(String) id 案例的id
-     @param(Boolean) addView 是否增加浏览量
-     */
-const detail = function(id,addView) {
-        let pars='id=' + id;
-        if(addView){
-          pars+='&addView='+addView
-        }
-        return ajax.get('/xboe/m/boe/cases/detail?'+pars);
-    }
-    /*推荐
-     *@param (String) id 案例的id
-     *@param (String) title  案例的标题
-     *@param (String) acceptAid  受众id
-     *@param (String) recommentThat  推荐说明
-     */
-const savaRecommend = function(data) {
-        return ajax.post('/xboe/m/boe/recommend/save', data);
-    }
-    /* 推荐列表
-     *没有参数
-     */
-const query = function() {
-    return ajax.get('/xboe/m/boe/recommend/query');
+const isTopList = function (query) {
+  return ajax.post('/xboe/m/boe/cases/isTopList', query);
+}
+/* 设置置顶  取消置顶
+ @param(String) id
+ @param(Integer) isTop  是否置顶 0：未置顶，1：已置顶
+ */
+const updateTop = function (id, isTop) {
+  return ajax.get(`/xboe/m/boe/cases/updateTop?id=${id}&isTop=${isTop}`);
+}
+/* 删除案例
+ *param(String) id 案例的id
+ */
+const del = function (id) {
+  return ajax.get('/xboe/m/boe/cases/delete?id=' + id);
+}
+/*案例详情
+ @param(String) id 案例的id
+ @param(Boolean) addView 是否增加浏览量
+ */
+const detail = function (id, addView) {
+  let pars = 'id=' + id;
+  if (addView) {
+    pars += '&addView=' + addView
+  }
+  return ajax.get('/xboe/m/boe/cases/detail?' + pars);
+}
+/*推荐
+ *@param (String) id 案例的id
+ *@param (String) title  案例的标题
+ *@param (String) acceptAid  受众id
+ *@param (String) recommentThat  推荐说明
+ */
+const savaRecommend = function (data) {
+  return ajax.post('/xboe/m/boe/recommend/save', data);
+}
+/* 推荐列表
+ *没有参数
+ */
+const query = function () {
+  return ajax.get('/xboe/m/boe/recommend/query');
 }
 /*
 *作者排行榜
  @param pageSize 长度
  */
-const usernameList= function(pageSize){
-    return ajax.get(`/xboe/m/boe/cases/usernamelist?pageSize=${pageSize}`);
+const usernameList = function (pageSize) {
+  return ajax.get(`/xboe/m/boe/cases/usernamelist?pageSize=${pageSize}`);
 }
 /*
 人气榜
 @param pageSize 长度
  */
-const queryPraises=function(pageSize){
-	return ajax.get(`/xboe/m/boe/cases/query-praises?pageSize=${pageSize}`);
+const queryPraises = function (pageSize) {
+  return ajax.get(`/xboe/m/boe/cases/query-praises?pageSize=${pageSize}`);
 }
 /*
 好评榜
 @param pageSize 长度
 */
-const queryComments=function(pageSize){
-	return ajax.get(`/xboe/m/boe/cases/query-comments?pageSize=${pageSize}`);
+const queryComments = function (pageSize) {
+  return ajax.get(`/xboe/m/boe/cases/query-comments?pageSize=${pageSize}`);
 }
 
 /**
  * 专业分类
  * */
-const majorTypes=function (){
+const majorTypes = function () {
   return ajax.get('/xboe/m/boe/cases/majorTypes');
 }
+
 /**
 * 详情新*/
 const details = function (id, addView) {
@@ -115,8 +119,8 @@ const details = function (id, addView) {
  *   ids
  * }
  * */
-const ids=function (data){
-  return ajax.postJson('/xboe/m/boe/cases/ids',data);
+const ids = function (data) {
+  return ajax.postJson('/xboe/m/boe/cases/ids', data);
 }
 
 /**
@@ -126,8 +130,8 @@ const ids=function (data){
  *   excellent   true、设置    false 取消
  * }
  * */
-const excellent=function(data){
-  return ajax.post('/xboe/m/boe/cases/excellent',data)
+const excellent = function (data) {
+  return ajax.post('/xboe/m/boe/cases/excellent', data)
 }
 
 
@@ -138,8 +142,8 @@ const excellent=function(data){
  *   pageSize
  * }
  * */
-const mylist=function (query){
-  return ajax.post('/xboe/m/boe/cases/mylist',query);
+const mylist = function (query) {
+  return ajax.post('/xboe/m/boe/cases/mylist', query);
 }
 
 /**
@@ -149,26 +153,56 @@ const mylist=function (query){
  *   pageSize
  * }
  * */
-const exportCases=function (query){
-  return ajax.post('/xboe/m/boe/cases/export',query);
+const exportCases = function (query) {
+  return ajax.post('/xboe/m/boe/cases/export', query);
 }
 
+/**
+ * 导出案例后加的
+ * */
+const exports = function (query) {
+  return ajax.post('/xboe/m/boe/cases/exportCase', query, { responseType: 'blob' });
+}
+/**
+ * @param
+ * 记录查看开始时间
+ * caseRecommendId读取的案例的id
+ */
+const startReadTimer =  (caseRecommendId) =>  ajax.get(`/xboe/m/boe/cases/recommend/startRead?caseRecommendId=${caseRecommendId}`);
+
+/**
+ * @param
+ * 记录查看结束时间
+ * data{
+ *  caseId [案例id]
+ *  browseDuration  [浏览时间秒]
+ * }
+ */
+const endReadTimer =  (data)=> ajax.postJson('/xboe/m/boe/cases/recommend/recordBrowseDuration',data)
+
+
+
+
 export default {
-    indexList,
-    queryList,
-    isTopList,
-    updateTop,
-    del,
-    detail,
-    savaRecommend,
-    query,
-    usernameList,
-	queryPraises,
-	queryComments,
+  indexList,
+  queryList,
+  queryListV2,
+  isTopList,
+  updateTop,
+  del,
+  detail,
+  savaRecommend,
+  query,
+  usernameList,
+  queryPraises,
+  queryComments,
   majorTypes,
   details,
   ids,
   excellent,
   mylist,
-  exportCases
+  exportCases,
+  exports,
+  startReadTimer,
+  endReadTimer
 }
diff --git a/src/api/modules/coursePortal.js b/src/api/modules/coursePortal.js
index 3af8fd4f..32d50bd2 100644
--- a/src/api/modules/coursePortal.js
+++ b/src/api/modules/coursePortal.js
@@ -40,8 +40,8 @@ const pageList = function(query) {
  * 课程的详细信息
  * @param {String} id
  */
-const detail = function(id,preview) {
-    return ajax.get(`/xboe/m/course/portal/detail?id=${id}&preview=${preview}`);
+const detail = function(id,preview,course=false) {
+    return ajax.get(`/xboe/m/course/portal/detail?id=${id}&preview=${preview}&course=${course}`);
 }
 
 /**
diff --git a/src/api/modules/type.js b/src/api/modules/type.js
index 05b381aa..37abdd9a 100644
--- a/src/api/modules/type.js
+++ b/src/api/modules/type.js
@@ -2,6 +2,7 @@
  * 分类
  */
 import ajax from '@/utils/xajax.js'
+import request from '../unionAjax.js';
 
 /**
  * 提取全量树形结构数据
@@ -11,6 +12,16 @@ import ajax from '@/utils/xajax.js'
 const tree = function(sysResType) {
     return ajax.get(`/xboe/type/tree-list?sysResType=${sysResType}&status=1`);
 }
+/**
+ *
+ * @param {*} sysResType [1]
+ * @param {*} pid [字典类别码]
+ * @param {*} current [1当前页码]
+ * @returns
+ */
+const treeList = function(sysResType,pid,current) {
+  return request.get('/infrasApi',`/dict/page?type=${sysResType}&pid=${pid}&current=${current}`);
+}
 
 /**
  * 按父ID查询列表
@@ -24,5 +35,6 @@ const list = function(sysResType, parentId) {
 
 export default {
     tree,
-    list
-}
\ No newline at end of file
+    list,
+    treeList
+}
diff --git a/src/api/phase2/index.js b/src/api/phase2/index.js
index c22ebb31..d0103c62 100644
--- a/src/api/phase2/index.js
+++ b/src/api/phase2/index.js
@@ -8,6 +8,12 @@ import ajax from '@/utils/xajax.js'
 const cases=function (type){
   return ajax.get('/xboe/portal/index/cases?type='+type);
 }
+/**
+ * 首页新改的推荐案例
+ * */
+const newCases=function (){
+  return ajax.get('/xboe/portal/index/casesV2');
+}
 
 /**
  * 首页文章排行榜
@@ -45,5 +51,6 @@ export default {
   articleViews,
   qaAnswers,
   articlelist,
-  courselist
+  courselist,
+  newCases
 }
diff --git a/src/assets/images/icon/Bitmap.png b/src/assets/images/icon/Bitmap.png
new file mode 100644
index 00000000..689ca3b6
Binary files /dev/null and b/src/assets/images/icon/Bitmap.png differ
diff --git a/src/assets/images/icon/jhot.png b/src/assets/images/icon/jhot.png
new file mode 100644
index 00000000..2e4a1d30
Binary files /dev/null and b/src/assets/images/icon/jhot.png differ
diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss
index 6b6aa53e..8f2b399e 100644
--- a/src/assets/styles/portal.scss
+++ b/src/assets/styles/portal.scss
@@ -341,6 +341,54 @@ body {margin: 0px;padding: 0px;}
   width: 400px;
 }
 
+//课程三级弹窗popperClass的样式
+.coursePopperClass{
+  padding: 0;
+  margin-left: 0 !important;
+  box-shadow: 1px 1px 35px 1px rgba(118,136,166,0.21);
+  border-radius: 4px;
+  .course-three-box{
+    min-height: 268px;
+    .course-three-box-title{
+      font-size: 16px;
+      font-weight: 600;
+      height: 68px;
+      line-height: 80px;
+      background: linear-gradient(180deg, rgba(78,166,255,0.2) 0%,
+       rgba(78,166,255,0) 100%);padding-left: 40px;
+    }
+    .course-three{
+      border-radius: 6px;
+      border: 1px solid #C7CBD2;display: inline-block;
+      height: 40px;
+      line-height: 40px;
+      padding: 0 20px;
+      margin-right: 20px;
+      cursor: pointer;
+
+      &:hover{
+        color: #387DF7;
+        border: 1px solid #387DF7 !important;
+      }
+     }
+
+    .threeActive{
+      color: #387DF7;
+      border: 1px solid #387DF7 !important;
+    }
+  }
+}
+// 标题提示
+.keywordInfo-class{
+  background-color: #F2F5F7 !important;
+  min-width: 54px;
+  padding: 0 10px;
+  line-height: 26px;
+  text-align: center;
+  border: 1px solid #387DF7;
+  color: #387DF7 !important;
+}
+
 
 //以下是多分辨率的控制，注意，只是一些样式的高度，宽度，大小控制，非大小控制不要在这里写
 @media screen and (max-width: 1366px){
@@ -384,11 +432,18 @@ body {margin: 0px;padding: 0px;}
       position: absolute;
       right:20px;
       bottom: 78px;
-  }
+    }
     .course-image-box {
       width:218;
       height: 122px;
     }
+    .course-img-box{
+      height: 122px;
+    }
+    .keywordInfo{
+      width: 40px !important;
+      margin-right: 2px;
+    }
   }
   .course-tit{
     float: none !important;
@@ -401,6 +456,13 @@ body {margin: 0px;padding: 0px;}
     height: 45px !important;
   }
 
+  // 课程导航
+  .nav{
+    width: 478px;
+  }
+  .upload{
+    width: 300px;
+  }
 }
 
 @media screen and (max-width: 1680px) and (min-width:1367px){
@@ -429,7 +491,21 @@ body {margin: 0px;padding: 0px;}
       width: 278px;
       height: 156px;
     }
+    .course-img-box{
+      height: 156px;
+    }
+    .keywordInfo{
+      width: 45px !important;
+      margin-right: 13px;
+    }
   }
+    // 课程导航
+    .nav{
+      width: 654px;
+    }
+    .upload{
+      width: 350px;
+    }
 }
 
 @media screen and (max-width: 1920px) and (min-width: 1681px){
@@ -458,6 +534,19 @@ body {margin: 0px;padding: 0px;}
       width: 346px;
       height: 192px;
     }
+    .course-img-box{
+      height: 191px;
+    }
+    .keywordInfo{
+      margin-right: 20px;
+    }
+  }
+  // 课程导航
+  .nav{
+    width: 828px;
+  }
+  .upload{
+    width: 400px;
   }
 }
 
@@ -488,6 +577,19 @@ body {margin: 0px;padding: 0px;}
       width: 340px;
       height: 191px;
     }
+    .course-img-box{
+      height: 191px;
+    }
+    .keywordInfo{
+      margin-right: 33px;
+    }
+  }
+  // 课程导航
+  .nav{
+    width: 974px;
+  }
+  .upload{
+    width: 410px;
   }
 
 }
diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 81aac052..50f4b7d1 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -132,8 +132,10 @@
                       <el-option  v-for="item in tagList" :key="item.id"  :label="item.name" :value="item.name"> </el-option>
                     </el-select>
                 </el-form-item> -->
-            <el-form-item v-if="!weike.onlyRequired" label="关键字">
-              <el-input v-model="courseInfo.keywords" maxlength="100" show-word-limit placeholder="请输入关键字(限100字以内)"></el-input>
+            <el-form-item  v-if="!weike.onlyRequired" label="关键字">
+              <!-- <el-input v-model="courseInfo.keywords" maxlength="100" show-word-limit placeholder="请输入关键字(限100字以内)"></el-input> -->
+              <el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords"  placeholder="请输入关键字"></el-input>
+              <el-tag v-for="(tag,index) in tips" size="small" :key="index" closable type="info" @close="closeKeywordsTag(tag,index)">{{ tag }}</el-tag>
             </el-form-item>
             <el-form-item v-if="!weike.onlyRequired" label="观看设置">
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="1">PC端可见</el-radio>
@@ -251,6 +253,12 @@
                   </el-select> -->
                   <choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
                 </el-form-item>
+                <el-form-item label="关键字">
+                  <el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords"  placeholder="请输入关键字"></el-input>
+                      <el-tag v-for="(tag,index) in tips" size="small" :key="index" closable type="info" @close="closeKeywordsTag(tag,index)">
+                              {{ tag }}
+                      </el-tag>
+                </el-form-item>
               </el-col>
             </el-form-item>
             <el-form-item label="资源归属" required>
@@ -421,6 +429,8 @@ export default {
   components: { weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
   data() {
     return {
+      keywords:'',//关键字的定义
+      tips:[],
       addOrder:1,
       checked:false,
       courseInfoFormCheckedShow:false,
@@ -571,6 +581,17 @@ export default {
     this.loadUserGroup();
   },
   methods: {
+    // 关键字的更改
+    changeKeywords(option){
+      if(option.target.value){
+        this.tips.push(option.target.value)
+      }
+      this.keywords = ''
+    },
+    //关闭关键字
+    closeKeywordsTag(item,index){
+      this.tips.splice(index, 1);
+    },
     showChooseOrg(){
        this.$refs.refChooseOrg.dlgShow = true;
     },
@@ -744,6 +765,8 @@ export default {
       this.teacherValues = [];
       this.courseCrowds=[];
       this.courseCoverurl = '';
+      // 关键字的清空
+      this.tips=[];
 
       if (!editData) {
         //console.log("新建课程？");
@@ -862,6 +885,7 @@ export default {
       this.courseCoverurl = '';
       this.courseInfo.coverImg = '';
     },
+    //获取课程信息
     async getDetail(id) {
       this.curCourseId = id;
       this.orgName='';
@@ -873,6 +897,10 @@ export default {
           if(result.course.visible==''){
             result.course.visible=true;
           }
+          // 给关键字赋值
+          if(result.course.keywords){
+            this.tips = result.course.keywords.split(',') || []
+          }
           this.courseInfo = result.course;
           this.checked = false;
           this.contentInfo.list = result.contents;
@@ -1156,6 +1184,7 @@ export default {
       if (this.showTags.length > 0) {
         this.courseInfo.tags = this.showTags.join();
       }
+      this.courseInfo.keywords = this.tips.join(',') || ''
       //检查输入是否合法
       //if(!this.requireSaveCourse){
       // this.curStepIndex=2;//转到第二步处理
diff --git a/src/components/HomePage/putTo.vue b/src/components/HomePage/putTo.vue
index f9c634bd..ee448f45 100644
--- a/src/components/HomePage/putTo.vue
+++ b/src/components/HomePage/putTo.vue
@@ -76,10 +76,11 @@
                 if(!data.id){
                     return;
                 }
-                if(item.info.deleted){
+                if(data.deleted){
                   this.$message.warning("此问题已删除");
                   return;
                 }
+
                 this.$router.push({ path: '/qa/answer', query: { id: data.id } });
             },
 
diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue
index 49a67cdd..d7418ea8 100644
--- a/src/components/Portal/authorInfo.vue
+++ b/src/components/Portal/authorInfo.vue
@@ -16,6 +16,7 @@
       <span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
       <span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
     </div>
+    <slot />
 	</div>
 </template>
 <script>
diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index 599a56ec..9391f64e 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -35,7 +35,7 @@
         <span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
       </div>
 
-      <div v-if="favorites"  @click="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
+      <div v-if="favorites"  @click.stop="addFavorite()" :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">
           <svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
           <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index c46ee069..c76d0593 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -76,9 +76,11 @@
             <div class="person-action-item">
               <el-badge class="person-action-index"  :value="userMsg" :hidden="userMsg == 0">
                 <el-tooltip   content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
-                   <el-link  type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false">
-                    <svg-icon :style="{color:textColor}" style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
-                   </el-link>
+                   <!-- <el-link  type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false"> -->
+                    <router-link to="/message/center/index">
+                        <svg-icon :style="{color:textColor}" style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
+                    </router-link>
+                   <!-- </el-link> -->
                 </el-tooltip>
               </el-badge>
             </div>
@@ -216,21 +218,17 @@ export default {
       // });
     },
     handleCommand(val) {
-      if (val === "four") {
-      this.$emit('showClass',true)
-      } else {
-        let urlPre = window.location.protocol + "//" + window.location.host;
-        // process.env.VUE_APP_BOE_WEB_URL
-        let obj = {
-          one: urlPre + "/web/teacherLesson",
-          two: urlPre + "/grow180/login",
-          three: this.webBaseUrl + "/study/index?study=1",
-          // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
-          five: urlPre + "/boe/new-employee/index.html",
-          six: urlPre + "/web/contributor/index",
-        };
-        window.open(obj[val]);
-      }
+      let urlPre=window.location.protocol+'//'+window.location.host;
+      // process.env.VUE_APP_BOE_WEB_URL
+      let obj = {
+        one: urlPre+'/web/teacherLesson',
+        two: urlPre+'/grow180/login',
+        three: this.webBaseUrl + '/study/index?study=1',
+        four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
+        five: urlPre+'/boe/new-employee/index.html',
+        six: urlPre+'/web/contributor/index'
+      };
+      window.open(obj[val]);
     },
     handleUcCommand(val) {
       if (val == 'uc') {
@@ -274,7 +272,8 @@ export default {
   } else if (this.goSearch == 2) {
           if(this.keyword==''){return;}
           // 案例
-          location.href=`${this.webBaseUrl}/case?keyword=${this.keyword}`;
+          // location.href=`${this.webBaseUrl}/case?keyword=${this.keyword}`;
+          this.$router.push(`/case?keyword=${this.keyword}`)
           //window.open(`${this.webBaseUrl}/case?keyword=${this.keyword}`);
         } else if (this.goSearch == 3) {
           if(this.keyword==''){return;}
diff --git a/src/components/VideoPlayer/index.vue b/src/components/VideoPlayer/index.vue
index 07d971ac..1d553334 100644
--- a/src/components/VideoPlayer/index.vue
+++ b/src/components/VideoPlayer/index.vue
@@ -38,11 +38,11 @@
             :biBarrageXml="biBarrageXml"
     />
     <!-- 加载动画 -->
-    <div v-show="isShowLoading" class="player-loading" @click="videoDom.focus({preventScroll: true})">
+    <div v-show="isShowLoading  && isCrowd" class="player-loading" @click="videoDom.focus({preventScroll: true})">
       <img src="@/components/VideoPlayer/images/loading.svg"  alt="loading"/>
     </div>
     <!-- 控制栏 -->
-    <div v-show="!isShowLoading" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
+    <div v-show="!isShowLoading && isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
       <div v-show="isShowVolumeHint" class="player-volumeHint">
         <span class="player-volumeHint-text">当前音量:{{volumePercent}}%</span>
       </div>
@@ -264,6 +264,10 @@ export default {
     isDrag:{
       type: Boolean,
       default: null,
+    },
+    isCrowd:{
+      type: Boolean,
+      default: true,
     }
   },
   data() {
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 1c0c2568..cda9d987 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -324,7 +324,7 @@
         <div class="xcontent2-main xindex-main">
           <div class="modules-title">
             <span class="modules-text">推荐案例</span>
-            <span class="quyer-tag">
+            <!-- <span class="quyer-tag">
               <a
                 :class="caseList.orderType == 2 ? 'current' : ''"
                 @click="changeCaseOrder(2)"
@@ -335,7 +335,7 @@
                 @click="changeCaseOrder(1)"
                 >最新</a
               >
-            </span>
+            </span> -->
             <span class="more">
               <router-link to="/case">查看更多>></router-link>
             </span>
@@ -1337,12 +1337,15 @@ export default {
       //     }
       //   })
     },
-    changeCaseOrder(val) {
-      this.caseList.orderType = val;
-      this.getCaseData();
-    },
+    // 去掉案例的推荐课程
+    // changeCaseOrder(val) {
+    //   this.caseList.orderType = val;
+    //   this.getCaseData();
+    // },
+
+    //案例的参数等着需要改
     getCaseData() {
-      apiIndex.cases(this.caseList.orderType).then((res) => {
+      apiIndex.newCases().then((res) => {
         if (res.status == 200) {
           if (res.result.length > 0) {
             let userIds = [];
diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue
index 76ba2374..8b855b3a 100644
--- a/src/views/case/ManageList.vue
+++ b/src/views/case/ManageList.vue
@@ -9,18 +9,27 @@
       <div style="display: flex;justify-content:flex-start;">
         <!-- <div style="padding: 0px 5px;"><el-cascader placeholder="资源归属" clearable v-model="params.type" :options="typeList"></el-cascader></div> -->
         <div style="padding: 0px 5px;">
-          <el-select v-model="queryObj.isTop" style="width: 110px;" clearable placeholder="置顶">
+          <el-select v-model="queryObj.isTop" style="width: 110px;" clearable placeholder="全部">
             <el-option label="已置顶" :value="true"></el-option>
             <el-option label="未置顶" :value="false"></el-option>
-
           </el-select>
         </div>
-        <div style="padding: 0px 5px;"><el-input placeholder="关键词搜索" v-model="queryObj.keyWord" @input="inputOn($event)" clearable></el-input></div>
         <div style="padding: 0px 5px;">
-          <el-button @click="getData(1)" icon="el-icon-search" type="primary" >搜索</el-button>
+          <el-select v-model="queryObj.excellent" style="width: 120px;" clearable placeholder="全部">
+            <el-option label="最佳案例" :value="true"></el-option>
+            <el-option label="非最佳案例" :value="false"></el-option>
+          </el-select>
+        </div>
+        <div style="padding: 0px 5px;"><el-input placeholder="关键词搜索" v-model="queryObj.keyWord" @input="inputOn($event)"
+            clearable></el-input></div>
+        <div style="padding: 0px 5px;flex: 1;display: flex;align-items: center;">
+          <el-button @click="getData(1)" icon="el-icon-search" type="primary">搜索</el-button>
           <!-- <el-button @click="showRecords()" icon="el-icon-tickets" type="info" >推荐记录</el-button> -->
-          <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
-          <el-checkbox style="margin-left:10px" v-model="queryObj.excellent" @change="getData()">优秀案例</el-checkbox>
+          <el-button icon="el-icon-refresh-right" type="primary" @click="reset">重置</el-button>
+          <!-- <el-checkbox style="margin-left:10px" v-model="queryObj.excellent" @change="getData()">优秀案例</el-checkbox> -->
+          <div style="flex: 1; display: flex; justify-content: flex-end;align-items:baseline;">
+            <el-button type="primary" icon="el-icon-document" @click="importList">导出</el-button>
+          </div>
         </div>
       </div>
     </div>
@@ -34,60 +43,61 @@
       </el-table-column> -->
       <el-table-column label="作者" width="80px" prop="authorName"></el-table-column>
       <el-table-column label="密级" width="80px" prop="confidentialityLevel"></el-table-column>
+      <el-table-column label="浏览次数" width="80px" prop="views"></el-table-column>
       <el-table-column label="导入时间" prop="sysCreateTime"></el-table-column>
       <el-table-column label="设置优秀时间" prop="excellentTime"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button-group>
             <!-- <el-button type="text" @click="shareItem(scope.row)"  icon="el-icon-share" style="margin:0 5px">推荐</el-button> -->
-            <el-button style="margin:0 5px" v-if="!scope.row.isTop && scope.row.confidentialityLevel=='内部'" type="text" @click="setTop(scope.row)"  icon="el-icon-top">置顶</el-button>
-            <el-button style="margin:0 5px" v-if="scope.row.isTop && scope.row.confidentialityLevel=='内部'"  type="text" @click="setTop(scope.row)"  icon="el-icon-bottom">取消置顶</el-button>
-            <el-button type="text" icon="el-icon-medal" v-if="scope.row.filePath && scope.row.confidentialityLevel=='内部'" ><span @click="cancal(scope.row)" v-if="scope.row.excellent">取消优秀</span><span @click="open(scope.row)" v-else>设为优秀</span></el-button>
-            <el-button style="margin:0 5px" type="text" @click="delItem(scope.row)"  icon="el-icon-delete">删除</el-button>
+            <el-button style="margin:0 5px" v-if="!scope.row.isTop && scope.row.confidentialityLevel == '内部'" type="text"
+              @click="setTop(scope.row)" icon="el-icon-top">置顶</el-button>
+            <el-button style="margin:0 5px" v-if="scope.row.isTop && scope.row.confidentialityLevel == '内部'" type="text"
+              @click="setTop(scope.row)" icon="el-icon-bottom">取消置顶</el-button>
+            <el-button type="text" icon="el-icon-medal"
+              v-if="scope.row.filePath && scope.row.confidentialityLevel == '内部'"><span @click="cancal(scope.row)"
+                v-if="scope.row.excellent">取消最佳</span><span @click="open(scope.row)" v-else>最佳案例</span></el-button>
+            <el-button style="margin:0 5px" type="text" @click="delItem(scope.row)" icon="el-icon-delete">删除</el-button>
           </el-button-group>
         </template>
       </el-table-column>
     </el-table>
     <div style="text-align: center;margin-top: 50px;">
-      <el-pagination
-        background
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="queryObj.pageIndex"
-        :page-sizes="[10, 20, 30, 40]"
-        :page-size="queryObj.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="count"
-      ></el-pagination>
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="queryObj.pageIndex" :page-sizes="[10, 20, 30, 40]" :page-size="queryObj.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="count"></el-pagination>
     </div>
     <div style="height: 100px;"></div>
 
     <el-dialog title="推荐案例" :visible.sync="shareShow" :close-on-click-modal="false" width="500px" custom-class="g-dialog">
       <div style="padding-right: 30px;">
-          <el-form  label-width="100px"  @submit.native.prevent >
-            <el-form-item label="推荐案例">{{shareItemData.title}}</el-form-item>
-            <el-form-item label="姓名或工号">
-              <el-input v-model="shareInfo.name" maxlength="10" placeholder="您要分享的人的姓名搜索" @keyup.enter.native="keyupEnter">
-                <el-button @click="findUser" slot="append" icon="el-icon-search"></el-button>
-              </el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-checkbox-group v-model="shareUsers">
-                 <el-checkbox v-for="(u,uidx) in shareInfo.list" :key="uidx" :label="u.aid">{{u.name+'('+u.orgInfo+')'}}</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-            <!-- <div style="padding: 0 20px 20px 20px;">
+        <el-form label-width="100px" @submit.native.prevent>
+          <el-form-item label="推荐案例">{{ shareItemData.title }}</el-form-item>
+          <el-form-item label="姓名或工号">
+            <el-input v-model="shareInfo.name" maxlength="10" placeholder="您要分享的人的姓名搜索" @keyup.enter.native="keyupEnter">
+              <el-button @click="findUser" slot="append" icon="el-icon-search"></el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-checkbox-group v-model="shareUsers">
+              <el-checkbox v-for="(u, uidx) in shareInfo.list" :key="uidx" :label="u.aid">{{ u.name + '(' + u.orgInfo +
+                ')' }}</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <!-- <div style="padding: 0 20px 20px 20px;">
 
             </div> -->
-            <el-form-item label="推荐说明"><el-input type="textarea" :rows="3" v-model="shareItemData.recommentThat" placeholder="备注说明"></el-input></el-form-item>
-          </el-form>
+          <el-form-item label="推荐说明"><el-input type="textarea" :rows="3" v-model="shareItemData.recommentThat"
+              placeholder="备注说明"></el-input></el-form-item>
+        </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="shareShow = false">取 消</el-button>
         <el-button @click="submitWork" type="primary">提交推荐任务</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="推荐记录" :visible.sync="recommend.dlgShow" :close-on-click-modal="false" width="900px" custom-class="g-dialog">
+    <el-dialog title="推荐记录" :visible.sync="recommend.dlgShow" :close-on-click-modal="false" width="900px"
+      custom-class="g-dialog">
       <div>
         <el-table stripe style="width: 100%" :data="recommend.records">
           <el-table-column prop="caseName" label="案例名称"></el-table-column>
@@ -121,27 +131,27 @@ export default {
   name: 'articleItems',
   data() {
     return {
-      excellent:false,
+      excellent: false,
       queryObj: {
-        pageIndex:1,
-        pageSize:10,
-        isTop:'',
-        excellent:'',
+        pageIndex: 1,
+        pageSize: 10,
+        isTop: '',
+        excellent: '',
       }, //查询对象
       caseList: [], //案例列表
-      count:0,
+      count: 0,
       recommend: {
         dlgShow: false,
         records: []
       },
-      shareInfo:{
-        name:'',
-        load:false,
-        list:[]
+      shareInfo: {
+        name: '',
+        load: false,
+        list: []
       },
       shareShow: false,
-      shareUsers:[],
-      shareItemData:{},
+      shareUsers: [],
+      shareItemData: {},
       timeout: null,
       params: { name: '', type: '' },
       typeList: [],
@@ -163,66 +173,81 @@ export default {
     this.getData();
   },
   methods: {
+    // 导出
+    importList() {
+      apiCase.exports(this.queryObj).then(res => {
+        const link = document.createElement('a');// 创建a标签
+        let blob = new Blob([res], { type: 'application/vnd.ms-excel;charset=UTF-8' }); // 设置文件类型
+        link.style.display = "none";
+        link.href = URL.createObjectURL(blob); // 创建URL
+        console.log(link.href);
+        link.setAttribute("download", "案例.xls");
+        document.body.appendChild(link);
+        link.click();
+        URL.revokeObjectURL(link.href)
+        document.body.removeChild(link);
+      })
+    },
     // getSearch(){
     //   this.queryObj.excellent = !this.queryObj.excellent;
     //   this.getData();
     // },
-    cancal(item){
-      this.$confirm('是否取消该案例为优秀案例?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.excellent = false;
-          let data = {
-            id:item.id,
-            excellent:this.excellent
+    cancal(item) {
+      this.$confirm('确定要取消设置为最佳案例吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.excellent = false;
+        let data = {
+          id: item.id,
+          excellent: this.excellent
+        }
+        console.log(data)
+        apiCase.excellent(data).then(res => {
+          if (res.status == 200) {
+            this.$message({
+              type: 'success',
+              message: '取消成功!'
+            });
+            this.getData()
           }
-          console.log(data)
-          apiCase.excellent(data).then(res => {
-            if(res.status == 200){
-               this.$message({
-                 type: 'success',
-                  message: '取消成功!'
-                  });
-              this.getData()
-            }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已撤回取消推荐'
-          });
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已撤回取消推荐'
         });
+      });
     },
     open(item) {
-        this.$confirm('是否设置此案例为优秀案例吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.excellent = true;
-          let data = {
-            id:item.id,
-            excellent:this.excellent
+      this.$confirm('你确认要设置为最佳案例吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.excellent = true;
+        let data = {
+          id: item.id,
+          excellent: this.excellent
+        }
+        console.log(data)
+        apiCase.excellent(data).then(res => {
+          if (res.status == 200) {
+            this.$message({
+              type: 'success',
+              message: '设置最佳案例成功!'
+            });
+            this.getData()
           }
-          console.log(data)
-          apiCase.excellent(data).then(res => {
-            if(res.status == 200){
-               this.$message({
-                 type: 'success',
-                  message: '设置优秀案例成功!'
-                  });
-              this.getData()
-            }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消优秀案例设置'
-          });
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消优秀案例设置'
         });
-      },
+      });
+    },
     inputOn() {
       this.$forceUpdate();
     },
@@ -235,20 +260,20 @@ export default {
     },
     //获取案例列表数据
     getData(num) {
-      if(num === 1) {
-       this.queryObj.pageIndex = 1;
-      }
-      if(!this.queryObj.excellent){
-        this.queryObj.excellent='';
+      if (num === 1) {
+        this.queryObj.pageIndex = 1;
       }
+      // if (!this.queryObj.excellent) {
+      //   this.queryObj.excellent = '';
+      // }
       apiCase.isTopList(this.queryObj).then(res => {
-          if (res.status == 200) {
-            this.count=res.result.count
-            this.caseList = res.result.list;
-          } else {
-            this.$message({type: 'error', message: '查询数据失败'});
-          }
-        })
+        if (res.status == 200) {
+          this.count = res.result.count
+          this.caseList = res.result.list;
+        } else {
+          this.$message({ type: 'error', message: '查询数据失败' });
+        }
+      })
         .catch(err => {
           this.$message({
             type: 'error',
@@ -257,54 +282,69 @@ export default {
         });
     },
     handleSizeChange(val) {
-      this.queryObj.pageSize=val;
+      this.queryObj.pageSize = val;
       this.getData(1);
     },
     handleCurrentChange(val) {
-      this.queryObj.pageIndex=val;
+      this.queryObj.pageIndex = val;
       this.getData();
     },
     //暂时因为没数据，先做添加
     showRecords() {
       this.recommend.dlgShow = true;
-      apiCase.query().then(res=>{
-        if(res.status==200){
-          this.recommend.records=res.result
+      apiCase.query().then(res => {
+        if (res.status == 200) {
+          this.recommend.records = res.result
         }
-      }).catch(err=>{
+      }).catch(err => {
         this.$message({
-          type:'error',
-          message:'获取数据失败'
+          type: 'error',
+          message: '获取数据失败'
         })
       })
     },
     setTop(item) {
-      let msg,isTop;
-      if (item.isTop==1) {
-        msg = '已取消置顶';
-        isTop=0
+      let msg, isTop, btnMsg;
+      if (item.isTop == 1) {
+        msg = '确认要取消置顶此案例吗？';
+        btnMsg = "取消成功"
+        isTop = 0
       } else {
-        msg = '置顶成功';
-        isTop=1
+        msg = '你确认要置顶此案例吗？';
+        btnMsg = "设置置顶成功"
+        isTop = 1
       }
-      apiCase.updateTop(item.id,isTop).then(res=>{
-        if(res.status==200){
-          this.$message.success(msg);
-          this.getData()
-        }else{
-          this.$message.error("操作失败")
-        }
-      })
-    },
-    delItem(item) {
-      this.$confirm('您确定要删除所选内容吗？', '删除提示', {
+      this.$confirm(msg, '删除提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
         .then(() => {
-          apiCase.del(item.id).then(res=>{
-            if(res.status==200){
+          apiCase.updateTop(item.id, isTop).then(res => {
+            if (res.status == 200) {
+              this.$message({
+                type: 'success',
+                message: btnMsg
+              });
+              this.getData()
+            } else {
+              this.$message.error("操作失败")
+            }
+          })
+        })
+        .catch(() => {
+          this.$message({ type: 'info', message: '取消操作', offset: 50 });
+        });
+    },
+    delItem(item) {
+      this.$confirm('您确定要删除这条案例吗？', '删除提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          apiCase.del(item.id).then(res => {
+            if (res.status == 200) {
               this.$message.success("删除成功");
               this.getData()
             }
@@ -316,67 +356,67 @@ export default {
     },
     //添加推荐
     shareItem(item) {
-      this.shareItemData={...item}
+      this.shareItemData = { ...item }
       this.shareShow = true;
     },
-    submitWork(){
-      if(this.shareUsers.length==0){
+    submitWork() {
+      if (this.shareUsers.length == 0) {
         this.$message.error('请选择分享人');
         return;
       }
-      let {title,recommentThat,id}=this.shareItemData
-      let {aid:acceptAid}=this.shareInfo.list[0]
-      let queryData={
-        title,recommentThat,acceptAid,id
+      let { title, recommentThat, id } = this.shareItemData
+      let { aid: acceptAid } = this.shareInfo.list[0]
+      let queryData = {
+        title, recommentThat, acceptAid, id
       }
       //暂时只针对个人分享，所以暂时只传一条，没有传数组
-      apiCase.savaRecommend(queryData).then(res=>{
-        if(res.status==200){
+      apiCase.savaRecommend(queryData).then(res => {
+        if (res.status == 200) {
           this.$message.success("分享成功")
-		  this.shareShow = false;
-        }else{
+          this.shareShow = false;
+        } else {
           this.$message.error("分享失败")
         }
-      }).catch(err=>{
+      }).catch(err => {
         this.$message.error("分享失败")
       })
       // let {id,title,acceptAid,recommentThat}=item
       // apiCase.savaRecommend()
     },
-    keyupEnter(){
-       this.findUser();
-       return false;
+    keyupEnter() {
+      this.findUser();
+      return false;
     },
-    findUser(){
-       this.shareInfo.load=false;
-       this.shareInfo.list=[];
-       this.shareUsers=[];
-       var name=this.shareInfo.name;
-       var regPos = /^\d+(\.\d+)?$/; //非负浮点数
-       if(regPos.test(name)){
-            //console.log("数字");
-            apiUser.getByLoginName(name).then(rs=>{
-              if(rs.status==200){
-                //因为根据工号查询，只会是一个人，所有会有null情况，而json会返回空字符串
-                if(rs.result!=''){
-                  this.shareInfo.list.push(rs.result);
-                }
-                this.shareInfo.load=true;
-              }else{
-                this.$message.error('查询用户失败');
-              }
-            })
-        }else{
-            // console.log("非数字");
-            apiUser.findByName(name).then(rs=>{
-              if(rs.status==200){
-                this.shareInfo.list=rs.result;
-                this.shareInfo.load=true;
-              }else{
-                this.$message.error('查询用户失败');
-              }
-            })
-        }
+    findUser() {
+      this.shareInfo.load = false;
+      this.shareInfo.list = [];
+      this.shareUsers = [];
+      var name = this.shareInfo.name;
+      var regPos = /^\d+(\.\d+)?$/; //非负浮点数
+      if (regPos.test(name)) {
+        //console.log("数字");
+        apiUser.getByLoginName(name).then(rs => {
+          if (rs.status == 200) {
+            //因为根据工号查询，只会是一个人，所有会有null情况，而json会返回空字符串
+            if (rs.result != '') {
+              this.shareInfo.list.push(rs.result);
+            }
+            this.shareInfo.load = true;
+          } else {
+            this.$message.error('查询用户失败');
+          }
+        })
+      } else {
+        // console.log("非数字");
+        apiUser.findByName(name).then(rs => {
+          if (rs.status == 200) {
+            this.shareInfo.list = rs.result;
+            this.shareInfo.load = true;
+          } else {
+            this.$message.error('查询用户失败');
+          }
+        })
+      }
     },
 
     setEssence(item, idx) {
@@ -415,12 +455,12 @@ export default {
       };
     },
     viewTopic(data) {
-      if(data.confidentialityLevel=='内部'){
-        this.$router.push({path:'/case/detail',query:{id:data.id}})
-      }else{
+      if (data.confidentialityLevel == '内部') {
+        this.$router.push({ path: '/case/detail', query: { id: data.id } })
+      } else {
         this.$message.warning("非内部密级案例不能查看");
       }
-        
+
     }
   }
 };
@@ -432,16 +472,19 @@ export default {
   border: 1px dotted #1ea0fa;
   color: #1ea0fa;
 }
+
 .article-status2 {
   padding: 3px;
   border: 1px dotted #00aa00;
   color: #00aa00;
 }
+
 .article-status3 {
   padding: 3px;
   border: 1px dotted #ff0000;
   color: #ff0000;
 }
+
 .article-list {
   margin: 5px 0;
   border: 1px solid #dddddd;
@@ -454,6 +497,7 @@ export default {
     font-weight: 400;
     height: 40px;
     line-height: 40px;
+
     .article-info-date {
       width: 150px;
       height: 40px;
@@ -461,21 +505,26 @@ export default {
       float: right;
       font-weight: 200;
       color: #999999;
+
       i {
         margin-right: 5px;
       }
     }
   }
+
   .article-info-summary {
     height: 65px;
     color: #999999;
   }
+
   .article-info-tools {
     height: 30px;
+
     .article-info-tools-auth {
       float: left;
       font-size: 13px;
       color: #999999;
+
       img {
         margin-right: 10px;
         width: 30px;
@@ -484,14 +533,17 @@ export default {
         vertical-align: middle;
       }
     }
+
     .article-info-tools-btns {
       float: right;
+
       .article-info-tools-btn {
         margin: 0 0 0 15px;
       }
     }
   }
 }
+
 .case-row-btn {
   line-height: 25px;
 
@@ -500,8 +552,9 @@ export default {
     padding: 3px 20px;
   }
 }
-.el-form{
-  .el-form-item{
+
+.el-form {
+  .el-form-item {
     margin-bottom: 10px;
   }
 }
diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue
index ff2bda18..37f80101 100644
--- a/src/views/course/ManageList.vue
+++ b/src/views/course/ManageList.vue
@@ -90,6 +90,11 @@
           <span v-if="scope.row.sysType3 !=''">/{{sysTypeName(scope.row.sysType3)}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="关键字" :show-overflow-tooltip="true" prop="name" width="200px">
+        <template slot-scope="scope">
+          {{ scope.row.keywords }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="资源归属" sortable prop="author" width="240px">
         <template slot-scope="scope">
           <span>{{resOwnerName(scope.row.resOwner1)}}</span>
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 60fdce0a..4b62925a 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -4,160 +4,172 @@
       <portal-header current="case" textColor="#fff" :goSearch="2"></portal-header>
     </div>
     <div class="">
-       <div class="xcontent2">
-          <div class="xcontent2-main" style="margin-right: 30px;" id="content-div">
-            <div v-if="noData">
-                <div class="detail">
-                  <div class="xpage-detail-crumbs">
-                      <router-link to="/case"><span class="crumbs-first">案例列表</span></router-link>
-                      <span class="crumbs-line">/</span>
-                      <span class="crumbs-last">案例详情</span>
-                  </div>
-                  <div class="title">
-                    <h5>{{ caseDetail.title }}</h5>
-                    <span style="text-align: right;" v-if="caseDetail.sysCreateTime"> <i class="el-icon-time"></i> {{ caseDetail.sysCreateTime.substring(0,10) }}</span>
-                  </div>
-                  <div class="label">
-                    <author :aid="caseDetail.sysCreateAid" :onlyAvatar="true" :avatar="authorInfo.avatar" :sex="authorInfo.sex" ></author>
-                    <span>案主：{{ authorInfo.name }} ({{authorInfo.orgInfo}})</span>
-                    <!-- <span>案主：{{ authorInfo.name }}</span>
+      <div class="xcontent2">
+        <div class="xcontent2-main" style="margin-right: 30px;" id="content-div">
+          <div v-if="noData">
+            <div class="detail">
+              <div class="xpage-detail-crumbs">
+                <router-link to="/case"><span class="crumbs-first">案例列表</span></router-link>
+                <span class="crumbs-line">/</span>
+                <span class="crumbs-last">案例详情</span>
+              </div>
+              <div class="title">
+                <h5>{{ caseDetail.title }}</h5>
+                <span style="text-align: right;" v-if="caseDetail.sysCreateTime"> <i class="el-icon-time"></i> {{
+                  caseDetail.sysCreateTime.substring(0, 10) }}</span>
+              </div>
+              <div class="label">
+                <author :aid="caseDetail.sysCreateAid" :onlyAvatar="true" :avatar="authorInfo.avatar"
+                  :sex="authorInfo.sex"></author>
+                <span>案主：{{ authorInfo.name }} ({{ authorInfo.orgInfo }})</span>
+                <!-- <span>案主：{{ authorInfo.name }}</span>
                     <span>工号：{{ authorInfo.code }}</span>
                     <span>组织：{{ authorInfo.orgInfo }} </span> -->
-                    <span> {{authorInfo.sign}}</span>
-                  </div>
-                  <!-- <div class="label">
+                <span> {{ authorInfo.sign }}</span>
+              </div>
+              <!-- <div class="label">
                     <span style="margin-left:0px;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
                     <interactBar  :data="caseDetail" :type="3" :comments="false" :shares="true"></interactBar>
                   </div> -->
-                  <!-- <div class="case-summary"><span>{{ caseDetail.summary }}</span></div> -->
-                  <div class="btn-div clearfix" >
-                    <div style="color:#2974D6;font-weight: 450;" v-if="caseDetail.orgDomain" class="item">{{ orgDomainTranslate(caseDetail.orgDomain) }}</div>
-                    <div style="color:#2974D6;font-weight: 450;" class="item" v-if="caseDetail.orgDomain == '' && caseDetail.orgDomainParent">{{ orgDomainTranslate(caseDetail.orgDomainParent) }}</div>
-                    <!-- <div style="color:#2974D6;font-weight: 450;" v-if="caseDetail.majorType" class="item">{{ majorTypeTranslate(caseDetail.majorType) }}</div> -->
-                    <div class="item" style="color:#2974D6;font-weight: 450;"  v-for="item,idx in caseDetail.majorType" :key="idx" >{{ majorTypeTranslate(item) }}</div>
-                    <div v-if="caseDetail.keyword1" class="item">{{ caseDetail.keyword1 }}</div>
-                    <div v-if="caseDetail.keyword2" class="item">{{ caseDetail.keyword2 }}</div>
-                    <div v-if="caseDetail.keyword3" class="item">{{ caseDetail.keyword3 }}</div>
-                    <div v-if="caseDetail.keyword4" class="item">{{ caseDetail.keyword4 }}</div>
-                    <div v-if="caseDetail.keyword5" class="item">{{ caseDetail.keyword5 }}</div>
-                    <!-- <span v-if="caseDetail.caseType" class="item">{{ caseDetail.caseType }}</span>
+              <!-- <div class="case-summary"><span>{{ caseDetail.summary }}</span></div> -->
+              <div class="btn-div clearfix">
+                <div style="color:#2974D6;font-weight: 450;" v-if="caseDetail.orgDomain" class="item">{{
+                  orgDomainTranslate(caseDetail.orgDomain) }}</div>
+                <div style="color:#2974D6;font-weight: 450;" class="item"
+                  v-if="caseDetail.orgDomain == '' && caseDetail.orgDomainParent">{{
+                    orgDomainTranslate(caseDetail.orgDomainParent) }}</div>
+                <!-- <div style="color:#2974D6;font-weight: 450;" v-if="caseDetail.majorType" class="item">{{ majorTypeTranslate(caseDetail.majorType) }}</div> -->
+                <div class="item" style="color:#2974D6;font-weight: 450;" v-for="item, idx in caseDetail.majorType"
+                  :key="idx">{{ majorTypeTranslate(item) }}</div>
+                <div v-if="caseDetail.keyword1" class="item">{{ caseDetail.keyword1 }}</div>
+                <div v-if="caseDetail.keyword2" class="item">{{ caseDetail.keyword2 }}</div>
+                <div v-if="caseDetail.keyword3" class="item">{{ caseDetail.keyword3 }}</div>
+                <div v-if="caseDetail.keyword4" class="item">{{ caseDetail.keyword4 }}</div>
+                <div v-if="caseDetail.keyword5" class="item">{{ caseDetail.keyword5 }}</div>
+                <!-- <span v-if="caseDetail.caseType" class="item">{{ caseDetail.caseType }}</span>
                     <span v-if="caseDetail.caseType1" class="item">{{ caseDetail.caseType1 }}</span>
                       <span v-if="caseDetail.caseType2" class="item">{{ caseDetail.caseType2 }}</span> -->
-                  </div>
-                  <div class="case-summary"><span>{{ caseDetail.summary }}</span></div>
+              </div>
+              <div class="case-summary"><span>{{ caseDetail.summary }}</span></div>
 
-                </div>
+            </div>
 
-                <div v-if="Internet == 1" :body-style="{ padding: '0px' }" class="jianjie" id="pdfPreview">
-                  <pdfPreview v-if="pdfPath" :filePath="pdfPath"></pdfPreview>
-                </div>
-                <el-card v-if="Internet == 2" style="background-color:#eee" class="jianjie pdftext" id="pdfPreview">
-                   <div style="margin-top:40px">
-                     <span>十分抱歉，您当前的网络环境不符合观看要求。<br/>
-                     为了保障案例信息的安全，您需要接入公司内网才能观看。</span>
-                  </div>
-                     <div style="margin-top:20px" @click="retest">
-                       <el-button type="primary">重新检测</el-button>
+            <div v-if="Internet == 1" :body-style="{ padding: '0px' }" class="jianjie" id="pdfPreview">
+              <pdfPreview v-if="pdfPath" :filePath="pdfPath"></pdfPreview>
+            </div>
+            <el-card v-if="Internet == 2" style="background-color:#eee" class="jianjie pdftext" id="pdfPreview">
+              <div style="margin-top:40px">
+                <span>十分抱歉，您当前的网络环境不符合观看要求。<br />
+                  为了保障案例信息的安全，您需要接入公司内网才能观看。</span>
+              </div>
+              <div style="margin-top:20px" @click="retest">
+                <el-button type="primary">重新检测</el-button>
+              </div>
+            </el-card>
+            <el-card v-else-if="Internet == 3" style="background-color:#eee" class="jianjie pdftext" id="pdfPreview">
+              <div style="margin-top:40px">
+                <span>网络安全检测中...</span>
+
+              </div>
+            </el-card>
+
+            <div class="postfixt-bot">
+              <div class="postfixt-bot-box" id="pdfTopBox">
+                <div style="display: flex;justify-content: space-between;">
+                  <div style="margin-left:20px">
+                    <div style="margin-top:3px">
+                      <i style="font-size:22px;color:#a3b1cc" v-show="zoomShow" @click="zoomBox()"
+                        class="el-icon-zoom-in"></i>
+                      <i style="font-size:22px;color:#a3b1cc" v-show="!zoomShow" @click="zoomBox()"
+                        class="el-icon-zoom-out"></i>
                     </div>
-                </el-card>
-                <el-card v-else-if="Internet == 3" style="background-color:#eee" class="jianjie pdftext" id="pdfPreview">
-                  <div style="margin-top:40px">
-                  <span>网络安全检测中...</span>
-
                   </div>
-                </el-card>
-
-                <div class="postfixt-bot">
-                  <div class="postfixt-bot-box" id="pdfTopBox">
-                    <div style="display: flex;justify-content: space-between;">
-                      <div style="margin-left:20px">
-                        <div style="margin-top:3px">
-                          <i style="font-size:22px;color:#a3b1cc" v-show="zoomShow" @click="zoomBox()" class="el-icon-zoom-in"></i>
-                          <i style="font-size:22px;color:#a3b1cc" v-show="!zoomShow" @click="zoomBox()" class="el-icon-zoom-out"></i>
-                        </div>
-                      </div>
-                      <div>
-                        <div style="display:inline-block;">
-                            <interactBar v-if="caseDetail.id"  :data="caseDetail" :type="3" :comments="false" :shares="true" :unicom="true"></interactBar>
-                          </div>
-                          <div style="display:inline-block;margin: 0 20px;">
-                            <i style="font-size: 25px;color:#6E7B84;"  @click="goTop()" class="el-icon-arrow-up"></i>
-                            <!-- <el-button type="primary" >返回顶部</el-button> -->
-                          </div>
-                      </div>
+                  <div>
+                    <div style="display:inline-block;">
+                      <interactBar v-if="caseDetail.id" :data="caseDetail" :type="3" :comments="false" :shares="true"
+                        :unicom="true"></interactBar>
+                    </div>
+                    <div style="display:inline-block;margin: 0 20px;">
+                      <i style="font-size: 25px;color:#6E7B84;" @click="goTop()" class="el-icon-arrow-up"></i>
+                      <!-- <el-button type="primary" >返回顶部</el-button> -->
                     </div>
                   </div>
                 </div>
-                <!-- :authorId="articleDetailData.sysCreateAid" -->
-                <div id="comments-box">
-                  <comments @success="success" v-if="resolveId != ''" :obj-type="3" :obj-id="resolveId" :authorId="caseDetail.authorId" :toUsers="toUsers"></comments>
-                </div>
+              </div>
+            </div>
+            <!-- :authorId="articleDetailData.sysCreateAid" -->
+            <div id="comments-box">
+              <comments @success="success" v-if="resolveId != ''" :obj-type="3" :obj-id="resolveId"
+                :authorId="caseDetail.authorId" :toUsers="toUsers"></comments>
+            </div>
 
-            </div>
-            <div v-else>
-              <el-empty :image-size="200"></el-empty>
-            </div>
           </div>
-          <div class="xcontent2-minor" :style="{display:zoomShow? '':'none'}">
-            <div>
+          <div v-else>
+            <el-empty :image-size="200"></el-empty>
+          </div>
+        </div>
+        <div class="xcontent2-minor" :style="{ display: zoomShow ? '' : 'none' }">
+          <div>
             <div id="fixd-box">
-            <div class="portal-ranking ranking-bg">
-              <p class="ranking-title">好评榜</p>
-              <ul class="ranking-data">
-                  <li  v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
-                          <span class="portal-right-text blue-one" v-if="index==0">
-                            <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
-                          </span>
-                          <span class="portal-right-text blue-tow" v-if="index==1">
-                              <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
-                          </span>
-                          <span class="portal-right-text blue-three" v-if="index==2">
-                              <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
-                          </span>
-                          <span class="portal-right-text" v-if="index==3">
-                               <img :src="`${webBaseUrl}/images/list04.png`" alt="">
-                          </span>
-                           <span class="portal-right-text" v-if="index==4">
-                               <img :src="`${webBaseUrl}/images/list05.png`" alt="">
-                          </span>
-                          <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+              <div class="portal-ranking ranking-bg">
+                <p class="ranking-title">好评榜</p>
+                <ul class="ranking-data">
+                  <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis"
+                    style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
+                    <span class="portal-right-text blue-one" v-if="index == 0">
+                      <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
+                    </span>
+                    <span class="portal-right-text blue-tow" v-if="index == 1">
+                      <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
+                    </span>
+                    <span class="portal-right-text blue-three" v-if="index == 2">
+                      <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 3">
+                      <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 4">
+                      <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                    </span>
+                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
                   </li>
-              </ul>
-            </div>
-            <div style="margin-top:26px" class="portal-ranking ranking-bg1">
-              <p class="ranking-title">人气榜</p>
-              <ul class="ranking-data">
-                <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
-                        <span class="portal-right-text orange-one" v-if="index==0">
-                          <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
-                        </span>
-                        <span class="portal-right-text orange-tow" v-if="index==1">
-                            <img :src="`${webBaseUrl}/images/list02.png`" alt="">
-                        </span>
-                        <span class="portal-right-text orange-three" v-if="index==2">
-                            <img :src="`${webBaseUrl}/images/list03.png`" alt="">
-                        </span>
-                        <span class="portal-right-text" v-if="index==3">
-                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
-                        </span>
-                         <span class="portal-right-text" v-if="index==4">
-                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
-                        </span>
-                        <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
-                   </li>
-              </ul>
-            </div>
-             <!-- <div class="course-resources pointer"> -->
-                <!-- 资源位 -->
-                <!-- <img @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
+                </ul>
+              </div>
+              <div style="margin-top:26px" class="portal-ranking ranking-bg1">
+                <p class="ranking-title">人气榜</p>
+                <ul class="ranking-data">
+                  <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis"
+                    style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
+                    <span class="portal-right-text orange-one" v-if="index == 0">
+                      <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
+                    </span>
+                    <span class="portal-right-text orange-tow" v-if="index == 1">
+                      <img :src="`${webBaseUrl}/images/list02.png`" alt="">
+                    </span>
+                    <span class="portal-right-text orange-three" v-if="index == 2">
+                      <img :src="`${webBaseUrl}/images/list03.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 3">
+                      <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 4">
+                      <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                    </span>
+                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                  </li>
+                </ul>
+              </div>
+              <!-- <div class="course-resources pointer"> -->
+              <!-- 资源位 -->
+              <!-- <img @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
               <!-- </div> -->
-           </div>
+            </div>
           </div>
         </div>
       </div>
     </div>
     <portal-footer></portal-footer>
-      <portalFloatTools></portalFloatTools>
+    <portalFloatTools></portalFloatTools>
   </div>
 </template>
 
@@ -173,119 +185,163 @@ import apiUser from '@/api/system/user.js';
 import author from '@/components/Portal/authorInfo.vue';
 import apiMessage from '@/api/system/message.js';
 import apiDict from "@/api/modules/dict.js"
-import {encrypt} from '@/utils/jsencrypt.js';
+import { encrypt } from '@/utils/jsencrypt.js';
 import cookies from 'vue-cookies'
-import {cutFullName} from "@/utils/tools.js";
+import { cutFullName } from "@/utils/tools.js";
 import apiPlace from "@/api/phase2/place.js"
 import portalFloatTools from "@/components/PortalFloatTools.vue";
 export default {
   name: 'atticle',
-  components: { portalHeader,portalFloatTools,  portalFooter, interactBar, author, comments,pdfPreview },
+  components: { portalHeader, portalFloatTools, portalFooter, interactBar, author, comments, pdfPreview },
   computed: {
     ...mapGetters(['userInfo'])
   },
   data() {
     return {
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
-      resonimg:{},
-      Internet:3,//1是成功 2是是失败 3是检测中
-      noData:true,
-      authorSign:'',//提问人的个性签名
-      zoomShow:true,
-      isTopBoxShow:true,
-      toUsers:[],
-      ankingList:[],
-      Popularity:[],
-      Positive:[],
+      resonimg: {},
+      Internet: 3,//1是成功 2是是失败 3是检测中
+      noData: true,
+      authorSign: '',//提问人的个性签名
+      zoomShow: true,
+      isTopBoxShow: true,
+      toUsers: [],
+      ankingList: [],
+      Popularity: [],
+      Positive: [],
       resolveId: '',
-      basePath:process.env.VUE_APP_FILE_BASE_URL,
-      pdfPath:'',
+      basePath: process.env.VUE_APP_FILE_BASE_URL,
+      pdfPath: '',
       caseDetail: {
-        sysCreateAid:'',
-        id:'',
-        filePath:''
+        sysCreateAid: '',
+        id: '',
+        filePath: ''
       },
-      ankingList:[],
-      authorInfo:{ aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null},
+      ankingList: [],
+      authorInfo: { aid: '', name: '', orgInfo: '', avatar: '', code: '', sex: null },
       domain: [],
       Profess: [],
       orgData: [],
       setTimeCase: null,
+      dataTime: sessionStorage.getItem('startTime') || 0
     };
   },
   mounted() {
-   let $this = this;
-   this.Intsucc();
-   this.retest();
-
-    this.resolveId = this.$route.query.id;
-    this.$watermark.set(this.userInfo.name+this.userInfo.loginName);
-    if (this.resolveId) {
-      this.getCaseData();
-    }
-    this.getdomain();
-    this.getProfess();
-    this.getAnkingData();
-    this.getPopularity();
-    this.getPositive();
-     this.couresreso();
-    window.addEventListener(
-      "scroll",
-      this.handleScroll
-    );
-
+    console.log(this.dataTime);
+    this.allRequests()
   },
-  beforeRouteLeave(to, from, next){
-    to.meta.keepAlive=true;
+
+  
+  beforeRouteEnter(to, from, next) {
+    console.log(from, '哈哈哈');
+    console.log(to, '嘿嘿');
+    let time = new Date().getTime()
+    sessionStorage.setItem('startTime', time)
+    next()
+  },
+  beforeRouteUpdate(to, from, next) {
+    if (to.query.id != from.query.id) {
+      window.removeEventListener("scroll", this.handleScroll);
+      clearInterval(this.setTimeCase);
+      // 结束时间
+      let recordEndTime = new Date().getTime()
+      this.endTimeRequst(from.query.id, recordEndTime)
+      //时间重新赋值
+      let time = new Date().getTime()
+      sessionStorage.setItem('startTime', time)
+      this.dataTime = time
+      this.allRequests(to.query.id)
+    }
+    next()
+  },
+  beforeRouteLeave(to, from, next) {
+    to.meta.keepAlive = true;
     next();
   },
-  beforeDestroy(){
-    window.removeEventListener("scroll",this.handleScroll);
+  beforeDestroy() {
+    console.log('销毁了');
+    // 结束时间
+    let recordEndTime = new Date().getTime()
+    this.endTimeRequst(this.resolveId, recordEndTime)
+    sessionStorage.removeItem('startTime')
+    window.removeEventListener("scroll", this.handleScroll);
     clearInterval(this.setTimeCase);
   },
   methods: {
+    endTimeRequst(caseId, recordEndTime) {
+      console.log(this.dataTime);
+      let time = (recordEndTime - this.dataTime) / 1000 / 60
+      if (time > 10080) {
+        time = 0
+      }
+      //结束之前的查看取时间
+      apiCase.endReadTimer({
+        caseId,
+        browseDuration: Math.ceil(time)
+      })
+    },
+    allRequests(id = '') {
+      this.Intsucc();
+      this.retest();
+
+      this.resolveId = id ? id : this.$route.query.id;
+      this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
+      if (this.resolveId) {
+        this.getCaseData();
+      }
+      this.getdomain();
+      this.getProfess();
+      this.getAnkingData();
+      this.getPopularity();
+      this.getPositive();
+      this.couresreso();
+      window.addEventListener(
+        "scroll",
+        this.handleScroll
+      );
+    },
     banJump() {
-      if(this.resonimg.JumpUrl) {
+      if (this.resonimg.JumpUrl) {
         window.open(this.resonimg.JumpUrl);
       }
     },
-    jumecase(item){
+    jumecase(item) {
       this.$router.push({ path: './Detail.vue', query: { id: item.id } });
     },
-     couresreso(){
+    couresreso() {
       let key = 'case';
-      apiPlace.detail(key).then(res=>{
-        let lmj =  JSON.parse(res.result.content)
+      apiPlace.detail(key).then(res => {
+        let lmj = JSON.parse(res.result.content)
         // console.log(lmj)
         this.resonimg = lmj[0]
       })
     },
-    retest(){
-      this.Internet=3;
-      let $this=this;
-      let xmlhttp=this.getXmlHttpRequest();
+    retest() {
+      this.Internet = 3;
+      let $this = this;
+      let xmlhttp = this.getXmlHttpRequest();
       let timedOut = false;
-      let timer = setTimeout(function(){
-            timedOut = true;
-            xmlhttp.abort();
-        }, 5000);
-        xmlhttp.open("HEAD", window.location.protocol+"//uapi.boe.com.cn",true);
-        xmlhttp.send();
-        xmlhttp.onreadystatechange=function() {
-          if (xmlhttp.readyState==4) {
-            if (xmlhttp.status==200){
-              clearTimeout(timer);
-              $this.Internet = 1;
-              $this.sendEventData();
-            }else{
-              clearTimeout(timer);
-              $this.Internet = 2;
-            }
-          }else{
-            if(timedOut) return;//忽略中止请求
-            clearTimeout(timer);//取消等待的超时
+      let timer = setTimeout(function () {
+        timedOut = true;
+        xmlhttp.abort();
+      }, 5000);
+      xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn", true);
+      xmlhttp.send();
+      xmlhttp.onreadystatechange = function () {
+        if (xmlhttp.readyState == 4) {
+          if (xmlhttp.status == 200) {
+            clearTimeout(timer);
+            $this.Internet = 1;
+            $this.sendEventData();
+          } else {
+            clearTimeout(timer);
+            $this.Internet = 2;
           }
+        } else {
+          if (timedOut) return;//忽略中止请求
+          clearTimeout(timer);//取消等待的超时
         }
+      }
     },
     getXmlHttpRequest() {
       if (window.XMLHttpRequest) {
@@ -295,26 +351,26 @@ export default {
         return new ActiveXObject("Microsoft.XMLHTTP");
       }
     },
-    Intsucc(){
+    Intsucc() {
       const loading = this.$loading({
-          lock: true,
-          text: '正在进行安全检测',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        setTimeout(() => {
-          loading.close();
-        }, 2000);
+        lock: true,
+        text: '正在进行安全检测',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+      setTimeout(() => {
+        loading.close();
+      }, 2000);
 
     },
 
-     getdomain() {
+    getdomain() {
       let key = "org_domain";
       apiDict.items(key).then(res => {
         if (res.status == 200) {
           this.domain = res.result;
-          if(res.result.length > 0) {
-           this.orgDomainLevel(res.result)
+          if (res.result.length > 0) {
+            this.orgDomainLevel(res.result)
           }
         }
       });
@@ -329,130 +385,139 @@ export default {
       });
     },
     orgDomainLevel(organization) {
-     this.orgData = [];
-     organization.forEach(item=>{
-       this.orgData.push(item);
-       if(item.list && item.list != "" && item.list.length > 0){
-            item.list.forEach(it =>{
-              this.orgData.push(it);
-            })
-       }
-     })
+      this.orgData = [];
+      organization.forEach(item => {
+        this.orgData.push(item);
+        if (item.list && item.list != "" && item.list.length > 0) {
+          item.list.forEach(it => {
+            this.orgData.push(it);
+          })
+        }
+      })
     },
-    orgDomainTranslate(code){ // 组织领域翻译
-      if(code == '') {
-       return
+    orgDomainTranslate(code) { // 组织领域翻译
+      if (code == '') {
+        return
       }
-     let name = '';
+      let name = '';
       let data = this.orgData.find(item => item.code == code);
-      if(data == undefined){
+      if (data == undefined) {
         name = '';
       } else {
         name = data.name;
       }
       return name;
     },
-    majorTypeTranslate(code){ // 专业分类翻译
+    majorTypeTranslate(code) { // 专业分类翻译
       let name = '';
       let data = this.Profess.find(item => item.code == code);
-      if(data == undefined){
+      if (data == undefined) {
         name = '';
       } else {
         name = data.name;
       }
       return name;
     },
-    zoomBox(){
+    zoomBox() {
       this.zoomShow = !this.zoomShow;
     },
     jumpRouter(item) {
       //   console.log(item)
-        location.href =`${this.webBaseUrl}/case/detail?id=${item.id}`
+      // location.href =`${this.webBaseUrl}/case/detail?id=${item.id}`
       // this.$router.push(`/case/detail?id=${item.id}`);
+      const currentRoute = this.$router.currentRoute;
+      if (currentRoute.query.id !== item.id) {
+        this.$router.push('/case/detail?id=' + item.id);
+      } else {
+        // 结束时间
+        let recordEndTime = new Date().getTime()
+        this.endTimeRequst(item.id, recordEndTime)
+        location.href = `${this.webBaseUrl}/case/detail?id=${item.id}`
+      }
     },
     goTop() {
-     document.documentElement.scrollTop = 0;
+      document.documentElement.scrollTop = 0;
     },
-    createPlayUrl(u){
-      let nowDate=new Date();
-      let ctime=parseInt(nowDate.getTime()/1000);
-      let beforeUrl=parseInt(nowDate.getTime()/1000)+'/'+u;
-      let urlSign=encodeURIComponent(encrypt(beforeUrl));
+    createPlayUrl(u) {
+      let nowDate = new Date();
+      let ctime = parseInt(nowDate.getTime() / 1000);
+      let beforeUrl = parseInt(nowDate.getTime() / 1000) + '/' + u;
+      let urlSign = encodeURIComponent(encrypt(beforeUrl));
       cookies.set('CASE_TIME', ctime);//写客户端的cookie保存
       //以下判断是为了区分本地环境和服务器环境
-      if(process.env.NODE_ENV == 'development'){
-        this.pdfPath=process.env.VUE_APP_FILE_BASE_URL+u;
-      }else{
-        this.pdfPath=process.env.VUE_APP_BASE_API+'/xboe/m/case/content/resource?sign='+urlSign;
+      if (process.env.NODE_ENV == 'development') {
+        this.pdfPath = process.env.VUE_APP_FILE_BASE_URL + u;
+      } else {
+        this.pdfPath = process.env.VUE_APP_BASE_API + '/xboe/m/case/content/resource?sign=' + urlSign;
       }
     },
     handleScroll() {
-       let innerw = document.querySelector("#fixd-box");
-        let innerHeight = document.querySelector('#case-list-content').clientHeight
-        let pdfTopBox = document.querySelector('#comments-box')
-        let pdfPreview = document.querySelector('#pdfPreview') //pdf盒子距离顶部的高度
-        let contentDiv = document.querySelector('#content-div').clientWidth;
-        let outerHeight = document.documentElement.clientHeight;
-        let outerWidth = innerw.clientWidth;
-        let scrollTop = document.documentElement.scrollTop
-        if ((outerHeight + scrollTop + 350) >= innerHeight) {
-          if(this.moreState == 1 && this.course.pageIndex < 4) {
-              this.loadMore();
-          }
-        }
-        if(pdfPreview.getBoundingClientRect().top < 0) {
-          document.querySelector('#pdfTopBox').style.cssText = `position: fixed;bottom:0;box-shadow: -3px 3px 10px 10px rgba(90, 119, 186, .1);width:${contentDiv-9}px;`;
-        } else {
-          document.querySelector('#pdfTopBox').style.cssText = "position:static";
-        }
-        if(pdfTopBox.getBoundingClientRect().top < 1000) {
-          document.querySelector('#pdfTopBox').style.cssText = "position:static";
-        }
-        if(scrollTop > 630) {
-          this.isTopBoxShow = true;
-          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:"+outerWidth+"px";
-        } else {
-          document.querySelector('#fixd-box').style.cssText = "position: static";
+      let innerw = document.querySelector("#fixd-box");
+      let innerHeight = document.querySelector('#case-list-content').clientHeight
+      let pdfTopBox = document.querySelector('#comments-box')
+      let pdfPreview = document.querySelector('#pdfPreview') //pdf盒子距离顶部的高度
+      let contentDiv = document.querySelector('#content-div').clientWidth;
+      let outerHeight = document.documentElement.clientHeight;
+      let outerWidth = innerw.clientWidth;
+      let scrollTop = document.documentElement.scrollTop
+      if ((outerHeight + scrollTop + 350) >= innerHeight) {
+        if (this.moreState == 1 && this.course.pageIndex < 4) {
+          this.loadMore();
         }
+      }
+      if (pdfPreview.getBoundingClientRect().top < 0) {
+        document.querySelector('#pdfTopBox').style.cssText = `position: fixed;bottom:0;box-shadow: -3px 3px 10px 10px rgba(90, 119, 186, .1);width:${contentDiv - 9}px;`;
+      } else {
+        document.querySelector('#pdfTopBox').style.cssText = "position:static";
+      }
+      if (pdfTopBox.getBoundingClientRect().top < 1000) {
+        document.querySelector('#pdfTopBox').style.cssText = "position:static";
+      }
+      if (scrollTop > 630) {
+        this.isTopBoxShow = true;
+        document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:" + outerWidth + "px";
+      } else {
+        document.querySelector('#fixd-box').style.cssText = "position: static";
+      }
     },
 
-   getAnkingData(){
-      apiCase.usernameList(5).then(res=>{
-        if(res.status==200){
-          this.ankingList=res.result
+    getAnkingData() {
+      apiCase.usernameList(5).then(res => {
+        if (res.status == 200) {
+          this.ankingList = res.result
         }
       })
     },
-    getPopularity(){
-      apiCase.queryPraises(5).then(res=>{
-        if(res.status==200){
-          this.Popularity=res.result;
-           if(res.result.length < 5){
-            for(let i=0;i=(5-res.result.length);i++){
-            this.Popularity.push({
-              authorName:'',
-              count:1,
-              id:'',
-              title:'',
-             })
-          }
+    getPopularity() {
+      apiCase.queryPraises(5).then(res => {
+        if (res.status == 200) {
+          this.Popularity = res.result;
+          if (res.result.length < 5) {
+            for (let i = 0; i = (5 - res.result.length); i++) {
+              this.Popularity.push({
+                authorName: '',
+                count: 1,
+                id: '',
+                title: '',
+              })
+            }
           }
         }
       })
     },
-    getPositive(){
-      apiCase.queryComments(5).then(res=>{
-        if(res.status==200){
-          this.Positive=res.result;
-          if(res.result.length < 5){
-            for(let i=0;i=(5-res.result.length);i++){
-            this.Positive.push({
-              authorName:'',
-              count:1,
-              id:'',
-              title:'',
-             })
-          }
+    getPositive() {
+      apiCase.queryComments(5).then(res => {
+        if (res.status == 200) {
+          this.Positive = res.result;
+          if (res.result.length < 5) {
+            for (let i = 0; i = (5 - res.result.length); i++) {
+              this.Positive.push({
+                authorName: '',
+                count: 1,
+                id: '',
+                title: '',
+              })
+            }
 
           }
           // console.log(this.Positive);
@@ -461,252 +526,282 @@ export default {
         }
       })
     },
-    sendEventData(){
+    sendEventData() {
       let event = {
-          key: "ViewCase",//后台的事件key  发布文章且审核通过
-          title: '查看案例',//事件的标题
-          parameters:"",//用户自定义参数 name:value,name:value
-          content: '查看了案例',//事件的内容
-          objId: this.resolveId,//关联的id
-          objType: "3",//关联的类型
-          objInfo:this.caseDetail.title,
-          aid: this.userInfo.aid, //当前登录人的id
-          aname: this.userInfo.name,//当前人的姓名
-          status: 1 //状态，直接写1
-        }
-        this.$store.dispatch("userTrigger", event);
-        let $this=this;
-        this.setTimeCase = setTimeout(()=>{
-          event.key = 'ReadCase';
-          event.title = '阅读案例';
-          event.parameters="second:60";
-          event.content = '阅读了案例';
-          $this.$store.dispatch("userTrigger", event);
-        },61000);//1分钟之后发送阅读案例事件
+        key: "ViewCase",//后台的事件key  发布文章且审核通过
+        title: '查看案例',//事件的标题
+        parameters: "",//用户自定义参数 name:value,name:value
+        content: '查看了案例',//事件的内容
+        objId: this.resolveId,//关联的id
+        objType: "3",//关联的类型
+        objInfo: this.caseDetail.title,
+        aid: this.userInfo.aid, //当前登录人的id
+        aname: this.userInfo.name,//当前人的姓名
+        status: 1 //状态，直接写1
+      }
+      this.$store.dispatch("userTrigger", event);
+      let $this = this;
+      this.setTimeCase = setTimeout(() => {
+        event.key = 'ReadCase';
+        event.title = '阅读案例';
+        event.parameters = "second:60";
+        event.content = '阅读了案例';
+        $this.$store.dispatch("userTrigger", event);
+      }, 61000);//1分钟之后发送阅读案例事件
     },
     getCaseData() {
-      let $this=this;
-      apiCase.details(this.resolveId,true).then(res => {
+      let $this = this;
+      apiCase.details(this.resolveId, true).then(res => {
         if (res.status == 200) {
           if (JSON.stringify(res.result) != '{}') {
             this.caseDetail = res.result.case;
             this.caseDetail.majorType = this.caseDetail.majorType.split(",")
             this.getCaseUserDetail();
-            if(this.caseDetail.filePath){
+            if (this.caseDetail.filePath) {
               //this.pdfPath=this.basePath+this.caseDetail.filePath;
               this.createPlayUrl(this.caseDetail.filePath);
               //this.sendEventData();//移到检查之后
-            }else{
-               this.$message.error('内容文件不存在或已被删除，请与管理员联系');
+            } else {
+              this.$message.error('内容文件不存在或已被删除，请与管理员联系');
             }
 
           }
-        }else{
-          this.noData=false;
+        } else {
+          this.noData = false;
           this.$message.error(res.message)
         }
       });
     },
     getCaseUserDetail() {
       apiUser.getByIds([this.caseDetail.authorId]).then(res => {
-        if (res.status == 200 && res.result.length>0) {
+        if (res.status == 200 && res.result.length > 0) {
           this.authorInfo = res.result[0];
 
-          this.authorInfo.orgInfo=cutFullName(this.authorInfo.orgInfo,1);
+          this.authorInfo.orgInfo = cutFullName(this.authorInfo.orgInfo, 1);
 
           this.toUsers = [
-            {name: res.result[0].name,  aid:res.result[0].aid ,sex:res.result[0].sex}
+            { name: res.result[0].name, aid: res.result[0].aid, sex: res.result[0].sex }
           ];
           //console.log(res.result,'res.result');
         }
       });
     },
-    success(value){
-      let content=this.userInfo.name+'评论了我的案例'+'-'+this.caseDetail.title;
-      let query={
-		  refId:this.caseDetail.id,
-		  sendType:1,
-		  title:'系统消息',
-		  refType:3,
-		  source:1,
-		  pageUrl:location.href,
-		  sendAid:this.userInfo.aid,
-		  content:content,
-		  sendName:this.userInfo.name,
-		  accpetId:this.caseDetail.sysCreateAid,
-		  acceptName:this.caseDetail.sysCreateBy,
-		}
-      apiMessage.save(query).then(res=>{
-        if(res.status==200){
+    success(value) {
+      let content = this.userInfo.name + '评论了我的案例' + '-' + this.caseDetail.title;
+      let query = {
+        refId: this.caseDetail.id,
+        sendType: 1,
+        title: '系统消息',
+        refType: 3,
+        source: 1,
+        pageUrl: location.href,
+        sendAid: this.userInfo.aid,
+        content: content,
+        sendName: this.userInfo.name,
+        accpetId: this.caseDetail.sysCreateAid,
+        acceptName: this.caseDetail.sysCreateBy,
+      }
+      apiMessage.save(query).then(res => {
+        if (res.status == 200) {
 
         }
       })
-          // let con=value.sysCreateBy+' 评论了我的文章'+'-'+this.articleDetailData.title;
-          // let query={refId:value.objId,content:con,accpetId:value.sysCreateAid,sendType:1,sendName:'系统',acceptName:'文章',title:'系统消息'}
-          // apiMessage.save(query).then(res=>{
-          //   if(res.status==200){
+      // let con=value.sysCreateBy+' 评论了我的文章'+'-'+this.articleDetailData.title;
+      // let query={refId:value.objId,content:con,accpetId:value.sysCreateAid,sendType:1,sendName:'系统',acceptName:'文章',title:'系统消息'}
+      // apiMessage.save(query).then(res=>{
+      //   if(res.status==200){
 
-          //   }
-          // })
+      //   }
+      // })
     }
   }
 };
 </script>
 
 <style scoped lang="scss">
+.case-banner {
+  height: 240px;
+  background: url('../../../../public/images/case-banner.png');
+}
 
-  .case-banner{
-    height: 240px;
-    background: url('../../../../public/images/case-banner.png');
-  }
-.course-resources{
+.course-resources {
   margin-top: 26px;
-  img{
+
+  img {
     width: 100%;
     height: 100%;
     border-radius: 8px;
   }
 }
-.pdftext{
+
+.pdftext {
+
   // padding: 0 20px;
-  span{
-  font-size: 22px;
-  color: #ccc;
-  font-weight: bold;
-  line-height: 40px;
-  padding: 0 20px;
+  span {
+    font-size: 22px;
+    color: #ccc;
+    font-weight: bold;
+    line-height: 40px;
+    padding: 0 20px;
   }
+
   text-align: center;
 }
-.fixd-box-show{
+
+.fixd-box-show {
   display: none;
 }
+
 ::v-deep .interact-bar .interact-bar-btns {
-  justify-content: flex-start!important;
+  justify-content: flex-start !important;
 
 }
-::v-deep .interact-bar-btn{
-  margin-left:0px!important;
-  margin-right:15px!important;
+
+::v-deep .interact-bar-btn {
+  margin-left: 0px !important;
+  margin-right: 15px !important;
 }
-.postfixt-bot{
+
+.postfixt-bot {
   height: 60px;
   //margin-top: 10px;
   line-height: 60px;
+
   // background-color: #fff;
   // border: 1px solid #eee;
   // z-index: 999;
-  .postfixt-bot-box{
+  .postfixt-bot-box {
 
     // text-align: right;
     background-color: #fff;
     // border: 1px solid #eee;
   }
 }
-.el-card{
-  border:none;
+
+.el-card {
+  border: none;
 }
-.case-summary{
+
+.case-summary {
   font-size: 15px;
   color: #454545;
-  word-break:break-all;
+  word-break: break-all;
   line-height: 25px;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
   padding: 0;
 }
-::v-deep .bacolor:nth-child(odd){
+
+::v-deep .bacolor:nth-child(odd) {
   background-color: #f6f6f6;
   padding: 0 5px;
 }
-::v-deep .bacolor:nth-child(even){
-  background-color:  #fff;
+
+::v-deep .bacolor:nth-child(even) {
+  background-color: #fff;
   padding: 0 5px;
 
 }
+
 .ranking-title {
-    //  line-height: 34px;
-    // font-size: 15px;
-    // color: #333333;
-    .center-titlt{
-      font-size: 15px;
-      color: #333333;
-    }
-    .center{
-      text-align: right;
-    }
-    img{
-      margin-top: 5px;
-    }
+
+  //  line-height: 34px;
+  // font-size: 15px;
+  // color: #333333;
+  .center-titlt {
+    font-size: 15px;
+    color: #333333;
   }
-  ::v-deep .title-line-ellipsis{
+
+  .center {
+    text-align: right;
+  }
+
+  img {
+    margin-top: 5px;
+  }
+}
+
+::v-deep .title-line-ellipsis {
   // width: 100%;
-   display: -webkit-box;
-   overflow: hidden;
-  text-overflow:ellipsis;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 1;
   box-sizing: border-box;
-  word-break:break-all;
+  word-break: break-all;
 }
+
 .nav {
   margin-bottom: 10px;
 }
+
 .detail {
   background-color: #fff;
   padding: 50px;
+
   .title {
     display: flex;
     width: 100%;
-    h5{
+
+    h5 {
       margin: 0;
       font-size: 20px;
       line-height: 45px;
       font-weight: 600;
       flex: 1;
     }
-    span{
+
+    span {
       margin-left: auto;
       line-height: 45px;
       color: #999999;
       font-size: 14px;
     }
   }
+
   .label {
     font-size: 15px;
     color: #999999;
     display: flex;
     justify-content: flex-start;
     align-items: center;
+
     span {
       margin-left: 10px;
+
       &:last-of-type {
         flex: 1;
       }
     }
   }
+
   .type {
     color: #0079fe;
   }
 
 
-  .clearfix:after{
-  content: "020";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
+  .clearfix:after {
+    content: "020";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
   }
+
   .btn-div {
     margin: 0px 0 5px 0;
     padding-bottom: 5px;
-    padding-top:5px;
+    padding-top: 5px;
     height: 100%;
     width: 100%;
+
     .item {
       float: left;
       margin: 7px 10px 0px 0px;
-      background: rgba(44,104,255,0.06);
+      background: rgba(44, 104, 255, 0.06);
       border-radius: 2px;
       padding: 0px 10px;
       line-height: 24px;
@@ -716,58 +811,71 @@ export default {
       box-sizing: border-box;
       color: #2C68FF;
     }
+
     .item-right {
       float: right;
     }
   }
 }
+
 .jianjie {
   // margin: 15px 0;
   margin-top: 30px;
   background-color: #f5f7fa;
   min-height: 300px;
   padding: 0px 0px 0px 0px;
+
   .content {
     padding: 10px 0;
     line-height: 25px;
   }
+
   .btn-div {
     margin: 8px 0;
     padding: 10px 0;
     color: #666;
+
     .item {
       margin-right: 30px;
     }
+
     .item-right {
       float: right;
     }
   }
 }
+
 .bottom-btn {
   padding: 10px 50px;
+
   .article-info-tools-btn {
     padding: 5px 0px;
     margin: 0 10px;
   }
 }
+
 .bottom-div {
   margin-top: 10px;
   background-color: #fff;
   padding: 5px 20px 10px 20px;
+
   .title {
     font-size: 16px;
     font-weight: 600;
     line-height: 50px;
     border-bottom: 1px solid #dfdfdf;
+
     .tip {
       color: #666;
       font-size: 12px;
       margin: 0 10px;
     }
   }
+
   .submit-div {
     margin: 15px 0;
   }
+
   .bottom {
     text-align: right;
   }
@@ -776,42 +884,52 @@ export default {
     margin-top: 10px;
     background-color: #fff;
     padding: 5px 20px 10px 20px;
+
     .data-item {
       border-bottom: 1px solid #dfdfdf;
       margin-top: 10px;
+
       .top {
         font-size: 18px;
         font-weight: 600;
+
         span {
           font-size: 14px;
           color: #666;
           font-weight: normal;
         }
       }
+
       .text {
         margin: 15px 0 5px 0;
         padding-left: 40px;
         line-height: 35px;
       }
+
       .huifu {
         padding-left: 40px;
         padding-bottom: 10px;
         border-bottom: 1px solid #dfdfdf;
       }
+
       .result-div {
         padding-left: 40px;
         padding-top: 10px;
+
         .top {
           font-size: 16px;
         }
       }
+
       .up-div {
         padding: 0 15px;
+
         .up-btn {
           padding: 8px 20px;
           color: #000;
         }
       }
+
       img {
         margin-right: 10px;
         width: 30px;
@@ -822,24 +940,30 @@ export default {
     }
   }
 }
+
 .right-box {
   line-height: 25px;
+
   .ranking-card {
     margin-bottom: 10px;
-    .el-col{
+
+    .el-col {
       margin-bottom: 10px;
     }
-    .center{
+
+    .center {
       text-align: center;
     }
   }
-  .ranking-title {
-  }
-  .aligh-title{
+
+  .ranking-title {}
+
+  .aligh-title {
     font-size: 14px;
     color: #333333;
 
   }
+
   .ranking-data {
     margin: 10px 0;
     color: #999999;
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index af54ade8..63389686 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -5,201 +5,275 @@
     </div>
     <div class="xcontent2">
       <div class="xcontent2-main" style="margin-right: 30px;">
-            <div class="left-div">
-              <div class="search-div">
-                <div class="searchbar" v-if="tagList.length > 0">
-                  <div style="line-height: 30px;">
-                    <span class="item-title">搜索条件</span>
-                    <el-tag closable v-for="(tag, tagIdx) in tagList" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.name }}</el-tag>
-                  </div>
-                </div>
-                <div class="search-item">
-                    <div style="margin-top:10px; display: flex;margin-bottom:24px;">
-                      <div style="line-height: 25px;padding-right: 10px;">
-                        <!-- <img class="orgaicon" :src="`${webBaseUrl}/images/orgaimg.png`" alt=""> -->
-                        <span class="item-title" >组织领域</span>
-                        <span class="item-line"></span>
+        <div class="left-div">
+          <div class="search-div">
+            <div class="searchbar" v-if="tagList.length > 0">
+              <div style="line-height: 30px;">
+                <span class="item-title">搜索条件</span>
+                <el-tag closable v-for="(tag, tagIdx) in tagList" :key="tagIdx" @close="tagsClose(tag, tagIdx)">{{
+                  tag.name
+                }}</el-tag>
+              </div>
+            </div>
+            <div class="search-item">
+              <div style="margin-top:10px; display: flex;margin-bottom:24px;">
+                <div style="flex:1;">
+                  <div class="field">
+                    <div style="line-height: 25px;padding-right: 10px;padding-left: 0;">
+                      <!-- <img class="orgaicon" :src="`${webBaseUrl}/images/orgaimg.png`" alt=""> -->
+                      <span class="item-title">组织领域</span>
+                      <span class="item-line"></span>
+                    </div>
+                    <div style="padding:0;" :class="oneTagAll ? 'fieldactive' : ''" @click="domainall(1)">全部</div>
+                    <div class="fieldbox">
+                      <div :class="item.fielclass ? 'fieldactive' : ''" @click="fieldswich(item, 1)"
+                        v-for="(item, idx) in domain" :key="'a' + idx">
+                        {{ item.name }}
                       </div>
-                      <div style="flex:1;">
-                        <div class="field">
-                           <div style="padding:0;" :class="fielclass ? 'fieldactive' :''  " @click="domainall()">全部</div>
-                            <div class="fieldbox">
-                           <div :class="item.fielclass ? 'fieldactive' :''  " @click="fieldswich(item)" v-for="(item,idx) in domain" :key="'t'+ idx">{{item.name}}</div>
-                            </div>
-                        </div>
-                        <!-- <el-checkbox-group v-model="queryCondition.orgDomain" size="mini" @change="search()">
+                    </div>
+                  </div>
+                  <!-- <el-checkbox-group v-model="queryCondition.orgDomain" size="mini" @change="search()">
                           <el-checkbox-button :label="null">全部</el-checkbox-button>
                           <el-checkbox-button v-for="item in domain" :key="item.code" :label="item.code"> {{ item.name}}</el-checkbox-button>
                         </el-checkbox-group> -->
+
+                  <!-- 二级分类 -->
+                  <div class="field" v-if="twoList.length > 0" style="margin-top: 24px;">
+                    <div style="line-height: 25px;padding-right: 10px;padding-left: 0;">
+                      <span class="item-title">二级分类</span>
+                      <span class="item-line"></span>
+                    </div>
+                    <div style="padding:0;" :class="twoTagAll ? 'fieldactive' : ''" @click="domainall(2)">全部</div>
+                    <div class="fieldbox">
+                      <div :class="item.fielclass ? 'fieldactive' : ''" @click="fieldswich(item, 2)"
+                        v-for="(item, idx) in twoList" :key="'b' + idx">{{ item.name }}</div>
+                    </div>
+                  </div>
+                  <!-- 三级分类 -->
+                  <div class="field" v-if="threeList.length > 0" style="margin-top: 24px;">
+                    <div style="line-height: 25px;padding-right: 10px;padding-left: 0;">
+                      <span class="item-title">三级分类</span>
+                      <span class="item-line"></span>
+                    </div>
+                    <div style="padding:0;" :class="threeTagAll ? 'fieldactive' : ''" @click="domainall(3)">全部</div>
+                    <div class="fieldbox">
+                      <div :class="item.fielclass ? 'fieldactive' : ''" @click="fieldswich(item, 3)"
+                        v-for="(item, idx) in threeList" :key="'c' + idx">{{ item.name }}</div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <!-- 专业分类 -->
+            <div class="search-div-collapse">
+              <div class="search-item">
+                <div style="margin-top:10px; display: flex;">
+                  <div style="line-height: 25px;padding-right: 10px;white-space: nowrap;">
+                    <!-- <img class="orgaicon" :src="`${webBaseUrl}/images/specimg.png`" alt=""> -->
+                    <span class="item-title">专业分类</span>
+                    <span class="item-line"></span>
+                  </div>
+                  <div style="flex:1;" id="searchBox">
+                    <div class="field">
+                      <div style="padding:0;" :class="speciAll ? 'fieldactive' : ''" @click="majorall()">全部</div>
+                      <div class="fieldbox">
+                        <div :class="item.fielclass ? 'fieldactive' : ''" @click="fieldmajor(item)"
+                          v-for="(item, idx) in speciData" :key="'d' + idx">{{ item.name }}({{ item.explanation }})</div>
                       </div>
                     </div>
-                </div>
-                <div class="search-div-collapse">
-                  <div class="search-item">
-
-                      <div style="margin-top:10px; display: flex;">
-                        <div style="line-height: 25px;padding-right: 10px;white-space: nowrap;">
-                           <!-- <img class="orgaicon" :src="`${webBaseUrl}/images/specimg.png`" alt=""> -->
-                      <span class="item-title" >专业分类</span>
-                      <span class="item-line"></span>
-                       </div>
-                       <div style="flex:1;" id="searchBox">
-                         <div class="field">
-                           <div style="padding:0;" :class="fielclassjor ? 'fieldactive' :''  " @click="majorall()">全部</div>
-                           <div class="fieldbox">
-                              <div :class="item.fielclass ? 'fieldactive' :''  " @click="fieldmajor(item)" v-for="(item,idx) in speciData" :key="'d'+idx">{{item.name}}({{item.explanation}})</div>
-                            </div>
-
-                        </div>
-                          <!-- <el-radio-group style="display:flex;" v-model="queryCondition.majorType" size="mini" @change="search()">
+                    <!-- <el-radio-group style="display:flex;" v-model="queryCondition.majorType" size="mini" @change="search()">
                             <el-radio-button :label="null">全部</el-radio-button>
                             <div>
                               <el-radio-button v-for="item in speciData" :key="item.code" :label="item.code" > {{ item.name }} </el-radio-button>
                             </div>
                           </el-radio-group> -->
-                       </div>
-                      </div>
-
                   </div>
                 </div>
-                <div class="searBox" v-if="searchwd">
-                   <el-button type="text"  id="closeSearchBtn" @click="closeSearch">
-                        {{word}}
-                       <i :class="showAll ? 'el-icon-arrow-up ': 'el-icon-arrow-down'"></i>
-                  </el-button>
-                </div>
-              </div>
-              <div style="height:30px;background-color:#f6f7fc;"></div>
-              <div class="order-div"  style="border-bottom:none">
-                <span class="quyer-tag">
-                  <el-button type="text" class="order-class" @click="searchData('views')" :class="{ actice: queryCondition.orderField == 'views' }">最热</el-button>
-                  <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最新</el-button>
-                  <el-button type="text" class="order-class" @click="searchexcellent()" :class="{ actice: queryCondition.orderField =='excellentTime' }">优秀案例</el-button>
 
-                  <!-- <el-button type="text" class="order-class" @click="queryCondition.breCommend = queryCondition.breCommend == ture ? true : null" :class="{ actice: queryCondition.breCommend == true }">组织推荐</el-button> -->
-                </span>
-              </div>
-              <div class="data-content">
-                <div v-for="item in caseList.list" :key="item.id" class="case-list">
-                  <div class="case-info">
-                    <div class="case-info-cont">
-                        <router-link :to="'/case/detail?id='+item.id">
-                      <div class="case-info-title">
-                      <div class="case-titdiv">
-                          <span class="case-tittext" v-html="item.title"></span>
-                          <div class="case-info-date portal-time">
-                            <i class="el-icon-time"></i>
-                            <time-show :time="item.sysCreateTime"></time-show>
-                          </div>
-                      </div>
-                    </div>
-                    </router-link>
-                      <div style="height:58px;padding-top:14px ">
-                        <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo"  :sex="item.authorInfo.sex" :aid="item.authorInfo.aid"></author>
-                      </div>
-                       <router-link :to="'/case/detail?id='+item.id">
-                      <div class="keyword-text clearfix">
-                        <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomainParent">{{orgDomainTranslate(item.orgDomainParent) }}</div>
-                        <!-- <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div> -->
-                        <div style="color:#2974D6;font-weight: 450;"  v-for="(item,idx) in item.majorType" :key="idx" >{{ majorTypeTranslate(item) }}</div>
-                        <div v-if="item.keyword1">{{ item.keyword1 }}</div>
-                        <div v-if="item.keyword2">{{ item.keyword2 }}</div>
-                        <div v-if="item.keyword3">{{ item.keyword3 }}</div>
-                        <div v-if="item.keyword4">{{ item.keyword4 }}</div>
-                        <div v-if="item.keyword5">{{ item.keyword5 }}</div>
-                      </div>
-                    </router-link>
-                      <div class="case-info-summary two-line-ellipsis" @click="jumcasedet(item)">
-                        {{ item.summary }}
-                        <!-- <router-link :to="'/case/detail?id='+item.id"> -->
-                            <!-- {{displayAll(item)}} -->
-                        <!-- </router-link> -->
-                            <!-- <span style="color:#588afc;cursor:pointer;" v-if="item.summary.length>150" @click.stop="changeIsAll(item)"> -->
-                                <!-- {{item.isAll?'收起':'展开'}} -->
-                            <!-- </span> -->
-                      </div>
-                      <div style="display: flex;justify-content: flex-end;">
-                       <div style="margin:8px 0;">
-                          <interactBar :type="3"  :data="item" :comments="false" :shares="true" ></interactBar> </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="pagination-div">
-                <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
-                <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-                  <span class="notcoures" v-else-if="caseList.list.length == 0">
-                      <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
-                  <h5>暂无案例，请优先学习其它案例吧～</h5>
-                  </span>
-                <!-- <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span> -->
-              </div>
-              <div v-if="isSeach" style="height:382px">
               </div>
             </div>
+            <div class="searBox" v-if="searchwd">
+              <el-button type="text" id="closeSearchBtn" @click="closeSearch">
+                {{ word }}
+                <i :class="showAll ? 'el-icon-arrow-up ' : 'el-icon-arrow-down'"></i>
+              </el-button>
+            </div>
+          </div>
+          <div style="height:30px;background-color:#f6f7fc;"></div>
+          <div class="order-div" style="border-bottom:none">
+            <span class="quyer-tag">
+              <el-button type="text" class="order-class" @click="searchexcellent('excellent')"
+                :class="{ actice: queryCondition.type == 'excellent' }">最佳案例</el-button>
+              <el-button type="text" class="order-class" @click="searchexcellent('recommend')"
+                :class="{ actice: queryCondition.type == 'recommend' }">推荐案例</el-button>
+              <el-button type="text" class="order-class" @click="searchexcellent('hot')"
+                :class="{ actice: queryCondition.type == 'hot' }">最热</el-button>
+              <el-button type="text" class="order-class" @click="searchexcellent('new')"
+                :class="{ actice: queryCondition.type == 'new' }">最新</el-button>
+            </span>
+            <div style="flex: 1; display: flex; justify-content: flex-end;align-items: center;">
+              <div style="margin-right: 20px;color: #6E7B84;font-size: 14px;">当前已检索 <span style="color:#387DF7;">
+                  {{ caseList.count }}</span> 条数据</div>
+              <el-select v-model="years" multiple collapse-tags
+                style="margin-left: 20px; width: 147px; border-radius:20px !important;" placeholder="全部年份">
+                <el-option v-for="item in allYears" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+          <div class="data-content">
+            <div v-for="item in caseList.list" :key="item.id" class="case-list">
+              <div class="case-info">
+                <div class="case-info-cont">
+                  <!-- <router-link :to="'/case/detail?id=' + item.id"> -->
+                  <div @click="toCaseDetail(item.id, item.refId)" style="cursor: pointer;">
+                    <div class="case-info-title">
+                      <div class="case-titdiv">
+                        <div class="case-tittext">
+                          <span class="title-line-ellipsis" v-html="item.title"></span>
+                        </div>
+                        <div class="case-activeText">
+                          <span v-if="item.breCommend" class="comWords"
+                            style="background-color:rgba(232, 139, 72);">荐</span>
+                          <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span>
+                        </div>
+                        <div class="case-info-date portal-time">
+                          <i class="el-icon-time"></i>
+                          <time-show :time="item.sysCreateTime"></time-show>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <!-- </router-link> -->
+                  <div style="height:58px;padding-top:14px ">
+                    <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo"
+                      :sex="item.authorInfo.sex" :aid="item.authorInfo.aid">
+                      <template>
+                        <div v-if="item.breCommend"
+                          style="padding-top: 6px;flex: 1;display: flex;justify-content: flex-end;color: #999;font-size: 12px;">
+                          <span>{{ item.recommendOrgName }}推荐</span>
+                        </div>
+                      </template>
+                    </author>
+                  </div>
+                  <!-- <router-link :to="'/case/detail?id=' + item.id"> -->
+                  <div @click="toCaseDetail(item.id, item.refId)" style="cursor: pointer;">
+                    <div class="keyword-text clearfix">
+                      <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomainParent">
+                        {{ orgDomainTranslate(item.orgDomainParent) }}
+                      </div>
+                      <!-- <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div> -->
+                      <div style="color:#2974D6;font-weight: 450;" v-for="(item, idx) in item.majorType" :key="idx">
+                        {{ majorTypeTranslate(item) }}
+                      </div>
+                      <div v-if="item.keyword1">{{ item.keyword1 }}</div>
+                      <div v-if="item.keyword2">{{ item.keyword2 }}</div>
+                      <div v-if="item.keyword3">{{ item.keyword3 }}</div>
+                      <div v-if="item.keyword4">{{ item.keyword4 }}</div>
+                      <div v-if="item.keyword5">{{ item.keyword5 }}</div>
+                    </div>
+                  </div>
+                  <!-- </router-link> -->
+                  <div class="case-info-summary two-line-ellipsis" @click="toCaseDetail(item.id, item.refId)">
+                    {{ item.summary }}
+                    <!-- <router-link :to="'/case/detail?id='+item.id"> -->
+                    <!-- {{displayAll(item)}} -->
+                    <!-- </router-link> -->
+                    <!-- <span style="color:#588afc;cursor:pointer;" v-if="item.summary.length>150" @click.stop="changeIsAll(item)"> -->
+                    <!-- {{item.isAll?'收起':'展开'}} -->
+                    <!-- </span> -->
+                  </div>
+                  <div style="display: flex;justify-content: flex-end;">
+                    <div style="margin:8px 0;">
+                      <interactBar :type="3" :data="item" :comments="false" :shares="true"></interactBar>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div v-if="caseList.showPagCount > queryCondition.pageSize">
+              <pagination :size="queryCondition.pageSize" :total="caseList.count" :page="queryCondition.pageIndex"
+                layout="total, prev, pager, next, jumper" @change-page="currentChange"></pagination>
+            </div>
+          </div>
+          <div class="pagination-div">
+            <!-- <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
+            <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
+            <span class="pag-text-msg" v-else-if="moreState == 3">没有更多数据了</span> -->
+            <span class="notcoures" v-if="caseList.list.length == 0">
+              <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
+              <h5>暂无案例，请优先学习其它案例吧～</h5>
+            </span>
+            <!-- <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span> -->
+          </div>
+          <div v-if="isSeach" style="height:382px">
+          </div>
+        </div>
 
       </div>
       <div class="xcontent2-minor">
-           <div id="fixd-box">
-              <div class="portal-ranking ranking-bg">
-                <p class="ranking-title">好评榜</p>
-                <ul class="ranking-data">
-                  <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;">
-                        <router-link :to="'/case/detail?id='+item.id">
-                        <span class="portal-right-text blue-one" v-if="index==0">
-                          <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
-                        </span>
-                        <span class="portal-right-text blue-tow" v-if="index==1">
-                            <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
-                        </span>
-                        <span class="portal-right-text blue-three" v-if="index==2">
-                            <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
-                        </span>
-                        <span class="portal-right-text" v-if="index==3">
-                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
-                        </span>
-                         <span class="portal-right-text" v-if="index==4">
-                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
-                        </span>
-                        <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
-                         </router-link>
-                   </li>
-                </ul>
-              </div>
-              <div class="portal-ranking ranking-bg1" style="margin-top:26px" >
-                <p class="ranking-title">人气榜</p>
-                <ul class="ranking-data">
-                    <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;">
-                        <router-link :to="'/case/detail?id='+item.id">
-                        <span class="portal-right-text orange-one" v-if="index==0">
-                          <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
-                        </span>
-                        <span class="portal-right-text orange-tow" v-if="index==1">
-                            <img :src="`${webBaseUrl}/images/list02.png`" alt="">
-                        </span>
-                        <span class="portal-right-text orange-three" v-if="index==2">
-                            <img :src="`${webBaseUrl}/images/list03.png`" alt="">
-                        </span>
-                        <span class="portal-right-text" v-if="index==3">
-                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
-                        </span>
-                         <span class="portal-right-text" v-if="index==4">
-                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
-                        </span>
-                        <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
-                        </router-link>
-                   </li>
-                </ul>
-              </div>
-               <!-- <div class="course-resources pointer"> -->
-                <!-- 资源位 -->
-                <!-- <img  @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
-              <!-- </div> -->
-           </div>
+        <div id="fixd-box">
+          <div class="portal-ranking ranking-bg">
+            <p class="ranking-title">好评榜</p>
+            <ul class="ranking-data">
+              <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis"
+                style="cursor: pointer;margin-top:30px;line-height: 22px;">
+                <router-link :to="'/case/detail?id=' + item.id">
+                  <span class="portal-right-text blue-one" v-if="index == 0">
+                    <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
+                  </span>
+                  <span class="portal-right-text blue-tow" v-if="index == 1">
+                    <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
+                  </span>
+                  <span class="portal-right-text blue-three" v-if="index == 2">
+                    <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
+                  </span>
+                  <span class="portal-right-text" v-if="index == 3">
+                    <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                  </span>
+                  <span class="portal-right-text" v-if="index == 4">
+                    <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                  </span>
+                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                </router-link>
+              </li>
+            </ul>
+          </div>
+          <div class="portal-ranking ranking-bg1" style="margin-top:26px">
+            <p class="ranking-title">人气榜</p>
+            <ul class="ranking-data">
+              <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis"
+                style="cursor: pointer;margin-top:30px;line-height: 22px;">
+                <router-link :to="'/case/detail?id=' + item.id">
+                  <span class="portal-right-text orange-one" v-if="index == 0">
+                    <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
+                  </span>
+                  <span class="portal-right-text orange-tow" v-if="index == 1">
+                    <img :src="`${webBaseUrl}/images/list02.png`" alt="">
+                  </span>
+                  <span class="portal-right-text orange-three" v-if="index == 2">
+                    <img :src="`${webBaseUrl}/images/list03.png`" alt="">
+                  </span>
+                  <span class="portal-right-text" v-if="index == 3">
+                    <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                  </span>
+                  <span class="portal-right-text" v-if="index == 4">
+                    <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                  </span>
+                  <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                </router-link>
+              </li>
+            </ul>
+          </div>
+          <!-- <div class="course-resources pointer"> -->
+          <!-- 资源位 -->
+          <!-- <img  @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
+          <!-- </div> -->
+        </div>
       </div>
       <div style="height: 50px;"></div>
-      <el-dialog class="protocol" :close-on-click-modal="false" :visible.sync="protocolDialogVisible" width="30%" :show-close="false">
+      <el-dialog class="protocol" :close-on-click-modal="false" :visible.sync="protocolDialogVisible" width="30%"
+        :show-close="false">
         <div class="protocol-title">案例查阅及使用用户协议</div>
         <div class="protocol-content">
           &emsp;&emsp;本专区内案例为BOE各组织沉淀的通用案例、 组织案例、卓越绩效案例、管理案例、 职级晋升案例、企业文化案例等。 案例内容记录作者亲历的、真实的、已完成的、
@@ -208,15 +282,16 @@
         <span slot="footer" class="dialog-footer">
           <el-checkbox label="我已阅读并同意。" @change="protocolCheck" style="float: left"></el-checkbox>
           <el-tooltip :disabled="!protocolConfirmButton" effect="light" content="请先勾选‘我已阅读并同意。’" placement="bottom">
-            <span><el-button type="primary" :disabled="protocolConfirmButton" @click="protocolConfirm">确 定</el-button></span>
+            <span><el-button type="primary" :disabled="protocolConfirmButton" @click="protocolConfirm">确
+                定</el-button></span>
           </el-tooltip>
         </span>
       </el-dialog>
     </div>
     <portal-footer></portal-footer>
     <portalFloatTools></portalFloatTools>
-     <!-- U课堂弹窗 -->
-     <div class="u-class">
+    <!-- U课堂弹窗 -->
+    <div class="u-class">
       <el-dialog :visible.sync="showUClass" width="833px">
         <div class="ClassBoxContent">
           <img src="../../../assets/images/u_class.png" alt="" class="img" />
@@ -232,11 +307,7 @@
             <div class="right">
               <div class="tyl" @click="tylClick">
                 <div class="tyl_title">
-                  <img
-                    src="../../../assets/images/dc.png"
-                    alt=""
-                    class="tyl_title_img"
-                  />
+                  <img src="../../../assets/images/dc.png" alt="" class="tyl_title_img" />
                   <span class="tyl_title_msg">通用力专区</span>
                 </div>
                 <div class="tyl_jy">加厚职业素养，轻学习、快成长！</div>
@@ -246,11 +317,7 @@
               </div>
               <div class="cyl" @click="cylClick">
                 <div class="tyl_title">
-                  <img
-                    src="../../../assets/images/cyl.png"
-                    alt=""
-                    class="tyl_title_img"
-                  />
+                  <img src="../../../assets/images/cyl.png" alt="" class="tyl_title_img" />
                   <span class="tyl_title_msg">创新力专区</span>
                 </div>
                 <div class="tyl_jy">激发创新潜力，拓视野、促思考！</div>
@@ -279,7 +346,8 @@ import apiUser from "@/api/system/user.js";
 import apiSearchterm from "@/api/modules/searchterm.js";
 import { deepClone } from "../../../utils";
 import apiDict from "@/api/modules/dict.js";
-import {cutFullName} from "@/utils/tools.js";
+import apiType from "@/api/modules/type.js";
+import { cutFullName } from "@/utils/tools.js";
 import apiPlace from "@/api/phase2/place.js"
 export default {
   name: "index",
@@ -293,38 +361,52 @@ export default {
   },
   data() {
     return {
+      refId: '',//消息跳转案例的id
+      selectList: [],//点击选中的list
+      twoList: [], //二级分类{type:12}
+      threeList: [],//三级分类{type:13}
       showUClass: false,
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
-      resonimg:{},
+      resonimg: {},
       domain: [],//组织领域
-      domainAll:[],//全部的组织领域
-      speciData:[],//专业分类
+      domainAll: [],//全部的组织领域
+      speciData: [],//专业分类
       moreState: 1, // 1 加载更多 2 加载中 3无数据
       isSeach: false,
       searchwd: false,
       showAll: true, //是否展开全部
-      initHeight:40,//原始 高度
+      initHeight: 40,//原始 高度
       searchRecords: [],//热门搜索词
       caseList: {
         count: 0,
-        list: []
+        list: [],
+        showPagCount: 0
       },
       ankingList: [],//排行数据1
       Popularity: [],//排行数据2
       Positive: [],//排行数据3
       protocolDialogVisible: false,
       protocolConfirmButton: true,
+      years: [new Date().getFullYear().toString()],
       queryCondition: {
         pageIndex: 1,
-        pageSize: 10,
-        isTop: true,
-        orderField: "views",
-        // breCommend:null,
-        keyWord: "",
-        majorType:'', //专业分类
-        orgDomain: '', // 组织领域
+        pageSize: 5,
+        // orderField: "excellent",
+        majorType: '', //专业分类code
         orderAsc: false,
-        excellent:false
+        // isTop: true,
+        excellent: true,
+        keyWord: '',
+        orgDomainDtos: [],
+        caseType: '',
+        authorName: '',
+        notInIds: [],
+        type: 'excellent',
+        userId: '',
+        parent: '',
+        children: [],
+        name: '',
+        years: []
       },
       keyWord: "",
       anking: 2,
@@ -333,14 +415,18 @@ export default {
       type2: 0,
       type3: 0,
       isFind: false,
-      fielclass:true,
-      fielclassjor:true,
-      localSessionKey:this.$xpage.constants.localCaseFiltersKey
+      fielclassjor: true,
+      localSessionKey: this.$xpage.constants.localCaseFiltersKey
     };
   },
+  watch: {
+    years() {
+      this.search(true)
+    }
+  },
   computed: {
     ...mapGetters(["userInfo", "portalCase"]),
-    word: function() {
+    word: function () {
       if (this.showAll == false) {
         //对文字进行处理
         return "展开";
@@ -355,59 +441,109 @@ export default {
       }
       return isOk;
     },
-    tagList(){ //列表属性，用于计算
-        let list=[];
-        if(this.keyWord){
-          list.push({type:'0',  code:'keyword', name:this.keyWord, checked:true})
+    tagList() { //列表属性，用于计算
+      let list = [];
+      if (this.keyWord) {
+        list.push({ type: '0', code: 'keyword', name: this.keyWord, checked: true })
+      }
+      this.domain.forEach(one => {
+        var twoChildChecked = false;//是否有下级
+        one.list.forEach(two => {
+          if (two.fielclass) {
+            twoChildChecked = true;
+          }
+          var threeChildChecked = false;
+          two.list.forEach(three => {
+            if (three.fielclass) {
+              list.push(three);
+              threeChildChecked = true;
+            }
+          });
+          if (two.fielclass && !threeChildChecked) {
+            list.push(two);
+          }
+        });
+        if (one.fielclass && !twoChildChecked) {
+          list.push(one);
         }
-        this.domain.forEach(item=>{
-          if(item.fielclass){
-            list.push(item);
-          }
-        });
-        this.speciData.forEach(item=>{
-          if(item.fielclass){
-            list.push(item);
-          }
-        });
-        return list;
+      })
+      this.speciData.forEach(item => {
+        if (item.fielclass) {
+          list.push(item);
+        }
+      });
+      return list;
+    },
+    allYears() {
+      let nowYear = new Date().getFullYear()
+      return Array.from({ length: 10 }, (_, i) => ({
+        value: (nowYear - i).toString(),
+        label: (nowYear - i).toString(),
+      }));
+    },
+    oneTagAll() {
+      return !this.domain.some(item => item.fielclass);
+    },
+    twoTagAll() {
+      return !this.twoList.some(item => item.fielclass)
+    },
+    threeTagAll() {
+      return !this.threeList.some(item => item.fielclass);
+    },
+    speciAll() {
+      return !this.speciData.some(item => item.fielclass);
     }
   },
   mounted() {
-    let $this=this;
+    let $this = this;
     // if(this.speciData.length==0){
     //   this.specialized();
     // }
     // if(this.domain.length==0){
     //   this.getdomain();
     // }
-    let isBack=false;
-    if(window.history && window.history.pushState) {
-        history.pushState(null, null, document.URL); //这里有没有都无所谓，最好是有以防万一
-        isBack=true;
+    let isBack = false;
+    if (window.history && window.history.pushState) {
+      history.pushState(null, null, document.URL); //这里有没有都无所谓，最好是有以防万一
+      isBack = true;
     }
-    console.log(isBack,'isBack');
-    Promise.all([apiDict.items("org_domain"),apiCase.majorTypes()]).then(rs=>{
-        if(rs[0].status==200){
-            rs[0].result.forEach(item =>{
-              item.fielclass = false;
-              item.type='org_domain';
+    console.log(isBack, 'isBack');
+    // Promise.all([apiType.items("org_domain"), apiCase.majorTypes()]).then(rs => {
+    Promise.all([apiType.treeList(1,90,1), apiCase.majorTypes()]).then(rs => {
+      if (rs[0].code == 200) {
+        const {records} = rs[0].data
+        records.forEach(item => {
+          item.fielclass = false;
+          item.type = 'org_domain';
+          item.list = item.children ? item.children : []
+          if (Array.isArray(item.children)) {
+            item.list.forEach(sub => {
+              sub.list = sub.children ? sub.children : []
+              sub.fielclass = false
+              if (Array.isArray(sub.children)) {
+                sub.list.forEach(three => {
+                  three.list = three.children ? three.children : []
+                  three.fielclass = false
+                })
+              }
             })
-            this.domain = rs[0].result;
-        }
-        if(rs[1].status==200){
-          rs[1].result.forEach(item =>{
-            item.fielclass = false;
-            item.type='major_type';
-          })
-          this.speciData = rs[1].result;
-        }
-        this.loadLocalFilters();
-        this.$nextTick(function() {
-          $this.initHeight = document.getElementById("searchBox").offsetHeight;
-          $this.closeSearch();
-        });
-        this.search();
+          }
+        })
+        this.domain = records;
+      }
+      if (rs[1].status == 200) {
+        rs[1].result.forEach(item => {
+          item.fielclass = false;
+          item.type = 'major_type';
+        })
+        this.speciData = rs[1].result;
+      }
+      this.loadLocalFilters();
+      this.$nextTick(function () {
+        $this.initHeight = document.getElementById("searchBox").offsetHeight;
+        $this.closeSearch();
+      });
+      this.search();
     });
 
     if (!this.portalCase.readProtocol) {
@@ -417,18 +553,32 @@ export default {
     if (this.keyWord != "") {
       this.isSeach = true;
     }
+    // 从消息多个案例跳转到本页面
+    this.refId = this.$route.query.recommendId;
+    if (this.refId) {
+      this.queryCondition.type = 'recommend'
+    }
     this.getAnkingData();
     this.getPopularity();
     this.searchterm();
     this.getPositive();
     this.couresreso();
-    window.addEventListener("scroll", this.handleScroll);
+    // window.addEventListener("scroll", this.handleScroll);
 
   },
   beforeDestroy() {
-    window.removeEventListener("scroll", this.handleScroll);
+    // window.removeEventListener("scroll", this.handleScroll);
+    console.log('销毁了');
+
   },
   methods: {
+    // 查看率的时间
+    toCaseDetail(id, refId) {
+      if (refId) {
+        apiCase.startReadTimer(refId)
+      }
+      this.$router.push({ path: '/case/detail', query: { id } });
+    },
     tylClick() {
       window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130");
     },
@@ -440,122 +590,183 @@ export default {
         this.showUClass = flag;
       }
     },
-    saveLocalFilters(){
-        let typeCodeList=[];
-        this.tagList.forEach(item=>{
-          typeCodeList.push({
-            type:item.type,
-            code:item.code,
-            name:item.name
-          })
-        });
-        let typeCodeString=JSON.stringify(typeCodeList);
-        sessionStorage.setItem(this.localSessionKey,typeCodeString);
+    saveLocalFilters() {
+      let typeCodeList = [];
+      this.tagList.forEach(item => {
+        typeCodeList.push({
+          type: item.type,
+          code: item.code,
+          name: item.name
+        })
+      });
+      let typeCodeString = JSON.stringify(typeCodeList);
+      sessionStorage.setItem(this.localSessionKey, typeCodeString);
     },
-    loadLocalFilters(t){
-       let hasData=sessionStorage.getItem(this.localSessionKey);
-       if(hasData){
-         let typeCodeList=JSON.parse(hasData);
-         typeCodeList.forEach(item=>{
-            if(item.type=='0'){
-               this.keyWord=item.name;
-            }else if(item.type=='major_type'){
-                 this.speciData.some(m=>{
-                    if(m.code==item.code){
-                      m.fielclass=true;
-                      return true;
-                    }
-                    return false;
-                 })
+    loadLocalFilters(t) {
+      let hasData = sessionStorage.getItem(this.localSessionKey);
+      if (hasData) {
+        let typeCodeList = JSON.parse(hasData);
+        typeCodeList.forEach(item => {
+          if (item.type == '0') {
+            this.keyWord = item.name;
+          } else if (item.type == 'major_type') {
+            this.speciData.some(m => {
+              if (m.code == item.code) {
+                m.fielclass = true;
+                return true;
+              }
+              return false;
+            })
 
-            }else if(item.type=='org_domain'){
-                 this.domain.some(m=>{
-                    if(m.code==item.code){
-                      m.fielclass=true;
-                      return true;
-                    }
-                    return false;
-                 })
+          } else if (item.type == 'org_domain') {
+            this.domain.some(m => {
+              if (m.code == item.code) {
+                m.fielclass = true;
+                return true;
+              }
+              return false;
+            })
 
-            }
-         })
-       }
+          }
+        })
+      }
     },
-    majorall(){
+    majorall() {
       this.queryCondition.majorType = '';
-      this.fielclassjor=true;
-      this.speciData.forEach(item=>{
+      this.speciData.forEach(item => {
         item.fielclass = false;
       })
-      this.search();
+      this.search(true);
     },
-    domainall(){
-
-       this.queryCondition.orgDomain = '';
-       this.domain.forEach(item=>{
-         item.fielclass = false;
-       })
-       this.fielclass=true;
-      this.search();
+    // 组织领域全部
+    domainall(type) {
+      console.log(this.selectList, 999);
+      if (type == 1) {
+        // 清空一下所有的
+        this.domain.forEach(item => {
+          item.fielclass = false;
+          item?.list?.forEach(sub => {
+            sub.fielclass = false;
+            sub?.list.forEach(subsub => {
+              subsub.fielclass = false;
+            })
+          })
+        })
+        this.twoList = [];
+        this.threeList = [];
+      } else if (type == 2) {
+        this.twoList.forEach(item => {
+          item.fielclass = false;
+        })
+        // 清空当前元素的三级的
+        this.domain.forEach(item => {
+          if (this.selectList.code == item.code) {
+            item?.list?.forEach(sub => {
+              sub?.list?.forEach(three => {
+                three.fielclass = false
+              });
+            })
+          }
+        })
+        this.threeList = [];
+      } else if (type == 3) {
+        this.threeList.forEach(item => {
+          item.fielclass = false;
+        })
+      }
+      this.search(true);
     },
-    fieldmajor(item){//专业分类
-      this.fielclassjor = false;
+    fieldmajor(item) {//专业分类
       item.fielclass = !item.fielclass;
-      this.search();
+      this.search(true);
     },
-    fieldswich(item){//组织领域
-      this.fielclass=false;
+    //组织领域
+    fieldswich(item, level) {
       item.fielclass = !item.fielclass;
-      this.search();
-    },
+      // 清空下边的为false的时候
+      if (!item.fielclass) {
+        if (Array.isArray(item.list)) {
+          item.list.forEach(subItem => {
+            subItem.fielclass = false;
+            if (subItem.list) {
+              subItem.list.forEach(sub => {
+                sub.fielclass = false;
+              })
+            }
+          });
+        }
+        if (level == 1) {
+          this.twoList = [];
+          this.threeList = [];
+        }
+        if (level == 2) {
+          this.threeList = [];
+        }
+        this.search(true);
+        return;
+      }
 
+      if (level === 1) {
+        this.twoList = [];
+        this.threeList = [];
+        this.twoList.push(...item.list);
+        // 全选根据他判断清楚三级
+        this.selectList = item
+      } else if (level === 2) {
+        this.threeList = [];
+        this.threeList.push(...item.list);
+      } else if (level === 3) {
+      }
+
+      this.search(true);
+    },
     banJump() {
-      if(this.resonimg.JumpUrl) {
+      if (this.resonimg.JumpUrl) {
         window.open(this.resonimg.JumpUrl);
       }
     },
-    couresreso(){
+    couresreso() {
       let key = 'case';
-      apiPlace.detail(key).then(res=>{
-        let lmj =  JSON.parse(res.result.content)
+      apiPlace.detail(key).then(res => {
+        let lmj = JSON.parse(res.result.content)
         this.resonimg = lmj[0]
       })
     },
-    specialized(){
-      let $this=this;
-      apiCase.majorTypes().then(res =>{
-        if(res.status == 200){
-          if (res.status == 200){
-            res.result.forEach(item =>{
+    specialized() {
+      let $this = this;
+      apiCase.majorTypes().then(res => {
+        if (res.status == 200) {
+          if (res.status == 200) {
+            res.result.forEach(item => {
               item.fielclass = false;
-              item.type='major_type';
+              item.type = 'major_type';
             })
           }
           this.speciData = res.result;
           this.loadLocalFilters(1);
           //this.Profess=res.result;
-          this.$nextTick(function() {
+          this.$nextTick(function () {
             $this.initHeight = document.getElementById("searchBox").offsetHeight;
             $this.closeSearch();
           });
         }
       })
     },
-    jumcasedet(item) {
-        this.$router.push({path:'/case/detail',query:{id:item.id}});
-    },
-    debounce(func, wait) {
-      // 非立即执行
-      let timeout;
-      return function() {
-        let context = this;
-        let args = arguments;
-        if (timeout) clearTimeout(timeout);
-        timeout = setTimeout(() => {
-          func.apply(context, args);
-        }, wait);
-      };
-    },
+    // jumcasedet(item) {
+    //   this.$router.push({ path: '/case/detail', query: { id: item.id } });
+    // },
+    // debounce(func, wait) {
+    //   // 非立即执行
+    //   let timeout;
+    //   return function () {
+    //     let context = this;
+    //     let args = arguments;
+    //     if (timeout) clearTimeout(timeout);
+    //     timeout = setTimeout(() => {
+    //       func.apply(context, args);
+    //     }, wait);
+    //   };
+    // },
     //展示全部
     displayAll(item) {
       if (!item.isAll && item.summary && item.summary.length > 150) {
@@ -570,14 +781,14 @@ export default {
       this.showAll = !this.showAll;
       var searchBoxHeght = document.getElementById("searchBox");
       //console.log(this.initHeight,'this.initHeight');
-      if(this.initHeight>100){
+      if (this.initHeight > 100) {
         this.searchwd = true;
       }
       //console.log(het,'het');
-      if(this.showAll){
+      if (this.showAll) {
         //searchBoxHeght.style.height = "auto";
         searchBoxHeght.style.maxHeight = this.initHeight + "px";
-      }else{
+      } else {
         searchBoxHeght.style.maxHeight = 70 + "px";
       }
     },
@@ -588,14 +799,14 @@ export default {
         }
       });
     },
-    getPopularity() {
-      apiCase.queryPraises(5).then(res => {
-        if (res.status == 200) {
-          this.Popularity = res.result;
-          // console.log(this.Popularity)
-        }
-      });
-    },
+    // getPopularity() {
+    //   apiCase.queryPraises(5).then(res => {
+    //     if (res.status == 200) {
+    //       this.Popularity = res.result;
+    //       // console.log(this.Popularity)
+    //     }
+    //   });
+    // },
     getPositive() {
       apiCase.queryComments(5).then(res => {
         if (res.status == 200) {
@@ -604,13 +815,14 @@ export default {
         }
       });
     },
+    // 无用
     async getdomain() {
       let key = "org_domain";
       await apiDict.items("org_domain").then(res => {
         if (res.status == 200) {
-          res.result.forEach(item =>{
+          res.result.forEach(item => {
             item.fielclass = false;
-            item.type=key;
+            item.type = key;
           })
           this.domain = res.result;
           this.loadLocalFilters(2);
@@ -640,25 +852,25 @@ export default {
     //    }
     //  })
     // },
-    orgDomainTranslate(code){ // 组织领域翻译
-      if(code == '') {
-       return
+    orgDomainTranslate(code) { // 组织领域翻译
+      if (code == '') {
+        return
       }
       //console.log(code,'code')
       //console.log(this.domain,'this.domain')
-     let name = '';
+      let name = '';
       let data = this.domain.find(item => {
-          return item.code == code;
+        return item.code == code;
       });
-      if(data){
+      if (data) {
         name = data.name;
       }
       return name;
     },
-    majorTypeTranslate(code){ // 专业分类翻译
+    majorTypeTranslate(code) { // 专业分类翻译
       let name = '';
       let data = this.speciData.find(item => item.code == code);
-      if(data){
+      if (data) {
         name = data.name;
       }
       return name;
@@ -666,43 +878,43 @@ export default {
     emitInput(val) {
       this.keyWord = val;
       this.isSeach = true;
-      this.queryCondition.pageIndex = 1;
-      this.search();
+      this.search(true);
     },
-    searchexcellent(){
-        //this.queryCondition.excellent =true;
-        this.queryCondition.orderField='excellentTime';
-        this.search();
-        //this.getCaseData();
-    },
-    searchData(num) {
-      // if(num == 1){
-        // this.queryCondition.excellent = !this.queryCondition.excellent;
-        // this.getCaseData();
-      // }
-      this.queryCondition.pageIndex = 1;
-      this.queryCondition.orderField = num;
-      this.getCaseData();
-    },
-    handleScroll() {
-      let innerw = document.querySelector("#fixd-box");
-      let innerHeight = document.querySelector("#case-list-content")
-        .clientHeight;
-      let outerHeight = document.documentElement.clientHeight;
-      let outerWidth = innerw.clientWidth;
-      let scrollTop = document.documentElement.scrollTop;
-      if (outerHeight + scrollTop + 350 >= innerHeight) {
-        if (this.moreState == 1) {
-          this.debounce(this.loadMore(), 5000);
-        }
-      }
-      if (scrollTop > 630) {
-        document.querySelector("#fixd-box").style.cssText =
-          "position: fixed;top: -400px;width:"+outerWidth+"px";
-      } else {
-        document.querySelector("#fixd-box").style.cssText = "position: static";
-      }
+    searchexcellent(num) {
+      //this.queryCondition.excellent =true;
+      this.queryCondition.type = num;
+      this.search(true);
+      //this.getCaseData();
     },
+    // searchData(num) {
+    //   // if(num == 1){
+    //   // this.queryCondition.excellent = !this.queryCondition.excellent;
+    //   // this.getCaseData();
+    //   // }
+    //   this.queryCondition.pageIndex = 1;
+    //   this.queryCondition.type = num;
+    //   this.getCaseData();
+    // },
+    // 滚动请求
+    // handleScroll() {
+    //   let innerw = document.querySelector("#fixd-box");
+    //   let innerHeight = document.querySelector("#case-list-content")
+    //     .clientHeight;
+    //   let outerHeight = document.documentElement.clientHeight;
+    //   let outerWidth = innerw.clientWidth;
+    //   let scrollTop = document.documentElement.scrollTop;
+    //   if (outerHeight + scrollTop + 350 >= innerHeight) {
+    //     if (this.moreState == 1) {
+    //       this.debounce(this.loadMore(), 5000);
+    //     }
+    //   }
+    //   if (scrollTop > 630) {
+    //     document.querySelector("#fixd-box").style.cssText =
+    //       "position: fixed;top: -400px;width:" + outerWidth + "px";
+    //   } else {
+    //     document.querySelector("#fixd-box").style.cssText = "position: static";
+    //   }
+    // },
     useHotword(item) {
       this.keyWord = item.keyword;
       this.search();
@@ -714,10 +926,11 @@ export default {
         }
       });
     },
-    loadMore() {
-      this.queryCondition.pageIndex += 1;
-      this.getCaseData();
-    },
+    // 监听滚动发请求
+    // loadMore() {
+    //   this.queryCondition.pageIndex += 1;
+    //   this.getCaseData();
+    // },
     protocolCheck(obj) {
       this.protocolConfirmButton = !obj;
     },
@@ -725,92 +938,176 @@ export default {
       this.protocolDialogVisible = false;
       this.$store.dispatch("portal/SetReadProtocol", true);
     },
-    handleSizeChange(item) {
-      this.queryCondition.pageSize = item;
+    // handleSizeChange(item) {
+    //   this.queryCondition.pageSize = item;
+    // },
+    // handleCurrentChange(item) {
+    //   this.queryCondition.pageIndex = item;
+    // },
+    getAllFielclass() { //获取全部选中的标签
+      let newlist = JSON.parse(JSON.stringify(this.domain))
+      return newlist.filter(one => {
+        one.list = one.list.filter(two => {
+          // if (!two.fielclass) {
+          //   one.list = []
+          // }
+          two.list = two.list.filter(three => {
+            // if (!three.fielclass) {
+            //   two.list = []
+            // }
+            return three.fielclass;
+          })
+          return two.fielclass;
+        });
+        return one.fielclass
+      })
     },
-    handleCurrentChange(item) {
-      this.queryCondition.pageIndex = item;
+    // 改变分页
+    currentChange(val) {
+      this.caseList.showPagCount = 0
+      this.queryCondition.pageIndex = val
+      this.search()
     },
-    search() {
-      if(this.keyWord){
+    // 查询
+    search(num = false) {
+      // 记录查询的数据
+      if (this.keyWord) {
         apiSearchterm.save({ keyword: this.keyWord, type: 3 });
       }
       if (!this.isFind) {
         this.isFind = true;
       }
-      this.queryCondition.pageIndex = 1;
+      if (num) {
+        this.caseList.showPagCount = 0
+        this.queryCondition.pageIndex = 1;
+      }
       if (this.keyWord != this.queryCondition.keyWord) {
         this.queryCondition.keyWord = this.keyWord;
       }
-      if(this.queryCondition.orgDomain == 0){
-        this.queryCondition.orgDomain = ''
-      }
-      if(this.queryCondition.majorType == 0){
+      if (this.queryCondition.majorType == 0) {
         this.queryCondition.majorType = ''
       }
       this.getCaseData();
     },
-    async getCaseData() {
-      this.saveLocalFilters();
-      // this.fieldData
-      //this.queryCondition.pageIndex = 1;
-      let orgDomainList=[];
-      let majorTypeList=[];
-      this.tagList.forEach(tag=>{
-         if(tag.type=='0'){
-            this.queryCondition.keyWord=tag.name;
-         }else if(tag.type=='major_type'){
-           majorTypeList.push(tag.code);
-         }else if(tag.type=='org_domain'){
-           orgDomainList.push(tag.code);
-         }
-      });
-      this.queryCondition.orgDomain =orgDomainList.join(',');
-      this.queryCondition.majorType =majorTypeList.join(',');
 
-      if(this.queryCondition.orderField=='excellentTime'){
-        this.queryCondition.excellent=true;
-      }else{
-        this.queryCondition.excellent='';
+    async getCaseData() {
+      // this.saveLocalFilters();//存储本地刷新有记录
+      let majorTypeList = [];
+      let allFielclass = JSON.parse(JSON.stringify(this.getAllFielclass()));
+      // 获取树状id
+      this.queryCondition.orgDomainDtos = allFielclass.map(item => {
+        item.list = item.list.map(two => {
+          two.list = two.list.map(three => {
+            return {
+              parent: three.code
+            }
+          })
+          return {
+            parent: two.code,
+            children: two.list || []
+          }
+        })
+        return {
+          parent: item.code,
+          children: item.list || []
+        }
+      })
+      console.log(JSON.stringify(this.queryCondition.orgDomainDtos));
+
+
+
+      // 专业分类的id
+      this.tagList.forEach(tag => {
+        if (tag.type == '0') {
+          this.queryCondition.keyWord = tag.name;
+        } else if (tag.type == 'major_type') {
+          majorTypeList.push(tag.code);
+        }
+      });
+      this.queryCondition.majorType = majorTypeList.join(',');
+      //设置年
+      this.queryCondition.years = this.years.map(item => parseInt(item))
+
+      // 设置最佳案例为true或是false
+      if (this.queryCondition.type == 'excellent') {
+        this.queryCondition.excellent = true;
+      } else {
+        this.queryCondition.excellent = false;
       }
 
       //this.getTags();
-      if (this.queryCondition.pageIndex == 1) {
-        this.caseList.list = [];
-      }
+      // if (this.queryCondition.pageIndex == 1) {
+      //   this.caseList.list = [];
+      // }
       this.moreState = 2;
-      await apiCase.queryList(this.queryCondition).then(res => {
-          if (res.status == 200) {
-            if (res.result.list.length > 0) {
-              this.isSeach = false;
-              res.result.list.forEach(item => {
-                item.majorType = item.majorType.split(",");
-                item.isAll = false;
-                item.authorInfo = {
-                  aid: "",
-                  name: "",
-                  orgInfo: "",
-                  avatar: "",
-                  sex: null
-                };
-              });
-              this.caseList.list.push(...res.result.list);
-              this.caseList.count = res.result.count;
-              this.getCaseUserData(res.result.list);
-              this.moreState = 1;
-              if (res.result.count === res.result.list.length) {
-                this.moreState = 3;
-              }
-            } else {
+      await apiCase.queryListV2(this.queryCondition).then((res) => {
+        if (res.status == 200) {
+          if (res.result.list.length > 0) {
+            this.isSeach = false;
+            res.result.list.forEach(item => {
+              item.majorType = item.majorType ? item.majorType.split(",") : [];
+              item.isAll = false;
+              item.authorInfo = {
+                aid: "",
+                name: "",
+                orgInfo: "",
+                avatar: "",
+                sex: null
+              };
+            });
+            // this.caseList.list.push(...res.result.list);
+            this.moreState = 1;
+            if (res.result.count === res.result.list.length) {
               this.moreState = 3;
             }
           } else {
-            this.$message.error(res.message);
+            this.moreState = 3;
           }
-        })
-        .catch(err => {
-          console.log(err);
-        });
+          console.log(res?.result?.list ,'有没有数据');
+          this.caseList.list = res.result.list
+          this.getCaseUserData(res.result.list);
+          // 给所有的赋值
+          this.caseList.count = res.result.count;
+          this.caseList.showPagCount = res.result.count;
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch(err => {
+        console.log(err);
+      });
+
+      // await apiCase.queryList(this.queryCondition).then(res => {
+      //   if (res.status == 200) {
+      //     if (res.result.list.length > 0) {
+      //       this.isSeach = false;
+      //       res.result.list.forEach(item => {
+      //         item.majorType = item.majorType.split(",");
+      //         item.isAll = false;
+      //         item.authorInfo = {
+      //           aid: "",
+      //           name: "",
+      //           orgInfo: "",
+      //           avatar: "",
+      //           sex: null
+      //         };
+      //       });
+      //       this.caseList.list.push(...res.result.list);
+      //       this.caseList.count = res.result.count;
+      //       this.getCaseUserData(res.result.list);
+      //       this.moreState = 1;
+      //       if (res.result.count === res.result.list.length) {
+      //         this.moreState = 3;
+      //       }
+      //     } else {
+      //       this.moreState = 3;
+      //     }
+      //   } else {
+      //     this.$message.error(res.message);
+      //   }
+      // })
+      //   .catch(err => {
+      //     console.log(err);
+      //   });
     },
     // getTags() {
     //   this.searchTags = [];
@@ -841,10 +1138,21 @@ export default {
     //     }
     //   }
     // },
+    // 清楚数组的元素
+    // clear(tag) {
+    //   if (tag.type == 'org_domain') {
+    //     this.twoList = [];
+    //     this.threeList = [];
+    //   }
+    //   if (tag.type == 1) {
+    //     console.log(111);
+    //     this.threeList = [];
+    //   }
+    // },
     tagsClose(tag, index) {
-      tag.fielclass=false;
-      if(tag.type==0){
-         this.keyWord='';
+      tag.fielclass = false;
+      if (tag.type == 0) {
+        this.keyWord = '';
       }
       // if(tag.type=='org_domain'){
       //   console.log(tag)
@@ -869,13 +1177,16 @@ export default {
       // }
       //this.fieldData.splice(index,1);
       //this.getCaseData();
-      this.search();
+      this.search(true);
 
     },
     getCaseUserData(caseList) {
       let ids = caseList.map((item, index) => {
         return item.authorId;
       });
+      //不能为空
+      if (!ids.length) return
+
       const noReapetIds = [...new Set(ids)];
       apiUser.getByIds(noReapetIds).then(res => {
         if (res.status == 200) {
@@ -883,7 +1194,7 @@ export default {
             res.result.some(author => {
               if (author.aid == item.authorId) {
                 item.authorInfo = author;
-                author.orgInfo=cutFullName(author.orgInfo,1);
+                author.orgInfo = cutFullName(author.orgInfo, 1);
                 return true;
               } else {
                 return false;
@@ -899,15 +1210,15 @@ export default {
       apiCase.queryPraises(5).then(res => {
         if (res.status == 200) {
           this.Popularity = res.result;
-          if(res.result.length < 5){
-            for(let i=0;i=(5-res.result.length);i++){
-            this.Popularity.push({
-              authorName:'',
-              count:1,
-              id:'',
-              title:'',
-             })
-          }
+          if (res.result.length < 5) {
+            for (let i = 0; i = (5 - res.result.length); i++) {
+              this.Popularity.push({
+                authorName: '',
+                count: 1,
+                id: '',
+                title: '',
+              })
+            }
           }
 
         }
@@ -917,15 +1228,15 @@ export default {
       apiCase.queryComments(5).then(res => {
         if (res.status == 200) {
           this.Positive = res.result;
-          if(res.result.length < 5){
-            for(let i=0;i=(5-res.result.length);i++){
-            this.Positive.push({
-              authorName:'',
-              count:1,
-              id:'',
-              title:'',
-             })
-          }
+          if (res.result.length < 5) {
+            for (let i = 0; i = (5 - res.result.length); i++) {
+              this.Positive.push({
+                authorName: '',
+                count: 1,
+                id: '',
+                title: '',
+              })
+            }
 
           }
         }
@@ -944,6 +1255,7 @@ export default {
 .u-class {
   ::v-deep .el-dialog {
     border-radius: 15px;
+
     .el-dialog__headerbtn .el-dialog__close {
       color: white;
       position: absolute;
@@ -951,27 +1263,33 @@ export default {
       right: 15px;
     }
   }
+
   ::v-deep .el-dialog__body {
     padding: 0px;
   }
+
   .ClassBoxContent {
     width: 100%;
     height: 456px;
     // background: red;
     border-radius: 15px;
+
     .ContentBox {
       width: 100%;
       height: 100%;
       position: absolute;
       z-index: 9;
       display: flex;
+
       .left,
       .right {
         height: calc(100% - 30px);
       }
+
       .left {
         padding-left: 30px;
         width: 48%;
+
         .title {
           width: 200px;
           height: 59px;
@@ -984,12 +1302,14 @@ export default {
           padding-top: 5px;
           text-shadow: 0 6px 3px rgba(96, 85, 243, 0.4);
         }
+
         .jy {
           color: white;
           font-size: 20px;
           margin-top: 87.53px;
           font-weight: 400;
         }
+
         .msg {
           margin-top: 5px;
           color: rgba(255, 255, 255, 0.85);
@@ -997,6 +1317,7 @@ export default {
           text-align: justify;
           line-height: 20px;
         }
+
         .bottom {
           width: 100px;
           height: 1px;
@@ -1004,9 +1325,11 @@ export default {
           margin-top: 40px;
         }
       }
+
       .right {
         // padding-left: 10px;
         width: 50%;
+
         .tyl {
           cursor: pointer;
           width: calc(100% - 20px);
@@ -1015,14 +1338,17 @@ export default {
           border-radius: 4px;
           height: 160px;
           margin-top: 83px;
+
           .tyl_title {
             width: 100%;
             padding-left: 20px;
             padding-top: 20px;
+
             .tyl_title_img {
               width: 18px;
               height: 18px;
             }
+
             .tyl_title_msg {
               font-size: 20px;
               margin-left: 10px;
@@ -1030,6 +1356,7 @@ export default {
               font-weight: 600;
             }
           }
+
           .tyl_jy {
             margin-top: 6.5px;
             font-size: 14px;
@@ -1037,6 +1364,7 @@ export default {
             padding-left: 20px;
             color: #333333;
           }
+
           .tyl_msg {
             width: 350.36px;
             margin-top: 13px;
@@ -1048,10 +1376,12 @@ export default {
             text-align: justify;
           }
         }
+
         .tyl:hover {
           border: 0.96px solid rgba(140, 105, 242, 1);
           box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.3);
         }
+
         .cyl {
           cursor: pointer;
           width: calc(100% - 20px);
@@ -1060,14 +1390,17 @@ export default {
           border-radius: 4px;
           height: 160px;
           margin-top: 10px;
+
           .tyl_title {
             width: 100%;
             padding-left: 20px;
             padding-top: 20px;
+
             .tyl_title_img {
               width: 18px;
               height: 18px;
             }
+
             .tyl_title_msg {
               font-size: 20px;
               margin-left: 10px;
@@ -1075,6 +1408,7 @@ export default {
               font-weight: 600;
             }
           }
+
           .tyl_jy {
             margin-top: 6.5px;
             font-size: 14px;
@@ -1082,6 +1416,7 @@ export default {
             padding-left: 20px;
             color: #333333;
           }
+
           .tyl_msg {
             width: 350.36px;
             margin-top: 13px;
@@ -1093,12 +1428,14 @@ export default {
             text-align: justify;
           }
         }
+
         .cyl:hover {
           border: 0.96px solid rgba(140, 105, 242, 1);
           box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.24);
         }
       }
     }
+
     .img {
       width: 835px;
       margin-left: -1px;
@@ -1108,12 +1445,14 @@ export default {
     }
   }
 }
-.fieldbox{
+
+.fieldbox {
 
   display: flex;
   white-space: nowrap;
   flex-wrap: wrap;
-  div{
+
+  div {
     padding: 0 15px;
     display: inline-block;
     font-size: 14px;
@@ -1121,15 +1460,18 @@ export default {
     color: #3d3d3d;
     font-weight: 500;
   }
-  .fieldactive{
+
+  .fieldactive {
     color: #387DF7;
   }
 }
-.field{
+
+.field {
   display: flex;
   white-space: nowrap;
+
   // flex-wrap: wrap;
-  div{
+  div {
     padding: 0 15px;
     // display: inline-block;
     font-size: 14px;
@@ -1137,120 +1479,147 @@ export default {
     color: #3d3d3d;
     font-weight: 500;
   }
-  .fieldactive{
+
+  .fieldactive {
     color: #387DF7;
   }
 }
-::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner{
+
+::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner {
   box-shadow: none !important;
 }
-::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner{
+
+::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner {
   color: #387df7 !important;
   background-color: #fff !important;
 }
-::v-deep .el-checkbox-button--mini .el-checkbox-button__inner{
+
+::v-deep .el-checkbox-button--mini .el-checkbox-button__inner {
   font-size: 14px;
 }
-::v-deep .el-checkbox-button .el-checkbox-button__inner{
+
+::v-deep .el-checkbox-button .el-checkbox-button__inner {
   border: none !important;
 }
-.notcoures{
+
+.notcoures {
   text-align: center;
-  img{
+
+  img {
     width: 360px;
     height: 226px;
   }
-  h5{
+
+  h5 {
     font-size: 14px;
     color: #333333;
     font-weight: 400;
   }
 }
-.orgaicon{
+
+.orgaicon {
   width: 22px;
   height: 22px;
   vertical-align: middle;
   margin-right: 8px;
-  img{
+
+  img {
     width: 100%;
     height: 100%;
   }
 }
-.course-resources{
+
+.course-resources {
   margin-top: 26px;
-  img{
+
+  img {
     width: 100%;
     height: 100%;
     border-radius: 8px;
   }
 }
-  .case-banner{
-    height: 240px;
-    background: url('../../../../public/images/case-banner.png');
-  }
 
-::v-deep  .el-checkbox{
-   .el-checkbox__input{
-     .el-checkbox__inner{
-       border: 1px solid #3e3c3c;
-     }
-   }
-
-  }
-
-::v-deep .el-radio-button{
-  margin-right:-5px;
+.case-banner {
+  height: 240px;
+  background: url('../../../../public/images/case-banner.png');
 }
+
+::v-deep .el-checkbox {
+  .el-checkbox__input {
+    .el-checkbox__inner {
+      border: 1px solid #3e3c3c;
+    }
+  }
+
+}
+
+::v-deep .el-radio-button {
+  margin-right: -5px;
+}
+
 ::v-deep .el-button {
   border-radius: 0px;
 }
+
 .case-titdiv {
   line-height: 30px;
   display: flex;
+
   .case-tittext {
     font-size: 18px;
     font-weight: 600;
     color: #333333;
-    width: 67%;
-    display: -webkit-box;
-    overflow: hidden;
-    word-break: break-all;
-    text-overflow: ellipsis;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    box-sizing: border-box;
+    max-width: 67%;
+  }
+
+  .case-activeText {
+    line-height: 27.5px;
+
+    .comWords {
+      color: white;
+      font-size: 12px;
+      border-radius: 2px;
+      padding: 2px 4px;
+      margin-left: 20px;
+    }
+
   }
 }
+
 ::v-deep .interact-bar .interact-bar-btns .interact-bar-btn {
   margin-left: 0;
   margin-right: 20px;
 }
-.clearfix:after{
+
+.clearfix:after {
   content: "020";
   display: block;
   height: 0;
   clear: both;
   visibility: hidden;
-  }
+}
+
 .keyword-text {
 
   div {
-    padding:0px 8px;
+    padding: 0px 8px;
     margin-top: 5px;
     float: left;
     line-height: 24px;
     font-size: 12px;
-    border-radius:2px;
+    border-radius: 2px;
     margin-right: 8px;
     color: #2C68FF;
     height: 24px;
-    background: rgba(44,104,255,0.06);
+    background: rgba(44, 104, 255, 0.06);
   }
 }
+
 .searBox {
   text-align: center;
   margin: 0px auto 0 auto;
 }
+
 #searchBox {
   overflow: hidden;
 
@@ -1266,29 +1635,36 @@ export default {
   box-sizing: border-box;
   word-break: break-all;
 }
+
 ::v-deep .el-card__body {
   padding: 0;
 }
+
 ::v-deep .bacolor:nth-child(odd) {
   background-color: #f6f6f6;
   padding: 0 5px;
 }
+
 ::v-deep .bacolor:nth-child(even) {
   background-color: #fff;
   padding: 0 5px;
 }
+
 ::v-deep .el-card {
   border: none;
   border-radius: 0px;
   // border: 1px solid #ebeef5;
 }
+
 ::v-deep .el-radio-button__inner,
 .el-radio-group {
   vertical-align: top;
 }
+
 ::v-deep .el-radio-button__inner {
   background: none;
 }
+
 ::v-deep .el-radio-button:first-child .el-radio-button__inner {
   border-left: none;
 
@@ -1303,6 +1679,7 @@ export default {
   color: #6B7C85;
   line-height: 25px;
 }
+
 .item-line {
   padding-left: 2px;
   height: 20px;
@@ -1314,6 +1691,7 @@ export default {
   justify-content: space-between;
 
 }
+
 .searchbar {
   background-color: #ffffff;
 
@@ -1326,6 +1704,7 @@ export default {
   z-index: 999;
   height: 50px;
 }
+
 .protocol {
   .protocol-title {
     font-size: 20px;
@@ -1333,24 +1712,30 @@ export default {
     text-align: center;
     margin-bottom: 25px;
   }
+
   .protocol-content {
     font-size: 14px;
     line-height: 25px;
   }
 }
+
 .left-div {
   border: none;
+
   .quyer-tag {
+
     // margin-left: 10px;
     .order-class {
-      padding:0px 12px;
+      padding: 0px 12px;
       color: #6E7B84;
       line-height: 32px;
       border-radius: 0px;
+
       .el-icon--right {
         margin-left: 0;
       }
     }
+
     .actice {
       border: 0px;
       background: #387DF7;
@@ -1359,39 +1744,47 @@ export default {
       border-radius: 4px;
     }
   }
+
   /* 分页div */
   .pagination-div {
     text-align: center;
     padding: 10px 0;
-    .pag-text {
-    }
+
+    .pag-text {}
   }
+
   .order-div {
     padding: 34px 40px 20px 40px;
     background-color: #fff;
+    display: flex;
+    align-items: center;
     // margin-bottom: ;
   }
+
   .data-content {
     background-color: #fff;
     padding: 5px 50px;
-    ::v-deep .interact-bar-btns{
-      .interact-bar-btn{
+
+    ::v-deep .interact-bar-btns {
+      .interact-bar-btn {
         text-align: right;
         min-width: 78px !important;
         margin-right: 0;
       }
     }
+
     .case-list:last-child {
       border-bottom: none;
     }
 
     .case-list {
-      border-bottom: 1px solid rgba(153, 153, 153,.2);
+      border-bottom: 1px solid rgba(153, 153, 153, .2);
       margin-top: 10px;
       margin-bottom: 25px;
       padding-left: 5px;
       padding-right: 5px;
     }
+
     .case-image {
       width: 230px;
       height: 170px;
@@ -1406,10 +1799,12 @@ export default {
           color: #333;
           font-weight: 600;
           height: 30px;
+
           .case-info-date {
             flex: 1;
             text-align: right;
             font-weight: normal;
+
             // font-size: 12px;
             // height: 30px;
             // font-weight: 200;
@@ -1419,8 +1814,9 @@ export default {
             }
           }
         }
+
         .case-info-summary {
-          margin-top:16px;
+          margin-top: 16px;
           cursor: pointer;
           margin-bottom: 5px;
           word-break: break-all;
@@ -1429,12 +1825,15 @@ export default {
           color: #333330;
           font-weight: 400;
         }
+
         .case-info-tools {
           height: 30px;
+
           .case-info-tools-auth {
             float: left;
             font-size: 13px;
             color: #999999;
+
             img {
               margin-right: 10px;
               width: 30px;
@@ -1443,8 +1842,10 @@ export default {
               vertical-align: middle;
             }
           }
+
           .case-info-tools-btns {
             float: right;
+
             .case-info-tools-btn {
               margin: 0 0 0 15px;
             }
@@ -1453,35 +1854,42 @@ export default {
       }
     }
   }
+
   .search-div {
     background: #fff;
     padding: 30px 40px;
+
     .search-keyword {
       line-height: 30px;
+
       .tip {
         font-size: 12px;
         color: #999999;
         // margin-bottom: 20px;
       }
     }
+
     .search-item {
       cursor: pointer;
       // margin-bottom: 10px;
       // padding: 10px 0;
     }
+
     // .search-item:not(:last-child) {
     //   //  border-bottom: 1px solid #dfdfdf;
     // }
   }
+
   .search-div-collapse {
     display: block;
   }
+
   .search-div-expand {
     display: none;
   }
+
   .search-div-more {
     text-align: center;
   }
 }
-
 </style>
diff --git a/src/views/portal/course/Detail.vue b/src/views/portal/course/Detail.vue
index be40c0ee..0a284846 100644
--- a/src/views/portal/course/Detail.vue
+++ b/src/views/portal/course/Detail.vue
@@ -50,7 +50,7 @@
                    </div>
                    <div v-else class="score-no">未评分</div>
                 </div>
-                <div class="btn-div"  style="height:30px;margin-top: 15px;">
+                <div class="btn-div" v-if="isCrowd" style="height:30px;margin-top: 15px;">
                   <el-button v-if="stuStusts == 0" type="primary" @click="startSigningUp()" >开始学习</el-button>
                   <el-button v-if="stuStusts == 1" type="primary" @click="jumpJearning">{{btnName}}</el-button>
                </div>
@@ -69,14 +69,14 @@
             <el-col :span="18">
               <el-card :body-style="{ padding: '0px' }" class="info" style="margin-top: 10px;">
                 <el-tabs v-model="activeName">
-                  <el-tab-pane label="课程简介" name="first">
+                  <el-tab-pane label="内容简介" name="first">
                     <div>
                       <div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset="">目标人群：<div class="content-text">{{courseInfo.forUsers}}</div></div>
                       <div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset="">课程价值：<div class="content-text">{{courseInfo.value}}</div></div>
                       <div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset="">详细介绍：<div class="content-text"  v-html="courseInfo.summary"></div></div>
                     </div>
                   </el-tab-pane>
-                  <el-tab-pane label="大纲" name="second" v-if="courseInfo.type==20">
+                  <el-tab-pane label="课程速览" name="second" v-if="courseInfo.type==20">
                     <div class="category" v-for="(item) in catalogTree" :key="item.id">
                       <div class="node">
                         <div class="title">{{item.section.name}}</div>
@@ -92,7 +92,7 @@
                     </div>
                     <div style="height: 30px;"></div>
                   </el-tab-pane>
-                  <el-tab-pane label="大纲" name="second" v-if="courseInfo.type==10">
+                  <el-tab-pane label="课程速览" name="second" v-if="courseInfo.type==10">
                     <div class="category" v-for="(item) in contentList" :key="item.id">
                       <div class="node">
                         <div class="title">{{item.contentName}}</div>
@@ -120,7 +120,8 @@
                     </div>
                     <div class="teacher-info">
                       <div class="teacher-name">{{ item.teacherName }}</div>
-                      <div class="teacher-remark" v-html="item.remark"></div>
+                       <!-- <div class="teacher-remark" v-html="item.remark"></div> -->
+                      <div class="teacher-remark">{{  cutOrgNamePath(item.orgInfo) }} </div>
                     </div>
                   </div>
                 </div>
@@ -144,7 +145,7 @@ import apiCourse from '@/api/modules/course.js';
 import apiUser from '@/api/system/user.js';
 import courseStudy from '@/api/modules/courseStudy.js';
 import apiCoursePortal from '@/api/modules/coursePortal.js';
-import { courseType,getType,toScore,userAvatarText} from '@/utils/tools.js';
+import { courseType,getType,toScore,userAvatarText,cutOrgNamePath } from '@/utils/tools.js';
 import courseImage from "@/components/Course/courseImage.vue"
 export default {
   name: "atticle",
@@ -154,6 +155,7 @@ export default {
   },
   data() {
     return {
+      cutOrgNamePath,
       userAvatarText,
       getType,
       showQrcode: false,
@@ -174,6 +176,7 @@ export default {
       commentsTtoal:0,
       toUsers:[],//可以@的用户列表
       btnName:'开始学习',
+      isCrowd:false, //根据受众展示不展示
     };
   },
   mounted() {
@@ -185,13 +188,17 @@ export default {
 
     let $this=this;
     //页面只支取一次，所以先直接写在这里面
-    apiCoursePortal.detail(id,false).then(rs=>{
+    apiCoursePortal.detail(id,false,true).then(rs=>{
       if(rs.status==200){
 
         if(!rs.result.course.enabled || rs.result.course.deleted){
           $this.$message.error('十分抱歉，此课程已停用，如需使用，请联系管理员。');
           return;
         }
+        if(!rs.result.isCrowd){
+          $this.$message.error('您没有查看该课程的权限');
+        }
+        this.isCrowd = rs.result.isCrowd
 
         if(rs.result.teachers && rs.result.teachers.length > 0){
           let userIds=[];
@@ -347,6 +354,7 @@ export default {
                   item.avatar=this.fileBaseUrl + author.avatar;
                 }
                 item.sex = author.sex;
+                item.orgInfo = author.orgInfo
                 return true;
               }else{
                 return false;
@@ -363,7 +371,7 @@ export default {
 };
 </script>
 
-<style scoped lang="scss" scoped>
+<style scoped lang="scss">
 ::v-deep .teacher .teacher-avator .teacher-text {
   background: none;
   border: none;
@@ -400,6 +408,7 @@ export default {
 }
 
 .course-title{
+  position: relative;
   height: 90px;
   display: flex;
   justify-content: space-between;
@@ -411,7 +420,6 @@ export default {
     margin-bottom: 10px;
     word-break:break-all;
   }
-  position: relative;
   // .course-title-right{
   //   position: absolute;
   //   right: 0;
diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index 6fa3d168..03bc81ce 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -1,12 +1,214 @@
 <template>
   <div id="couser-list-content" class="couser-list-content">
     <div class="course-banner">
-      <portal-header current="course" textColor="#fff" @emitInput="emitInput"  @showClass="showClass"></portal-header>
+      <portal-header current="course" textColor="#fff" @emitInput="emitInput" @showClass="showClass"></portal-header>
     </div>
-    <div style="padding-top:30px" class="">
+    <div style="padding-top:30px">
+      <div class="xcontent2" v-if="!newData">
+        <div class="navTitle">
+          <a @click="handleClearTags">课程分类&nbsp;</a>
+          <span v-if="navTitle.length">></span>
+          <template v-if="navTitle.length">
+            <div class="oneTitle" v-for="(item, index) in navTitle" :key="item.id"
+              @click="handleOptionClick(item, index)">
+              <span class="titleName">&nbsp;{{ item.name }}&nbsp;</span>
+              <span v-if="index !== navTitle.length - 1">></span>
+            </div>
+          </template>
+        </div>
+      </div>
       <div class="xcontent2">
+        <!-- 左侧三级 -->
+        <div class="xcontent2-minor" style="margin-right:36px;">
+          <div class="course-title-style">
+            <div class="imgTilte">
+              <div>课程分类</div>
+              <div>COURSE</div>
+            </div>
+          </div>
+          <div class="course-list">
+            <div class="course-one" v-for="one in oneList" :key="one.id" @click.stop="handleOptionClick(one, 1, oneList)">
+              <div class="course-one-content">{{ one.name }}</div>
+              <div class="course-two" v-for="(twoList, twoIndex) in one.children" :key="twoList.id"
+                @click.stop="handleOptionClick(twoList, 2, one.children)"
+                :class="{ courseTwoActive: twoList.id == twoId || twoList.checked }" @mouseleave.stop="leaveIndex"
+                @mouseenter.stop="changeIndex(twoList.id)">
+                <!-- 三级分类 -->
+                <el-popover class="popover" popper-class='coursePopperClass' placement="right-start" width="536"
+                  :disabled="!twoList.children.length" :open-delay="0" :close-delay="0" trigger="hover"
+                  :visible-arrow="false" @hide="leaveIndex" @show="changeIndex(twoList.id)" transition="none">
+                  <div class="course-two-content" slot="reference">{{
+                    twoList.name }}</div>
+                  <!-- 内容 -->
+                  <div class="course-three-box">
+                    <div class="course-three-box-title">
+                      {{ twoList.name }}
+                    </div>
+                    <div style="padding: 0 40px;display: flex;flex-wrap: wrap;">
+                      <div :class="threeList.checked ? 'threeActive' : ''" v-for="threeList in twoList.children"
+                        :key="threeList.id" @click.stop="handleOptionClick(threeList, 3, twoList.children)"
+                        class="course-three">
+                        <span>{{ threeList.name }}</span>
+                      </div>
+                    </div>
+                  </div>
+                </el-popover>
+              </div>
+            </div>
+          </div>
+          <div id="fixd-box">
+            <!-- 好评榜 -->
+            <!-- <div class="portal-ranking-list ranking-bg">
+              <div class="ranking-title">好评榜</div>
+              <ul class="ranking-data">
+                <li class="list-info" v-for="(item, index) in scorelist" :key="index"
+                  style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
+                  <a style="display: inherit" @click="toCourseDetail(item)">
+                    <span class="portal-right-text blue-one" v-if="index == 0">
+                      <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
+                    </span>
+                    <span class="portal-right-text blue-tow" v-if="index == 1">
+                      <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
+                    </span>
+                    <span class="portal-right-text blue-three" v-if="index == 2">
+                      <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 3">
+                      <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 4">
+                      <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                    </span>
+                    <span class="portal-title-desc title-line-ellipsis" v-if="item.images == ''"
+                      style="font-size: 14px;">{{ item.name }}</span>
+                    <span class="portal-title-desc" v-else style="font-size: 14px;">
+                      <span class="portal-images-title two-line-ellipsis">{{ item.name }}</span>
+                    </span>
+
+                    <div class="list-active">
+                      <div class="list-content">
+                        <div class="list-img">
+                          <course-image :course="item" :text="false" width="108px" height="60px"></course-image>
+                          <span v-if="item.type < 21" class="course-type">录播</span>
+                          <span v-if="item.type == 30" class="course-type">线下课</span>
+                          <span v-if="item.type == 40" class="course-type">学习项目</span>
+                        </div>
+                        <div class="list-text">
+                          <h6 class="index-one-line-ellipsis">{{ item.name }}</h6>
+                          <span class="index-one-line-ellipsis">{{ item.publishTime }}</span>
+                        </div>
+                      </div>
+                      <div class="list-bottom">
+                        <couresinteract :type="1" :data="item"></couresinteract>
+                      </div>
+                    </div>
+                  </a>
+                </li>
+              </ul>
+            </div> -->
+            <!-- 人气榜 -->
+            <!-- <div style="margin-top:26px" class="portal-ranking-list ranking-bg1">
+              <div class="ranking-title">人气榜</div>
+              <ul class="ranking-data">
+                <li class="list-info" v-for="(item, index) in ankingList" :key="index"
+                  style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
+                  <a style="display: inherit" @click="toCourseDetail(item)">
+                    <span class="portal-right-text orange-one" v-if="index == 0">
+                      <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
+                    </span>
+                    <span class="portal-right-text orange-tow" v-if="index == 1">
+                      <img :src="`${webBaseUrl}/images/list02.png`" alt="">
+                    </span>
+                    <span class="portal-right-text orange-three" v-if="index == 2">
+                      <img :src="`${webBaseUrl}/images/list03.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 3">
+                      <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 4">
+                      <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                    </span>
+                    <span class="portal-title-desc title-line-ellipsis" v-if="item.images == ''"
+                      style="font-size: 14px;">{{ item.name }}</span>
+                    <span class="portal-title-desc" v-else style="font-size: 14px;">
+                      <span class="portal-images-title two-line-ellipsis">{{ item.name }}</span>
+                    </span>
+
+                    <div class="list-active">
+                      <div class="list-content">
+                        <div class="list-img">
+                          <course-image :course="item" :text="false" width="108px" height="60px"></course-image>
+                          <span v-if="item.type < 21" class="course-type">录播</span>
+                          <span v-if="item.type == 30" class="course-type">线下课</span>
+                          <span v-if="item.type == 40" class="course-type">学习项目</span>
+                        </div>
+                        <div class="list-text">
+                          <h6 class="index-one-line-ellipsis">{{ item.name }}</h6>
+                          <span class="index-one-line-ellipsis">{{ item.publishTime }}</span>
+                        </div>
+                      </div>
+                      <div class="list-bottom">
+                        <couresinteract :type="1" :data="item"></couresinteract>
+                      </div>
+                    </div>
+                  </a>
+                </li>
+              </ul>
+            </div> -->
+            <!-- 热榜 -->
+            <!-- <div style="margin-top:26px" class="portal-ranking-list ranking-bg2">
+              <div class="ranking-title">热度榜</div>
+              <ul class="ranking-data">
+                <li class="list-info" v-for="(item, index) in hotList" :key="index"
+                  style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
+                  <a style="display: inherit" @click="toCourseDetail(item)">
+                    <span class="portal-right-text orange-one" v-if="index == 0">
+                      <img :src="`${webBaseUrl}/images/listred01 .png`" alt="">
+                    </span>
+                    <span class="portal-right-text orange-tow" v-if="index == 1">
+                      <img :src="`${webBaseUrl}/images/listred02.png`" alt="">
+                    </span>
+                    <span class="portal-right-text orange-three" v-if="index == 2">
+                      <img :src="`${webBaseUrl}/images/listred03.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 3">
+                      <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                    </span>
+                    <span class="portal-right-text" v-if="index == 4">
+                      <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                    </span>
+                    <span class="portal-title-desc title-line-ellipsis list-lidex" v-if="item.images == ''"
+                      style="font-size: 14px;">{{ item.courseName }}</span>
+                    <span class="portal-title-desc " v-else style="font-size: 14px;">
+                      <span class="portal-images-title two-line-ellipsis">{{ item.courseName }}</span>
+                    </span>
+                    <div class="list-active">
+                      <div class="list-content">
+                        <div class="list-img">
+                          <course-image :course="item" :text="false" width="108px" height="60px"></course-image>
+                          <span v-if="item.type < 21" class="course-type">录播</span>
+                          <span v-if="item.type == 30" class="course-type">线下课</span>
+                          <span v-if="item.type == 40" class="course-type">学习项目</span>
+                        </div>
+                        <div class="list-text">
+                          <h6 class="index-one-line-ellipsis">{{ item.courseName }}</h6>
+                          <span class="index-one-line-ellipsis">{{ item.publishTime }}</span>
+                        </div>
+                      </div>
+                      <div class="list-bottom">
+                        <couresinteract :type="1" :data="item"></couresinteract>
+                      </div>
+                    </div>
+                  </a>
+                </li>
+              </ul>
+            </div> -->
+          </div>
+        </div>
+        <!-- 右侧 -->
         <div class="xcontent2-main content-div">
-          <div class="search-div" style="margin-right:36px">
+          <!-- 之前的 -->
+          <!-- <div class="search-div" style="margin-right:36px">
             <div class="searchbar" style="padding-right: 40px;" v-if="stagList.length > 0">
               <span @click="handleClearTags" style="float: right;margin-top: 6px;margin-right: -20px;color: #858585;cursor: pointer;" title="清除查询条件"><i class="el-icon-close"></i> 清除</span>
               <div style="line-height: 30px;">
@@ -19,7 +221,6 @@
                   <div style="line-height: 25px;padding-right: 10px;">
                     <span class="item-title" style="padding-right: 5px;">授课方式:</span>
                   </div>
-                  <!-- // 10微课，21在线课(直播)；20:在线课( 录播)；30:面授课；40:学习项目,90:混合式， -->
                   <div>
                     <a @click="handleTypeAllClick(1)" class="option-item" :class="{'option-active':ctypeTagAll}">全部</a>
                     <a @click="handleTypeClick(ctypeList[0],ctypeList)"  class="option-item" :class="{'option-active':ctypeList[0].checked}">录播课</a>
@@ -74,232 +275,182 @@
                   </div>
                 </div>
             </div>
+          </div> -->
 
-          </div>
-          <div class="order-div">
-            <span class="quyer-tag">
-                 <el-button type="text" class="order-class" @click="orderChange('studys')" :class="{ actice: course.orderField == 'studys' }">最热</el-button>
-                 <el-button type="text" class="order-class" @click="orderChange('publishTime')" :class="{ actice: course.orderField == 'publishTime' }">最新</el-button>
-            </span>
-          </div>
-          <div class="xcourse-list">
-            <div class="xcourse-card" v-for="(cinfo,cidx) in courseList" :key="cinfo.id">
-              <div class="course-card">
-                <div class="course-card-favorite">
-                  <interactBar :type="1" nodeWidth="20px" :data="cinfo" :courseExclusive="true" :comments="false" :praises="false" :shares="false" :views="false"></interactBar>
+          <!-- 线上品牌的nav -->
+          <div class="topNav" v-if="newData">
+            <div class="navTitle">
+              <a @click="handleClearTags">课程分类&nbsp;</a>
+              <span v-if="navTitle.length">></span>
+              <template v-if="navTitle.length">
+                <div class="oneTitle" v-for="(item, index) in navTitle" :key="item.id"
+                  @click="handleOptionClick(item, index)">
+                  <span class="titleName">&nbsp;{{ item.name }}&nbsp;</span>
+                  <span v-if="index !== navTitle.length - 1">></span>
                 </div>
-                <!-- <a :href="toCourseDetail(cinfo)"> -->
-                <a @click="toCourseDetail(cinfo)">
-                  <div class="course-image-box">
-                    <course-image :text="true" :course="cinfo"></course-image>
-                    <span v-if="cinfo.type == 20 || 10" class="course-type-left">录播课</span>
-                    <span v-if="cinfo.type == 30" class="course-type-left">线下课</span>
-                    <span v-if="cinfo.type == 40" class="course-type-left">学习项目</span>
-                  </div>
-                  <div style="width:80%" class="course-title two-line-ellipsis" :title="cinfo.title"   v-html="cinfo.name">
+              </template>
+            </div>
+          </div>
+          <!-- 内容导航 -->
+          <div class="topNav" v-if="!newData">
+            <div class="search-div nav" style="height: 100px;flex: 1;">
+              <div @click="handleTypeAllClick(1)" class="option-item" :class="{ 'option-active': ctypeTagAll }">
+                <a>全部</a>
+                <span :class="ctypeTagAll ? 'nav-bottbor' : ''"></span>
+              </div>
+              <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item"
+                :class="{ 'option-active': ctypeList[0].checked }">
+                <a>录播课</a>
+                <span :class="ctypeList[0].checked ? 'nav-bottbor' : ''"></span>
+              </div>
+              <div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item"
+                :class="{ 'option-active': ctypeList[1].checked }">
+                <a>线下课</a>
+                <span :class="ctypeList[1].checked ? 'nav-bottbor' : ''"></span>
+              </div>
+              <div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item"
+                :class="{ 'option-active': ctypeList[2].checked }">
+                <a>学习项目</a>
+                <span :class="ctypeList[2].checked ? 'nav-bottbor' : ''"></span>
+              </div>
+              <a class="option-item">
+                <span @click="uClassClick" class="Uxtext" style=""> U选小课堂
+                  <span class="uxicon">
+                    <svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
+                  </span>
+                </span>
+              </a>
+            </div>
+            <div id="fixd-box" class="upload" style="margin-left: 26px;">
+              <div v-if="identity == 2 || identity == 3 || identity == 5">
+                <div class="portal-model-btn pointer" style="margin-bottom: 0px;height: 100px;line-height: 100px;"
+                  @click="toNeedCourse">
+                  <svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="upCourse"></svg-icon>
+                  上传课程
+                </div>
+              </div>
+            </div>
+          </div>
+          <!-- 清除 -->
+          <div v-if="stagList.length > 0 && !newData" class="search-div" style="padding: 0;">
+            <div class="searchbar" style="background-color:#f6f7fb;display: flex;justify-content: space-between;">
+              <div style="line-height: 30px;">
+                <span class="item-title"> 搜索条件</span>
+                <el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t' + tagIdx" @close="stagClose(tag, tagIdx)">{{
+                  tag.name }}</el-tag>
+              </div>
+              <div>
+                <el-button type="primary" size="mini" @click="handleClearTags">清除</el-button>
+              </div>
+            </div>
+          </div>
 
-                  </div>
-
-                   <div class="couresstartTime">
-                        <span v-if="cinfo.type == 30 && cinfo.startTime">开课时间：{{ cinfo.startTime }}</span>
-                   </div>
-
-                  <div class="course-info">
-                    <div class="course-info-user">
-                       <!-- <span class="course-info-author"  v-if="cinfo.teacher">{{cinfo.teacher=='BOE教师'? '':cinfo.teacher}}</span> -->
-                       <span class="course-info-author"  v-if="cinfo.teacher" v-html="cinfo.teacher"></span>
-                       <span class="course-info-studys" >{{formatNum(cinfo.studies)}}人学习</span>
+          <!-- 标题最新最热好评率 -->
+          <div class="xcourse-list" style="background-color: #fff;border-radius: 8px;padding:0 25px;margin-top: 20px;">
+            <div class="order-div" v-if="!newData">
+              <span class="quyer-tag">
+                <el-button type="text" class="order-class" @click="orderChange('studys')"
+                  :class="{ actice: course.orderField == 'studys' }">最热</el-button>
+                <el-button type="text" class="order-class" @click="orderChange('publishTime')"
+                  :class="{ actice: course.orderField == 'publishTime' }">最新</el-button>
+                <el-button type="text" class="order-class" @click="orderChange('score')"
+                  :class="{ actice: course.orderField == 'score' }">好评率</el-button>
+              </span>
+              <span class="order-count">
+                共找到<span>{{ count }}</span>个结果
+              </span>
+            </div>
+            <template v-if="!newData">
+              <div class="xcourse-card" v-for="(cinfo, cidx) in courseList" :key="cinfo.id">
+                <div class="course-card" style="padding: 10px;">
+                  <a @click="toCourseDetail(cinfo)">
+                    <div class="course-img-box">
+                      <course-image :text="true" :course="cinfo"></course-image>
+                      <span v-if="cinfo.type == 20 || 10" class="course-type-left">录播课</span>
+                      <span v-if="cinfo.type == 30" class="course-type-left">线下课</span>
+                      <span v-if="cinfo.type == 40" class="course-type-left">学习项目</span>
                     </div>
-                    <div class="course-info-score">
-                      <div>
+                    <div class="course-title two-line-ellipsis" :title="cinfo.title" v-html="cinfo.name"></div>
+                    <!-- 关键字 -->
+                    <div class="keywordInfo-every">
+                      <div class="keywordInfo" v-for="(keyword, index) in cinfo.keywordsActive" :key="index">
+                        <el-tooltip popper-class="keywordInfo-class" :visible-arrow="false"
+                          :disabled="!keyword.showTitle">
+                          <template #content>
+                            <span v-html="keyword.title"></span>
+                          </template>
+                          <div class="keyword-content" v-html="keyword.name"></div>
+                        </el-tooltip>
+                      </div>
+                    </div>
+                    <div class="couresstartTime">
+                      <span v-if="cinfo.type == 30 && cinfo.startTime">开课时间：{{ cinfo.startTime }}</span>
+                    </div>
+
+                    <div class="course-info">
+                      <div class="course-info-user">
+                        <span class="course-info-author" v-if="cinfo.teacher" v-html="cinfo.teacher"></span>
+                        <span class="course-info-studys">{{ formatNum(cinfo.studies) }}人学习</span>
+                      </div>
+                      <div class="course-info-score">
+                        <div style="display: flex;">
+                          <interactBar :type="1" nodeWidth="20px" :data="cinfo" :courseExclusive="true" :comments="false"
+                            :praises="false" :shares="false" :views="false"></interactBar>
                           <div v-if="cinfo.score">
-                            <span class="course-score-value">{{toScore(cinfo.score)}}分</span>
+                            <span class="course-score-value">{{ toScore(cinfo.score) }}分</span>
                           </div>
                           <div v-else class="course-score-no">未评分</div>
+                        </div>
                       </div>
                     </div>
-                  </div>
-                </a>
-              </div>
-            </div>
-          </div>
-          <!--  分页 -->
-          <div class="pagination-div">
-            <span class="pag-text" @click="loadMore()" v-if="moreState == 1 && courseList.length>=course.pageSize">加载更多</span>
-            <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-            <span class="pag-text-msg" v-else-if="moreState == 3 && courseList.length > 0">没有更多数据了</span>
-            <span class="notcoures" v-else-if="moreState == 3 && courseList.length==0">
-              <img :src="`${webBaseUrl}/images/nocouresimg.png`" alt="">
-              <h5>暂无课程，请优先学习其它课程吧～</h5>
-            </span>
-          </div>
-        </div>
-        <div class="xcontent2-minor">
-            <div id="fixd-box">
-              <div v-if="identity == 2 || identity == 3 || identity == 5">
-                <div class="portal-model-btn pointer" @click="toNeedCourse">
-                      <svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="upCourse"></svg-icon>
-                      上传课程
+                  </a>
                 </div>
               </div>
-              <div class="portal-ranking-list ranking-bg">
-                <div class="ranking-title">好评榜</div>
-                <ul class="ranking-data">
-                   <li   class="list-info" v-for="(item, index) in scorelist" :key="index" style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
-                       <a style="display: inherit" @click="toCourseDetail(item)">
-                        <span class="portal-right-text blue-one" v-if="index==0">
-                          <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
-                        </span>
-                        <span class="portal-right-text blue-tow" v-if="index==1">
-                            <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
-                        </span>
-                        <span class="portal-right-text blue-three" v-if="index==2">
-                            <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
-                        </span>
-                        <span class="portal-right-text" v-if="index==3">
-                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
-                        </span>
-                         <span class="portal-right-text" v-if="index==4">
-                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
-                        </span>
-                        <span class="portal-title-desc title-line-ellipsis" v-if="item.images == ''" style="font-size: 14px;">{{ item.name }}</span>
-                        <span class="portal-title-desc" v-else style="font-size: 14px;">
-                          <!-- <img v-if="index == 0"  class="rankimg"  :src="fileBaseUrl + item.images" alt=""/> -->
-                          <span class="portal-images-title two-line-ellipsis">{{ item.name }}</span>
-                        </span>
-
-                      <div class="list-active">
-                         <div class="list-content">
-                           <div class="list-img">
-                           <course-image :course="item"  :text="false" width="108px" height="60px"></course-image>
-                            <span v-if="item.type < 21" class="course-type">录播</span>
-                            <span v-if="item.type==30" class="course-type">线下课</span>
-                            <span v-if="item.type==40" class="course-type">学习项目</span>
-                          </div>
-                           <div class="list-text">
-                             <h6 class="index-one-line-ellipsis">{{item.name}}</h6>
-                             <span class="index-one-line-ellipsis">{{item.publishTime}}</span>
-                           </div>
-                         </div>
-                         <div class="list-bottom">
-                           <couresinteract :type="1" :data="item" ></couresinteract>
-
-                          <!-- <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar> -->
-                         </div>
+            </template>
+            <!-- 线上品牌系列课程 -->
+            <template v-if="newData">
+              <div class="xcourse-card" style="margin-bottom: 0;margin-top: 36px;" v-for="(cinfo, cidx) in courseList" :key="cinfo.id">
+                <div class="course-card" style="padding: 10px;">
+                  <a @click="() => $message.success('如需了解详情，请联系BOEU')">
+                    <div class="course-img-box">
+                      <course-image :text="true" :course="cinfo"></course-image>
+                    </div>
+                    <div class="course-title two-line-ellipsis" :title="cinfo.title" v-html="cinfo.name"></div>
+                    <div class="course-title two-line-ellipsis">
+                      {{ cinfo.remark }}
+                    </div>
+                    <div class="course-info">
+                      <div class="course-info-user">
+                        <span class="course-info-author" v-if="cinfo.teacher" v-html="cinfo.teacher"></span>
                       </div>
-                      </a>
-                   </li>
-                </ul>
+                    </div>
+                  </a>
+                </div>
               </div>
-              <div style="margin-top:26px" class="portal-ranking-list ranking-bg1">
-                <div class="ranking-title">人气榜</div>
-                <ul class="ranking-data">
-                   <li  class="list-info" v-for="(item, index) in ankingList" :key="index" style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
-                         <a style="display: inherit" @click="toCourseDetail(item)">
-                        <span class="portal-right-text orange-one" v-if="index==0">
-                          <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
-                        </span>
-                        <span class="portal-right-text orange-tow" v-if="index==1">
-                            <img :src="`${webBaseUrl}/images/list02.png`" alt="">
-                        </span>
-                        <span class="portal-right-text orange-three" v-if="index==2">
-                            <img :src="`${webBaseUrl}/images/list03.png`" alt="">
-                        </span>
-                        <span class="portal-right-text" v-if="index==3">
-                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
-                        </span>
-                         <span class="portal-right-text" v-if="index==4">
-                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
-                        </span>
-                        <span class="portal-title-desc title-line-ellipsis" v-if="item.images == ''" style="font-size: 14px;">{{ item.name }}</span>
-                        <span class="portal-title-desc" v-else style="font-size: 14px;">
-                          <!-- <img v-if="index == 0" class="rankimg"  :src="fileBaseUrl + item.images" alt=""/> -->
-                          <span class="portal-images-title two-line-ellipsis">{{ item.name }}</span>
-                        </span>
-
-                        <div class="list-active">
-                         <div class="list-content">
-                           <div class="list-img">
-                           <course-image :course="item" :text="false" width="108px" height="60px"></course-image>
-                            <span v-if="item.type < 21" class="course-type">录播</span>
-                            <span v-if="item.type==30" class="course-type">线下课</span>
-                            <span v-if="item.type==40" class="course-type">学习项目</span>
-                           </div>
-                           <div class="list-text">
-                             <h6 class="index-one-line-ellipsis">{{item.name}}</h6>
-                             <span class="index-one-line-ellipsis">{{item.publishTime}}</span>
-                           </div>
-                         </div>
-                         <div class="list-bottom">
-                       <couresinteract :type="1" :data="item" ></couresinteract>
-
-                          <!-- <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar> -->
-                         </div>
-                      </div>
-                      </a>
-                   </li>
-                </ul>
+            </template>
+            <!--  暂无数据 -->
+            <div class="pagination-div">
+              <!-- <span class="pag-text" @click="loadMore()"
+                v-if="moreState == 1 && courseList.length >= course.pageSize">加载更多</span> -->
+              <!-- <span class="pag-text-msg" v-if="moreState == 2">数据加载中</span> -->
+              <!-- <span class="pag-text-msg" v-else-if="moreState == 3 && courseList.length > 0">没有更多数据了</span> -->
+              <span class="notcoures" v-if="moreState == 3 && courseList.length == 0">
+                <img :src="`${webBaseUrl}/images/nocouresimg.png`" alt="">
+                <h5>暂无课程，请优先学习其它课程吧～</h5>
+              </span>
+              <div v-if="courseList.length > 0">
+                <pagination :size="course.pageSize" :total="count" :page="course.pageIndex"
+                  layout="total, prev, pager, next, jumper" @change-page="currentChange"></pagination>
               </div>
-              <div style="margin-top:26px" class="portal-ranking-list ranking-bg2">
-                <div class="ranking-title">热度榜</div>
-                <ul class="ranking-data">
-                   <li class="list-info" v-for="(item, index) in hotList" :key="index" style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
-                         <a style="display: inherit" @click="toCourseDetail(item)">
-                        <span class="portal-right-text orange-one" v-if="index==0">
-                          <img :src="`${webBaseUrl}/images/listred01 .png`" alt="">
-                        </span>
-                        <span class="portal-right-text orange-tow" v-if="index==1">
-                            <img :src="`${webBaseUrl}/images/listred02.png`" alt="">
-                        </span>
-                        <span class="portal-right-text orange-three" v-if="index==2">
-                            <img :src="`${webBaseUrl}/images/listred03.png`" alt="">
-                        </span>
-                        <span class="portal-right-text" v-if="index==3">
-                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
-                        </span>
-                         <span class="portal-right-text" v-if="index==4">
-                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
-                        </span>
-                        <span class="portal-title-desc title-line-ellipsis list-lidex" v-if="item.images == ''" style="font-size: 14px;">{{ item.courseName }}</span>
-                        <span class="portal-title-desc " v-else style="font-size: 14px;">
-                          <!-- <img v-if="index == 0" class="rankimg"  :src="fileBaseUrl + item.images" alt=""/> -->
-                          <span class="portal-images-title two-line-ellipsis">{{ item.courseName }}</span>
-                        </span>
-                        <div class="list-active">
-                         <div class="list-content">
-                           <div class="list-img">
-                            <course-image :course="item" :text="false" width="108px" height="60px"></course-image>
-                           <!-- <img style="width:96px;height:52px" :src="fileBaseUrl + item.images" alt=""/> -->
-                            <span v-if="item.type < 21" class="course-type">录播</span>
-                            <span v-if="item.type==30" class="course-type">线下课</span>
-                            <span v-if="item.type==40" class="course-type">学习项目</span>
-                           </div>
-                           <div class="list-text">
-                             <h6 class="index-one-line-ellipsis">{{item.courseName}}</h6>
-                             <span class="index-one-line-ellipsis">{{item.publishTime}}</span>
-                           </div>
-                         </div>
-                         <div class="list-bottom">
-                        <couresinteract :type="1" :data="item" ></couresinteract>
-                          <!-- <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar> -->
-                         </div>
-                      </div>
-                      </a>
-                   </li>
-                </ul>
-              </div>
-              <!-- <div class="course-resources pointer"> -->
-                <!-- 资源位 -->
-                <!-- <img  @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
-              <!-- </div> -->
             </div>
+          </div>
         </div>
       </div>
     </div>
     <portal-footer></portal-footer>
     <portalFloatTools ref="floatTools"></portalFloatTools>
-       <!-- U课堂弹窗 -->
-       <div class="u-class">
+    <!-- U课堂弹窗 -->
+    <div class="u-class">
       <el-dialog :visible.sync="showUClass" width="833px">
         <div class="ClassBoxContent">
           <img src="../../../assets/images/u_class.png" alt="" class="img" />
@@ -315,11 +466,7 @@
             <div class="right">
               <div class="tyl" @click="tylClick">
                 <div class="tyl_title">
-                  <img
-                    src="../../../assets/images/dc.png"
-                    alt=""
-                    class="tyl_title_img"
-                  />
+                  <img src="../../../assets/images/dc.png" alt="" class="tyl_title_img" />
                   <span class="tyl_title_msg">通用力专区</span>
                 </div>
                 <div class="tyl_jy">加厚职业素养，轻学习、快成长！</div>
@@ -329,11 +476,7 @@
               </div>
               <div class="cyl" @click="cylClick">
                 <div class="tyl_title">
-                  <img
-                    src="../../../assets/images/cyl.png"
-                    alt=""
-                    class="tyl_title_img"
-                  />
+                  <img src="../../../assets/images/cyl.png" alt="" class="tyl_title_img" />
                   <span class="tyl_title_msg">创新力专区</span>
                 </div>
                 <div class="tyl_jy">激发创新潜力，拓视野、促思考！</div>
@@ -368,7 +511,7 @@ import scene from "@/api/modules/scene.js";
 import apiUserbasic from "@/api/boe/userbasic.js";
 import interactBar from "@/components/Portal/interactBar.vue";
 import courseImage from "@/components/Course/courseImage.vue";
-import { courseType, getType, toScore,formatDate,formatUserNumber,formatDateByFmt } from "@/utils/tools.js";
+import { courseType, getType, toScore, formatDate, formatUserNumber, formatDateByFmt } from "@/utils/tools.js";
 import { deepClone, param } from "../../../utils";
 import apiSearchterm from "@/api/modules/searchterm.js";
 import apiPlace from "@/api/phase2/place.js"
@@ -387,101 +530,112 @@ export default {
   },
   computed: {
     ...mapGetters(["resOwnerMap", "sysTypeMap", "userInfo", "identity"]),
-    stagList(){ //计算出选择的内容
-       let list=[];
-       if(this.keyword){
-         list.push({
-           type:0,
-           id:'keyword',
-           name:this.keyword,
-           checked:true
-         })
-       }
-       this.ctypeList.forEach(item=>{
-         if(item.checked){
-           list.push(item);
-         }
-       });
-       this.oneList.forEach(one=>{
-           var twoChildChecked=false;//是否有下级
-           one.children.forEach(two=>{
-              if(two.checked){
-                twoChildChecked=true;
-              }
-              var threeChildChecked=false;
-              two.children.forEach(three=>{
-                 if(three.checked){
-                   list.push(three);
-                   threeChildChecked=true;
-                 }
-              });
-              if(two.checked && !threeChildChecked){
-                list.push(two);
-              }
-           });
-           if(one.checked && !twoChildChecked){
-             list.push(one);
-           }
-       })
-       // this.oneList.forEach(item=>{
-       //   if(item.checked){
-       //     list.push(item);
-       //   }
-       // });
-       // this.twoList.forEach(item=>{
-       //   if(item.checked){
-       //     list.push(item);
-       //   }
-       // });
-       // this.threeList.forEach(item=>{
-       //   if(item.checked){
-       //     list.push(item);
-       //   }
-       // });
-       //console.log(list,'list');
-       return list;
+    typeList() {
+      let list = [];
+
     },
-    ctypeTagAll(){
-      let flag=this.ctypeList.some(item=>{
+    stagList() { //计算出选择的内容
+      let list = [];
+      if (this.keyword) {
+        list.push({
+          type: 0,
+          id: 'keyword',
+          name: this.keyword,
+          checked: true
+        })
+      }
+      this.ctypeList.forEach(item => {
+        if (item.checked) {
+          list.push(item);
+        }
+      });
+      this.oneList.forEach(one => {
+        var twoChildChecked = false;//是否有下级
+        one.children.forEach(two => {
+          if (two.checked) {
+            twoChildChecked = true;
+          }
+          var threeChildChecked = false;
+          two.children.forEach(three => {
+            if (three.checked) {
+              list.push(three);
+              threeChildChecked = true;
+            }
+          });
+          if (two.checked && !threeChildChecked) {
+            list.push(two);
+          }
+        });
+        if (one.checked && !twoChildChecked) {
+          list.push(one);
+        }
+      })
+      // this.oneList.forEach(item=>{
+      //   if(item.checked){
+      //     list.push(item);
+      //   }
+      // });
+      // this.twoList.forEach(item=>{
+      //   if(item.checked){
+      //     list.push(item);
+      //   }
+      // });
+      // this.threeList.forEach(item=>{
+      //   if(item.checked){
+      //     list.push(item);
+      //   }
+      // });
+      //console.log(list,'list');
+      return list;
+    },
+    ctypeTagAll() {
+      let flag = this.ctypeList.some(item => {
         return item.checked;
       });
       return !flag;
     },
-    oneTagAll(){
-      let flag=this.oneList.some(item=>{
-        return item.checked;
-      });
-      return !flag;
-    },
-    twoTagAll(){
-      let flag=this.twoList.some(item=>{
-        return item.checked;
-      });
-      return !flag;
-    },
-    threeTagAll(){
-      let flag=this.threeList.some(item=>{
-        return item.checked;
-      });
-      return !flag;
-    }
+    // oneTagAll() {
+    //   let flag = this.oneList.some(item => {
+    //     return item.checked;
+    //   });
+    //   return !flag;
+    // },
+    // twoTagAll() {
+    //   let flag = this.twoList.some(item => {
+    //     return item.checked;
+    //   });
+    //   return !flag;
+    // },
+    // threeTagAll() {
+    //   let flag = this.threeList.some(item => {
+    //     return item.checked;
+    //   });
+    //   return !flag;
+    // }
   },
   data() {
     return {
+      newData: false,//线上品牌系列隐藏
+      navTitle: [],
+      // 设置高亮
+      twoId: '',
+      count: 0,//分页总条条数
       showUClass: false,
-      ctypeList:[
-        {type:1,id:20,name:'录播课',checked:false},
-        {type:1,id:30,name:'线下课',checked:false},
-        {type:1,id:40,name:'学习项目',checked:false},
+      ctypeList: [
+        { type: 1, id: 20, name: '录播课', checked: false },
+        { type: 1, id: 30, name: '线下课', checked: false },
+        { type: 1, id: 40, name: '学习项目', checked: false },
       ],
-      oneList:[], //一级分类{type:11}
-      twoList:[], //二级分类{type:12}
-      threeList:[],//三级分类{type:13}
+      id: '',
+      oneList: [], //一级分类{type:11}
+      twoList: [], //二级分类{type:12}
+      threeList: [],//三级分类{type:13}
       searching:false,//是否正在搜索中
-      resonimg:{},
+
+      resonimg: {},
       formatDate,
-      formatNum:formatUserNumber,
-      audiences:[],//当前用户的受众
+      formatNum: formatUserNumber,
+      audiences: [],//当前用户的受众
       couretitle: "",
       toScore,
       noPageList: true, //判断接口是否还有数据
@@ -493,12 +647,12 @@ export default {
       course: {
         orderField: "studys",
         companyId:'',
-        keyword:'',//关键词
+        keyword: '',//关键词
         topOrder: true,
         orderAsc: false,
         pageIndex: 1, // 第几页
-        pageSize: 9 ,//每页多少条
-        openCourse:0,//增加的公开课查询
+        pageSize: 9,//每页多少条
+        openCourse: 0,//增加的公开课查询
       },
       sceneList: [], //场景
       keyword: "",//查询的关键字
@@ -520,22 +674,22 @@ export default {
       searchRecords: [],
       hotList: [],
       totalPages: 1,
-      localSessionKey:this.$xpage.constants.localCourseFiltersKey
+      localSessionKey: this.$xpage.constants.localCourseFiltersKey
     };
   },
 
   mounted() {
     let screenWidth = window.screen.availWidth;
-    if (screenWidth < 1280) {
-      this.course.pageSize = 9;
-      this.columns = 3;
-    } else if (screenWidth < 1600) {
-      this.course.pageSize = 12;
-      this.columns = 3;
-    } else if (screenWidth >= 1600) {
-      this.course.pageSize = 15;
-      this.columns = 3;
-    }
+    // if (screenWidth < 1280) {
+    //   this.course.pageSize = 9;
+    //   this.columns = 3;
+    // } else if (screenWidth < 1600) {
+    //   this.course.pageSize = 12;
+    //   this.columns = 3;
+    // } else if (screenWidth >= 1600) {
+    //   this.course.pageSize = 15;
+    //   this.columns = 3;
+    // }
 
     let el_top = document.querySelector("#searchbar");
     let el_search = document.querySelector("#searchbar");
@@ -543,8 +697,9 @@ export default {
     let flag = true;
     let $this = this;
     this.getAnkingData();
-    window.addEventListener("scroll",this.handleScroll);
-    if (this.$route.query !== {}) {
+    // window.addEventListener("scroll", this.handleScroll);
+    // if (this.$route.query !== {}) {
+    if (this.$route.query.keyword) {
       this.keyword = this.$route.query.keyword;
     }
     this.loadTypeData();//加载分类
@@ -552,42 +707,48 @@ export default {
     if (this.keyword) {
       this.totalPages = 4;
     }
-
+    //新加
+    this.refId = this.$route.query.recommendId;
+    if (this.refId) {
+      this.course.type = 'recommend'
+    }
     this.loadSysTypes();
     this.getScoreList();
     this.getHotList();
+    // this.toCourseDetail(item);
+    // this.orderChange(id);
     //查询排行榜，页面打开只查询一次
-    let localKey="user_"+this.userInfo.sysId+"_gids";
-    if(this.audiences.length==0){
-       //let hasIds;
-       let hasIds=sessionStorage.getItem(localKey);
-       if(hasIds && hasIds.length>0){
-         this.audiences=hasIds.split(",");
-         this.search();
-       }else{
-         apiUserbasic.getInAudienceIds().then(rs=>{
-            if(rs.status==200){
-               this.audiences=rs.result;
-               sessionStorage.setItem(localKey,this.audiences);
-            }else{
-              console.log(rs.message);
-            }
-            this.search();
-         })
-         // Promise.all([apiOldCourse.audience(this.userInfo.sysId),apiUserGroup.userGroupIds()]).then(rs=>{
-         //    //console.log(rs,'rs');
-         //    let aids=[];
-         //    if(rs[0].status==200){
-         //      aids.push(rs[0].result);
-         //    }
-         //    if(rs[1].status==200){
-         //      aids.push(rs[1].result);
-         //    }
-         //    this.audiences=aids;
-         //    sessionStorage.setItem(localKey,this.audiences);
-         //    this.search();
-         // })
-       }
+    let localKey = "user_" + this.userInfo.sysId + "_gids";
+    if (this.audiences.length == 0) {
+      //let hasIds;
+      let hasIds = sessionStorage.getItem(localKey);
+      if (hasIds && hasIds.length > 0) {
+        this.audiences = hasIds.split(",");
+        this.search();
+      } else {
+        apiUserbasic.getInAudienceIds().then(rs => {
+          if (rs.status == 200) {
+            this.audiences = rs.result;
+            sessionStorage.setItem(localKey, this.audiences);
+          } else {
+            console.log(rs.message);
+          }
+          this.search();
+        })
+        // Promise.all([apiOldCourse.audience(this.userInfo.sysId),apiUserGroup.userGroupIds()]).then(rs=>{
+        //    //console.log(rs,'rs');
+        //    let aids=[];
+        //    if(rs[0].status==200){
+        //      aids.push(rs[0].result);
+        //    }
+        //    if(rs[1].status==200){
+        //      aids.push(rs[1].result);
+        //    }
+        //    this.audiences=aids;
+        //    sessionStorage.setItem(localKey,this.audiences);
+        //    this.search();
+        // })
+      }
     }
 
     //this.searchterm();//搜索词已经没有了
@@ -595,9 +756,22 @@ export default {
 
   },
   beforeDestroy() {
-    window.removeEventListener("scroll", this.handleScroll);
+    // window.removeEventListener("scroll", this.handleScroll);
   },
   methods: {
+    // 改变分页
+    currentChange(val) {
+      this.course.pageIndex = val
+      this.search()
+    },
+    // 移入
+    changeIndex(twoId) {
+      this.twoId = twoId
+    },
+    // 移除
+    leaveIndex() {
+      this.twoId = ''
+    },
     tylClick() {
       window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130");
     },
@@ -609,172 +783,207 @@ export default {
         this.showUClass = flag;
       }
     },
-    uClassClick(){
+    uClassClick() {
       this.showUClass = true;
     },
-    saveLocalFilters(){
-        let typeCodeList=[];
-        this.stagList.forEach(item=>{
-          typeCodeList.push({
-            type:item.type,
-            id:item.id,
-            name:item.name
+    saveLocalFilters() {
+      let typeCodeList = [];
+      this.stagList.forEach(item => {
+        typeCodeList.push({
+          type: item.type,
+          id: item.id,
+          name: item.name
+        })
+      });
+      let typeCodeString = JSON.stringify(typeCodeList);
+      //console.log(typeCodeString);
+      sessionStorage.setItem(this.localSessionKey, typeCodeString);
+    },
+    loadLocalFilters() {
+      let hasData = sessionStorage.getItem(this.localSessionKey);
+      let $this = this;
+      if (hasData) {
+        // let typeCodeList=JSON.parse(hasData);
+        // typeCodeList.forEach(item=>{
+        //    if(item.type==0){
+        //       this.keyword=item.name;
+        //    }else if(item.type==1){
+        //       if(item.id==20){
+        //         $this.ctypeList[0].checked=true;
+        //       }else if(item.id==30){
+        //         $this.ctypeList[1].checked=true;
+        //       }else if(item.id==40){
+        //         $this.ctypeList[2].checked=true;
+        //       }
+        //    }else{ //三级分类的处理，如果一个分类选中多个，显示哪个，显示第一个，是否可以
+
+        //    }
+        // })
+      }
+    },
+    //搜索条件
+    stagClose(tag, tagIndex) {
+      tag.checked = false;
+      if (tag.type == 0) {
+        this.keyword = '';
+      }
+      this.navTitle = []
+      this.searchData();
+    },
+
+    // 导航全选
+    handleTypeAllClick(t) {
+      if (t == 1) {
+        this.ctypeList.forEach(ct => {
+          ct.checked = false;
+        })
+      } else if (t == 11) {
+        this.oneList.forEach(ct => {
+          ct.checked = true;
+        });
+        this.twoList.forEach(ct => {
+          ct.checked = true;
+        });
+        this.threeList.forEach(ct => {
+          ct.checked = false;
+        });
+        this.twoList = [];
+        this.threeList = [];
+      } else if (t == 12) {
+        this.twoList.forEach(ct => {
+          ct.checked = false;
+        });
+        this.threeList.forEach(ct => {
+          ct.checked = false;
+        });
+        this.threeList = [];
+      } else if (t == 13) {
+        this.threeList.forEach(ct => {
+          ct.checked = false;
+        })
+      }
+      this.searchData();
+    },
+    // 清除
+    handleClearTags() {
+      //清空所有的条件
+      this.keyword = '';
+      this.ctypeList.forEach(item => {
+        item.checked = false;
+      });
+      this.oneList.forEach(one => {
+        one.checked = false;
+        one.children.forEach(two => {
+          two.checked = false;
+          two.children.forEach(three => {
+            three.checked = false;
           })
-        });
-        let typeCodeString=JSON.stringify(typeCodeList);
-        //console.log(typeCodeString);
-        sessionStorage.setItem(this.localSessionKey,typeCodeString);
-    },
-    loadLocalFilters(){
-       let hasData=sessionStorage.getItem(this.localSessionKey);
-       let $this=this;
-       if(hasData){
-         // let typeCodeList=JSON.parse(hasData);
-         // typeCodeList.forEach(item=>{
-         //    if(item.type==0){
-         //       this.keyword=item.name;
-         //    }else if(item.type==1){
-         //       if(item.id==20){
-         //         $this.ctypeList[0].checked=true;
-         //       }else if(item.id==30){
-         //         $this.ctypeList[1].checked=true;
-         //       }else if(item.id==40){
-         //         $this.ctypeList[2].checked=true;
-         //       }
-         //    }else{ //三级分类的处理，如果一个分类选中多个，显示哪个，显示第一个，是否可以
-
-         //    }
-         // })
-       }
-    },
-    stagClose(tag,tagIndex){
-      tag.checked=false;
-      if(tag.type==0){
-         this.keyword='';
-      }
-      this.searchData();
-    },
-
-    handleTypeAllClick(t){
-      if(t==1){
-        this.ctypeList.forEach(ct=>{
-          ct.checked=false;
         })
-      }else if(t==11){
-        this.oneList.forEach(ct=>{
-          ct.checked=false;
-        });
-        this.twoList.forEach(ct=>{
-          ct.checked=false;
-        });
-        this.threeList.forEach(ct=>{
-          ct.checked=false;
-        });
-        this.twoList=[];
-        this.threeList=[];
-      }else if(t==12){
-        this.twoList.forEach(ct=>{
-          ct.checked=false;
-        });
-        this.threeList.forEach(ct=>{
-          ct.checked=false;
-        });
-        this.threeList=[];
-      }else if(t==13){
-        this.threeList.forEach(ct=>{
-          ct.checked=false;
-        })
-      }
+      });
+      this.twoList = [];
+      this.threeList = [];
+      this.navTitle = [];
+      this.newData = false;
       this.searchData();
     },
-    handleClearTags(){
-       //清空所有的条件
-       this.keyword='';
-       this.ctypeList.forEach(item=>{
-         item.checked=false;
-       });
-       this.oneList.forEach(one=>{
-         one.checked=false;
-         one.children.forEach(two=>{
-            two.checked=false;
-            two.children.forEach(three=>{
-              three.checked=false;
-            })
-         })
-       });
-       this.twoList=[];
-       this.threeList=[];
-       this.searchData();
-    },
-    handleTypeClick(item,list){
-      item.checked=!item.checked;
-       //使用上面一行是可以多选，使用下面是单选
-      // list.forEach(row=>{
-      //   row.checked=false;
-      // })
-      // item.checked=true;
-
-      this.searchData();
-    },
-    handleOptionClick(item,list,level){
-      item.checked=!item.checked;
+    // 导航切换(录播课，线下课，学习项目)
+    handleTypeClick(item, list) {
+      item.checked = !item.checked;
       //使用上面一行是可以多选，使用下面是单选
       // list.forEach(row=>{
       //   row.checked=false;
       // })
       // item.checked=true;
-      //以下是新的规则的修改，
-      if(!item.checked){
-        //清空它下面的所有的中的
-        item.children.forEach(subItem=>{
-          subItem.checked=false;
-          if(subItem.children){
-            subItem.children.forEach(sub=>{
-              sub.checked=false;
-            })
+
+      this.searchData();
+    },
+    //三级分类
+    handleOptionClick(item, level, list) {
+      // 线上品牌展示效果
+      this.newData = item.newData;
+      console.log(this.newData);
+      // 单选，排除法
+      this.oneList.forEach(one => {
+        one.checked = false;
+        if (one.id == item.id) {
+          this.navTitle = [{ ...one }]
+          one.checked = true;
+        }
+        one.children.forEach(two => {
+          two.checked = false;
+          if (two.id == item.id) {
+            this.navTitle = [{ ...one }, { ...two }]
+            two.checked = true
           }
-        });
-        if(level==1){
-          this.twoList=[];
-          this.threeList=[];
-        }
-        if(level==2){
-          this.threeList=[];
-        }
-        this.searchData();
-        return;
-      }
+          two.children.forEach(three => {
+            three.checked = false;
+            if (three.id == item.id) {
+              this.navTitle = [{ ...one }, { ...two }, { ...three }]
+              three.checked = true
+            }
+          })
+        })
+      })
 
-      let $this=this;
-      if(level==1){ //一级的情况
-        this.twoList=[];
-        this.threeList=[];
-        let lastCheked=null;
-        item.children.forEach(two=>{
-           $this.twoList.push(two);
-           if(two.checked){
-             lastCheked=two;
-           }
-        });
-        if(lastCheked!=null){
-          $this.threeList=lastCheked.children;
-            item.children.forEach(three=>{
-          });
-        }
-      }else if(level==2){ //二级的情况
-          this.threeList=item.children;
-      }else if(level==3){ //三级的情况
+      // item.checked = !item.checked;
+      //使用上面一行是可以多选，使用下面是单选
+      // list.forEach(row => {
+      //   row.checked = false;
+      // })
+      // item.checked = true;
+      // //以下是新的规则的修改，
+      // if (!item.checked) {
+      //   //清空它下面的所有的中的
+      //   item.children.forEach(subItem => {
+      //     subItem.checked = false;
+      //     if (subItem.children) {
+      //       subItem.children.forEach(sub => {
+      //         sub.checked = false;
+      //       })
+      //     }
+      //   });
+      //   if (level == 1) {
+      //     this.twoList = [];
+      //     this.threeList = [];
+      //   }
+      //   if (level == 2) {
+      //     this.threeList = [];
+      //   }
+      //   this.searchData();
+      //   return;
+      // }
 
-      }
+      // let $this = this;
+      // if (level == 1) { //一级的情况
+      //   this.twoList = [];
+      //   this.threeList = [];
+      //   let lastCheked = null;
+      //   item.children.forEach(two => {
+      //     $this.twoList.push(two);
+      //     if (two.checked) {
+      //       lastCheked = two;
+      //     }
+      //   });
+      //   if (lastCheked != null) {
+      //     $this.threeList = lastCheked.children;
+      //     item.children.forEach(three => {
+      //     });
+      //   }
+      // } else if (level == 2) { //二级的情况
+      //   this.threeList = item.children;
+      // } else if (level == 3) { //三级的情况
+
+      // }
       //this.handleChangeTypes(item);
       this.searchData();
     },
-    handleChangeTypes(item){
+    // 无用
+    handleChangeTypes(item) {
       console.log(item);
       //重新计算
-      this.twoList=[];
-      this.threeList=[];
-      let $this=this;
+      this.twoList = [];
+      this.threeList = [];
+      let $this = this;
       // this.oneList.forEach(one=>{
       //   if(one.checked){
       //      one.children.forEach(two=>{
@@ -800,46 +1009,61 @@ export default {
         }
       })
     },
+    // 加载分类
     async loadTypeData() {
-      let $this=this;
+      let $this = this;
       try {
         const { result, status } = await apiType.tree(1);
         if (status === 200) {
-          let tree=[];
-          result.forEach(item=>{
-             let newItem={
-               type:11,
-               id:item.id,
-               name:item.name,
-               children:[],
-               checked:false
-             }
-             if(item.children){
-                item.children.forEach(subItem=>{
-                  let newSubItem={
-                    type:12,
-                    id:subItem.id,
-                    name:subItem.name,
-                    children:[],
-                    checked:false
-                  }
+          let tree = [];
+          result.forEach((item, index) => {
+            let newItem = {
+              type: 11,
+              id: item.id,
+              name: item.name,
+              children: [],
+
+              checked: false
+            }
+            if (item.children) {
+              //增加死数据
+              item.children.push({
+                type: 12,
+                id: item.id * (index + 200),
+                name: '线上品牌系列课程',
+                children: [],
+                checked: false,
+                newData: true
+              })
+              item.children.forEach(subItem => {
+                let newSubItem = {
+                  type: 12,
+                  id: subItem.id,
+                  name: subItem.name,
+                  children: [],
+                  checked: false,
+                  newData: subItem?.newData || false
+                }
+
+                if (subItem.children) {
+                  subItem.children.forEach(sub => {
+                    let newSub = {
+                      type: 13,
+                      id: sub.id,
+                      name: sub.name,
+                      children: [],
+                      checked: false
+                    }
+                    newSubItem.children.push(newSub);
+                  })
+                }
+                newItem.children.push(newSubItem);
+              })
+            }
+            $this.oneList.push(newItem);
+            console.log(newItem);
+
 
-                  if(subItem.children){
-                    subItem.children.forEach(sub=>{
-                      let newSub={
-                        type:13,
-                        id:sub.id,
-                        name:sub.name,
-                        children:[],
-                        checked:false
-                      }
-                      newSubItem.children.push(newSub);
-                    })
-                  }
-                  newItem.children.push(newSubItem);
-                })
-             }
-             $this.oneList.push(newItem);
           });
           this.loadLocalFilters();
         }
@@ -847,64 +1071,70 @@ export default {
         console.log(error);
       }
     },
+    // 无用
     banJump() {
-      if(this.resonimg.JumpUrl) {
+      if (this.resonimg.JumpUrl) {
         window.open(this.resonimg.JumpUrl);
       }
     },
-    couresreso(){
+    couresreso() {
       let key = 'course';
-      apiPlace.detail(key).then(res=>{
-        let resImgList =  JSON.parse(res.result.content);
-        if(resImgList && resImgList.length>0){
+      apiPlace.detail(key).then(res => {
+        let resImgList = JSON.parse(res.result.content);
+        if (resImgList && resImgList.length > 0) {
           this.resonimg = resImgList[0]
         }
       })
     },
+    // 无用
     jumUX() {
       window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130", "_blank");
     },
-    jumOpen(){
-       //公开课 openCourse=1
-       this.course.openCourse=1;//
-       this.searchData();
+    // 无用
+    jumOpen() {
+      //公开课 openCourse=1
+      this.course.openCourse = 1;//
+      this.searchData();
     },
+    // 头部
     emitInput(val) {
       this.keyword = val;
       //this.stagList;
       this.searchData();
     },
-    handleScroll() {
-      if(this.courseList.length>6){
 
-        let innerHeight = document.querySelector("#couser-list-content").clientHeight;
-        let outerHeight = document.documentElement.clientHeight;
-        let scrollTop = document.documentElement.scrollTop;
-        let outerWidth = document.querySelector(".xcontent2-minor").clientWidth;
-        if (outerHeight + scrollTop + 350 >= innerHeight) {
-          if (this.moreState == 1 && this.course.pageIndex < 4) {
-            this.loadMore();
-          }
-        }
-        //console.log(this.course.pageIndex,'this.course.pageIndex');
-        //加此判断，是为了没有数据时的闪动问题
-        //if(this.course.pageIndex >1){
-          if (scrollTop > 1176) {
-            document.querySelector("#fixd-box").style.cssText =
-              "position: fixed;top: -882px;width:"+outerWidth+"px";
-          } else {
-              document.querySelector("#fixd-box").style.cssText = "position: static";
-          }
-        //}
+    // 滚动
+    // handleScroll() {
+    //   if (this.courseList.length > 6) {
 
-      }
+    //     let innerHeight = document.querySelector("#couser-list-content").clientHeight;
+    //     let outerHeight = document.documentElement.clientHeight;
+    //     let scrollTop = document.documentElement.scrollTop;
+    //     let outerWidth = document.querySelector(".xcontent2-minor").clientWidth;
+    //     if (outerHeight + scrollTop + 350 >= innerHeight) {
+    //       if (this.moreState == 1 && this.course.pageIndex < 4) {
+    //         this.loadMore();
+    //       }
+    //     }
+    //     //console.log(this.course.pageIndex,'this.course.pageIndex');
+    //     //加此判断，是为了没有数据时的闪动问题
+    //     //if(this.course.pageIndex >1){
+    //     if (scrollTop > 1176) {
+    //       document.querySelector("#fixd-box").style.cssText =
+    //         "position: fixed;top: -882px;width:" + outerWidth + "px";
+    //     } else {
+    //       document.querySelector("#fixd-box").style.cssText = "position: static";
+    //     }
+    //     //}
+    //   }
+    // },
 
-    },
-    toNeedCourse() {
+    toNeedCourse() {// 上传
       // 需要先切换标签
       //this.$store.dispatch('SetCurIdentity',2);
       //this.$router.push('/need/course?open=new');
       this.$refs.floatTools.toNeedCourse();
+
     },
     searchData() {
       this.course.pageIndex = 1;
@@ -936,46 +1166,47 @@ export default {
         }
       });
     },
+    //课程列表详情
     toCourseDetail(item) {
-      let $this=this;
-      let courseId=item.id;
-      if(!courseId){
-        courseId=item.courseId;
+      let $this = this;
+      let courseId = item.id;
+      if (!courseId) {
+        courseId = item.courseId;
       }
       if (item.source == 1) {
         //return `${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`;
         //location.href=`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`;
-         this.$router.push('/course/boeframe?id='+courseId+'&type='+item.type);
+        this.$router.push('/course/boeframe?id=' + courseId + '&type=' + item.type);
         //此处使用window.open有问题
         //window.open(`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`);
-      }else if(item.source == 3){
-         //跳转到管理系统的页面
-         let manageApi=process.env.VUE_APP_MANAGER_API_PATH;
-         let studentPath=process.env.VUE_APP_STUDENT_PATH;
-         if (item.type == 30){ //线下课，面授课
-            let params=encodeURIComponent('courseId='+courseId);
-            this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
-         }else if(item.type==40){ //学习项目
-            let params=encodeURIComponent('projectId='+courseId);
-            this.$router.push('/forward?to='+studentPath+'/projectdetails&params='+params);
-            //this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
-         }
+      } else if (item.source == 3) {
+        //跳转到管理系统的页面
+        let manageApi = process.env.VUE_APP_MANAGER_API_PATH;
+        let studentPath = process.env.VUE_APP_STUDENT_PATH;
+        if (item.type == 30) { //线下课，面授课
+          let params = encodeURIComponent('courseId=' + courseId);
+          this.$router.push('/forward?to=' + manageApi + '/stu/project/redirectDetail&params=' + params);
+        } else if (item.type == 40) { //学习项目
+          let params = encodeURIComponent('projectId=' + courseId);
+          this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
+          //this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
+        }
       } else {
-         if (item.type == 10) {
-            //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
-            this.$router.push("/course/studyindex?id=" + courseId);
-         } else if (item.type == 20) {
-           apiCourseStudy.hasSignup(courseId).then(rs=>{
-              if(rs.status==200){
-                //return $this.webBaseUrl + "/course/studyindex?id=" + item.id;
-                this.$router.push("/course/studyindex?id=" + courseId);
-              }else{
-                //return $this.webBaseUrl + "/course/detail?id=" + item.id;
-                this.$router.push("/course/detail?id=" + courseId);
-              }
-           })
+        if (item.type == 10) {
+          //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
+          this.$router.push("/course/studyindex?id=" + courseId);
+        } else if (item.type == 20) {
+          apiCourseStudy.hasSignup(courseId).then(rs => {
+            if (rs.status == 200) {
+              //return $this.webBaseUrl + "/course/studyindex?id=" + item.id;
+              this.$router.push("/course/studyindex?id=" + courseId);
+            } else {
+              //return $this.webBaseUrl + "/course/detail?id=" + item.id;
+              this.$router.push("/course/detail?id=" + courseId);
+            }
+          })
           //return $this.webBaseUrl + "/course/detail?id=" + item.id;
-         }
+        }
       }
     },
     orderChange(id) {
@@ -1007,35 +1238,70 @@ export default {
       const Reg = new RegExp(keyword, 'i');
       let res = '';
       if (val) {
-           res = val.replace(Reg, `<span style="color: #3e7fff;">${keyword}</span>`);
-         return res;
-       }
+        res = val.replace(Reg, `<span style="color: #3e7fff;">${keyword}</span>`);
+        return res;
+      }
     },
-    getAllChecked(){ //获取全部选中的标签
-       let list=[];
+    brightenKeywords(val, keyword) {
+      if (!val) return
+      const keywordData = val.filter(item => item.indexOf(keyword) != -1)
+      const Reg = new RegExp(keyword, 'i');
+      return keywordData.map(item => {
+        let color = '#e89e42'
+        let equalityColor = '#387DF7'
+        let listData = item.replace(Reg, `<span style="color: ${item == keyword ? equalityColor : color};">${keyword}</span>`)
+        const regex = /(.*?)(<span.*?>)(.*?)(<\/span>)(.*)/i;
+        const match = regex.exec(listData);
+        console.log(match);
+        const contentStart = match[1];
+        const spanTag = match[2];
+        const content = match[3];
+        const spanEnd = match[4];
+        const contentEnd = match[5];
+        let modifiedStr = '';
+        if (!contentStart) {
+          modifiedStr = `${spanTag}${content.substring(0, 3)}${spanEnd}${content.length == 1 ? contentEnd.substring(0, 2) : content.length == 2 ? contentEnd.substring(0, 1) : ''}`
+        } else if (contentStart.length == 1) {
+          modifiedStr = `${contentStart}${spanTag}${content.substring(0, 2)}${spanEnd}${content.length == 1 ? contentEnd.substring(0, 1) : ''}`
+        } else if (contentStart.length == 2) {
+          modifiedStr = `${contentStart}${spanTag}${content.substring(0, 1)}${spanEnd}`
+        } else {
+          modifiedStr = contentStart.substring(0, 3)
+        }
+        console.log(modifiedStr);
+        return {
+          name: modifiedStr,
+          title: listData,
+          showTitle: item.length > 3
+        }
+      })
+    },
+    getAllChecked() { //获取全部选中的标签
+      let list = [];
 
-       this.ctypeList.forEach(item=>{
-         if(item.checked){
-           list.push(item);
-         }
-       });
-       this.oneList.forEach(one=>{
-           one.children.forEach(two=>{
-              two.children.forEach(three=>{
-                 if(three.checked){
-                   list.push(three);
-                 }
-              });
-              if(two.checked ){
-                list.push(two);
-              }
-           });
-           if(one.checked){
-             list.push(one);
-           }
-       })
-       return list;
+      this.ctypeList.forEach(item => {
+        if (item.checked) {
+          list.push(item);
+        }
+      });
+      this.oneList.forEach(one => {
+        one.children.forEach(two => {
+          two.children.forEach(three => {
+            if (three.checked) {
+              list.push(three);
+            }
+          });
+          if (two.checked) {
+            list.push(two);
+          }
+        });
+        if (one.checked) {
+          list.push(one);
+        }
+      })
+      return list;
     },
+    // 查询
     async search() {
       //
       if(this.searching){
@@ -1053,37 +1319,37 @@ export default {
         apiSearchterm.save({ keyword: this.course.keyword, type: 1 });
       }
 
-      if(this.audiences.length>0){
-        this.course.audiences=this.audiences.join(",");
+      if (this.audiences.length > 0) {
+        this.course.audiences = this.audiences.join(",");
       }
       //console.log(this.userInfo)
-      this.course.companyId=this.userInfo.companyId;
+      //this.course.companyId=this.userInfo.companyId;
       this.course.type = "";//不使用单查询了
       this.course.types = "";
       this.course.sysType1 = "";
       this.course.sysType2 = "";
       this.course.sysType3 = "";
-      this.course.keyword=this.keyword;
-      let allChecked=this.getAllChecked();
-      allChecked.forEach(item=>{
-        if(item.type==1){
-            if(that.course.types){ that.course.types+='-'; }
-            that.course.types+=item.id;
-        }else if(item.type==11){
-            if(that.course.sysType1){ that.course.sysType1+='-'; }
-            that.course.sysType1+=item.id;
-        }else if(item.type==12){
-            if(that.course.sysType2){ that.course.sysType2+='-'; }
-            that.course.sysType2+=item.id;
-        }else if(item.type==13){
-            if(that.course.sysType3){ that.course.sysType3+='-'; }
-            that.course.sysType3+=item.id;
+      this.course.keyword = this.keyword;
+      let allChecked = this.getAllChecked();
+      allChecked.forEach(item => {
+        if (item.type == 1) {
+          if (that.course.types) { that.course.types += '-'; }
+          that.course.types += item.id;
+        } else if (item.type == 11) {
+          if (that.course.sysType1) { that.course.sysType1 += '-'; }
+          that.course.sysType1 += item.id;
+        } else if (item.type == 12) {
+          if (that.course.sysType2) { that.course.sysType2 += '-'; }
+          that.course.sysType2 += item.id;
+        } else if (item.type == 13) {
+          if (that.course.sysType3) { that.course.sysType3 += '-'; }
+          that.course.sysType3 += item.id;
         }
       });
 
       this.isFind = true;
       this.course.device = 1;
-      if(this.course.pageIndex == 1) {
+      if (this.course.pageIndex == 1) {
         this.courseList = [];
       }
 
@@ -1092,46 +1358,94 @@ export default {
       this.moreState = 2;
         await apiCoursePortal.courseSearch(this.course).then(res => {
             this.searching=false;
-            if (res.status == 200 && res.result.list.length > 0) {
+            if (res.status == 200) {
               this.totalPages = res.result.totalPages;
               res.result.list.forEach(item => {
-                // item.startTime
-                if(item.startTime != '') {
-                  item.startTime=formatDateByFmt(new Date(item.startTime*1000),'yyyy-MM-dd hh:mm')
-                  //let time = item.startTime.split('-');
-                  //item.startTime = `${time[0]}年${time[1]}月${time[2]}日`
-                }
-                //教师转化
-                if(item.teacher){
-                   let dotIdx=item.teacher.indexOf(',');
-                   if(dotIdx>0){
-                      item.teacher=item.teacher.substring(0,dotIdx);
-                   }
-                }
-                if(item.teacher && item.teacher=='BOE教师'){
-                  item.teacher='';
-                }
-
-                //转化标红显示
-                item.title=item.name;
-                if(that.course.keyword){
-                  item.name=that.brightenKeyword(item.name,that.course.keyword);
-                }else{
-                  item.name=item.name;
-                }
-
-              });
-
-              this.courseList.push(...res.result.list);
-              this.moreState = 1;
-            } else {
-              this.moreState = 3;
+            if (item.startTime != '') {
+              item.startTime = formatDateByFmt(new Date(item.startTime * 1000), 'yyyy-MM-dd hh:mm')
+              //let time = item.startTime.split('-');
+              //item.startTime = `${time[0]}年${time[1]}月${time[2]}日`
+            }
+            //教师转化
+            if (item.teacher) {
+              let dotIdx = item.teacher.indexOf(',');
+              if (dotIdx > 0) {
+                item.teacher = item.teacher.substring(0, dotIdx);
+              }
+            }
+            if (item.teacher && item.teacher == 'BOE教师') {
+              item.teacher = '';
+            }
+
+            //转化标红显示
+            item.title = item.name;
+            if (that.course.keyword) {
+              item.name = that.brightenKeyword(item.name, that.course.keyword);
+              item.keywordsActive = that.brightenKeywords(item.keywordsList, that.course.keyword)
+              console.log(item.keywordsActive);
+            } else {
+              item.name = item.name;
             }
-          })
-          .catch(err => {
-            this.moreState = 3;
           });
 
+          this.courseList = res?.result?.list ?? []
+          console.log(this.courseList);
+          if (this.newData) {
+            this.courseList = [
+              {
+              audiences: "",
+              companyId: "",
+              coverImg: "",
+              createdAt: "",
+              device: 3,
+              domainIds: "",
+              duration: 7,
+              endTime: "",
+              esId: "Z4LAbYkBfn0lSHQ9acXX",
+              id: "1091051270927183872",
+              isSetAudience: 0,
+              isTop: 0,
+              keywords: "回归,新建,在线,课程",
+              keywordsList: ['回归', '新建', '在线', '课程'],
+              maxDuration: "",
+              name: "人力资源知识技能晋升（人力资源总监空降现场，为各位答疑解惑",
+              openCourse: 0,
+              openEnroll: 0,
+              orderType: "",
+              publishTime: 1689748779,
+              resOwner: "",
+              score: 5,
+              source: 2,
+              startTime: "",
+              studies: 2,
+              studiesFormat: "",
+              summary: "",
+              sysType1: "966458733088919552",
+              sysType2: "966459050400600064",
+              sysType3: "1060578278816509959",
+              tags: "",
+              teacher: "张学智",
+              teacherCode: "",
+              title: "BOE",
+              topTime: "",
+              type: 20,
+              types: "",
+              remark: '备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备注备'
+              },
+            ]
+          }
+          this.count = res?.result?.count
+          if(this.newData) {
+             this.count = 1
+          }
+          this.moreState = 3
+        } else {
+          this.moreState = 2;
+        }
+      })
+        .catch(err => {
+          this.moreState = 2;
+        });
     },
     // showInApply() {
     //   this.inapply.show = true;
@@ -1148,11 +1462,11 @@ export default {
     getAnkingData() {
       apiCourse.ranking().then(res => {
         if (res.status == 200) {
-          res.result.forEach(item=>{
-            if(item.publishTime != '') {
-              item.coverImg=item.images;
-             let time = item.publishTime.split('-');
-             item.publishTime = `${time[0]}年${time[1]}月${time[2]}日`
+          res.result.forEach(item => {
+            if (item.publishTime != '') {
+              item.coverImg = item.images;
+              let time = item.publishTime.split('-');
+              item.publishTime = `${time[0]}年${time[1]}月${time[2]}日`
             }
           })
           this.ankingList = res.result;
@@ -1160,13 +1474,13 @@ export default {
       });
     },
     getScoreList() {
-      apiCourse.scorelist(5,2).then(res => {
+      apiCourse.scorelist(5, 2).then(res => {
         if (res.status == 200) {
-          res.result.forEach(item=>{
-            if(item.publishTime != '') {
-              item.coverImg=item.images;
-             let time = item.publishTime.split('-');
-             item.publishTime = `${time[0]}年${time[1]}月${time[2]}日`
+          res.result.forEach(item => {
+            if (item.publishTime != '') {
+              item.coverImg = item.images;
+              let time = item.publishTime.split('-');
+              item.publishTime = `${time[0]}年${time[1]}月${time[2]}日`
             }
           })
           this.scorelist = res.result;
@@ -1177,11 +1491,11 @@ export default {
     getHotList() {
       apiCourse.studyCounts(5).then(res => {
         if (res.status == 200) {
-          res.result.forEach(item=>{
-            if(item.publishTime != '') {
-              item.coverImg=item.images;
-             let time = item.publishTime.split('-');
-             item.publishTime = `${time[0]}年${time[1]}月${time[2]}日`
+          res.result.forEach(item => {
+            if (item.publishTime != '') {
+              item.coverImg = item.images;
+              let time = item.publishTime.split('-');
+              item.publishTime = `${time[0]}年${time[1]}月${time[2]}日`
             }
           })
           this.hotList = res.result;
@@ -1192,13 +1506,13 @@ export default {
       //console.log(item.type, "item.type");
       // return console.log(id,type,"fihkj1")
       // if (item.type == 20) {
-        //录播课
-        //  window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
-        this.$router.push(`/course/detail?id=${item.id}`);
+      //录播课
+      //  window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
+      this.$router.push(`/course/detail?id=${item.id}`);
       // }
       // if (item.type == 10) {
-        //微课
-        //  window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
+      //微课
+      //  window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
       //   this.$router.push(`/course/micro?id=${item.id}`);
       // }
     },
@@ -1210,13 +1524,13 @@ export default {
       //console.log(item.type,type,'item.type');
       // return console.log(id,type,"fihkj1")
       // if (type == 20) {
-        //录播课
-        //  window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
-        this.$router.push(`/course/detail?id=${id}`);
+      //录播课
+      //  window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
+      this.$router.push(`/course/detail?id=${id}`);
       // }
       // if (type == 10) {
-        //微课
-        //  window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
+      //微课
+      //  window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
       //   this.$router.push(`/course/micro?id=${id}`);
       // }
     }
@@ -1225,9 +1539,125 @@ export default {
 </script>
 
 <style scoped lang="scss">
+// 标题
+.navTitle {
+  margin-bottom: 20px;
+
+  & a:hover {
+    color: #387DF7;
+  }
+
+  .oneTitle {
+    display: inline-block;
+    cursor: pointer;
+
+    & .titleName:hover {
+      color: #387DF7;
+    }
+  }
+}
+
+// 三级背景高度
+.course-title-style {
+  position: relative;
+  height: 100px;
+  background-image: url('../../../../public/images/courseBg.png');
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+
+  .imgTilte {
+
+    & div:first-child {
+      padding-left: 40px;
+      font-size: 30px;
+      color: #FFFFFF;
+    }
+
+    & div:last-child {
+      padding-left: 40px;
+      font-size: 20px;
+      color: #FFFFFF;
+      opacity: .5;
+      font-family: ArialMT !important;
+    }
+
+  }
+}
+
+// 三级列表
+.course-list {
+  background-color: #fff;
+
+  .course-one {
+    position: relative;
+
+    .course-one-content {
+      cursor: pointer;
+      line-height: 38px;
+      height: 38px;
+      padding-left: 40px;
+      background: linear-gradient(270deg, #F0F7FF 0%, #DDEDFF 100%);
+    }
+
+    // 二级的高亮
+    .courseTwoActive {
+      color: #387DF7;
+      border-image: linear-gradient(90deg, rgba(47, 101, 236, 1), rgba(228, 236, 255, 1)) 1 1 !important;
+    }
+
+    .course-two {
+      position: relative;
+      border-bottom: 1px solid;
+      border-image: linear-gradient(333deg, rgba(243, 243, 243, 1), rgba(227, 227, 227, 1)) 1 1;
+
+      .course-two-content {
+        cursor: pointer;
+        height: 38px;
+        line-height: 38px;
+        font-size: 16px;
+        padding-left: 40px;
+      }
+    }
+
+    .popover {
+      background: linear-gradient(180deg, rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0) 100%);
+    }
+
+  }
+
+}
+
+// 导航
+.topNav {
+  display: flex;
+  margin-bottom: 20px;
+
+  .nav {
+    display: flex;
+    align-items: center;
+
+    .option-item {
+      position: relative;
+
+      .nav-bottbor {
+        position: absolute;
+        top: 130%;
+        left: 0;
+        width: 100%;
+        height: 4px;
+        background: #387DF7;
+        border-radius: 5px;
+      }
+    }
+  }
+}
+
 .u-class {
   ::v-deep .el-dialog {
     border-radius: 15px;
+
     .el-dialog__headerbtn .el-dialog__close {
       color: white;
       position: absolute;
@@ -1235,27 +1665,33 @@ export default {
       right: 15px;
     }
   }
+
   ::v-deep .el-dialog__body {
     padding: 0px;
   }
+
   .ClassBoxContent {
     width: 100%;
     height: 456px;
     // background: red;
     border-radius: 15px;
+
     .ContentBox {
       width: 100%;
       height: 100%;
       position: absolute;
       z-index: 9;
       display: flex;
+
       .left,
       .right {
         height: calc(100% - 30px);
       }
+
       .left {
         padding-left: 30px;
         width: 48%;
+
         .title {
           width: 200px;
           height: 59px;
@@ -1268,12 +1704,14 @@ export default {
           padding-top: 5px;
           text-shadow: 0 6px 3px rgba(96, 85, 243, 0.4);
         }
+
         .jy {
           color: white;
           font-size: 20px;
           margin-top: 87.53px;
           font-weight: 400;
         }
+
         .msg {
           margin-top: 5px;
           color: rgba(255, 255, 255, 0.85);
@@ -1281,6 +1719,7 @@ export default {
           text-align: justify;
           line-height: 20px;
         }
+
         .bottom {
           width: 100px;
           height: 1px;
@@ -1288,9 +1727,11 @@ export default {
           margin-top: 40px;
         }
       }
+
       .right {
         // padding-left: 10px;
         width: 50%;
+
         .tyl {
           cursor: pointer;
           width: calc(100% - 20px);
@@ -1299,14 +1740,17 @@ export default {
           border-radius: 4px;
           height: 160px;
           margin-top: 83px;
+
           .tyl_title {
             width: 100%;
             padding-left: 20px;
             padding-top: 20px;
+
             .tyl_title_img {
               width: 18px;
               height: 18px;
             }
+
             .tyl_title_msg {
               font-size: 20px;
               margin-left: 10px;
@@ -1314,6 +1758,7 @@ export default {
               font-weight: 600;
             }
           }
+
           .tyl_jy {
             margin-top: 6.5px;
             font-size: 14px;
@@ -1321,6 +1766,7 @@ export default {
             padding-left: 20px;
             color: #333333;
           }
+
           .tyl_msg {
             width: 350.36px;
             margin-top: 13px;
@@ -1332,10 +1778,12 @@ export default {
             text-align: justify;
           }
         }
+
         .tyl:hover {
           border: 0.96px solid rgba(140, 105, 242, 1);
           box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.3);
         }
+
         .cyl {
           cursor: pointer;
           width: calc(100% - 20px);
@@ -1344,14 +1792,17 @@ export default {
           border-radius: 4px;
           height: 160px;
           margin-top: 10px;
+
           .tyl_title {
             width: 100%;
             padding-left: 20px;
             padding-top: 20px;
+
             .tyl_title_img {
               width: 18px;
               height: 18px;
             }
+
             .tyl_title_msg {
               font-size: 20px;
               margin-left: 10px;
@@ -1359,6 +1810,7 @@ export default {
               font-weight: 600;
             }
           }
+
           .tyl_jy {
             margin-top: 6.5px;
             font-size: 14px;
@@ -1366,6 +1818,7 @@ export default {
             padding-left: 20px;
             color: #333333;
           }
+
           .tyl_msg {
             width: 350.36px;
             margin-top: 13px;
@@ -1377,12 +1830,14 @@ export default {
             text-align: justify;
           }
         }
+
         .cyl:hover {
           border: 0.96px solid rgba(140, 105, 242, 1);
           box-shadow: 7px 5px 6px 0px rgba(76, 31, 221, 0.24);
         }
       }
     }
+
     .img {
       width: 835px;
       margin-left: -1px;
@@ -1392,176 +1847,231 @@ export default {
     }
   }
 }
-.couresstartTime{
+
+.couresstartTime {
   line-height: 26px;
   height: 26px;
   padding-top: 5px;
   font-size: 14px;
   color: #666;
   // position: absolute;
-    // right:2px;
-    // height: 20px;
-    // bottom: 50px;
+  // right:2px;
+  // height: 20px;
+  // bottom: 50px;
 }
-.interact-bar-value{
+
+.interact-bar-value {
   color: #999;
 }
 
-.couderbox{
+.couderbox {
   // width: 5px;
   // padding: 0;
   // display: inline-block;
   // text-align: center;
 }
-.coures-border{
+
+.coures-border {
   width: 2px;
   height: 15px;
   border-radius: 20%;
   background: #666;
 }
-.notcoures{
+
+.notcoures {
   text-align: center;
-  img{
+
+  img {
     width: 360px;
     height: 226px;
   }
-  h5{
+
+  h5 {
     font-size: 14px;
     color: #333333;
     font-weight: 400;
   }
 }
 
-  .course-type-left {
-        position: absolute;
-        top: 0px;
-        right: 0px;
-        width: 60px;
-        height: 24px;
-        line-height: 24px;
-        text-align: center;
-        background-color: #f99000;
-        border-radius: 2px 4px 2px 14px;
-        font-size: 12px;
-        color: #ffffff;
-        -moz-user-select: none;
-        /*火狐*/
-        -webkit-user-select: none;
-        /*webkit浏览器*/
-        -ms-user-select: none;
-        /*IE10*/
-        -khtml-user-select: none;
-        /*早期浏览器*/
-        user-select: none;
-      }
-  .list-lidex{
-    display: inline-block;
-    display: flex;
-  }
-.course-resources{
+.course-type-left {
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  width: 60px;
+  height: 24px;
+  line-height: 24px;
+  text-align: center;
+  background-color: #f99000;
+  border-radius: 2px 4px 2px 14px;
+  font-size: 12px;
+  color: #ffffff;
+  -moz-user-select: none;
+  /*火狐*/
+  -webkit-user-select: none;
+  /*webkit浏览器*/
+  -ms-user-select: none;
+  /*IE10*/
+  -khtml-user-select: none;
+  /*早期浏览器*/
+  user-select: none;
+}
+
+.list-lidex {
+  display: inline-block;
+  display: flex;
+}
+
+.course-resources {
   margin-top: 24px;
 
-  img{
+  img {
     width: 100%;
     height: 100%;
     border-radius: 8px;
   }
 }
-.course-image-box:hover{
-  transform: scale(1.3) translateY(-15px);
+
+.course-img-box {
+  position: relative;
+}
+
+.course-img-box:hover {
+  transform: scale(1.15) translateY(-15px);
   transition: all 0.6s;
 }
 
+// 关键字卡片的样式
+.keywordInfo-every {
+  display: flex;
+  padding-top: 5px;
 
-.list-active{
+  .keywordInfo {
+    width: 54px;
+    font-size: 12px;
+    line-height: 26px;
+    background: #F2F5F7;
+    border-radius: 4px;
+    position: relative;
+    border: 1px solid #387DF7;
+
+    .keyword-content {
+      color: #387DF7;
+      text-align: center;
+    }
+  }
+
+  & .keywordInfo:last-child {
+    margin-right: 0 !important;
+  }
+
+}
+
+
+.list-active {
   display: none;
   // width: 458px;
-  width:135%;
+  width: 135%;
   height: 165px;
   padding: 20px;
   background: #FFFFFF;
   box-sizing: border-box;
-  box-shadow: 0px 2px 12px 0px rgba(0,0,0,0.05);
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.05);
   border-radius: 2px;
   border: 1px solid #EDEFF0;
   position: absolute;
   top: 30px;
   left: -17.5%;
   z-index: 999;
-  .list-content{
+
+  .list-content {
     display: flex;
     padding-bottom: 10px;
     border-bottom: 1px solid #EDEFF0;
-    .list-img{
+
+    .list-img {
       width: 125px;
       height: 70px;
       position: relative;
-      ::v-deep .el-image{
+
+      ::v-deep .el-image {
         border-radius: 4px !important;
       }
-      img{
+
+      img {
         width: 100%;
         height: 100%;
       }
-      .course-type{
+
+      .course-type {
         position: absolute;
         right: 23.5%;
         // bottom: 26%;
-        top:0;
+        top: 0;
         height: 20;
         line-height: 20px;
         font-size: 12px;
         color: #FFFFFF;
         padding: 0px 8px;
-        background: #f99000 ;
+        background: #f99000;
         border-radius: 0px 0px 0px 10px;
       }
     }
-    .list-text{
+
+    .list-text {
       flex: 1;
+
       // margin-left: 12px;
-      h6{
+      h6 {
         font-size: 14px;
         margin: 0px;
         font-weight: 500;
         line-height: normal;
         color: #04243C;
       }
-      span{
+
+      span {
         font-size: 14px;
         color: #6E7B84;
       }
     }
   }
-  .list-bottom{
+
+  .list-bottom {
     padding-top: 10px;
-    ::v-deep .interact-bar-btns{
+
+    ::v-deep .interact-bar-btns {
       justify-content: space-between !important;
-      .interact-bar-btn{
+
+      .interact-bar-btn {
         margin: 0 !important;
       }
     }
   }
 }
-.list-info{
+
+.list-info {
   position: relative;
-  .span{
+
+  .span {
     display: flex;
   }
 }
-.list-info:hover .list-active{
+
+.list-info:hover .list-active {
   // transition: all 0.5s;
   display: block;
 }
 
-.course-banner{
-  height: 240px;
-  background: url('../../../../public/images/course-banner.png');
+.course-banner {
+  // height: 240px;
+  // background: url('../../../../public/images/course-banner.png');
+  background-color: #0078FC;
 }
 
-::v-deep .el-radio-button{
-  margin-right:0px;
+::v-deep .el-radio-button {
+  margin-right: 0px;
 }
+
 ::v-deep .title-line-ellipsis {
   // width: 100%;
   display: -webkit-box;
@@ -1572,17 +2082,21 @@ export default {
   box-sizing: border-box;
   word-break: break-all;
 }
+
 ::v-deep .el-card__body {
   padding: 0;
 }
+
 ::v-deep .bacolor:nth-child(odd) {
   background-color: #fff;
   padding: 0 5px;
 }
+
 ::v-deep .bacolor:nth-child(even) {
   background-color: #f6f6f6;
   padding: 0 5px;
 }
+
 .Uxtext {
   font-weight: 450;
   margin-top: 5px;
@@ -1592,12 +2106,14 @@ export default {
   cursor: pointer;
   position: relative;
 }
+
 .uxicon {
   font-size: 10px;
   position: absolute;
   top: -14px;
   left: 98%;
 }
+
 // .el-radio-button{
 //   margin-right: 10px;
 //   margin-bottom: 10px;
@@ -1612,9 +2128,11 @@ export default {
 .el-radio-group {
   vertical-align: top;
 }
+
 ::v-deep .el-radio-button__inner {
   background: none;
 }
+
 ::v-deep .el-radio-button:first-child .el-radio-button__inner {
   border-left: none;
   // border-radius: 4px 0 0 4px;
@@ -1626,6 +2144,7 @@ export default {
   font-size: 14px;
   color: #6E7B84;
 }
+
 .item-line {
   padding-left: 2px;
   height: 20px;
@@ -1636,6 +2155,7 @@ export default {
   position: relative;
   display: inline-block;
   outline: 0;
+
   span {
     padding: 7px 15px;
     font-size: 12px;
@@ -1656,6 +2176,7 @@ export default {
     transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
   }
 }
+
 .searchbar {
   background-color: #ffffff;
   // border: 1px solid #f3f3f3;
@@ -1670,8 +2191,10 @@ export default {
   z-index: 999;
   height: 50px;
 }
+
 .content-div {
   .quyer-tag {
+
     // margin-left: 10px;
     .order-class {
       margin: 30px 0;
@@ -1681,16 +2204,19 @@ export default {
       padding: 4px 8px;
       margin-right: 30px;
     }
+
     .actice {
       background: #387DF7;
       color: #fff;
     }
   }
+
   /* 分页div */
   .pagination-div {
     text-align: center;
     padding: 10px 0;
     margin: 10px;
+
     .pag-text {
       border: 1px solid #292828;
       padding: 10px 20px;
@@ -1698,23 +2224,28 @@ export default {
       background: #fff;
       cursor: pointer;
     }
+
     .pag-text-msg {
       padding: 10px 20px;
       background: #fff;
     }
   }
+
   .search-div {
     background: #fff;
     padding: 10px 25px;
     border-radius: 8px;
+
     ::v-deep .el-input {
       width: 420px;
       height: 38px;
       margin-bottom: 13px;
+
       .el-input__inner {
         height: 38px;
         border-radius: 0;
       }
+
       .el-input-group__append {
         width: 44px;
         height: 38px;
@@ -1722,6 +2253,7 @@ export default {
         padding: 0;
         background: #3e7fff;
         border-radius: 0;
+
         .el-button {
           margin: 0;
           border: 0;
@@ -1731,6 +2263,7 @@ export default {
           display: flex;
           justify-content: center;
           align-items: center;
+
           .el-icon-search {
             color: #fff;
             font-size: 22px;
@@ -1738,6 +2271,7 @@ export default {
         }
       }
     }
+
     // .tip{
     //   color:#999999;
     //   font-size: 12px;
@@ -1749,28 +2283,46 @@ export default {
     .search-item {
       // padding: 10px 0;
     }
+
     .search-item:not(:last-child) {
       // border-bottom: 1px solid #dfdfdf;
     }
+
     .search-item-sub {
       // margin-top: 10px;
       display: flex;
     }
   }
+
   .search-div-collapse {
     display: block;
   }
+
   .search-div-expand {
     // display: none;
   }
+
   .search-div-more {
     text-align: center;
   }
 
   .order-div {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     padding: 0px 15px 0 0px;
+
+    .order-count {
+      font-size: 14px;
+      color: #6E7B84;
+
+      span {
+        color: #000;
+      }
+    }
   }
 }
+
 // .course-form {
 //   width: 100%;
 //   margin: 10px 0;
@@ -1794,26 +2346,30 @@ export default {
 //     color: #999999;
 //   }
 // }]
-.search-item-type{
+.search-item-type {
   line-height: 25px;
-  padding-right: 10px;width:85px;
+  padding-right: 10px;
+  width: 85px;
   white-space: nowrap;
 }
-.option-item{
-  font-family:"Menlo", "苹方-简" !important;
-  color:#3d3d3d;
+
+.option-item {
+  font-family: "Menlo", "苹方-简" !important;
+  color: #3d3d3d;
   display: inline-block;
   font-size: 14px;
   margin: 0px 15px;
 }
-.option-border{
+
+.option-border {
   width: 2px;
   display: inline-block;
   height: 15px;
   margin: 0px 20px -2px 20px;
   background: #666;
 }
-.option-active{
-  color:#387DF7;
+
+.option-active {
+  color: #387DF7;
 }
 </style>
diff --git a/src/views/portal/user/Message.vue b/src/views/portal/user/Message.vue
index 03021036..cde75512 100644
--- a/src/views/portal/user/Message.vue
+++ b/src/views/portal/user/Message.vue
@@ -17,15 +17,16 @@
           </el-radio-group> -->
         </div>
         <div>
-          <el-button style="margin-left: 25px;" :disabled="disabledReadAll" :class="{navbut:!disabledReadAll}" type="text" @click="isReadChooseList">设置已读</el-button>
+          <el-button style="margin-left: 25px;" :disabled="disabledReadAll" :class="{ navbut: !disabledReadAll }"
+            type="text" @click="isReadChooseList">设置已读</el-button>
           <el-button class="navbut" type="text" @click="delChooseList">删除所选</el-button>
         </div>
       </div>
       <div style="background-color: #FFFFFF;min-height: 600px;">
-        <p style="line-height:30px;text-align: center;">{{showMessage}}</p>
+        <p style="line-height:30px;text-align: center;">{{ showMessage }}</p>
 
 
-        <!-- 临时增加，上线一段时间后删除   开始 
+        <!-- 临时增加，上线一段时间后删除   开始
         <div class="msg-list">
           <a href="javascript:void(0);">
           <div class="msg-top">
@@ -45,16 +46,16 @@
 
         <div class="msg-list">
           <a href="javascript:void(0);">
-          <div class="msg-top">
-            <div>
-              <span style="padding-right: 10px;"><el-checkbox disabled></el-checkbox></span>
-              <span @click="showMsgDg()">系统消息</span>
+            <div class="msg-top">
+              <div>
+                <span style="padding-right: 10px;"><el-checkbox disabled></el-checkbox></span>
+                <span @click="showMsgDg()">系统消息</span>
+              </div>
             </div>
-          </div>
-          <div class="msg-body" @click="dialogMsgVisible=true">
-            <div class="msg-body-content">新功能说明</div>
-          </div>
-          <div class="msg-time">2022-12-30 11:23:33</div>
+            <div class="msg-body" @click="dialogMsgVisible = true">
+              <div class="msg-body-content">新功能说明</div>
+            </div>
+            <div class="msg-time">2022-12-30 11:23:33</div>
           </a>
         </div>
 
@@ -78,40 +79,43 @@
 
 
 
-        <div  class="msg-list" v-for="(item, index) in data" :key="index">
+        <div class="msg-list" v-for="(item, index) in data" :key="index">
 
           <div class="msg-top">
             <div>
-              <span style="padding-right: 10px;"><el-checkbox v-model="item.checked" @change="setCheckAll(item)"></el-checkbox></span>
-              <span v-if="!item.isRead" style="font-size:12px;padding:5px 7px; border-radius: 2px;background: #FF6562;color: #fff;margin-right: 5px">未读</span>
-              <span v-else style="font-size:14px;padding:5px 7px; background: #eee;  border-radius: 2px; color: #666666;margin-right: 5px">已读</span>
+              <span style="padding-right: 10px;"><el-checkbox v-model="item.checked"
+                  @change="setCheckAll(item)"></el-checkbox></span>
+              <span v-if="!item.isRead"
+                style="font-size:12px;padding:5px 7px; border-radius: 2px;background: #FF6562;color: #fff;margin-right: 5px">未读</span>
+              <span v-else
+                style="font-size:14px;padding:5px 7px; background: #eee;  border-radius: 2px; color: #666666;margin-right: 5px">已读</span>
               <!-- <a :href="returnRouter(item)"> -->
-                <span style="cursor: pointer;" @click="returnRouter(item)">{{ item.title }}</span>
+              <span style="cursor: pointer;" @click="returnRouter(item)">{{ item.title }}</span>
             </div>
           </div>
           <div class="msg-body">
-          <!-- <a :href="returnRouter(item)"> -->
-            <div style="cursor: pointer;" @click="returnRouter(item)" class="msg-body-content" v-if="item.content">{{item.tip}}-{{ item.content }}</div>
-            <div style="cursor: pointer;" @click="returnRouter(item)" class="msg-body-content" v-else>{{item.tip}}</div>
-          <!-- </a> -->
-            <div class="msg-body-but">
-                <el-button type="danger" plain   @click="delItem(item)">删除</el-button>
+            <!-- <a :href="returnRouter(item)"> -->
+            <div v-if="item.refType !== '99'">
+              <div style="cursor: pointer;" @click="returnRouter(item)" class="msg-body-content" v-if="item.content">
+                {{ item.tip }}-{{ item.content }}</div>
+              <div style="cursor: pointer;" @click="returnRouter(item)" class="msg-body-content" v-else>{{ item.tip }}
+              </div>
+            </div>
+            <div v-else :class="!item.isRead ? 'infoActive' : ''" style="cursor: pointer;" @click="goRouter(item)"
+              class="msg-body-content">管理员{{ item.acceptName }}向您推荐了案例{{ item.content }}，点击查看>>>
+            </div>
+            <!-- </a> -->
+            <div v-if="item.refType !== '99'" class="msg-body-but">
+              <el-button type="danger" plain @click="delItem(item)">删除</el-button>
             </div>
           </div>
           <div class="msg-time">{{ item.msgTime }}</div>
-
         </div>
       </div>
       <div style="text-align: center;margin-top: 50px" v-if="total > queryData.pageSize">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="queryData.pageIndex"
-          :page-sizes="[2, 4, 6, 8]"
-          :page-size="queryData.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        ></el-pagination>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+          :current-page="queryData.pageIndex" :page-sizes="[2, 4, 6, 8]" :page-size="queryData.pageSize"
+          layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
       </div>
       <!-- <div class="pagination-div" v-if="queryData.pageIndex < totalPages"><span class="pag-text" @click="loadMore()">加载更多</span></div> -->
     </div>
@@ -122,21 +126,21 @@
     <!--  对话框 -->
     <el-dialog :visible.sync="dialogMsgVisible" title="新功能说明" width="30%" append-to-body>
       <div>
-        教师端：<br/>
-        1、支持个人授课记录/案例记录查询<br/>
-        2、支持个人修改/完善教师介绍并在个人主页中展示<br/>
-        <br/>
-        <br/>
-        管理员端：<br/>
-        1、新增学习路径图功能<br/>
-        2、新增学习项目功能<br/>
-        3、新增课程库功能<br/>
-        4、升级案例管理（设置优秀案例等）<br/>
-        5、升级考试功能（试题及提干支持图片，修改已发布考试的部分信息等)<br/>
-        6、课件支持 Scorm 格式<br/>
-        及上述功能配套的学员端功能<br/>
-        <br/>
-        <br/>
+        教师端：<br />
+        1、支持个人授课记录/案例记录查询<br />
+        2、支持个人修改/完善教师介绍并在个人主页中展示<br />
+        <br />
+        <br />
+        管理员端：<br />
+        1、新增学习路径图功能<br />
+        2、新增学习项目功能<br />
+        3、新增课程库功能<br />
+        4、升级案例管理（设置优秀案例等）<br />
+        5、升级考试功能（试题及提干支持图片，修改已发布考试的部分信息等)<br />
+        6、课件支持 Scorm 格式<br />
+        及上述功能配套的学员端功能<br />
+        <br />
+        <br />
         我们会在1月份提供线上操作培训及详细的使用手册，便于大家熟悉和使用新增功能。
       </div>
       <template #footer>
@@ -147,13 +151,6 @@
     </el-dialog>
 
   </div>
-
-
-
-
-
-
-
 </template>
 
 <script>
@@ -162,6 +159,7 @@ import portalHeader from '@/components/PortalHeader.vue';
 import portalFooter from '@/components/PortalFooter.vue';
 import GuideBox from '@/components/Portal/guideBox.vue'
 import apiMessage from '@/api/system/message.js';
+import apiCase from '@/api/modules/cases.js';
 export default {
   name: 'answer',
   components: {
@@ -174,21 +172,21 @@ export default {
   },
   data() {
     return {
-      dialogMsgVisible:false,
+      dialogMsgVisible: false,
       queryData: {
         pageIndex: 1,
         pageSize: 6,
         isRead: null
       },
-      disabledReadAll:false,
+      disabledReadAll: false,
       total: 0,
       checkAll: false,
       data: [],
       totalPages: '',
-      checkedIds:[],
+      checkedIds: [],
       isIndeterminate: false,
       url: '',
-      showMessage:'暂无消息'
+      showMessage: '暂无消息'
     };
   },
   mounted() {
@@ -209,10 +207,10 @@ export default {
     this.isReadChooseList();
   },
   methods: {
-    showMsgDg(){
+    showMsgDg() {
       this.dialogMsgVisible = true;
     },
-    jumResearch(){
+    jumResearch() {
       this.$router.push('/user/research');
       // return this.webBaseUrl + '/src/views/user/myResearch.vue';
     },
@@ -223,27 +221,27 @@ export default {
         this.checkAll = false;
         this.isIndeterminate = false;
       }
-      this.disabledReadAll=false;
+      this.disabledReadAll = false;
       apiMessage.list(this.queryData).then(res => {
         if (res.status == 200) {
           this.totalPages = res.result.totalPages;
           this.total = res.result.count;
-          let allRead=true;
+          let allRead = true;
           res.result.list.forEach(item => {
             let name = this.filterContent(item.content);
-            let num = name.slice(1,name.length);
+            let num = name.slice(1, name.length);
             item.tip = name[0];
             item.content = num.join('-');
             item.checked = false;
-            if(!item.isRead){
-              allRead=false;
+            if (!item.isRead) {
+              allRead = false;
             }
             this.data.push(item);
           });
-          if(allRead){
-            this.disabledReadAll=true;
+          if (allRead) {
+            this.disabledReadAll = true;
           }
-          if(this.total == 0){this.showMessage = '暂无消息';}
+          if (this.total == 0) { this.showMessage = '暂无消息'; }
           this.showMessage = this.total <= 0 ? '暂无消息' : '';
         } else {
           this.$message.error('获取数据失败');
@@ -275,9 +273,9 @@ export default {
     //   }
     // },
     setCheckAll(item) {
-      if(item.checked){
+      if (item.checked) {
         this.checkedIds.push(item.id);
-      }else{
+      } else {
         let obj = this.checkedIds.indexOf(item.id);
         this.checkedIds.splice(obj, 1)
       }
@@ -293,6 +291,7 @@ export default {
         this.checkAll = item.checked;
       }
     },
+
     //改变已读状态的操作
     isReadChooseList() {
       if (this.data.length == 0) return;
@@ -302,8 +301,8 @@ export default {
           ids.push(this.data[i].id);
         }
       }
-      if(this.checkedIds.length>0){
-          apiMessage.updateIsRead(this.checkedIds).then(res => {
+      if (this.checkedIds.length > 0) {
+        apiMessage.updateIsRead(this.checkedIds).then(res => {
           if (res.status == 200) {
             this.$store.dispatch('refrashMsg');
             this.queryMessage(true)
@@ -313,7 +312,7 @@ export default {
         return;
       }
 
-      if(this.checkAll){
+      if (this.checkAll) {
         apiMessage.updateIsRead(ids).then(res => {
           if (res.status == 200) {
             this.$store.dispatch('refrashMsg');
@@ -324,11 +323,17 @@ export default {
       }
     },
     delChooseList() {
+      // 全选的时候不能删除案例
+      if (this.data.some((item) => item.refType == '99' && item.checked)) {
+        this.$message.error('推荐案例不能删除，请重新选择');
+        return;
+      }
       let list = this.data.filter(item => item.checked).map(v => v.id);
       if (list.length == 0) {
         this.$message.error('请先选择要删除的消息');
         return;
       }
+
       this.$confirm('您确定要删除所选消息吗？', '删除提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -367,42 +372,59 @@ export default {
     },
 
     // 弹出新功能引导页弹窗事件(临时)
-    showGuideDialog(){
+    showGuideDialog() {
       this.$refs.guide.guideCollection = true;
     },
 
+    // 点击案例
+    async goRouter(item) {
+      console.log(item);
+      apiMessage.updateIsRead([item.id]).then(res => {
+        if (res.status == 200) {
+          this.$store.dispatch('refrashMsg');
+          item.isRead = true;
+        }
+      });
+      //需要跳转
+      if (item.pageUrl && item.pageUrl.length > 10) {
+        await apiCase.startReadTimer(item.refId)
+        this.$router.push('/case/detail?id=' + item.pageParams);
+      } else {
+        this.$router.push('/case?recommendId=' + item.refId);
+      }
+    },
     // 跳转详情事件11
     returnRouter(item) {
       apiMessage.updateIsRead([item.id]).then(res => {
-          if (res.status == 200) {
-            this.$store.dispatch('refrashMsg');
-            // this.queryMessage(true)
-            item.isRead = true;
-          }
+        if (res.status == 200) {
+          this.$store.dispatch('refrashMsg');
+          // this.queryMessage(true)
+          item.isRead = true;
+        }
       });
-      if(item.pageUrl && item.pageUrl.length>10){
+      if (item.pageUrl && item.pageUrl.length > 10) {
         location.href = item.pageUrl;
-      }else{
-        if(item.pageType && item.pageParams){
-            if(item.pageType==1){
-               this.$router.push('/course/studyindex?id='+ item.pageParams);
-            }else if(item.pageType==2){
-               this.$router.push('/article/detail?id='+ item.pageParams);
-            }else if(item.pageType==3){
-               this.$router.push('/case/detail?id='+ item.pageParams);
-            }else if(item.pageType==4){
-              this.$router.push('/qa/answer?id='+ item.pageParams);
-            }
-        }else{
-           if (item.refType == 2) {
-              this.$router.push('/article/detail?id='+ item.refId);
-           }else if(item.refType==3){
-              this.$router.push('/case/detail?id='+ item.refId);
-           }else if (item.refType == 4||item.refType == 5) {
-              this.$router.push('/qa/answer?id='+ item.refId);
-           } else if (item.refType == 1){
-              this.$router.push('/course/studyindex?id='+ item.refId);
-           }
+      } else {
+        if (item.pageType && item.pageParams) {
+          if (item.pageType == 1) {
+            this.$router.push('/course/studyindex?id=' + item.pageParams);
+          } else if (item.pageType == 2) {
+            this.$router.push('/article/detail?id=' + item.pageParams);
+          } else if (item.pageType == 3) {
+            this.$router.push('/case/detail?id=' + item.pageParams);
+          } else if (item.pageType == 4) {
+            this.$router.push('/qa/answer?id=' + item.pageParams);
+          }
+        } else {
+          if (item.refType == 2) {
+            this.$router.push('/article/detail?id=' + item.refId);
+          } else if (item.refType == 3) {
+            this.$router.push('/case/detail?id=' + item.refId);
+          } else if (item.refType == 4 || item.refType == 5) {
+            this.$router.push('/qa/answer?id=' + item.refId);
+          } else if (item.refType == 1) {
+            this.$router.push('/course/studyindex?id=' + item.refId);
+          }
         }
 
       }
@@ -413,7 +435,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.navbut{
+.infoActive {
+  color: #0078FC !important;
+}
+
+.navbut {
   width: 110px;
   height: 30px;
   border-radius: 2px;
@@ -421,8 +447,9 @@ export default {
   text-align: center;
   border: 1px solid #0078FC;
   padding: 0;
-  color: #0078FC ;
+  color: #0078FC;
 }
+
 .msg-nav {
   display: flex;
   // justify-content: space-between;
@@ -431,62 +458,72 @@ export default {
   background-color: #ffffff;
   padding: 5px 10px;
 }
+
 .msg-list {
   border-bottom: 1px solid rgb(237, 237, 237);
   margin-top: 10px;
   line-height: 26px;
   background-color: #ffffff;
   padding: 5px 10px;
+
   &:first-of-type {
     padding-top: 15px;
   }
+
   .msg-top {
     display: flex;
     justify-content: space-between;
     line-height: 30px;
   }
+
   .msg-body {
     padding: 10px 10px 10px 25px;
     display: flex;
     width: 100%;
-    .msg-body-content{
+
+    .msg-body-content {
       flex: 1;
-      word-break:break-all;
+      word-break: break-all;
       color: #727272;
+
       a:hover {
         color: #409eff;
       }
     }
-    .msg-body-but{
+
+    .msg-body-but {
       margin-left: auto;
 
-      button{
-         width: 88px;
-         height: 32px;
-         background-color: #fff;
-         border-radius: 16px;
-         padding: 0;
-         color: #F52F3E;
-         line-height: 32px;
-         text-align: center;
-         border: 1px solid #F52F3E;
+      button {
+        width: 88px;
+        height: 32px;
+        background-color: #fff;
+        border-radius: 16px;
+        padding: 0;
+        color: #F52F3E;
+        line-height: 32px;
+        text-align: center;
+        border: 1px solid #F52F3E;
       }
-      button:hover{
-         background-color: rgba(255,101,98,0.13);
-         color: #F52F3E;
+
+      button:hover {
+        background-color: rgba(255, 101, 98, 0.13);
+        color: #F52F3E;
 
 
       }
     }
   }
+
   .msg-time {
     color: #a5a5a5;
     font-size: 14px;
     padding-left: 25px;
   }
 }
+
 .messageList {
-  > p {
+  >p {
     display: flex;
     justify-content: space-between;
     border-bottom: 1px solid rgb(219, 219, 219);
@@ -494,9 +531,11 @@ export default {
     margin: 0;
     align-items: center;
   }
+
   .messageItem:not(:first-child) {
     padding-top: 10px;
   }
+
   .messageItem {
     // width: 100%;
     padding-bottom: 10px;
@@ -504,12 +543,15 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .el-checkbox {
       margin-right: 5px;
     }
+
     .el-button {
       margin-left: auto;
     }
+
     // margin-bottom: 10px;
     p {
       margin: 0;
@@ -517,24 +559,29 @@ export default {
       justify-content: space-between;
       align-items: center;
     }
+
     p:first-of-type {
-      > span {
+      >span {
         display: flex;
         justify-content: flex-start;
         align-items: center;
+
         span:first-of-type {
           font-size: 12px;
         }
       }
-      > span:last-of-type {
+
+      >span:last-of-type {
         font-size: 14px;
         color: #b7b7b7;
         margin-left: 5px;
       }
     }
+
     p:last-of-type {
       font-size: 14px;
       text-indent: 3em;
+
       span:last-of-type {
         font-size: 14px;
         color: #b7b7b7;
@@ -542,6 +589,7 @@ export default {
     }
   }
 }
+
 .pagination-div {
   cursor: pointer;
 }
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 99107031..ea7dd297 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -30,7 +30,7 @@
               <videoPlayer ref="myVideoPlayer" id="myVideoPlayer"  :src="blobUrl" @onPlayerPlaying="onPlayerPlaying"
                 :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
                 :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
-                @onPlayerEnded="onPlayerEnded"></videoPlayer>
+                @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd"></videoPlayer>
               <div class="player-box" v-if="playerBoxShow">
                 <div class="player-praise" style="cursor: pointer;">
                   <div @click="praiseContent">
@@ -200,7 +200,7 @@
         <div class="course-info">
           <div style="background-color: #fff;">
                 <div class="course-info-tab">
-                  <div @click="coutab(1)" :class="courestab == 1? 'course-info-tab-active' : ''">课程介绍<span class=""></span> </div>
+                  <div @click="coutab(1)" :class="courestab == 1? 'course-info-tab-active' : ''">内容简介<span class=""></span> </div>
                   <div @click="coutab(2)" :class="courestab == 2? 'course-info-tab-active' : ''">课程评论<span class=""></span> </div>
                   <div @click="coutab(3)" :class="courestab == 3? 'course-info-tab-active' : ''">课程笔记<span class=""></span> </div>
                 </div>
@@ -240,9 +240,10 @@
               <div class="teacher-info">
                 <div class="teacher-name">
                     <span> {{ item.teacherName }}</span>
-                    <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span>
+                    <!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->
                 </div>
-                <div class="teacher-remark" v-html="item.authorInfo.sign"></div>
+                <!-- <div class="teacher-remark" v-html="item.authorInfo.sign"></div> -->
+                <div class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
               </div>
               <div  style="padding-top:15px;width:70px;">
                 <followButton :auto="true" size="small" :aid="item.teacherId"></followButton>
@@ -319,6 +320,7 @@
     },
     data() {
       return {
+        isCrowd:false,
         cutOrgNamePath,
         scormUrl:'',//当前播放的scormUrl
         loading:false,
@@ -692,6 +694,10 @@
         })
       },
       showRes(r, i, index) { //i:子节下标，index:章下标
+        // 无权限查看不能点击
+        if(!this.isCrowd){
+          return
+        }
         if (i != undefined && i!=-1 && index != undefined && r.status < 9) {
           if (this.courseInfo.orderStudy) {
             //判断上个是否学完
@@ -1132,6 +1138,7 @@
           this.finishStudyItem();
         }
       },
+      // 获取数据信息
       loadData() {
         let $this=this;
         apiStudy.studyIndex(this.courseId).then(rs => {
@@ -1149,6 +1156,11 @@
                $this.tab=2;
                //console.log('内容只有一个');
             }
+            if(!rs.result.isCrowd){
+                $this.$message.error('您没有查看该课程的权限');
+            }
+            // 是否播放
+            this.isCrowd = rs.result.isCrowd
             if (rs.result.course.type == 20) { //有目录课程
 
               rs.result.sections.forEach(sec => {