Merge commit '56036879f571ec96acd4bd4a037b7f6985e866f7' into gzb

src/views/platformSection/regionManage/adminManage.vue

@@ -498,6 +498,9 @@ export default {
     },
     // 新建
     toAdd() {
+      if (this.adminInfo.timer) {
+        clearInterval(this.adminInfo.timer);
+      }
       this.adminInfo = {
         show: true,
         timer: null,
@@ -646,6 +649,9 @@ export default {
     },
     // 编辑
     toEdit(row) {
+      if (this.adminInfo.timer) {
+        clearInterval(this.adminInfo.timer);
+      }
       admin_detail({ adminid: row.adminid }).then((data) => {
         if (data.code === 0) {
           this.adminInfo = {

src/views/platformSection/regionManage/regionManage.vue

@@ -498,7 +498,6 @@ export default {
     toAdd() {
       if (this.regionInfo.timer) {
         clearInterval(this.regionInfo.timer);
-        this.regionInfo.timer = null;
       }
       this.regionInfo = {
         show: true,