提交

2023-07-28 11:49:56 +08:00 · 2023-07-28 11:49:56 +08:00 · 043fba6262
commit 043fba6262
parent e9b0f2b425
1 changed files with 1 additions and 4 deletions
--- 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{