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

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

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

+ 10 - 8
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,12 +95,12 @@ function getRouteWhiteList(path){
         const parts = path.split('/').filter(Boolean); // 分割并过滤空字符串
         console.log(parts[0])
         let whiteList = [
-            "404",
-            "search",//搜索页
-            "xiangcunshangcheng",//乡村商城搜索页
-            "topic",//商圈
-            "advertising",//广告
-            "about",//关于我们
+            // "404",
+            // "search",//搜索页
+            // "xiangcunshangcheng",//乡村商城搜索页
+            // "topic",//商圈
+            // "advertising",//广告
+            // "about",//关于我们
         ]
 
         if(whiteList.includes(parts[0])){

+ 1 - 1
pages/[dir]/index.html.vue

@@ -634,7 +634,7 @@ async function getPageAllData(jsonString) {
 
     if (mkdata.code == 200) {
         console.log(778899)
-        console.log(mkdata.data)
+        console.log('mkdata.data',mkdata.data)
         //模块1理论前沿
         if (mkdata.data[0].child.imgnum.length > 0) {
             pageData.value[0].data.push(mkdata.data[0].child.imgnum[0]);

+ 2 - 1
pages/index.vue

@@ -973,7 +973,8 @@
                     <!-- 乡村商城 -->
                     <div class="part6_left_content1">
                         <h2 class="part6_left_content_title">
-                            <NuxtLink class="active" v-if="pageData[20].cid" href="/" :title="pageData[20].alias">
+                            <NuxtLink class="active" v-if="pageData[20].cid" :href="`/${pageData[20].url}/index.html`"
+                                :title="pageData[20].alias">
                                 <img src="../public/index/xcsc.png" alt="乡村商城">
                                 {{ pageData[20].alias }}
                             </NuxtLink>