diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue
index 21a6bf04..1facdb19 100644
--- a/src/components/Course/collectItem.vue
+++ b/src/components/Course/collectItem.vue
@@ -134,7 +134,7 @@ export default {
 <style lang="scss" scoped>
 .one-line-ellipsis{
   display: -webkit-box;
-  // white-space:pre-wrap;
+  white-space:pre-wrap;
   word-wrap: break-word;
   word-break:break-all;
   overflow: hidden;
diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 8210665b..4b885766 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -161,7 +161,7 @@
     width="800px">
     <teacher-details v-if="teacherDetailsId != ''" :id="teacherDetailsId"></teacher-details>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="handleClose">取 消</el-button>
+      <el-button @click="handleCloseOne()">取 消</el-button>
       <!-- <el-button type="primary" @click="showTeacherDetails = false">确 定</el-button> -->
     </span>
 </el-dialog>
@@ -255,7 +255,7 @@
       ...mapGetters(['userInfo'])
     },
     methods:{
-      handleClose() {
+      handleCloseOne() {
         console.log("1111");
         // this.teacherDetailsId = '';
         this.showTeacherDetails = false;
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 4248c8a4..2ed3fe45 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -225,8 +225,7 @@
   :visible.sync="dialogVisible"
   width="300px"
   top="20%"
-  :modal="false"
-  :before-close="handleClose">
+  :modal="false">
   <div>请输入授课时长（分钟）</div>
   <div><el-input v-model="input" placeholder="请输入内容"></el-input></div>
   <span slot="footer" class="dialog-footer">
diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue
index a8b1da3d..718876e5 100644
--- a/src/views/portal/article/Index.vue
+++ b/src/views/portal/article/Index.vue
@@ -37,7 +37,7 @@
               </div>
               <span class="more"></span>
             </el-row>
-            <div class="data-content">
+            <div class="data-content" v-if="articleList.list.length > 0">
               <div :span="24" v-for="(article, aidx) in articleList.list" :key="aidx" class="article-list">
                 <div class="article-info">
                   <!--title-->
@@ -77,7 +77,8 @@
             <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="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
+              <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
             </div>
           </el-card>
         </el-row>
@@ -193,6 +194,7 @@ export default {
       ankingFixed:false,
       diagSync:false,//控制弹窗
       // articleList: []
+      isSeach:false,
     };
   },
   mounted() {
@@ -200,7 +202,9 @@ export default {
     // this.ankingWidth=el_anking.clientWidth;
     //console.log(el_anking.clientWidth,'clientWidth');
     this.articleList.keyword = this.$route.query.keyword;
-
+    if(this.articleList.keyword != '') {
+     this.isSeach = true;
+    }
     this.getArticleList();
     this.getAnkingData();
     this.searchterm();
@@ -217,6 +221,7 @@ export default {
   methods: {
     emitInput(val){
       this.articleList.keyword = val;
+      this.isSeach =true;
       this.searchData();
     },
     saveSuccess(data){
@@ -329,6 +334,7 @@ export default {
       // portalPageList接口换了，这是原来的
       apiArticle.findPortal(query).then(res => {
         if (res.status == 200 && res.result.list.length > 0) {
+          this.isSeach =false;
           let ids = [];
           res.result.list.forEach(item => {
             item.authorInfo = { name: '', avatar: '', orgInfo: '' ,sex:null};
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index 71fc9ee8..ab081077 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -48,7 +48,7 @@
                 </el-radio-group> -->
               </span>
             </el-row>
-            <div class="data-content">
+            <div class="data-content" v-if="qaList.length > 0">
               <div :span="24" v-for="(qa, qaidx) in qaList" :key="qaidx" class="qa-list">
                 <div class="qa-info-box">
                   <div class="qa-info">
@@ -85,7 +85,8 @@
             <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="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
+               <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
             </div>
           </el-card>
             </el-row>
@@ -215,12 +216,16 @@ export default {
       //以上是整理后的数据
       anking: 2, //排行榜
       ankingList: [],
-      styleControl:2
+      styleControl:2,
+      isSeach:false,
     };
   },
   mounted() {
     this.queryKeyWord = this.$route.query.keyword;
     this.queryConditions.keyword = this.queryKeyWord;
+     if(this.queryConditions.keyword != '') {
+     this.isSeach = true;
+    }
     this.getQaData(true);
     this.getAnkingData();
     window.addEventListener("scroll", this.handleScroll);
@@ -232,6 +237,7 @@ export default {
   methods: {
    emitInput(val){
       this.queryKeyWord = val;
+      this.isSeach =true;
       this.search();
     },
   //发布回答
@@ -373,6 +379,7 @@ export default {
         .potallist(this.queryConditions)
         .then(res => {
           if (res.status == 200 && res.result.list.length > 0) {
+            this.isSeach = false;
             res.result.list.forEach(item => {
               item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '',sex:null, };
             });