Merge remote-tracking branch 'origin/bjy' into case

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

src/views/article/MyList.vue

@@ -24,7 +24,7 @@
             </el-select>
           </div>
           <div style="padding: 0px 5px;"><el-input clearable placeholder="搜索名称" v-model="pageData.keyword"></el-input></div>
-          <div style="padding: 0px 5px;"><el-button icon="el-icon-search" type="primary"  @click="getArticleList">搜索</el-button></div>
+          <div style="padding: 0px 5px;"><el-button icon="el-icon-search" type="primary"  @click="search">搜索</el-button></div>
            <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button></div>
         </div>
       </div>
@@ -35,7 +35,7 @@
     </div>
     <div style="padding: 10px 19px 0px 22px;">
       <article-items @update="getArticleList" :items="pageData.list" v-if="pageData.list.length!=0"></article-items>
-      <div  v-if="pageData.list.length > 0 " style="text-align: center; margin-top:57px"><el-pagination
+      <div v-if="pageData.list.length > 0 " style="text-align: center; margin-top:57px"><el-pagination
         @size-change="handleSizeChange"
         background
         @current-change="handleCurrentChange"
@@ -45,6 +45,13 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       ></el-pagination></div>
+        <div v-else>
+            <div v-if="pageData.list.length == 0">
+              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
+              <div v-else class="zan-wu">暂无数据</div>
+              </div>
+            </div> 
+
     </div>
 	<el-dialog title="创建文章" :visible.sync="diagSync" :close-on-click-modal="false" width="900px" custom-class="g-dialog">
 	  <editItems v-if="diagSync" :jumpLimit="false" :editForm="{}" @success="saveSuccess"></editItems>
@@ -67,6 +74,7 @@ export default {
   },
   data() {
     return {
+      isSearh:false,
       pageData: {
         pageIndex: 1,
         pageSize: 10,
@@ -81,7 +89,10 @@ export default {
     this.getArticleList();
   },
   methods: {
-
+     search(){
+      this.isSearh = true;
+      this.getArticleList()
+    },
     saveSuccess(data){
       this.diagSync=false;
       this.articleList.pageIndex = 1;
@@ -116,9 +127,11 @@ export default {
     },
 
     reset(){
+
        this.pageData.keyword = '',
        this.pageData.status = ''
-       this.getArticleList()
+       this.getArticleList();
+       this.isSearh = false;
     },
     getQaUserData(list){
       let ids=list.map((item,index)=>{

src/views/feedback/Index.vue

@@ -185,7 +185,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .problem{
   margin: 10px;
   border: 1px solid #e4e4e4;

src/views/feedback/Manager.vue

@@ -186,7 +186,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .problem{
   margin: 10px;
   border: 1px solid #f0f0f0;

src/views/share/ToList.vue

@@ -44,7 +44,7 @@
           <div style="min-height: 500px;">
             <course-items :keyword="keyword" type="toMy" @confirm="confirm" :items="courseList.list"></course-items>
             <!-- v-if="courseList.count>courseList.pageSize" -->
-            <div v-if="caseList.list.length > 0" style="text-align: center; margin-top:57px">
+            <div v-if="courseList.list.length > 0" style="text-align: center; margin-top:57px">
               <el-pagination
                 background
                 @size-change="handleSizeChange"
@@ -57,7 +57,7 @@
               ></el-pagination>
             </div>
              <div v-else>
-                <div v-if="caseList.list.length == 0">
+                <div v-if="courseList.list.length == 0">
                   <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
                   <div v-else class="zan-wu">暂无数据</div>
                 </div>