Merge branch 'online' of http://git.dayaedu.com/molingzhide/dy-admin-manager into online

src/views/categroyManager/insideSetting/branchActive.vue

@@ -141,7 +141,9 @@ export default {
     if (this.$route.query.rules) {
       this.$route.query.rules instanceof Object ? this.pageInfo = this.$route.query.rules : this.pageInfo = JSON.parse(this.$route.query.rules);
     }
-
+  },
+  activated() {
+    this.getList()
   },
   mounted () {
     this.getList() // 获取列表数据