diff --git a/src/App.vue b/src/App.vue
index 31466c7..551ba9e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,5 @@
 <template>
-<<<<<<< HEAD
-  <router-view/>
-=======
+
   <router-view />
   <login></login>
 >>>>>>> 542e853 (提交)
diff --git a/src/router/index.js b/src/router/index.js
index 73b13fd..e937954 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -48,29 +48,29 @@ const routes = [
   {//个人房源
     path: '/personHousing',
     component: () => import(/* webpackChunkName: "housing" */ '@/views/housingView/person.vue'),
-    meta:{
-      title:'个人房源'
+    meta: {
+      title: '个人房源'
     }
   },
   {//中介房源
     path: '/intermediaryHousing',
     component: () => import(/* webpackChunkName: "housing" */ '@/views/housingView/intermediary.vue'),
-    meta:{
-      title:'中介房源'
+    meta: {
+      title: '中介房源'
     }
   },
   {//求房源
     path: '/needHousing',
     component: () => import(/* webpackChunkName: "housing" */ '@/views/housingView/needHousing.vue'),
-    meta:{
-      title:'求房源'
+    meta: {
+      title: '求房源'
     }
-  }, 
+  },
   {//搜索
-    path:'/seachPage',
-    component:()=> import(/* webpackChunkName: "seachPage" */ '@/views/seachIndex.vue'),
-    meta:{
-      title:'搜索'
+    path: '/seachPage',
+    component: () => import(/* webpackChunkName: "seachPage" */ '@/views/seachIndex.vue'),
+    meta: {
+      title: '搜索'
     }
   },
   {
@@ -98,17 +98,17 @@ const router = createRouter({
 
 
 router.beforeEach((to, from, next) => {
-<<<<<<< HEAD
+  // <<<<<<< HEAD
   //导航数据
-  if(/['seachPage','needHousing','intermediaryHousing','personHousing']/.test(from.path)){
-    store.state.routeList.secondaryIndex.title=from.meta.title
-    store.state.routeList.secondaryIndex.path=from.path
+  if (/['seachPage','needHousing','intermediaryHousing','personHousing']/.test(from.path)) {
+    store.state.routeList.secondaryIndex.title = from.meta.title
+    store.state.routeList.secondaryIndex.path = from.path
   }
 
   //
-=======
+  // =======
   console.log(to, from);
->>>>>>> 542e853 (提交)
+  // >>>>>>> 542e853 (提交)
   next()
   let meta = to['meta'] || {}
   let title = meta['title']
diff --git a/src/utils/axios.js b/src/utils/axios.js
index 124d8fa..c815f6b 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -1,11 +1,8 @@
 import axios from 'axios';
 import QS from 'qs';
 import { goTologin } from '@/utils/util.js'
-<<<<<<< HEAD
 import {showFullScreenLoading,tryHideFullScreenLoading} from './loading'
-=======
 import store from '@/store/index';
->>>>>>> 542e853 (提交)
 
 axios.defaults.baseURL = 'https://app.gter.net'
 // axios.defaults.baseURL = '/index'