Commit ab5562a517164779d945d4efb7ae963d648bfaa1

Authored by 刘有才luck
2 parents 03f275b4 891b5a1d

Merge branch 'ezTeach-2.0.0.0.release' of http://120.78.57.84/baoman/Ezquiz_Plat…

…form into ezTeach-2.0.0.0.release
src/views/basic/askTestQuestion/index.vue
@@ -580,10 +580,8 @@ export default { @@ -580,10 +580,8 @@ export default {
580 end: null, 580 end: null,
581 type: this.dataType, //试卷类型 581 type: this.dataType, //试卷类型
582 share: this.tabType, //分享类型 582 share: this.tabType, //分享类型
583 - };  
584 -  
585 -  
586 - 583 + };
  584 + this.listPage.page = 1;
587 queryParams.classId = this.query.class; 585 queryParams.classId = this.query.class;
588 queryParams.subjectName = this.query.subject; 586 queryParams.subjectName = this.query.subject;
589 queryParams.tagId = this.query.tagId; 587 queryParams.tagId = this.query.tagId;
src/views/basic/askTestQuestion/recycle.vue
@@ -283,7 +283,7 @@ export default { @@ -283,7 +283,7 @@ export default {
283 type: this.dataType, //试卷类型 283 type: this.dataType, //试卷类型
284 share: this.tabType, //分享类型 284 share: this.tabType, //分享类型
285 }; 285 };
286 - 286 + this.listPage.page = 1;
287 queryParams.classId = this.query.class; 287 queryParams.classId = this.query.class;
288 queryParams.subjectName = this.query.subject; 288 queryParams.subjectName = this.query.subject;
289 queryParams.tagId = this.query.tagId; 289 queryParams.tagId = this.query.tagId;