Merge remote-tracking branch 'origin/master'

@@ -1044,7 +1044,7 @@
         computed:{
         computed:{
             ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性，相当于this.$store.getters.resturantName
             ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性，相当于this.$store.getters.resturantName
         },
         },
-        mounted(){
+        activated(){
             this.getList();
             this.getList();
         }
         }
     }
     }

@@ -184,7 +184,7 @@
                 this.$router.go(-1);//返回上一层
                 this.$router.go(-1);//返回上一层
             },
             },
         },
         },
-        mounted(){
+        activated(){
             this.getDefaultData();
             this.getDefaultData();
         }
         }
     }
     }

@@ -195,7 +195,7 @@
             }
             }
         },
         },
         /*渲染方法*/
         /*渲染方法*/
-        mounted(){
+        activated(){
             this.getDefaultData();
             this.getDefaultData();
             //this.getFlightList();
             //this.getFlightList();
         },
         },

@@ -198,7 +198,7 @@
             }
             }
         },
         },
         /*渲染方法*/
         /*渲染方法*/
-        mounted(){
+        activated(){
             this.getDefaultData();
             this.getDefaultData();
         }
         }
     };
     };

@@ -195,7 +195,7 @@
                 this.$router.go(-1);//返回上一层
                 this.$router.go(-1);//返回上一层
             },
             },
         },
         },
-        mounted(){
+        activated(){
             this.getDefaultData();
             this.getDefaultData();
         }
         }
     }
     }

@@ -168,7 +168,7 @@
             ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性，相当于this.$store.getters.resturantName
             ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性，相当于this.$store.getters.resturantName
         },
         },
         /*渲染方法*/
         /*渲染方法*/
-        mounted() {
+        activated() {
             let that=this;
             let that=this;
             that.getdatatime();
             that.getdatatime();
             that.getFlightList();
             that.getFlightList();

@@ -1401,7 +1401,7 @@
             ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性，相当于this.$store.getters.resturantName
             ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性，相当于this.$store.getters.resturantName
         },
         },
         /*渲染方法*/
         /*渲染方法*/
-        mounted(){
+        activated(){
             this.getDefaultData();
             this.getDefaultData();
             this.getList();
             this.getList();
         }
         }

@@ -892,7 +892,7 @@
             ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性，相当于this.$store.getters.resturantName
             ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性，相当于this.$store.getters.resturantName
         },
         },
         //渲染方法
         //渲染方法
-        mounted(){
+        activated(){
             this.getDefaultData();
             this.getDefaultData();
             this.getMt5201List();
             this.getMt5201List();
         }
         }