修改问题

src/api/inhert/VillageInfoApi.ts

@@ -211,7 +211,7 @@ export class VillageInfoApi extends AppServerRequestModule<DataModel> {
     subId: number|undefined,
     subKey: string|undefined,
     villageId: number,
-    villageVolunteerId: number,
+    villageVolunteerId: number|undefined,
     catalogId?: number|undefined,
     page?: number,
     pageSize?: number,

src/pages/dig/forms/list.vue

@@ -54,12 +54,14 @@
 </template>
 
 <script setup lang="ts">
-import { useSimplePageListLoader } from '@/common/composeabe/SimplePageListLoader';
 import { ref } from 'vue';
+import { onPullDownRefresh } from '@dcloudio/uni-app';
+import { alert } from '@/components/dialog/CommonRoot';
 import { DataDateUtils } from '@imengyu/js-request-transform';
+import { useSimplePageListLoader } from '@/common/composeabe/SimplePageListLoader';
 import { useLoadQuerys } from '@/common/composeabe/LoadQuerys';
 import { useCollectStore } from '@/store/collect';
-import { onPullDownRefresh } from '@dcloudio/uni-app';
+import { useAuthStore } from '@/store/auth';
 import { navTo } from '@/components/utils/PageAction';
 import SimplePageListLoader from '@/common/components/SimplePageListLoader.vue';
 import VillageInfoApi from '@/api/inhert/VillageInfoApi';
@@ -74,11 +76,12 @@ import Height from '@/components/layout/space/Height.vue';
 import H4 from '@/components/typography/H4.vue';
 import Touchable from '@/components/feedback/Touchable.vue';
 import XBarSpace from '@/components/layout/space/XBarSpace.vue';
-import { alert } from '@/components/dialog/CommonRoot';
 
 const subTitle = ref('');
 const searchText = ref('');
 const collectStore = useCollectStore();
+const authStore = useAuthStore();
+
 const listLoader = useSimplePageListLoader<{
   id: number,
   image: string,
@@ -105,7 +108,7 @@ const listLoader = useSimplePageListLoader<{
     params.subKey ? params.subId : undefined,
     params.subKey,
     params.villageId,
-    params.villageVolunteerId,
+    querys.value.isView && authStore.isAdmin ? undefined : params.villageVolunteerId,
     querys.value.catalogId,
     page,
     pageSize,

src/pages/home/discover/list.vue

@@ -40,7 +40,7 @@ async function loadData(
     return { list: [], total: 0 };
   const res = (await VillageInfoApi.getListForDiscover(
     page, pageSize, 
-    (querys.value.keywords || '') + ' ' + searchText, 
+    ((querys.value.keywords || '') + ' ' + (searchText || '')).trim(), 
   ));
    return { 
     list: res.list.map((item) => ({

src/pages/home/store/index.vue

@@ -102,7 +102,7 @@ function goList(mainBodyColumnId: number|undefined, title: string, search?: stri
     modelId: 16,
     mainBodyColumnId,
     title,
-    search,
+    search: search || '',
   });
 }
 </script>