Merge branch 'zj' into dev

src/pages/authority/addroles.vue

@@ -280,17 +280,13 @@ export default {
           { max: 200, message: "长度小于200个字符", trigger: "blur" },
         ],
       },
+      edit_flag:0,
     };
   },
   watch: {},
   computed: {},
   created() {
-    this.now_user = this.$store.state.role;
-    getRole().then((data) => {
-      this.now_user = data;
-      this.$store.commit("rolefun", data);
-      this.now_page();
-    });
+    this.get_now_page()
     console.log(this.$route);
   },
   mounted() {},
@@ -306,16 +302,31 @@ export default {
         }
       });
     },
-    now_page() {
-      if (this.$route.path.indexOf("edit") !== -1) {
-        this.getInfo();
+    get_now_page(){
+        console.log(this.$route);
+        if(this.$route.path.indexOf('add')!==-1){
+            this.edit_flag = 0 
+        }
+        if(this.$route.path.indexOf('edit')!==-1){
+            this.edit_flag = 1
+            this.getInfo()
         }
-      if (this.$route.path.indexOf("allot") !== -1) {
-        this.getInfo();
+        if(this.$route.path.indexOf('detail')!==-1){
+            this.edit_flag = 2
+            this.getInfo()
         }
     },
     getInfo() {
-      console.log("111");
+      this.$http
+            .get(`/apaas/backmgt/role/id/${this.$route.params.id}`)
+            .then(response => {
+                console.log(response);
+                let data = response.data.data
+                
+            })
+            .catch((response)=> {
+                
+            });
     },
     changePermissions(values) {
       console.log(values);