Merge branch 'teacher' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into dev

# Conflicts:
#	.gitignore
#	src/components/Course/weikeContent.vue

src/views/portal/article/Index.vue

@@ -33,11 +33,11 @@
                   :class="{ actice: articleList.order == 1 }">
                   最新
                 </el-button>
-              
+
               </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,11 @@
             <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>
+            <div v-if="isSeach" style="height:382px">
+
             </div>
           </el-card>
         </el-row>
@@ -128,9 +132,9 @@
          </div>
       </div>
       <el-row :gutter="10">
-       
+
         <el-col :span="6" class="right-box" >
-         
+
         </el-col>
       </el-row>
     </div>
@@ -193,6 +197,7 @@ export default {
       ankingFixed:false,
       diagSync:false,//控制弹窗
       // articleList: []
+      isSeach:false,
     };
   },
   mounted() {
@@ -200,7 +205,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 +224,7 @@ export default {
   methods: {
     emitInput(val){
       this.articleList.keyword = val;
+      this.isSeach =true;
       this.searchData();
     },
     saveSuccess(data){
@@ -329,6 +337,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};
@@ -583,7 +592,7 @@ export default {
     width: 100%;
     padding: 15px 0;
   }
-  
+
   .ranking-data {
     margin: 10px 0;
     color: #999999;