提交

src/components/Article/collectList.vue

@@ -10,7 +10,7 @@
           <div class="article-info-summary two-line-ellipsis">{{ item.summary || item.content}}</div>
           <div class="article-info-tools">
             <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"> </authorInfo>
-            <span>发布时间：{{ item.sysCreateTime || item.publishTime | timeFilter }}</span>
+            <span>发布时间：{{ item.sysCreateTime || item.publishTime || item.favoritesTime | timeFilter }}</span>
             <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span>
             <el-button @click.stop="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-remove">取消收藏</el-button>
           </div>

src/components/Portal/interactBar.vue

@@ -7,33 +7,33 @@
     </div>
     <div v-show="theme==1" class="interact-bar-btns" :style="{'justify-content':showAlign}">
       <div v-if="answers" @click="addAnswers()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly || clickAnswer}">
-        <el-tooltip  effect="light" content="回答" placement="left">
+        <el-tooltip  effect="light" content="回答" placement="left" :visible-arrow="false" popper-class="text-tooltip">
           <!-- <svg-icon style="margin-right: 0;"  icon-class="comment"></svg-icon> -->
          <img style="width:16px;height:16px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')">
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.answers}}</span>
       </div>
       <div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
-        <el-tooltip  effect="light" content="评论" placement="left">
+        <el-tooltip  effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon style="margin-right: 0;font-size: 16px;" icon-class="comment"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.comments}}</span>
       </div>
       <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
-        <el-tooltip effect="light" content="分享" placement="top">
+        <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon icon-class="share" style="margin-right: 0;font-size: 16px;"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.shares}}</span>
       </div>
       <div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
-        <el-tooltip effect="light" content="点赞" placement="top">
+        <el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon style="margin-right: 0;font-size: 20px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.praises}}</span>
       </div>
 
       <div v-if="favorites"  @click="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
-        <el-tooltip effect="light" content="收藏" placement="top">
+        <el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon style="font-size: 16px;margin-right: 0;" :icon-class="isFavorite?'collected':'collection'"></svg-icon>
           <!-- <svg-icon :icon-class="isFavorite?'collected':'dropdown_collected'"></svg-icon> -->
           <!-- dropdown_collected -->
@@ -42,7 +42,7 @@
       </div>
 
       <div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
-        <el-tooltip effect="light" content="浏览量" placement="top">
+        <el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon style="margin-right: 0;font-size:20.5px;" icon-class="eyes"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.views}}</span>

src/components/PortalHeader.vue

@@ -41,7 +41,7 @@
           <div class="person-action" >
             <!-- 消息 -->
            <el-badge   :value="userMsg" :hidden="userMsg == 0" class="message-count">
-              <el-tooltip   content="消息" placement="bottom" effect="light">
+              <el-tooltip   content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
                  <el-link  type="primary" :href="`${webBaseUrl}/message`" icon="el-icon-bell" :underline="false"></el-link>
               </el-tooltip>
             </el-badge>

src/components/UserCenter/menu.vue

@@ -320,7 +320,7 @@
                     <span v-if="lastStudy.contentType=='face-course'" class="course-type-title course-type">线下课</span>
                     <span v-if="lastStudy.contentType=='project'" class="course-type-title course-type">学习项目</span>
                 </div>
-                 <el-tooltip :content="lastStudy.courseName" placement="bottom-start" effect="light">
+                 <el-tooltip :content="lastStudy.courseName" placement="bottom-start" effect="light" :visible-arrow="false" popper-class="text-tooltip">
                <div class="course-title two-line-ellipsis">{{lastStudy.courseName}}
                 </div>
             </el-tooltip>

src/views/portal/course/Index.vue

@@ -85,7 +85,7 @@
                     <span v-if="cinfo.type=='face-course'" class="course-type-title course-type">线下课</span>
                     <span v-if="cinfo.type=='project'" class="course-type-title course-type">学习项目</span>
                 </div>
-                  <el-tooltip class="item"  :content="cinfo.name" placement="bottom-start" effect="light">
+                  <el-tooltip class="item"  :content="cinfo.couretitle" placement="bottom-start" effect="light"  :visible-arrow="false" popper-class="text-tooltip" >
                       <div class="course-title title-line-ellipsis"  v-html="$keywordActiveShow(cinfo.name,keyword)">
                       </div>
                   </el-tooltip>
@@ -231,6 +231,7 @@ export default {
   },
   data() {
     return {
+      couretitle:'',
       toScore,
       noPageList: true,//判断接口是否还有数据
       noDataList: true,//判断接口是否还有数据
@@ -285,6 +286,7 @@ export default {
     };
   },
   mounted() {
+
     let screenWidth=window.screen.width;
     if(screenWidth<1280){
       this.course.pageSize=9;
@@ -330,6 +332,8 @@ export default {
   },
   methods: {
 
+   
+
     jumUX(){
      window.open('https://m.qingxuetang.com/x/?appId=qxtcorp306130','_blank');
     },
@@ -581,6 +585,7 @@ export default {
      this.noDataList && await apiOldCourse.courseList(oldParams).then(oldRs=>{
         if(oldRs.status==200 && oldRs.result.dataList.length > 0) {
               let list = that.filterConversion(oldRs.result.dataList);
+              list.name = list.name.replace(/<[^>]+>|&[^>]+;/g,"").trim();
               data.push(...list);
               that.moreState = 1;
         }else{
@@ -595,10 +600,12 @@ export default {
         .then(res => {
 
             if(res.status == 200 && res.result.list.length>0){
+              
               this.totalPages = res.result.totalPages;
               let courseIds=[];
               res.result.list.forEach(item=>{
-                item.name = this.$keywordActiveShow(item.name,this.course.keyword)
+                item.name = this.$keywordActiveShow(item.name,this.course.keyword);
+               item.couretitle  =  this.$keywordActiveShow(item.name,this.course.keyword).replace(/<[^>]+>|&[^>]+;/g,"").trim();//去掉所有的html标签和&nbsp;之类的特殊符合
                 item.authorInfo={aid:'',name:'',orgInfo:'',avatar:'',code:''};
                 courseIds.push(item.id);
                 if(item.isTop) {