修改bug

.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"5c7ecb09-05f9-4b19-9ae0-e11729f8a1fa","timestamp":1752210555083}
+{"id":"862f22d3-060f-4a55-9925-b13f84818d92","timestamp":1752635391450}

.nuxt/manifest/meta/5c7ecb09-05f9-4b19-9ae0-e11729f8a1fa.json

@@ -1 +0,0 @@
-{"id":"5c7ecb09-05f9-4b19-9ae0-e11729f8a1fa","timestamp":1752210555083,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/manifest/meta/862f22d3-060f-4a55-9925-b13f84818d92.json

@@ -0,0 +1 @@
+{"id":"862f22d3-060f-4a55-9925-b13f84818d92","timestamp":1752635391450,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/5c7ecb09-05f9-4b19-9ae0-e11729f8a1fa.json"
+        "./manifest/meta/862f22d3-060f-4a55-9925-b13f84818d92.json"
       ],
       "#components": [
         "./components"

pages/[dir]/index.html.vue

@@ -2,34 +2,34 @@
     <div>
         <HomePageHead></HomePageHead>
         <HomePageNavigation></HomePageNavigation>
-        <HomeSecondaryHeading :titleData="allData" :pinyinid="routeId"></HomeSecondaryHeading>
+        <HomeSecondaryHeading :titleData="pageData" :pinyinid="routeId"></HomeSecondaryHeading>
 
         <div class="farmingPartOne">
             <div class="inner">
-                <div class="innerLeft" v-if="pageData.length > 0">
+                <div class="innerLeft" v-if="newsData.length > 0">
                     <div class="title">
                         <h3>
-                            <NuxtLink :href="getLinkPath(pageData[0])" v-if="pageData[0]" :title="pageData[0].alias">
-                                {{ pageData[0].alias }}
+                            <NuxtLink :href="getLinkPath(newsData[0])" v-if="newsData[0]" :title="newsData[0].alias">
+                                {{ newsData[0].alias }}
                             </NuxtLink>
                             <span>
-                                <!-- <NuxtLink :href="getLinkPath(pageData[0])" v-if="pageData[0]"
-                                    :title="pageData[0].title">
+                                <!-- <NuxtLink :href="getLinkPath(newsData[0])" v-if="newsData[0]"
+                                    :title="newsData[0].title">
                                     查看更多
                                 </NuxtLink> -->
                             </span>
                         </h3>
                     </div>
                     <div class="leftTop">
-                        <div class="leftTopPhoto left" v-if="pageData[0].data[0]">
-                            <NuxtLink :href="getLinkPathDetail(pageData[0].data[0])" :title="pageData[0].data[0].title">
-                                <img :src="pageData[0].data[0].imgurl" :alt="pageData[0].data[0].title">
-                                <span>{{ pageData[0].data[0].title }}</span>
+                        <div class="leftTopPhoto left" v-if="newsData[0].data[0]">
+                            <NuxtLink :href="getLinkPathDetail(newsData[0].data[0])" :title="newsData[0].data[0].title">
+                                <img :src="newsData[0].data[0].imgurl" :alt="newsData[0].data[0].title">
+                                <span>{{ newsData[0].data[0].title }}</span>
                             </NuxtLink>
                         </div>
                         <div class="leftTopPhoto left" v-else></div>
                         <ul class="left">
-                            <li v-for="item in pageData[0].data3">
+                            <li v-for="item in newsData[0].data3">
                                 <em></em>
                                 <span>
                                     <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
@@ -39,8 +39,8 @@
                             </li>
                         </ul>
                     </div>
-                    <ul class="leftBottom" v-if="pageData[0].data2[0] != null">
-                        <li v-for="item in pageData[0].data2">
+                    <ul class="leftBottom" v-if="newsData[0].data2[0] != null">
+                        <li v-for="item in newsData[0].data2">
                             <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                 <img :src="item.imgurl" :alt="item.title">
                             </NuxtLink>
@@ -53,22 +53,22 @@
                     </ul>
                 </div>
 
-                <div class="innerRight" v-if="pageData.length >= 2">
+                <div class="innerRight" v-if="newsData.length >= 2">
                     <div class="title">
                         <h3>
-                            <NuxtLink :href="getLinkPath(pageData[1])" v-if="pageData[1]" :title="pageData[1].alias">
-                                {{ pageData[1].alias }}
+                            <NuxtLink :href="getLinkPath(newsData[1])" v-if="newsData[1]" :title="newsData[1].alias">
+                                {{ newsData[1].alias }}
                             </NuxtLink>
                             <span>
-                                <!-- <NuxtLink :href="getLinkPath(pageData[1])" v-if="pageData[1]"
-                                    :title="pageData[1].title">
+                                <!-- <NuxtLink :href="getLinkPath(newsData[1])" v-if="newsData[1]"
+                                    :title="newsData[1].title">
                                     查看更多
                                 </NuxtLink> -->
                             </span>
                         </h3>
                     </div>
                     <ul class="rightList">
-                        <li v-for="item in pageData[1].data">
+                        <li v-for="item in newsData[1].data">
                             <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                 <img class="left" :src="item.imgurl" :alt="item.title">
                             </NuxtLink>
@@ -83,32 +83,32 @@
             </div>
         </div>
         <HomeTopTen :imgurl="adImg1" v-if="adImg1"></HomeTopTen>
-        <div class="farmingPartTwo" v-if="pageData.length >= 3">
+        <div class="farmingPartTwo" v-if="newsData.length >= 3">
             <div class="inner">
-                <div class="farmer" v-if="pageData.length >= 3">
+                <div class="farmer" v-if="newsData.length >= 3">
                     <div class="title">
                         <h3>
-                            <NuxtLink :href="getLinkPath(pageData[2])" v-if="pageData[2]" :title="pageData[2].alias">
-                                {{ pageData[2].alias }}
+                            <NuxtLink :href="getLinkPath(newsData[2])" v-if="newsData[2]" :title="newsData[2].alias">
+                                {{ newsData[2].alias }}
                             </NuxtLink>
                             <span>
-                                <!-- <NuxtLink :href="getLinkPath(pageData[2])" v-if="pageData[2]"
-                                    :title="pageData[2].title">
+                                <!-- <NuxtLink :href="getLinkPath(newsData[2])" v-if="newsData[2]"
+                                    :title="newsData[2].title">
                                     查看更多
                                 </NuxtLink> -->
                             </span>
                         </h3>
                     </div>
                     <div class="PartTwoPhoto">
-                        <div v-if="pageData[2].data[0]">
-                            <NuxtLink :href="getLinkPathDetail(pageData[2].data[0])" :title="pageData[2].data[0].title">
-                                <img :src="pageData[2].data[0].imgurl" :alt="pageData[2].data[0].title">
-                                <span>{{ pageData[2].data[0].title }}</span>
+                        <div v-if="newsData[2].data[0]">
+                            <NuxtLink :href="getLinkPathDetail(newsData[2].data[0])" :title="newsData[2].data[0].title">
+                                <img :src="newsData[2].data[0].imgurl" :alt="newsData[2].data[0].title">
+                                <span>{{ newsData[2].data[0].title }}</span>
                             </NuxtLink>
                         </div>
                     </div>
                     <ul class="PartTwoList">
-                        <li v-for="item in pageData[2].data2">
+                        <li v-for="item in newsData[2].data2">
                             <em></em>
                             <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                 {{ item.title }}
@@ -116,30 +116,30 @@
                         </li>
                     </ul>
                 </div>
-                <div class="farmer" v-if="pageData.length >= 4">
+                <div class="farmer" v-if="newsData.length >= 4">
                     <div class="title">
                         <h3>
-                            <NuxtLink :href="getLinkPath(pageData[3])" v-if="pageData[3]" :title="pageData[3].alias">
-                                {{ pageData[3].alias }}
+                            <NuxtLink :href="getLinkPath(newsData[3])" v-if="newsData[3]" :title="newsData[3].alias">
+                                {{ newsData[3].alias }}
                             </NuxtLink>
                             <span>
-                                <!-- <NuxtLink :href="getLinkPath(pageData[3])" v-if="pageData[3]"
-                                    :title="pageData[3].title">
+                                <!-- <NuxtLink :href="getLinkPath(newsData[3])" v-if="newsData[3]"
+                                    :title="newsData[3].title">
                                     查看更多
                                 </NuxtLink> -->
                             </span>
                         </h3>
                     </div>
                     <div class="PartTwoPhoto">
-                        <div v-if="pageData[3].data[0]">
-                            <NuxtLink :href="getLinkPathDetail(pageData[3].data[0])" :title="pageData[3].data[0].title">
-                                <img :src="pageData[3].data[0].imgurl" :alt="pageData[3].data[0].title">
-                                <span>{{ pageData[3].data[0].title }}</span>
+                        <div v-if="newsData[3].data[0]">
+                            <NuxtLink :href="getLinkPathDetail(newsData[3].data[0])" :title="newsData[3].data[0].title">
+                                <img :src="newsData[3].data[0].imgurl" :alt="newsData[3].data[0].title">
+                                <span>{{ newsData[3].data[0].title }}</span>
                             </NuxtLink>
                         </div>
                     </div>
                     <ul class="PartTwoList">
-                        <li v-for="item in pageData[3].data2">
+                        <li v-for="item in newsData[3].data2">
                             <em></em>
                             <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                 {{ item.title }}
@@ -147,30 +147,30 @@
                         </li>
                     </ul>
                 </div>
-                <div class="farmer" v-if="pageData.length >= 5">
+                <div class="farmer" v-if="newsData.length >= 5">
                     <div class="title">
                         <h3>
-                            <NuxtLink :href="getLinkPath(pageData[4])" v-if="pageData[4]" :title="pageData[4].alias">
-                                {{ pageData[4].alias }}
+                            <NuxtLink :href="getLinkPath(newsData[4])" v-if="newsData[4]" :title="newsData[4].alias">
+                                {{ newsData[4].alias }}
                             </NuxtLink>
                             <span>
-                                <!-- <NuxtLink :href="getLinkPath(pageData[4])" v-if="pageData[4]"
-                                    :title="pageData[4].title">
+                                <!-- <NuxtLink :href="getLinkPath(newsData[4])" v-if="newsData[4]"
+                                    :title="newsData[4].title">
                                     查看更多
                                 </NuxtLink> -->
                             </span>
                         </h3>
                     </div>
                     <div class="PartTwoPhoto">
-                        <div v-if="pageData[4].data[0]">
-                            <NuxtLink :href="getLinkPathDetail(pageData[4].data[0])" :title="pageData[4].data[0].title">
-                                <img :src="pageData[4].data[0].imgurl" :alt="pageData[4].data[0].title">
-                                <span>{{ pageData[4].data[0].title }}</span>
+                        <div v-if="newsData[4].data[0]">
+                            <NuxtLink :href="getLinkPathDetail(newsData[4].data[0])" :title="newsData[4].data[0].title">
+                                <img :src="newsData[4].data[0].imgurl" :alt="newsData[4].data[0].title">
+                                <span>{{ newsData[4].data[0].title }}</span>
                             </NuxtLink>
                         </div>
                     </div>
                     <ul class="PartTwoList">
-                        <li v-for="item in pageData[4].data2">
+                        <li v-for="item in newsData[4].data2">
                             <em></em>
                             <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                 {{ item.title }}
@@ -178,7 +178,7 @@
                         </li>
                     </ul>
                 </div>
-                <div class="farmer" v-if="goodsData.length >= 1">
+                <div class="farmer" v-if="goodsData.length > 0">
                     <div class="title">
                         <h3>
                             <NuxtLink :href="getLinkPath(goodsData[0])" v-if="goodsData[0]" :title="goodsData[0].alias">
@@ -213,27 +213,27 @@
             </div>
         </div>
         <HomeTopTen :imgurl="adImg2" v-if="adImg2"></HomeTopTen>
-        <div class="zixuntuijian" v-if="pageData.length >= 6">
+        <div class="zixuntuijian" v-if="newsData.length >= 6">
             <div class="inner">
                 <div class="innerLeft">
                     <div class="zixunTop">
-                        <div class="zixunLeft" v-if="pageData.length >= 6">
+                        <div class="zixunLeft" v-if="newsData.length >= 6">
                             <div class="title">
                                 <h3>
-                                    <NuxtLink :href="getLinkPath(pageData[5])" v-if="pageData[5]"
-                                        :title="pageData[5].alias">
-                                        {{ pageData[5].alias }}
+                                    <NuxtLink :href="getLinkPath(newsData[5])" v-if="newsData[5]"
+                                        :title="newsData[5].alias">
+                                        {{ newsData[5].alias }}
                                     </NuxtLink>
                                     <span>
-                                        <!-- <NuxtLink :href="getLinkPath(pageData[5])" v-if="pageData[5]"
-                                            :title="pageData[5].title">
+                                        <!-- <NuxtLink :href="getLinkPath(newsData[5])" v-if="newsData[5]"
+                                            :title="newsData[5].title">
                                             查看更多
                                         </NuxtLink> -->
                                     </span>
                                 </h3>
                             </div>
-                            <ul class="photo_text" v-if="pageData[5].data[0] != null">
-                                <li v-for="item in pageData[5].data">
+                            <ul class="photo_text" v-if="newsData[5].data[0] != null">
+                                <li v-for="item in newsData[5].data">
                                     <article>
                                         <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                             <img :src="item.imgurl" :alt="item.title">
@@ -251,7 +251,7 @@
                                         </div>
                                     </article>
                                 </li>
-                                <li v-for="item in pageData[5].data2">
+                                <li v-for="item in newsData[5].data2">
                                     <article>
                                         <em></em>
                                         <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
@@ -261,23 +261,23 @@
                                 </li>
                             </ul>
                         </div>
-                        <div class="zixunRight" v-if="pageData.length >= 7">
+                        <div class="zixunRight" v-if="newsData.length >= 7">
                             <div class="title">
                                 <h3>
-                                    <NuxtLink :href="getLinkPath(pageData[6])" v-if="pageData[6]"
-                                        :title="pageData[6].alias">
-                                        {{ pageData[6].alias }}
+                                    <NuxtLink :href="getLinkPath(newsData[6])" v-if="newsData[6]"
+                                        :title="newsData[6].alias">
+                                        {{ newsData[6].alias }}
                                     </NuxtLink>
                                     <span>
-                                        <!-- <NuxtLink :href="getLinkPath(pageData[6])" v-if="pageData[6]"
-                                            :title="pageData[6].title">
+                                        <!-- <NuxtLink :href="getLinkPath(newsData[6])" v-if="newsData[6]"
+                                            :title="newsData[6].title">
                                             查看更多
                                         </NuxtLink> -->
                                     </span>
                                 </h3>
                             </div>
                             <div class="towPic">
-                                <div v-for="item in pageData[6].data" class="picBox">
+                                <div v-for="item in newsData[6].data" class="picBox">
                                     <div>
                                         <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                             <img :src="item.imgurl" :alt="item.title">
@@ -286,7 +286,7 @@
                                 </div>
                             </div>
                             <ul class="photo_text">
-                                <li v-for="item in pageData[6].data2">
+                                <li v-for="item in newsData[6].data2">
                                     <article>
                                         <em></em>
                                         <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
@@ -297,33 +297,33 @@
                             </ul>
                         </div>
                     </div>
-                    <div class="zixunBottom" v-if="pageData[7].data[0] != null">
-                        <NuxtLink :href="getLinkPathDetail(pageData[7].data[0])"
-                            v-if="pageData[7].data[0] && hoverStatus == 0">
-                            <img class="left" :src="pageData[7].data[0].imgurl" :alt="pageData[7].data[0].title">
+                    <div class="zixunBottom" v-if="newsData[7].data[0] != null">
+                        <NuxtLink :href="getLinkPathDetail(newsData[7].data[0])"
+                            v-if="newsData[7].data[0] && hoverStatus == 0">
+                            <img class="left" :src="newsData[7].data[0].imgurl" :alt="newsData[7].data[0].title">
                         </NuxtLink>
-                        <NuxtLink :href="getLinkPathDetail(pageData[7].data[1])"
-                            v-if="pageData[7].data[1] && hoverStatus == 1">
-                            <img class="left" :src="pageData[7].data[1].imgurl" :alt="pageData[7].data[1].title">
+                        <NuxtLink :href="getLinkPathDetail(newsData[7].data[1])"
+                            v-if="newsData[7].data[1] && hoverStatus == 1">
+                            <img class="left" :src="newsData[7].data[1].imgurl" :alt="newsData[7].data[1].title">
                         </NuxtLink>
-                        <NuxtLink :href="getLinkPathDetail(pageData[7].data[2])"
-                            v-if="pageData[7].data[2] && hoverStatus == 2">
-                            <img class="left" :src="pageData[7].data[2].imgurl" :alt="pageData[7].data[2].title">
+                        <NuxtLink :href="getLinkPathDetail(newsData[7].data[2])"
+                            v-if="newsData[7].data[2] && hoverStatus == 2">
+                            <img class="left" :src="newsData[7].data[2].imgurl" :alt="newsData[7].data[2].title">
                         </NuxtLink>
-                        <NuxtLink :href="getLinkPathDetail(pageData[7].data[3])"
-                            v-if="pageData[7].data[3] && hoverStatus == 3">
-                            <img class="left" :src="pageData[7].data[3].imgurl" :alt="pageData[7].data[3].title">
+                        <NuxtLink :href="getLinkPathDetail(newsData[7].data[3])"
+                            v-if="newsData[7].data[3] && hoverStatus == 3">
+                            <img class="left" :src="newsData[7].data[3].imgurl" :alt="newsData[7].data[3].title">
                         </NuxtLink>
-                        <NuxtLink :href="getLinkPathDetail(pageData[7].data[4])"
-                            v-if="pageData[7].data[4] && hoverStatus == 4">
-                            <img class="left" :src="pageData[7].data[4].imgurl" :alt="pageData[7].data[4].title">
+                        <NuxtLink :href="getLinkPathDetail(newsData[7].data[4])"
+                            v-if="newsData[7].data[4] && hoverStatus == 4">
+                            <img class="left" :src="newsData[7].data[4].imgurl" :alt="newsData[7].data[4].title">
                         </NuxtLink>
-                        <NuxtLink :href="getLinkPathDetail(pageData[7].data[5])"
-                            v-if="pageData[7].data[5] && hoverStatus == 5">
-                            <img class="left" :src="pageData[7].data[5].imgurl" :alt="pageData[7].data[5].title">
+                        <NuxtLink :href="getLinkPathDetail(newsData[7].data[5])"
+                            v-if="newsData[7].data[5] && hoverStatus == 5">
+                            <img class="left" :src="newsData[7].data[5].imgurl" :alt="newsData[7].data[5].title">
                         </NuxtLink>
                         <ul class="leftList left">
-                            <li v-for="(item, index) in pageData[7].data" @mouseenter="qhPic(index)">
+                            <li v-for="(item, index) in newsData[7].data" @mouseenter="qhPic(index)">
                                 <h4>
                                     <em></em>
                                     <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
@@ -334,22 +334,22 @@
                         </ul>
                     </div>
                 </div>
-                <div class="innerRight" v-if="pageData.length >= 8">
+                <div class="innerRight" v-if="newsData.length >= 8">
                     <div class="title">
                         <h3>
-                            <NuxtLink :href="getLinkPath(pageData[7])" v-if="pageData[7]" :title="pageData[7].alias">
-                                {{ pageData[7].alias }}
+                            <NuxtLink :href="getLinkPath(newsData[7])" v-if="newsData[7]" :title="newsData[7].alias">
+                                {{ newsData[7].alias }}
                             </NuxtLink>
                             <span>
-                                <!-- <NuxtLink :href="getLinkPath(pageData[7])" v-if="pageData[7]"
-                                    :title="pageData[7].title">
+                                <!-- <NuxtLink :href="getLinkPath(newsData[7])" v-if="newsData[7]"
+                                    :title="newsData[7].title">
                                     查看更多
                                 </NuxtLink> -->
                             </span>
                         </h3>
                     </div>
                     <ul class="information">
-                        <li v-for="item in pageData[7].data2">
+                        <li v-for="item in newsData[7].data2">
                             <NuxtLink :href="getLinkPathDetail(item)" :title="item.title">
                                 <img :src="item.imgurl" :alt="item.title">
                             </NuxtLink>
@@ -673,7 +673,7 @@ const pageData = ref([
 ])
 // 商品
 const goodsData = ref([]);
-const allData = ref([])
+const newsData = ref([])
 
 const navSize = ref("");
 
@@ -714,16 +714,16 @@ try {
             if (navigateData.data[index].is_url == 1) {
                 // 处理 URL 的逻辑
             } else {
-                if (navigateData.data[index].type == 2) {
+                if (navigateData.data[index].type == 1) {
+                    newsData.value.push(data);
+                } else if (navigateData.data[index].type == 2) {
                     goodsData.value.push(data);
-                } else if (navigateData.data[index].type == 1) {
-                    pageData.value.push(data);
                 }
                 //每个页面最多8个模块
-                allData.value.push(data);
+                pageData.value.push(data);
             }
         }
-        // console.log("导航池11111pageData", pageData.value);
+        // console.log("导航池11111newsData", newsData.value);
         // console.log("导航池11111goods", goodsData.value);
 
         let goodsJson = []
@@ -731,7 +731,7 @@ try {
             if (i == 0) {
                 goodsJson.push({ "catid": goodsData.value[0].cid + ",0,7" });
             } else if (i == 1) {
-                goodsJson.push({ "catid": goodsData.value[1].cid + ",0,10" });
+                goodsJson.push({ "catid": goodsData.value[1].cid + ",0,9" });
             } else if (i == 2) {
                 goodsJson.push({ "catid": goodsData.value[2].cid + ",0,5" });
             } else if (i == 3) {
@@ -739,41 +739,41 @@ try {
             }
         }
         let goodsJsonString = JSON.stringify(goodsJson);
-        getPageGoodsAllData(goodsJsonString);
+        getPageGoodspageData(goodsJsonString);
 
         //导航池加载完毕，开始申请模块数据
         let getJson = [
-            // { "parent": routeId + ",0,0", "child": pageData.value[0].cid + ",5,8" },//模块1理论前沿
-            // { "parent": routeId + ",0,0", "child": pageData.value[1].cid + ",5,0" },//模块2典型经验
-            // { "parent": routeId + ",0,0", "child": pageData.value[2].cid + ",1,6" },//模块3农业天地
-            // { "parent": routeId + ",0,0", "child": pageData.value[3].cid + ",1,6" },//模块4美丽乡村
-            // { "parent": routeId + ",0,0", "child": pageData.value[4].cid + ",1,6" },//模块5农民之家
-            // { "parent": routeId + ",0,0", "child": pageData.value[5].cid + ",6,3" },//模块6农业天地
-            // { "parent": routeId + ",0,0", "child": pageData.value[6].cid + ",2,3" },//模块7农村建设
-            // { "parent": routeId + ",0,0", "child": pageData.value[7].cid + ",4,0" },//模块8高端资讯
+            // { "parent": routeId + ",0,0", "child": newsData.value[0].cid + ",5,8" },//模块1理论前沿
+            // { "parent": routeId + ",0,0", "child": newsData.value[1].cid + ",5,0" },//模块2典型经验
+            // { "parent": routeId + ",0,0", "child": newsData.value[2].cid + ",1,6" },//模块3农业天地
+            // { "parent": routeId + ",0,0", "child": newsData.value[3].cid + ",1,6" },//模块4美丽乡村
+            // { "parent": routeId + ",0,0", "child": newsData.value[4].cid + ",1,6" },//模块5农民之家
+            // { "parent": routeId + ",0,0", "child": newsData.value[5].cid + ",6,3" },//模块6农业天地
+            // { "parent": routeId + ",0,0", "child": newsData.value[6].cid + ",2,3" },//模块7农村建设
+            // { "parent": routeId + ",0,0", "child": newsData.value[7].cid + ",4,0" },//模块8高端资讯
         ]
-        for (let i = 0; i < pageData.value.length; i++) {
+        for (let i = 0; i < newsData.value.length; i++) {
             if (i == 0) {
-                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[0].cid + ",5,8" });//模块1理论前沿
+                getJson.push({ "parent": routeId + ",0,0", "child": newsData.value[0].cid + ",5,8" });//模块1理论前沿
             } else if (i == 1) {
-                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[1].cid + ",5,0" });//模块2典型经验
+                getJson.push({ "parent": routeId + ",0,0", "child": newsData.value[1].cid + ",5,0" });//模块2典型经验
             } else if (i == 2) {
-                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[2].cid + ",1,6" });//模块3农业天地
+                getJson.push({ "parent": routeId + ",0,0", "child": newsData.value[2].cid + ",1,6" });//模块3农业天地
             } else if (i == 3) {
-                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[3].cid + ",4,0" });//模块4美丽乡村
+                getJson.push({ "parent": routeId + ",0,0", "child": newsData.value[3].cid + ",1,6" });//模块4美丽乡村
             } else if (i == 4) {
-                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[4].cid + ",1,6" });//模块5农民之家
+                getJson.push({ "parent": routeId + ",0,0", "child": newsData.value[4].cid + ",1,6" });//模块5农民之家
             } else if (i == 5) {
-                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[5].cid + ",6,3" });//模块6农业天地
+                getJson.push({ "parent": routeId + ",0,0", "child": newsData.value[5].cid + ",6,3" });//模块6农业天地
             } else if (i == 6) {
-                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[6].cid + ",2,3" });//模块7农村建设
+                getJson.push({ "parent": routeId + ",0,0", "child": newsData.value[6].cid + ",2,3" });//模块7农村建设
             } else if (i == 7) {
-                getJson.push({ "parent": routeId + ",0,0", "child": pageData.value[7].cid + ",4,0" });//模块8高端资讯
+                getJson.push({ "parent": routeId + ",0,0", "child": newsData.value[7].cid + ",4,0" });//模块8高端资讯
             }
         }
 
         let jsonString = JSON.stringify(getJson);
-        getPageAllData(jsonString);
+        getPagepageData(jsonString);
 
     } else {
         console.log("SSR waring ---------- SSR waring ---------- SSR waring ---------->")
@@ -789,7 +789,7 @@ try {
 }
 
 // 获取商品数据 start--------------------------------------->
-async function getPageGoodsAllData(goodsJsonString) {
+async function getPageGoodspageData(goodsJsonString) {
     const mkdata = await requestDataPromise('/web/getWebsiteCatidshop', {
         method: 'GET',
         query: {
@@ -806,7 +806,7 @@ async function getPageGoodsAllData(goodsJsonString) {
                 goodsData.value[0].data2.push(mkdata.data[0][index]);
             }
         }
-        //模块3
+        //模块2
         for (let index in mkdata.data[1]) {
             if (index < 1) {
                 goodsData.value[1].data.push(mkdata.data[1][index]);
@@ -832,7 +832,7 @@ async function getPageGoodsAllData(goodsJsonString) {
 // 获取商品数据 end----------------------------------------->
 
 // 获取资讯数据 start----------------------------------------->
-async function getPageAllData(jsonString) {
+async function getPagepageData(jsonString) {
     const mkdata = await requestDataPromise('/web/getWebsiteAllArticle', {
         method: 'GET',
         query: {
@@ -845,48 +845,48 @@ async function getPageAllData(jsonString) {
         console.log(mkdata.data)
         //模块1理论前沿
         if (mkdata.data[0].child.imgnum.length > 0) {
-            pageData.value[0].data.push(mkdata.data[0].child.imgnum[0]);
+            newsData.value[0].data.push(mkdata.data[0].child.imgnum[0]);
         }
         if (mkdata.data[0].child.imgnum.length > 1) {
-            pageData.value[0].data2.push(mkdata.data[0].child.imgnum[1]);
+            newsData.value[0].data2.push(mkdata.data[0].child.imgnum[1]);
         }
         if (mkdata.data[0].child.imgnum.length > 2) {
-            pageData.value[0].data2.push(mkdata.data[0].child.imgnum[2]);
+            newsData.value[0].data2.push(mkdata.data[0].child.imgnum[2]);
         }
         if (mkdata.data[0].child.imgnum.length > 3) {
-            pageData.value[0].data2.push(mkdata.data[0].child.imgnum[3]);
+            newsData.value[0].data2.push(mkdata.data[0].child.imgnum[3]);
         }
         if (mkdata.data[0].child.imgnum.length > 4) {
-            pageData.value[0].data2.push(mkdata.data[0].child.imgnum[4]);
+            newsData.value[0].data2.push(mkdata.data[0].child.imgnum[4]);
         }
-        pageData.value[0].data3 = mkdata.data[0].child.textnum;
+        newsData.value[0].data3 = mkdata.data[0].child.textnum;
         //模块2典型经验
-        pageData.value[1].data = mkdata.data[1].child.imgnum;
+        newsData.value[1].data = mkdata.data[1].child.imgnum;
         //模块3农业天地
-        pageData.value[2].data = mkdata.data[2].child.imgnum;
-        pageData.value[2].data2 = mkdata.data[2].child.textnum;
+        newsData.value[2].data = mkdata.data[2].child.imgnum;
+        newsData.value[2].data2 = mkdata.data[2].child.textnum;
         //模块4美丽乡村
-        pageData.value[3].data = mkdata.data[3].child.imgnum;
-        pageData.value[3].data2 = mkdata.data[3].child.textnum;
+        newsData.value[3].data = mkdata.data[3].child.imgnum;
+        newsData.value[3].data2 = mkdata.data[3].child.textnum;
         //模块5农民之家
-        pageData.value[4].data = mkdata.data[4].child.imgnum;
-        pageData.value[4].data2 = mkdata.data[4].child.textnum;
+        newsData.value[4].data = mkdata.data[4].child.imgnum;
+        newsData.value[4].data2 = mkdata.data[4].child.textnum;
         //模块6农业天地 注意，三农资讯网跟其他行星站不一样，你不需要复制我这个
         //因为本来二级分类页有9个模块，但是实际应用中只有8个，所以我把本来是模块7
         //的地方和现有的模块6合并成1个了
         if (mkdata.data[5].child.imgnum.length > 0) {
-            pageData.value[5].data.push(mkdata.data[5].child.imgnum[0]);
+            newsData.value[5].data.push(mkdata.data[5].child.imgnum[0]);
         }
-        pageData.value[5].data2 = mkdata.data[5].child.textnum;
+        newsData.value[5].data2 = mkdata.data[5].child.textnum;
         //把模块6的内容放到模块7中一部分
         for (let i = 1; i < mkdata.data[5].child.imgnum.length && i <= 5; i++) {
-            pageData.value[7].data.push(mkdata.data[5].child.imgnum[i]);
+            newsData.value[7].data.push(mkdata.data[5].child.imgnum[i]);
         }
         //模块7农村建设
-        pageData.value[6].data = mkdata.data[6].child.imgnum;
-        pageData.value[6].data2 = mkdata.data[6].child.textnum;
+        newsData.value[6].data = mkdata.data[6].child.imgnum;
+        newsData.value[6].data2 = mkdata.data[6].child.textnum;
         //模块8高端资讯
-        pageData.value[7].data2 = mkdata.data[7].child.imgnum;
+        newsData.value[7].data2 = mkdata.data[7].child.imgnum;
 
     } else {
         ElMessage.error(mkdata.message)