1

src/common/composeabe/LoadQuerys.ts

@@ -22,9 +22,9 @@ export function useLoadQuerys<T extends Record<string, any>>(
         else if (typeof defaults[key] === 'boolean')
           (querys.value as Record<string, any>)[key] = Boolean(_querys[key]); 
         else if (typeof defaults[key] === 'object')
-          (querys.value as Record<string, any>)[key] = JSON.parse(_querys[key]); 
+          (querys.value as Record<string, any>)[key] = JSON.parse(decodeURIComponent(_querys[key])); 
         else
-          querys.value[key] = _querys[key];
+          querys.value[key] = decodeURIComponent(_querys[key]) as any;
       }
     }
     nextTick(() => {

src/components/utils/PageAction.ts

@@ -54,10 +54,8 @@ function redirectTo(url: string, data: Record<string, unknown> = {}) {
 function navTo(url: string, data: Record<string, unknown> = {}) {
   var dataString = '';
   
-  for (const key in data) {
-    if (Object.prototype.hasOwnProperty.call(data, key))
-      dataString += `&${key}=${data[key]}`;
-  }
+  for (const key in data)
+    dataString += `&${key}=${encodeURIComponent('' + data[key])}`;
 
   uni.navigateTo({ 
     url: url + (url.includes('?') ? '&' : '?') + dataString,

src/pages/article/data/CommonCategoryBlocks.vue

@@ -274,7 +274,7 @@ const categoryDatas = computed(() => props.categoryDefine.map(item => {
       default: {
         const block = useHomeCommonCategoryBlock({
           ...item.content,
-          dataSolve: item.dataSolve ?? [],
+          dataSolve: item.content.dataSolve ?? [],
         }, false);
         return {
           ...item,

src/pages/article/data/DefaultCategory.json

@@ -220,13 +220,18 @@
                   "text": "世界闽南文化交流中心",
                   "type": "",
                   "data": {
-                    "type": "detailContent",
+                    "type": "commonContent",
                     "params": {
-                      "id": 8494,
-                      "modelId": 14
-                    }
+                      "modelId": 18,
+                      "mainBodyColumnId": 232
+                    },
+                    "otherParams": {}
                   },
-                  "showMore": false
+                  "showMore": false,
+                  "dataSolve": [
+                    "common"
+                  ],
+                  "count": 1
                 },
                 {
                   "text": "闽南文化",
@@ -325,10 +330,12 @@
                   "visible": false
                 },
                 {
-                  "text": "音频",
-                  "showTitle": false,
+                  "text": "闽南话",
+                  "showTitle": true,
                   "type": "AudioBlock",
-                  "visible": true
+                  "visible": true,
+                  "detailsPage": "/pages/inhert/language/list",
+                  "morePage": "/pages/inhert/language/list"
                 }
               ]
             }
@@ -364,7 +371,7 @@
                     }
                   },
                   "morePage": "/pages/travel/fashion/list",
-                  "detailsPage": "/pages/article/data/details?pageConfigName=expand-details",
+                  "detailsPage": "/pages/article/data/details?pageConfigName=songs-details",
                   "type": "large-image"
                 },
                 {
@@ -385,7 +392,7 @@
                     }
                   },
                   "morePage": "/pages/travel/fashion/list",
-                  "detailsPage": "/pages/article/data/details?pageConfigName=expand-details",
+                  "detailsPage": "/pages/article/data/details?pageConfigName=songs-details",
                   "type": "large-image"
                 },
                 {
@@ -529,7 +536,10 @@
                   "text": "研究成果",
                   "data": {
                     "type": "serializedApi",
-                    "name": "ResultContent"
+                    "name": "ResultContent",
+                    "params": {
+                      "mainBodyColumnId": 271
+                    }
                   },
                   "dataSolve": [
                     "common"
@@ -587,15 +597,19 @@
                   "detailsPage": "/pages/video/details"
                 },
                 {
-                  "type": "speicalMergeItem:getColumns:horizontal-large",
+                  "type": "speicalMergeItem:getColumns:large-image",
                   "params": {
                     "mainBodyColumnId": 366,
-                    "modelId": 18
+                    "modelId": 18,
+                    "overrideItems": [],
+                    "otherParams": {
+                      "pid": "0"
+                    }
                   },
                   "dataSolve": [
                     "common"
                   ],
-                  "detailsPage": "byContent"
+                  "detailsPage": "/pages/article/data/details?pageConfigName=songs-details"
                 }
               ]
             }
@@ -673,7 +687,9 @@
                       "mainBodyColumnId": 386
                     }
                   },
-                  "textLevel": "h2"
+                  "textLevel": "h2",
+                  "showMore": true,
+                  "visible": false
                 },
                 {
                   "text": "市民文化汇",
@@ -1227,6 +1243,7 @@
                 }
               },
               "dataSolve": [
+                "date",
                 "form",
                 "common"
               ]
@@ -1741,6 +1758,51 @@
       }
     },
     {
+      "name": "songs-details",
+      "title": "双哥赛详情页",
+      "content": {
+        "type": "Details",
+        "props": {
+          "introBlockDescs": [],
+          "introBlocks": [],
+          "tabs": [
+            {
+              "text": "简介",
+              "type": "intro"
+            },
+            {
+              "text": "图片",
+              "type": "images"
+            },
+            {
+              "text": "视频",
+              "type": "list",
+              "key": "associationMeList",
+              "define": {
+                "props": {
+                  "showTab": false,
+                  "showSearch": false,
+                  "itemType": "image-large-2",
+                  "detailsPage": "/pages/video/details",
+                  "tabs": [
+                    {
+                      "text": "Root",
+                      "type": "list",
+                      "data": {
+                        "type": "parentKey",
+                        "key": "associationMeList"
+                      },
+                      "dataSolve": []
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
       "name": "expand-details",
       "title": "拓展详情页",
       "content": {
@@ -1758,7 +1820,7 @@
               "type": "images"
             },
             {
-              "text": "视频",
+              "text": "相关文章",
               "type": "list",
               "key": "associationMeList",
               "define": {

src/pages/article/data/data-defines/Category.ts

@@ -74,6 +74,7 @@ export async function doLoadDynamicCategoryDataMergeTypeGetColumns(
               params: undefined,
               text: item.name as string,
               type,
+              dataSolve: category.dataSolve || [],
               ...overrideItem,
               data: {
                 type: 'commonContent',

src/pages/article/data/editor/components/KeyValueEditor.vue

@@ -141,8 +141,6 @@ watch(
     } else {
       localItems.value = [];
     }
-    console.log('aaaa', newValue, localItems);
-    
   },
   { deep: true, immediate: true }
 );