Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -67,7 +67,7 @@ export default withLayout((props) => {
 
   useEffect(() => {
     if (id) {
-      getTouristDetail(id).then((res) => {
+      getTouristDetail(id, { location }).then((res) => {
         setDetail(res)
         setimglist(res.imageList || [])
         getRecommendList({ location: res.locaton }).then((res2) => {

src/services/home.js

@@ -101,7 +101,7 @@ export const getExtendContent = (type, id, params) => request(`/${type}/${id}/co
  * @param {*} id 
  * @returns 
  */
-export const getTouristDetail = (id) => request(`/tourist/${id}`)
+export const getTouristDetail = (id, params) => request(`/tourist/${id}`, { params })
 
 
 /**