提交

src/router/index.js

@@ -98,6 +98,7 @@ const router = createRouter({
 
 
 router.beforeEach((to, from, next) => {
+<<<<<<< HEAD
   //导航数据
   if(/['seachPage','needHousing','intermediaryHousing','personHousing']/.test(from.path)){
     store.state.routeList.secondaryIndex.title=from.meta.title
@@ -105,6 +106,9 @@ router.beforeEach((to, from, next) => {
   }
 
   //
+=======
+  console.log(to, from);
+>>>>>>> 542e853 (提交)
   next()
   let meta = to['meta'] || {}
   let title = meta['title']