Merge branch 'online' into iteration_active11

src/views/teacherManager/teacherOperation/index.vue

@@ -69,6 +69,7 @@ export default {
     this.teacherId = this.$route.query.teacherId
     this.pageType = this.$route.query.type
     this.init()
+    this.activeName = '0'
 
   },
   methods: {

src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -313,7 +313,7 @@ export default {
     this.__init()
   },
   activated () {
-    // this.__init()
+    this.__init()
   },
   methods: {
     __init () {