Merge branch 'zcwy_0723_hotforum' into dev0515

src/components/Study/manager.vue

@@ -290,7 +290,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="studyContentRecords">搜索</el-button>
+          <el-button type="primary" @click="studyContentRecordsSearch">搜索</el-button>
         </el-form-item>
         <el-button v-if="isHomeWork" style="padding:10px 15px;margin-bottom: 10px;" type="primary" @click="downLoad">导出全部作业</el-button>
       </el-form>
@@ -413,7 +413,12 @@ export default {
         this.getDetail();
       }
      }
-    }
+    },
+    'study.catalogueShow'(val){
+      if(!val){
+        this.learningSituation.status = null
+      }
+    },
   },
   mounted() {
     this.getSignupList();
@@ -484,6 +489,10 @@ export default {
         }
       });
     },
+    studyContentRecordsSearch(){
+      this.learningSituation.pageIndex = 1;
+      this.studyContentRecords()
+    },
     // 资源里的学习详情
     studyContentRecords() {
       let params = {