Browse Source

修改bug

Jing 2 weeks ago
parent
commit
4c74fcf364
5 changed files with 58 additions and 32 deletions
  1. 1 1
      assets/css/class.less
  2. 2 4
      composables/publicFunction.ts
  3. 15 12
      pages/[dir]/index.html.vue
  4. 17 13
      pages/index.vue
  5. 23 2
      plugins/category.ts

+ 1 - 1
assets/css/class.less

@@ -833,7 +833,7 @@
                         .content_top_left {
                             float: left;
                             width: 350px;
-                            height: 484px;
+                            height: 550px;
 
                             .part3_photo_text {
                                 width: 350px;

+ 2 - 4
composables/publicFunction.ts

@@ -47,9 +47,7 @@ const getTitleLength = function (title: string, length: number) {
 
 //3.格式化跳转路径 start ---------------------------------------->
 //3.1跳转到频道页面或者一级列表页
-const getLinkPath = (item: any) => {
-  console.log("111111111item", item);
-  
+const getLinkPath = (item: any) => {  
   if (item.is_url == 1) {
     return `${item.web_url}`;
   } else if (item.children_count == 0) {
@@ -61,7 +59,7 @@ const getLinkPath = (item: any) => {
   }
 }
 const getLinkPath1 = (item: any) => {
-  return `/${item.aLIas_pinyin}/list-1.html`;
+  return `/${item.pinyin}/list-1.html`;
 }
 //3.2跳转到详情页
 const getLinkPathDetail = (item: any) => {

+ 15 - 12
pages/[dir]/index.html.vue

@@ -14,8 +14,9 @@
                 <li class="home">
                     {{ title }}
                 </li>
-                <li class="titleList" v-for="(item, index) in pageData" :key="index">
-                    <NuxtLink :href="getLinkPath(item)" :title="item.alias">
+                <li class="titleList" v-for="(item, index) in pageData1" :key="index">
+                    <NuxtLink :href="getLinkPath(item)" :title="item.alias"
+                        :target="item.is_url == 1 ? '_blank' : '_self'">
                         <span class="nav2_title">{{ item.alias }}</span>
                     </NuxtLink>
                 </li>
@@ -173,7 +174,8 @@
         <HomeAdvertising :imgurl="adImg2"></HomeAdvertising>
 
         <!-- 第二层 -->
-        <div class="part3" v-if="pageData[4]">
+        <!-- v-if="pageData.length>7" -->
+        <div class="part3" v-if="pageData.length > 7">
             <div class="inner">
                 <div class="part3_left">
                     <div class="part3_left_top" v-if="pageData[4]">
@@ -519,6 +521,7 @@ const pageData = ref([
     // { id: 7, data: [], title: "", cid: "" },
     // { id: 8, data: [], title: "", cid: "" },
 ])
+const pageData1 = ref([])
 
 const navSize = ref("");
 
@@ -529,10 +532,10 @@ try {
         query: {
             'placeid': 1,
             'pid': routeId,
-            'num': 8
+            'num': 20
         },
     });
-    console.log('1111111111111二级导航',navigateData)
+    console.log('1111111111111二级导航', navigateData)
     if (navigateData.code == 200) {
         // 遍历可用的导航池放到页面中
         for (let index in navigateData.data) {
@@ -558,14 +561,14 @@ try {
                 title3: "",
                 title4: ""
             };
-            pageData.value.push(data);
+            pageData1.value.push(data);
 
-            // if (navigateData.data[index].is_url == 1) {
-            //     // 处理 URL 的逻辑
-            // } else {
-            //     //每个页面最多8个模块
-            //     pageData.value.push(data);
-            // }
+            if (navigateData.data[index].is_url == 1) {
+                // 处理 URL 的逻辑
+            } else {
+                //每个页面最多8个模块
+                pageData.value.push(data);
+            }
         }
         //导航池加载完毕,开始申请模块数据
         // await getPageData1();

+ 17 - 13
pages/index.vue

@@ -1381,20 +1381,20 @@ try {
 
 
 let getJson = [
-    { "parent": $pageNav[0] + ",0,20", "child": $pageNav[0] + ",1,1" },//模块1 三农资讯445
-    { "parent": $pageNav[1] + ",0,4", "child": $pageNav[1] + ",1,1" },//模块2 三农服务27
+    { "parent": $pageNav[0] + ",0,20", "child": $pageNav[23] + ",1,1" },//模块1 三农资讯445
+    { "parent": $pageNav[1] + ",0,4", "child": $pageNav[24] + ",1,1" },//模块2 三农服务27
     { "parent": $pageNav[2] + ",0,4", "child": "" },//模块3 网站公告410
-    { "parent": $pageNav[3] + ",3,10", "child": $pageNav[3] + ",1,1" },//模块4 乡村招商325
+    { "parent": $pageNav[3] + ",3,10", "child": $pageNav[25] + ",1,1" },//模块4 乡村招商325
     { "parent": $pageNav[4] + ",2,0", "child": "" },//模块5 乡村建设320
     { "parent": $pageNav[5] + ",2,0", "child": "" },//模块6 乡村管理319
     { "parent": $pageNav[6] + ",2,0", "child": "" },//模块7 乡村文化321
-    { "parent": $pageNav[7] + ",3,10", "child": $pageNav[7] + ",1,1" },//模块8 三农投资12
+    { "parent": $pageNav[7] + ",3,10", "child": $pageNav[26] + ",1,1" },//模块8 三农投资12
     { "parent": $pageNav[8] + ",2,0", "child": "" },//模块9 乡村生活322
     { "parent": $pageNav[9] + ",2,0", "child": "" },//模块10 乡村经济323
     { "parent": $pageNav[10] + ",2,0", "child": "" },//模块11 乡村风采318
     { "parent": $pageNav[11] + ",1,5", "child": "" },//模块12 乡村名企407
     { "parent": $pageNav[12] + ",1,5", "child": "" },//模块13 特色乡村331 
-    { "parent": $pageNav[13] + ",1,13", "child": $pageNav[13] + ",1,1" },//模块14 产业集群330
+    { "parent": $pageNav[13] + ",1,13", "child": $pageNav[27] + ",1,1" },//模块14 产业集群330
     { "parent": $pageNav[14] + ",1,13", "child": "" },//模块15 三农人物18
     { "parent": $pageNav[15] + ",1,13", "child": "" },//模块16 三农名企335
     { "parent": $pageNav[16] + ",3,10", "child": "" },//模块17 农技推广348
@@ -1403,9 +1403,9 @@ let getJson = [
     { "parent": $pageNav[19] + ",2,7", "child": "" },//模块20 招工求职344
 
     //不包含资讯的导航
-    { "parent": $pageNav[20] + ",0,0", "child": $pageNav[20] + ",1,1" },//模块1 乡村商城346
-    { "parent": $pageNav[21] + ",0,0", "child": $pageNav[20] + ",1,1" },//模块2 市场报价345
-    { "parent": $pageNav[22] + ",0,0", "child": $pageNav[20] + ",1,1" },//模块3 乡土特色343 
+    { "parent": $pageNav[20] + ",0,0", "child": $pageNav[28] + ",1,1" },//模块1 乡村商城346
+    { "parent": $pageNav[21] + ",0,0", "child": $pageNav[29] + ",1,1" },//模块2 市场报价345
+    { "parent": $pageNav[22] + ",0,0", "child": $pageNav[30] + ",1,1" },//模块3 乡土特色343 
 ]
 
 let jsonString = JSON.stringify(getJson);
@@ -1418,7 +1418,7 @@ async function getPageAllData() {
             'id': jsonString
         },
     });
-    // console.log("成功获取模块数据1111!", mkdata);
+    console.log("成功获取模块数据1111!", mkdata.data);
 
     if (mkdata.code == 200) {
         // console.log("成功获取模块数据1111222!", mkdata.data[1].textnum);
@@ -1443,8 +1443,10 @@ async function getPageAllData() {
                 boxData4data2.value.push(data44[i]);
             }
         }
-        if (mkdata.data[3].child) {
-            boxData4menu.value = mkdata.data[3].child.all_childcat;
+        for (let i in mkdata.data[3].child.all_childcat) {
+            if (i < 6) {
+                boxData4menu.value.push(mkdata.data[3].child.all_childcat[i]);
+            }
         }
         //模块5 乡村建设
         boxData5.value = mkdata.data[4].imgnum;
@@ -1463,8 +1465,10 @@ async function getPageAllData() {
                 boxData8data2.value.push(data1[i]);
             }
         }
-        if (mkdata.data[7].child) {
-            boxData8menu.value = mkdata.data[7].child.all_childcat;
+        for (let i in mkdata.data[7].child.all_childcat) {
+            if (i < 6) {
+                boxData8menu.value.push(mkdata.data[7].child.all_childcat[i]);
+            }
         }
         //模块9 乡村生活
         boxData9.value = mkdata.data[8].imgnum;

+ 23 - 2
plugins/category.ts

@@ -4,7 +4,7 @@ const navMaster: number[] = [
     445,//模块1 三农资讯445
     27, //模块2 三农服务27
     410,//模块3 网站公告410
-    325,//模块4 乡村招商325
+    325,//
     320,//模块5 乡村建设320
     319,//模块6 乡村管理319
     321,//模块7 乡村文化321
@@ -24,7 +24,18 @@ const navMaster: number[] = [
     // 不包含资讯的导航
     346, //乡村商场346
     345, //市场报价345
-    343  //乡土特色343
+    343,  //乡土特色343
+
+    //二级栏目
+    604, //模块1 三农资讯445-政策法规604
+    193, //模块2 三农服务27-三农招商193
+    429, //模块4 乡村招商325-乡村引资429
+    223, //模块8 三农投资12-国家拨款223
+    612, //模块14 产业集群330-农产基地612
+    446, //乡村商场346 农副产品446
+    454, //市场报价345 最新报价454
+    462, //乡土特色343 饮食文化462
+
 ]
 
 const navPre: number[] = [
@@ -52,6 +63,16 @@ const navPre: number[] = [
     346, //乡村商场346
     345, //市场报价345
     343  //乡土特色343
+
+    //二级栏目
+    // 419, //模块1 三农资讯328-政策法规419
+    // 193, //模块2 三农服务27-三农招商193
+    // 429, //模块4 乡村招商325-乡村引资429 (pre没有二级导航)
+    // 223, //模块8 三农投资12-国家拨款223
+    // 612, //模块14 产业集群330-农产基地612 (pre没有二级导航)
+    // 442, //乡村商场346 农资产品442
+    // 450, //市场报价345 最新报价450
+    // 458, //乡土特色343 饮食文化458
 ]
 
 export default defineNuxtPlugin((nuxtApp) => {