Эх сурвалжийг харах

将路由白名单功能上到正式环境

Jing 3 долоо хоног өмнө
parent
commit
ddc26ede1a

+ 1 - 1
.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"e7742a4e-203c-43c7-9078-55bfa794f214","timestamp":1750143129488}
+{"id":"d95050ca-a5d5-4bfe-9348-e22e9c83b20c","timestamp":1750727108136}

+ 1 - 0
.nuxt/manifest/meta/d95050ca-a5d5-4bfe-9348-e22e9c83b20c.json

@@ -0,0 +1 @@
+{"id":"d95050ca-a5d5-4bfe-9348-e22e9c83b20c","timestamp":1750727108136,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 0 - 1
.nuxt/manifest/meta/e7742a4e-203c-43c7-9078-55bfa794f214.json

@@ -1 +0,0 @@
-{"id":"e7742a4e-203c-43c7-9078-55bfa794f214","timestamp":1750143129488,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/e7742a4e-203c-43c7-9078-55bfa794f214.json"
+        "./manifest/meta/d95050ca-a5d5-4bfe-9348-e22e9c83b20c.json"
       ],
       "#components": [
         "./components"

+ 11 - 9
middleware/setup.global.js

@@ -42,7 +42,7 @@ function parseRoute(url) {
         parts.pop();
     }
 
-    let all_route, last_route;
+    let all_route, last_route, other_route;
 
     // 如果路径以 xiangcunshangcheng 开头
     // if (parts[0] === "xiangcunshangcheng") {
@@ -70,11 +70,13 @@ function parseRoute(url) {
 
     all_route = parts.join('/');
     last_route = parts.length > 0 ? parts[parts.length - 1] : null;
+    other_route = parts[0]
 
     // 返回结果(只有数字.html 时才包含 id)
     const result = {
         all_route,
-        last_route
+        last_route,
+        other_route,
     };
     if (id !== undefined) {
         result.id = id;
@@ -93,13 +95,13 @@ function getRouteWhiteList(path) {
         const parts = path.split('/').filter(Boolean); // 分割并过滤空字符串
         console.log(parts[0])
         let whiteList = [
-            "404",
-            "search",//搜索页
-            "xiangcunshangcheng",//乡村商城搜索页
-            "topic",//商圈
-            "advertising",//广告
-            "about",//关于我们
-            "shukanyinxiang",//书刊音像
+            // "404",
+            // "search",//搜索页
+            // "xiangcunshangcheng",//乡村商城搜索页
+            // "topic",//商圈
+            // "advertising",//广告
+            // "about",//关于我们
+            // "shukanyinxiang",//书刊音像
         ]
 
         if (whiteList.includes(parts[0])) {

+ 27 - 8
pages/[dir]/index.html.vue

@@ -460,15 +460,34 @@ try {
 
         //导航池加载完毕,开始申请模块数据
         let getJson = [
-            { "parent": routeId + ",0,0", "child": pageData.value[0].cid + ",4,9" },//模块1 顶部没有标题的那个
-            { "parent": routeId + ",0,0", "child": pageData.value[1].cid + ",3,11" },//模块2
-            { "parent": routeId + ",0,0", "child": pageData.value[2].cid + ",2,7" },//模块3
-            { "parent": routeId + ",0,0", "child": pageData.value[3].cid + ",0,8" },//模块4
-            { "parent": routeId + ",0,0", "child": pageData.value[4].cid + ",1,0" },//模块5
-            { "parent": routeId + ",0,0", "child": pageData.value[5].cid + ",1,6" },//模块6
-            { "parent": routeId + ",0,0", "child": pageData.value[6].cid + ",1,6" },//模块7
-            { "parent": routeId + ",0,0", "child": pageData.value[7].cid + ",1,7" },//模块8
+            // { "parent": routeId + ",0,0", "child": pageData.value[0].cid + ",4,9" },//模块1 顶部没有标题的那个
+            // { "parent": routeId + ",0,0", "child": pageData.value[1].cid + ",3,11" },//模块2
+            // { "parent": routeId + ",0,0", "child": pageData.value[2].cid + ",2,7" },//模块3
+            // { "parent": routeId + ",0,0", "child": pageData.value[3].cid + ",0,8" },//模块4
+            // { "parent": routeId + ",0,0", "child": pageData.value[4].cid + ",1,0" },//模块5
+            // { "parent": routeId + ",0,0", "child": pageData.value[5].cid + ",1,6" },//模块6
+            // { "parent": routeId + ",0,0", "child": pageData.value[6].cid + ",1,6" },//模块7
+            // { "parent": routeId + ",0,0", "child": pageData.value[7].cid + ",1,7" },//模块8
         ]
+        for (let i = 0; i < pageData.value.length; i++) {
+            if (i == 0) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[i].cid + ",4,9" });//模块1 
+            } else if (i == 1) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[i].cid + ",3,11" });//模块2 
+            } else if (i == 2) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[i].cid + ",2,7" });//模块3 
+            } else if (i == 3) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[i].cid + ",0,8" });//模块4 
+            } else if (i == 4) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[i].cid + ",1,0" });//模块5
+            } else if (i == 5) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[i].cid + ",1,6" });//模块6
+            } else if (i == 6) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[i].cid + ",1,6" });//模块7
+            } else if (i == 7) {
+                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[i].cid + ",1,7" });//模块8 
+            }
+        }
         let jsonString = JSON.stringify(getJson);
         console.log('mkdatajsonString', jsonString);