快乐的梦鱼 пре 6 часа
родитељ
комит
5aed2614a5

+ 6 - 0
src/pages/article/common/CommonContent.ts

@@ -13,6 +13,9 @@ export function goCommonContentList(p: {
   mainBodyId?: number,
   mainBodyColumnId?: number|number[],
   modelId?: number,
+  latitude?: number,
+  longitude?: number,
+  isNearby?: boolean,
 }) {
   navTo('/pages/article/common/list', {
     title: p.title,
@@ -21,6 +24,9 @@ export function goCommonContentList(p: {
       p.mainBodyColumnId.join(',') : 
       p.mainBodyColumnId,
     modelId: p.modelId,
+    latitude: p.latitude,
+    longitude: p.longitude,
+    isNearby: p.isNearby,
   }) 
 } 
 

+ 6 - 1
src/pages/article/common/list.vue

@@ -28,6 +28,9 @@ const { querys } = useLoadQuerys({
   title: '',
   region: '',
   search: '',
+  latitude: 0,
+  longitude: 0,
+  isNearby: false,
 });
 
 async function loadData(
@@ -45,7 +48,9 @@ async function loadData(
     modelId: querys.value.modelId || undefined,
     keywords: searchText,
     region: querys.value.region || undefined,
-  }), page, pageSize);
+    latitude: querys.value.latitude || undefined,
+    longitude: querys.value.longitude || undefined,
+  }), page, pageSize, undefined, querys.value.isNearby);
 
   for (const element of res.list || []) {
     if (!element.desc && element.from)

+ 6 - 1
src/pages/home/index.vue

@@ -24,7 +24,12 @@
       </FlexRow>
     </Box>
 
-    <Box title="发现 · 周边" icon="https://mncdn.wenlvti.net/app_static/xiangyuan/images/home/icon-compass.png" showMore @moreClicked="$emit('goDiscover')">  
+    <Box title="发现 · 周边" icon="https://mncdn.wenlvti.net/app_static/xiangyuan/images/home/icon-compass.png" showMore @moreClicked="goCommonContentList({ 
+      modelId: 1, 
+      latitude: currentLonlat.latitude,
+      longitude: currentLonlat.longitude,
+      isNearby: true,
+    })">  
       <SimplePageContentLoader :loader="recommendedNearbySitesLoader">
         <FlexCol :gap="25">
           <Touchable