Merge branch 'feature-2.0' into 'master'

Feature 2.0

See merge request crowd-2019/crowd-test-service-front!157

src/pages/DetailPage/NewAgencyDetail.vue

@@ -96,6 +96,7 @@
       init() {
         this.userId = this.$route.query.id
         this.type = this.$route.query.type
+        this.setUserInfo()
         this.setServiceTypes()
         this.setResourceTypes()
         this.getAuthInfo()

src/pages/Homepage/HotAgency.vue

@@ -45,12 +45,13 @@
                 name: 'AgencyList',
             });
         },
-        goToDetail(userId) {
-            this.$router.push({
-                name: 'NewAgencyDetail',
-                params: {id: userId, type: 0}
-            })
-        },
+      goToDetail(userId) {
+        this.$router.push({
+          name: 'NewAgencyDetail',
+          path:'/agency/detail',
+          query: {id: userId, type: 0}
+        })
+      },
     }
   }
 </script>

src/pages/HomepageSearch/AgencyResidentList.vue

@@ -179,10 +179,11 @@
         this.activePage = index;
         this.handleSearchData();
       },
-      goToDetail(id) {
+      goToDetail(userId) {
         this.$router.push({
           name: 'NewAgencyDetail',
-          params: {id: id, type: 1}
+          path:'/agency/detail',
+          query: {id: userId, type: 1}
         })
       },
       showLoading() {