.

src/pages/index/components/Card.js

@@ -15,13 +15,8 @@ export default (props) => {
   const [isSaved, toggleSave] = useSave(item.isSaved, item.targetType, item.targetId)
   const Detail = () => {
     if (item.targetType == 'tourist') {
-<<<<<<< HEAD
-      let location = item.lng + ',' + item.lat
-      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance / 1000).toFixed(2)}&location2=${location}` });
-=======
       let loc = item.lng + ',' + item.lat
       Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance / 1000).toFixed(2)}&location=${loc}` });
->>>>>>> 8d87d83972bce4b0a0e1a04bf7a9b9922c03d173
     }
     else {
       Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })