diff --git a/src/components/page/ClassificationDetails.vue b/src/components/page/ClassificationDetails.vue
index 329f06e..789627a 100644
--- a/src/components/page/ClassificationDetails.vue
+++ b/src/components/page/ClassificationDetails.vue
@@ -157,10 +157,7 @@
 </template>
 <script>
 import {assetClassInfo,getProvince,getCity,getArea,} from '../../api/index'
-<<<<<<< HEAD
 import bus from '../common/bus'
-=======
->>>>>>> 4d64f54053961759a3b806da4fe29546dd47eb26
 export default {
   data(){
     return{
@@ -185,13 +182,10 @@ export default {
     }
   },
   created(){
-<<<<<<< HEAD
     console.info(this.$route.query)
     bus.$on('getDate', (e) => {
       this.getData()
     })
-=======
->>>>>>> 4d64f54053961759a3b806da4fe29546dd47eb26
     this.getData()
     this.getProvince();
   },
diff --git a/src/components/page/index.vue b/src/components/page/index.vue
index ddfea10..922acd8 100644
--- a/src/components/page/index.vue
+++ b/src/components/page/index.vue
@@ -457,11 +457,7 @@ export default {
     cursor: pointer;
     margin-right: 14px;
   }
-<<<<<<< HEAD
-  .tabs_item:nth-child(n+3){
-=======
   .tabs_item:nth-child(3n+3){
->>>>>>> 4d64f54053961759a3b806da4fe29546dd47eb26
     margin-right: 0;
   }
   .tabs_item_img{
diff --git a/src/utils/request.js b/src/utils/request.js
index 870cc83..e84eb15 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -30,13 +30,8 @@ service.interceptors.response.use(
     response => {
       if (response.data.code === 303) {
         localStorage.removeItem('login_info')
-<<<<<<< HEAD
-        location.reload()
-        router.push('/index')
-=======
         router.push('/index')
         location.reload()
->>>>>>> 4d64f54053961759a3b806da4fe29546dd47eb26
         // location.reload()
         // MessageBox.confirm('登录已超时，请重新登录', '退出', {
         //     confirmButtonText: '登录',