📦 通用内容列表页核心修改

src/common/composeabe/LoadQuerys.ts

@@ -14,8 +14,8 @@ export function useLoadQuerys<T extends Record<string, any>>(
   const rawQuerys = ref({}) as Ref<Record<string, any>>; 
 
   onLoad((_querys) => {
+    rawQuerys.value = _querys || {};
     if (_querys) {
-      rawQuerys.value = _querys;
       for (const key in querys.value) {
         if (typeof defaults[key] === 'number')
           (querys.value as Record<string, any>)[key] = Number(_querys[key]); 

src/pages.json

@@ -115,12 +115,6 @@
       }
     },
     {
-      "path": "pages/inhert/intangible/list",
-      "style": {
-        "navigationBarTitleText": "非遗列表"
-      }
-    },
-    {
       "path": "pages/inhert/intangible/details",
       "style": {
         "navigationBarTitleText": "非遗项目详情"

src/pages/article/data/CommonCategoryDynamicData.ts

@@ -115,8 +115,6 @@ function CommonCategorDynamicDropDownValuesToParams(dropDownValues: (number|stri
     else if (typeof v === 'string')
       params[define.key] = v;
   });
-  console.log(params,dropDownValues );
-  
   return params;
 }
 

src/pages/article/data/CommonCategoryList.vue

@@ -2,7 +2,7 @@
   <FlexCol>
     <Result v-if="errorMessage" status="error" :description="errorMessage" />
     <CommonListPage 
-      v-else-if="currentCommonCategoryDefine"
+      v-else-if="currentCommonCategoryDefine && loadState"
       :startTabIndex="pageStartTab"
       v-bind="currentCommonCategoryDefine.content.props as any || undefined"
       :title="currentCommonCategoryDefine.title || undefined"
@@ -37,11 +37,13 @@ import Footer from '@/components/display/Footer.vue';
 import FlexCol from '@/components/layout/FlexCol.vue';
 import { resolveCommonContentSolveProps } from '../common/CommonContent';
 import type { SimpleDropDownPickerItem } from '@/common/components/SimpleDropDownPicker.vue';
+import { waitTimeOut } from '@imengyu/imengyu-utils';
 
 /**
  * 动态通用内容 - 通用列表页
  */
 
+const loadState = ref(false);
 const errorMessage = ref('');
 const currentCommonCategoryDefine = ref<IHomeCommonCategoryDefine['page'][0]>();
 const commonCategory = injectCommonCategory();
@@ -76,6 +78,8 @@ async function loadPageConfig() {
     title: currentCommonCategoryDefine.value?.title || '',
   })
 
+  await waitTimeOut(200);
+
   //加载下拉列表
   const result = [] as DropDownNames[];
   for (const [key, tab] of Object.entries(tabRenderDefines.value)) {
@@ -103,6 +107,7 @@ async function loadPageConfig() {
       }
     }
   }
+  loadState.value = true;
   dropdownNames.value = result;
 }
 

src/pages/home/index.vue

@@ -325,7 +325,7 @@ const statsLoader = useSimpleDataLoader(async () => {
       value: item.total,
       titleSuffix: '项',
       type: 'forth',
-      onClick: () => navTo('/pages/inhert/intangible/list', { tab: 0, level: item.level }),
+      onClick: () => navTo('/pages/article/data/list', { pageConfigName: 'intangible', tab: 0, level: item.level }),
     } as StatsTextItem
   });
   const inheritors = data.inheritorData.filter((p: any) => [ '国家级', '省级', '市级' ].includes(p.title)).map((item: any) => {

src/pages/introduction/inhert.vue

@@ -15,7 +15,7 @@
     />
 
     <template v-if="activeIndex === 0">
-      <HomeTitle title="非遗项目" showMore @clickMore="navTo('/pages/inhert/intangible/list')" />
+      <HomeTitle title="非遗项目" showMore @clickMore="navTo('/pages/article/data/list', { pageConfigName: 'intangible', tab: 0 })" />
       <!-- 非遗项目 -->
       <SimplePageContentLoader :loader="intangibleData" >
         <scroll-view scroll-x>