diff --git a/src/views/detail.vue b/src/views/detail.vue
index 1ad3646..3058334 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -1165,11 +1165,8 @@ let setNavigation = () => {
                     areaItem: housingInfo['data']['info'].location.substring(0, 1),
                     types: housingInfo['data']['info'].type
                 },
-<<<<<<< HEAD
                 path: `${store.state.routeList['secondaryIndex'].path}`,
-=======
-                path: `${store.state.routeList['secondaryIndex'].path}}/${JSON.stringify({ name: location[housingInfo['data']['info'].location.substring(0, 1)] })}/${JSON.stringify({ type: 'types', data: { name: type[housingInfo['data']['info'].type.substring(0, 3)], id: housingInfo['data']['info'].type } })}`,
->>>>>>> 2d161e5 (封装组件和修改bug)
+
                 title: `${location[housingInfo['data']['info'].location]}${type[housingInfo['data']['info'].type]}`
             }
     }else{